ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

nix: Add nixFlakes attribute for the flake branch

Browse Source
This commit is contained in:
Eelco Dolstra 2019-06-12 18:23:19 +02:00
parent e82f01d2c5
commit abd51d042c
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/package-management/nix/default.nix
View File

@ -11,7 +11,7 @@ let
common = common =
{ lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz { lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline , 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 , busybox-sandbox-shell
, storeDir , storeDir
, stateDir , stateDir
@ -37,7 +37,7 @@ common =
nativeBuildInputs = nativeBuildInputs =
[ pkgconfig ] [ pkgconfig ]
++ lib.optionals (!is20) [ curl perl ] ++ 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 ] buildInputs = [ curl openssl sqlite xz bzip2 ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
@ -193,4 +193,18 @@ in rec {
inherit storeDir stateDir confDir boehmgc; 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;
});
} }

3
pkgs/top-level/all-packages.nix
View File

@ -23373,7 +23373,8 @@ in
nix nix
nix1 nix1
nixStable nixStable
nixUnstable; nixUnstable
nixFlakes;
nixops = callPackage ../tools/package-management/nixops { }; nixops = callPackage ../tools/package-management/nixops { };