diff --git a/flake.lock b/flake.lock index 0e9b3e2..e9e47ba 100644 --- a/flake.lock +++ b/flake.lock @@ -35,22 +35,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1729256560, @@ -69,11 +53,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { @@ -83,22 +67,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "backup-helper": "backup-helper", @@ -109,8 +77,12 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": [ + "nixpkgs-unstable" + ], + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1729394972, diff --git a/flake.nix b/flake.nix index 22b33cc..2c5b9e4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,12 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - sops-nix.url = "github:Mic92/sops-nix"; + + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + }; backup-helper.url = "git+https://git.t-juice.club/torjus/backup-helper?ref=master"; };