From b4b4e369212c9f0f5792455a81424a27210a9c61 Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Thu, 7 Jan 2021 15:55:52 +0100 Subject: [PATCH 01/31] agda.withPackages: use GHC with ieee754 as default As mentioned in the package description of ieee on Hackage, ieee is deprecated in favor of ieee754. --- doc/languages-frameworks/agda.section.md | 2 +- pkgs/build-support/agda/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 66b4a208302..f57b194a726 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -46,7 +46,7 @@ depend: standard-library More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). ## Compiling Agda -Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee` is made available to the Agda program via the `--with-compiler` flag. +Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag. This can be overridden by a different version of `ghc` as follows: ``` diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 3c973e8cc0a..046bdd061f8 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -7,7 +7,7 @@ with lib.strings; let withPackages' = { pkgs, - ghc ? ghcWithPackages (p: with p; [ ieee ]) + ghc ? ghcWithPackages (p: with p; [ ieee754 ]) }: let pkgs' = if builtins.isList pkgs then pkgs else pkgs self; library-file = writeText "libraries" '' From 67e43b7453ec197e5045f64dc630b57a3160038f Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Fri, 22 Jan 2021 17:25:29 +0100 Subject: [PATCH 02/31] nixos/tests/agda: check execution of HelloWorld Test that the compiled executable actually runs. --- nixos/tests/agda.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix index bbdeb7395aa..ccc6a9bbfd1 100644 --- a/nixos/tests/agda.nix +++ b/nixos/tests/agda.nix @@ -36,6 +36,10 @@ in "cp ${hello-world} HelloWorld.agda" ) machine.succeed("agda -l standard-library -i . -c HelloWorld.agda") + # Check execution + assert "Hello World!" in machine.succeed( + "./HelloWorld" + ), "HelloWorld does not run properly" ''; } ) From 226299e1a2e8dbc9ee8b10042182d8a1f47d7f16 Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Mon, 18 Jan 2021 20:01:31 +0100 Subject: [PATCH 03/31] agdaPackages.mkDerivation: don't install Everything module The Everthing module is not part of a library and should therefore not be copied to the nix store. This is particularly bad, if the Everything module is defined in an agda library included directory, e.g. consider an agda-lib with include: . and Everything.agda in the project root (.), in which case the Everything module would become part of the library. If multiple such projects are in the dependency tree, the Everything module becomes ambiguous and the build would fail. --- nixos/tests/agda.nix | 7 +++++++ pkgs/build-support/agda/default.nix | 2 +- pkgs/build-support/agda/lib.nix | 10 ++++++++++ pkgs/top-level/agda-packages.nix | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/build-support/agda/lib.nix diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix index bbdeb7395aa..61d99fe5050 100644 --- a/nixos/tests/agda.nix +++ b/nixos/tests/agda.nix @@ -23,6 +23,13 @@ in }; testScript = '' + assert ( + "${pkgs.agdaPackages.lib.interfaceFile "Everything.agda"}" == "Everything.agdai" + ), "wrong interface file for Everything.agda" + assert ( + "${pkgs.agdaPackages.lib.interfaceFile "tmp/Everything.agda.md"}" == "tmp/Everything.agdai" + ), "wrong interface file for tmp/Everything.agda.md" + # Minimal script that typechecks machine.succeed("touch TestEmpty.agda") machine.succeed("agda TestEmpty.agda") diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 3c973e8cc0a..01855bf2614 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -70,7 +70,7 @@ let installPhase = if installPhase != null then installPhase else '' runHook preInstall mkdir -p $out - find \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + + find -not \( -path ${everythingFile} -or -path ${lib.interfaceFile everythingFile} \) -and \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + runHook postInstall ''; }; diff --git a/pkgs/build-support/agda/lib.nix b/pkgs/build-support/agda/lib.nix new file mode 100644 index 00000000000..976151a8283 --- /dev/null +++ b/pkgs/build-support/agda/lib.nix @@ -0,0 +1,10 @@ +{ lib }: +{ + /* Returns the Agda interface file to a given Agda file. + * + * Examples: + * interfaceFile "Everything.agda" == "Everything.agdai" + * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai" + */ + interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai"; +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 601ab6d42b9..7434134d28f 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -11,6 +11,8 @@ let in { inherit mkDerivation; + lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); + agda = withPackages [] // { inherit withPackages; }; standard-library = callPackage ../development/libraries/agda/standard-library { From 688ebdc77dcc73163da651ad1bfc7509266df67e Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Fri, 22 Jan 2021 15:16:53 +0100 Subject: [PATCH 04/31] agdaPackages.standard-library: don't install Everything files --- pkgs/development/libraries/agda/standard-library/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 1d8dc03bbde..39e30b3c371 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -14,6 +14,9 @@ mkDerivation rec { nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; preConfigure = '' runhaskell GenerateEverything.hs + # We will only build/consider Everything.agda, in particular we don't want Everything*.agda + # do be copied to the store. + rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda ''; meta = with lib; { From 5465e6e8ef58d38e07b98b5619342ccebe9d991d Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Tue, 26 Jan 2021 04:56:35 +0100 Subject: [PATCH 05/31] agdaPackages.standard-library: 1.4 -> 1.5 --- pkgs/development/libraries/agda/standard-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index c0b0287d897..7018af4928c 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "1asjbisb7pfkgzqy7gf9b23z63bba8l8p1wqfd6ff5ddgqwj3dhp"; + sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From ec52278ea11bc393df2ac2d92c211048cb02dc20 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 27 Jan 2021 13:44:40 +0100 Subject: [PATCH 06/31] agdaPackages.functional-linear-algebra: 0.1 -> 0.2 --- .../libraries/agda/functional-linear-algebra/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index ce4deb5b519..15603f293b4 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { - version = "0.1"; + version = "0.2"; pname = "functional-linear-algebra"; buildInputs = [ standard-library ]; @@ -10,9 +10,13 @@ mkDerivation rec { repo = "functional-linear-algebra"; owner = "ryanorendorff"; rev = "v${version}"; - sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm"; + sha256 = "1dz7kh92df23scl1pkhn70n1f2v3d0x84liphn9kpsd6wlsxccxc"; }; + preConfigure = '' + sh generate-everything.sh + ''; + meta = with lib; { homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' From 01bb748cb4394dad1def57ed2a26bd2dd6f29ebe Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 27 Jan 2021 14:04:21 +0100 Subject: [PATCH 07/31] agdaPackages.generic: 0.1.0.1 -> 0.1.0.2 --- pkgs/development/libraries/agda/generic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/generic/default.nix b/pkgs/development/libraries/agda/generic/default.nix index 08a1d8e12e0..ab203121426 100644 --- a/pkgs/development/libraries/agda/generic/default.nix +++ b/pkgs/development/libraries/agda/generic/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "generic"; - version = "0.1.0.1"; + version = "0.1.0.2"; src = fetchFromGitHub { - repo = "Generic"; owner = "effectfully"; + repo = "Generic"; rev = "v${version}"; - sha256 = "07l44yzx1jly20kmkmkjk8q493bn6x7i3xxpz6mhadkqlxyhmc8s"; + sha256 = "05igsd2gaj6h9bkqwp8llhvn4qvc5gmi03x4fnz096ba8m6x8s3n"; }; buildInputs = [ From 0c3b6defc193a9acaf23b5d8a8cd26f15604f891 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 3 Feb 2021 09:31:12 +0100 Subject: [PATCH 08/31] agdaPackages.agda-categories: 0.1.4 -> 0.1.5 --- pkgs/development/libraries/agda/agda-categories/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index fb6cc727967..1aca24ac8ea 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.4"; + version = "0.1.5"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk"; + sha256 = "1b5gj0r2z5fhh7k8b9s2kx4rjv8gi5y8ijgrbcvsa06n3acap3lm"; }; buildInputs = [ standard-library ]; From 4fe69d33aeb6dac647e424d8f190a7635b34ef70 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Feb 2021 12:32:36 +0100 Subject: [PATCH 09/31] chromium: 88.0.4324.96 -> 88.0.4324.146 https://chromereleases.googleblog.com/2021/02/stable-channel-update-for-desktop.html This update includes 6 security fixes. CVEs: CVE-2021-21142 CVE-2021-21143 CVE-2021-21144 CVE-2021-21145 CVE-2021-21146 CVE-2021-21147 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 46228e2b27d..fbb00e62946 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "88.0.4324.96", - "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", - "sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc", + "version": "88.0.4324.146", + "sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q", + "sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id", "deps": { "gn": { "version": "2020-11-05", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "88.0.4324.27", - "sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p", - "sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14" + "version": "88.0.4324.96", + "sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41", + "sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp" } }, "beta": { From bdf7d732d30efa7fee0a5f6143745edb76476e26 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Feb 2021 12:32:55 +0100 Subject: [PATCH 10/31] ungoogled-chromium: 88.0.4324.104 -> 88.0.4324.146 (security) --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index fbb00e62946..7707776bb21 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "88.0.4324.104", - "sha256": "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx", - "sha256bin64": null, + "version": "88.0.4324.146", + "sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q", + "sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id", "deps": { "gn": { "version": "2020-11-05", @@ -55,8 +55,8 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "88.0.4324.104-1", - "sha256": "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5" + "rev": "88.0.4324.146-1", + "sha256": "0vp53b3jdsay6a17n27vi6cj10jj6zz94gr9ip4r5zf45qq6jx3w" } } } From 9717d021214d84c3c34ac9fc2f68cab158abf396 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 3 Feb 2021 13:47:05 +0100 Subject: [PATCH 11/31] calcurse: include oauth2client package The `oauth2client` is required for the `calcurse-caldav` program to e.g. connect to Google Calendar with OAuth2 --- pkgs/applications/misc/calcurse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index ba8edb2baa5..8a83c593986 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' patchShebangs . - buildPythonPath ${python3Packages.httplib2} + buildPythonPath "${python3Packages.httplib2} ${python3Packages.oauth2client}" patchPythonScript $out/bin/calcurse-caldav ''; From dc69fc793abf8e3b081599d3b9fb0db10ec3a3f0 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 1 Feb 2021 15:22:55 +0100 Subject: [PATCH 12/31] sfeed: 0.9.20 -> 0.9.21 Signed-off-by: Matthias Beyer Message-Id: <20210201142257.517-1-mail@beyermatthias.de> --- pkgs/tools/misc/sfeed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 6f205db432f..57e49c88745 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "0.9.20"; + version = "0.9.21"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq"; + sha256 = "010wasp6hcnwbf0d3gaxmjpkvr85zyv2xxz2pnkwxyk2bbr1h6q8"; }; installPhase = '' From 18a962418485146805a9e1eee74093ed6133c79e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 1 Feb 2021 15:22:56 +0100 Subject: [PATCH 13/31] smenu: 0.9.16 -> 0.9.17 Signed-off-by: Matthias Beyer Message-Id: <20210201142257.517-2-mail@beyermatthias.de> --- pkgs/tools/misc/smenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 5da7f19b060..dbfb5fb1cf8 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.16"; + version = "0.9.17"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "1vlsrc071fznqnz67jbhrc4pcfwzc737lwd9jxpnidn0i08py5p2"; + sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa"; }; buildInputs = [ ncurses ]; From c585670615275f661e9081818997f1d41d794bdf Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 1 Feb 2021 15:22:57 +0100 Subject: [PATCH 14/31] taskwarrior-tui: 0.9.5 -> 0.9.6 Signed-off-by: Matthias Beyer Message-Id: <20210201142257.517-3-mail@beyermatthias.de> --- pkgs/applications/misc/taskwarrior-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 1a97f6c0feb..5c5192ebb28 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "1348ypjphm5f46civbrcxbbahwwl2j47z1hg8ndq1cg2bh5wb8kg"; + sha256 = "1w8x3qfw7p4q8srdbamqlrz5nsilyd0dy87jp7kq2n7yxsrbyh4x"; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "11zpy3whzir9mlbvf0jyscqwj9z44a6s5i1bc2cnxyciqy9b57md"; + cargoSha256 = "0b69qyb74r9may6n61i5a5nzwhxpaij6y40bq6kh8rzdwy0awwx7"; meta = with lib; { description = "A terminal user interface for taskwarrior "; From 5a362d2cbf9379b0b50ba6a1bef79a302bacde63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Feb 2021 14:25:00 +0100 Subject: [PATCH 15/31] ghostwriter: 2.0.0-rc3 -> 2.0.0-rc4 --- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index f0ae7ef5f3e..23a81c9cb00 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0-rc3"; + version = "2.0.0-rc4"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; + sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3"; }; nativeBuildInputs = [ qmake pkg-config qttools ]; From 59ef9e5a1647abb4e16063192fb72f51e0799a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Feb 2021 14:50:58 +0100 Subject: [PATCH 16/31] rclone-browser: use Qt 5.15 --- pkgs/applications/networking/sync/rclone/browser.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index 8dbbc0cf221..1917fc40c0e 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; }; + patches = [ + # patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126 + (fetchpatch { + url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch"; + sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8"; + }) + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a34c0778c2a..53a9edb2f02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24558,7 +24558,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; From b2e5c48ab3a8ebc2460b9c4825ac7265ad1d8deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Feb 2021 14:36:44 +0100 Subject: [PATCH 17/31] texworks: use Qt 5.15 --- pkgs/applications/editors/texworks/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index d0347bcb37c..87990b6eae8 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config , qtscript, poppler, hunspell , withLua ? true, lua , withPython ? true, python3 }: @@ -14,6 +14,14 @@ mkDerivation rec { sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; }; + patches = [ + (fetchpatch { + name = "fix-compilation-with-qt-5.15.patch"; + url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch"; + sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtscript poppler hunspell ] ++ lib.optional withLua lua diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a34c0778c2a..d3b27f687db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8253,7 +8253,7 @@ in textadept11 = callPackage ../applications/editors/textadept/11 { }; - texworks = libsForQt514.callPackage ../applications/editors/texworks { }; + texworks = libsForQt5.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; From a30a844f3177eda84cf3585e6de1e6c340b2be44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 14:43:11 +0000 Subject: [PATCH 18/31] helmfile: 0.138.1 -> 0.138.2 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 8a571669c57..c45ff90c02d 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.1"; + version = "0.138.2"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ZViDnV2b9od3yBfROBBZPsuFX8FH/rSO/epZtuCO1ps="; + sha256 = "sha256-hy673acO9/fJL/80VTnQS8t9jXb7y9KVSVa0Zmja4uk="; }; vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE="; From 2dab814a773c5cdf0b108e78ceb6402c97b386eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Feb 2021 17:12:46 +0100 Subject: [PATCH 19/31] python3Packages.javaobj-py3: 0.4.1 -> 0.4.2 --- .../python-modules/javaobj-py3/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index fae3c2f3958..421b63a6640 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -2,27 +2,30 @@ , fetchPypi , isPy27 , lib +, numpy }: buildPythonPackage rec { pname = "javaobj-py3"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14"; + sha256 = "sha256-7Tsf/P058WVynLU1h8ygKrC/pMMyyDepLV/+au9cgBA="; }; + propagatedBuildInputs = [ numpy ]; + # Tests assume network connectivity doCheck = false; - meta = { + pythonImportsCheck = [ "javaobj" ]; + + meta = with lib; { description = "Module for serializing and de-serializing Java objects"; homepage = "https://github.com/tcalmant/python-javaobj"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - kamadorueda - ]; + license = licenses.asl20; + maintainers = with maintainers; [ kamadorueda ]; }; } From 232cc7a64ac0b33112ea7205a0bcd187a3442a22 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 3 Feb 2021 16:31:51 +0100 Subject: [PATCH 20/31] pinentry-mac: name -> pname --- pkgs/tools/security/pinentry/mac.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index f208576561e..9c328d472c4 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: stdenv.mkDerivation { - name = "pinentry-mac-0.9.4"; + pname = "pinentry-mac"; + version = "0.9.4"; src = fetchFromGitHub { owner = "matthewbauer"; From b7e5f53c01016b8e9aef49b8bb6e3d3b7ef35458 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 18:03:44 +0000 Subject: [PATCH 21/31] nfs-ganesha: 3.4 -> 3.5 --- pkgs/servers/nfs-ganesha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index b5fefc963f0..b5533e10b2f 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k"; + sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE="; }; patches = [ ./sysstatedir.patch ]; From 84210a8538d5d143f279e839ff0562a82ffdce1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Feb 2021 10:12:40 +0100 Subject: [PATCH 22/31] python3Packages.pysyncobj: init at 0.3.7 --- .../python-modules/pysyncobj/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pysyncobj/default.nix diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix new file mode 100644 index 00000000000..bca2d47320e --- /dev/null +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pysyncobj"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "bakwc"; + repo = "PySyncObj"; + rev = version; + sha256 = "0i7gjapaggkfvys4rgd4krpmh6mxwpzv30ngiwb6ddgp8jx0nzxk"; + }; + + # Tests require network features + doCheck = false; + pythonImportsCheck = [ "pysyncobj" ]; + + meta = with lib; { + description = "Python library for replicating your class"; + homepage = "https://github.com/bakwc/PySyncObj"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d7f168162c..315e9202da0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5991,6 +5991,8 @@ in { pysychonaut = callPackage ../development/python-modules/pysychonaut { }; + pysyncobj = callPackage ../development/python-modules/pysyncobj { }; + pytabix = callPackage ../development/python-modules/pytabix { }; pytado = callPackage ../development/python-modules/pytado { }; From ca447081a843addc24981a8b8e3fbd4e09adeaf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Feb 2021 10:13:48 +0100 Subject: [PATCH 23/31] patroni: 1.6.5 -> 2.0.1 --- pkgs/servers/sql/patroni/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 682dbe45f7d..8da0213a2aa 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -1,14 +1,17 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib +, pythonPackages +, fetchFromGitHub +}: pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "1.6.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "0iw0ra9fya4bf1vkjq3w5kij4x46yinb90v015pi9c6qfpancfdj"; + sha256 = "sha256-IlRltJrEMrRiwVVMYQywb0MqwEoL8MX3do2GlHXjuPc="; }; # cdiff renamed to ydiff; remove when patroni source reflects this. @@ -28,6 +31,7 @@ pythonPackages.buildPythonApplication rec { prettytable psutil psycopg2 + pysyncobj python-dateutil python-etcd pyyaml @@ -40,13 +44,15 @@ pythonPackages.buildPythonApplication rec { flake8 mock pytestCheckHook - pytestcov + pytest-cov requests ]; # Fix tests by preventing them from writing to /homeless-shelter. preCheck = "export HOME=$(mktemp -d)"; + pythonImportsCheck = [ "patroni" ]; + meta = with lib; { homepage = "https://patroni.readthedocs.io/en/latest/"; description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul"; From bde2fffbbe031c245000d33a8567ba6b90d17129 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Mon, 1 Feb 2021 20:26:29 +0100 Subject: [PATCH 24/31] zfs: 2.0.1 -> 2.0.2 --- pkgs/os-specific/linux/zfs/default.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d61c0931e20..d8729fbe165 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -21,12 +21,6 @@ let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; - # remove this patch at the next ZFS release (> 2.0.1) - reapplyPathSanitizerPatch = fetchpatch { - url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch"; - sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca"; - }; - common = { version , sha256 , extraPatches ? [] @@ -192,11 +186,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "2.0.1"; + version = "2.0.2"; - sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - - extraPatches = [ reapplyPathSanitizerPatch ]; + sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; }; zfsUnstable = common { @@ -204,10 +196,8 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.1"; + version = "2.0.2"; - sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - - extraPatches = [ reapplyPathSanitizerPatch ]; + sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; }; } From 20596586ffe34bd49d5d930decbe51acb851dc25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 19:48:22 +0000 Subject: [PATCH 25/31] osmium-tool: 1.13.0 -> 1.13.1 --- pkgs/applications/misc/osmium-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 2397f3b8806..906d8c62602 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2"; + sha256 = "sha256-IeFbcgwayBl3xxv3onCJr0f1oeveyyNlLxXQlzOoVq0="; }; nativeBuildInputs = [ From 4f059a5ab288a23ff7586de8905218b2c642db1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 20:02:32 +0000 Subject: [PATCH 26/31] papirus-icon-theme: 20210101 -> 20210201 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ed5f8e7c4c2..b18354910e4 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210101"; + version = "20210201"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE="; + sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M="; }; nativeBuildInputs = [ From 90860de871ecf188d22f635452dd24889715eddc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 20:10:54 +0000 Subject: [PATCH 27/31] particl-core: 0.19.1.1 -> 0.19.2.3 --- pkgs/applications/blockchains/particl/particl-core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index 2c17b344664..feced9eecb0 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -17,11 +17,11 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.1.1"; + version = "0.19.2.3"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; + sha256 = "sha256-nAsQvYWUejSu/4MMIwZhlV5Gjza/Da4jcp6/01lppvg="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From a6e5607595296dc28d8d10315f3b0dda9716debd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Jan 2021 12:24:30 +0000 Subject: [PATCH 28/31] bazarr: 0.9.0.7 -> 0.9.0.8 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 375f33e5d60..d68646c4275 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.7"; + version = "0.9.0.8"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1nskhdb1pcgwp39ld8zrnngzsq6g1pn59nb211qhf6rsj0nyahic"; + sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc="; }; nativeBuildInputs = [ makeWrapper ]; From d7ee2a16bd762c38eb97e6f8898b176a65d56fa9 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Sun, 31 Jan 2021 12:08:32 +0100 Subject: [PATCH 29/31] nixos/resilio: add sharedFolders type --- nixos/modules/services/networking/resilio.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 6193d7340fc..4701b0e8143 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -183,6 +183,7 @@ in sharedFolders = mkOption { default = []; + type = types.listOf (types.attrsOf types.anything); example = [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; directory = "/home/user/sync_test"; From 5ac119043d903a75575a055e9b6539ca2a452cff Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Mon, 1 Feb 2021 17:43:01 +0100 Subject: [PATCH 30/31] nixos/oauth2_proxy: add extraConfig type --- nixos/modules/services/security/oauth2_proxy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 486f3ab0538..77c579279ab 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -538,6 +538,7 @@ in extraConfig = mkOption { default = {}; + type = types.attrsOf types.anything; description = '' Extra config to pass to oauth2-proxy. ''; From 05fbc82771a0a63473cbd22cdc2367f393ad00f4 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Sun, 31 Jan 2021 13:12:36 +0100 Subject: [PATCH 31/31] nixos/top-level: add specialisation..configuration type --- nixos/modules/system/activation/top-level.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b0f77ca3fb8..75eb91f2834 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -173,6 +173,7 @@ in }; options.configuration = mkOption { + type = types.attrsOf types.anything; default = {}; description = "Arbitrary NixOS configuration options."; };