diff --git a/flake.lock b/flake.lock index b0e1234..a26c6e4 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -40,7 +56,77 @@ "type": "indirect" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat", + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1696000550, + "narHash": "sha256-Q5L+rHzjp0bYuR2ogg+YPCn6isjmlQ4CJVT0zpn/hFc=", + "owner": "nixos", + "repo": "nix", + "rev": "e64606084e955f3fbaed42f2faa68991401be408", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "2.17.1", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1697484591, "narHash": "sha256-ahV2m9CeTLkTOo0hZNf3miMKTOOHtWKIBnjxNeFdx5A=", @@ -59,7 +145,8 @@ "inputs": { "fakedir": "fakedir", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nix": "nix", + "nixpkgs": "nixpkgs_2" } }, "systems": { diff --git a/flake.nix b/flake.nix index 13a935b..f87858b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { description = "Put Nix in everything!"; inputs.nixpkgs.url = github:nixos/nixpkgs; + inputs.nix.url = github:nixos/nix/2.17.1; inputs.fakedir = { url = github:nixie-dev/fakedir; inputs.nixpkgs.follows = "nixpkgs"; @@ -10,7 +11,7 @@ nixConfig.extra-substituters = "https://nix-wrap.cachix.org"; nixConfig.extra-trusted-public-keys = "nix-wrap.cachix.org-1:FcfSb7e+LmXBZE/MdaFWcs4bW2OQQeBnB/kgWlkZmYI="; - outputs = { self, nixpkgs, flake-utils, fakedir, ... }: + outputs = { self, nix, nixpkgs, flake-utils, fakedir, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -22,6 +23,7 @@ static-bins = import ./static-bins { inherit nixpkgs fakedir pkgs; libfakedir = fakedir.packages.aarch64-darwin.fakedir-universal; + nixStatics.aarch64-linux = nix.packages.aarch64-linux.nix-static; }; } // (if system == "x86_64-darwin" || system == "aarch64-darwin"