From 7558e4b4313269c2cec671e490f8dd1366bf51f6 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 5 Mar 2025 17:14:34 +0100 Subject: [PATCH] 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 --- flake.lock | 22 ++++++++++++++++++++-- flake.nix | 3 ++- systems/default.nix | 7 +++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 919ba0a..a8c41d7 100644 --- a/flake.lock +++ b/flake.lock @@ -227,9 +227,26 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "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": { @@ -245,6 +262,7 @@ "mystia": "mystia", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", + "nixpkgs-mottarone": "nixpkgs-mottarone", "systems": "systems", "treefmt-nix": "treefmt-nix", "ukubot-rs": "ukubot-rs" diff --git a/flake.nix b/flake.nix index ca1cc01..c21fb05 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,8 @@ }; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-mottarone.url = "github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680"; camasca = { url = "git+https://git.uku3lig.net/uku/camasca"; diff --git a/systems/default.nix b/systems/default.nix index 18937a3..7b13f94 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -11,8 +11,9 @@ let { role, system, + nixpkgs ? inputs.nixpkgs, }: - inputs.nixpkgs.lib.nixosSystem { + nixpkgs.lib.nixosSystem { inherit system; modules = [ @@ -24,9 +25,10 @@ let ]; specialArgs = inputs // { + inherit nixpkgs; _utils = mkUtils { inherit lib; - pkgs = inputs.nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; }; }; }; @@ -51,6 +53,7 @@ in mottarone = { role = "laptop"; system = "x86_64-linux"; + nixpkgs = inputs.nixpkgs-mottarone; }; etna = {