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 | 71 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
7 files changed, 64 insertions, 32 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6312d1bd571..fd873605056 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -280,6 +280,7 @@ mapAliases ({ qt_gstreamer1 = qt-gstreamer1; # added 2017-02 quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 + qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fc073db1d3..09ded301f91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -163,6 +163,8 @@ in proto-contrib = callPackage ../development/tools/proto-contrib {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + demoit = callPackage ../servers/demoit { }; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -244,6 +246,8 @@ in packer = callPackage ../development/tools/packer { }; + packr = callPackage ../development/libraries/packr { }; + pet = callPackage ../development/tools/pet { }; mod = callPackage ../development/tools/mod { }; @@ -1669,6 +1673,8 @@ in link-grammar = callPackage ../tools/text/link-grammar { }; + linuxptp = callPackage ../os-specific/linux/linuxptp { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -1784,6 +1790,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -2661,6 +2669,8 @@ in tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; + trompeloeil = callPackage ../development/libraries/trompeloeil { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -3947,7 +3957,10 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; - kakoune = callPackage ../applications/editors/kakoune { }; + wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { }; + kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { }; + kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; + kakoune = wrapKakoune kakoune-unwrapped { }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -4237,12 +4250,10 @@ in }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { openssl = openssl_1_1; - icu = icu63; }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; openssl = openssl_1_1; - icu = icu63; }; # Update this when adding the newest nodejs major version! @@ -4834,9 +4845,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { - buildGoPackage = buildGo110Package; - }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { }; @@ -6214,6 +6223,8 @@ in timetrap = callPackage ../applications/office/timetrap { }; + timetable = callPackage ../applications/office/timetable { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; tinc = callPackage ../tools/networking/tinc { }; @@ -7672,6 +7683,14 @@ in bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjfx11 = + if stdenv.isDarwin then + null + else + callPackage ../development/compilers/openjdk/openjfx/11.nix { + openjdk = openjdk11; + }; + openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } @@ -7686,6 +7705,7 @@ in callPackage ../development/compilers/openjdk/darwin/11.nix { } else callPackage ../development/compilers/openjdk/11.nix { + openjfx = openjfx11; inherit (gnome2) GConf gnome_vfs; }; @@ -7997,6 +8017,8 @@ in pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { }; + qbe = callPackage ../development/compilers/qbe { }; + rgbds = callPackage ../development/compilers/rgbds { }; rtags = callPackage ../development/tools/rtags { @@ -9182,6 +9204,8 @@ in drip = callPackage ../development/tools/drip { }; + drm_info = callPackage ../development/tools/drm_info { }; + drush = callPackage ../development/tools/misc/drush { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -14548,11 +14572,6 @@ in influxdb = callPackage ../servers/nosql/influxdb { }; - mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -14739,6 +14758,8 @@ in }; }; + roon-server = callPackage ../servers/roon-server { }; + s6 = skawarePackages.s6; s6-rc = skawarePackages.s6-rc; @@ -15198,6 +15219,8 @@ in iproute = callPackage ../os-specific/linux/iproute { }; + iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; + iputils = callPackage ../os-specific/linux/iputils { }; iptables = callPackage ../os-specific/linux/iptables { }; @@ -15721,6 +15744,8 @@ in nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; + nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { }; + nftables = callPackage ../os-specific/linux/nftables { }; noah = callPackage ../os-specific/darwin/noah { @@ -15864,7 +15889,7 @@ in semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { }; + powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -15881,6 +15906,8 @@ in procdump = callPackage ../os-specific/linux/procdump { }; + prototool = callPackage ../development/tools/prototool { }; + qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); # See `xenPackages` source for explanations. @@ -16134,6 +16161,8 @@ in aileron = callPackage ../data/fonts/aileron { }; + amiri = callPackage ../data/fonts/amiri { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -19014,7 +19043,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -19519,6 +19548,8 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; + vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { }; + openmpt123 = callPackage ../applications/audio/openmpt123 { }; opusfile = callPackage ../applications/audio/opusfile { }; @@ -19823,8 +19854,6 @@ in qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; - qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; - qtractor = libsForQt5.callPackage ../applications/audio/qtractor { }; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; @@ -21808,6 +21837,8 @@ in racer = callPackage ../games/racer { }; + redeclipse = callPackage ../games/redeclipse { }; + residualvm = callPackage ../games/residualvm { }; rftg = callPackage ../games/rftg { }; @@ -22420,6 +22451,8 @@ in niftyseg = callPackage ../applications/science/biology/niftyseg { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; + paml = callPackage ../applications/science/biology/paml { }; picard-tools = callPackage ../applications/science/biology/picard-tools { }; @@ -22945,12 +22978,6 @@ in ecl-fasl = true; sbcl = null; }; - # old version temporarily kept for sage - maxima-ecl-5_41 = callPackage ../applications/science/math/maxima/5.41.nix { - ecl = ecl_16_1_2; - ecl-fasl = true; - sbcl = null; - }; mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; @@ -24309,4 +24336,6 @@ in dapper = callPackage ../development/tools/dapper { }; + kube3d = callPackage ../applications/networking/cluster/kube3d {}; + } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 524f3bf4399..8a987c6cf14 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -54,17 +54,17 @@ let mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcompExtraGen multinomials + mathcompExtraGen multinomials coqeal mathcomp-finmap mathcomp-bigenough mathcomp-analysis - mathcomp-multinomials mathcomp-real-closed + mathcomp-multinomials mathcomp-real-closed mathcomp-coqeal mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis mathcomp_1_7-multinomials mathcomp_1_7-real-closed mathcomp_1_7-finmap_1_0 mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis - mathcomp_1_8-multinomials mathcomp_1_8-real-closed + mathcomp_1_8-multinomials mathcomp_1_8-real-closed mathcomp_1_8-coqeal mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis mathcomp_1_9-multinomials mathcomp_1_9-real-closed; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index ea4a0962a43..1740b327809 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -305,14 +305,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Boogie = buildDotnetPackage rec { baseName = "Boogie"; - version = "2018-05-28"; + version = "2019-06-20"; name = "${baseName}-unstable-${version}"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; - rev = "fc97aac639505f46cda7904dae95c9557716d037"; - sha256 = "1hjksc5sapw1shxjwg0swja5afman8i15wnv5b6rzkqd4mg8y6nz"; + rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e"; + sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2"; }; # emulate `nuget restore Source/Boogie.sln` @@ -359,11 +359,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Dafny = buildDotnetPackage rec { baseName = "Dafny"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz"; - sha256 = "1iyhy0zpi6wvqif7826anzgdipgsy5bk775ds9qqwfw27j7x6fy5"; + sha256 = "0s6ihx32kda7400lvdrq60l46c11nki8b6kalir2g4ic508f6ypa"; }; postPatch = '' diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 6df20d926d7..89698263f3d 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -312,7 +312,7 @@ let postInstall = '' mkdir -p $out mv $out/share/emacs/site-lisp/elpa/*/server/bin $out - rm -rf $out/share/emacs/site-lisp/*/server + rm -rf $out/share/emacs/site-lisp/elpa/*/server ''; preCheck = '' cd source/server diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf4d9fc77f6..e0e55fd507b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15787,11 +15787,11 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "4.10.0"; + version = "5.4.0"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "1dfwq4d46kx18lz27rb3jkxb0g1hirpq70vr4572sc38rybpq59v"; + sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c06cf060d6e..e957fe5746c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2099,6 +2099,8 @@ in { google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + google-pasta = callPackage ../development/python-modules/google-pasta { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; |