From 0eb9d1c9c23c893748641b88a9df9d569c644c4f Mon Sep 17 00:00:00 2001 From: catvayor Date: Tue, 10 Jun 2025 16:32:09 +0200 Subject: [PATCH 1/3] fix(patches): adapt kanidm patch to nixpkgs upgrade --- patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch b/patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch index b558080..1938927 100644 --- a/patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch +++ b/patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch @@ -93,14 +93,12 @@ diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kani index 63d7e85ba8a8..5ebd69cb91ee 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix -@@ -14,6 +14,10 @@ rustPlatform.buildRustPackage rec { - hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI="; +@@ -18,4 +18,8 @@ rustPlatform.buildRustPackage rec { + hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw="; }; + patches = [ + ./01-memberless.patch + ]; + - postPatch = '' - tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml - ''; + useFetchCargoVendor = true; From f137ff5e0329d20f2a02df72bee40f62e9ce3a2e Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 13:00:27 +0000 Subject: [PATCH 2/3] lon: update nixos-25.05 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 70c74b02eac4 → 88331c17ba434359491e8d5889cce872464052c2 Last 50 commits: cbd2361 lomiri.lomiri-content-hub: 2.0.0 -> 2.1.0 0b041bb discord: allow not disabling updates f1dd86b linuxKernel.kernels.linux_zen: 6.14.7-zen1 -> 6.14.9-zen1 6f4cf13 linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 -> 6.14.9-lqx1 d68067a openterface-qt: 0.3.12 -> 0.3.14 6c2a0db google-cloud-sdk: 2nd fix for pyopenssl e6349fb [release-25.05] rke2_1_29: mark as vulnerable due to EOL e9f574a firefly-iii: 6.2.10 -> 6.2.16 55ea961 knot-dns: 3.4.6 -> 3.4.7 2f0990c samba: 4.20.4 -> 4.20.8 8565f96 openvswitch: 3.5.0 -> 3.5.1 a29b809 webkitgtk_6_0: 2.48.2 → 2.48.3 4d97194 google-cloud-sdk: docu 5106751 homebank: 5.9.1 -> 5.9.2 2344702 mozhi: init at 0-unstable-2025-04-14 03981db zipline: 4.1.1 -> 4.1.2 73e167b [Backport release-25.05] zipline: 4.1.1 -> 4.1.2 (#414569) 77b2b4b mbedtls_2: 2.28.9 -> 2.28.10 6879530 headscale: patch /machine/map endpoint vulnerability ae6bd2e [Backport release-25.05] knot-dns: 3.4.6 -> 3.4.7 (#414141) cf0b95b [Backport release-25.05] firefly-iii: 6.2.10 -> 6.2.16 (#414136) 63921b2 [Backport release-25.05] samba: 4.20.4 -> 4.20.8 (#414155) 86e5d92 olivetin: 2025.6.1 -> 2025.6.6 ce7ee08 [Backport release-25.05] olivetin: 2025.6.1 -> 2025.6.6 (#414601) 15c7b1d zluda: provide fallback CMAKE_BUILD_TYPE 1c9b107 [Backport release-25.05] mbedtls_2: 2.28.9 -> 2.28.10 (#414588) 33fd628 [Backport release-25.05] zluda: provide fallback CMAKE_BUILD_TYPE (#414608) dbeb1f6 rustic: simplify shell completion installation 8217c6e [Backport release-25.05] rustic: simplify shell completion installation (#414618) e66f041 sylpheed: fix with gcc 14 c6ee89b uudeview: 0.5.20 -> 0.5.20-unstable-2025-03-20, update repo, fixes build (#411084) 1b0417e [Backport release-25.05] mozhi: init at 0-unstable-2025-04-14 (#414537) 1a95f2e [release-25.05] rke2_1_29: mark as vulnerable due to EOL (#414009) 5cf7c54 [Backport release-25.05] discord: allow not disabling updates (#412750) df6e50a [Backport release-25.05] sylpheed: fix with gcc 14 (#414657) 6003004 [Backport release-25.05] uudeview: 0.5.20 -> 0.5.20-unstable-2025-03-20, update repo, fixes build (#414659) a09ac07 [Backport release-25.05] webkitgtk_6_0: 2.48.2 → 2.48.3 (#414255) 4ee336f shadps4: fix update script 1295d6e [Backport release-25.05] shadps4: fix update script (#414680) 2c4964a matrix-synapse-unwrapped: restore ability to make backports 45346c3 matrix-synapse: 1.130.0 -> 1.131.0 2bf8c5e [Backport release-25.05] linuxKernel.kernels.linux_zen: 6.14.7-zen1 -> 6.14.9-zen1, linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 -> 6.14.9-lqx1 (#413520) 8977813 [25.05] headscale: patch /machine/map endpoint vulnerability (#414589) 6ef270c grafana-image-renderer: 3.12.5 -> 3.12.6 4a587be apacheHttpdPackages.php: 8.4.7 -> 8.4.8 1ef9180 Merge: [25.05] matrix-synapse-unwrapped: 1.130.0 -> 1.131.0 (#414686) c0572a7 [Backport release-25.05] google-cloud-sdk: 2nd fix for pyopenssl (#414271) 0f305a9 Merge: [Backport release-25.05] grafana-image-renderer: 3.12.5 -> 3.12.6 (#414698) acf018e Merge: [Backport release-25.05] apacheHttpdPackages.php: 8.4.7 -> 8.4.8 (#414704) 07e68f0 php83: 8.3.21 -> 8.3.22 --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 3bed73c..23d0471 100644 --- a/lon.lock +++ b/lon.lock @@ -247,9 +247,9 @@ "owner": "NixOS", "repo": "nixpkgs", "branch": "nixos-25.05", - "revision": "70c74b02eac4", - "url": "https://github.com/NixOS/nixpkgs/archive/70c74b02eac4.tar.gz", - "hash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=" + "revision": "88331c17ba434359491e8d5889cce872464052c2", + "url": "https://github.com/NixOS/nixpkgs/archive/88331c17ba434359491e8d5889cce872464052c2.tar.gz", + "hash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=" }, "nixos-unstable": { "type": "GitHub", From a7377a6afc334b3535ff8d7fb1f99f1e268e4d90 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:57:58 +0000 Subject: [PATCH 3/3] lon: update dns.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a3196708a56dee76186a9415c187473b94e6cbae → 96e548ae8bd44883afc5bddb9dacd0502542276d Last 17 commits: 3fa62df Add DANE-Related RRs d86ffdc zone#toString relative to $ORIGIN b2c6c9d useOrigin option in zone to switch toString e13b516 merge writeRecord{,Rel} b0a5a0f remove writeRecordDel 2307af0 fix subdomain case 0d4694f Update dns/types/record.nix e3ad889 Update dns/types/record.nix 3b4d4b3 Update dns/types/record.nix f084caf doc: adds useOrigin example 025996a Merge pull request #33 from pigam/unqualified-domain-names 7d62cee fix syntax error a23f43f Merge pull request #36 from griffi-gh/patch-1 51e3deb Apply suggestions from code review 1ad7b72 Apply suggestions from code review 17e7f9b Merge pull request #27 from DarkKirb/dnssec-rr 96e548a fix: Make the example work --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 23d0471..cc7a60c 100644 --- a/lon.lock +++ b/lon.lock @@ -77,9 +77,9 @@ "owner": "nix-community", "repo": "dns.nix", "branch": "master", - "revision": "a3196708a56dee76186a9415c187473b94e6cbae", - "url": "https://github.com/nix-community/dns.nix/archive/a3196708a56dee76186a9415c187473b94e6cbae.tar.gz", - "hash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=" + "revision": "96e548ae8bd44883afc5bddb9dacd0502542276d", + "url": "https://github.com/nix-community/dns.nix/archive/96e548ae8bd44883afc5bddb9dacd0502542276d.tar.gz", + "hash": "sha256-qTbv8Pm9WWF63M5Fj0Od9E54/lsbMSQUBHw/s30eFok=" }, "git-hooks": { "type": "GitHub",