diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-06-12 18:23:19 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-06-12 18:23:19 +0200 |
| commit | abd51d042c5036a3f1c3566b3e1025f955c43baf (patch) | |
| tree | abef09889f3b417d10296a3ef134e037337d5881 /pkgs/tools | |
| parent | e82f01d2c5a9f54632e779780fbde725fd2a72e1 (diff) | |
| download | nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.tar nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.tar.gz nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.tar.bz2 nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.tar.lz nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.tar.xz nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.tar.zst nixpkgs-abd51d042c5036a3f1c3566b3e1025f955c43baf.zip | |
nix: Add nixFlakes attribute for the flake branch
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6d0e07d60f9..7ba83b70037 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -11,7 +11,7 @@ let common = { lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline - , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns + , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq , busybox-sandbox-shell , storeDir , stateDir @@ -37,7 +37,7 @@ common = nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium @@ -193,4 +193,18 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); + nixFlakes = lib.lowPrio (callPackage common rec { + name = "nix-2.3${suffix}"; + suffix = "pre20190612_06010ea"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "06010eaf199005a393f212023ec5e8bc97978537"; + sha256 = "1fq99fmlag5hxvgzxrclgfsnc1fhhfwnslyshad1934wi9nzx1s2"; + }; + fromGit = true; + + inherit storeDir stateDir confDir boehmgc; + }); + } |