diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-19 14:40:01 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-19 14:40:01 -0700 |
commit | 9f3c0d9967548602a10ccfa12f1327cbef86c894 (patch) | |
tree | 587cb32108e3b0120a500ee1ed676caac5067d6d /pkgs/top-level | |
parent | 8b670fba26b6b4536377c6178b29a6ff17169506 (diff) | |
parent | a23b96c74dd7d1b09f8e8bf218873b52fe5fa4a6 (diff) | |
download | nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.tar nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.tar.gz nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.tar.bz2 nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.tar.lz nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.tar.xz nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.tar.zst nixlib-9f3c0d9967548602a10ccfa12f1327cbef86c894.zip |
Merge branch 'master.upstream' into staging.post-15.06
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 228 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
3 files changed, 229 insertions, 26 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 605ee0c9ec61..8792976d4a56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2015,7 +2015,6 @@ let libuv = libuvVersions.v1_6_1; libtool = darwin.cctools; }; - nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { libtool = darwin.cctools; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation; @@ -3571,6 +3570,8 @@ let zinnia = callPackage ../tools/inputmethods/zinnia { }; tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; + zimwriterfs = callPackage ../tools/text/zimwriterfs { }; + zip = callPackage ../tools/archivers/zip { }; zpaq = callPackage ../tools/archivers/zpaq { }; @@ -7868,14 +7869,6 @@ let developerBuild = true; }); - qt53 = callPackage ../development/libraries/qt-5/5.3 { - mesa = mesa_noglu; - cups = if stdenv.isLinux then cups else null; - # GNOME dependencies are not used unless gtkStyle == true - inherit (gnome) libgnomeui GConf gnome_vfs; - bison = bison2; # error: too few arguments to function 'int yylex(... - }; - qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {}); qt5 = qt54; @@ -7884,7 +7877,7 @@ let qt5Full = appendToName "full" (qtEnv { qtbase = qt5.base; - paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5); + paths = lib.filter lib.isDerivation (lib.attrValues qt5); }); qtcreator = callPackage ../development/qtcreator { @@ -11451,9 +11444,7 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; - linssid = callPackage ../applications/networking/linssid { - qt5 = qt53; - }; + linssid = callPackage ../applications/networking/linssid { }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -12244,6 +12235,8 @@ let pencil = callPackage ../applications/graphics/pencil { }; + perseus = callPackage ../applications/science/math/perseus {}; + petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome) libgnomecanvas; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4a3d8437c6fb..6140137accb3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -64,43 +64,251 @@ rec { ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; ghc6123 = callPackage ../development/haskell-modules { ghc = compiler.ghc6123; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; }; ghc704 = callPackage ../development/haskell-modules { ghc = compiler.ghc704; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; }; ghc722 = callPackage ../development/haskell-modules { ghc = compiler.ghc722; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; }; ghc742 = callPackage ../development/haskell-modules { ghc = compiler.ghc742; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; }; ghc763 = callPackage ../development/haskell-modules { ghc = compiler.ghc763; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; + }; + ghc783 = callPackage ../development/haskell-modules { + ghc = compiler.ghc783; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; ghc784 = callPackage ../development/haskell-modules { ghc = compiler.ghc784; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; ghc7102 = callPackage ../development/haskell-modules { ghc = compiler.ghc7102; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; ghcNokinds = callPackage ../development/haskell-modules { ghc = compiler.ghcNokinds; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; }; ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; + + lts-0_0 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.0.nix { }; + }; + + lts-0_1 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.1.nix { }; + }; + + lts-0_2 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.2.nix { }; + }; + + lts-0_3 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.3.nix { }; + }; + + lts-0_4 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.4.nix { }; + }; + + lts-0_5 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.5.nix { }; + }; + + lts-0_6 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.6.nix { }; + }; + + lts-0_7 = packages.ghc783.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.7.nix { }; + }; + + lts-1_0 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.0.nix { }; + }; + + lts-1_1 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.1.nix { }; + }; + + lts-1_2 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.2.nix { }; + }; + + lts-1_4 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.4.nix { }; + }; + + lts-1_5 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.5.nix { }; + }; + + lts-1_7 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.7.nix { }; + }; + + lts-1_8 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.8.nix { }; + }; + + lts-1_9 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.9.nix { }; + }; + + lts-1_10 =packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.10.nix { }; + }; + + lts-1_11 =packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.11.nix { }; + }; + + lts-1_12 =packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.12.nix { }; + }; + + lts-1_13 =packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.13.nix { }; + }; + + lts-1_14 =packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.14.nix { }; + }; + + lts-1_15 =packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.15.nix { }; + }; + + lts-2_0 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.0.nix { }; + }; + + lts-2_1 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.1.nix { }; + }; + + lts-2_2 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.2.nix { }; + }; + + lts-2_3 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.3.nix { }; + }; + + lts-2_4 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.4.nix { }; + }; + + lts-2_5 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.5.nix { }; + }; + + lts-2_6 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.6.nix { }; + }; + + lts-2_7 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.7.nix { }; + }; + + lts-2_8 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.8.nix { }; + }; + + lts-2_9 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.9.nix { }; + }; + + lts-2_10 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.10.nix { }; + }; + + lts-2_11 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.11.nix { }; + }; + + lts-2_12 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.12.nix { }; + }; + + lts-2_13 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.13.nix { }; + }; + + lts-2_14 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.14.nix { }; + }; + + lts-2_15 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.15.nix { }; + }; + + lts-2_16 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.16.nix { }; + }; + + lts-2_17 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.17.nix { }; + }; + + lts-2_18 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.18.nix { }; + }; + + lts-2_19 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.19.nix { }; + }; + + lts-2_20 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.20.nix { }; + }; + + lts-2_21 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.21.nix { }; + }; + + lts-2_22 = packages.ghc784.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.22.nix { }; + }; + + lts-3_0 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.0.nix { }; + }; + + lts-3_1 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.1.nix { }; + }; + + lts-3_2 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.2.nix { }; + }; + + lts-3_3 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.3.nix { }; + }; + + lts-3_4 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.4.nix { }; + }; + + lts-3_5 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.5.nix { }; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92fa94b7ab50..3e114986ebbf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10021,6 +10021,8 @@ let name = "pep8-${version}"; version = "1.6.2"; + disabled = isPy35; # Not yet supported + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; sha256 = "1zybkcdw1sx84dvkfss96nhykqg9bc0cdpwpl4k9wlxm61bf7dxq"; @@ -15084,12 +15086,12 @@ let }; upass = buildPythonPackage rec { - version = "0.1.3"; + version = "0.1.4"; name = "upass-${version}"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/u/upass/upass-${version}.tar.gz"; - sha256 = "1gwp1b2xydc06pnj4a7kwadzs81fizqiyrq07l82dqjx4zkwn292"; + url = "https://github.com/Kwpolska/upass/archive/v${version}.tar.gz"; + sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb"; }; propagatedBuildInputs = with pythonPackages; [ |