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: 2aa471997fd4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61fabdfc67ba
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 10, 2019

  1. nix*: Make .override work 

    Currently, .override is only on a temporary attrset that is thrown away, now it
is also on the nix derivations we use.
    @Ericson2314
    Ericson2314 committed Mar 10, 2019
    Copy the full SHA
    bfc7214 View commit details

  2. Merge remote-tracking branch 'upstream/release-19.03' into override-u… 

    …nstable-nix-19.03
    @Ericson2314
    Ericson2314 committed Mar 10, 2019
    Copy the full SHA
    44cc6fa View commit details

  3. Merge pull request #57268 from obsidiansystems/override-unstable-nix-… 

    …19.03

nix*: Make .override work for 19.03
    @Ericson2314
    Ericson2314 authored Mar 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    61fabdf View commit details
Showing with 29 additions and 14 deletions.
  1. +28 −13 pkgs/tools/package-management/nix/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
41 changes: 28 additions & 13 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, 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
, busybox-sandbox-shell
{ lib, fetchurl, fetchFromGitHub, callPackage
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
, boehmgc
}:

let

sh = busybox-sandbox-shell;

common = { name, suffix ? "", src, includesPerl ? false, fromGit ? false }:
let nix = stdenv.mkDerivation rec {
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
, busybox-sandbox-shell
, storeDir
, stateDir
, confDir
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp

, name, suffix ? "", src, includesPerl ? false, fromGit ? false

}:
let
sh = busybox-sandbox-shell;
nix = stdenv.mkDerivation rec {
inherit name src;
version = lib.getVersion name;

@@ -144,7 +153,7 @@ in rec {

nix = nixStable;

nix1 = common rec {
nix1 = callPackage common rec {
name = "nix-1.11.16";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@@ -153,17 +162,21 @@ in rec {

# Nix1 has the perl bindings by default, so no need to build the manually.
includesPerl = true;

inherit storeDir stateDir confDir boehmgc;
};

nixStable = common rec {
nixStable = callPackage common rec {
name = "nix-2.2";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7";
};

inherit storeDir stateDir confDir boehmgc;
};

nixUnstable = lib.lowPrio (common rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.3${suffix}";
suffix = "pre6631_e58a7144";
src = fetchFromGitHub {
@@ -173,6 +186,8 @@ in rec {
sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802";
};
fromGit = true;

inherit storeDir stateDir confDir boehmgc;
});

}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22487,7 +22487,7 @@ in

mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };

inherit (callPackages ../tools/package-management/nix {
inherit (callPackage ../tools/package-management/nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; };