public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next'

Browse Source 
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
This commit is contained in:
Vladimír Čunát
2019-02-10 14:20:49 +01:00
parent b8d7c0cab5 64edccb463
commit c40f211499
243 changed files with 1333 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/ninja/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
};
nativeBuildInputs = [ python ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];
buildPhase = ''
python configure.py --bootstrap
pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ python2Packages.buildPythonApplication {
sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
};
nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkgconfig libxslt.dev ];
buildInputs = [ libxslt ];
configureFlags = [ "--disable-scrollkeeper" ];
pkgs/development/tools/misc/hydra/default.nix
+4 -2
View File
@@ -87,7 +87,7 @@ in releaseTools.nixBuild rec {
};
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support
perlDeps perl nix
@@ -100,7 +100,7 @@ in releaseTools.nixBuild rec {
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
# adds a patch which ensures compatibility with the API of Nix 2.0.
# it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44,
@@ -114,6 +114,8 @@ in releaseTools.nixBuild rec {
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = [ "-pthread" ];
shellHook = ''
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
PERL5LIB=$(pwd)/src/lib:$PERL5LIB;