aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-05-06 13:20:10 +0200
committerKarel Kočí <cynerd@email.cz>2022-06-11 10:35:48 +0200
commitb2099a33684c998d7b3375677f338ba8d628b430 (patch)
tree8235fe2b05e0c7df67e08608a55e6c6278a909e1
parentc385cc1c05efd2d44a02fd729a6a0241adf9004c (diff)
downloadnixturris-b2099a33684c998d7b3375677f338ba8d628b430.tar.gz
nixturris-b2099a33684c998d7b3375677f338ba8d628b430.tar.bz2
nixturris-b2099a33684c998d7b3375677f338ba8d628b430.zip
flake: drop the stable nixos
-rw-r--r--flake.lock25
-rw-r--r--flake.nix10
2 files changed, 5 insertions, 30 deletions
diff --git a/flake.lock b/flake.lock
index 802d295..0247827 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,11 +16,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1651146972,
- "narHash": "sha256-on1R40AlYKbngH2p+cqvhMt9P5oEUWAh9xTVtE70YFA=",
+ "lastModified": 1651804312,
+ "narHash": "sha256-DJxOGlxwQccuuwXUS0oRRkcNJbW5UP4fpsL5ga9ZwYw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6ff202cb7be0c92c81b4db0f4b7b8c8e969e8001",
+ "rev": "d59dd43e49f24b58fe8d5ded38cbdf00c3da4dc2",
"type": "github"
},
"original": {
@@ -28,27 +28,10 @@
"type": "indirect"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1651310835,
- "narHash": "sha256-MLk/zsLlbPhwFucxL64Fr+oIrvQC2/76Ap2F7ekbPNI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fd3e33d696b81e76b30160dfad2efb7ac1f19879",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-21.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs",
- "nixpkgs-stable": "nixpkgs-stable"
+ "nixpkgs": "nixpkgs"
}
}
},
diff --git a/flake.nix b/flake.nix
index 0cca044..e3eb890 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,7 @@
{
description = "Turris flake";
- inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-21.11";
-
- outputs = { self, flake-utils, nixpkgs, nixpkgs-stable }: {
+ outputs = { self, flake-utils, nixpkgs }: {
overlays.default = final: prev: import ./pkgs { nixpkgs = prev; };
overlay = self.overlays.default; # Backward compatibility
@@ -19,8 +17,6 @@
nixosConfigurations = {
tarballMox = self.lib.nixturrisTarballSystem { board = "mox"; nixpkgs = nixpkgs; };
tarballOmnia = self.lib.nixturrisTarballSystem { board = "omnia"; nixpkgs = nixpkgs; };
- stableTarballMox = self.lib.nixturrisTarballSystem { board = "mox"; nixpkgs = nixpkgs-stable; };
- stableTarballOmnia = self.lib.nixturrisTarballSystem { board = "omnia"; nixpkgs = nixpkgs-stable; };
};
} // flake-utils.lib.eachSystem (flake-utils.lib.defaultSystems ++ ["armv7l-linux"]) (
@@ -31,13 +27,9 @@
tarballMox = tarball self.nixosConfigurations.tarballMox;
tarballOmnia = tarball self.nixosConfigurations.tarballOmnia;
- stableTarballMox = tarball self.nixosConfigurations.stableTarballMox;
- stableTarballOmnia = tarball self.nixosConfigurations.stableTarballOmnia;
crossTarballMox = tarball (self.lib.nixturrisTarballSystem { board = "mox"; nixpkgs = nixpkgs; system = system; });
crossTarballOmnia = tarball (self.lib.nixturrisTarballSystem { board = "omnia"; nixpkgs = nixpkgs; system = system; });
- stableCrossTarballMox = tarball (self.lib.nixturrisTarballSystem { board = "mox"; nixpkgs = nixpkgs-stable; system = system; });
- stableCrossTarballOmnia = tarball (self.lib.nixturrisTarballSystem { board = "omnia"; nixpkgs = nixpkgs-stable; system = system; });
} // flake-utils.lib.filterPackages system (flake-utils.lib.flattenTree (
import ./pkgs { nixpkgs = nixpkgs.legacyPackages."${system}"; }