diff options
Diffstat (limited to 'nixpkgs/flake.nix')
| -rw-r--r-- | nixpkgs/flake.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/nixpkgs/flake.nix b/nixpkgs/flake.nix index 52fd2f82a37..e7c04417ac8 100644 --- a/nixpkgs/flake.nix +++ b/nixpkgs/flake.nix @@ -1,8 +1,6 @@ # Experimental flake interface to Nixpkgs. # See https://github.com/NixOS/rfcs/pull/49 for details. { - edition = 201909; - description = "A collection of packages for the Nix package manager"; outputs = { self }: @@ -14,23 +12,30 @@ lib = import ./lib; - systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + systems = [ + "x86_64-linux" + "i686-linux" + "x86_64-darwin" + "aarch64-linux" + "armv6l-linux" + "armv7l-linux" + ]; forAllSystems = f: lib.genAttrs systems (system: f system); in { - lib = lib // { + lib = lib.extend (final: prev: { nixosSystem = { modules, ... } @ args: import ./nixos/lib/eval-config.nix (args // { modules = modules ++ [ { system.nixos.versionSuffix = - ".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; - system.nixos.revision = lib.mkIf (self ? rev) self.rev; + ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; + system.nixos.revision = final.mkIf (self ? rev) self.rev; } ]; }); - }; + }); checks.x86_64-linux.tarball = jobs.tarball; |