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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-07-16 17:11:01 +02:00
commit f001c81c1a
22 changed files with 2672 additions and 1265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/processing3/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }:
{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "3.3.7";
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
rm core/library/*.jar
cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/
# do not download a file during build
${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml
install -D -m0444 ${fetchurl {
url = http://download.processing.org/reference.zip;
sha256 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf";
}
} ./java/reference.zip
# suppress "Not fond of this Java VM" message box
substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \
--replace 'Messages.showWarning' 'if (false) Messages.showWarning'
@ -37,9 +45,11 @@ stdenv.mkDerivation rec {
ln -s ${jdk} $out/${name}/java
makeWrapper $out/${name}/processing $out/bin/processing \
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
'';

2
pkgs/applications/science/logic/cvc4/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A high-performance theorem prover and SMT solver";
homepage = http://cvc4.cs.nyu.edu/web/;
homepage = http://cvc4.cs.stanford.edu/web/;
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl thoughtpolice gebner ];

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/0986b1ed62a71528e09a660493955d79f0bf2fbf.tar.gz";
sha256 = "1s8xffqpkwv1x038mi1vw0rk6k3scwpp2l1phq9zs2vxrhblriaw";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz";
sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3";
}

6
pkgs/development/compilers/ghc/8.6.1.nix
View File

@ -76,12 +76,12 @@ let
in
stdenv.mkDerivation (rec {
version = "8.6.0.20180627";
version = "8.6.0.20180714";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.6.1-alpha1/ghc-${version}-src.tar.xz";
sha256 = "0vmki10ypdhca3nykxz3lgarr14mfanfkif43m1s2p1q0b1z576n";
url = "https://downloads.haskell.org/~ghc/8.6.1-alpha2/ghc-${version}-src.tar.xz";
sha256 = "1jrkqrqdv2z9i9s1xaxhci34c9rjvlgr40y34bxsfj0hj1r28409";
};
enableParallelBuilding = true;

7
pkgs/development/compilers/ghcjs-ng/README.md
View File

@ -12,9 +12,10 @@ Updating
---
```
$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \
$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \
| jq '{ url, rev, fetchSubmodules, sha256 }' \
> 8.2/git.json
$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix
> 8.4/git.json
$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix
$ cabal2nix --compiler ghcjs git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix
```

7
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@ -18,6 +18,7 @@
, lib
, nodePackages
, ghcjsDepOverrides ? (_:_:{})
, haskell
}:
let
@ -48,7 +49,11 @@ let
# Relics of the old GHCJS build system
stage1Packages = [];
mkStage2 = _: {};
mkStage2 = { callPackage }: {
# https://github.com/ghcjs/ghcjs-base/issues/110
# https://github.com/ghcjs/ghcjs-base/pull/111
ghcjs-base = haskell.lib.dontCheck (haskell.lib.doJailbreak (callPackage ./ghcjs-base.nix {}));
};
haskellCompilerName = "ghcjs-${bootGhcjs.version}";
};

29
pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix Normal file
View File

@ -0,0 +1,29 @@
{ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
, containers, deepseq, directory, dlist, fetchgit, ghc-prim
, ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck
, quickcheck-unicode, random, scientific, stdenv, test-framework
, test-framework-hunit, test-framework-quickcheck2, text, time
, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "ghcjs-base";
version = "0.2.0.0";
src = fetchgit {
url = "git://github.com/ghcjs/ghcjs-base";
sha256 = "0qr05m0djll3x38dhl85pl798arsndmwfhil8yklhb70lxrbvfrs";
rev = "01014ade3f8f5ae677df192d7c2a208bd795b96c";
};
libraryHaskellDepends = [
aeson attoparsec base binary bytestring containers deepseq dlist
ghc-prim ghcjs-prim hashable integer-gmp primitive scientific text
time transformers unordered-containers vector
];
testHaskellDepends = [
array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
primitive QuickCheck quickcheck-unicode random test-framework
test-framework-hunit test-framework-quickcheck2 text
];
homepage = "http://github.com/ghcjs/ghcjs-base";
description = "base library for GHCJS";
license = stdenv.lib.licenses.mit;
}

11
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -4,8 +4,8 @@ with haskellLib;
self: super: {
# Use the latest LLVM.
inherit (pkgs) llvmPackages;
# This compiler version needs llvm 5.x.
llvmPackages = pkgs.llvmPackages_5;
# Disable GHC 8.4.x core libraries.
array = null;
@ -55,11 +55,8 @@ self: super: {
# package's version constraints.
xmonad-extras = doJailbreak super.xmonad-extras;
# This package desperately needs a maintainer.
xmobar = super.xmobar.overrideScope (self: super: {
hinotify = self.hinotify_0_3_9; # https://github.com/jaor/xmobar/issues/356
dbus = self.dbus_0_10_15; # https://github.com/jaor/xmobar/issues/346
});
# https://github.com/jaor/xmobar/issues/356
xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; });
hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
}

4
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -4,8 +4,8 @@ with haskellLib;
self: super: {
# Use the latest LLVM.
inherit (pkgs) llvmPackages;
# This compiler version needs llvm 5.x.
llvmPackages = pkgs.llvmPackages_5;
# Disable GHC 8.6.x core libraries.
array = null;

4
pkgs/development/haskell-modules/configuration-ghc-head.nix
View File

@ -4,8 +4,8 @@ with haskellLib;
self: super: {
# Use the latest LLVM.
inherit (pkgs) llvmPackages;
# This compiler version needs llvm 5.x.
llvmPackages = pkgs.llvmPackages_5;
# Disable GHC 8.7.x core libraries.
array = null;

13
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -23,6 +23,11 @@ self: super:
};
in stage1 // stage2 // {
# GHCJS does not ship with the same core packages as GHC.
# https://github.com/ghcjs/ghcjs/issues/676
stm = self.stm_2_4_5_0;
ghc-compact = self.ghc-compact_0_1_0_0;
network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
@ -121,7 +126,6 @@ self: super:
});
ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ];
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
isLibrary = true;
});
@ -197,4 +201,11 @@ self: super:
base-orphans = dontCheck super.base-orphans;
distributive = dontCheck super.distributive;
# https://github.com/glguy/th-abstraction/issues/53
th-abstraction = dontCheck super.th-abstraction;
# https://github.com/dreixel/syb/issues/21
syb = dontCheck super.syb;
# https://github.com/ghcjs/ghcjs/issues/677
hspec-core = dontCheck super.hspec-core;
}

1744
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/node-packages/node-packages-v10.nix
View File

@ -213,10 +213,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
version = "2.9.0";
version = "2.11.2";
src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz";
sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968";
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz";
sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5";
};
buildInputs = globalBuildInputs;
meta = {

1506
pkgs/development/node-packages/node-packages-v6.nix
View File

File diff suppressed because it is too large Load Diff

551
pkgs/development/node-packages/node-packages-v8.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
version = "4.18-rc4";
modDirVersion = "4.18.0-rc4";
version = "4.18-rc5";
modDirVersion = "4.18.0-rc5";
extraMeta.branch = "4.18";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1nhl82ygz7sm6njnb9qg9k4jp0gr1cv2wxpayrpc4ab21xb6b5mj";
sha256 = "1r7ia0dc4p8xvyrl5kx9v7ii1m25ly0hg6xyz3zwhaailg1y4jzk";
};
# Should the testing kernels ever be built on Hydra?

2
pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
View File

@ -17,7 +17,7 @@ in stdenv.mkDerivation {
echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
cat "$f" >> "$out"/modprobe.conf
# https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1475945
sed -i '/^blacklist i2c_801/d' $out/modprobe.conf
sed -i '/^blacklist i2c_i801/d' $out/modprobe.conf
done
substituteInPlace "$out"/modprobe.conf \

4
pkgs/servers/jackett/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jackett-${version}";
version = "0.8.1209";
version = "0.9.1";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "0vql7h6diswvvh1a0rcisc541bk4ilp0ab1nn4z4dq16hcy0fv61";
sha256 = "1hj6ilhv98yzhfjvrgqrsgaz7bd1yqaayifir8ivsvqq8085nlf6";
};
buildInputs = [ makeWrapper ];

5
pkgs/servers/nosql/aerospike/default.nix
View File

@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
description = "Flash-optimized, in-memory, NoSQL database";
homepage = http://aerospike.com/;
license = licenses.agpl3;
platforms = [ "x86_64-linux" ];
maintainer = with maintainers; [ kalbasit ];
#platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64
platforms = platforms.linux;
maintainers = with maintainers; [ kalbasit ];
};
}

6
pkgs/servers/x11/xorg/default.nix
View File

@ -2420,11 +2420,11 @@ let
}) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
xkbcomp = (mkDerivation "xkbcomp" {
name = "xkbcomp-1.4.0";
name = "xkbcomp-1.4.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2;
sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw";
url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2;
sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libxkbfile xproto ];

4
pkgs/tools/compression/xz/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, enableStatic ? false }:
stdenv.mkDerivation rec {
name = "xz-5.2.4";
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ];
configureFlags = stdenv.lib.optional enableStatic "--disable-shared";
doCheck = true;
preCheck = ''

4
pkgs/top-level/haskell-packages.nix
View File

@ -84,7 +84,7 @@ in rec {
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghcjs = compiler.ghcjs82;
ghcjs = compiler.ghcjs84;
ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs {
bootPkgs = packages.ghc7103;
inherit (pkgs) cabal-install;
@ -166,7 +166,7 @@ in rec {
ghc = bh.compiler.ghcHEAD;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
};
ghcjs = packages.ghcjs82;
ghcjs = packages.ghcjs84;
ghcjs710 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs710;