From 6af7fb26236499aaed6623248b320bb4d4baca71 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 15 Feb 2025 03:04:52 +0100 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/b905f6fc23a9051a6e1b741e1438dbfc0634c6de' (2025-01-06) → 'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd' (2025-02-01) • Updated input 'flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz?narHash=sha256-CewEm1o2eVAnoqb6Ml%2BQi9Gg/EfNAxbRx1lANGVyoLI%3D' (2025-01-01) → 'https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz?narHash=sha256-vJzFZGaCpnmo7I6i416HaBLpC%2BhvcURh/BQwROcGIp8%3D' (2025-02-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9' (2025-01-23) → 'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0' (2025-02-13) • Updated input 'poetry2nix': 'github:nix-community/poetry2nix/75d0515332b7ca269f6d7abfd2c44c47a7cbca7b' (2025-01-14) → 'github:nix-community/poetry2nix/be1fe795035d3d36359ca9135b26dcc5321b31fb' (2025-02-05) --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 005299a..bcd5581 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -134,14 +134,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "poetry2nix": { @@ -159,11 +159,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736884309, - "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=", + "lastModified": 1738741221, + "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b", + "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb", "type": "github" }, "original": { From 74feeec4f13d06de85bcb86fa7136021a331f06c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 15 Feb 2025 03:05:06 +0100 Subject: [PATCH 2/3] docs: fix broken blueprints symlink Recent nixpkgs unstable added a symlink checker that discovered the blueprints symlink didn't point to the correct directory location. --- components/docs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/docs.nix b/components/docs.nix index b476407..521f2d5 100644 --- a/components/docs.nix +++ b/components/docs.nix @@ -18,7 +18,9 @@ buildNapalmPackage "${authentik-src}/website" { ]; installPhase = '' rm -r ../website/node_modules/.cache + rm -f ../website/static/blueprints mv -v ../website $out + cp -vr ../blueprints $out/static/blueprints ''; # These are lockfiles with extra deps that are required to successfully build From 219e3fd2f5847cc9871a66ad56b65955dc076807 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 15 Feb 2025 03:07:28 +0100 Subject: [PATCH 3/3] python-overrides: fetchCargoTarball is deprecated `fetchCargoTarball` was deprecated and replaced with `fetchCargoVendor`. Newer cargo versions produce different output which changes `fetchCargoTarball` hashes. --- poetry2nix-python-overrides.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/poetry2nix-python-overrides.nix b/poetry2nix-python-overrides.nix index 06d491e..898bf09 100644 --- a/poetry2nix-python-overrides.nix +++ b/poetry2nix-python-overrides.nix @@ -90,11 +90,11 @@ pkgs: [ pkgs.rustPlatform.maturinBuildHook ]; cargoRoot = "rust"; - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { src = oA.src; sourceRoot = "${oA.pname}-${oA.version}/rust"; name = "${oA.pname}-${oA.version}"; - sha256 = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; + hash = "sha256-6WgGIfz9I+xRJqXWhjfGDZM1umYwVlUEpLAiecZNZmI="; }; }); django-pgactivity = prev.django-pgactivity.overrideAttrs (oA: { @@ -144,9 +144,9 @@ pkgs: [ buildInputs = oA.buildInputs ++ [ pkgs.krb5 ]; - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { inherit (oA) pname version src; - hash = "sha256-iH2fm4OUwLdx+lqmPNOkzM3LH6gBVYDtZ+livhOQrE4="; + hash = "sha256-1J2aaEj/G7TE+EptWNwb5Vj048W6DOJNUBWPd9F4DqU="; }; }); gssapi = prev.gssapi.overrideAttrs (oA: { @@ -165,5 +165,17 @@ pkgs: [ ua-parser-builtins = prev.ua-parser-builtins.overridePythonAttrs (oA: { propagatedBuildInputs = builtins.filter (p: p.pname != "ua-parser") oA.propagatedBuildInputs; }); + rpds-py = prev.rpds-py.overridePythonAttrs (oA: { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (oA) src pname version; + hash = "sha256-vfx0ZbIgH5UvL1JMYeJIToY35w2axiHngBt5FJUih7c="; + }; + }); + watchfiles = prev.watchfiles.overridePythonAttrs (oA: { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (oA) src pname version; + hash = "sha256-EuH6svw8eOEpLJYLx+4RFUTTClqfPN07Vc0cjlWoCXw="; + }; + }); }) ]