From b4e2028211a7de1b3dd2806073e0a706fc96111a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 5 Oct 2024 15:16:59 +0200 Subject: [PATCH 01/26] apko: fix go tests --- pkgs/development/tools/apko/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 879d88cf0a92..ab67eb3e252d 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -41,10 +41,15 @@ buildGoModule rec { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - checkFlags = [ - # fails to run on read-only filesystem - "-skip=(TestPublish|TestBuild|TestTarFS)" - ]; + preCheck = '' + # some tests require a writable HOME + export HOME=$(mktemp -d) + + # some test data include SOURCE_DATE_EPOCH (which is different from our default) + # and the default version info which we get by unsetting our ldflags + export SOURCE_DATE_EPOCH=0 + ldflags= + ''; postInstall = '' installShellCompletion --cmd apko \ From 8c31c4e46032f81e57dac8b0df8790f9a971d74b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 5 Oct 2024 15:18:03 +0200 Subject: [PATCH 02/26] apko: add emilylange as maintainer --- pkgs/development/tools/apko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index ab67eb3e252d..257d6b3c354e 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -74,6 +74,6 @@ buildGoModule rec { description = "Build OCI images using APK directly without Dockerfile"; mainProgram = "apko"; license = licenses.asl20; - maintainers = with maintainers; [ jk developer-guy ]; + maintainers = with maintainers; [ jk developer-guy emilylange ]; }; } From d4ecdb36b525fdddebeb84de270e482476e3acd9 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 5 Oct 2024 15:22:27 +0200 Subject: [PATCH 03/26] apko: 0.14.1 -> 0.19.1 https://github.com/chainguard-dev/apko/releases/tag/v0.19.1 https://github.com/chainguard-dev/apko/releases/tag/v0.19.0 https://github.com/chainguard-dev/apko/releases/tag/v0.18.1 https://github.com/chainguard-dev/apko/releases/tag/v0.18.0 https://github.com/chainguard-dev/apko/releases/tag/v0.17.0 https://github.com/chainguard-dev/apko/releases/tag/v0.16.0 https://github.com/chainguard-dev/apko/releases/tag/v0.15.0 https://github.com/chainguard-dev/apko/releases/tag/v0.14.9 https://github.com/chainguard-dev/apko/releases/tag/v0.14.8 https://github.com/chainguard-dev/apko/releases/tag/v0.14.7 https://github.com/chainguard-dev/apko/releases/tag/v0.14.6 https://github.com/chainguard-dev/apko/releases/tag/v0.14.5 https://github.com/chainguard-dev/apko/releases/tag/v0.14.4 https://github.com/chainguard-dev/apko/releases/tag/v0.14.3 https://github.com/chainguard-dev/apko/releases/tag/v0.14.2 diff: https://github.com/chainguard-dev/apko/compare/v0.14.1...v0.19.1 --- pkgs/development/tools/apko/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 257d6b3c354e..6248c08360df 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.14.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-O1lU3b3dNmFcV0Dfkpw63Eu6AgLSLBi7MbF47OsjgL4="; + hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-shnVJ6TcqWxUu1Ib2ewaz2VK4mi1Rt3R0Cmof9ilDJ4="; + vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,11 @@ buildGoModule rec { ldflags= ''; + checkFlags = [ + # requires networking (apk.chainreg.biz) + "-skip=TestInitDB_ChainguardDiscovery" + ]; + postInstall = '' installShellCompletion --cmd apko \ --bash <($out/bin/apko completion bash) \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eef9ab339bd0..c0cea2a24f21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -283,7 +283,9 @@ with pkgs; fission = callPackage ../development/tools/fission { }; - apko = callPackage ../development/tools/apko { }; + apko = callPackage ../development/tools/apko { + buildGoModule = buildGo123Module; + }; melange = callPackage ../development/tools/melange { }; From dd09921858285d0e345de0d6aefd86237387adf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 11:31:18 +0000 Subject: [PATCH 04/26] grafana: 11.2.1 -> 11.2.2 --- pkgs/servers/monitoring/grafana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 89b7cec1023d..ed9c621f4139 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "grafana"; - version = "11.2.1"; + version = "11.2.2"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-rMRzrGdTPfGzMtE3xej5dSOjyyEMn66oPjDUWifMjnQ="; + hash = "sha256-rELvOqKVf/Dmh38fxvvFzNM9zRQF9J8OyidXJvuubzs="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 From 7caca24a1f47098e4e643705d1729c93889a0d8c Mon Sep 17 00:00:00 2001 From: Solomon Victorino Date: Tue, 8 Oct 2024 10:06:26 -0600 Subject: [PATCH 05/26] liboqs: 0.10.1 -> 0.11.0 --- pkgs/by-name/li/liboqs/fix-openssl-detection.patch | 13 ++++++------- pkgs/by-name/li/liboqs/package.nix | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/liboqs/fix-openssl-detection.patch b/pkgs/by-name/li/liboqs/fix-openssl-detection.patch index 33be7188370f..ea90a5d98685 100644 --- a/pkgs/by-name/li/liboqs/fix-openssl-detection.patch +++ b/pkgs/by-name/li/liboqs/fix-openssl-detection.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR forcibly to "/usr" breaks this. --- - CMakeLists.txt | 11 ----------- - 1 file changed, 11 deletions(-) + CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 288bcbe8..9750fae6 100644 +index 0564bc8e..7b4c7f47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) +@@ -144,15 +144,6 @@ include(.CMake/compiler_opts.cmake) include(.CMake/alg_support.cmake) if(${OQS_USE_OPENSSL}) @@ -24,13 +24,12 @@ index 288bcbe8..9750fae6 100644 - elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") - set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") - endif() -- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") -- set(OPENSSL_ROOT_DIR "/usr") - endif() - endif() find_package(OpenSSL 1.1.1 REQUIRED) - endif() + if(OQS_DLOPEN_OPENSSL) + -- 2.42.0 diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index 36d9d042ca4e..5da88f18169a 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE="; + hash = "sha256-+Gx1JPrJoeMix9DIF0rJQTivxN1lgaCIYFvJ1pnYZzM="; }; patches = [ From 8f9743465ab4597f3324c75367a1a120c7116f4e Mon Sep 17 00:00:00 2001 From: Solomon Victorino Date: Tue, 8 Oct 2024 10:10:17 -0600 Subject: [PATCH 06/26] oqs-provider: 0.6.1 -> 0.7.0 --- pkgs/by-name/oq/oqs-provider/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix index 84ffce3f8f5c..17f73913fcfb 100644 --- a/pkgs/by-name/oq/oqs-provider/package.nix +++ b/pkgs/by-name/oq/oqs-provider/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { name = "oqs-provider"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "oqs-provider"; rev = finalAttrs.version; - hash = "sha256-AW0rOszXm9Hy55b2fQ2mpZulhXjYwvztwL6DIFgIzjA="; + hash = "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg="; }; nativeBuildInputs = [ From 01a26436848d9d142fb2d8cda39649f96c94a6bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Oct 2024 23:51:52 +0000 Subject: [PATCH 07/26] python312Packages.spark-parser: 1.8.9 -> 1.9.0 --- pkgs/development/python-modules/spark-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spark-parser/default.nix b/pkgs/development/python-modules/spark-parser/default.nix index f82b7df76342..46eea5136304 100644 --- a/pkgs/development/python-modules/spark-parser/default.nix +++ b/pkgs/development/python-modules/spark-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spark-parser"; - version = "1.8.9"; + version = "1.9.0"; format = "setuptools"; src = fetchPypi { pname = "spark_parser"; inherit version; - sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; + sha256 = "sha256-3GbUjEJlxBM9tBqcX+nBxQKzsgFn3xWKDyNM0xcSz2Q="; }; propagatedBuildInputs = [ click ]; From a83079b36e060b3a2412a26172a111b332a8bfd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 09:23:22 +0000 Subject: [PATCH 08/26] palemoon-bin: 33.3.1 -> 33.4.0 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index e6bb9e887c4f..d9a668add99f 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.3.1"; + version = "33.4.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-auo45tzMY6bKahSEmUrkcYnz7v+GFbsrG+ePAKRC00U="; + hash = "sha256-XHp0ebgVqv1Va0hN9kczfPtped7JOLZP62ryMjmLjrc="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-7qrT5fSfwcEAkbq8g/HRoUiDv5+qrzpiysjHTdZVgLc="; + hash = "sha256-UXkr6oE1hS/ftXK1TPv3DZW/hubqJS/TEedE6i/6J+Y="; }; }; From 36f6b0fd271e06dd0eba5ee1e04b093abb31fd4f Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 9 Oct 2024 19:28:26 +0200 Subject: [PATCH 09/26] bakelite: unstable-2022-02-12 -> unstable-2023-03-30 --- .../default.nix => by-name/ba/bakelite/package.nix} | 12 ++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/{tools/backup/bakelite/default.nix => by-name/ba/bakelite/package.nix} (80%) diff --git a/pkgs/tools/backup/bakelite/default.nix b/pkgs/by-name/ba/bakelite/package.nix similarity index 80% rename from pkgs/tools/backup/bakelite/default.nix rename to pkgs/by-name/ba/bakelite/package.nix index d9505562768a..7eb87f2b5a33 100644 --- a/pkgs/tools/backup/bakelite/default.nix +++ b/pkgs/by-name/ba/bakelite/package.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "bakelite"; - version = "unstable-2022-02-12"; + version = "unstable-2023-03-30"; src = fetchFromGitHub { owner = "richfelker"; repo = pname; - rev = "373901734d114e42aa385e6a7843745674e4ca08"; - hash = "sha256-HBnYlUyTkvPTbdsZD02yCq5C7yXOHYK4l4mDRUkcN5I="; + rev = "65d69e88e0972d1493ebbd9bf9d1bfde36272636"; + hash = "sha256-OjBw9aYD2h7BWYgQzZp03hGCyQcRgmm2AjrcT/QrQAo="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11c6eeb65b4f..da1b879af9c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -313,8 +313,6 @@ with pkgs; beeper = callPackage ../applications/networking/instant-messengers/beeper { }; - bakelite = callPackage ../tools/backup/bakelite { }; - bearer = callPackage ../development/tools/bearer { }; benthos = callPackage ../development/tools/benthos { }; From 3d30811d4edeeeee1740a07b21a41f4f257dd5a1 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 10 Oct 2024 07:12:28 +0200 Subject: [PATCH 10/26] nixos/gerrit: Apply initial hardening using the systemd unit These options are a good start for sandboxing the service. It's planned to set `ProtectSystem` to `strict` instead of `full`, but that requires specific directories to be configured as writable. It's also planned to filter system calls. However, that requires more testing but it shouldn't prevent us from applying these options for now and add others later. Signed-off-by: Felix Singer --- nixos/modules/services/web-apps/gerrit.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix index 573c9d0d7dbb..acb2dfeeff54 100644 --- a/nixos/modules/services/web-apps/gerrit.nix +++ b/nixos/modules/services/web-apps/gerrit.nix @@ -222,6 +222,27 @@ in StandardOutput = "journal"; StateDirectory = "gerrit"; WorkingDirectory = "%S/gerrit"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "full"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = 027; }; }; }; From b3f73a7470b60834aff6d6b8c3a4f346d4d69e5d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 10 Oct 2024 15:33:56 +0200 Subject: [PATCH 11/26] palemoon-bin: 33.4.0 -> 33.4.0.1 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index d9a668add99f..7f70a49e1a06 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.4.0"; + version = "33.4.0.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-XHp0ebgVqv1Va0hN9kczfPtped7JOLZP62ryMjmLjrc="; + hash = "sha256-34x9L0L42KO7mUDaW41I71ln5xyHGAKBoAJ6HcDC//g="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-UXkr6oE1hS/ftXK1TPv3DZW/hubqJS/TEedE6i/6J+Y="; + hash = "sha256-TRIgfqKsJxueZ/Oazw7kTLjVyxdh+IUiR+XDaemow9A="; }; }; From 974456db38e639741f2b07f90c56cc417d9f6507 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Thu, 10 Oct 2024 20:45:07 +0200 Subject: [PATCH 12/26] vscodium: 1.94.1 -> 1.94.2 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index deeb78ce03e8..0bff53ccf31a 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hq2w9rc54qy6234njx6xfh3m1p3d206lr22sdxxa3snnrh4vrs8"; - x86_64-darwin = "0knkn4i6vvszxqzsv9564bbassqgszr8bfa4l7hsqy25ki37k5ln"; - aarch64-linux = "1k9qvymc7yfq8ihlbx8676gsjyfhg41acc5p4lrw9ci0a3sqanz9"; - aarch64-darwin = "029sdf0h9fcviv6qdphzlgb1qhy24vj79h465mf559gdih21xlp4"; - armv7l-linux = "16lwgagg2i6mwqm3p2z97di571wgl2hj255pnxqhcz6x9vq26l8p"; + x86_64-linux = "0xbnyi6g5a12bip1vh2b5ap5108gwxa9g9g3ncllllz3ak2jim5r"; + x86_64-darwin = "0linvibppgjr4dwsrjpqd126m8izq757cnwkr0w4bv81k30j1jv6"; + aarch64-linux = "1324p9av9vx8ywz55vdls53b34jp6csnqbm0y94v5azxjvwcr3kj"; + aarch64-darwin = "160mwlz17fb0xq935ih35h8bd7dn7gmvy5szra0jdr754xcgn5z5"; + armv7l-linux = "07dln5mgrhn0569m77rj30443hgk1z7z8xi442lh5y8ib729q10y"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.94.1.24283"; + version = "1.94.2.24284"; pname = "vscodium"; executableName = "codium"; From e14483d6a67399485876ab51c9726dbd2eb0836a Mon Sep 17 00:00:00 2001 From: MithicSpirit Date: Thu, 3 Oct 2024 21:28:24 -0400 Subject: [PATCH 13/26] formats.ini: disable merging as list by default Previously, setting listsAsDuplicateKeys or listToValue would make it so merging these treat all values as lists, by coercing non-lists via lib.singleton. Some programs (such as gamemode; see #345121), allow some values to be repeated but not others, which can lead to unexpected behavior when non-list values are merged like this rather than throwing an error. This now makes that behavior opt-in via the mergeAsList option. Setting mergeAsList (to either true or false) without setting either listsAsDuplicateKeys or listToValue is an error, since lists are meaningless in this case. --- .../manual/release-notes/rl-2411.section.md | 5 + pkgs/pkgs-lib/formats.nix | 38 +++-- pkgs/pkgs-lib/tests/formats.nix | 137 ++++++++++++++++++ 3 files changed, 171 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e802470e7a04..01b09aee1578 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -566,6 +566,11 @@ - The `rustic` package was upgrade to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0). +- `pkgs.formats.ini` and `pkgs.formats.iniWithGlobalSection` with + `listsAsDuplicateKeys` or `listToValue` no longer merge non-list values into + lists by default. Backwards-compatible behavior can be enabled with + `atomsCoercedToLists`. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index c99144d93519..03663ad96b97 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -109,18 +109,21 @@ rec { singleIniAtom = nullOr (oneOf [ bool int float str ]) // { description = "INI atom (null, bool, int, float or string)"; }; - iniAtom = { listsAsDuplicateKeys, listToValue }: + iniAtom = { listsAsDuplicateKeys, listToValue, atomsCoercedToLists }: + let + singleIniAtomOr = if atomsCoercedToLists then coercedTo singleIniAtom lib.singleton else either singleIniAtom; + in if listsAsDuplicateKeys then - coercedTo singleIniAtom lib.singleton (listOf singleIniAtom) // { + singleIniAtomOr (listOf singleIniAtom) // { description = singleIniAtom.description + " or a list of them for duplicate keys"; } else if listToValue != null then - coercedTo singleIniAtom lib.singleton (nonEmptyListOf singleIniAtom) // { + singleIniAtomOr (nonEmptyListOf singleIniAtom) // { description = singleIniAtom.description + " or a non-empty list of them"; } else singleIniAtom; - iniSection = { listsAsDuplicateKeys, listToValue }@args: + iniSection = { listsAsDuplicateKeys, listToValue, atomsCoercedToLists }@args: attrsOf (iniAtom args) // { description = "section of an INI file (attrs of " + (iniAtom args).description + ")"; }; @@ -133,18 +136,26 @@ rec { # Alternative to listsAsDuplicateKeys, converts list to non-list # listToValue :: [IniAtom] -> IniAtom listToValue ? null, + # Merge multiple instances of the same key into a list + atomsCoercedToLists ? null, ... }@args: assert listsAsDuplicateKeys -> listToValue == null; + assert atomsCoercedToLists != null -> (listsAsDuplicateKeys || listToValue != null); + let + atomsCoercedToLists' = if atomsCoercedToLists == null then false else atomsCoercedToLists; + in { - type = lib.types.attrsOf (iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }); + type = lib.types.attrsOf ( + iniSection { inherit listsAsDuplicateKeys listToValue; atomsCoercedToLists = atomsCoercedToLists'; } + ); generate = name: value: lib.pipe value [ (lib.mapAttrs (_: maybeToList listToValue)) - (lib.generators.toINI (removeAttrs args ["listToValue"])) + (lib.generators.toINI (removeAttrs args ["listToValue" "atomsCoercedToLists"])) (pkgs.writeText name) ]; }; @@ -155,26 +166,34 @@ rec { # Alternative to listsAsDuplicateKeys, converts list to non-list # listToValue :: [IniAtom] -> IniAtom listToValue ? null, + # Merge multiple instances of the same key into a list + atomsCoercedToLists ? null, ... }@args: assert listsAsDuplicateKeys -> listToValue == null; + assert atomsCoercedToLists != null -> (listsAsDuplicateKeys || listToValue != null); + let + atomsCoercedToLists' = if atomsCoercedToLists == null then false else atomsCoercedToLists; + in { type = lib.types.submodule { options = { sections = lib.mkOption rec { - type = lib.types.attrsOf (iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }); + type = lib.types.attrsOf ( + iniSection { inherit listsAsDuplicateKeys listToValue; atomsCoercedToLists = atomsCoercedToLists'; } + ); default = {}; description = type.description; }; globalSection = lib.mkOption rec { - type = iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }; + type = iniSection { inherit listsAsDuplicateKeys listToValue; atomsCoercedToLists = atomsCoercedToLists'; }; default = {}; description = "global " + type.description; }; }; }; generate = name: { sections ? {}, globalSection ? {}, ... }: - pkgs.writeText name (lib.generators.toINIWithGlobalSection (removeAttrs args ["listToValue"]) + pkgs.writeText name (lib.generators.toINIWithGlobalSection (removeAttrs args ["listToValue" "atomsCoercedToLists"]) { globalSection = maybeToList listToValue globalSection; sections = lib.mapAttrs (_: maybeToList listToValue) sections; @@ -186,6 +205,7 @@ rec { atom = iniAtom { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = null; + atomsCoercedToLists = false; }; in attrsOf (attrsOf (either atom (attrsOf atom))); diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 86a35c6bf26d..5f6f3b93e280 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -222,6 +222,67 @@ in runBuildTests { ''; }; + iniCoercedDuplicateKeys = shouldPass rec { + format = formats.ini { + listsAsDuplicateKeys = true; + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniCoercedDuplicateKeys"; + value = { foo = { bar = 1; }; }; + } + { + file = "format-test-inner-iniCoercedDuplicateKeys"; + value = { foo = { bar = 2; }; }; + } + ]; + expected = '' + [foo] + bar=1 + bar=2 + ''; + }; + + iniCoercedListToValue = shouldPass rec { + format = formats.ini { + listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault { }); + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniCoercedListToValue"; + value = { foo = { bar = 1; }; }; + } + { + file = "format-test-inner-iniCoercedListToValue"; + value = { foo = { bar = 2; }; }; + } + ]; + expected = '' + [foo] + bar=1, 2 + ''; + }; + + iniCoercedNoLists = shouldFail { + format = formats.ini { atomsCoercedToLists = true; }; + input = { + foo = { + bar = 1; + }; + }; + }; + + iniNoCoercedNoLists = shouldFail { + format = formats.ini { atomsCoercedToLists = false; }; + input = { + foo = { + bar = 1; + }; + }; + }; + iniWithGlobalNoSections = shouldPass { format = formats.iniWithGlobalSection {}; input = {}; @@ -317,6 +378,82 @@ in runBuildTests { ''; }; + iniWithGlobalCoercedDuplicateKeys = shouldPass rec { + format = formats.iniWithGlobalSection { + listsAsDuplicateKeys = true; + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniWithGlobalCoercedDuplicateKeys"; + value = { + globalSection = { baz = 4; }; + sections = { foo = { bar = 1; }; }; + }; + } + { + file = "format-test-inner-iniWithGlobalCoercedDuplicateKeys"; + value = { + globalSection = { baz = 3; }; + sections = { foo = { bar = 2; }; }; + }; + } + ]; + expected = '' + baz=3 + baz=4 + + [foo] + bar=2 + bar=1 + ''; + }; + + iniWithGlobalCoercedListToValue = shouldPass rec { + format = formats.iniWithGlobalSection { + listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault { }); + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniWithGlobalCoercedListToValue"; + value = { + globalSection = { baz = 4; }; + sections = { foo = { bar = 1; }; }; + }; + } + { + file = "format-test-inner-iniWithGlobalCoercedListToValue"; + value = { + globalSection = { baz = 3; }; + sections = { foo = { bar = 2; }; }; + }; + } + ]; + expected = '' + baz=3, 4 + + [foo] + bar=2, 1 + ''; + }; + + iniWithGlobalCoercedNoLists = shouldFail { + format = formats.iniWithGlobalSection { atomsCoercedToLists = true; }; + input = { + globalSection = { baz = 4; }; + foo = { bar = 1; }; + }; + }; + + iniWithGlobalNoCoercedNoLists = shouldFail { + format = formats.iniWithGlobalSection { atomsCoercedToLists = false; }; + input = { + globalSection = { baz = 4; }; + foo = { bar = 1; }; + }; + }; + keyValueAtoms = shouldPass { format = formats.keyValue {}; input = { From 43505186a4f9d7740edc640d7542e7e0775ac46a Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 10 Oct 2024 20:55:02 +0800 Subject: [PATCH 14/26] remove patch from go-task build file --- pkgs/development/tools/go-task/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 09cb7e2a7462..4a122d634874 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , installShellFiles , testers , go-task @@ -20,16 +19,6 @@ buildGoModule rec { vendorHash = "sha256-P9J69WJ2C2xgdU9xydiaY8iSKB7ZfexLNYi7dyHDTIk="; - patches = [ - # fix version resolution when passed in though ldflags - # remove on next release - (fetchpatch { - name = "fix-ldflags-version.patch"; - url = "https://github.com/go-task/task/commit/9ee4f21d62382714ac829df6f9bbf1637406eb5b.patch?full_index=1"; - hash = "sha256-wu5//aZ/vzuObb03AjUUlVFjPr175mn1vVAZgqSGIZ0="; - }) - ]; - doCheck = false; nativeBuildInputs = [ installShellFiles ]; From 129d2c22a0ba81b131f4a7622c77b67cddb51a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 06:21:57 +0000 Subject: [PATCH 15/26] open-vm-tools: 12.4.5 -> 12.5.0 --- pkgs/by-name/op/open-vm-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix index d660cd64bb34..ac340b7a87c5 100644 --- a/pkgs/by-name/op/open-vm-tools/package.nix +++ b/pkgs/by-name/op/open-vm-tools/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.4.5"; + version = "12.5.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${finalAttrs.version}"; - hash = "sha256-VMnxWKGBgwnkP9eSVm///d6THzzWgUe5kNj/lGVBVlc="; + hash = "sha256-pjMXhVN4xdmPCk1Aeb83VZjDJ1t1mb9wryC6h3O+Qvc="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; From e200fd6810c558a188f0a668efc12953d89ce663 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 09:24:57 +0200 Subject: [PATCH 16/26] python312Packages.sentence-transformers: 3.1.1 -> 3.2.0 Diff: https://github.com/UKPLab/sentence-transformers/compare/refs/tags/v3.1.1...v3.2.0 Changelog: https://github.com/UKPLab/sentence-transformers/releases/tag/3.2.0 --- .../python-modules/sentence-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index b9cf305a8d65..c70ea216cd42 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-YtAgv0vH2aL7UX3ETVfwDEQYEWYo5Pj/R45CeH7T3BU="; + hash = "sha256-T9y+usEOqz53Wv5gObD5o3gAlABHM3apoq/ySD5ynVg="; }; build-system = [ setuptools ]; From 0c5277bc9fe065ceba8983989a9a2fb5af5997a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 08:51:36 +0000 Subject: [PATCH 17/26] ytdownloader: 3.18.2 -> 3.18.3 --- pkgs/by-name/yt/ytdownloader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index 190c8e9f96f1..43265c6bd348 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.18.2"; + version = "3.18.3"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-j6FeRqAeqXLofvI5R7nOwfg6wd17Xk85vryktGfnxyI="; + hash = "sha256-omq1krlHj0+SvyofQtJnVBiQzHPIC/v/WhXGClm0vzM="; }; - npmDepsHash = "sha256-LUlpyzHJDpjytZmMjjn899NKwvb80a0DXdMhVT2aRTY="; + npmDepsHash = "sha256-PE9RWdnUlHTCBqGN6xvq+B7gXke/KsKsGcg1SAy7bfs="; nativeBuildInputs = [ copyDesktopItems From a9fc9e87d8389fd5c688de7419444043dcc0c2c9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:17:33 +0200 Subject: [PATCH 18/26] coeurl: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/coeurl/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 580cd488c9fd..d2cba732fa20 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , ninja , pkg-config , meson @@ -12,31 +11,15 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; + hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE="; }; - patches = [ - # Fix compatibility issues with curl > 7.85, see: - # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a - # PATCH CAN BE REMOVED AFTER 0.3.0 - (fetchpatch { - url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch"; - hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY="; - }) - # Fix error when building with fmt >= 10, see: - # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc - # PATCH CAN BE REMOVED AFTER 0.3.0 - (fetchpatch { - url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch"; - hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w="; - }) - ]; postPatch = '' substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' ''; From 9ed27f014e73590ccaf87e8c0f573c27f0dd1e62 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:28:10 +0200 Subject: [PATCH 19/26] coeurl: move to by-name and reformat --- .../co/coeurl/package.nix} | 31 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 20 insertions(+), 13 deletions(-) rename pkgs/{development/libraries/coeurl/default.nix => by-name/co/coeurl/package.nix} (73%) diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/by-name/co/coeurl/package.nix similarity index 73% rename from pkgs/development/libraries/coeurl/default.nix rename to pkgs/by-name/co/coeurl/package.nix index d2cba732fa20..b3a24e910bda 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/by-name/co/coeurl/package.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitLab -, ninja -, pkg-config -, meson -, libevent -, curl -, spdlog +{ + lib, + stdenv, + fetchFromGitLab, + ninja, + pkg-config, + meson, + libevent, + curl, + spdlog, }: stdenv.mkDerivation rec { @@ -24,9 +25,17 @@ stdenv.mkDerivation rec { substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' ''; - nativeBuildInputs = [ ninja pkg-config meson ]; + nativeBuildInputs = [ + ninja + pkg-config + meson + ]; - buildInputs = [ libevent curl spdlog ]; + buildInputs = [ + libevent + curl + spdlog + ]; meta = with lib; { description = "Simple async wrapper around CURL for C++"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e9c8fc17a4..1bec0857df1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19180,8 +19180,6 @@ with pkgs; protobuf = protobuf_21; }; - coeurl = callPackage ../development/libraries/coeurl { }; - coercer = callPackage ../tools/security/coercer { }; cogl = callPackage ../development/libraries/cogl { From f69e61221fcd13d49df3e6b7a07c803c05dae098 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:50:26 +0200 Subject: [PATCH 20/26] nheko: add rnhmjoj as maintainer --- .../networking/instant-messengers/nheko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 041a3949d92d..b60d68f2bc12 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; mainProgram = "nheko"; - maintainers = with maintainers; [ ekleog fpletz ]; + maintainers = with maintainers; [ ekleog fpletz rnhmjoj ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 From 9f6acaec62a15e80ed9806227a555455068bbd1d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:51:04 +0200 Subject: [PATCH 21/26] mtxclient: add rnhmjoj as maintainer --- pkgs/development/libraries/mtxclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index dff005d9eb1b..35d0f55675fe 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Client API library for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; - maintainers = with maintainers; [ fpletz pstn ]; + maintainers = with maintainers; [ fpletz pstn rnhmjoj ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 From 1b016ab476fe6e07bdfe35c58153b1c28cb0845a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:56:46 +0200 Subject: [PATCH 22/26] mtxclient: move to by-name and reformat --- .../mt/mtxclient/package.nix} | 33 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 insertions(+), 16 deletions(-) rename pkgs/{development/libraries/mtxclient/default.nix => by-name/mt/mtxclient/package.nix} (83%) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/by-name/mt/mtxclient/package.nix similarity index 83% rename from pkgs/development/libraries/mtxclient/default.nix rename to pkgs/by-name/mt/mtxclient/package.nix index 35d0f55675fe..2d47a07b2645 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/by-name/mt/mtxclient/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, coeurl -, curl -, libevent -, nlohmann_json -, olm -, openssl -, re2 -, spdlog +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + coeurl, + curl, + libevent, + nlohmann_json, + olm, + openssl, + re2, + spdlog, }: stdenv.mkDerivation rec { @@ -56,7 +57,11 @@ stdenv.mkDerivation rec { description = "Client API library for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; - maintainers = with maintainers; [ fpletz pstn rnhmjoj ]; + maintainers = with maintainers; [ + fpletz + pstn + rnhmjoj + ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bec0857df1a..c6ccf48da478 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22160,8 +22160,6 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { }; - mu = callPackage ../tools/networking/mu { }; mueval = callPackage ../development/tools/haskell/mueval { }; From 4312e5a93c75524c8f8bfe57eb74bbb25f5aaab8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 15:10:18 +0200 Subject: [PATCH 23/26] nheko: move to by-name and reformat --- .../nh/nheko/package.nix} | 118 +++++++++--------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 59 insertions(+), 61 deletions(-) rename pkgs/{applications/networking/instant-messengers/nheko/default.nix => by-name/nh/nheko/package.nix} (51%) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/by-name/nh/nheko/package.nix similarity index 51% rename from pkgs/applications/networking/instant-messengers/nheko/default.nix rename to pkgs/by-name/nh/nheko/package.nix index b60d68f2bc12..2e1bf3126d75 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -1,32 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, asciidoc -, pkg-config -, boost179 -, cmark -, coeurl -, curl -, kdsingleapplication -, libevent -, libsecret -, lmdb -, lmdbxx -, mtxclient -, nlohmann_json -, olm -, qtbase -, qtimageformats -, qtkeychain -, qtmultimedia -, qttools -, qtwayland -, re2 -, spdlog -, wrapQtAppsHook -, gst_all_1 -, libnice +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + asciidoc, + pkg-config, + boost179, + cmark, + coeurl, + curl, + kdsingleapplication, + libevent, + libsecret, + lmdb, + lmdbxx, + mtxclient, + nlohmann_json, + olm, + re2, + spdlog, + gst_all_1, + libnice, + qt6Packages, }: stdenv.mkDerivation rec { @@ -45,37 +40,38 @@ stdenv.mkDerivation rec { cmake lmdbxx pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - boost179 - cmark - coeurl - curl - kdsingleapplication - libevent - libsecret - lmdb - mtxclient - nlohmann_json - olm - qtbase - qtimageformats - qtkeychain - qtmultimedia - qttools - qtwayland - re2 - spdlog - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt6Support = true; }) - gst-plugins-bad - libnice - ]); + buildInputs = + [ + boost179 + cmark + coeurl + curl + kdsingleapplication + libevent + libsecret + lmdb + mtxclient + nlohmann_json + olm + qt6Packages.qtbase + qt6Packages.qtimageformats + qt6Packages.qtkeychain + qt6Packages.qtmultimedia + qt6Packages.qttools + qt6Packages.qtwayland + re2 + spdlog + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt6Support = true; }) + gst-plugins-bad + libnice + ]); cmakeFlags = [ "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 @@ -91,7 +87,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; mainProgram = "nheko"; - maintainers = with maintainers; [ ekleog fpletz rnhmjoj ]; + maintainers = with maintainers; [ + ekleog + fpletz + rnhmjoj + ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ccf48da478..0524c9849c44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31589,8 +31589,6 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; - notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; From 16ef825fa8d6d890d4926869f7a14711032136b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 12:51:37 +0000 Subject: [PATCH 24/26] python312Packages.unstructured: 0.15.13 -> 0.15.14 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index dc0b24644733..6625de40c87c 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.15.13"; + version = "0.15.14"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-DbOuNh+p+4vsEO6AQUeMq25RTLm5Zn9FyzcTKJedbTM="; + hash = "sha256-cIMKaSKG4T832rpiJeiwftqVrcMezD9ICfislGPV/TQ="; }; propagatedBuildInputs = [ From a864db9f7b84e83f377075de834de4b20278da91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 11:32:28 +0000 Subject: [PATCH 25/26] p2pool: 4.1 -> 4.1.1 --- pkgs/applications/misc/p2pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index b8ca97d298ac..49a3c1cdca56 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY="; + hash = "sha256-rxsKbrgDdVtGEv63SHi3FbFpqU2j6ESksq0SDm78j+0="; fetchSubmodules = true; }; From 5ed32376554485e583ad964998cf4295abcf3d5b Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 11 Oct 2024 11:15:31 -0500 Subject: [PATCH 26/26] Revert "kops: 1.29.2 -> 1.30.1 (#344817)" This reverts commit cb710f366bd5f1dd369e112615c4f00ee2a636d5. --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 8832c697944e..fd19982b9502 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_29 = mkKops rec { - version = "1.30.1"; - sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; + version = "1.29.2"; + sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ="; rev = "v${version}"; };