From 4cd87f9ba96674cc5d3d25c4e08152eb214373d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 06:41:47 +0000 Subject: [PATCH 01/35] bcc: 0.30.0 -> 0.31.0 --- pkgs/by-name/bc/bcc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index ae8ab4fcaccb..50d812cd1d71 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -20,15 +20,15 @@ python3.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.30.0"; + version = "0.31.0"; disabled = !stdenv.isLinux; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; - rev = "v${version}"; - hash = "sha256-ngGLGfLv2prnjhgaRPf8ea3oyy4129zGodR0Yz1QtCw="; + rev = "refs/tags/v${version}"; + hash = "sha256-ludgmHFOyBu1CwUiaqczmNui0J8bUBAA5QGBiado8yw="; }; format = "other"; From 96790120dfd8633e10359bb193fea78d839e4fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Aug 2024 16:20:14 +0200 Subject: [PATCH 02/35] nixos/pam: fix writeFile no longer taking null as an argument warning > evaluation warning: pkgs.writeText "motd": The second argument should be a string, but it's a null instead, which is deprecated. Use `toString` to convert the value to a string first. --- nixos/modules/security/pam.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e74858f4ce85..4f891021a7de 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -866,7 +866,7 @@ let { name = "limits"; enable = cfg.limits != []; control = "required"; modulePath = "${package}/lib/security/pam_limits.so"; settings = { conf = "${makeLimitsConf cfg.limits}"; }; } - { name = "motd"; enable = cfg.showMotd && (config.users.motd != null || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = { + { name = "motd"; enable = cfg.showMotd && (config.users.motd != "" || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = { inherit motd; }; } { name = "apparmor"; enable = cfg.enableAppArmor && config.security.apparmor.enable; control = "optional"; modulePath = "${pkgs.apparmor-pam}/lib/security/pam_apparmor.so"; settings = { @@ -1478,9 +1478,9 @@ in ''; users.motd = mkOption { - default = null; + default = ""; example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178."; - type = types.nullOr types.lines; + type = types.lines; description = "Message of the day shown to users when they log in."; }; @@ -1498,7 +1498,7 @@ in config = { assertions = [ { - assertion = config.users.motd == null || config.users.motdFile == null; + assertion = config.users.motd == "" || config.users.motdFile == null; message = '' Only one of users.motd and users.motdFile can be set. ''; From b898495c9a00b3cd9966440dcf8d5db388529b92 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 9 Aug 2024 14:48:36 +0200 Subject: [PATCH 03/35] mpiCheckPhaseHook: update to use openmpi-5 compatible parameters --- .../setup-hooks/mpi-check-hook/mpi-check-hook.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh index fca1f7b7f932..41b6d864c8a5 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -33,10 +33,17 @@ setupMpiCheck() { case $mpiType in openmpi) - # make sure the test starts even if we have less than the requested amount of cores + # Note, that openmpi-5 switched to using PRRTE. + # Thus we need to set PRTE_MCA_* instead of OMPI_MCA_*. + # We keep the openmpi-4 parameters for backward compatability. + + # Make sure the test starts even if we have less than the requested amount of cores export OMPI_MCA_rmaps_base_oversubscribe=1 + export PRTE_MCA_rmaps_default_mapping_policy=node:oversubscribe + # Disable CPU pinning export OMPI_MCA_hwloc_base_binding_policy=none + export PRTE_MCA_hwloc_default_binding_policy=none ;; MPICH) # Fix to make mpich run in a sandbox From 954f1606a9c6836c1313966ff28bd78697f226c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 17:11:22 +0000 Subject: [PATCH 04/35] python312Packages.schwifty: 2024.6.1 -> 2024.8.1 --- pkgs/development/python-modules/schwifty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 6a3c7d25f9cf..793627bb3c61 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2024.6.1"; + version = "2024.8.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-32+YpDIXcgldwtxU5s9V6cong70EiyEgf9QCNYdEvp0="; + hash = "sha256-XWdB0yGYKxz2PJVNbXpNnsG/SaF3ysZn8JjrDn/rZ7w="; }; build-system = [ From d1241f14c3cbd23e34eebe4f2efa5ae6ff87baa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 18:27:49 +0000 Subject: [PATCH 05/35] auth0-cli: 1.4.0 -> 1.5.0 --- pkgs/tools/admin/auth0-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index 1328c478a7bb..3c3986231a79 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-j7HT57/4rrrVkx9Zz+XuWD6UL0spdej+U5gWtFo1FSI="; + hash = "sha256-C4zKWMrWGrnamlcugrOUUUdCUwYDgiD6XKdBQ3bBWFI="; }; - vendorHash = "sha256-bWAneCRsQbPRxEM/3jr1/Lov6NV67MRycOgrlj3bKF8="; + vendorHash = "sha256-VeH7EDMNrdJSWHioz2O29NiGtC59IdWYww3WoABO4LY="; ldflags = [ "-s" From 5bda38840918753e642a204e3de46de71aa0e9d7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 14 Aug 2024 16:18:05 +0200 Subject: [PATCH 06/35] pagefind: update time crate, unbreak --- pkgs/applications/misc/pagefind/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 7ee28983d2f5..66ebad25ec36 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -9,6 +9,7 @@ , rustc , wasm-bindgen-cli , wasm-pack +, fetchpatch }: let @@ -32,7 +33,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pcgcu9zylSTjj5rxNff+afFBWVpN5sGtlpadG1wb93M="; }; - cargoHash = "sha256-E4gjG5GrVWkMKgjQiAvEiSy2/tx/yHKe+5isveMZ9tU="; + cargoPatches = [ + (fetchpatch { # https://github.com/CloudCannon/pagefind/pull/680 + name = "cargo-update-time.patch"; + url = "https://github.com/CloudCannon/pagefind/commit/e6778572d225316803180db822f5cc12a936acd2.patch"; + hash = "sha256-XHpHA1hPIe+wjDQ6LE9hn2jn3eMBOK9Yoo920jfH9do="; + }) + ]; + + cargoHash = "sha256-KWWln7QCRo02cOgHy5JNERGS0CvvgsPISwkTZeeNEkg="; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; From f5fc444f56b46e33e7af6322d39a76d93e466c7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 15:47:49 +0000 Subject: [PATCH 07/35] python312Packages.saneyaml: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/saneyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 5fca7e223f6b..b9f98b3b2e08 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "saneyaml"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sjCfeDZiPNbbkyV067xD4/ZcdD52NReeZL7ssNFibkQ="; + hash = "sha256-Gc+9i/lNcwmYFix5D+XOyau1MAzFiQ/jfcbbyqj7Frs="; }; dontConfigure = true; From 1cc0966dbd0c4f053c9b8fef2c2deac5209d8777 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 15:52:28 +0000 Subject: [PATCH 08/35] python312Packages.pygmars: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/pygmars/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 7d250017b5d8..0418e9568904 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pygmars"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o="; + hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA="; }; postPatch = '' From ff5ec3eb342cdc43be2a6bff5bf414b0e8c88861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 14 Aug 2024 21:31:17 +0200 Subject: [PATCH 09/35] bubblewrap: 0.9.0 -> 0.10.0 Fixes CVE-2024-42472 Changelog: https://github.com/containers/bubblewrap/releases/tag/v0.10.0 --- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 2ec57721e419..d45e0043e21f 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-dfr6MiBdCHVscrS6XE0pT67q18NxrtqJliVbbQDFl5g="; + hash = "sha256-HYJoX7DnAwHCgxCzTYGJlc4RodbVP6hutK065AmGSl0="; }; postPatch = '' From d6898a6bda9fa2eceac47d1b6ce3e9dfa209e96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 14 Aug 2024 21:29:23 +0200 Subject: [PATCH 10/35] flatpak: 1.14.8 -> 1.14.10 Fixes CVE-2024-42472 Changelog: https://github.com/flatpak/flatpak/releases/tag/1.14.10 --- pkgs/by-name/fl/flatpak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 226ea755e184..1e33ff9e4a95 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.8"; + version = "1.14.10"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - hash = "sha256-EBa3Mn96+HiW+VRl9+WBN1DTtwSaN0ChpN3LX6jFNI4="; + hash = "sha256-a73HkIEnNQrYWkpH1wKSyi9MRul3sysf0jHCpxnYIc0="; }; patches = [ From b80ad4a5fba7efefa2cc25d230958b6b5974e505 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 14 Aug 2024 22:06:57 +0100 Subject: [PATCH 11/35] cargo-semver-checks: 0.33.0 -> 0.34.0 Diff: https://github.com/obi1kenobi/cargo-semver-checks/compare/v0.33.0...v0.34.0 Changelog: https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v0.34.0 --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index ee0376db72e5..3fc7becd37ed 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-E9jEZXD7nY90v35y4Wv1cUp2aoKzC7dR9bFOTI+2fqo="; + hash = "sha256-U7ykTLEuREe2GTVswcAw3R3h4zbkWxuI2dt/2689xSA="; }; - cargoHash = "sha256-1lHF8S0Xf5iOLQyARoYeWGGC9i68GVpk3EvSHo21Q2w="; + cargoHash = "sha256-NoxYHwY5XpRiqrOjQsaSWQCXFalNAS9SchaKwHbB2uU="; nativeBuildInputs = [ cmake From 12b70760b7086c28213f18318cbbc9631ebba034 Mon Sep 17 00:00:00 2001 From: Axel Svensson Date: Wed, 14 Aug 2024 18:20:41 +0200 Subject: [PATCH 12/35] pdf-sign: Fix program name in help text --- pkgs/by-name/pd/pdf-sign/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdf-sign/package.nix b/pkgs/by-name/pd/pdf-sign/package.nix index f226c2cb315f..ffa038690dcd 100644 --- a/pkgs/by-name/pd/pdf-sign/package.nix +++ b/pkgs/by-name/pd/pdf-sign/package.nix @@ -38,8 +38,11 @@ stdenv.mkDerivation { runHook preInstall for exe in "pdf-sign" "pdf-create-empty" "pdf-from-text"; do - install -Dm755 $exe -t $out/bin - wrapProgram $out/bin/$exe --prefix PATH : ${binPath} + # Install wrapped programs into $out/lib so that they are not renamed. + # Renaming them, like wrapProgram does, would produce the wrong output + # from `--help`. + install -Dm755 $exe -t $out/lib + makeWrapper $out/lib/$exe $out/bin/$exe --prefix PATH : ${binPath} done runHook postInstall From 9493665a54c08b5c4291f8a826f570e70d188ad9 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 14 Aug 2024 22:41:22 +0100 Subject: [PATCH 13/35] cargo-semver-checks: enable more tests --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 3fc7becd37ed..704ec34e654e 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -36,10 +36,6 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - # requires nightly version of cargo-rustdoc - "--skip=both_passing_manifest_path_and_directory_works" - "--skip=verify_binary_contains_lints" - # requires internet access "--skip=detects_target_dependencies" ]; From fcea203a7006402d7bb72fb20f380b6201444756 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 14 Aug 2024 22:41:22 +0100 Subject: [PATCH 14/35] =?UTF-8?q?cargo-semver-checks:=20don=E2=80=99t=20re?= =?UTF-8?q?quire=20Git=20for=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/rust/cargo-semver-checks/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 704ec34e654e..a219cbd41d1d 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -31,10 +31,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - nativeCheckInputs = [ - git - ]; - checkFlags = [ # requires internet access "--skip=detects_target_dependencies" @@ -42,7 +38,10 @@ rustPlatform.buildRustPackage rec { preCheck = '' patchShebangs scripts/regenerate_test_rustdocs.sh - git init + substituteInPlace scripts/regenerate_test_rustdocs.sh \ + --replace-fail \ + 'TOPLEVEL="$(git rev-parse --show-toplevel)"' \ + "TOPLEVEL=$PWD" scripts/regenerate_test_rustdocs.sh ''; From 8667992f72f1e0d787e7d13a4d58b3cde4e27e17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 00:53:21 +0000 Subject: [PATCH 15/35] tageditor: 3.9.1 -> 3.9.2 --- pkgs/applications/audio/tageditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 662d7a49a8a2..3fd4f9ecf6af 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-FX0wb6GVTB/Y0m6qmoMbaeXPf8bA3+JqbGE8PPS6vAA="; + hash = "sha256-Bmi1U/SmYENlwsysAHsgFODU7R1RnU3xqbwhPEwsGcM="; }; nativeBuildInputs = [ From 9dbe8e16c96c3f75f0ff7aa9bce14714d85e16fd Mon Sep 17 00:00:00 2001 From: urob <978080+urob@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:58:24 -0400 Subject: [PATCH 16/35] qemu_full: remove unavailable buildInputs ceph and glusterfs are only available for Linux platforms. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2031b4382b9..ff6d6bc17286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27112,7 +27112,11 @@ with pkgs; prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); - qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; }); + qemu_full = lowPrio (qemu.override { + smbdSupport = lib.meta.availableOn stdenv.hostPlatform samba; + cephSupport = lib.meta.availableOn stdenv.hostPlatform ceph; + glusterfsSupport = lib.meta.availableOn stdenv.hostPlatform glusterfs && lib.meta.availableOn stdenv.hostPlatform libuuid; + }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. From 068c11900fb264304d9020a0d36a767032845e83 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 2 Aug 2024 17:28:10 +1000 Subject: [PATCH 17/35] postgresqlPackages.postgis: enable tests --- pkgs/servers/sql/postgresql/ext/postgis.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index ee1669e5db18..a44643014b52 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -3,6 +3,7 @@ , perl , libxml2 , postgresql +, postgresqlTestHook , geos , proj , gdalMinimal @@ -11,6 +12,9 @@ , file , protobufc , libiconv +, libxslt +, docbook_xml_dtd_45 +, cunit , pcre2 , nixosTests , jitSupport @@ -36,10 +40,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm; dontDisableStatic = true; + nativeCheckInputs = [ postgresqlTestHook cunit libxslt ]; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + # postgis config directory assumes /include /lib from the same root for json-c library env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; - preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install" @@ -61,6 +69,15 @@ stdenv.mkDerivation rec { ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; + doCheck = stdenv.isLinux; + + preCheck = '' + substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" + substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ + --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" + substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + ''; + # create aliases for all commands adding version information postInstall = '' # Teardown the illusory postgres used for building; see postConfigure. From d3c9639c75b3261435ae7abbc992631e5c0dc9f7 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 15 Aug 2024 13:55:26 +1000 Subject: [PATCH 18/35] postgresqlPackages.postgis: nixfmt-rfc-style --- pkgs/servers/sql/postgresql/ext/postgis.nix | 80 ++++++++++++++------- 1 file changed, 53 insertions(+), 27 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index a44643014b52..170d451b81b0 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,24 +1,26 @@ -{ fetchurl -, lib, stdenv -, perl -, libxml2 -, postgresql -, postgresqlTestHook -, geos -, proj -, gdalMinimal -, json_c -, pkg-config -, file -, protobufc -, libiconv -, libxslt -, docbook_xml_dtd_45 -, cunit -, pcre2 -, nixosTests -, jitSupport -, llvm +{ + fetchurl, + lib, + stdenv, + perl, + libxml2, + postgresql, + postgresqlTestHook, + geos, + proj, + gdalMinimal, + json_c, + pkg-config, + file, + protobufc, + libiconv, + libxslt, + docbook_xml_dtd_45, + cunit, + pcre2, + nixosTests, + jitSupport, + llvm, }: let @@ -28,19 +30,37 @@ stdenv.mkDerivation rec { pname = "postgis"; version = "3.4.2"; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; }; - buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] - ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm; + buildInputs = [ + libxml2 + postgresql + geos + proj + gdal + json_c + protobufc + pcre2.dev + ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ + perl + pkg-config + ] ++ lib.optional jitSupport llvm; dontDisableStatic = true; - nativeCheckInputs = [ postgresqlTestHook cunit libxslt ]; + nativeCheckInputs = [ + postgresqlTestHook + cunit + libxslt + ]; postgresqlTestUserOptions = "LOGIN SUPERUSER"; failureHook = "postgresqlStop"; @@ -98,7 +118,13 @@ stdenv.mkDerivation rec { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + marcweber + wolfgangwalther + ]; inherit (postgresql.meta) platforms; }; } From 8dbaf1229e1f98ed6168280423dde5a353443f5a Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Wed, 14 Aug 2024 20:55:41 -0700 Subject: [PATCH 19/35] go-ethereum: 1.14.6 -> 1.14.8 Release notes: https://github.com/ethereum/go-ethereum/releases/tag/v1.14.8 Note that cmd/p2psim was removed in https://github.com/ethereum/go-ethereum/pull/30250 --- pkgs/by-name/go/go-ethereum/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index ec40f92fab37..fc8d252636cf 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.14.6"; + version = "1.14.8"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X9XwVZpRnkp7oVKwyvQbs8ZaWwLkuLEEHNfV5BvfVvI="; + sha256 = "sha256-y831v6ar1RdDvGQMZf2lZKgq2IQzAAQrNwDCL0xbj24="; }; proxyVendor = true; - vendorHash = "sha256-UP+bQM8ydfbILlVhuNPVIKLyXZFTzGmHizn2hYgNE4Y="; + vendorHash = "sha256-CLGf64Fftu4u8Vaj66Q4xuRKBEMNZmpltUyaUMVyVJk="; doCheck = false; @@ -41,7 +41,6 @@ in buildGoModule rec { "cmd/ethkey" "cmd/evm" "cmd/geth" - "cmd/p2psim" "cmd/rlpdump" "cmd/utils" ]; From b023a8a2f162b1b9aa1ee0eb6ba2200907f1b9b0 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 15 Aug 2024 13:56:01 +1000 Subject: [PATCH 20/35] postgresqlPackages.postgis: sha256 -> hash --- pkgs/servers/sql/postgresql/ext/postgis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 170d451b81b0..251d79ffe04a 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; + hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; }; buildInputs = [ From ec4876b18ec56339e9428327fa67d21cb065e1a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 07:55:08 +0200 Subject: [PATCH 21/35] python312Packages.pygmars: refactor --- .../python-modules/pygmars/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 0418e9568904..5536490860d1 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -5,31 +5,26 @@ pytestCheckHook, setuptools-scm, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pygmars"; version = "0.8.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "pygmars"; rev = "refs/tags/v${version}"; hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA="; }; - postPatch = '' - # https://github.com/nexB/pygmars/pull/9 - substituteInPlace setup.cfg \ - --replace ">=3.6.*" ">=3.6" - ''; - dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook ]; From e504dff21e106af8f2b5ca4ea38c3c6372b7f61d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 07:57:02 +0200 Subject: [PATCH 22/35] python312Packages.saneyaml: add changelog to meta --- pkgs/development/python-modules/saneyaml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index b9f98b3b2e08..761bde70f06b 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -6,6 +6,7 @@ pyyaml, pytestCheckHook, }: + buildPythonPackage rec { pname = "saneyaml"; version = "0.6.1"; @@ -29,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyYaml wrapper with sane behaviour to read and write readable YAML safely"; homepage = "https://github.com/nexB/saneyaml"; + changelog = "https://github.com/aboutcode-org/saneyaml/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = [ ]; }; From 8406a2dc5e28b4192ea029bd645cd79a7ec5b880 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 07:58:44 +0200 Subject: [PATCH 23/35] python312Packages.saneyaml: refactor --- pkgs/development/python-modules/saneyaml/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 761bde70f06b..1f27c46dd641 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -5,12 +5,16 @@ setuptools-scm, pyyaml, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "saneyaml"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -19,9 +23,9 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ pyyaml ]; + dependencies = [ pyyaml ]; nativeCheckInputs = [ pytestCheckHook ]; From f1826a4e6ddf004a9735c6b72f27bf381354cc5c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 14 Aug 2024 15:19:01 +0200 Subject: [PATCH 24/35] linux_testing: 6.11-rc2 -> 6.11-rc3 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b28f208bcf31..259b0c8035f7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.11-rc2", - "hash": "sha256:1ssw0cfzssczykg47gvvnpkzk2nvq3sl258nvxgypk3an1xc4xzs" + "version": "6.11-rc3", + "hash": "sha256:12434r4y6gwjykwbjzp2chqlkdvl8449a9mrhn3wlr6ixazfg9fm" }, "6.1": { "version": "6.1.104", From 21b168a5a637750f2464a4381270a1f5141af1f7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 14 Aug 2024 15:19:16 +0200 Subject: [PATCH 25/35] linux_6_6: 6.6.45 -> 6.6.46 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 259b0c8035f7..9b022fb15bcd 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal" }, "6.6": { - "version": "6.6.45", - "hash": "sha256:0ygiqh4zdg9ndqgyv9fiv4h0cgmgxa7ff28nkjas1r370wjfs6qj" + "version": "6.6.46", + "hash": "sha256:1wj5vn8dj0ln85n1xr5xi0hw35zpirm254fsxr6diiyrjqir6bq5" }, "6.8": { "version": "6.8.12", From 756c2a4b9e1e35d03498fddf13aa2edfc32a1e95 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 14 Aug 2024 15:19:24 +0200 Subject: [PATCH 26/35] linux_6_1: 6.1.104 -> 6.1.105 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9b022fb15bcd..a58367bb159b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:12434r4y6gwjykwbjzp2chqlkdvl8449a9mrhn3wlr6ixazfg9fm" }, "6.1": { - "version": "6.1.104", - "hash": "sha256:0xlrfm15c7cx1r3lndjgcwv29dyzr79wq09nbkhrf4r4j9j35yjw" + "version": "6.1.105", + "hash": "sha256:162yz32jqd2xkswsd1jxmjq4yhzmhzn17snicad35x51k3vaigr3" }, "5.15": { "version": "5.15.164", From ce206b83a51339784e9dd042d0f83c935b1b4f79 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 14 Aug 2024 16:05:01 +0200 Subject: [PATCH 27/35] linux_6_10: 6.10.4 -> 6.10.5 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a58367bb159b..90530408dc33 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.4", - "hash": "sha256:1y2m2pqrvsgr9ng72nnh4yvsprkvkznhnmn4p8g78350bzyrvip2" + "version": "6.10.5", + "hash": "sha256:02yckkh6sxvcrwzbqgmw4jhqhxmbvz87xn9wm6bwwka3w2r9x41h" } } From bf404fe6a660fe63bae144cc12cffc08fe826b79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 01:35:20 +0000 Subject: [PATCH 28/35] papeer: 0.8.1 -> 0.8.2 --- pkgs/tools/text/papeer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/papeer/default.nix b/pkgs/tools/text/papeer/default.nix index b8cbc477b174..aba9b64bfab8 100644 --- a/pkgs/tools/text/papeer/default.nix +++ b/pkgs/tools/text/papeer/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "papeer"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lapwat"; repo = pname; rev = "v${version}"; - hash = "sha256-nEt2rxI9slrEkbpMpXQM6+jO0QWQsuLdOswXPCSozJs="; + hash = "sha256-wUlvv7kXDr33tJuaMm+V68qQZMWEHyXPBkwRKQhqthY="; }; vendorHash = "sha256-3QRSdkx9p0H+zPB//bpWCBKKjKjrx0lHMk5lFm+U7pA="; From a4a8833b50252d7c08e7b898524ce2c414b33cd2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 15 Aug 2024 10:47:02 +0200 Subject: [PATCH 29/35] open-webui: 0.3.12 -> 0.3.13 Diff: https://github.com/open-webui/open-webui/compare/v0.3.12..v0.3.13 Changelog: https://github.com/open-webui/open-webui/releases/tag/v0.3.13 --- pkgs/by-name/op/open-webui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index bb38012268ab..813468f367ef 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-Ot8QsRgRbe0l37C9KGlREDCjq5nTTvcJ1TJaeBe2oxw="; + hash = "sha256-7OGUlyBvxX/wra4GYnhmSni/7xloCXUKEu0xa2bbn2A="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-fr+IA6I1pE+vJ+uGE1sf2++s65rPzK//ZL+xT3QoLOA="; + npmDepsHash = "sha256-hQOpkbw8RDATnORh8Z1ziUhBcXb5xVplVOvueC/3RwA="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From 591f4f2bf5bc28df0463bf83426a0f2bb0390eb4 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 15 Aug 2024 05:45:39 +0200 Subject: [PATCH 30/35] shapelib: 1.6.0 - 1.6.1 --- pkgs/development/libraries/shapelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 27a3b7f5ee30..f61012840e9d 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "shapelib"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://download.osgeo.org/shapelib/shapelib-${version}.tar.gz"; - sha256 = "sha256-GVKLJDdyQXBWNzIMNnlDAxrVCIZl0fsOHqpSpxJkpsQ="; + sha256 = "sha256-XakKYOJUQPEI9OjpVzK/qD7eE8jgwrz4CuQQBsyOvCA="; }; doCheck = true; From bdf14f104b7c5016c8b251aa6bfcfcb9263337ac Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 15 Aug 2024 05:48:27 +0200 Subject: [PATCH 31/35] shapelib: move to by-name --- .../shapelib/default.nix => by-name/sh/shapelib/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/shapelib/default.nix => by-name/sh/shapelib/package.nix} (100%) diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/by-name/sh/shapelib/package.nix similarity index 100% rename from pkgs/development/libraries/shapelib/default.nix rename to pkgs/by-name/sh/shapelib/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff6d6bc17286..3f36bfcb38e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23689,8 +23689,6 @@ with pkgs; }; csfml = callPackage ../development/libraries/csfml { }; - shapelib = callPackage ../development/libraries/shapelib { }; - sharness = callPackage ../development/libraries/sharness { }; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; From 04331f0eabafb987cdf64a731f53757c78774f7c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 15 Aug 2024 09:06:57 +0100 Subject: [PATCH 32/35] shapelib: add meta.changelog --- pkgs/by-name/sh/shapelib/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sh/shapelib/package.nix b/pkgs/by-name/sh/shapelib/package.nix index f61012840e9d..8bcf103d8403 100644 --- a/pkgs/by-name/sh/shapelib/package.nix +++ b/pkgs/by-name/sh/shapelib/package.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ]; + changelog = "http://shapelib.maptools.org/release.html"; }; } From b4a09f1f9d1599478afadffa782a02690550447c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Aug 2024 09:59:49 +0200 Subject: [PATCH 33/35] pipewire: disable ldac when unavailable ldacbt only supports little endian platforms. This was mistakenly made unconditional when the ldacbtSupport option was removed. (It used to check availability in its default value.) Fixes: 3cf28607c140 ("pipewire: remove superfluous args") --- pkgs/development/libraries/pipewire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d9ddee2b1022..27b5eff1f1ae 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation(finalAttrs: { # source code is not easily obtainable (lib.mesonEnable "bluez5-codec-lc3plus" false) (lib.mesonEnable "bluez5-codec-lc3" true) - (lib.mesonEnable "bluez5-codec-ldac" true) + (lib.mesonEnable "bluez5-codec-ldac" (lib.meta.availableOn stdenv.hostPlatform ldacbt)) (lib.mesonEnable "opus" true) (lib.mesonOption "sysconfdir" "/etc") (lib.mesonEnable "raop" raopSupport) From 0fe845338e71bbc7d18fbce98e73a7db863f87f1 Mon Sep 17 00:00:00 2001 From: Cabia Rangris Date: Thu, 8 Aug 2024 07:30:36 +0400 Subject: [PATCH 34/35] pythonPackages.senf: init at 1.5.0 Co-authored-by: OTABI Tomoya --- .../python-modules/senf/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/senf/default.nix diff --git a/pkgs/development/python-modules/senf/default.nix b/pkgs/development/python-modules/senf/default.nix new file mode 100644 index 000000000000..14ed23d06933 --- /dev/null +++ b/pkgs/development/python-modules/senf/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + hypothesis, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "senf"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kFlFEOqYVBM47YWmwUOPuiCqoqSW+I3y0tNlSFZjjNE="; + }; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + disabledTests = [ + # Both don't work even with HOME specified... + "test_getuserdir" + "test_expanduser_user" + ]; + + pythonImportsCheck = [ "senf" ]; + + meta = with lib; { + description = "Consistent filename handling for all Python versions and platforms"; + homepage = "https://senf.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ cab404 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b0200329f87..d0625948c0b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14228,6 +14228,8 @@ self: super: with self; { sendgrid = callPackage ../development/python-modules/sendgrid { }; + senf = callPackage ../development/python-modules/senf { }; + sense-energy = callPackage ../development/python-modules/sense-energy { }; sensirion-ble = callPackage ../development/python-modules/sensirion-ble { }; From 199d21a8330f681f71436014375ea9cd5b0dc6e9 Mon Sep 17 00:00:00 2001 From: Cabia Rangris Date: Thu, 8 Aug 2024 07:39:16 +0400 Subject: [PATCH 35/35] quodlibet: 4.6.0 -> 4.6.0-unstable-2024-08-08 --- pkgs/applications/audio/quodlibet/default.nix | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index d93b69c645ce..a47b01b8cf58 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, tag ? "", # build time @@ -46,9 +45,9 @@ xvfb-run, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "quodlibet${tag}"; - version = "4.6.0"; + version = "4.6.0-unstable-2024-08-08"; pyproject = true; outputs = [ @@ -59,24 +58,11 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "quodlibet"; repo = "quodlibet"; - rev = "refs/tags/release-${version}"; - hash = "sha256-dkO/CFN7Dk72xhtmcSDcwUciOPMeEjQS2mch+jSfiII="; + rev = "3dcf31dfc8db9806d1f73a47fdabc950d35ded1d"; + hash = "sha256-8qWuxTvMF6ksDkbZ6wRLPCJK1cSqgGMPac/ht6qVpnA="; }; - patches = [ - (fetchpatch { - name = "python-3.12-startup.patch"; - url = "https://patch-diff.githubusercontent.com/raw/quodlibet/quodlibet/pull/4358.patch"; - hash = "sha256-3IjtAX2mKO/Xi/iTwT5WBD5CMTRYFED7XMm/cx+29Zc="; - }) - (fetchpatch { - name = "more-python-3.12-fixes.patch"; - url = "https://patch-diff.githubusercontent.com/raw/quodlibet/quodlibet/pull/4364.patch"; - hash = "sha256-VRIQ+4e+X0kjZYuxV2wEjrFr+x5biwBtIR50K6hSfCY="; - excludes = [ "poetry.lock" ]; - }) - ./fix-gdist-python-3.12.patch - ]; + patches = [ ./fix-gdist-python-3.12.patch ]; build-system = [ python3.pkgs.setuptools ];