public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ihatemoney

Browse Source
This commit is contained in:
Léo Gaspard
2020-01-09 03:49:03 +01:00
committed by GitHub
parent 665fee312a 1b28e47ae1
commit b31660e5bb
8539 changed files with 257718 additions and 176052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/aliases.nix
+97 -8
View File
@@ -40,6 +40,7 @@ mapAliases ({
adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
alienfx = throw "alienfx has been removed."; # added 2019-12-08
ammonite-repl = ammonite; # added 2017-05-02
arduino_core = arduino-core; # added 2015-02-04
asciidocFull = asciidoc-full; # added 2014-06-22
@@ -47,7 +48,12 @@ mapAliases ({
at_spi2_core = at-spi2-core; # added 2018-02-25
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
beegfs = throw "beegfs has been removed."; # added 2019-11-24
bluezFull = bluez; # Added 2019-12-03
bridge_utils = bridge-utils; # added 2015-02-20
bro = zeek; # added 2019-09-29
bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
btrfsProgs = btrfs-progs; # added 2016-01-03
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
@@ -55,16 +61,23 @@ mapAliases ({
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
catfish = xfce.catfish; # added 2019-12-22
checkbashism = checkbashisms; # added 2016-08-16
cide = throw "deprecated in 2019-09-11: abandoned by upstream";
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
cifs_utils = cifs-utils; # added 2016-08
ckb = ckb-next; # added 2018-10-21
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
conkerorWrapper = conkeror; # added 2015-01
compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20
conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31
coprthr = throw "coprthr has been removed."; # added 2019-12-08
corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";
coredumper = throw "coredumper has been removed: Abandoned by upstream."; # added 2019-11-16
cpp-gsl = microsoft_gsl; # added 2019-05-24
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
@@ -74,6 +87,7 @@ mapAliases ({
dbus_daemon = dbus.daemon; # added 2018-04-25
dbus_glib = dbus-glib; # added 2018-02-25
dbus_libs = dbus; # added 2018-04-25
diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
@@ -97,16 +111,25 @@ mapAliases ({
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06
ffadoFull = ffado; # added 2018-05-01
firefox-esr-wrapper = firefox-esr; # 2016-01
firefox-wrapper = firefox; # 2016-01
firefoxWrapper = firefox; # 2015-09
firestr = throw "firestr has been removed."; # added 2019-12-08
flameGraph = flamegraph; # added 2018-04-25
font-awesome-ttf = font-awesome; # 2018-02-25
# 2019-10-31
fontconfig-ultimate = throw ''
fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years.
https://github.com/bohoomil/fontconfig-ultimate/issues/171.
'';
font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
foomatic_filters = foomatic-filters; # 2016-08
fprintd-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25
fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
@@ -114,6 +137,8 @@ mapAliases ({
git-hub = gitAndTools.git-hub; # added 2016-04-29
glib_networking = glib-networking; # added 2018-02-25
gnome-mpv = celluloid; # added 2019-08-22
gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10
gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
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
@@ -147,8 +172,10 @@ mapAliases ({
gupnp_igd = gupnp-igd; # added 2018-02-25
gupnptools = gupnp-tools; # added 2015-12-19
gutenberg = zola; # added 2018-11-17
hamster-time-traker = throw "hamster-time-tracker has been removed from nixpkgs, as it was unmaintained."; # added 2019-12-10
heimdalFull = heimdal; # added 2018-05-01
hepmc = hepmc2; # added 2019-08-05
hexen = throw "hexen (SDL port) has been removed: Abandoned by upstream."; # added 2019-12-11
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08
@@ -158,6 +185,7 @@ mapAliases ({
infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools;
jbuilder = dune; # added 2018-09-09
jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream";
joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25
kdiff3-qt5 = kdiff3; # added 2017-02-18
@@ -166,7 +194,9 @@ mapAliases ({
keepassx-reboot = keepassx-community; # added 2017-02-01
keepassx2-http = keepassx-reboot; # added 2016-10-17
keybase-go = keybase; # added 2016-08-24
kicad-with-packages3d = kicad; # added 2019-11-25
krename-qt5 = krename; # added 2017-02-18
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
kvm = qemu_kvm; # added 2018-04-25
letsencrypt = certbot; # added 2016-05-16
libaudit = audit; # added 2018-04-25
@@ -174,12 +204,16 @@ mapAliases ({
libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
libcap_manpages = libcap.doc; # added 2016-04-29
libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
libcap_progs = libcap.out; # added 2016-04-29
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
libdbusmenu-glib = libdbusmenu; # added 2018-05-01
liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
libfprint-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21
@@ -187,13 +221,15 @@ mapAliases ({
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
liblapackWithoutAtlas = liblapack; # added 2018-11-05
libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
libqrencode = qrencode; # added 2019-01-01
librecad2 = librecad; # backwards compatibility alias, added 2015-10
libsysfs = sysfsutils; # added 2018-04-25
libtidy = html-tidy; # added 2014-12-21
libudev = udev; # added 2018-04-25
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
links = links2; # added 2016-01-31
linux_rpi0 = linux_rpi1;
linuxPackages_rpi0 = linuxPackages_rpi1;
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
@@ -203,6 +239,10 @@ mapAliases ({
man_db = man-db; # added 2016-05
manpages = man-pages; # added 2015-12-06
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
mess = mame; # added 2019-10-30
mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10
mysql-client = hiPrio mariadb.client;
memtest86 = memtest86plus; # added 2019-05-08
mesa_noglu = mesa; # added 2019-05-28
@@ -215,6 +255,9 @@ mapAliases ({
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
module_init_tools = kmod; # added 2016-04-22
mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream.";
mozart = mozart2-binary; # added 2019-09-23
mozart-binary = mozart2-binary; # added 2019-09-23
mpich2 = mpich; # added 2018-08-06
msf = metasploit; # added 2018-04-25
libmsgpack = msgpack; # added 2018-08-17
@@ -231,6 +274,7 @@ mapAliases ({
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
nix-review = nixpkgs-review; # added 2019-12-22
nfsUtils = nfs-utils; # added 2014-12-06
nginxUnstable = nginxMainline; # added 2018-04-25
nilfs_utils = nilfs-utils; # added 2018-04-25
@@ -239,11 +283,13 @@ mapAliases ({
nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "deprecated in 2019-09-11: abandoned by upstream";
opencascade_oce = opencascade; # added 2018-04-25
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
opencl-icd = ocl-icd; # added 2017-01-20
openexr_ctl = ctl; # added 2018-04-25
openjpeg_2_1 = openjpeg_2; # added 2018-10-25
opensans-ttf = open-sans; # added 2018-12-04
openssh_with_kerberos = openssh; # added 2018-01-28
osquery = throw "osquery has been removed."; # added 2019-11-24
owncloudclient = owncloud-client; # added 2016-08
p11_kit = p11-kit; # added 2018-02-25
parquet-cpp = arrow-cpp; # added 2018-09-08
@@ -264,6 +310,7 @@ mapAliases ({
pltScheme = racket; # just to be sure
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
pmtools = acpica-tools; # added 2018-11-01
polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
postgresql95 = postgresql_9_5;
postgresql96 = postgresql_9_6;
@@ -281,25 +328,37 @@ mapAliases ({
pg_hll = postgresqlPackages.pg_hll;
pg_cron = postgresqlPackages.pg_cron;
pg_topn = postgresqlPackages.pg_topn;
pinentry_curses = pinentry-curses; # added 2019-10-14
pinentry_emacs = pinentry-emacs; # added 2019-10-14
pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14
pinentry_qt = pinentry-qt; # added 2019-10-14
pinentry_gnome = pinentry-gnome; # added 2019-10-14
postgis = postgresqlPackages.postgis;
# end
ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
processing3 = processing; # added 2019-08-16
procps-ng = procps; # added 2018-06-08
pygmentex = texlive.bin.pygmentex; # added 2019-12-15
pyo3-pack = maturin;
pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10
pulseaudioLight = pulseaudio; # added 2018-04-25
phonon-backend-gstreamer = throw "Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon-backend-vlc = throw "Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qt_gstreamer = qt-gstreamer; # added 2017-02
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
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19
rhc = throw "deprecated in 2019-04-09: abandoned by upstream.";
rng_tools = rng-tools; # added 2018-10-24
robomongo = robo3t; #added 2017-09-28
rssglx = rss-glx; #added 2015-03-25
recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby";
@@ -315,6 +374,9 @@ mapAliases ({
s6PortableUtils = s6-portable-utils; # added 2018-07-23
sagemath = sage; # added 2018-10-27
sam = deadpixi-sam; # added 2018-04-25
samba3 = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15
samba3_light = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15
sambaMaster = throw "removed 2019-09-13: outdated and no longer needed";
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02
@@ -322,25 +384,33 @@ mapAliases ({
sapic = throw "deprecated 2019-1-19: sapic is bundled with 'tamarin-prover' now";
scim = sc-im; # added 2016-01-22
scollector = bosun; # added 2018-04-25
sdlmame = mame; # added 2019-10-30
seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
shared_mime_info = shared-mime-info; # added 2018-02-25
skrooge2 = skrooge; # added 2017-02-18
skype = skypeforlinux; # added 2017-07-27
skydive = throw "skydive has been removed from nixpkgs (2019-09-10)";
slic3r-prusa3d = prusa-slicer; # added 2019-05-21
slurm-llnl = slurm; # renamed July 2017
slurm-llnl-full = slurm-full; # renamed July 2017
slurm-full = slurm; # added 2018-05-1
smbclient = samba; # added 2018-04-25
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
net_snmp = net-snmp; # added 2019-12-21
spaceOrbit = space-orbit; # addewd 2016-05-23
speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
sqliteInteractive = sqlite-interactive; # added 2014-12-06
squid4 = squid; # added 2019-08-22
sshfsFuse = sshfs-fuse; # added 2016-09
suil-qt5 = suil; # added 2018-05-01
surf-webkit2 = surf; # added 2017-04-02
sup = throw "deprecated in 2019-09-10: abandoned by upstream";
system_config_printer = system-config-printer; # added 2016-01-03
systool = sysfsutils; # added 2018-04-25
tahoelafs = tahoe-lafs; # added 2018-03-26
@@ -359,12 +429,14 @@ mapAliases ({
terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28
tesseract_4 = tesseract4; # added 2018-12-19
testdisk-photorec = throw "This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13
tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03
torbrowser = tor-browser-bundle-bin; # added 2017-04-05
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
trang = jing-trang; # added 2018-04-25
transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
@@ -374,17 +446,29 @@ mapAliases ({
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
v4l_utils = v4l-utils; # added 2019-08-07
v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages";
valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01
vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05
vimprobable2-unwrapped = vimprobable2; # added 2019-12-05
virtviewer = virt-viewer; # added 2015-12-24
virtmanager = virt-manager; # added 2019-10-29
virtmanager-qt = virt-manager-qt; # added 2019-10-29
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
wireguard = wireguard-tools; # added 2018-05-19
morituri = whipper; # added 2018-09-13
xfceUnstable = xfce4-14; # added 2019-09-17
xfce4-14 = xfce;
xfce4-12 = xfce;
x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25
@@ -395,6 +479,7 @@ mapAliases ({
xpraGtk3 = xpra; # added 2018-09-13
youtubeDL = youtube-dl; # added 2014-10-26
zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off
@@ -421,7 +506,7 @@ mapAliases ({
ocamlPackages_latest;
gst_all = { # added 2018-04-25
inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
inherit (pkgs) gstreamer gnonlin gst-python;
gstPluginsBase = pkgs.gst-plugins-base;
gstPluginsBad = pkgs.gst-plugins-bad;
gstPluginsGood = pkgs.gst-plugins-good;
@@ -433,8 +518,8 @@ mapAliases ({
};
# added 2019-08-01
mumble_git = pkgs.mumble_rc;
murmur_git = pkgs.murmur_rc;
mumble_git = pkgs.mumble;
murmur_git = pkgs.murmur;
# added 2019-09-06
zeroc_ice = pkgs.zeroc-ice;
@@ -443,4 +528,8 @@ mapAliases ({
ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
ocaml_4_02 = ocamlPackages_4_02.ocaml;
ocaml_4_03 = ocamlPackages_4_03.ocaml;
}))
}) // {
# added 2019-10-28
gnatsd = nats-server;
})
pkgs/top-level/all-packages.nix
+1912 -946
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/coq-packages.nix
+6 -1
View File
@@ -16,6 +16,7 @@ let
category-theory = callPackage ../development/coq-modules/category-theory { };
Cheerios = callPackage ../development/coq-modules/Cheerios {};
CoLoR = callPackage ../development/coq-modules/CoLoR {};
coq-bits = callPackage ../development/coq-modules/coq-bits {};
coq-elpi = callPackage ../development/coq-modules/coq-elpi {};
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {};
@@ -127,7 +128,10 @@ in rec {
version = "8.9.1";
};
coq_8_10 = callPackage ../applications/science/logic/coq {
version = "8.10+beta2";
version = "8.10.2";
};
coq_8_11 = callPackage ../applications/science/logic/coq {
version = "8.11+beta1";
};
coqPackages_8_5 = mkCoqPackages coq_8_5;
@@ -136,6 +140,7 @@ in rec {
coqPackages_8_8 = mkCoqPackages coq_8_8;
coqPackages_8_9 = mkCoqPackages coq_8_9;
coqPackages_8_10 = mkCoqPackages coq_8_10;
coqPackages_8_11 = mkCoqPackages coq_8_11;
coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
coqPackages_8_9
);
pkgs/top-level/dotnet-packages.nix
+1
View File
@@ -527,6 +527,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ obadz ];
platforms = with stdenv.lib.platforms; linux;
broken = true;
};
};
pkgs/top-level/emacs-packages.nix
+1 -1
View File
@@ -60,7 +60,7 @@ let
};
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper stdenv runCommand;
inherit lib lndir makeWrapper runCommand;
};
mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix {
pkgs/top-level/emscripten-packages.nix
+4 -3
View File
@@ -81,7 +81,8 @@ rec {
});
xmlmirror = pkgs.buildEmscriptenPackage rec {
name = "xmlmirror";
pname = "xmlmirror";
version = "unstable-2016-06-05";
buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
nativeBuildInputs = [ pkgconfig zlib ];
@@ -113,7 +114,7 @@ rec {
installPhase = ''
mkdir -p $out/share
mkdir -p $doc/share/${name}
mkdir -p $doc/share/${pname}
cp Demo* $out/share
cp -R codemirror-5.12 $out/share
@@ -124,7 +125,7 @@ rec {
cp *.html $out/share
cp *.json $out/share
cp *.rng $out/share
cp README.md $doc/share/${name}
cp README.md $doc/share/${pname}
'';
checkPhase = ''
pkgs/top-level/haskell-packages.nix
+24 -39
View File
@@ -1,6 +1,4 @@
{ buildPackages, pkgs
, newScope
}:
{ buildPackages, pkgs, newScope }:
let
# These are attributes in compiler and packages that don't support integer-simple.
@@ -9,7 +7,6 @@ let
"ghc863Binary"
"ghc844"
"ghcjs"
"ghcjs84"
"ghcjs86"
"integer-simple"
];
@@ -47,24 +44,12 @@ in {
ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { };
ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_39;
llvmPackages = pkgs.llvmPackages_39;
};
ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
bootPkgs = packages.ghc822Binary;
sphinx = buildPackages.python3Packages.sphinx_1_7_9;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghc864 = callPackage ../development/compilers/ghc/8.6.4.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_6;
llvmPackages = pkgs.llvmPackages_6;
};
ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -77,6 +62,18 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix {
bootPkgs = packages.ghc863Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix {
bootPkgs = packages.ghc863Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_9;
llvmPackages = pkgs.llvmPackages_9;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc863Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -84,14 +81,8 @@ in {
llvmPackages = pkgs.llvmPackages_6;
};
ghcjs = compiler.ghcjs86;
ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc844;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
};
ghcjs86 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc864;
bootPkgs = packages.ghc865;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {};
@@ -126,21 +117,11 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
ghc822 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc822;
ghc = bh.compiler.ghc822;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
};
ghc844 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc844;
ghc = bh.compiler.ghc844;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
};
ghc864 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc864;
ghc = bh.compiler.ghc864;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
};
ghc865 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc865;
ghc = bh.compiler.ghc865;
@@ -151,18 +132,22 @@ in {
ghc = bh.compiler.ghc881;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
};
ghc882 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc882;
ghc = bh.compiler.ghc882;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
};
ghc8101 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8101;
ghc = bh.compiler.ghc8101;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
};
ghcjs = packages.ghcjs86;
ghcjs84 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs84;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};
ghcjs86 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs86;
pkgs/top-level/lua-packages.nix
+34 -1
View File
@@ -23,7 +23,7 @@ let
isLua51 = (lib.versions.majorMinor lua.version) == "5.1";
isLua52 = (lib.versions.majorMinor lua.version) == "5.2";
isLua53 = lua.luaversion == "5.3";
isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
isLuaJIT = lib.getName lua == "luajit";
lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix { };
@@ -132,6 +132,39 @@ with self; {
};
};
pulseaudio = buildLuaPackage rec {
pname = "pulseaudio";
version = "0.2";
name = "pulseaudio-${version}";
src = fetchFromGitHub {
owner = "doronbehar";
repo = "lua-pulseaudio";
rev = "v${version}";
sha256 = "140y1m6k798c4w7xfl0zb0a4ffjz6i1722bgkdcdg8g76hr5r8ys";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
buildInputs = [ pkgs.libpulseaudio ];
propagatedBuildInputs = [ lua ];
nativeBuildInputs = [ pkgs.pulseaudio pkgconfig ];
makeFlags = [
"INST_LIBDIR=${placeholder "out"}/lib/lua/${lua.luaversion}"
"INST_LUADIR=${placeholder "out"}/share/lua/${lua.luaversion}"
"LUA_BINDIR=${placeholder "out"}/bin"
];
preBuild = ''
mkdir -p ${placeholder "out"}/lib/lua/${lua.luaversion}
'';
meta = with stdenv.lib; {
homepage = "https://github.com/doronbehar/lua-pulseaudio";
description = "Libpulse Lua bindings";
maintainers = with maintainers; [ doronbehar ];
license = licenses.lgpl21;
};
};
vicious = toLuaModule(stdenv.mkDerivation rec {
pname = "vicious";
version = "2.3.1";
pkgs/top-level/ocaml-packages.nix
+135 -23
View File
@@ -16,10 +16,20 @@ let
buildDunePackage = callPackage ../build-support/ocaml/dune.nix {};
buildDune2Package = buildDunePackage.override { dune = dune_2; };
alcotest = callPackage ../development/ocaml-modules/alcotest {};
alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {};
angstrom = callPackage ../development/ocaml-modules/angstrom { };
angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { };
angstrom-lwt-unix = callPackage ../development/ocaml-modules/angstrom-lwt-unix { };
angstrom-unix = callPackage ../development/ocaml-modules/angstrom-unix { };
ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
apron = callPackage ../development/ocaml-modules/apron { };
@@ -67,6 +77,8 @@ let
bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { };
biocaml = callPackage ../development/ocaml-modules/biocaml { };
bistro = callPackage ../development/ocaml-modules/bistro { };
bitstring = callPackage ../development/ocaml-modules/bitstring { };
@@ -132,6 +144,8 @@ let
cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
cfstream = callPackage ../development/ocaml-modules/cfstream { };
charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { };
checkseum = callPackage ../development/ocaml-modules/checkseum { };
@@ -177,8 +191,12 @@ let
cppo = callPackage ../development/tools/ocaml/cppo { };
cpu = callPackage ../development/ocaml-modules/cpu { };
cpuid = callPackage ../development/ocaml-modules/cpuid { };
crunch = callPackage ../development/tools/ocaml/crunch { };
cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
cstruct =
@@ -211,11 +229,7 @@ let
digestif = callPackage ../development/ocaml-modules/digestif { };
doc-ock = callPackage ../development/ocaml-modules/doc-ock { };
doc-ock-html = callPackage ../development/ocaml-modules/doc-ock-html { };
doc-ock-xml = callPackage ../development/ocaml-modules/doc-ock-xml { };
dispatch = callPackage ../development/ocaml-modules/dispatch { };
dolmen = callPackage ../development/ocaml-modules/dolmen { };
@@ -225,20 +239,36 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
duff = callPackage ../development/ocaml-modules/duff { };
dune = callPackage ../development/tools/ocaml/dune { };
dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };
dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; };
dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; };
earley = callPackage ../development/ocaml-modules/earley { };
earlybird = callPackage ../development/ocaml-modules/earlybird { };
easy-format = callPackage ../development/ocaml-modules/easy-format { };
eigen = callPackage ../development/ocaml-modules/eigen { };
elina = callPackage ../development/ocaml-modules/elina { };
eliom = callPackage ../development/ocaml-modules/eliom { };
elpi = callPackage ../development/ocaml-modules/elpi { };
encore = callPackage ../development/ocaml-modules/encore { };
enumerate = callPackage ../development/ocaml-modules/enumerate { };
eqaf = callPackage ../development/ocaml-modules/eqaf { };
erm_xml = callPackage ../development/ocaml-modules/erm_xml { };
erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
@@ -281,6 +311,10 @@ let
gmap = callPackage ../development/ocaml-modules/gmap { };
gnuplot = callPackage ../development/ocaml-modules/gnuplot {
inherit (pkgs) gnuplot;
};
herelib = callPackage ../development/ocaml-modules/herelib { };
higlo = callPackage ../development/ocaml-modules/higlo { };
@@ -289,6 +323,8 @@ let
imagelib = callPackage ../development/ocaml-modules/imagelib { };
imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };
inotify = callPackage ../development/ocaml-modules/inotify { };
integers = callPackage ../development/ocaml-modules/integers { };
@@ -302,8 +338,12 @@ let
then callPackage ../development/ocaml-modules/ipaddr { }
else ipaddr_p4;
irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { };
iso8601 = callPackage ../development/ocaml-modules/iso8601 { };
iter = callPackage ../development/ocaml-modules/iter { };
javalib = callPackage ../development/ocaml-modules/javalib {
extlib = ocaml_extlib;
};
@@ -314,7 +354,7 @@ let
gg = callPackage ../development/ocaml-modules/gg { };
git = callPackage ../development/ocaml-modules/git { };
git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; };
git-http = callPackage ../development/ocaml-modules/git-http { };
@@ -322,16 +362,46 @@ let
gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
graphql = callPackage ../development/ocaml-modules/graphql { };
graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { };
graphql-lwt = callPackage ../development/ocaml-modules/graphql/lwt.nix { };
graphql_parser = callPackage ../development/ocaml-modules/graphql/parser.nix { };
gtktop = callPackage ../development/ocaml-modules/gtktop { };
hex = callPackage ../development/ocaml-modules/hex { };
httpaf = callPackage ../development/ocaml-modules/httpaf { };
index = callPackage ../development/ocaml-modules/index { };
inifiles = callPackage ../development/ocaml-modules/inifiles { };
iri = callPackage ../development/ocaml-modules/iri { };
irmin = callPackage ../development/ocaml-modules/irmin { };
irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { };
irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { };
irmin-graphql = callPackage ../development/ocaml-modules/irmin/graphql.nix { };
irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { };
irmin-mem = callPackage ../development/ocaml-modules/irmin/mem.nix { };
irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { };
irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { };
irmin-unix = callPackage ../development/ocaml-modules/irmin/unix.nix { };
irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { };
jingoo = callPackage ../development/ocaml-modules/jingoo {
pcre = ocaml_pcre;
};
@@ -362,6 +432,10 @@ let
jsonm = callPackage ../development/ocaml-modules/jsonm { };
kafka = callPackage ../development/ocaml-modules/kafka { };
ke = callPackage ../development/ocaml-modules/ke { };
lablgl = callPackage ../development/ocaml-modules/lablgl { };
lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };
@@ -406,11 +480,9 @@ let
lru = callPackage ../development/ocaml-modules/lru { };
lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { };
lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
lwt3 = if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/lwt/3.x.nix { }
else throw "lwt3 is not available for OCaml ${ocaml.version}";
lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { };
lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { };
@@ -434,6 +506,8 @@ let
lwt = ocaml_lwt;
};
macaddr = callPackage ../development/ocaml-modules/macaddr { };
macaque = callPackage ../development/ocaml-modules/macaque { };
magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
@@ -450,6 +524,14 @@ let
merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
metrics = callPackage ../development/ocaml-modules/metrics { };
metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {
inherit (pkgs) gnuplot;
};
mezzo = callPackage ../development/compilers/mezzo { };
minisat = callPackage ../development/ocaml-modules/minisat { };
@@ -517,6 +599,8 @@ let
ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { };
ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
@@ -541,6 +625,8 @@ let
ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { };
ocf = callPackage ../development/ocaml-modules/ocf { };
ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
@@ -589,10 +675,16 @@ let
owee = callPackage ../development/ocaml-modules/owee { };
owl-base = callPackage ../development/ocaml-modules/owl-base { };
owl = callPackage ../development/ocaml-modules/owl { };
ounit = callPackage ../development/ocaml-modules/ounit { };
pgsolver = callPackage ../development/ocaml-modules/pgsolver { };
phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
piqi = callPackage ../development/ocaml-modules/piqi {
base64 = base64_2;
};
@@ -621,8 +713,6 @@ let
seq = callPackage ../development/ocaml-modules/seq { };
sequence = callPackage ../development/ocaml-modules/sequence { };
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
@@ -664,6 +754,8 @@ let
then sexplib_108_08_00
else null;
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
@@ -676,6 +768,8 @@ let
pa_test = callPackage ../development/ocaml-modules/pa_test { };
parany = callPackage ../development/ocaml-modules/parany { };
pipebang = callPackage ../development/ocaml-modules/pipebang { };
pprint = callPackage ../development/ocaml-modules/pprint { };
@@ -694,6 +788,10 @@ let
then callPackage ../development/ocaml-modules/ppx_deriving {}
else null;
ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};
ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {};
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
@@ -731,12 +829,18 @@ let
rope = callPackage ../development/ocaml-modules/rope { };
rpclib = callPackage ../development/ocaml-modules/rpclib { };
rresult = callPackage ../development/ocaml-modules/rresult { };
safepass = callPackage ../development/ocaml-modules/safepass { };
sedlex = callPackage ../development/ocaml-modules/sedlex { };
sodium = callPackage ../development/ocaml-modules/sodium { };
spelll = callPackage ../development/ocaml-modules/spelll { };
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
ssl = callPackage ../development/ocaml-modules/ssl { };
@@ -795,6 +899,8 @@ let
wasm = callPackage ../development/ocaml-modules/wasm { };
webmachine = callPackage ../development/ocaml-modules/webmachine { };
wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
x509 = callPackage ../development/ocaml-modules/x509 { };
@@ -805,6 +911,8 @@ let
xtmpl = callPackage ../development/ocaml-modules/xtmpl { };
yaml = callPackage ../development/ocaml-modules/yaml { };
yojson = callPackage ../development/ocaml-modules/yojson { };
zarith = callPackage ../development/ocaml-modules/zarith { };
@@ -821,9 +929,18 @@ let
# Jane Street
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janePackage =
if lib.versionOlder "4.07" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {}
else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janeStreet = import ../development/ocaml-modules/janestreet {
janeStreet =
if lib.versionOlder "4.07" ocaml.version
then import ../development/ocaml-modules/janestreet/0.12.nix {
inherit ctypes janePackage num octavius ppxlib re;
inherit (pkgs) openssl;
}
else import ../development/ocaml-modules/janestreet {
inherit janePackage ocamlbuild angstrom ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re ppxlib;
@@ -1074,8 +1191,6 @@ let
# Apps / from all-packages
haxe = callPackage ../development/compilers/haxe { };
ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { };
trv = callPackage ../development/tools/misc/trv { };
@@ -1084,11 +1199,6 @@ let
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
monotoneViz = callPackage ../applications/version-management/monotone-viz {
inherit (pkgs.gnome2) libgnomecanvas glib;
};
unison = callPackage ../applications/networking/sync/unison {
enableX11 = config.unison.enableX11 or true;
};
@@ -1118,7 +1228,9 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });
ocamlPackages_latest = ocamlPackages_4_08;
ocamlPackages_4_09 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.09.nix { });
ocamlPackages = ocamlPackages_4_06;
ocamlPackages_latest = ocamlPackages_4_09;
ocamlPackages = ocamlPackages_4_07;
}
pkgs/top-level/perl-packages.nix
+1487 -610
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/php-packages.nix
+92 -27
View File
@@ -14,12 +14,13 @@ let
});
isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
isPhp74 = pkgs.lib.versionAtLeast php.version "7.4";
apcu = buildPecl {
version = "5.1.17";
version = "5.1.18";
pname = "apcu";
sha256 = "14y7alvj5q17q1b544bxidavkn6i40cjbq2nv1m0k70ai5vv84bb";
sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl";
buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
doCheck = true;
@@ -39,10 +40,10 @@ let
};
ast = buildPecl {
version = "1.0.3";
version = "1.0.5";
pname = "ast";
sha256 = "1sk9bkyw3ck9jgvlazxx8zl2nv6lc0gq66v1rfcby9v0zyydb7xr";
sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp";
};
box = mkDerivation rec {
@@ -73,12 +74,12 @@ let
};
composer = mkDerivation rec {
version = "1.9.0";
version = "1.9.1";
pname = "composer";
src = pkgs.fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "0x88bin1c749ajymz2cqjx8660a3wxvndpv4xr6w3pib16fzdpy9";
sha256 = "04a1fqxhxrckgxw9xbx7mplkzw808k2dz4jqsxq2dy7w6y80n88z";
};
dontUnpack = true;
@@ -140,6 +141,8 @@ let
AC_MSG_WARN([Cannot find igbinary.h])
'')
];
meta.broken = isPhp74; # Build error
};
event = buildPecl {
@@ -196,14 +199,35 @@ let
sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz";
};
maxminddb = buildPecl rec {
pname = "maxminddb";
version = "1.5.0";
src = pkgs.fetchFromGitHub {
owner = "maxmind";
repo = "MaxMind-DB-Reader-php";
rev = "v${version}";
sha256 = "1ilgpx36rgihjr8s4bvkbms5hl6xy7mymna3ym2bl4lb15vkr0sm";
};
buildInputs = [ pkgs.libmaxminddb ];
sourceRoot = "source/ext";
meta = with pkgs.lib; {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ ajs124 das_j ];
};
};
memcached = buildPecl rec {
version = "3.1.3";
version = "3.1.5";
pname = "memcached";
src = fetchgit {
url = "https://github.com/php-memcached-dev/php-memcached";
rev = "v${version}";
sha256 = "1w9g8k7bmq3nbzskskpsr5632gh9q75nqy7nkjdzgs17klq9khjk";
sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380";
};
configureFlags = [
@@ -217,9 +241,9 @@ let
mongodb = buildPecl {
pname = "mongodb";
version = "1.5.5";
version = "1.6.1";
sha256 = "0gpywk3wkimjrva1p95a7abvl3s8yccalf6yimn3nbkpvn2kknm6";
sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m";
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [
@@ -245,11 +269,22 @@ let
'';
};
pcov = buildPecl {
version = "1.0.6";
pname = "pcov";
sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1";
buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
};
pcs = buildPecl {
version = "1.3.3";
pname = "pcs";
sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
meta.broken = isPhp74; # Build error
};
pdo_sqlsrv = buildPecl {
@@ -259,15 +294,17 @@ let
sha256 = "02ill1iqffa5fha9iz4y91823scml24ikfk8pn90jyycfwv07x6a";
buildInputs = [ pkgs.unixODBC ];
meta.broken = isPhp74; # Build error
};
php-cs-fixer = mkDerivation rec {
version = "2.15.1";
version = "2.16.1";
pname = "php-cs-fixer";
src = pkgs.fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
sha256 = "0qbqdki6vj8bgj5m2k4mi0qgj17r6s2v2q7yc30hhgvksf7vamlc";
sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68";
};
phases = [ "installPhase" ];
@@ -338,12 +375,12 @@ let
};
phpcbf = mkDerivation rec {
version = "3.4.2";
version = "3.5.3";
pname = "phpcbf";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
sha256 = "08s47r8i5dyjivk1q3nhrz40n6fx3zghrn5irsxfnx5nj9pb7ffp";
sha256 = "1mrsf9p6p64pyqyylnlxb2b7cirdfccch83g7yhfnka3znffq86v";
};
phases = [ "installPhase" ];
@@ -365,12 +402,12 @@ let
};
phpcs = mkDerivation rec {
version = "3.4.2";
version = "3.5.3";
pname = "phpcs";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
sha256 = "0hk9w5kn72z9xhswfmxilb2wk96vy07z4a1pwrpspjlr23aajrk9";
sha256 = "0y4nhsifj4pdmf5g1nnm4951yjgiqswyz7wmjxx6kqiqc7chlkml";
};
phases = [ "installPhase" ];
@@ -392,12 +429,12 @@ let
};
phpstan = mkDerivation rec {
version = "0.11.15";
version = "0.12.3";
pname = "phpstan";
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "1fa3bq5k548jpyph2rxkgnarblyy5f1m55awjcps8mjqbw9r6439";
sha256 = "08ya50qf75nq8ypyhb0vsqnj166kc27rc8iasxr3y7kssbfd95ai";
};
phases = [ "installPhase" ];
@@ -420,7 +457,7 @@ let
actual line.
'';
license = licenses.mit;
homepage = https://github.com/phpstan/phpstan;
homepage = "https://github.com/phpstan/phpstan";
maintainers = with maintainers; [ etu ];
};
};
@@ -470,10 +507,10 @@ let
};
protobuf = buildPecl {
version = "3.9.0";
version = "3.11.2";
pname = "protobuf";
sha256 = "1pyfxrfdbzzg5al4byyazdrvy7yad13zwq7papbb2d8gkvc3f3kh";
sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz";
buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ];
@@ -486,13 +523,39 @@ let
};
};
psalm = mkDerivation rec {
version = "3.7.2";
pname = "psalm";
src = pkgs.fetchurl {
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
sha256 = "0mcxlckycvpxxc6h0x0kdidbq2l4m3xws1v3kdf797js234x0vjx";
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/psalm/psalm.phar
makeWrapper ${php}/bin/php $out/bin/psalm \
--add-flags "$out/libexec/psalm/psalm.phar"
'';
meta = with pkgs.lib; {
description = "A static analysis tool for finding errors in PHP applications";
license = licenses.mit;
homepage = https://github.com/vimeo/psalm;
};
};
psysh = mkDerivation rec {
version = "0.9.9";
version = "0.9.12";
pname = "psysh";
src = pkgs.fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
sha256 = "0knbib0afwq2z5fc639ns43x8pi3kmp85y13bkcl00dhvf46yinw";
sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc";
};
phases = [ "installPhase" ];
@@ -544,10 +607,10 @@ let
};
redis = buildPecl {
version = "5.0.2";
version = "5.1.1";
pname = "redis";
sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f";
sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732";
};
sqlsrv = buildPecl {
@@ -557,6 +620,8 @@ let
sha256 = "0ial621zxn9zvjh7k1h755sm2lc9aafc389yxksqcxcmm7kqmd0a";
buildInputs = [ pkgs.unixODBC ];
meta.broken = isPhp74; # Build error
};
v8 = buildPecl {
@@ -582,10 +647,10 @@ let
};
xdebug = buildPecl {
version = "2.7.1";
version = "2.8.1";
pname = "xdebug";
sha256 = "1hr4gy87a3gp682ggwp831xk1fxasil9wan8cxv23q3m752x3sdp";
sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3";
doCheck = true;
checkTarget = "test";
pkgs/top-level/python-packages.nix
+660 -99
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/release-cross.nix
+7 -3
View File
@@ -135,6 +135,11 @@ in
/* Linux on the fuloong */
fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon;
/* Javacript */
ghcjs = mapTestOnCross lib.systems.examples.ghcjs {
haskell.packages.ghcjs.hello = nativePlatforms;
};
/* Linux on Raspberrypi */
rpi = mapTestOnCross lib.systems.examples.raspberryPi rpiCommon;
rpi-musl = mapTestOnCross lib.systems.examples.muslpi rpiCommon;
@@ -143,9 +148,8 @@ in
x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;
/* Linux on Aarch64 */
android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // {
});
android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon;
android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon;
wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon;
pkgs/top-level/release.nix
+7 -5
View File
@@ -46,7 +46,7 @@ let
jobs.go.x86_64-darwin
jobs.mariadb.x86_64-darwin
jobs.nix.x86_64-darwin
jobs.nox.x86_64-darwin
jobs.nixpkgs-review.x86_64-darwin
jobs.nix-info.x86_64-darwin
jobs.nix-info-tested.x86_64-darwin
jobs.openssh.x86_64-darwin
@@ -60,9 +60,10 @@ let
jobs.stack.x86_64-darwin
jobs.stdenv.x86_64-darwin
jobs.vim.x86_64-darwin
jobs.cachix.x86_64-darwin
# UI apps
jobs.firefox-unwrapped.x86_64-darwin
# jobs.firefox-unwrapped.x86_64-darwin
jobs.qt5.qtmultimedia.x86_64-darwin
jobs.inkscape.x86_64-darwin
jobs.gimp.x86_64-darwin
@@ -97,14 +98,15 @@ let
jobs.pandoc.x86_64-linux
jobs.python.x86_64-linux
jobs.python3.x86_64-linux
# Needed by travis-ci to test PRs
jobs.nox.x86_64-linux
# Needed by contributors to test PRs (by inclusion of the PR template)
jobs.nixpkgs-review.x86_64-linux
# Needed for support
jobs.nix-info.x86_64-linux
jobs.nix-info-tested.x86_64-linux
# Ensure that X11/GTK are in order.
jobs.thunderbird.x86_64-linux
jobs.unar.x86_64-linux
jobs.cachix.x86_64-linux
/*
jobs.tests.cc-wrapper.x86_64-linux
@@ -134,7 +136,7 @@ let
jobs.stdenv.x86_64-darwin
jobs.python.x86_64-darwin
jobs.python3.x86_64-darwin
jobs.nox.x86_64-darwin
jobs.nixpkgs-review.x86_64-darwin
jobs.nix-info.x86_64-darwin
jobs.nix-info-tested.x86_64-darwin
jobs.git.x86_64-darwin
pkgs/top-level/ruby-packages.nix
-11
View File
@@ -2466,17 +2466,6 @@
};
version = "1.8.0";
};
therubyracer = {
dependencies = ["libv8" "ref"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g95bzs2axjglyjyj6xvsywqgr80bnzlkw7mddxx1fdrak5wni2q";
type = "gem";
};
version = "0.12.3";
};
thor = {
groups = ["default"];
platforms = [];
pkgs/top-level/stage.nix
+1 -1
View File
@@ -71,7 +71,7 @@ let
trivialBuilders = self: super:
import ../build-support/trivial-builders.nix {
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.pkgsBuildHost.xorg) lndir;
inherit (self) runtimeShell;
};
pkgs/top-level/static.nix
+115 -5
View File
@@ -14,7 +14,7 @@ self: super: let
inherit (super.stdenvAdapters) makeStaticBinaries
makeStaticLibraries
propagateBuildInputs;
inherit (super.lib) foldl optional flip id composeExtensions;
inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs;
inherit (super) makeSetupHook;
# Best effort static binaries. Will still be linked to libSystem,
@@ -52,6 +52,39 @@ self: super: let
});
};
removeUnknownConfigureFlags = f: with self.lib;
remove "--disable-shared"
(remove "--enable-static" f);
ocamlFixPackage = b:
b.overrideAttrs (o: {
configurePlatforms = [ ];
configureFlags = removeUnknownConfigureFlags (o.configureFlags or [ ]);
buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ];
propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ];
});
ocamlStaticAdapter = _: super:
self.lib.mapAttrs
(_: p: if p ? overrideAttrs then ocamlFixPackage p else p)
super
// {
lablgtk = null; # Currently xlibs cause infinite recursion
ocaml = ((super.ocaml.override { useX11 = false; }).overrideAttrs (o: {
configurePlatforms = [ ];
dontUpdateAutotoolsGnuConfigScripts = true;
})).overrideDerivation (o: {
preConfigure = ''
configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r")
'';
configureFlags = (removeUnknownConfigureFlags o.configureFlags) ++ [
"--no-shared-libs"
"-host ${o.stdenv.hostPlatform.config}"
"-target ${o.stdenv.targetPlatform.config}"
];
});
};
in {
stdenv = foldl (flip id) super.stdenv staticAdapters;
gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters;
@@ -69,16 +102,23 @@ in {
haskellStaticAdapter;
};
nghttp2 = super.nghttp2.override {
enableApp = false;
};
ncurses = super.ncurses.override {
enableStatic = true;
};
libxml2 = super.libxml2.override {
libxml2 = super.libxml2.override ({
enableShared = false;
enableStatic = true;
};
} // optionalAttrs super.stdenv.hostPlatform.isDarwin {
pythonSupport = false;
});
zlib = super.zlib.override {
static = true;
shared = false;
splitStaticOutput = false;
# Don’t use new stdenv zlib because
# it doesn’t like the --disable-shared flag
@@ -93,6 +133,9 @@ in {
libiberty = super.libiberty.override {
staticBuild = true;
};
libpfm = super.libpfm.override {
enableShared = false;
};
ipmitool = super.ipmitool.override {
static = true;
};
@@ -100,6 +143,9 @@ in {
static = true;
shared = false;
};
fmt = super.fmt.override {
enableShared = false;
};
gifsicle = super.gifsicle.override {
static = true;
};
@@ -109,21 +155,51 @@ in {
optipng = super.optipng.override {
static = true;
};
openblas = super.openblas.override { enableStatic = true; };
openssl = super.openssl.override {
openblas = super.openblas.override {
enableStatic = true;
enableShared = false;
};
mkl = super.mkl.override { enableStatic = true; };
nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile
openssl = super.openssl_1_0_2.override {
static = true;
# Don’t use new stdenv for openssl because it doesn’t like the
# --disable-shared flag
stdenv = super.stdenv;
};
arrow-cpp = super.arrow-cpp.override {
enableShared = false;
python = { pkgs = { python = null; numpy = null; }; };
};
boost = super.boost.override {
enableStatic = true;
enableShared = false;
# Don’t use new stdenv for boost because it doesn’t like the
# --disable-shared flag
stdenv = super.stdenv;
};
thrift = super.thrift.override {
static = true;
twisted = null;
};
double-conversion = super.double-conversion.override {
static = true;
};
gmp = super.gmp.override {
withStatic = true;
};
gflags = super.gflags.override {
enableShared = false;
};
glog = super.glog.override {
static = true;
};
gtest = super.gtest.override {
static = true;
};
cdo = super.cdo.override {
enable_all_static = true;
};
@@ -142,10 +218,19 @@ in {
# it doesn’t like the --disable-shared flag
stdenv = super.stdenv;
};
woff2 = super.woff2.override {
static = true;
};
snappy = super.snappy.override {
static = true;
};
lz4 = super.lz4.override {
enableShared = false;
enableStatic = true;
};
libressl = super.libressl.override {
buildShared = false;
};
darwin = super.darwin // {
libiconv = super.darwin.libiconv.override {
@@ -154,6 +239,27 @@ in {
};
};
kmod = super.kmod.override {
withStatic = true;
};
curl = super.curl.override {
# a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
gssSupport = false;
};
e2fsprogs = super.e2fsprogs.override {
shared = false;
};
brotli = super.brotli.override {
staticOnly = true;
};
zstd = super.zstd.override {
enableShared = false;
};
llvmPackages_8 = super.llvmPackages_8 // {
libraries = super.llvmPackages_8.libraries // rec {
libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override {
@@ -169,5 +275,9 @@ in {
};
};
ocaml-ng = self.lib.mapAttrs (_: set:
if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set
) super.ocaml-ng;
python27 = super.python27.override { static = true; };
}
pkgs/top-level/wine-packages.nix
+2
View File
@@ -44,6 +44,8 @@ rec {
gsmSupport = true;
gphoto2Support = true;
ldapSupport = true;
faudioSupport = true;
vkd3dSupport = true;
};
stable = base.override { wineRelease = "stable"; };