diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
commit | 8213ff161c461655aaff7d43984384dbca64b312 (patch) | |
tree | 3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/top-level | |
parent | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff) | |
parent | e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff) | |
download | nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.gz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2 nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.lz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.xz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.zst nixlib-8213ff161c461655aaff7d43984384dbca64b312.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 97 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 79 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 84 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 3 |
6 files changed, 137 insertions, 150 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a5bf546a204..fe77a591876f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,7 +85,6 @@ mapAliases ({ evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 - fam = gamin; # added 2018-04-25 ffadoFull = ffado; # added 2018-05-01 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 @@ -98,10 +97,8 @@ mapAliases ({ gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gettextWithExpat = gettext; # 2016-02-19 - gflags = google-gflags; # added 2018-04-25 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 - gmock = gtest; # added 2018-04-25 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 @@ -132,7 +129,6 @@ mapAliases ({ iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 inotifyTools = inotify-tools; - jack2Full = jack2; # added 2018-04-25 joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 @@ -140,7 +136,6 @@ mapAliases ({ keepassx-community = keepassxc; # added 2017-11 keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 - kerberos = libkrb5; # added 2018-04-25 keybase-go = keybase; # added 2016-08-24 krename-qt5 = krename; # added 2017-02-18 kvm = qemu_kvm; # added 2018-04-25 @@ -158,7 +153,6 @@ mapAliases ({ libgumbo = gumbo; # added 2018-01-21 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - liblrdf = librdf; # added 2018-04-25 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 @@ -170,7 +164,6 @@ mapAliases ({ lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 - lzma = xz; # added 2018-04-25 m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 @@ -182,7 +175,6 @@ mapAliases ({ mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 - mysql = mariadb; # added 2018-04-25 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 @@ -198,7 +190,6 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 - openal = openalSoft; # added 2018-04-25 opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 @@ -217,7 +208,6 @@ mapAliases ({ pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 pltScheme = racket; # just to be sure - polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 @@ -229,7 +219,6 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 - redland = librdf_redland; # added 2018-04-25 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -261,7 +250,6 @@ mapAliases ({ spice_protocol = spice-protocol; # added 2018-02-25 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 - sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 @@ -289,7 +277,6 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 tshark = wireshark-cli; # added 2018-04-25 ucsFonts = ucs-fonts; # added 2016-07-15 - udev = systemd; # added 2018-04-25 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 vimbWrapper = vimb; # added 2015-01 @@ -306,7 +293,6 @@ mapAliases ({ xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 - yacc = bison; # added 2018-04-25 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 @@ -319,6 +305,11 @@ mapAliases ({ libva-full = libva; libva1-full = libva1; + # forceSystem should not be used directly in Nixpkgs. + # added 2018-07-16 + forceSystem = system: _: + (import self.path { localSystem = { inherit system; }; }); + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 @@ -347,5 +338,4 @@ mapAliases ({ ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; - ocaml = ocamlPackages.ocaml; })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1957bd65be5..eb793ab0b472 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2864,6 +2864,8 @@ with pkgs; gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; + gmock = gtest; # TODO: move to aliases.nix + gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; @@ -3394,7 +3396,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_2; - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -3729,6 +3731,7 @@ with pkgs; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; + lzma = xz; # TODO: move to aliases.nix lz4 = callPackage ../tools/compression/lz4 { }; @@ -4035,7 +4038,7 @@ with pkgs; netboot = callPackage ../tools/networking/netboot {}; - netcat = netcat-openbsd; + netcat = libressl.nc; netcat-gnu = callPackage ../tools/networking/netcat { }; @@ -4718,7 +4721,7 @@ with pkgs; qshowdiff = callPackage ../tools/text/qshowdiff { }; - qtikz = callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quicktun = callPackage ../tools/networking/quicktun { }; @@ -5070,7 +5073,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; + sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; @@ -5174,6 +5177,7 @@ with pkgs; srcml = callPackage ../applications/version-management/srcml { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshfs = sshfs-fuse; # added 2017-08-14 sshlatex = callPackage ../tools/typesetting/sshlatex { }; @@ -5344,7 +5348,7 @@ with pkgs; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; - texstudio = callPackage ../applications/editors/texstudio { }; + texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; textadept = callPackage ../applications/editors/textadept { }; @@ -6978,6 +6982,7 @@ with pkgs; obliv-c = callPackage ../development/compilers/obliv-c {}; ocaml-ng = callPackage ./ocaml-packages.nix { }; + ocaml = ocamlPackages.ocaml; ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; @@ -6994,7 +6999,7 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -7075,7 +7080,9 @@ with pkgs; scalafmt = callPackage ../development/tools/scalafmt { }; - sdcc = callPackage ../development/compilers/sdcc { }; + sdcc = callPackage ../development/compilers/sdcc { + gputils = null; + }; serpent = callPackage ../development/compilers/serpent { }; @@ -7116,7 +7123,7 @@ with pkgs; }; teyjus = callPackage ../development/compilers/teyjus { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; omake = omake_rc1; }; @@ -7838,6 +7845,7 @@ with pkgs; bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + yacc = bison; # TODO: move to aliases.nix blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; @@ -8164,6 +8172,8 @@ with pkgs; gotty = callPackage ../servers/gotty { }; + gputils = callPackage ../development/tools/misc/gputils { }; + gradleGen = callPackage ../development/tools/build-managers/gradle { }; gradle = self.gradleGen.gradle_latest; gradle_2_14 = self.gradleGen.gradle_2_14; @@ -9220,6 +9230,7 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; gamin = callPackage ../development/libraries/gamin { }; + fam = gamin; # added 2018-04-25 ganv = callPackage ../development/libraries/ganv { }; @@ -9415,6 +9426,7 @@ with pkgs; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; google-gflags = callPackage ../development/libraries/google-gflags { }; + gflags = google-gflags; # TODO: move to aliases.nix gperftools = callPackage ../development/libraries/gperftools { }; @@ -9830,6 +9842,7 @@ with pkgs; fetchurl = fetchurlBoot; type = "lib"; }; + kerberos = libkrb5; # TODO: move to aliases.nix languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -10899,6 +10912,7 @@ with pkgs; mbedtls = callPackage ../development/libraries/mbedtls { }; mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { }; + polarssl = mbedtls; # TODO: add to aliases.nix mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds_0_12_1 = callPackage ../development/libraries/mdds/0.12.1.nix { }; @@ -11129,6 +11143,7 @@ with pkgs; openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; + openal = openalSoft; openbabel = callPackage ../development/libraries/openbabel { }; @@ -11651,8 +11666,10 @@ with pkgs; librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { }; librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; + redland = librdf_redland; # added 2018-04-25 librdf = callPackage ../development/libraries/librdf { }; + liblrdf = librdf; # added 2018-04-25 libsmf = callPackage ../development/libraries/audio/libsmf { }; @@ -12771,6 +12788,8 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; + hydron = callPackage ../servers/hydron { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -12963,6 +12982,7 @@ with pkgs; inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; + mysql = mariadb; # TODO: move to aliases.nix mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; @@ -13466,7 +13486,7 @@ with pkgs; directvnc = callPackage ../os-specific/linux/directvnc { }; dmraid = callPackage ../os-specific/linux/dmraid { - devicemapper = devicemapper.override {enable_dmeventd = true;}; + lvm2 = lvm2.override {enable_dmeventd = true;}; }; drbd = callPackage ../os-specific/linux/drbd { }; @@ -14376,6 +14396,7 @@ with pkgs; systemd = callPackage ../os-specific/linux/systemd { utillinux = utillinuxMinimal; # break the cyclic dependency }; + udev = systemd; # TODO: move to aliases.nix # standalone cryptsetup generator for systemd systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; @@ -15618,13 +15639,11 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - # go 1.9 pin until https://github.com/moby/moby/pull/35739 - inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) - docker_18_03 - docker_18_05; + inherit (callPackage ../applications/virtualization/docker {}) + docker_18_06; - docker = docker_18_03; - docker-edge = docker_18_05; + docker = docker_18_06; + docker-edge = docker_18_06; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -15913,7 +15932,7 @@ with pkgs; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch; - inherit emacs texinfo makeWrapper runCommand; + inherit emacs texinfo makeWrapper runCommand writeText; inherit (xorg) lndir; trivialBuild = callPackage ../build-support/emacs/trivial.nix { @@ -15927,7 +15946,8 @@ with pkgs; external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; - inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m; + inherit + autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib; }; }; @@ -16418,7 +16438,7 @@ with pkgs; praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { - lua5_sockets = lua5_1_sockets; + lua5_sockets = lua51Packages.luasocket; lua5 = lua5_1; }; @@ -16758,8 +16778,6 @@ with pkgs; inferno = pkgsi686Linux.callPackage ../applications/inferno { }; - inginious = callPackage ../servers/inginious {}; - inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; poppler = poppler_0_61; @@ -16927,6 +16945,7 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; + poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -16935,6 +16954,8 @@ with pkgs; ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + ksonnet = callPackage ../applications/networking/cluster/ksonnet { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; @@ -17130,6 +17151,8 @@ with pkgs; marathon = callPackage ../applications/networking/cluster/marathon { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; + markdown-pp = callPackage ../tools/text/markdown-pp { }; + marp = callPackage ../applications/office/marp { }; matchbox = callPackage ../applications/window-managers/matchbox { }; @@ -17343,8 +17366,11 @@ with pkgs; xvSupport = !stdenv.isDarwin; }; + mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; + mpvScripts = { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; + mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -17476,6 +17502,7 @@ with pkgs; synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; + mlt-qt5 = libsForQt5.mlt; }; typora = callPackage ../applications/editors/typora { }; @@ -17645,7 +17672,10 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; ocamlPackages = ocamlPackages_4_02; }; + orpie = callPackage ../applications/misc/orpie { + gsl = gsl_1; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; osmo = callPackage ../applications/office/osmo { }; @@ -18651,6 +18681,8 @@ with pkgs; vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcv-rack = callPackage ../applications/audio/vcv-rack { }; + vdirsyncer = callPackage ../tools/misc/vdirsyncer { }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; @@ -19681,6 +19713,8 @@ with pkgs; nethack = callPackage ../games/nethack { }; + nethack-qt = callPackage ../games/nethack { qtMode = true; }; + nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; neverball = callPackage ../games/neverball { }; @@ -20554,8 +20588,10 @@ with pkgs; boogie = dotnetPackages.Boogie; - inherit (callPackage ./coq-packages.nix {}) - mkCoqPackages + inherit (callPackage ./coq-packages.nix { + inherit (ocaml-ng) ocamlPackages_3_12_1 + ocamlPackages_4_02; + }) mkCoqPackages 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 @@ -20579,7 +20615,7 @@ with pkgs; drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; }; eprover = callPackage ../applications/science/logic/eprover { }; @@ -20612,7 +20648,7 @@ with pkgs; }; iprover = callPackage ../applications/science/logic/iprover { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; }; jonprl = callPackage ../applications/science/logic/jonprl { @@ -20627,7 +20663,7 @@ with pkgs; elan = callPackage ../applications/science/logic/elan {}; leo2 = callPackage ../applications/science/logic/leo2 { - ocaml = ocamlPackages_4_01_0.ocaml;}; + ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; logisim = callPackage ../applications/science/logic/logisim {}; @@ -20656,7 +20692,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocamlPackages_4_01_0; + prooftree = (with ocaml-ng.ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; }); @@ -20668,7 +20704,7 @@ with pkgs; sapic = callPackage ../applications/science/logic/sapic { }; satallax = callPackage ../applications/science/logic/satallax { - ocaml = ocamlPackages_4_01_0.ocaml; + ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; saw-tools = callPackage ../applications/science/logic/saw-tools {}; @@ -21197,6 +21233,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; }; libjack2 = jack2.override { prefix = "lib"; }; + jack2Full = jack2; # TODO: move to aliases.nix keynav = callPackage ../tools/X11/keynav { }; @@ -21212,7 +21249,7 @@ with pkgs; lilypond = lilypond-unstable; }; - lollypop-portal = callPackages ../misc/lollypop-portal { }; + lollypop-portal = callPackage ../misc/lollypop-portal { }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; @@ -21744,6 +21781,8 @@ with pkgs; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; + xlog = callPackage ../applications/misc/xlog { }; + xmagnify = callPackage ../tools/X11/xmagnify { }; xosd = callPackage ../misc/xosd { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index c4c264c811ad..f6c992d5bd5f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,7 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand, writeText , emacs, texinfo, lndir, makeWrapper , trivialBuild @@ -50,7 +50,7 @@ let }; melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { - inherit lib; + inherit external lib; }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { @@ -99,7 +99,11 @@ let nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; - fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ]; + recipe = writeText "recipe" '' + (pdf-tools + :repo "politza/pdf-tools" :fetcher github + :files ("lisp/pdf-*.el" "server/epdfinfo")) + ''; packageRequires = [ tablist let-alist ]; meta = { description = "Emacs support library for PDF files"; @@ -118,7 +122,12 @@ let }; buildInputs = [ external.libffi ]; preBuild = "make"; - files = [ "ffi-glue" "ffi.el" ]; + recipe = writeText "recipe" '' + (elisp-ffi + :repo "skeeto/elisp-ffi" + :fetcher github + :files ("ffi-glue" "ffi.el")) + ''; meta = { description = "Emacs Lisp Foreign Function Interface"; longDescription = '' @@ -163,6 +172,9 @@ let rev = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8"; sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs"; }; + recipe = writeText "recipe" '' + (elpy :repo "jorgenschaefer/elpy" :fetcher github) + ''; patchPhase = '' for file in elpy.el elpy-pkg.el; do @@ -203,6 +215,9 @@ let rev = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167"; sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj"; }; + recipe = writeText "recipe" '' + (evil-jumper :repo "bling/evil-jumper" :fetcher github) + ''; packageRequires = [ evil ]; meta = { description = "Jump across buffer boundaries and revive dead buffers if necessary"; @@ -222,6 +237,11 @@ let rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177"; sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd"; }; + recipe = writeText "recipe" '' + (find-file-in-project + :repo "technomancy/find-file-in-project" + :fetcher github) + ''; meta = { description = "Quick access to project files in Emacs"; longDescription = '' @@ -243,6 +263,9 @@ let src = external.ghc-mod.src; packageRequires = [ haskell-mode ]; propagatedUserEnvPkgs = [ external.ghc-mod ]; + recipe = writeText "recipe" '' + (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) + ''; fileSpecs = [ "elisp/*.el" ]; meta = { description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; @@ -259,6 +282,11 @@ let rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; + recipe = writeText "recipe" '' + (haskell-unicode-input-method + :repo "roelvandijk/emacs-haskell-unicode-input-method" + :fetcher github) + ''; packageRequires = []; meta = { homepage = "https://melpa.org/#haskell-unicode-input-method/"; @@ -278,7 +306,11 @@ let src = external.hindent.src; packageRequires = [ haskell-mode ]; propagatedUserEnvPkgs = [ external.hindent ]; - fileSpecs = [ "elisp/*.el" ]; + recipe = writeText "recipe" '' + (hindent + :repo "commercialhaskell/hindent" :fetcher github + :files ("elisp/*.el")) + ''; meta = { description = "Indent haskell code using the \"hindent\" program"; license = bsd3; @@ -297,7 +329,11 @@ let configurePhase = ":"; propagatedUserEnvPkgs = [ external.rtags ]; - fileSpecs = [ "src/*.el" ]; + recipe = writeText "recipe" '' + (rtags + :repo "andersbakken/rtags" :fetcher github + :files ("src/*.el")) + ''; inherit (external.rtags) meta; }; @@ -305,7 +341,9 @@ let pname = "lcs"; version = circe.version; src = circe.src; - fileSpecs = [ "lcs.el" ]; + recipe = writeText "recipe" '' + (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lcs.el")) + ''; meta = { description = "Longest Common Sequence (LCS) library for Emacs"; license = gpl3Plus; @@ -320,7 +358,9 @@ let version = circe.version; src = circe.src; packageRequires = [ tracking ]; - fileSpecs = [ "lui*.el" ]; + recipe = writeText "recipe" '' + (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lui*.el")) + ''; meta = { description = "User interface library for Emacs"; license = gpl3Plus; @@ -345,7 +385,9 @@ let pname = "shorten"; version = circe.version; src = circe.src; - fileSpecs = [ "shorten.el" ]; + recipe = writeText "recipe" '' + (shorten :repo "jorgenschaefer/circe" :fetcher github :files ("shorten.el")) + ''; meta = { description = "String shortening to unique prefix library for Emacs"; license = gpl3Plus; @@ -354,20 +396,10 @@ let stgit = callPackage ../applications/editors/emacs-modes/stgit { }; - structured-haskell-mode = melpaBuild rec { - pname = "shm"; - version = external.structured-haskell-mode.version; - src = external.structured-haskell-mode.src; - packageRequires = [ haskell-mode ]; - fileSpecs = [ "elisp/*.el" ]; + structured-haskell-mode = self.shm; + shm = (melpaPackages self).shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; - - meta = { - description = "Structured editing Emacs mode for Haskell"; - license = bsd3; - platforms = external.structured-haskell-mode.meta.platforms; - }; - }; + }); thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { }; @@ -386,6 +418,9 @@ let rm weechat-sauron.el weechat-secrets.el ''; packageRequires = [ s ]; + recipe = writeText "recipe" '' + (weechat :repo "the-kenny/weechat" :fetcher github) + ''; meta = { description = "A weechat IRC client frontend for Emacs"; license = gpl3Plus; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4f63e2347eb..c3465fbda44a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12334,7 +12334,7 @@ let self = _self // overrides; _self = with self; { url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"; sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507"; }; - nativeBuildInputs = [ pkgs.docbook_xml_xslt pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; + nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ]; LC_ALL="en_US.UTF-8"; @@ -17776,7 +17776,7 @@ let self = _self // overrides; _self = with self; { }; }; -} // stdenv.lib.optionalAttrs (config.skipAliases or false == false) { +} // stdenv.lib.optionalAttrs (config.allowAliases or true) { autodie = null; # part of Perl AutoLoader = null; # part of Perl 5.22 constant = null; # part of Perl 5.22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43d9f110a757..dddfa74f43ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5473,23 +5473,6 @@ in { flask-babel = callPackage ../development/python-modules/flask-babel { }; - flask_cache = buildPythonPackage rec { - name = "Flask-Cache-0.13.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Cache/${name}.tar.gz"; - sha256 = "90126ca9bc063854ef8ee276e95d38b2b4ec8e45fd77d5751d37971ee27c7ef4"; - }; - - propagatedBuildInputs = with self; [ werkzeug flask ]; - - meta = { - homepage = https://github.com/thadeusb/flask-cache; - description = "Adds cache support to your Flask application"; - license = "BSD"; - }; - }; - flask-caching = callPackage ../development/python-modules/flask-caching { }; flask-common = callPackage ../development/python-modules/flask-common { }; @@ -7111,7 +7094,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm; }; + llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_6; }; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -12612,30 +12595,6 @@ in { simplejson = callPackage ../development/python-modules/simplejson { }; - simpleldap = buildPythonPackage rec { - version = "0.8"; - name = "simpleldap-${version}"; - - propagatedBuildInputs = with self; [ ldap ]; - buildInputs = with self; [ pep8 pytest tox ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/simpleldap/simpleldap-${version}.tar.gz"; - sha256 = "a5916680a7fe1b2c5d74dc76351be2941d03b7b94a50d8520280e3f588a84e61"; - }; - - meta = { - description = "A module that makes simple LDAP usage simple"; - longDescription = '' - A small wrapper around the python-ldap library that provides a more - Pythonic interface for LDAP server connections, LDAP objects, and the - common get and search operations. - ''; - license = licenses.mit; - maintainers = with maintainers; [ layus ]; - }; - }; - simpleparse = buildPythonPackage rec { version = "2.1.1"; name = "simpleparse-${version}"; @@ -15812,44 +15771,7 @@ EOF }; }; - graphite_api = buildPythonPackage rec { - name = "graphite-api-1.0.1"; - disabled = isPyPy; - - src = pkgs.fetchgit { - url = "https://github.com/brutasse/graphite-api.git"; - rev = "b6f75e8a08fae695c094fece6de611b893fc65fb"; - sha256 = "1n8h5krhv7hzmn336y9vjrmv6b6009lz5hj0d9wz7v1k2500ws5k"; - }; - - checkPhase = "nosetests"; - - propagatedBuildInputs = with self; [ - flask - flask_cache - cairocffi - pyparsing - pytz - pyyaml - raven - six - structlog - tzlocal - ]; - - buildInputs = with self; [ - nose - mock - ]; - - LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; - - meta = { - description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = https://github.com/brutasse/graphite-api; - license = licenses.asl20; - }; - }; + graphite_api = callPackage ../development/python-modules/graphite-api { }; graphite_beacon = buildPythonPackage rec { name = "graphite_beacon-0.27.0"; @@ -18010,6 +17932,8 @@ EOF qiskit = callPackage ../development/python-modules/qiskit { }; qasm2image = callPackage ../development/python-modules/qasm2image { }; + + simpy = callPackage ../development/python-modules/simpy { }; }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index cc70950c497c..5b802aea0758 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -97,8 +97,7 @@ let res self; in res; - aliases = self: super: if config.skipAliases or false then {} - else import ./aliases.nix lib self super; + aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); # stdenvOverrides is used to avoid having multiple of versions # of certain dependencies that were used in bootstrapping the |