diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 25 insertions, 13 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5376750593ae..e3131c4d7882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1138,7 +1138,6 @@ with pkgs; }; blueman = callPackage ../tools/bluetooth/blueman { - inherit (gnome3) dconf gsettings_desktop_schemas; withPulseAudio = config.pulseaudio or true; }; @@ -1850,7 +1849,10 @@ with pkgs; fdk_aac = callPackage ../development/libraries/fdk-aac { }; - flameGraph = callPackage ../development/tools/flamegraph { }; + flamegraph = callPackage ../development/tools/flamegraph { }; + + # Awkward historical capitalization for flamegraph. Remove eventually + flameGraph = flamegraph; flvtool2 = callPackage ../tools/video/flvtool2 { }; @@ -2574,6 +2576,8 @@ with pkgs; knockknock = callPackage ../tools/security/knockknock { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + kpcli = callPackage ../tools/security/kpcli { }; krename = libsForQt5.callPackage ../applications/misc/krename { }; @@ -6324,7 +6328,13 @@ with pkgs; ### DEVELOPMENT / TOOLS - activator = callPackage ../development/tools/activator { }; + activator = throw '' + Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life. + + See https://github.com/NixOS/nixpkgs/pull/25616 + and http://www.lightbend.com/community/core-tools/activator-and-sbt + for more information. + ''; alloy = callPackage ../development/tools/alloy { }; @@ -9691,6 +9701,8 @@ with pkgs; libva = libva-full; # also wants libva-x11 }; + kpmcore = callPackage ../development/libraries/kpmcore { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -13414,10 +13426,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_17_03 - docker_17_04; + docker_17_05; docker = docker_17_03; - docker-edge = docker_17_04; + docker-edge = docker_17_05; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -14457,9 +14469,7 @@ with pkgs; boost = boost155; }; - k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { }); - - k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { }; + k3b = kdeApplications.k3b; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; @@ -14544,7 +14554,7 @@ with pkgs; openjpeg = openjpeg_1; }; - krusader = kde4.callPackage ../applications/misc/krusader { }; + krusader = libsForQt5.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; @@ -15385,8 +15395,8 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK - qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; + # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 + qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; qsynth = callPackage ../applications/audio/qsynth { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d330de0f267f..3a185bc0a10b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -395,6 +395,8 @@ let ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; + octavius = callPackage ../development/ocaml-modules/octavius { }; + ojquery = callPackage ../development/ocaml-modules/ojquery { }; omd = callPackage ../development/ocaml-modules/omd { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a86b0b7d9b68..110ce6b84116 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -73,7 +73,7 @@ let in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; - inherit fetchPypi; + inherit fetchPypi callPackage; inherit sharedLibraryExtension; # helpers @@ -5252,8 +5252,8 @@ in { sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k"; }; + buildInputs = with self; [ pytest pytest_xdist virtualenv process-tests ]; propagatedBuildInputs = with self; [ coverage ]; - buildInputs = with self; [ pytest covCore virtualenv process-tests helper ]; # xdist related tests fail with the following error # OSError: [Errno 13] Permission denied: 'py/_code' |