From 7c6e538767f33c36fdb19592deb382cf22d73f53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 11:15:59 +0000 Subject: [PATCH 01/29] dnsproxy: 0.43.1 -> 0.44.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 15b0e23493d8..f9a024d366f7 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q+MLFdZTn14FhJ+gV3j5gVusL19lR7Cpd1BGxGvi848="; + sha256 = "sha256-WSz2pbHDtF+yBaCG7RI8A70lG+5sVe8pRmGxxFvt+jc="; }; vendorSha256 = null; From de52d13612ccb7dd36c578e94e68f5e5d876b238 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 30 Aug 2022 11:35:57 +0100 Subject: [PATCH 02/29] deno: 1.23.4 -> 1.25.1 --- pkgs/development/web/deno/default.nix | 19 +++++-------------- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- .../web/deno/update/librusty_v8.ts | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 484f5a3d6b97..eedf747c21ff 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , rustPlatform , installShellFiles -, fetchpatch , tinycc , libiconv , libobjc @@ -30,24 +29,15 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.23.4"; + version = "1.25.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nLQqfLRuh9mhZfjeiPaGpQbi5bXEg7HiGwrwDmaIRWM="; + sha256 = "sha256-nKMQDfCU1HsOfdzVwmgCIWa/rUmvufHlsS9jcDwcZzw="; }; - cargoSha256 = "sha256-l5Ce/ypYXZKEi859OFskwC/Unpo842ZPxIHvp6lCjQc="; - - patches = [ - # remove after https://github.com/denoland/deno/pull/15193 is in a release - (fetchpatch { - name = "byo-tcc.patch"; - url = "https://github.com/denoland/deno/pull/15193/commits/c43698b2b58af1ef69b1558d55c8ebea0268dfea.patch"; - sha256 = "sha256-YE5mGHyEm20FjFhr8yveBRlrOVL3+qQYxz2xp/IfmJs="; - }) - ]; + cargoSha256 = "sha256-jFoVQK74gnhC6Ume/PHe8NG7rNeTkwPMBBWn/hT7nCs="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -68,7 +58,7 @@ rustPlatform.buildRustPackage rec { # The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time # To avoid this we point it to our copy (dir) # In the future tinycc will be replaced with asm - DENO_FFI_LIBTCC = "${libtcc}/lib"; + TCC_PATH = "${libtcc}/lib"; # Tests have some inconsistencies between runs with output integration tests # Skipping until resolved @@ -111,5 +101,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + broken = stdenv.isDarwin; # currently fail to build tinycc on darwin in nixpkgs }; } diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 1e6626b1e9e1..f173057db15a 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.45.0"; + version = "0.49.0"; shas = { - x86_64-linux = "sha256-yZw6zwEhJyRntqOmyk03N+sHxzIrbY/e67AQ21ePlAU="; - aarch64-linux = "sha256-2p21Smm5wZycv9u+yDbyerKTjSTB7yau5WC2aJ+Vr8w="; - x86_64-darwin = "sha256-HO287V+iBwdqKZUWhZJnuGJO9RE4wGG4cQMN8CkB7WQ="; - aarch64-darwin = "sha256-ekoMhWMQpBUdM7R7i82NWrNtQMNqCujNYy1ijOxT64U="; + x86_64-linux = "sha256-l6+NdMzYI9r2aHU7/OUhbgmc/LmAZjEFL8y8GrJ+EX8="; + aarch64-linux = "sha256-uo+/Wsrlkm+xotoIr8xlQWoiWzMz02TKFW+olfXtpz8="; + x86_64-darwin = "sha256-gWxljTgt6aXUzwex2zu46B9YzTvhN0Pi9C1Ll1eiohg="; + aarch64-darwin = "sha256-/UnBIQ/wA/0biIG9vIDKylhqFJ8QCoqjKH7xiePZ/eg="; }; } diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index 3f2ad8d7b2a3..7ee4c855741f 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -27,7 +27,7 @@ const getLibrustyV8Version = async ( ) => fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`) .then((res) => res.text()) - .then((txt) => mod.parse(txt).dependencies.v8.version); + .then((txt) => toml.parse(txt).dependencies.v8.version); const fetchArchShaTasks = (version: string, arches: Architecture[]) => arches.map( From 4e427c9df0f1d021a8d7dc0437f73d9582b21c67 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 31 Aug 2022 12:35:42 +0100 Subject: [PATCH 03/29] tinycc: avoid replacing VERSION when it would cause errors Still doesn't fix the general build of tinycc on darwin --- pkgs/development/compilers/tinycc/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 97a86a3fa783..21eb497a116a 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -8,6 +8,10 @@ , which }: +let + # avoid "malformed 32-bit x.y.z" error on mac when using clang + isCleanVer = version: builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; +in stdenv.mkDerivation rec { pname = "tcc"; version = "unstable-2022-07-15"; @@ -62,7 +66,11 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - echo ${version} > VERSION + ${ + if stdenv.isDarwin && ! isCleanVer version + then "echo 'not overwriting VERSION since it would upset ld'" + else "echo ${version} > VERSION" + } configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; From 817a35be0bfcb9d29146ef89a2d927a315c67f3e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 31 Aug 2022 12:36:48 +0100 Subject: [PATCH 04/29] deno: allow for the build of libtcc.a on darwin While the rest of the build is broken libtcc.a actually builds fine on darwin systems and deno_ffi can link to it and work perfectly fine --- pkgs/development/web/deno/default.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index eedf747c21ff..a28b0dba4b62 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -15,18 +15,6 @@ , librusty_v8 ? callPackage ./librusty_v8.nix { } }: -let - libtcc = tinycc.overrideAttrs (oa: { - makeFlags = [ "libtcc.a" ]; - # tests want tcc binary - doCheck = false; - outputs = [ "out" ]; - installPhase = '' - mkdir -p $out/lib/ - mv libtcc.a $out/lib/ - ''; - }); -in rustPlatform.buildRustPackage rec { pname = "deno"; version = "1.25.1"; @@ -58,6 +46,19 @@ rustPlatform.buildRustPackage rec { # The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time # To avoid this we point it to our copy (dir) # In the future tinycc will be replaced with asm + libtcc = tinycc.overrideAttrs (oa: { + makeFlags = [ "libtcc.a" ]; + # tests want tcc binary + doCheck = false; + outputs = [ "out" ]; + installPhase = '' + mkdir -p $out/lib/ + mv libtcc.a $out/lib/ + ''; + # building the whole of tcc on darwin is broken in nixpkgs + # but just building libtcc.a works fine so mark this as unbroken + meta.broken = false; + }); TCC_PATH = "${libtcc}/lib"; # Tests have some inconsistencies between runs with output integration tests @@ -101,6 +102,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - broken = stdenv.isDarwin; # currently fail to build tinycc on darwin in nixpkgs }; } From 441e76b3735a224b404f62e823ff4724ce28991c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 4 Sep 2022 15:16:24 -0300 Subject: [PATCH 05/29] sioyek: get rid of rec --- pkgs/applications/misc/sioyek/default.nix | 35 ++++++++++++++++------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 3ea7afcbdeb4..bfa0fb1d5055 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -15,21 +15,34 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; version = "unstable-2022-08-30"; src = fetchFromGitHub { owner = "ahrm"; - repo = pname; + repo = "sioyek"; rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; }; - buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ] - ++ lib.optionals stdenv.isDarwin [ freetype ]; + buildInputs = [ + gumbo + harfbuzz + jbig2dec + mujs + mupdf + openjpeg + qt3d + qtbase + ] + ++ lib.optionals stdenv.isDarwin [ freetype ]; - nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; + nativeBuildInputs = [ + installShellFiles + qmake + wrapQtAppsHook + ]; qmakeFlags = lib.optionals stdenv.isDarwin [ "CONFIG+=non_portable" ]; @@ -51,7 +64,7 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications cp -r sioyek.app $out/Applications - '' else '' + '' else '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config @@ -59,11 +72,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Sioyek is a PDF viewer designed for reading research papers and technical books."; homepage = "https://sioyek.info/"; - changelog = "https://github.com/ahrm/sioyek/releases"; + description = "A PDF viewer designed for research papers and technical books"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0"; license = licenses.gpl3Only; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.podocarp ]; + maintainers = with maintainers; [ podocarp ]; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 246b73746775..44217e7b365c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30692,7 +30692,9 @@ with pkgs; simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; + sioyek = callPackage ../applications/misc/sioyek { + inherit (libsForQt5) qmake qt3d qtbase wrapQtAppsHook; + }; siproxd = callPackage ../applications/networking/siproxd { }; From 07caa11af6b25384c412fc1073c978d0e9dd0fa1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Sep 2022 09:18:48 -0400 Subject: [PATCH 06/29] eww: 0.3.0 -> 0.4.0 --- pkgs/applications/window-managers/eww/Cargo.lock.patch | 8 +++----- pkgs/applications/window-managers/eww/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/eww/Cargo.lock.patch b/pkgs/applications/window-managers/eww/Cargo.lock.patch index 50241230bb42..571592b1d698 100644 --- a/pkgs/applications/window-managers/eww/Cargo.lock.patch +++ b/pkgs/applications/window-managers/eww/Cargo.lock.patch @@ -1,13 +1,11 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 9ae7ab9..c810728 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -403,7 +403,7 @@ dependencies = [ +@@ -406,7 +406,7 @@ dependencies = [ [[package]] name = "eww" --version = "0.2.0" -+version = "0.3.0" +-version = "0.3.0" ++version = "0.4.0" dependencies = [ "anyhow", "bincode", diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index fe914f5a9823..6420b79072f0 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "elkowar"; repo = pname; rev = "v${version}"; - sha256 = "055il2b3k8x6mrrjin6vkajpksc40phcp4j1iq0pi8v3j7zsfk1a"; + sha256 = "sha256-wzgWx3QxZvCAzRKLFmo/ru8hsIQsEDNeb4cPdlEyLxE="; }; - cargoSha256 = "sha256-3hGA730g8E4rwQ9V0wSLUcAEmockXi+spwp50cgf0Mw="; + cargoSha256 = "sha256-9RfYDF31wFYylhZv53PJpZofyCdMiUiH/nhRB2Ni/Is="; cargoPatches = [ ./Cargo.lock.patch ]; From 9c0d34c94094f1c5ac57ab29f8ba9e4d41c3da1f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Sep 2022 13:45:59 -0400 Subject: [PATCH 07/29] glitter: 1.6.1 -> 1.6.3 --- .../version-management/git-and-tools/glitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index ab40c77d44f5..e51791042b99 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1iBTuFhxgsOFO3GueIB0kqNfmLglzircnCY+AffFj9I="; + sha256 = "sha256-xrQqeRJfBEcjX0tkULg+94R7+mWWn6QeKIfZiDp+Vt8="; }; - cargoSha256 = "sha256-wY60B+3ndKL6IAaLmvbIcCxvq/Un/Sgzgedml6ouqFc="; + cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; # tests require it to be in a git repository preCheck = '' From a037a50b4696632977dadd61747b02492a109478 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 12:15:29 +0000 Subject: [PATCH 08/29] coq_8_16: 8.16+rc1 -> 8.16.0 --- pkgs/applications/science/logic/coq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 06d4a915c91d..f1ec27642fec 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -49,7 +49,7 @@ let "8.15.0".sha256 = "sha256:0q7jl3bn0d1v9cwdkxykw4frccww6wbh1p8hdrfqw489mkxmh5jh"; "8.15.1".sha256 = "sha256:1janvmnk3czimp0j5qmnfwx6509vhpjc2q7lcza1bc6dm6kn8n42"; "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; - "8.16+rc1".sha256 = "sha256-hmZQ6rFIOZJwnAh23nKScJ3Nn+xqDRn5q2Tn82igpYE="; + "8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From ecf58409a27826c8bf1de8c622705607633dba19 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 6 Sep 2022 15:32:13 +0200 Subject: [PATCH 09/29] grafana: 9.1.2 -> 9.1.3 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.3 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 98478e9f45eb..c37ab33e22ce 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.2"; + version = "9.1.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Xj9pbOmAqlEwxmEPfwC9Seoqh7HLXAhsa2ux7hIRgos="; + sha256 = "sha256-8qIGag0gl4BIuCYUA5T6cDqO4A/mbkQh/EyPyeYMLJg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0bnm4v5ca01lsbygv9zlmvhambyxvsvhw4wp1inr3svjqdf2l21v"; + sha256 = "sha256-L+MuDb5NIQfpMzUQARSEAihYipDhySH6HSKjAxiXskU="; }; - vendorSha256 = "sha256-6mf49PWp3htCDvXIQuc/mmqqFXFJcP8jDoDSQGi4rKc="; + vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; nativeBuildInputs = [ wire ]; From c91790e21ca75217d2e7efe8fe516ff14c4b3d1f Mon Sep 17 00:00:00 2001 From: Kenji Maillard Date: Tue, 6 Sep 2022 15:55:48 +0200 Subject: [PATCH 10/29] add attributes for metacoq subpackages --- pkgs/top-level/coq-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index e013bf7cd1bc..dbfc7bb1eddc 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -82,6 +82,10 @@ let mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; metacoq = callPackage ../development/coq-modules/metacoq { }; + metacoq-template-coq = self.metacoq.template-coq; + metacoq-pcuic = self.metacoq.pcuic; + metacoq-safechecker = self.metacoq.safechecker; + metacoq-erasure = self.metacoq.erasure; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; odd-order = callPackage ../development/coq-modules/odd-order { }; From ebb86f32b5b962e5096f1517dd4dbab14f21f026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 13:57:01 +0000 Subject: [PATCH 11/29] ghz: 0.109.0 -> 0.110.0 --- pkgs/tools/networking/ghz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/tools/networking/ghz/default.nix index ddbb33ceceed..db227c06c9db 100644 --- a/pkgs/tools/networking/ghz/default.nix +++ b/pkgs/tools/networking/ghz/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghz"; - version = "0.109.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "bojand"; repo = "ghz"; rev = "v${version}"; - sha256 = "sha256-5l2PeN+VxTaORAkmAfI9TCGd4W6y8BFs/eY4T9nYJuc="; + sha256 = "sha256-lAQGog45COrS2a5ZmFZEDERdZt24DnVSkPz49txqFmo="; }; - vendorSha256 = "sha256-qZD+qxjjFgyQDtjOQcilS4w2sS9I+7iCK2/ThaAJTy4="; + vendorSha256 = "sha256-VjrSUP0SwE5iOTevqIGlnSjH+TV4Ajx/PKuco9etkSc="; subPackages = [ "cmd/ghz" "cmd/ghz-web" ]; From 97ba09f0b5921859ecb1e71e5acb939ee951e41e Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 6 Sep 2022 15:49:51 -0400 Subject: [PATCH 12/29] zld: fix hash --- pkgs/development/tools/zld/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/development/tools/zld/default.nix index 69385c688ea7..95a642137f0b 100644 --- a/pkgs/development/tools/zld/default.nix +++ b/pkgs/development/tools/zld/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.4"; src = fetchzip { url = "https://github.com/michaeleisel/zld/releases/download/${version}/zld.zip"; - sha256 = "1rzdcrky0dl9n7niv39a5gc7q7rwl8jv6h77nvm6gwdymkjf2973"; + sha256 = "sha256-w1Pe96sdCbrfYdfBpD0BBXu7cFdW3cpo0PCn1+UyZI8="; }; installPhase = '' From faed8ef36e8942eb6f3127a5071e64896d53c60c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 7 Sep 2022 00:11:26 -0300 Subject: [PATCH 13/29] sioyek: mark as broken on Darwin Aarch64 --- pkgs/applications/misc/sioyek/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index bfa0fb1d5055..2dc82b55df7c 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isAarch64; }; }) From 510c7b9d7ff1c4939dca4f048f1f258d4deb7107 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Sep 2022 06:46:06 +0000 Subject: [PATCH 14/29] python310Packages.sqlmap: 1.6.8 -> 1.6.9 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index d3a8e39d48ea..595066b0de0c 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.8"; + version = "1.6.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OWIuYAms4SXQXVr0Wx8y7pne13IBclfq0P3VTy91Kz8="; + sha256 = "sha256-azAhpt6Qo/arTYeJSeQdBnqOmg2m7h+1pTsV30/pAOc="; }; postPatch = '' From 0277e56ed5cd301a6a98ba7517c3274babb4485a Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Tue, 6 Sep 2022 23:14:45 -0700 Subject: [PATCH 15/29] p4d: init at 2022.1.2305383 This package splits p4d, p4broker, and p4p out of the p4 package, because the actual CLI for Perforce is open-source and can be readily built from a source distribution. --- .../version-management/p4d/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/version-management/p4d/default.nix diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix new file mode 100644 index 000000000000..5b98131303d3 --- /dev/null +++ b/pkgs/applications/version-management/p4d/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, fetchurl +, lib +, autoPatchelfHook +}: + +let + # Upstream replaces minor versions, so use cached URLs. + srcs = { + "i686-linux" = fetchurl { + url = "https://web.archive.org/web/20220907001049/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86/helix-core-server.tgz"; + sha256 = "e9cf27c9dd2fa6432745058a93896d151543aff712fce9f7322152d6ea88a12a"; + }; + "x86_64-linux" = fetchurl { + url = "https://web.archive.org/web/20220907001202/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86_64/helix-core-server.tgz"; + sha256 = "9c272b67574264a4f49fe846ccda24fbd4baeb282665af74b6fbccff26a43558"; + }; + "x86_64-darwin" = fetchurl { + url = "https://web.archive.org/web/20220907001334/https://ftp.perforce.com/perforce/r22.1/bin.macosx1015x86_64/helix-core-server.tgz"; + sha256 = "2500a23fe482a303bd400f0de460b7624ad3f940fef45246004b9f956e90ea45"; + }; + }; +in +stdenv.mkDerivation { + pname = "p4d"; + version = "2022.1.2305383"; + + src = + assert lib.assertMsg (builtins.hasAttr stdenv.hostPlatform.system srcs) "p4d is not available for ${stdenv.hostPlatform.system}"; + srcs.${stdenv.hostPlatform.system}; + + sourceRoot = "."; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + dontBuild = true; + + installPhase = '' + install -D -t $out/bin p4broker p4d p4p + install -D -t $out/doc/p4d -m 0644 *.txt + ''; + + meta = with lib; { + description = "Perforce Helix Core Server"; + homepage = "https://www.perforce.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + mainProgram = "p4d"; + platforms = builtins.attrNames srcs; + maintainers = with maintainers; [ impl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e50949aef8b8..9c6aceb0dd31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29701,6 +29701,7 @@ with pkgs; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; p4 = callPackage ../applications/version-management/p4 { }; + p4d = callPackage ../applications/version-management/p4d { }; p4v = libsForQt515.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; From f9ad9aab790b8e21abef1a6d480714001f9346b8 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 6 Sep 2022 17:48:31 +0200 Subject: [PATCH 16/29] fftwMpi: add attribute for MPI-enabled fftw --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915e23056427..82ef2f44f512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18036,6 +18036,7 @@ with pkgs; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; + fftwMpi = fftw.override { enableMpi = true; }; filter-audio = callPackage ../development/libraries/filter-audio {}; From 3826784ae914eab98fc6b3ade6b50018b81db29d Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 7 Sep 2022 12:27:09 +0200 Subject: [PATCH 17/29] libvdwxc: init at 24.02.2020 libvdwxc: passthru mpi and do checks libvdwxc: formatting libvdwxc: fix evaluation --- .../science/chemistry/libvdwxc/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/science/chemistry/libvdwxc/default.nix diff --git a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix new file mode 100644 index 000000000000..f90cad4a099f --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitLab +, gfortran +, autoreconfHook +, fftwMpi +, mpi +}: + +stdenv.mkDerivation rec { + pname = "libvdwxc"; + # Stable version has non-working MPI detection. + version = "unstable-24.02.2020"; + + src = fetchFromGitLab { + owner = "libvdwxc"; + repo = pname; + rev = "92f4910c6ac88e111db2fb3a518089d0510c53b0"; + sha256 = "1c7pjrvifncbdyngs2bv185imxbcbq64nka8gshhp8n2ns6fids6"; + }; + + nativeBuildInputs = [ autoreconfHook gfortran ]; + + propagatedBuildInputs = [ mpi fftwMpi ]; + + preConfigure = '' + mkdir build && cd build + + export PATH=$PATH:${mpi}/bin + configureFlagsArray+=( + --with-mpi=${mpi} + CC=mpicc + FC=mpif90 + MPICC=mpicc + MPIFC=mpif90 + ) + ''; + + configureScript = "../configure"; + + hardeningDisable = [ "format" ]; + + doCheck = true; + + meta = with lib; { + description = "Portable C library of density functionals with van der Waals interactions for density functional theory"; + license = with licenses; [ lgpl3Plus bsd3 ]; + homepage = "https://libvdwxc.org/"; + platforms = platforms.unix; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ef2f44f512..de3255001acf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20226,6 +20226,8 @@ with pkgs; libvdpau = callPackage ../development/libraries/libvdpau { }; + libvdwxc = callPackage ../development/libraries/science/chemistry/libvdwxc { }; + libmodulemd = callPackage ../development/libraries/libmodulemd { }; libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; From bb1b2cf2f2a29f1e8632d253cb358a329574a454 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 6 Sep 2022 17:49:07 +0200 Subject: [PATCH 18/29] gpaw: init at 22.8.0 gpaw: use passthru fftw from libvdwxc gpaw: fixes --- .../python-modules/gpaw/SetupPath.patch | 18 +++ .../python-modules/gpaw/default.nix | 123 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 143 insertions(+) create mode 100644 pkgs/development/python-modules/gpaw/SetupPath.patch create mode 100644 pkgs/development/python-modules/gpaw/default.nix diff --git a/pkgs/development/python-modules/gpaw/SetupPath.patch b/pkgs/development/python-modules/gpaw/SetupPath.patch new file mode 100644 index 000000000000..e13389429f72 --- /dev/null +++ b/pkgs/development/python-modules/gpaw/SetupPath.patch @@ -0,0 +1,18 @@ +diff --git a/gpaw/__init__.py b/gpaw/__init__.py +index b5c029e13..518c16b13 100644 +--- a/gpaw/__init__.py ++++ b/gpaw/__init__.py +@@ -201,12 +201,7 @@ def initialize_data_paths(): + try: + setup_paths[:0] = os.environ['GPAW_SETUP_PATH'].split(os.pathsep) + except KeyError: +- if len(setup_paths) == 0: +- if os.pathsep == ';': +- setup_paths[:] = [r'C:\gpaw-setups'] +- else: +- setup_paths[:] = ['/usr/local/share/gpaw-setups', +- '/usr/share/gpaw-setups'] ++ setup_paths[:0] = ["@gpawSetupPath@"] + + + read_rc_file() diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix new file mode 100644 index 000000000000..5f6bc3f71dc3 --- /dev/null +++ b/pkgs/development/python-modules/gpaw/default.nix @@ -0,0 +1,123 @@ +{ buildPythonPackage +, lib +, fetchFromGitLab +, writeTextFile +, fetchurl +, blas +, lapack +, mpi +, scalapack +, libxc +, libvdwxc +, which +, ase +, numpy +, scipy +}: + +assert lib.asserts.assertMsg (!blas.isILP64) + "A 32 bit integer implementation of BLAS is required."; + +assert lib.asserts.assertMsg (!lapack.isILP64) + "A 32 bit integer implementation of LAPACK is required."; + +let + gpawConfig = writeTextFile { + name = "siteconfig.py"; + text = '' + # Compiler + compiler = 'gcc' + mpicompiler = '${mpi}/bin/mpicc' + mpilinker = '${mpi}/bin/mpicc' + + # BLAS + libraries += ['blas'] + library_dirs += ['${blas}/lib'] + + # FFTW + fftw = True + if fftw: + libraries += ['fftw3'] + + scalapack = True + if scalapack: + libraries += ['scalapack'] + + # LibXC + libxc = True + if libxc: + xc = '${libxc}/' + include_dirs += [xc + 'include'] + library_dirs += [xc + 'lib/'] + extra_link_args += ['-Wl,-rpath={xc}/lib'.format(xc=xc)] + if 'xc' not in libraries: + libraries.append('xc') + + # LibVDWXC + libvdwxc = True + if libvdwxc: + vdwxc = '${libvdwxc}/' + extra_link_args += ['-Wl,-rpath=%s/lib' % vdwxc] + library_dirs += ['%s/lib' % vdwxc] + include_dirs += ['%s/include' % vdwxc] + libraries += ['vdwxc'] + ''; + }; + + setupVersion = "0.9.20000"; + pawDataSets = fetchurl { + url = "https://wiki.fysik.dtu.dk/gpaw-files/gpaw-setups-${setupVersion}.tar.gz"; + sha256 = "07yldxnn38gky39fxyv3rfzag9p4lb0xfpzn15wy2h9aw4mnhwbc"; + }; + +in buildPythonPackage rec { + pname = "gpaw"; + version = "22.8.0"; + + src = fetchFromGitLab { + owner = "gpaw"; + repo = pname; + rev = version; + hash = "sha256-Kgf8yuGua7mcGP+jVVmbE8JCsbrfzewRTRt3ihq9YX4="; + }; + + nativeBuildInputs = [ which ]; + + buildInputs = [ blas scalapack libxc libvdwxc ]; + + propagatedBuildInputs = [ ase scipy numpy mpi ]; + + patches = [ ./SetupPath.patch ]; + + postPatch = '' + substituteInPlace gpaw/__init__.py \ + --subst-var-by gpawSetupPath "$out/share/gpaw/gpaw-setups-${setupVersion}" + ''; + + preConfigure = '' + unset CC + cp ${gpawConfig} siteconfig.py + ''; + + postInstall = '' + currDir=$(pwd) + mkdir -p $out/share/gpaw && cd $out/share/gpaw + cp ${pawDataSets} gpaw-setups.tar.gz + tar -xvf $out/share/gpaw/gpaw-setups.tar.gz + rm gpaw-setups.tar.gz + cd $currDir + ''; + + doCheck = false; # Requires MPI runtime to work in the sandbox + pythonImportsCheckHook = [ "gpaw" ]; + + passthru = { inherit mpi; }; + + meta = with lib; { + description = "Density functional theory and beyond within the projector-augmented wave method"; + homepage = "https://wiki.fysik.dtu.dk/gpaw/index.html"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03eb188e0730..34c13bd026df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3898,6 +3898,8 @@ in { gpapi = callPackage ../development/python-modules/gpapi { }; + gpaw = callPackage ../development/python-modules/gpaw { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; From ea3d9cc8cec22620444abc8baf39b64ee0f207cd Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Wed, 7 Sep 2022 12:46:48 +0100 Subject: [PATCH 19/29] zsh-powerlevel10k: add powerlevel9k.zsh-theme to install phase Signed-off-by: Robert Greener --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index cdda7d81f41d..4f5e21ec8cf7 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k + install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k install -D config/* --target-directory=$out/share/zsh-powerlevel10k/config install -D internal/* --target-directory=$out/share/zsh-powerlevel10k/internal cp -R gitstatus $out/share/zsh-powerlevel10k/gitstatus From d4b1bbb7d3dbbcd2af90b845686ea2282c704a7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Sep 2022 18:19:09 +0200 Subject: [PATCH 20/29] coccinelle: backport some useful patches --- .../tools/misc/coccinelle/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 66424e439684..6eca9b7f8fa9 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -25,6 +25,41 @@ stdenv.mkDerivation rec { url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch"; sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4="; }) + + # Fix attaching code before declarations. + # https://github.com/coccinelle/coccinelle/issues/282 + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/cd33db143416d820f547bf5869482cfcfc0ea9d0.patch"; + sha256 = "q7wbxbB9Ob0fSJwCjRtDPO3Xg4RO9yrQZG9G0/LGunI="; + }) + + # Fix attaching declaration metavariables. + # https://github.com/coccinelle/coccinelle/issues/281 + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/df71c5c0fe2a73c7358f73f45a550b57a7e30d85.patch"; + sha256 = "qrYfligJnXP7J5G/hfzyaKg9aFn74VExtc/Rs/DI2gc="; + }) + + # Support GLib’s autocleanup macros. + # https://github.com/coccinelle/coccinelle/issues/275 + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/6d5602aca8775c3c5c503939c3dcf0637649d09b.patch"; + sha256 = "NACf8joOOvN32H/sIfI+oqiT3289zXXQVVfXbRfbIe8="; + }) + + # Exit with non-zero status on failure. + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/6c0a855af14d41864e1e522b93dc39646a3b83c7.patch"; + sha256 = "6yfK8arB0GDW7o4cXsv0Y9TMvqgGf3/P1ebXrFFUC80="; + }) + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/5448bb2bd03491ffec356bf7bd6ddcdbf4d36bc9.patch"; + sha256 = "fyyxw2BNZUpyLBieIhOKeWbLFGP1tjULH70w/hU+jKw="; + }) + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/b8b1937657765e991195a10fcd7b8f7a300fc60b.patch"; + sha256 = "ergWJF6BKrhmJhx1aiVYDHztgjaQvaJ5iZRAmC9i22s="; + }) ]; nativeBuildInputs = with ocamlPackages; [ From 7d6b5d171adaf0a7d6808493629556d270c35c47 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 11:53:26 +0200 Subject: [PATCH 21/29] update-script-combinators: experimental init The sequence combinator will be useful for updating packages consisting of multiple sources. --- pkgs/common-updater/combinators.nix | 128 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 130 insertions(+) create mode 100644 pkgs/common-updater/combinators.nix diff --git a/pkgs/common-updater/combinators.nix b/pkgs/common-updater/combinators.nix new file mode 100644 index 000000000000..93fdac52f7c4 --- /dev/null +++ b/pkgs/common-updater/combinators.nix @@ -0,0 +1,128 @@ +{ lib +}: + +/* + This is a set of tools to manipulate update scripts as recognized by update.nix. + It is still very experimental with **instability** almost guaranteed so any use + outside Nixpkgs is discouraged. + + update.nix currently accepts the following type: + + type UpdateScript + // Simple path to script to execute script + = FilePath + // Path to execute plus arguments to pass it + | [ (FilePath | String) ] + // Advanced attribue set (experimental) + | { + // Script to execute (same as basic update script above) + command : (FilePath | [ (FilePath | String) ]) + // Features that the script supports + // - commit: (experimental) returns commit message in stdout + supportedFeatures : ?[ "commit" ] + // Override attribute path detected by update.nix + attrPath : ?String + } +*/ + +let + /* + type ShellArg = String | { __rawShell : String } + */ + + /* + Quotes all arguments to be safely passed to the Bourne shell. + + escapeShellArgs' : [ShellArg] -> String + */ + escapeShellArgs' = lib.concatMapStringsSep " " (arg: if arg ? __rawShell then arg.__rawShell else lib.escapeShellArg arg); + + /* + processArg : { maxArgIndex : Int, args : [ShellArg], paths : [FilePath] } → (String|FilePath) → { maxArgIndex : Int, args : [ShellArg], paths : [FilePath] } + Helper reducer function for building a command arguments where file paths are replaced with argv[x] reference. + */ + processArg = + { maxArgIndex, args, paths }: + arg: + if builtins.isPath arg then { + args = args ++ [ { __rawShell = "\"\$${builtins.toString maxArgIndex}\""; } ]; + maxArgIndex = maxArgIndex + 1; + paths = paths ++ [ arg ]; + } else { + args = args ++ [ arg ]; + inherit maxArgIndex paths; + }; + /* + extractPaths : Int → [ (String|FilePath) ] → { maxArgIndex : Int, args : [ShellArg], paths : [FilePath] } + Helper function that extracts file paths from command arguments and replaces them with argv[x] references. + */ + extractPaths = maxArgIndex: command: builtins.foldl' processArg { inherit maxArgIndex; args = [ ]; paths = [ ]; } command; + /* + processCommand : { maxArgIndex : Int, commands : [[ShellArg]], paths : [FilePath] } → [ (String|FilePath) ] → { maxArgIndex : Int, commands : [[ShellArg]], paths : [FilePath] } + Helper reducer function for extracting file paths from individual commands. + */ + processCommand = + { maxArgIndex, commands, paths }: + command: + let + new = extractPaths maxArgIndex command; + in + { + commands = commands ++ [ new.args ]; + paths = paths ++ new.paths; + maxArgIndex = new.maxArgIndex; + }; + /* + extractCommands : Int → [[ (String|FilePath) ]] → { maxArgIndex : Int, commands : [[ShellArg]], paths : [FilePath] } + Helper function for extracting file paths from a list of commands and replacing them with argv[x] references. + */ + extractCommands = maxArgIndex: commands: builtins.foldl' processCommand { inherit maxArgIndex; commands = [ ]; paths = [ ]; } commands; + + /* + commandsToShellInvocation : [[ (String|FilePath) ]] → [ (String|FilePath) ] + Converts a list of commands into a single command by turning them into a shell script and passing them to `sh -c`. + */ + commandsToShellInvocation = commands: + let + extracted = extractCommands 0 commands; + in + [ + "sh" + "-c" + (lib.concatMapStringsSep ";" escapeShellArgs' extracted.commands) + # We need paths as separate arguments so that update.nix can ensure they refer to the local directory + # rather than a store path. + ] ++ extracted.paths; +in +rec { + /* + normalize : UpdateScript → UpdateScript + EXPERIMENTAL! Converts a basic update script to the experimental attribute set form. + */ + normalize = updateScript: { + command = lib.toList (updateScript.command or updateScript); + supportedFeatures = updateScript.supportedFeatures or [ ]; + } // lib.optionalAttrs (updateScript ? attrPath) { + inherit (updateScript) attrPath; + }; + + /* + sequence : [UpdateScript] → UpdateScript + EXPERIMENTAL! Combines multiple update scripts to run in sequence. + */ + sequence = + scripts: + + let + scriptsNormalized = builtins.map normalize scripts; + in + let + scripts = scriptsNormalized; + validateFeatures = ({ supportedFeatures, ... }: supportedFeatures == [ ]); + in + + assert lib.assertMsg (lib.all validateFeatures scripts) "Combining update scripts with features enabled is currently unsupported."; + assert lib.assertMsg (builtins.length (lib.unique (builtins.map ({ attrPath ? null, ... }: attrPath) scripts)) == 1) "Combining update scripts with different attr paths is currently unsupported."; + + commandsToShellInvocation (builtins.map ({ command, ... }: command) scripts); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6db187b74fd5..00a1836c806f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -124,6 +124,8 @@ with pkgs; genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + update-script-combinators = callPackage ../common-updater/combinators.nix { }; + gitUpdater = callPackage ../common-updater/git-updater.nix { }; httpTwoLevelsUpdater = callPackage ../common-updater/http-two-levels-updater.nix { }; From 9137e671a2e2f5b46748ae21b21737b3f4194883 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 12:36:11 +0200 Subject: [PATCH 22/29] update-script-combinators.copyAttrOutputToFile: init Useful for storing generated files into Nixpkgs repo as a part of an update script to avoid a build time dependency. --- pkgs/common-updater/combinators.nix | 38 ++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/common-updater/combinators.nix b/pkgs/common-updater/combinators.nix index 93fdac52f7c4..d60a6e742715 100644 --- a/pkgs/common-updater/combinators.nix +++ b/pkgs/common-updater/combinators.nix @@ -19,7 +19,8 @@ command : (FilePath | [ (FilePath | String) ]) // Features that the script supports // - commit: (experimental) returns commit message in stdout - supportedFeatures : ?[ "commit" ] + // - silent: (experimental) returns no stdout + supportedFeatures : ?[ ("commit" | "silent") ] // Override attribute path detected by update.nix attrPath : ?String } @@ -118,11 +119,40 @@ rec { in let scripts = scriptsNormalized; - validateFeatures = ({ supportedFeatures, ... }: supportedFeatures == [ ]); + hasCommitSupport = lib.findSingle ({ supportedFeatures, ... }: supportedFeatures == [ "commit" ]) null null scripts != null; + validateFeatures = + if hasCommitSupport then + ({ supportedFeatures, ... }: supportedFeatures == [ "commit" ] || supportedFeatures == [ "silent" ]) + else + ({ supportedFeatures, ... }: supportedFeatures == [ ]); in - assert lib.assertMsg (lib.all validateFeatures scripts) "Combining update scripts with features enabled is currently unsupported."; + assert lib.assertMsg (lib.all validateFeatures scripts) "Combining update scripts with features enabled (other than a single script with “commit” and all other with “silent”) is currently unsupported."; assert lib.assertMsg (builtins.length (lib.unique (builtins.map ({ attrPath ? null, ... }: attrPath) scripts)) == 1) "Combining update scripts with different attr paths is currently unsupported."; - commandsToShellInvocation (builtins.map ({ command, ... }: command) scripts); + { + command = commandsToShellInvocation (builtins.map ({ command, ... }: command) scripts); + supportedFeatures = lib.optionals hasCommitSupport [ + "commit" + ]; + }; + + /* + copyAttrOutputToFile : String → FilePath → UpdateScript + EXPERIMENTAL! Simple update script that copies the output of Nix derivation built by `attr` to `path`. + */ + copyAttrOutputToFile = + attr: + path: + + { + command = [ + "sh" + "-c" + "cp --no-preserve=all \"$(nix-build -A ${attr})\" \"$0\" > /dev/null" + path + ]; + supportedFeatures = [ "silent" ]; + }; + } From 6262fa0b1724a32ffe07cf69e3b7284c8ea17ed2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:31 +0000 Subject: [PATCH 23/29] evolution-data-server: generate GSettings patch as part of update script This should avoid it getting out of sync again. --- .../core/evolution-data-server/default.nix | 45 ++- .../hardcode-gsettings.cocci | 76 +++++ .../hardcode-gsettings.patch | 315 ++++++++++-------- 3 files changed, 289 insertions(+), 147 deletions(-) create mode 100644 pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index f7c2fcee549e..ea4616a23306 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -2,8 +2,12 @@ , lib , fetchurl , substituteAll +, runCommand +, git +, coccinelle , pkg-config , gnome +, update-script-combinators , python3 , gobject-introspection , gettext @@ -63,7 +67,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -125,10 +129,41 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "evolution-data-server"; - versionPolicy = "odd-unstable"; - }; + # In order for GNOME not to depend on OCaml through Coccinelle, + # we materialize the SmPL patch into a unified diff-style patch. + hardcodeGsettingsPatch = + runCommand + "hardcode-gsettings.patch" + { + inherit src; + nativeBuildInputs = [ + git + coccinelle + python3 # For patch script + ]; + } + '' + unpackPhase + cd "''${sourceRoot:-.}" + git init + git add -A + spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place + git diff > "$out" + ''; + + updateScript = + let + updateSource = gnome.updateScript { + packageName = "evolution-data-server"; + versionPolicy = "odd-unstable"; + }; + + updateGsettingsPatch = update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + update-script-combinators.sequence [ + updateSource + updateGsettingsPatch + ]; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci new file mode 100644 index 000000000000..9e60e892b711 --- /dev/null +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci @@ -0,0 +1,76 @@ +/** + * Since Nix does not have a standard location like /usr/share, + * where GSettings system could look for schemas, we need to point the software to a correct location somehow. + * For executables, we handle this using wrappers but this is not an option for libraries like e-d-s. + * Instead, we hardcode the schema path when creating the settings. + */ + +@initialize:python@ +@@ + +cpp_constants = {} + +def register_cpp_constant(const_name, val): + cpp_constants[const_name] = val.strip() + +def resolve_cpp_constant(const_name): + return cpp_constants.get(const_name, const_name) + +e_s_d_schema_constants = [ + # The following are actually part of e-d-s, despite the name. + # We rename the old ambiguos constant name in ./prepare-for-gsettings-patching.patch + "\"org.gnome.Evolution.DefaultSources\"", + "\"org.gnome.evolution.shell.network-config\"", +] + +g_d_s_schema_constants = [ + "\"org.gnome.system.proxy\"", +] + +def get_schema_directory(schema_path): + # Sometimes the schema id is referenced using C preprocessor #define constant in the same file + # let’s try to resolve it first. + schema_path = resolve_cpp_constant(schema_path.strip()) + if schema_path.startswith("\"org.gnome.evolution-data-server") or schema_path in e_s_d_schema_constants: + return "\"@EDS_GSETTINGS_PATH@\"" + elif schema_path in g_d_s_schema_constants: + return "\"@GDS_GSETTINGS_PATH@\"" + raise Exception(f"Unknown schema path {schema_path}") + + +@find_cpp_constants@ +identifier const_name; +expression val; +@@ + +#define const_name val + +@script:python record_cpp_constants depends on find_cpp_constants@ +const_name << find_cpp_constants.const_name; +val << find_cpp_constants.val; +@@ + +register_cpp_constant(const_name, val) + + +@depends on ever record_cpp_constants || never record_cpp_constants@ +// We want to run after #define constants have been collected but even if there are no #defines. +expression SCHEMA_PATH; +expression settings; +// Coccinelle does not like autocleanup macros in + sections, +// let’s use fresh id with concatenation to produce the code as a string. +fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source"; +fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema"; +fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_PATH) { get_schema_directory(SCHEMA_PATH) }; +@@ +-settings = g_settings_new(SCHEMA_PATH); ++{ ++ schema_source_decl; ++ schema_decl; ++ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY, ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_PATH, FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++} diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 4e345c3cb3ca..c756b4bcc2ac 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -1,16 +1,16 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 2c0557c3c..5955aa55e 100644 +index 7888e69..c3b695c 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1989,7 +1989,20 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1983,7 +1983,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; - settings = g_settings_new (SELF_UID_PATH_ID); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -18,21 +18,19 @@ index 2c0557c3c..5955aa55e 100644 + SELF_UID_PATH_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2057,7 +2070,20 @@ e_book_client_set_self (EBookClient *client, +@@ -2051,7 +2062,18 @@ e_book_client_set_self (EBookClient *client, g_return_val_if_fail ( e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); - settings = g_settings_new (SELF_UID_PATH_ID); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -40,22 +38,20 @@ index 2c0557c3c..5955aa55e 100644 + SELF_UID_PATH_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2093,8 +2119,20 @@ e_book_client_is_self (EContact *contact) +@@ -2087,8 +2109,18 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); - if (!settings) - settings = g_settings_new (SELF_UID_PATH_ID); + if (!settings) { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -63,25 +59,23 @@ index 2c0557c3c..5955aa55e 100644 + SELF_UID_PATH_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } uid = g_settings_get_string (settings, SELF_UID_KEY); g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index 3396b57c0..ac6420b2e 100644 +index 8dfff6d..cd88392 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c -@@ -2594,7 +2594,20 @@ e_book_get_self (ESourceRegistry *registry, +@@ -2587,7 +2587,18 @@ e_book_get_self (ESourceRegistry *registry, return FALSE; } - settings = g_settings_new (SELF_UID_PATH_ID); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -89,21 +83,19 @@ index 3396b57c0..ac6420b2e 100644 + SELF_UID_PATH_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2649,7 +2662,20 @@ e_book_set_self (EBook *book, +@@ -2642,7 +2653,18 @@ e_book_set_self (EBook *book, g_return_val_if_fail (E_IS_BOOK (book), FALSE); g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); - settings = g_settings_new (SELF_UID_PATH_ID); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -111,21 +103,19 @@ index 3396b57c0..ac6420b2e 100644 + SELF_UID_PATH_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2677,7 +2703,20 @@ e_book_is_self (EContact *contact) +@@ -2670,7 +2692,18 @@ e_book_is_self (EContact *contact) g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); - settings = g_settings_new (SELF_UID_PATH_ID); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -133,25 +123,23 @@ index 3396b57c0..ac6420b2e 100644 + SELF_UID_PATH_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index de1716941..e83b104f1 100644 +index e696861..52af238 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1397,7 +1397,20 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); - cbc->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -159,25 +147,23 @@ index de1716941..e83b104f1 100644 + "org.gnome.evolution-data-server.calendar", + FALSE); + cbc->priv->settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } cbc->priv->notifyid = 0; cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index b08a7f301..a49fe39c5 100644 +index a24ede2..5d2a032 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2202,7 +2202,21 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2477,7 +2477,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) - watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_REMINDER_WATCHER, EReminderWatcherPrivate); + watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); - watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -186,25 +172,23 @@ index b08a7f301..a49fe39c5 100644 + FALSE); + watcher->priv->settings = g_settings_new_full(schema, NULL, + NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); - watcher->priv->default_zone = icaltimezone_copy (zone); + watcher->priv->default_zone = e_cal_util_copy_timezone (zone); watcher->priv->timers_enabled = TRUE; diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index dcdc3eed0..fd2e428c2 100644 +index 8013ba7..ba74769 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1635,7 +1635,20 @@ camel_cipher_can_load_photos (void) +@@ -1625,7 +1625,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -212,25 +196,23 @@ index dcdc3eed0..fd2e428c2 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } load_photos = g_settings_get_boolean (settings, "camel-cipher-load-photos"); g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 1b3362886..f0811b292 100644 +index 685d3ab..521d91f 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -573,7 +573,20 @@ gpg_ctx_get_executable_name (void) +@@ -571,7 +571,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -238,25 +220,72 @@ index 1b3362886..f0811b292 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } path = g_settings_get_string (settings, "camel-gpg-binary"); g_clear_object (&settings); +diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c +index e61160c..d17871a 100644 +--- a/src/camel/camel-utils.c ++++ b/src/camel/camel-utils.c +@@ -362,7 +362,19 @@ void + _camel_utils_initialize (void) + { + G_LOCK (mi_user_headers); +- mi_user_headers_settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ mi_user_headers_settings = g_settings_new_full(schema, NULL, ++ NULL); ++ } + g_signal_connect (mi_user_headers_settings, "changed::camel-message-info-user-headers", + G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); + G_UNLOCK (mi_user_headers); +diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c +index f535ad6..30130b9 100644 +--- a/src/camel/providers/smtp/camel-smtp-transport.c ++++ b/src/camel/providers/smtp/camel-smtp-transport.c +@@ -1458,7 +1458,18 @@ smtp_helo (CamelSmtpTransport *transport, + transport->authtypes = NULL; + } + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + name = g_settings_get_string (settings, "camel-smtp-helo-argument"); + g_clear_object (&settings); + diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c -index e0d8b87d6..3a4d5a359 100644 +index 188f276..7c4db94 100644 --- a/src/libedataserver/e-network-monitor.c +++ b/src/libedataserver/e-network-monitor.c -@@ -255,7 +255,20 @@ e_network_monitor_constructed (GObject *object) +@@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object) /* Chain up to parent's method. */ G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -264,25 +293,23 @@ index e0d8b87d6..3a4d5a359 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } g_settings_bind ( settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index f0c6f2cbf..0053e3ce6 100644 +index f9d9056..115d344 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c -@@ -69,7 +69,20 @@ eos_google_read_settings (EOAuth2Service *service, +@@ -70,7 +70,18 @@ eos_google_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -290,25 +317,47 @@ index f0c6f2cbf..0053e3ce6 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } value = g_settings_get_string (settings, key_name); g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 687c10d3b..684583c35 100644 +index 687c10d..ac1deae 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c -@@ -70,7 +70,20 @@ eos_outlook_read_settings (EOAuth2Service *service, +@@ -70,7 +70,18 @@ eos_outlook_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c +index 329a38c..f541393 100644 +--- a/src/libedataserver/e-oauth2-service-yahoo.c ++++ b/src/libedataserver/e-oauth2-service-yahoo.c +@@ -66,7 +66,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -316,25 +365,23 @@ index 687c10d3b..684583c35 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } value = g_settings_get_string (settings, key_name); g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 682673c16..436f52d5f 100644 +index 979095b..ecac6bb 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -95,7 +95,20 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -89,7 +89,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -342,26 +389,24 @@ index 682673c16..436f52d5f 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } values = g_settings_get_strv (settings, "oauth2-services-hint"); g_object_unref (settings); diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c -index 883379a60..989353494 100644 +index bcd07f9..17db26c 100644 --- a/src/libedataserver/e-proxy.c +++ b/src/libedataserver/e-proxy.c -@@ -969,8 +969,37 @@ e_proxy_init (EProxy *proxy) +@@ -957,8 +957,33 @@ e_proxy_init (EProxy *proxy) proxy->priv->type = PROXY_TYPE_SYSTEM; - proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); - proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -371,12 +416,10 @@ index 883379a60..989353494 100644 + proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, + NULL, + NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; + schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, @@ -386,25 +429,23 @@ index 883379a60..989353494 100644 + FALSE); + proxy->priv->proxy_settings = g_settings_new_full(schema, + NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index a5a30a3e1..5fbdf8190 100644 +index 837e940..4bbd00d 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1749,7 +1749,21 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1769,7 +1769,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); - registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -413,25 +454,23 @@ index a5a30a3e1..5fbdf8190 100644 + FALSE); + registry->priv->settings = g_settings_new_full(schema, NULL, + NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index f89cd4a5c..06cca9b5f 100644 +index d18474d..418ccc2 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1650,7 +1650,21 @@ static void +@@ -1874,7 +1874,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); - reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -440,25 +479,23 @@ index f89cd4a5c..06cca9b5f 100644 + FALSE); + reminders->priv->settings = g_settings_new_full(schema, NULL, + NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } reminders->priv->cancellable = g_cancellable_new (); reminders->priv->is_empty = TRUE; reminders->priv->is_mapped = FALSE; diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -index 6f03053d6..dffc186c7 100644 +index 6f03053..127c92e 100644 --- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -@@ -706,7 +706,20 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve +@@ -706,7 +706,18 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve gchar *autoconfig_directory; gint ii; - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -466,25 +503,23 @@ index 6f03053d6..dffc186c7 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -index d531cb9e2..c5b1c761c 100644 +index d531cb9..3d8807c 100644 --- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -@@ -61,7 +61,20 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) +@@ -61,7 +61,18 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) extension_name = E_SOURCE_EXTENSION_PROXY; extension = e_source_get_extension (source, extension_name); - settings = g_settings_new (NETWORK_CONFIG_SCHEMA_ID); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -492,25 +527,23 @@ index d531cb9e2..c5b1c761c 100644 + NETWORK_CONFIG_SCHEMA_ID, + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } switch (g_settings_get_int (settings, "proxy-type")) { case 1: diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c -index 1c0a11382..3e144845e 100644 +index 1c0a113..d26b059 100644 --- a/src/services/evolution-source-registry/evolution-source-registry.c +++ b/src/services/evolution-source-registry/evolution-source-registry.c -@@ -181,7 +181,20 @@ main (gint argc, +@@ -181,7 +181,18 @@ main (gint argc, reload: - settings = g_settings_new ("org.gnome.evolution-data-server"); + { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -518,8 +551,6 @@ index 1c0a11382..3e144845e 100644 + "org.gnome.evolution-data-server", + FALSE); + settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); + } if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) { From 258615beb660d52ed1aa2ef79e3971e8457f4030 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Sep 2022 12:54:20 +0000 Subject: [PATCH 24/29] dagger: 0.2.32 -> 0.2.33 --- .../tools/continuous-integration/dagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index cb12da46e97b..0b0b851e123f 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.32"; + version = "0.2.33"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-D/iCHXEwsJ4QbDem9+cCjljMTeZY7HDmyXEcPCKjNck="; + sha256 = "sha256-+NpoD6PwTd8s9cABnFApnnqrEb8UkhCxmj3FEE6sP9Q="; }; - vendorSha256 = "sha256-GsBeitFYkjwybyRmC0GfYWGs4rwbFz4o6RlmuJibQDY="; + vendorSha256 = "sha256-t/tYN+Zxj3rxzb9QTTuPyjc4hdl+UjwPs+evAXbAByg="; subPackages = [ "cmd/dagger" From 11c8f03ea397e408c7cc26f3d29e2c5bfd9cc5d9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Sep 2022 23:18:01 +1000 Subject: [PATCH 25/29] podman: 4.2.0 -> 4.2.1 https://github.com/containers/podman/releases/tag/v4.2.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 1e1263755b76..86fed9703428 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-crlOF8FoLlDulJJ8t8M1kk6JhSZdJU1VtR+G0O6VngM="; + sha256 = "sha256-e3MC7doAC2jpHWI+DX5+m+sbGxFpz7JDheGn+Yp7CF4="; }; vendorSha256 = null; From 720cf227e996cbbd2016ac4c93a79c8c143fa1a3 Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Wed, 7 Sep 2022 09:14:40 -0500 Subject: [PATCH 26/29] maintainers: add rb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7294ffcb8aff..5a4a41d21672 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15247,4 +15247,10 @@ fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; }]; }; + rb = { + email = "maintainers@cloudposse.com"; + github = "nitrocode"; + githubId = 7775707; + name = "RB"; + }; } From 9121f5b0f6be9179bbfaeb68fc0e37cd915b46fb Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Wed, 7 Sep 2022 09:16:09 -0500 Subject: [PATCH 27/29] atmos: init at 1.4.28 --- .../networking/cluster/atmos/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/cluster/atmos/default.nix diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix new file mode 100644 index 000000000000..1e4c86bec1e6 --- /dev/null +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "atmos"; + version = "1.4.28"; + + src = fetchFromGitHub { + owner = "cloudposse"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-AqW//+x1tKzm5dJirXCLFuDBTk3dHHw7c6vwsVsI37U"; + }; + + vendorSha256 = "sha256-bepv8Ns8vcpLpmO7fsRgGijB9B6kQ5HhxUhIuEpGtOY="; + + ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; + + preCheck = '' + # Remove tests that depend on a network connection. + rm -f pkg/vender/component_vendor_test.go + ''; + + doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/atmos version | grep "v${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://atmos.tools"; + changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}"; + description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; + license = licenses.asl20; + maintainers = with maintainers; [ rb ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d2f6ac66b91..14a8c62d68ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35184,6 +35184,8 @@ with pkgs; atlantis = callPackage ../applications/networking/cluster/atlantis { }; + atmos = callPackage ../applications/networking/cluster/atmos {}; + fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; auctex = callPackage ../tools/typesetting/tex/auctex { }; From 37102db7a3a1cea307b1e576c26e86819f639f8a Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 7 Sep 2022 18:08:35 +0200 Subject: [PATCH 28/29] vault-medusa: add onny as a maintainer (#190143) --- pkgs/tools/security/vault-medusa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/tools/security/vault-medusa/default.nix index 552fa90a4c14..f248890ad03b 100644 --- a/pkgs/tools/security/vault-medusa/default.nix +++ b/pkgs/tools/security/vault-medusa/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "A cli tool for importing and exporting Hashicorp Vault secrets"; homepage = "https://github.com/jonasvinther/medusa"; license = licenses.mit; - maintainers = with maintainers; [ "bpaulin" ]; + maintainers = with maintainers; [ onny ]; }; } From c9fdaef48f89dc74f2375f99e872c9ab92c79912 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 7 Sep 2022 18:11:17 +0200 Subject: [PATCH 29/29] oxipng: 6.0.0 -> 6.0.1 https://github.com/shssoichiro/oxipng/releases/tag/v6.0.1 --- pkgs/tools/graphics/oxipng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 007ca278475c..27268bead2aa 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "6.0.0"; + version = "6.0.1"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "sha256-iav1va1EbEj4qWSfe8bzFgdx1U3IeZV60LYk7vD1LoQ="; + sha256 = "sha256-YH4sIEOTPBbzsEMvHyphOsf12ZZRKsRPMlZ4emMMTrw="; }; - cargoSha256 = "sha256-e4uACIiHelCvLXPCZ4aMa59mX5xuhVFkk0MvS/1uk68="; + cargoSha256 = "sha256-c7uEb64epjzU3pmHRr69FoxFGCN+1WVMLm8LsBwQ50o="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;