tamipes/authentik-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #44 from fpletz/flake-update/2025-02-15

Browse source 
flake.lock: Update, blueprint & fetchCargoVendor fixes
This commit is contained in:
WilliButz 2025-02-15 10:38:44 +01:00 • committed by GitHub
commit efd801f6fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/docs.nix
View file

@ -18,7 +18,9 @@ buildNapalmPackage "${authentik-src}/website" {
]; ];
installPhase = '' installPhase = ''
rm -r ../website/node_modules/.cache rm -r ../website/node_modules/.cache
rm -f ../website/static/blueprints
mv -v ../website $out mv -v ../website $out
cp -vr ../blueprints $out/static/blueprints
''; '';
# These are lockfiles with extra deps that are required to successfully build # These are lockfiles with extra deps that are required to successfully build

26
flake.lock generated
View file

@ -38,11 +38,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1738453229,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737632463, "lastModified": 1739446958,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,14 +134,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1735774519, "lastModified": 1738452942,
"narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
} }
}, },
"poetry2nix": { "poetry2nix": {
@ -159,11 +159,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1736884309, "lastModified": 1738741221,
"narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=", "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b", "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
poetry2nix-python-overrides.nix
View file

@ -90,11 +90,11 @@ pkgs: [
pkgs.rustPlatform.maturinBuildHook pkgs.rustPlatform.maturinBuildHook
]; ];
cargoRoot = "rust"; cargoRoot = "rust";
cargoDeps = pkgs.rustPlatform.fetchCargoTarball { cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
src = oA.src; src = oA.src;
sourceRoot = "${oA.pname}-${oA.version}/rust"; sourceRoot = "${oA.pname}-${oA.version}/rust";
name = "${oA.pname}-${oA.version}"; name = "${oA.pname}-${oA.version}";
sha256 = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; hash = "sha256-6WgGIfz9I+xRJqXWhjfGDZM1umYwVlUEpLAiecZNZmI=";
}; };
}); });
django-pgactivity = prev.django-pgactivity.overrideAttrs (oA: { django-pgactivity = prev.django-pgactivity.overrideAttrs (oA: {
@ -144,9 +144,9 @@ pkgs: [
buildInputs = oA.buildInputs ++ [ buildInputs = oA.buildInputs ++ [
pkgs.krb5 pkgs.krb5
]; ];
cargoDeps = pkgs.rustPlatform.fetchCargoTarball { cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
inherit (oA) pname version src; inherit (oA) pname version src;
hash = "sha256-iH2fm4OUwLdx+lqmPNOkzM3LH6gBVYDtZ+livhOQrE4="; hash = "sha256-1J2aaEj/G7TE+EptWNwb5Vj048W6DOJNUBWPd9F4DqU=";
}; };
}); });
gssapi = prev.gssapi.overrideAttrs (oA: { gssapi = prev.gssapi.overrideAttrs (oA: {
@ -165,5 +165,17 @@ pkgs: [
ua-parser-builtins = prev.ua-parser-builtins.overridePythonAttrs (oA: { ua-parser-builtins = prev.ua-parser-builtins.overridePythonAttrs (oA: {
propagatedBuildInputs = builtins.filter (p: p.pname != "ua-parser") oA.propagatedBuildInputs; 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=";
};
});
}) })
] ]