diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 65 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haxe-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/java-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 29 | ||||
-rw-r--r-- | pkgs/top-level/release-python.nix | 4 |
12 files changed, 46 insertions, 89 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb793ab0b472..8980ccf4c245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -700,9 +700,7 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { - pkgs_i686 = pkgsi686Linux; - }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -860,6 +858,8 @@ with pkgs; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + libtensorflow = callPackage ../development/libraries/libtensorflow { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; bliss = callPackage ../applications/science/math/bliss { }; @@ -5168,7 +5168,7 @@ with pkgs; sourceHighlight = callPackage ../tools/text/source-highlight { }; - spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; + spaceFM = callPackage ../applications/misc/spacefm { }; squashfsTools = callPackage ../tools/filesystems/squashfs { }; @@ -6757,9 +6757,8 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk10distro = packageType: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); + oraclejdk10distro = packageType: _: + (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); jikes = callPackage ../development/compilers/jikes { }; @@ -8640,7 +8639,6 @@ with pkgs; xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - stdenv = buildPackages.clangStdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { @@ -11418,7 +11416,6 @@ with pkgs; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; - inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -11439,7 +11436,7 @@ with pkgs; qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11453,7 +11450,7 @@ with pkgs; qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11468,7 +11465,7 @@ with pkgs; qt511 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.11) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -12168,13 +12165,9 @@ with pkgs; wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { - graphviz = graphviz-nox; - }; + wayland = callPackage ../development/libraries/wayland { }; - wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { - graphviz = graphviz-nox; - }; + wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { }; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; @@ -12561,7 +12554,7 @@ with pkgs; openblas = openblasCompat; withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; - inherit (darwin) cf-private libobjc; + inherit (darwin) libobjc; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -12678,7 +12671,6 @@ with pkgs; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; - python = python27; sphinx = python27Packages.sphinx; erlang = erlangR19; }; @@ -15749,7 +15741,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { @@ -15767,7 +15759,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { @@ -16367,9 +16359,7 @@ with pkgs; python = python27; }; - git-review = callPackage ../applications/version-management/git-review { - python = python27; - }; + git-review = callPackage ../applications/version-management/git-review { }; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -16412,7 +16402,6 @@ with pkgs; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; - androidsdk = androidsdk_extras; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; }); @@ -16867,9 +16856,7 @@ with pkgs; let mkApplications = import ../applications/kde; attrs = { - inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; - inherit plasma5; - inherit attica phonon; + inherit lib libsForQt5 fetchurl; inherit okteta; }; in @@ -17181,7 +17168,6 @@ with pkgs; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; - inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI }; @@ -17500,7 +17486,6 @@ with pkgs; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -17702,7 +17687,7 @@ with pkgs; pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + paraview = libsForQt59.callPackage ../applications/graphics/paraview { }; packet = callPackage ../development/tools/packet { }; @@ -18449,8 +18434,9 @@ with pkgs; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - # linux only by now - synergy = callPackage ../applications/misc/synergy { }; + synergy = callPackage ../applications/misc/synergy { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; + }; tabbed = callPackage ../applications/window-managers/tabbed { # if you prefer a custom config, write the config.h in tabbed.config.h @@ -18814,9 +18800,6 @@ with pkgs; nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - primusLib_i686 = if system == "x86_64-linux" - then pkgsi686Linux.primusLib - else null; libglvnd_i686 = if system == "x86_64-linux" then pkgsi686Linux.libglvnd else null; @@ -19232,7 +19215,7 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; #TODO: 'pil' is not available for python3, yet xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; @@ -19266,7 +19249,6 @@ with pkgs; finalterm = callPackage ../applications/misc/finalterm { }; roxterm = callPackage ../applications/misc/roxterm { - inherit (pythonPackages) lockfile; inherit (gnome3) gsettings-desktop-schemas vte; }; @@ -20174,7 +20156,7 @@ with pkgs; lumina = libsForQt5.callPackage ../desktops/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5 fetchFromGitHub; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); @@ -21244,7 +21226,7 @@ with pkgs; kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; }; + lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; @@ -21683,7 +21665,6 @@ with pkgs; }; vice = callPackage ../misc/emulators/vice { - libX11 = xorg.libX11; giflib = giflib_4_1; }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8f8caf755edf..3440bfafb110 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, callPackage, wxGTK30, darwin }: +{ callPackage, wxGTK30 }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 4527451d71a4..3782fc33d6a6 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,6 @@ , fetchNuGet , pkgconfig , mono -, monodevelop , fsharp , unzip , overrides ? {} diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f6c992d5bd5f..5d042c3385e1 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -39,7 +39,7 @@ , melpaBuild , external -}@args: +}: with lib.licenses; @@ -50,16 +50,14 @@ let }; melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { - inherit external lib; + inherit external; }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { inherit external lib; }; - orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { - inherit fetchurl lib stdenv texinfo; - }; + orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { inherit lib lndir makeWrapper stdenv runCommand; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5fef4872db21..bef3c2d0a219 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,5 +1,5 @@ { buildPackages, pkgs -, newScope, stdenv +, newScope , buildPlatform, targetPlatform }: diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 5a85dc3433ba..35b0b42da3fe 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }: +{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: let self = haxePackages; - callPackage = newScope self; haxePackages = with self; { withCommas = stdenv.lib.replaceChars ["."] [","]; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 77cd5b0eba53..73ed6bf9162c 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, maven }: +{ pkgs }: with pkgs; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 017b9fca3f93..cb9df4382463 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,15 +5,14 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which, fetchpatch, writeText }: let - isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a49d638dc47e..eb76c323dde4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -748,14 +748,14 @@ let # Jane Street janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; - + janeStreet = import ../development/ocaml-modules/janestreet { - inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit; + inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re zarith ppxlib; inherit (pkgs) stdenv openssl; }; - + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; }; inherit lib ocaml ocamlbuild ctypes cryptokit; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3465fbda44a..da5c9f68a095 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}: +{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: let self = _self // overrides; _self = with self; { @@ -5038,7 +5038,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { - homepage = http://www.matijs.net/software/msgconv/; + homepage = https://www.matijs.net/software/msgconv/; description = "A .MSG to mbox converter"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; @@ -15990,7 +15990,7 @@ let self = _self // overrides; _self = with self; { install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.3/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dddfa74f43ee..fa3da8c99fd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3105,6 +3105,8 @@ in { }; + image-match = callPackage ../development/python-modules/image-match { }; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; immutables = callPackage ../development/python-modules/immutables {}; @@ -4542,6 +4544,8 @@ in { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; + zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-4.1.2"; @@ -9620,7 +9624,7 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales pandoc git; + inherit (pkgs) glibcLocales git; }; pep8 = buildPythonPackage rec { @@ -12411,28 +12415,7 @@ in { scipy = callPackage ../development/python-modules/scipy { }; - scikitimage = buildPythonPackage rec { - name = "scikit-image-${version}"; - version = "0.12.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scikit-image/${name}.tar.gz"; - sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2"; - }; - - buildInputs = with self; [ cython dask nose numpy scipy six ]; - - propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ]; - - # the test fails because the loader cannot create test objects! - doCheck = false; - - meta = { - description = "Image processing routines for SciPy"; - homepage = http://scikit-image.org; - license = licenses.bsd3; - }; - }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = callPackage ../development/python-modules/scikitlearn { inherit (pkgs) gfortran glibcLocales; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 3bc252e440f7..8b7240e21a33 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,9 +3,7 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } -, officialRelease ? false -, # The platforms for which we build Nixpkgs. +{ # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] }: |