diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-07 15:22:35 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-07 15:22:35 +0100 |
commit | 5f554279ec31e8d42266a3f4477035fa8e43a5c7 (patch) | |
tree | 0edb6eea939ec15ed533ca44b4d26ff4b97aea21 /pkgs/top-level | |
parent | 13ee78018cc0ebb8ff0ae25b6d86c9c273fd55b9 (diff) | |
parent | cb2a447c510848c925977c0ecc440eef7443c12f (diff) | |
download | nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.gz nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.bz2 nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.lz nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.xz nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.zst nixlib-5f554279ec31e8d42266a3f4477035fa8e43a5c7.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 212 | ||||
-rw-r--r-- | pkgs/top-level/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/static.nix | 150 |
7 files changed, 323 insertions, 105 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 94edaf6dbee4..8d29370c8763 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -210,6 +210,7 @@ mapAliases ({ 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 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59d4f69004aa..24074f922172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6,10 +6,23 @@ * Hint: ### starts category names. */ { lib, noSysDirs, config}: -self: pkgs: +res: pkgs: super: with pkgs; +let + self = + builtins.trace '' + It seems that you are using a patched Nixpkgs that references the self + variable in pkgs/top-level/all-packages.nix. This variable was incorrectly + named, so its usage needs attention. Please use pkgs for packages or super + for functions. + '' + res; # Do *NOT* use res in your fork. It will be removed. + + # TODO: turn self into an error + +in { # Allow callPackage to fill in the pkgs argument @@ -815,7 +828,7 @@ with pkgs; androidsdk = androidenv.androidsdk_8_0; - androidsdk_extras = self.androidenv.androidsdk_8_0_extras; + androidsdk_extras = res.androidenv.androidsdk_8_0_extras; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -3301,6 +3314,8 @@ with pkgs; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; + hivemind = callPackage ../applications/misc/hivemind { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; highlight = callPackage ../tools/text/highlight ({ @@ -3477,9 +3492,7 @@ with pkgs; buildGoPackage = buildGo110Package; }; - ipmitool = callPackage ../tools/system/ipmitool { - static = false; - }; + ipmitool = callPackage ../tools/system/ipmitool { }; ipmiutil = callPackage ../tools/system/ipmiutil {}; @@ -3533,7 +3546,7 @@ with pkgs; jid = callPackage ../development/tools/jid { }; - jing = self.jing-trang; + jing = res.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -3560,6 +3573,8 @@ with pkgs; jp2a = callPackage ../applications/misc/jp2a { }; + jpeginfo = callPackage ../applications/graphics/jpeginfo { }; + jpegoptim = callPackage ../applications/graphics/jpegoptim { }; jpegrescan = callPackage ../applications/graphics/jpegrescan { }; @@ -3662,6 +3677,8 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kube-router = callPackage ../applications/networking/cluster/kube-router { }; + kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; peruse = libsForQt5.callPackage ../tools/misc/peruse { }; @@ -3964,14 +3981,14 @@ with pkgs; libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; + libnids = callPackage ../tools/networking/libnids { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; libmpack = callPackage ../development/libraries/libmpack { }; libiberty = callPackage ../development/libraries/libiberty { }; - libiberty_static = libiberty.override { staticBuild = true; }; - libxc = callPackage ../development/libraries/libxc { }; libxcomp = callPackage ../development/libraries/libxcomp { }; @@ -4819,23 +4836,23 @@ with pkgs; libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = self.pinentry.override { + pinentry_ncurses = res.pinentry.override { gtk2 = null; }; - pinentry_emacs = self.pinentry.override { + pinentry_emacs = res.pinentry.override { enableEmacs = true; }; - pinentry_gnome = self.pinentry.override { + pinentry_gnome = res.pinentry.override { gcr = gnome3.gcr; }; - pinentry_qt4 = self.pinentry.override { + pinentry_qt4 = res.pinentry.override { qt = qt4; }; - pinentry_qt5 = self.pinentry.override { + pinentry_qt5 = res.pinentry.override { qt = qt5.qtbase; }; @@ -4880,7 +4897,9 @@ with pkgs; plowshare = callPackage ../tools/misc/plowshare { }; pngcheck = callPackage ../tools/graphics/pngcheck { - zlib = zlibStatic; + zlib = zlib.override { + static = true; + }; }; pngcrush = callPackage ../tools/graphics/pngcrush { }; @@ -4999,6 +5018,8 @@ with pkgs; remarshal = callPackage ../development/tools/remarshal { }; + rig = callPackage ../tools/misc/rig { }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { }; @@ -5038,6 +5059,8 @@ with pkgs; qshowdiff = callPackage ../tools/text/qshowdiff { }; + qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quickserve = callPackage ../tools/networking/quickserve { }; @@ -5188,7 +5211,7 @@ with pkgs; routino = callPackage ../tools/misc/routino { }; rq = callPackage ../development/tools/rq { - v8 = v8_static; + v8 = v8.override { static = true; }; }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -7506,10 +7529,11 @@ with pkgs; lua = lua5_1; }; - teyjus = callPackage ../development/compilers/teyjus { - inherit (ocaml-ng.ocamlPackages_4_02) ocaml; - omake = omake_rc1; - }; + teyjus = callPackage ../development/compilers/teyjus ( + with ocaml-ng.ocamlPackages_4_02; { + inherit ocaml; + omake = omake_rc1; + }); thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome2.GConf; @@ -8008,7 +8032,9 @@ with pkgs; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { + v8_static = v8.override { static = true; }; + }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; @@ -8150,13 +8176,14 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_0; + apacheKafka = apacheKafka_2_1; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; + apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; kt = callPackage ../tools/misc/kt {}; @@ -8429,7 +8456,9 @@ with pkgs; lattice-diamond = callPackage ../development/tools/lattice-diamond { }; - distcc = callPackage ../development/tools/misc/distcc { }; + distcc = callPackage ../development/tools/misc/distcc { + libiberty_static = libiberty.override { staticBuild = true; }; + }; # distccWrapper: wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: @@ -8531,6 +8560,8 @@ with pkgs; jdepend = callPackage ../development/tools/analysis/jdepend { }; + fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; + flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -8571,11 +8602,11 @@ with pkgs; 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; - gradle_2_5 = self.gradleGen.gradle_2_5; - gradle_3_5 = self.gradleGen.gradle_3_5; - gradle_4_10 = self.gradleGen.gradle_4_10; + gradle = res.gradleGen.gradle_latest; + gradle_2_14 = res.gradleGen.gradle_2_14; + gradle_2_5 = res.gradleGen.gradle_2_5; + gradle_3_5 = res.gradleGen.gradle_3_5; + gradle_4_10 = res.gradleGen.gradle_4_10; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -8637,8 +8668,6 @@ with pkgs; iozone = callPackage ../development/tools/misc/iozone { }; - ired = callPackage ../development/tools/analysis/radare/ired.nix { }; - itstool = callPackage ../development/tools/misc/itstool { }; jam = callPackage ../development/tools/build-managers/jam { }; @@ -8782,15 +8811,15 @@ with pkgs; omake = callPackage ../development/tools/ocaml/omake { }; - inherit (ocamlPackages) omake_rc1; - omniorb = callPackage ../development/tools/omniorb { }; opengrok = callPackage ../development/tools/misc/opengrok { }; openocd = callPackage ../development/tools/misc/openocd { }; - oprofile = callPackage ../development/tools/profiling/oprofile { }; + oprofile = callPackage ../development/tools/profiling/oprofile { + libiberty_static = libiberty.override { staticBuild = true; }; + }; pahole = callPackage ../development/tools/misc/pahole {}; @@ -8848,21 +8877,14 @@ with pkgs; puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; + pyflame = callPackage ../development/tools/profiling/pyflame { }; + pyrseas = callPackage ../development/tools/database/pyrseas { }; qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; - radare = callPackage ../development/tools/analysis/radare { - inherit (gnome2) vte; - lua = lua5; - useX11 = config.radare.useX11 or false; - pythonBindings = config.radare.pythonBindings or false; - rubyBindings = config.radare.rubyBindings or false; - luaBindings = config.radare.luaBindings or false; - }; - inherit (callPackages ../development/tools/analysis/radare2 { inherit (gnome2) vte; lua = lua5; @@ -9058,7 +9080,7 @@ with pkgs; valgrind = callPackage ../development/tools/analysis/valgrind { inherit (darwin) xnu bootstrap_cmds cctools; }; - valgrind-light = self.valgrind.override { gdb = null; }; + valgrind-light = res.valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -9643,7 +9665,7 @@ with pkgs; inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; - fltk = self.fltk13; + fltk = res.fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9656,7 +9678,7 @@ with pkgs; freetts = callPackage ../development/libraries/freetts { }; - frog = self.languageMachines.frog; + frog = res.languageMachines.frog; fstrcmp = callPackage ../development/libraries/fstrcmp { }; @@ -9724,11 +9746,11 @@ with pkgs; }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = self.gtk2; + gtk = res.gtk2; }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = self.gtk2; + gtk = res.gtk2; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10125,7 +10147,7 @@ with pkgs; gumbo = callPackage ../development/libraries/gumbo { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = self.gnome3; + gnome = res.gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -10775,6 +10797,8 @@ with pkgs; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; + libgpiod = callPackage ../development/libraries/libgpiod { }; + libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; monoSupport = false; @@ -11095,6 +11119,8 @@ with pkgs; libopus = callPackage ../development/libraries/libopus { }; + libopusenc = callPackage ../development/libraries/libopusenc { }; + libosinfo = callPackage ../development/libraries/libosinfo { inherit (gnome3) libsoup; }; @@ -11354,7 +11380,7 @@ with pkgs; libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky - name = "libxml2+py-${self.libxml2.version}"; + name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv @@ -11794,9 +11820,9 @@ with pkgs; }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = self.pcre.override { variant = "pcre16"; }; + pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = self.pcre.override { variant = "cpp"; }; + pcre-cpp = res.pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -12097,7 +12123,9 @@ with pkgs; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; - qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { + inherit (darwin.apple_sdk.libs) utmp; + }; qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { }; qscintilla = callPackage ../development/libraries/qscintilla { @@ -12378,10 +12406,13 @@ with pkgs; soapybladerf soapyhackrf soapyremote + soapyrtlsdr soapyuhd ]; }; + soapyrtlsdr = callPackage ../applications/misc/soapyrtlsdr { }; + soapyuhd = callPackage ../applications/misc/soapyuhd { }; socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; @@ -12697,8 +12728,6 @@ with pkgs; stdenv = overrideCC stdenv gcc6; }); - v8_static = lowPrio (self.v8.override { static = true; }); - vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; @@ -12924,10 +12953,6 @@ with pkgs; zlog = callPackage ../development/libraries/zlog { }; - zlibStatic = lowPrio (appendToName "static" (zlib.override { - static = true; - })); - zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq = zeromq4; @@ -14582,7 +14607,9 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - # Don't forget to update linuxPackages_latest! + # When adding to this list: + # - Update linuxPackages_latest to the latest version + # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; @@ -15418,6 +15445,8 @@ with pkgs; man-pages = callPackage ../data/documentation/man-pages { }; + materia-theme = callPackage ../data/themes/materia-theme { }; + material-icons = callPackage ../data/fonts/material-icons { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -15458,6 +15487,8 @@ with pkgs; nafees = callPackage ../data/fonts/nafees { }; + nordic-polar = callPackage ../data/themes/nordic-polar { }; + inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra; @@ -15479,7 +15510,7 @@ with pkgs; open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; - opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + open-sans = callPackage ../data/fonts/open-sans { }; orbitron = callPackage ../data/fonts/orbitron { }; @@ -15621,7 +15652,7 @@ with pkgs; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = self.gtk2; + gtk = res.gtk2; }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -15863,16 +15894,16 @@ with pkgs; libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = self.altcoins.go-ethereum; - ethabi = self.altcoins.ethabi; + go-ethereum = res.altcoins.go-ethereum; + ethabi = res.altcoins.ethabi; - parity = self.altcoins.parity; - parity-beta = self.altcoins.parity-beta; - parity-ui = self.altcoins.parity-ui; + parity = res.altcoins.parity; + parity-beta = res.altcoins.parity-beta; + parity-ui = res.altcoins.parity-ui; - stellar-core = self.altcoins.stellar-core; + stellar-core = res.altcoins.stellar-core; - particl-core = self.altcoins.particl-core; + particl-core = res.altcoins.particl-core; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -15967,7 +15998,7 @@ with pkgs; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (gnome3) zenity; - inherit (self) bitwig-studio1; + inherit (res) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -16647,7 +16678,7 @@ with pkgs; espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = self.espeak-ng; + espeak = res.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -16940,7 +16971,7 @@ with pkgs; inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; name = "firefox-beta-bin-" + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; @@ -16955,7 +16986,7 @@ with pkgs; inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; name = "firefox-devedition-bin-" + @@ -17042,6 +17073,7 @@ with pkgs; lcms = lcms2; inherit (gnome3) gexiv2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + inherit (darwin) cf-private; }; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { @@ -17338,6 +17370,7 @@ with pkgs; jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; + slack-dark = pkgs.slack.override { darkMode = true; }; slack-cli = callPackage ../tools/networking/slack-cli { }; @@ -17841,6 +17874,8 @@ with pkgs; lua = lua5_1; }; + luppp = callPackage ../applications/audio/luppp { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -19706,12 +19741,16 @@ with pkgs; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; - weechat = callPackage ../applications/networking/irc/weechat { + wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; + + weechat-unwrapped = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; guile = guile_2_0; }; + weechat = wrapWeechat weechat-unwrapped { }; + weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; westonLite = weston.override { @@ -19912,6 +19951,8 @@ with pkgs; kodi = kodiPlain; }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; + kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; @@ -20485,6 +20526,8 @@ with pkgs; kobodeluxe = callPackage ../games/kobodeluxe { }; + leela-zero = libsForQt5.callPackage ../games/leela-zero { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; @@ -20580,7 +20623,9 @@ with pkgs; openspades = callPackage ../games/openspades { }; openttd = callPackage ../games/openttd { - zlib = zlibStatic; + zlib = zlib.override { + static = true; + }; }; opentyrian = callPackage ../games/opentyrian { }; @@ -20852,7 +20897,7 @@ with pkgs; ut2004Packages = callPackage ../games/ut2004 { }; - ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ]; + ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -20989,8 +21034,8 @@ with pkgs; # Included for backwards compatibility libsoup libwnck gtk-doc gnome-doc-utils; - gtk = self.gtk2; - gtkmm = self.gtkmm2; + gtk = res.gtk2; + gtkmm = res.gtkmm2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -22044,7 +22089,7 @@ with pkgs; fakenes = callPackage ../misc/emulators/fakenes { }; - faust = self.faust2; + faust = res.faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -22170,6 +22215,8 @@ with pkgs; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; + loop = callPackage ../tools/misc/loop { }; + mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; }; @@ -22178,9 +22225,6 @@ with pkgs; matcha = callPackage ../misc/themes/matcha { }; - # previously known as flat-plat - materia-theme = callPackage ../misc/themes/materia-theme { }; - mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome2) GConf; }; @@ -22267,7 +22311,7 @@ with pkgs; parameter set to the right value for your deployment target. */ nixos = configuration: - (import (self.path + "/nixos/lib/eval-config.nix") { + (import (res.path + "/nixos/lib/eval-config.nix") { inherit (pkgs.stdenv.hostPlatform) system; modules = [( { lib, ... }: { @@ -22546,7 +22590,7 @@ with pkgs; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; @@ -22631,6 +22675,8 @@ with pkgs; callPackage ../applications/networking/cluster/terraform-providers {} ); + terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; @@ -22974,6 +23020,8 @@ with pkgs; inherit (darwin) libresolv; }; + dsniff = callPackage ../tools/networking/dsniff {}; + wal-g = callPackage ../tools/backup/wal-g {}; tlwg = callPackage ../data/fonts/tlwg { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index da7fc1bed34c..dcd443a1c29e 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -22,9 +22,8 @@ # `*Platform`s. localSystem -, # The system packages will ultimately be run on. Null if the two should be the - # same. - crossSystem ? null +, # The system packages will ultimately be run on. + crossSystem ? localSystem , # Allow a configuration attribute set to be passed in as an argument. config ? {} @@ -32,6 +31,9 @@ , # List of overlays layers used to extend Nixpkgs. overlays ? [] +, # List of overlays to apply to target packages only. + crossOverlays ? [] + , # A function booting the final package set for a specific standard # environment. See below for the arguments given to that function, the type of # list it returns. @@ -61,7 +63,8 @@ in let builtins.intersectAttrs { platform = null; } config // args.localSystem); - crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0; + crossSystem = if crossSystem0 == null then localSystem + else lib.systems.elaborate crossSystem0; # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than @@ -91,7 +94,7 @@ in let boot = import ../stdenv/booter.nix { inherit lib allPackages; }; stages = stdenvStages { - inherit lib localSystem crossSystem config overlays; + inherit lib localSystem crossSystem config overlays crossOverlays; }; pkgs = boot stages; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 131ff34c564e..74e9e60a0f88 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9117,6 +9117,19 @@ let }; }; + MailSender = buildPerlPackage rec { + name = "Mail-Sender-0.903"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/${name}.tar.gz"; + sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf"; + }; + meta = { + homepage = https://github.com/Perl-Email-Project/Mail-Sender; + description = "(DEPRECATED) module for sending mails with attachments through an SMTP server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailSendmail = buildPerlPackage rec { name = "Mail-Sendmail-0.80"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef1d1d40ad6d..37c1a0c9c67b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1661,8 +1661,6 @@ in { then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}"; - fedpkg = callPackage ../development/python-modules/fedpkg { }; - flit = callPackage ../development/python-modules/flit { }; flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; @@ -3041,7 +3039,9 @@ in { graphviz = callPackage ../development/python-modules/graphviz { }; - pygraphviz = callPackage ../development/python-modules/pygraphviz { }; + pygraphviz = callPackage ../development/python-modules/pygraphviz { + graphviz = pkgs.graphviz; # not the python package + }; pymc3 = callPackage ../development/python-modules/pymc3 { }; @@ -3910,18 +3910,6 @@ in { sphinx = callPackage ../development/python-modules/sphinx { }; - sphinx_1_2 = self.sphinx.overridePythonAttrs rec { - name = "sphinx-1.2.3"; - version = "1.2.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; - sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; - }; - postPatch = ''''; - # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this: - doCheck = false; - }; - sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; @@ -4872,8 +4860,7 @@ in { ROPGadget = callPackage ../development/python-modules/ROPGadget { }; # We need "normal" libxml2 and not the python package by the same name. - pywbem = disabledIf isPy36 - (callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }); + pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; unicorn = callPackage ../development/python-modules/unicorn { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1d412a6582cd..6ca370e0b9b7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -91,7 +91,7 @@ let allPackages = self: super: let res = import ./all-packages.nix { inherit lib noSysDirs config; } - res self; + res self super; in res; aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); @@ -174,6 +174,22 @@ let # Prefer appendOverlays if used repeatedly. extend = f: self.appendOverlays [f]; + # Fully static packages. + # Currently uses Musl on Linux (couldn’t get static glibc to work). + pkgsStatic = nixpkgsFun ({ + crossOverlays = [ (import ./static.nix) ]; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + crossSystem = { + parsed = stdenv.hostPlatform.parsed // { + abi = { + "gnu" = lib.systems.parse.abis.musl; + "gnueabi" = lib.systems.parse.abis.musleabi; + "gnueabihf" = lib.systems.parse.abis.musleabihf; + }.${stdenv.hostPlatform.parsed.abi.name} + or lib.systems.parse.abis.musl; + }; + }; + }); }; # The complete chain of package set builders, applied from top to bottom. diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix new file mode 100644 index 000000000000..687e38dcc3aa --- /dev/null +++ b/pkgs/top-level/static.nix @@ -0,0 +1,150 @@ +# Overlay that builds static packages. + +# Not all packages will build but support is done on a +# best effort basic. +# +# Note on Darwin/macOS: Apple does not provide a static libc +# so any attempts at static binaries are going to be very +# unsupported. +# +# Basic things like pkgsStatic.hello should work out of the box. More +# complicated things will need to be fixed with overrides. + +self: super: let + inherit (super.stdenvAdapters) makeStaticBinaries + overrideInStdenv + makeStaticLibraries; + inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions; + inherit (super) makeSetupHook; + + # Best effort static binaries. Will still be linked to libSystem, + # but more portable than Nix store binaries. + makeStaticDarwin = stdenv: stdenv // { + mkDerivation = args: stdenv.mkDerivation (args // { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + + " -static-libgcc"; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { + substitutions = { + libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; + }; + } ../stdenv/darwin/portable-libsystem.sh) ]; + }); + }; + + staticAdapters = [ makeStaticLibraries ] + + # Apple does not provide a static version of libSystem or crt0.o + # So we can’t build static binaries without extensive hacks. + ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries + + ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin + + # Glibc doesn’t come with static runtimes by default. + # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) + ; + + # Force everything to link statically. + haskellStaticAdapter = self: super: { + mkDerivation = attrs: super.mkDerivation (attrs // { + enableSharedLibraries = false; + enableSharedExecutables = false; + enableStaticLibraries = true; + }); + }; + +in { + stdenv = foldl (flip id) super.stdenv staticAdapters; + + haskell = super.haskell // { + packageOverrides = composeExtensions + (super.haskell.packageOverrides or (_: _: {})) + haskellStaticAdapter; + }; + + ncurses = super.ncurses.override { + enableStatic = true; + }; + libxml2 = super.libxml2.override { + enableShared = false; + enableStatic = true; + }; + zlib = super.zlib.override { + static = true; + shared = false; + + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; + xz = super.xz.override { + enableStatic = true; + }; + busybox = super.busybox.override { + enableStatic = true; + }; + v8 = super.v8.override { + static = true; + }; + libiberty = super.libiberty.override { + staticBuild = true; + }; + ipmitool = super.ipmitool.override { + static = true; + }; + neon = super.neon.override { + static = true; + shared = false; + }; + libjpeg = super.libjpeg.override { + static = true; + }; + gifsicle = super.gifsicle.override { + static = true; + }; + bzip2 = super.bzip2.override { + linkStatic = true; + }; + optipng = super.optipng.override { + static = true; + }; + openssl = super.openssl.override { + static = true; + + # Don’t use new stdenv for openssl because it doesn’t like the + # --disable-shared flag + stdenv = super.stdenv; + }; + boost = super.boost.override { + enableStatic = true; + enableShared = false; + }; + gmp = super.gmp.override { + withStatic = true; + }; + cdo = super.cdo.override { + enable_all_static = true; + }; + gsm = super.gsm.override { + staticSupport = true; + }; + parted = super.parted.override { + enableStatic = true; + }; + libiconvReal = super.libiconvReal.override { + enableShared = false; + enableStatic = true; + }; + perl = super.perl.override { + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; + + darwin = super.darwin // { + libiconv = super.darwin.libiconv.override { + enableShared = false; + enableStatic = true; + }; + }; + +} |