diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 30 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 1 |
3 files changed, 31 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b16df6ae03..31cfcc41b5dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2820,6 +2820,8 @@ let oraclejdk = pkgs.jdkdistro true false; + oraclejdk7 = pkgs.oraclejdk7distro true false; + oraclejre = lowPrio (pkgs.jdkdistro false false); jrePlugin = lowPrio (pkgs.jdkdistro false true); @@ -2833,6 +2835,11 @@ let (if pluginSupport then appendToName "plugin" else x: x) (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); + oraclejdk7distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "plugin" else x: x) + (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); + jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { @@ -2926,6 +2933,7 @@ let camlimages = callPackage ../development/ocaml-modules/camlimages { libpng = libpng12; + giflib = giflib_4_1; }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -3643,10 +3651,11 @@ let gnum4 = callPackage ../development/tools/misc/gnum4 { }; - gnumake = callPackage ../development/tools/build-managers/gnumake { }; - - gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { }; - gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { }; + gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; + gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; + gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; + gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; + gnumake = gnumake382; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -4332,6 +4341,7 @@ let glsurf = callPackage ../applications/science/math/glsurf { inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; libpng = libpng12; + giflib = giflib_4_1; }; gmime = callPackage ../development/libraries/gmime { }; @@ -5095,6 +5105,7 @@ let libupnp = callPackage ../development/libraries/pupnp { }; giflib = callPackage ../development/libraries/giflib { }; + giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { }; @@ -5400,7 +5411,9 @@ let openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; - openscenegraph = callPackage ../development/libraries/openscenegraph {}; + openscenegraph = callPackage ../development/libraries/openscenegraph { + giflib = giflib_4_1; + }; openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -7464,7 +7477,9 @@ let arora = callPackage ../applications/networking/browsers/arora { }; - aseprite = callPackage ../applications/editors/aseprite { }; + aseprite = callPackage ../applications/editors/aseprite { + giflib = giflib_4_1; + }; audacious = callPackage ../applications/audio/audacious { }; @@ -8494,7 +8509,7 @@ let jackSupport = config.mumble.jackSupport or false; }; - murmur = callPackage ../applications/networking/mumble/murmur.nix { + murmur = callPackage ../applications/networking/mumble/murmur.nix { avahi = avahi.override { withLibdnssdCompat = true; }; @@ -10347,6 +10362,7 @@ let vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; + giflib = giflib_4_1; }; viewnior = callPackage ../applications/graphics/viewnior { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 747ce660b511..40446bcd3660 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -975,6 +975,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; + exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; @@ -992,6 +994,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fileLocation = callPackage ../development/libraries/haskell/file-location {}; + extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; + extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; @@ -1170,6 +1174,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hashtables = callPackage ../development/libraries/haskell/hashtables {}; + haskelldb = callPackage ../development/libraries/haskell/haskelldb {}; + haskeline = callPackage ../development/libraries/haskell/haskeline {}; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; @@ -1361,6 +1367,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x intervals = callPackage ../development/libraries/haskell/intervals {}; + IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {}; + ioChoice = callPackage ../development/libraries/haskell/io-choice {}; IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cc62eaec86d4..cccd1363864b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -309,7 +309,6 @@ let vim = linux; vimHugeX = linux; VisualBoyAdvance = linux; - vlc = linux; vncrec = linux; vorbisTools = linux; vpnc = linux; |