Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c780db5337ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6bbd89b7b1c7
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 12, 2019

  1. nix: Add nixFlakes attribute for the flake branch 

    (cherry picked from commit abd51d0)
    @edolstra
    edolstra committed Jun 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6bbd89b View commit details
Showing with 18 additions and 3 deletions.
  1. +16 −2 pkgs/tools/package-management/nix/default.nix
  2. +2 −1 pkgs/top-level/all-packages.nix
18 changes: 16 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,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
@@ -36,7 +36,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
@@ -190,4 +190,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;
});

}
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22605,7 +22605,8 @@ in
nix
nix1
nixStable
nixUnstable;
nixUnstable
nixFlakes;

nixops = callPackage ../tools/package-management/nixops { };