b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #24277 from NixOS/hydra-bump

Browse source 
Nix, Hydra: bump to 2017-03-21
This commit is contained in:
Domen Kožar 2017-03-26 18:33:59 +02:00 committed by GitHub
parent 955b79f462 99632d5466
commit 5912496490
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/misc/hydra/default.nix
View file

@ -61,15 +61,15 @@ let
};
in releaseTools.nixBuild rec {
name = "hydra-${version}";
version = "2017-02-03";
version = "2017-03-21";
inherit stdenv;
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "a366f362e197476615a813e2cc904b60db28e65f";
sha256 = "0q7bywh59aqgpgj9ca2xscszxal9c3c90bs7sb4cfg7w8g6m69hf";
rev = "57bc0eaead8c76ffd71ddc49adfacc47bb8a75ac";
sha256 = "1kshl6ms42fgh621s1ba3a224rawqzgvl89rq1k6c9qhlplpndd9";
};
buildInputs =

9
pkgs/tools/package-management/nix/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
@ -21,6 +21,7 @@ let
buildInputs = [ curl openssl sqlite xz ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optional fromGit brotli # Since 1.12
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
(aws-sdk-cpp.override {
apis = ["s3"];
@ -112,12 +113,12 @@ in rec {
nixUnstable = lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
suffix = "pre5073_1cf4801";
suffix = "pre5110_165786d";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
rev = "165786dbc0ca0b93fadb6e491defac603475b601";
sha256 = "0ah68ss5wlpgfpc4k7yl2h3szbwgllyn5d6s464vynaig6b165pz";
};
fromGit = true;
});