fix(systems/mottarone): the horrors.

alternatively, rollback nixpkgs to before the latest staging merge.
something (gtk3 or something depending on it) broke jaspersoft studio
and well i need that to work
This commit is contained in:
uku 2025-03-05 17:14:34 +01:00
parent 2a16b68bf4
commit 7558e4b431
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
3 changed files with 27 additions and 5 deletions

22
flake.lock generated
View file

@ -227,9 +227,26 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-mottarone": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
} }
}, },
"root": { "root": {
@ -245,6 +262,7 @@
"mystia": "mystia", "mystia": "mystia",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-mottarone": "nixpkgs-mottarone",
"systems": "systems", "systems": "systems",
"treefmt-nix": "treefmt-nix", "treefmt-nix": "treefmt-nix",
"ukubot-rs": "ukubot-rs" "ukubot-rs": "ukubot-rs"

View file

@ -58,7 +58,8 @@
}; };
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-mottarone.url = "github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680";
camasca = { camasca = {
url = "git+https://git.uku3lig.net/uku/camasca"; url = "git+https://git.uku3lig.net/uku/camasca";

View file

@ -11,8 +11,9 @@ let
{ {
role, role,
system, system,
nixpkgs ? inputs.nixpkgs,
}: }:
inputs.nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
@ -24,9 +25,10 @@ let
]; ];
specialArgs = inputs // { specialArgs = inputs // {
inherit nixpkgs;
_utils = mkUtils { _utils = mkUtils {
inherit lib; inherit lib;
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
}; };
}; };
}; };
@ -51,6 +53,7 @@ in
mottarone = { mottarone = {
role = "laptop"; role = "laptop";
system = "x86_64-linux"; system = "x86_64-linux";
nixpkgs = inputs.nixpkgs-mottarone;
}; };
etna = { etna = {