diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 13 |
4 files changed, 15 insertions, 18 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4e91dee6a405c..9962c3c8fe6ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -148,7 +148,6 @@ mapAliases (rec { networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nfsUtils = nfs-utils; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1197bdffc9f7..d1cfa3463ef35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -573,8 +573,6 @@ with pkgs; awless = callPackage ../tools/virtualization/awless { }; - aws-auth = callPackage ../tools/admin/aws-auth { }; - ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -3582,6 +3580,8 @@ with pkgs; }; }; + memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; + memtest86 = callPackage ../tools/misc/memtest86 { }; memtest86plus = callPackage ../tools/misc/memtest86+ { }; @@ -3685,7 +3685,7 @@ with pkgs; mmake = callPackage ../tools/misc/mmake { }; - modemmanager = callPackage ../tools/networking/modemmanager {}; + modemmanager = callPackage ../tools/networking/modem-manager {}; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; @@ -3841,8 +3841,6 @@ with pkgs; networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; - networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; @@ -16949,7 +16947,7 @@ with pkgs; mypaint = callPackage ../applications/graphics/mypaint { }; - mythtv = callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -17311,6 +17309,7 @@ with pkgs; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = callPackage ../applications/graphics/qscreenshot { + inherit (darwin.apple_sdk.frameworks) Carbon; qt = qt4; }; @@ -19811,8 +19810,8 @@ with pkgs; inherit (callPackage ./coq-packages.nix {}) mkCoqPackages - coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 - coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 + coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 + coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 419fc485dd012..43d6d8d2dd5ed 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -71,10 +71,14 @@ in rec { coq_8_7 = callPackage ../applications/science/logic/coq { version = "8.7.2"; }; + coq_8_8 = callPackage ../applications/science/logic/coq { + version = "8.8+beta1"; + }; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; + coqPackages_8_8 = mkCoqPackages coq_8_8; coqPackages = coqPackages_8_7; coq = coqPackages.coq; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25aa2e9514f94..ca4a13b86dfdc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -267,6 +267,8 @@ in { lmtpd = callPackage ../development/python-modules/lmtpd { }; + logster = callPackage ../development/python-modules/logster { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -339,6 +341,8 @@ in { pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; + pygtail = callPackage ../development/python-modules/pygtail { }; + pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; @@ -5423,15 +5427,6 @@ in { natsort = callPackage ../development/python-modules/natsort { }; - logster = buildPythonPackage { - name = "logster-7475c53822"; - src = pkgs.fetchgit { - url = git://github.com/etsy/logster; - rev = "7475c53822"; - sha256 = "0565wxxiwksnly8rakb2r77k7lwzniq16kv861qd2ns9hgsjgy31"; - }; - }; - ncclient = callPackage ../development/python-modules/ncclient {}; logfury = callPackage ../development/python-modules/logfury { }; |