From f64056fccdc1871a1297d326db6745a3acbefc1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Sep 2021 22:33:20 +0200 Subject: [PATCH 01/15] botamusique: unstable-2021-06-01 -> unstable-2021-09-01 --- pkgs/tools/audio/botamusique/node-packages.nix | 2 +- pkgs/tools/audio/botamusique/src.json | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix index c9bdb6f00971..89c7d8d98036 100644 --- a/pkgs/tools/audio/botamusique/node-packages.nix +++ b/pkgs/tools/audio/botamusique/node-packages.nix @@ -4527,7 +4527,7 @@ let name = "botamusique"; packageName = "botamusique"; version = "0.0.0"; - src = ../../../../../../../../../tmp/tmp.UAoivnXH3n; + src = ../../../../../../../../../tmp/tmp.IOzfGq3zuo; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json index d1337f5ae68a..ab5c4819ecbe 100644 --- a/pkgs/tools/audio/botamusique/src.json +++ b/pkgs/tools/audio/botamusique/src.json @@ -1,9 +1,10 @@ { "url": "https://github.com/azlux/botamusique", - "rev": "ba02cdebf2e175dc371995361eafcb88ad2c1b52", - "date": "2021-06-01T23:39:44+02:00", - "path": "/nix/store/dp5vnj7zqv1sp1ab5xycvvqdpia9xb71-botamusique", - "sha256": "01d51y6h38hs4ynjgz050ryy14sp5y2c3n7f80mcv0a4ls8413qp", + "rev": "3733353170e1d24b5f3ce2a21643c27ca2a39835", + "date": "2021-09-01T12:19:37+02:00", + "path": "/nix/store/07vl4lhi6dshh4n7pcyrxvy9m028rrbr-botamusique", + "sha256": "0cggan70zymbh9iwggq9a04zkky86k9cncprxb9nnr35gp4l4992", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false From 183710009626e81af20afeb055b47c866a18c69c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 19 Sep 2021 12:42:20 +0100 Subject: [PATCH 02/15] tremor-rs: 0.11.5 -> 0.11.6 --- pkgs/tools/misc/tremor-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 5f6acfd9696f..c88fca0aebcb 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE="; + sha256 = "1ldqa4q7q9afrbjh7adinav21zsh26pqqvrd6q9542r90mxnygmx"; }; - cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI="; + cargoSha256 = "0ivxd5mhvcpzv9wf859vwyiq1s0bbd9vdk6fy6m81bn5ykihx7ar"; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From ccbdef3b206c14c588ae6fa2bbd37695a09f998f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Sep 2021 02:38:31 +0200 Subject: [PATCH 03/15] edk2: 202102 -> 202108 --- pkgs/development/compilers/edk2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 1a6685e91411..aaf59ca1ef57 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -36,13 +36,13 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202102"; + version = "202108"; # submodules src = fetchgit { url = "https://github.com/tianocore/edk2"; rev = "edk2-stable${edk2.version}"; - sha256 = "1292hfbqz4wyikdf6glqdy80n9zpy54gnfngqnyv05908hww6h82"; + sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; }; buildInputs = [ libuuid pythonEnv ]; From fb405269612ce6df5021e97d57dca9be3bfeed86 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Oct 2021 17:33:31 +0200 Subject: [PATCH 04/15] nixos/nextcloud: minor manual improvements * Linkify documentation about objectstore-feature rather than only mentioning it. * Use `` where it makes sense. * Remove unnecessary `Whether to load` from `enableImagemagick` because `mkEnableOption` already prepends `Whether to enable` to the given description. --- nixos/modules/services/web-apps/nextcloud.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 886e030b80c9..cb755b99c914 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -321,8 +321,8 @@ in { This mounts a bucket on an Amazon S3 object storage or compatible implementation into the virtual filesystem. - See nextcloud's documentation on "Object Storage as Primary - Storage" for more details. + Further details about this feature can be found in the + upstream documentation. ''; bucket = mkOption { type = types.str; @@ -389,9 +389,9 @@ in { Required for some non-Amazon S3 implementations. Ordinarily, requests will be made with - http://bucket.hostname.domain/, but with path style + http://bucket.hostname.domain/, but with path style enabled requests are made with - http://hostname.domain/bucket instead. + http://hostname.domain/bucket instead. ''; }; }; @@ -399,7 +399,7 @@ in { }; enableImagemagick = mkEnableOption '' - Whether to load the ImageMagick module into PHP. + the ImageMagick module for PHP. This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). From 9f37d6aee028679b8a94be59d74984e708acaa85 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Oct 2021 17:34:48 +0200 Subject: [PATCH 05/15] nixos/nextcloud: put secrets into the environment of nextcloud-setup.service The `$(/cmdline`. Now, these values don't appear in a command line anymore, but will be passed as environment variables to `nextcloud-occ`. --- nixos/modules/services/web-apps/nextcloud.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index cb755b99c914..b182f66a698c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -623,14 +623,21 @@ in { ]; ''; occInstallCmd = let - dbpass = if c.dbpassFile != null - then ''"$(<"${toString c.dbpassFile}")"'' - else if c.dbpass != null - then ''"${toString c.dbpass}"'' - else ''""''; - adminpass = if c.adminpassFile != null - then ''"$(<"${toString c.adminpassFile}")"'' - else ''"${toString c.adminpass}"''; + mkExport = { arg, value }: "export ${arg}=${value}"; + dbpass = { + arg = "DBPASS"; + value = if c.dbpassFile != null + then ''"$(<"${toString c.dbpassFile}")"'' + else if c.dbpass != null + then ''"${toString c.dbpass}"'' + else ''""''; + }; + adminpass = { + arg = "ADMINPASS"; + value = if c.adminpassFile != null + then ''"$(<"${toString c.adminpassFile}")"'' + else ''"${toString c.adminpass}"''; + }; installFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { "--database" = ''"${c.dbtype}"''; @@ -641,12 +648,14 @@ in { ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"''; ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"''; ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"''; - "--database-pass" = dbpass; + "--database-pass" = "\$${dbpass.arg}"; "--admin-user" = ''"${c.adminuser}"''; - "--admin-pass" = adminpass; + "--admin-pass" = "\$${adminpass.arg}"; "--data-dir" = ''"${cfg.home}/data"''; }); in '' + ${mkExport dbpass} + ${mkExport adminpass} ${occ}/bin/nextcloud-occ maintenance:install \ ${installFlags} ''; From 176793b716a1d223753234171f1f8e3656f2da68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Oct 2021 17:21:16 +0200 Subject: [PATCH 06/15] knockpy: 5.1.0 -> 5.2.0 --- pkgs/tools/security/knockpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 8189145846b3..eedd436dc2df 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.1.0"; + version = "5.2.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = version; - sha256 = "sha256-4W6/omGPmQFuZ/2AVNgCs2q0ti/P8OY4o7b4/g9q+Rc="; + sha256 = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o="; }; propagatedBuildInputs = with python3.pkgs; [ From 59c0ff2c932d5619f70d776331628abcf0d54180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Oct 2021 17:51:29 +0200 Subject: [PATCH 07/15] metasploit: 6.1.8 -> 6.1.9 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 16 ++++++----- pkgs/tools/security/metasploit/default.nix | 6 ++-- pkgs/tools/security/metasploit/gemset.nix | 32 ++++++++++++++------- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 0871a51b6d33..55116147f3bd 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.8" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.9" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 3b799b4f9ea0..41c8daf29358 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: d50b53eafca062b7270a91894e4e9de7a526aa10 - ref: refs/tags/6.1.8 + revision: 1e520ab4a5779648de889d198100af4eb556a7f6 + ref: refs/tags/6.1.9 specs: - metasploit-framework (6.1.8) + metasploit-framework (6.1.9) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -87,6 +87,7 @@ GIT tzinfo-data unix-crypt warden + win32api windows_error winrm xdr @@ -127,19 +128,19 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.510.0) + aws-partitions (1.512.0) aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.265.0) + aws-sdk-ec2 (1.266.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.61.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.48.0) + aws-sdk-kms (1.49.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.103.0) @@ -404,7 +405,7 @@ GEM ttfunk (1.7.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.2) + tzinfo-data (1.2021.3) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -416,6 +417,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + win32api (0.1.0) windows_error (0.1.2) winrm (2.3.6) builder (>= 2.1.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 9d0728b0303b..29c8b177986f 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.8"; + version = "6.1.9"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-KDexgv5rsaOyAJhaiLiU1z0st7ncwIayoqn+fvJnSng="; + sha256 = "sha256-ZhNy6rp3Jdrua1dZr3dTQxLOVAflWiI0lc/f38d0kqc="; }; nativeBuildInputs = [ makeWrapper ]; @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/rapid7/metasploit-framework/wiki"; platforms = platforms.unix; license = licenses.bsd3; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ fab makefu ]; mainProgram = "msfconsole"; }; } diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index d529c58ef58c..7b0e12b509b0 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lszcza7k1jc57pivjajz1bdgsg3bxfp60phsidv729yhjw3yzwv"; + sha256 = "09v7z0sg09vsysv0hm1552b3laa8sf933c0sqnb35mb4wksj1fv9"; type = "gem"; }; - version = "1.510.0"; + version = "1.512.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ymrwsc1caf9rfl5613w1xpckzx7v9l4y20dpmzzq72ih0y6lijn"; + sha256 = "0bwkgmdas7ig52cbfdx6vf63j8qk91lizd7sdjdapbfnabbpwmq1"; type = "gem"; }; - version = "1.265.0"; + version = "1.266.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -144,10 +144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aa7n3bad4h8sipzb31inc0q2r5k2nviaihmhqdv7mqnpylvcgia"; + sha256 = "15iar7b74lnvw1cafacp8vc63xy3zxa8zxmranfssa37mhk53byi"; type = "gem"; }; - version = "1.48.0"; + version = "1.49.0"; }; aws-sdk-s3 = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "d50b53eafca062b7270a91894e4e9de7a526aa10"; - sha256 = "0y2aczr7xzm9lar8dh6wp6vjqgfpjjw8hnlq02ra7cbbzs1b2dr8"; + rev = "1e520ab4a5779648de889d198100af4eb556a7f6"; + sha256 = "19wjfk3xzpygjls24np50xacw4j3advsynapdgpdl9bppbm744v6"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.8"; + version = "6.1.9"; }; metasploit-model = { groups = ["default"]; @@ -1477,10 +1477,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a0d3smxpdn6i5vjc616wnva8c9nvh8mvsjyvwcxlsj1qsih2l21"; + sha256 = "1f9wlg8p1p1wa86hcskiy58abbdysdqwr4pv2dmkhkfbi94f1lmr"; type = "gem"; }; - version = "1.2021.2"; + version = "1.2021.3"; }; unf = { groups = ["default"]; @@ -1552,6 +1552,16 @@ }; version = "0.1.5"; }; + win32api = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1liryy0pz0gpw5sadbb9xwaflay272b8bwv4pclh6wkhldnh7wg7"; + type = "gem"; + }; + version = "0.1.0"; + }; windows_error = { groups = ["default"]; platforms = []; From f57bed88326b7b7e3ff6dc97ddeaef5b02f8e510 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Oct 2021 18:30:57 +0200 Subject: [PATCH 08/15] nixos/nextcloud: drop adminpass/dbpass options entirely --- nixos/modules/services/web-apps/nextcloud.nix | 59 ++++++------------- nixos/tests/nextcloud/basic.nix | 2 +- .../nextcloud/with-mysql-and-memcached.nix | 4 +- 3 files changed, 20 insertions(+), 45 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index b182f66a698c..4d7f16b1e1a9 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -51,6 +51,12 @@ let in { imports = [ + (mkRemovedOptionModule [ "services" "nextcloud" "config" "adminpass" ] '' + Please use `services.nextcloud.config.adminpassFile' instead! + '') + (mkRemovedOptionModule [ "services" "nextcloud" "config" "dbpass" ] '' + Please use `services.nextcloud.config.dbpassFile' instead! + '') (mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ] '' The nextcloud module supports `nginx` as reverse-proxy by default and doesn't support other reverse-proxies officially. @@ -206,14 +212,6 @@ in { default = "nextcloud"; description = "Database user."; }; - dbpass = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Database password. Use dbpassFile to avoid this - being world-readable in the /nix/store. - ''; - }; dbpassFile = mkOption { type = types.nullOr types.str; default = null; @@ -246,17 +244,8 @@ in { default = "root"; description = "Admin username."; }; - adminpass = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Admin password. Use adminpassFile to avoid this - being world-readable in the /nix/store. - ''; - }; adminpassFile = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; description = '' The full path to a file that contains the admin's password. Must be readable by user nextcloud. @@ -403,7 +392,7 @@ in { This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). - See https://github.com/nextcloud/server/issues/13099 + See . '' // { default = true; }; @@ -464,13 +453,6 @@ in { config = mkIf cfg.enable (mkMerge [ { assertions = let acfg = cfg.config; in [ - { assertion = !(acfg.dbpass != null && acfg.dbpassFile != null); - message = "Please specify no more than one of dbpass or dbpassFile"; - } - { assertion = ((acfg.adminpass != null || acfg.adminpassFile != null) - && !(acfg.adminpass != null && acfg.adminpassFile != null)); - message = "Please specify exactly one of adminpass or adminpassFile"; - } { assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null; message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!"; } @@ -613,7 +595,6 @@ in { ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} ${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"} ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} - ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"} 'dbtype' => '${c.dbtype}', 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, @@ -628,15 +609,11 @@ in { arg = "DBPASS"; value = if c.dbpassFile != null then ''"$(<"${toString c.dbpassFile}")"'' - else if c.dbpass != null - then ''"${toString c.dbpass}"'' else ''""''; }; adminpass = { arg = "ADMINPASS"; - value = if c.adminpassFile != null - then ''"$(<"${toString c.adminpassFile}")"'' - else ''"${toString c.adminpass}"''; + value = ''"$(<"${toString c.adminpassFile}")"''; }; installFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { @@ -682,16 +659,14 @@ in { exit 1 fi ''} - ${optionalString (c.adminpassFile != null) '' - if [ ! -r "${c.adminpassFile}" ]; then - echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..." - exit 1 - fi - if [ -z "$(<${c.adminpassFile})" ]; then - echo "adminpassFile ${c.adminpassFile} is empty!" - exit 1 - fi - ''} + if [ ! -r "${c.adminpassFile}" ]; then + echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..." + exit 1 + fi + if [ -z "$(<${c.adminpassFile})" ]; then + echo "adminpassFile ${c.adminpassFile} is empty!" + exit 1 + fi ln -sf ${cfg.package}/apps ${cfg.home}/ diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 40ee9d5184cc..1a7b25d5a49e 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -38,7 +38,7 @@ in { hostName = "nextcloud"; config = { # Don't inherit adminuser since "root" is supposed to be the default - inherit adminpass; + adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! dbtableprefix = "nixos_"; }; package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index c0df773eaaa8..80cb63df5dbe 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -32,9 +32,9 @@ in { dbuser = "nextcloud"; dbhost = "127.0.0.1"; dbport = 3306; - dbpass = "hunter2"; + dbpassFile = "${pkgs.writeText "dbpass" "hunter2" }"; # Don't inherit adminuser since "root" is supposed to be the default - inherit adminpass; + adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! }; }; From a6c34ff3633924f0aa1b91cc0eaa4559986e6633 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 26 Sep 2021 14:23:23 -0400 Subject: [PATCH 09/15] linux: cleanup zlib conditional dependency zlib was added to its own optional statement, when there was already another for 5.2 --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 44e0b1d77b2d..5ff9a8be7723 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -315,9 +315,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils - ++ optional (lib.versionAtLeast version "5.2") zlib ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; From 4715a08d0872425a73e3a185e9699bc3e4080212 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Oct 2021 04:31:09 +0000 Subject: [PATCH 10/15] python38Packages.mautrix: 0.10.9 -> 0.10.10 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 2ef611a0acf5..c74d2f547c5b 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.9"; + version = "0.10.10"; src = fetchPypi { inherit pname version; - sha256 = "b774a2e1178a2f9812ce02119c6ee374b1ea08d34bad4c09a1ecc92d08d98f28"; + sha256 = "78309702392fe1ced000a23cfacb9bae0511ba533963b82d1d040f4a39924c09"; }; propagatedBuildInputs = [ From e84f3ad76cf962c1621140528492200a5ed80c1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Oct 2021 09:26:32 +0200 Subject: [PATCH 11/15] terrascan: 1.10.0 -> 1.11.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index eb5320d250fc..0308bc5d35bc 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IF5BDe6XnOR7F/ajYBbMuFpIxUawgd/Oo2AthL5aeWE="; + sha256 = "sha256-vKKBbTculy/r1l3lHnHiBZLAwhw/61kDAsypa0o2VXQ="; }; - vendorSha256 = "sha256-PZM8OWvjj8681/CWVE896f3vRHnkNeJj2w/aoOFZ9P0="; + vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry"; # Tests want to download a vulnerable Terraform project doCheck = false; From 467e36f5da2fc8c9cb481d7ce28a8b3725b051b1 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sat, 9 Oct 2021 11:02:43 +0200 Subject: [PATCH 12/15] guitarix: move from Python 2 to Python 3 --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index f90cae115b4e..b6ce0daef0d2 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -24,7 +24,7 @@ , lrdf , lv2 , pkg-config -, python2 +, python3 , sassc , serd , sord @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme intltool pkg-config - python2 + python3 wafHook wrapGAppsHook ]; From 981d5317b9722c33a0926929fb589d61c866f6a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Oct 2021 19:19:57 +0200 Subject: [PATCH 13/15] gitlint: 0.15.1 -> 0.16.0 --- pkgs/tools/misc/gitlint/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/tools/misc/gitlint/default.nix index 267cdee72338..23420a654a1c 100644 --- a/pkgs/tools/misc/gitlint/default.nix +++ b/pkgs/tools/misc/gitlint/default.nix @@ -10,28 +10,21 @@ let packageOverrides = self: super: { click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "7.1.2"; + version = "8.0.1"; src = oldAttrs.src.override { inherit version; - sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + sha256 = "0ymdyf37acq4qxh038q0xx44qgj6y2kf0jd0ivvix6qij88w214c"; }; }); arrow = super.arrow.overridePythonAttrs (oldAttrs: rec { - version = "1.0.3"; + version = "1.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r"; + sha256 = "0x70a057dqki2z1ny491ixbg980hg4lihc7g1zmy69g4v6xjkz0n"; }; }); - sh = super.sh.overridePythonAttrs (oldAttrs: rec { - version = "1.14.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "13hxgifab9ichla13qaa7sh8r0il7vs1r21js72s0n355zr9mair"; - }; - }); }; }; in @@ -39,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "gitlint"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; rev = "v${version}"; - sha256 = "sha256-CqmE4V+svSuQAsoX0I3NpUqPU5CQf3fyCHJPrjUjHF4="; + sha256 = "1j6gfgqin5dmqd2qq0vib55d2r07s9sy4hwrvwlichxx5jjwncly"; }; nativeBuildInputs = [ From 9044534a8dd73df87ef35e604d7212f876988b02 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 9 Oct 2021 20:06:10 +0200 Subject: [PATCH 14/15] elan: 1.0.7 -> 1.1.0 --- pkgs/applications/science/logic/elan/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 1fb4693d64a2..987068d9bbb6 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl +, fetchpatch , openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: let @@ -7,16 +8,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.7"; + version = "1.1.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI="; + sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb"; }; - cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU="; + cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -40,12 +41,17 @@ rustPlatform.buildRustPackage rec { --subst-var dynamicLinker \ --subst-var libPath '') + # fix build, will be included in 1.1.1 + (fetchpatch { + url = "https://github.com/leanprover/elan/commit/8d1dec09d67b2ac1768b111d24f1a1cabdd563fa.patch"; + sha256 = "sha256-yMdnXqycu4VF9EKavZ85EuspvAqvzDSIm5894SB+3+A="; + }) ]; postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker leanc leanmake; do + for link in lean leanpkg leanchecker leanc leanmake lake; do ln -s elan $link done popd From 6c6670d9c458e4421e58cc99d6ac55f669a59ac1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 9 Oct 2021 10:47:11 +1000 Subject: [PATCH 15/15] lima: 0.6.4 -> 0.7.1 https://github.com/lima-vm/lima/releases/tag/v0.7.0 https://github.com/lima-vm/lima/releases/tag/v0.7.1 --- pkgs/applications/virtualization/lima/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index ba056920e849..78f47d5292cd 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u4XLWDJ35jEKKr98eEoUUsT3gawM/qNqXPXrhlQlugg="; + sha256 = "sha256-CBRBcRvMFE9Pdxac3O15z0brF/5D279/Hat0CSYGRyE="; }; - vendorSha256 = "sha256-ivKudP0SlArfD+wXHmqNRmW8UGu0o2SJqURrjPhK2hs="; + vendorSha256 = "sha256-xlFIO33OOyLnIvbsbyHVNdyxh0vlwQOATbbZA7rsz9E="; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -34,7 +34,9 @@ buildGoModule rec { wrapProgram $out/bin/limactl \ --prefix PATH : ${lib.makeBinPath [ qemu ]} installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) runHook postInstall ''; @@ -50,4 +52,3 @@ buildGoModule rec { maintainers = with maintainers; [ anhduy ]; }; } -