fix(patches): Port necessary patches to nixos 24.11
This commit is contained in:
parent
12f19506fc
commit
af66eb557f
4 changed files with 40 additions and 1 deletions
|
@ -20,7 +20,7 @@ precedence = "closest"
|
||||||
[[annotations]]
|
[[annotations]]
|
||||||
SPDX-FileCopyrightText = "2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>"
|
SPDX-FileCopyrightText = "2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>"
|
||||||
SPDX-License-Identifier = "EUPL-1.2"
|
SPDX-License-Identifier = "EUPL-1.2"
|
||||||
path = ["machines/nixos/compute01/librenms/kanidm.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/nixpkgs/04-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch"]
|
path = ["machines/nixos/compute01/librenms/kanidm.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/nixpkgs/03-crabfit-karla.patch", "patches/nixpkgs/04-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch"]
|
||||||
precedence = "closest"
|
precedence = "closest"
|
||||||
|
|
||||||
[[annotations]]
|
[[annotations]]
|
||||||
|
|
|
@ -90,6 +90,7 @@ let
|
||||||
"machines/nixos/web01/crabfit/*.patch"
|
"machines/nixos/web01/crabfit/*.patch"
|
||||||
"machines/nixos/web02/cas-eleves/01-pytest-cas.patch"
|
"machines/nixos/web02/cas-eleves/01-pytest-cas.patch"
|
||||||
"patches/lix/01-disable-installChecks.patch"
|
"patches/lix/01-disable-installChecks.patch"
|
||||||
|
"patches/nixpkgs/03-crabfit-karla.patch"
|
||||||
"patches/nixpkgs/04-crabfit-karla.patch"
|
"patches/nixpkgs/04-crabfit-karla.patch"
|
||||||
"patches/nixpkgs/05-netbird-relay.patch"
|
"patches/nixpkgs/05-netbird-relay.patch"
|
||||||
];
|
];
|
||||||
|
|
|
@ -60,6 +60,20 @@ in
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
"nixos-24.11" = [
|
||||||
|
# nixos/nextcloud: Rename autocreate (a no-op) to verify_bucket_exists
|
||||||
|
{
|
||||||
|
id = "275165";
|
||||||
|
hash = "sha256-9a26V3Pi8yLD3N9+mC1kvJoruxRTp/qOHapnt6VX7pw=";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Crabfit: don't depend on all google-fonts
|
||||||
|
(local ./nixpkgs/03-crabfit-karla.patch)
|
||||||
|
|
||||||
|
# netbox qrcode plugin
|
||||||
|
(local ./nixpkgs/06-netbox-qrcode.patch)
|
||||||
|
];
|
||||||
|
|
||||||
"nixos-unstable" = [
|
"nixos-unstable" = [
|
||||||
# netbox qrcode plugin
|
# netbox qrcode plugin
|
||||||
(local ./nixpkgs/06-netbox-qrcode.patch)
|
(local ./nixpkgs/06-netbox-qrcode.patch)
|
||||||
|
|
24
patches/nixpkgs/03-crabfit-karla.patch
Normal file
24
patches/nixpkgs/03-crabfit-karla.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
diff --git a/pkgs/by-name/cr/crabfit-frontend/package.nix b/pkgs/by-name/cr/crabfit-frontend/package.nix
|
||||||
|
index 99d7be0fdeae..9f858e8a9a9e 100644
|
||||||
|
--- a/pkgs/by-name/cr/crabfit-frontend/package.nix
|
||||||
|
+++ b/pkgs/by-name/cr/crabfit-frontend/package.nix
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
nodejs,
|
||||||
|
yarn,
|
||||||
|
fixup-yarn-lock,
|
||||||
|
- google-fonts,
|
||||||
|
+ karla,
|
||||||
|
api_url ? "http://127.0.0.1:3000",
|
||||||
|
frontend_url ? "crab.fit",
|
||||||
|
}:
|
||||||
|
@@ -83,9 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
patchShebangs node_modules
|
||||||
|
|
||||||
|
mkdir -p src/app/fonts
|
||||||
|
- cp "${
|
||||||
|
- google-fonts.override { fonts = [ "Karla" ]; }
|
||||||
|
- }/share/fonts/truetype/Karla[wght].ttf" src/app/fonts/karla.ttf
|
||||||
|
+ cp "${karla}/share/fonts/truetype/Karla-Regular.ttf" src/app/fonts/karla.ttf
|
||||||
|
|
||||||
|
runHook postConfigure
|
||||||
|
'';
|
Loading…
Reference in a new issue