git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into staging-next

A few more rebuilds (~1k on x86_64-linux).

commitd84a33d85b621f4621f4e4da1c74b8ad896a349e authorVladimír Čunát <vcunat@gmail.com> dateSat 5 Jan 2019, 13:37 (8 years ago) parentd97077917f4d41
27 files changed+142−83
lib/systems/parse.nix+9−4 nixos/modules/misc/version.nix+1 pkgs/applications/audio/musescore/default.nix+8−4 pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch+25 pkgs/applications/misc/gpxsee/default.nix+5−5 pkgs/applications/networking/mailreaders/thunderbird/default.nix+2−2 pkgs/applications/version-management/gitea/default.nix+2−2 pkgs/development/beam-modules/default.nix+7−4 pkgs/development/compilers/sbcl/default.nix+2−2 pkgs/development/interpreters/elixir/1.3.nix−7 pkgs/development/interpreters/elixir/1.8.nix+7 pkgs/development/libraries/libcdr/default.nix+2−10 pkgs/development/python-modules/cbor/default.nix+22 pkgs/development/python-modules/django_redis/default.nix+2−2 pkgs/development/python-modules/faker/default.nix+2−2 pkgs/development/python-modules/node-semver/default.nix+2−2 pkgs/development/python-modules/pdf2image/default.nix+3−3 pkgs/development/tools/clang-tools/default.nix+2−2 pkgs/os-specific/linux/fuse/default.nix+2−2 pkgs/os-specific/linux/kernel/generic.nix+8−2 pkgs/os-specific/linux/kernel/hardened-config.nix+11−10 pkgs/tools/X11/xpointerbarrier/default.nix+6−8 pkgs/tools/misc/plantuml/default.nix+2−2 pkgs/tools/system/fakeroot/default.nix+3−5 pkgs/top-level/all-packages.nix+4−2 pkgs/top-level/beam-packages.nix+1−1 pkgs/top-level/python-packages.nix+2
lib/systems/parse.nix+9−4
@@ -279,8 +279,14 @@ rec {
279279 "2" = # We only do 2-part hacks for things Nix already supports
280280 if elemAt l 1 == "cygwin"
281281 then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
282+ # MSVC ought to be the default ABI so this case isn't needed. But then it
283+ # becomes difficult to handle the gnu* variants for Aarch32 correctly for
284+ # minGW. So it's easier to make gnu* the default for the MinGW, but
285+ # hack-in MSVC for the non-MinGW case right here.
286+ else if elemAt l 1 == "windows"
287+ then { cpu = elemAt l 0; kernel = "windows"; abi = "msvc"; }
282288 else if (elemAt l 1) == "elf"
283− then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
289+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
284290 else { cpu = elemAt l 0; kernel = elemAt l 1; };
285291 "3" = # Awkwards hacks, beware!
286292 if elemAt l 1 == "apple"
@@ -288,7 +294,7 @@ rec {
288294 else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
289295 then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
290296 else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
291− then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
297+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
292298 else if hasPrefix "netbsd" (elemAt l 2)
293299 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
294300 else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
@@ -324,13 +330,12 @@ rec {
324330 else getKernel args.kernel;
325331 abi =
326332 /**/ if args ? abi then getAbi args.abi
327− else if isLinux parsed then
333+ else if isLinux parsed || isWindows parsed then
328334 if isAarch32 parsed then
329335 if lib.versionAtLeast (parsed.cpu.version or "0") "6"
330336 then abis.gnueabihf
331337 else abis.gnueabi
332338 else abis.gnu
333− else if isWindows parsed then abis.gnu
334339 else abis.unknown;
335340 };
336341
nixos/modules/misc/version.nix+1
@@ -93,6 +93,7 @@ in
9393 VERSION_CODENAME=${toLower cfg.codeName}
9494 VERSION_ID="${cfg.version}"
9595 PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
96+ LOGO="nix-snowflake"
9697 HOME_URL="https://nixos.org/"
9798 SUPPORT_URL="https://nixos.org/nixos/support.html"
9899 BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
pkgs/applications/audio/musescore/default.nix+8−4
@@ -1,20 +1,24 @@
11{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
22, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
33, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
4−, qtwebkit, qtxmlpatterns
4+, qtwebengine, qtxmlpatterns
55}:
66
77stdenv.mkDerivation rec {
88 name = "musescore-${version}";
9− version = "2.3.2";
9+ version = "3.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "musescore";
1313 repo = "MuseScore";
1414 rev = "v${version}";
15− sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
15+ sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
1616 };
1717
18+ patches = [
19+ ./remove_qtwebengine_install_hack.patch
20+ ];
21+
1822 cmakeFlags = [
1923 ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
2024
@@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
2327 buildInputs = [
2428 alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
2529 portaudio portmidi # tesseract
26− qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
30+ qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
2731 ];
2832
2933 meta = with stdenv.lib; {
pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patchnew file+25
@@ -0,0 +1,25 @@
1+--- a/mscore/CMakeLists.txt
2++++ b/mscore/CMakeLists.txt
3+@@ -660,22 +660,6 @@ if (MINGW)
4+ else (MINGW)
5+
6+ if ( NOT MSVC )
7+-## install qwebengine core
8+- if (NOT APPLE AND USE_WEBENGINE)
9+- install(FILES
10+- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
11+- DESTINATION bin
12+- )
13+- install(DIRECTORY
14+- ${QT_INSTALL_DATA}/resources
15+- DESTINATION lib/qt5
16+- )
17+- install(DIRECTORY
18+- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
19+- DESTINATION lib/qt5/translations
20+- )
21+- endif(NOT APPLE AND USE_WEBENGINE)
22+-
23+ target_link_libraries(mscore
24+ ${ALSA_LIB}
25+ ${QT_LIBRARIES}
pkgs/applications/misc/gpxsee/default.nix+5−5
@@ -2,20 +2,20 @@
22
33stdenv.mkDerivation rec {
44 name = "gpxsee-${version}";
5− version = "6.3";
5+ version = "7.1";
66
77 src = fetchFromGitHub {
88 owner = "tumic0";
99 repo = "GPXSee";
1010 rev = version;
11− sha256 = "0kbnmcis04kjqkd0msfjd8rdmdf23c71dpzx9wcpf2yadc9rv4c9";
11+ sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5";
1212 };
1313
1414 nativeBuildInputs = [ qmake ];
1515 buildInputs = [ qttools ];
1616
1717 preConfigure = ''
18− substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
18+ substituteInPlace src/common/programpaths.cpp --replace /usr/share/ $out/share/
1919 lrelease lang/*.ts
2020 '';
2121
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
3131 enableParallelBuilding = true;
3232
3333 meta = with stdenv.lib; {
34− homepage = http://www.gpxsee.org/;
34+ homepage = https://www.gpxsee.org/;
3535 description = "GPX viewer and analyzer";
3636 longDescription = ''
3737 GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX,
38− TCX, KML, FIT, IGC and NMEA files.
38+ TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
3939 '';
4040 license = licenses.gpl3;
4141 maintainers = [ maintainers.womfoo ];
pkgs/applications/networking/mailreaders/thunderbird/default.nix+2−2
@@ -24,11 +24,11 @@ let
2424 gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
2525in stdenv.mkDerivation rec {
2626 name = "thunderbird-${version}";
27− version = "60.3.3";
27+ version = "60.4.0";
2828
2929 src = fetchurl {
3030 url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
31− sha512 = "04m6mgm4nfnq3nfkv0d1al5b7bw95kfcjpyd7aschqi6wnn21g8qacx42ynj89i5l9vc1jx8nz0wy266sy6x5iv9q585c6l6j9gvkrh";
31+ sha512 = "0flg3j0bvgpyk4wbb8d17yl8rddww7q9m9n5brqx1jlj0vjk8lrf8awvxxhn5ssyhy2ys2sklnw75y35hnws3hijs8l9l8ahznfqjq8";
3232 };
3333
3434 # from firefox, but without sound libraries
pkgs/applications/version-management/gitea/default.nix+2−2
@@ -7,13 +7,13 @@ with stdenv.lib;
77
88buildGoPackage rec {
99 name = "gitea-${version}";
10− version = "1.6.2";
10+ version = "1.6.3";
1111
1212 src = fetchFromGitHub {
1313 owner = "go-gitea";
1414 repo = "gitea";
1515 rev = "v${version}";
16− sha256 = "1ijxpihdg8k6gs1xpim0iviqakvjadjzp0a5ki2czykilnyg8y85";
16+ sha256 = "02d37mh1qxsq9lc9ylk5sgdlc1cgwh6fri077crk43mnyb5lhj3j";
1717 # Required to generate the same checksum on MacOS due to unicode encoding differences
1818 # More information: https://github.com/NixOS/nixpkgs/pull/48128
1919 extraPostFetch = ''
pkgs/development/beam-modules/default.nix+7−4
@@ -44,6 +44,11 @@ let
4444 # BEAM-based languages.
4545 elixir = elixir_1_7;
4646
47+ elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
48+ inherit rebar erlang;
49+ debugInfo = true;
50+ };
51+
4752 elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
4853 inherit rebar erlang;
4954 debugInfo = true;
@@ -64,10 +69,8 @@ let
6469 debugInfo = true;
6570 };
6671
67− elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
68− inherit rebar erlang;
69− debugInfo = true;
70− };
72+ # Remove old versions of elixir, when the supports fades out:
73+ # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
7174
7275 lfe = lfe_1_2;
7376 lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
pkgs/development/compilers/sbcl/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 name = "sbcl-${version}";
13− version = "1.4.13";
13+ version = "1.4.15";
1414
1515 src = fetchurl {
1616 url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
17− sha256 = "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm";
17+ sha256 = "0bipl4gsvpcifi6vkqm5636i3219mk1bl99px4xh5l1q2g7knv28";
1818 };
1919
2020 buildInputs = [texinfo];
pkgs/development/interpreters/elixir/1.3.nixdeleted−7
@@ -1,7 +0,0 @@
1−{ mkDerivation }:
2−
3−mkDerivation rec {
4− version = "1.3.4";
5− sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l";
6− minimumOTPVersion = "18";
7−}
pkgs/development/interpreters/elixir/1.8.nixnew file+7
@@ -0,0 +1,7 @@
1+{ mkDerivation }:
2+
3+mkDerivation rec {
4+ version = "1.8.0-rc.1";
5+ sha256 = "06k9q46cwn79ic6kw0b0mskf9rqlgm02jb8n1ajz55kmw134kq6m";
6+ minimumOTPVersion = "20";
7+}
pkgs/development/libraries/libcdr/default.nix+2−10
@@ -1,25 +1,17 @@
11{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
22
33stdenv.mkDerivation rec {
4− name = "libcdr-0.1.4";
4+ name = "libcdr-0.1.5";
55
66 src = fetchurl {
77 url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
8− sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7";
8+ sha256 = "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka";
99 };
1010
1111 buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
1212
1313 nativeBuildInputs = [ pkgconfig ];
1414
15− # Boost 1.59 compatability fix
16− # Attempt removing when updating
17− postPatch = ''
18− sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
19− '';
20−
21− configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror";
22−
2315 CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
2416
2517 meta = {
pkgs/development/python-modules/cbor/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ stdenv, buildPythonPackage, fetchPypi }:
2+
3+buildPythonPackage rec {
4+ pname = "cbor";
5+ version = "1.0.0";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1dmv163cnslyqccrybkxn0c9s1jk1mmafmgxv75iamnz5lk5l8hk";
10+ };
11+
12+ # Tests are excluded from PyPI and four unit tests are also broken:
13+ # https://github.com/brianolson/cbor_py/issues/6
14+ doCheck = false;
15+
16+ meta = with stdenv.lib; {
17+ homepage = https://bitbucket.org/bodhisnarkva/cbor;
18+ description = "Concise Binary Object Representation (CBOR) library";
19+ license = licenses.asl20;
20+ maintainers = with maintainers; [ geistesk ];
21+ };
22+}
pkgs/development/python-modules/django_redis/default.nix+2−2
@@ -2,11 +2,11 @@
22 mock, django, redis, msgpack }:
33buildPythonPackage rec {
44 pname = "django-redis";
5− version = "4.9.1";
5+ version = "4.10.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "93fc0f73b0c1736546a979a4996826b2c430f56f7e4176df40ef53b9cb0e4f36";
9+ sha256 = "1rxcwnv9ik0swkwvfqdi9i9baw6n8if5pj6q63fjh4p9chw3j2xg";
1010 };
1111
1212 doCheck = false;
pkgs/development/python-modules/faker/default.nix+2−2
@@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
88
99buildPythonPackage rec {
1010 pname = "Faker";
11− version = "0.9.3";
11+ version = "1.0.1";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "8c6df7903c7b4a51f4ac273bc5fec79a249e3220c47b35d1ac1175b41982d772";
15+ sha256 = "067mdy9p1vbkypr3vazmrb0sga6maqbk542hr7hmzcb5lp3dr8sj";
1616 };
1717
1818 buildInputs = [ pytestrunner ];
pkgs/development/python-modules/node-semver/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchPypi, buildPythonPackage, pytest }:
22
33buildPythonPackage rec {
4− version = "0.5.1";
4+ version = "0.6.1";
55 pname = "node-semver";
66
77 checkInputs = [ pytest ];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "b87e335179d874a3dd58041198b2715ae70fd20eba81683acde3553c51b28f8e";
11+ sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
1212 };
1313
1414 meta = with stdenv.lib; {
pkgs/development/python-modules/pdf2image/default.nix+3−3
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "pdf2image";
5− version = "1.0.0";
5+ version = "1.3.1";
66
7− buildInputs = [ pillow poppler_utils ];
7+ propagatedBuildInputs = [ pillow poppler_utils ];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "74607efb48a9e95289148d70af05a53dbef192010a44ac868437fb044842697d";
11+ sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky";
1212 };
1313
1414 meta = with stdenv.lib; {
pkgs/development/tools/clang-tools/default.nix+2−2
@@ -1,7 +1,7 @@
1−{ stdenv, writeScript, llvmPackages_latest }:
1+{ stdenv, writeScript, llvmPackages }:
22
33let
4− clang = llvmPackages_latest.clang-unwrapped;
4+ clang = llvmPackages.clang-unwrapped;
55 version = stdenv.lib.getVersion clang;
66in
77
pkgs/os-specific/linux/fuse/default.nix+2−2
@@ -6,8 +6,8 @@ let
66 };
77in {
88 fuse_2 = mkFuse {
9− version = "2.9.8";
10− sha256Hash = "0s04ln4k9zvvbjih8ybaa19fxg8xv7dcsz2yrlbk35psnf3l67af";
9+ version = "2.9.9";
10+ sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n";
1111 };
1212
1313 fuse_3 = mkFuse {
pkgs/os-specific/linux/kernel/generic.nix+8−2
@@ -4,6 +4,9 @@
44, perl
55, bison ? null
66, flex ? null
7+, gmp ? null
8+, libmpc ? null
9+, mpfr ? null
710, stdenv
811
912, # The kernel source tarball.
@@ -89,7 +92,7 @@ let
8992 passAsFile = [ "kernelConfig" ];
9093
9194 depsBuildBuild = [ buildPackages.stdenv.cc ];
92− nativeBuildInputs = [ perl ]
95+ nativeBuildInputs = [ perl gmp libmpc mpfr ]
9396 ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
9497
9598 platformName = stdenv.hostPlatform.platform.name;
@@ -112,7 +115,10 @@ let
112115 export buildRoot="''${buildRoot:-build}"
113116
114117 # Get a basic config file for later refinement with $generateConfig.
115− make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$kernelArch
118+ make -C . O="$buildRoot" $kernelBaseConfig \
119+ ARCH=$kernelArch \
120+ HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
121+ HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}g++
116122
117123 # Create the config file.
118124 echo "generating kernel configuration..."
pkgs/os-specific/linux/kernel/hardened-config.nix+11−10
@@ -103,17 +103,18 @@ PAGE_POISONING_ZERO y
103103PANIC_ON_OOPS y
104104PANIC_TIMEOUT -1
105105
106−${optionalString (versionOlder version "4.18") ''
107− GCC_PLUGINS y # Enable gcc plugin options
108− # Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
109− GCC_PLUGIN_LATENT_ENTROPY y
106+GCC_PLUGINS y # Enable gcc plugin options
107+# Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
108+GCC_PLUGIN_LATENT_ENTROPY y
110109
111− ${optionalString (versionAtLeast version "4.11") ''
112− GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
113− ''}
114− ${optionalString (versionAtLeast version "4.14") ''
115− GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address
116− ''}
110+${optionalString (versionAtLeast version "4.11") ''
111+ GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
112+''}
113+${optionalString (versionAtLeast version "4.14") ''
114+ GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address
115+''}
116+${optionalString (versionAtLeast version "4.20") ''
117+ GCC_PLUGIN_STACKLEAK y # A port of the PaX stackleak plugin
117118''}
118119
119120# Disable various dangerous settings
pkgs/tools/X11/xpointerbarrier/default.nix+6−8
@@ -1,13 +1,11 @@
1−{ stdenv, xorg, fetchFromGitHub }:
1+{ stdenv, xorg, fetchgit }:
22stdenv.mkDerivation rec {
33 name = "xpointerbarrier-${version}";
4− version = "17.11";
5−
6− src = fetchFromGitHub {
7− owner = "vain";
8− repo = "xpointerbarrier";
4+ version = "18.06";
5+ src = fetchgit {
6+ url = "https://www.uninformativ.de/git/xpointerbarrier.git";
97 rev = "v${version}";
10− sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm";
8+ sha256 = "1k7i641x18qhjm0llsaqn2h2g9k31kgv6p8sildllmbvgxyrgvq7";
119 };
1210
1311 buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];
@@ -15,7 +13,7 @@ stdenv.mkDerivation rec {
1513 makeFlags = "prefix=$(out)";
1614
1715 meta = {
18− homepage = https://github.com/vain/xpointerbarrier;
16+ homepage = https://uninformativ.de/git/xpointerbarrier;
1917 description = "Create X11 pointer barriers around your working area";
2018 license = stdenv.lib.licenses.mit;
2119 maintainers = [ stdenv.lib.maintainers.xzfc ];
pkgs/tools/misc/plantuml/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
22
33stdenv.mkDerivation rec {
4− version = "1.2018.13";
4+ version = "1.2018.14";
55 name = "plantuml-${version}";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
9− sha256 = "181wm05gp4hs4g0z345pp1x9w1g5bx1vpipkhnwvmy4vdj17b4bg";
9+ sha256 = "0alsrip25w3hy7h9rryrm7isl6jyk1spdm6bqgbmbscla7vq960y";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/system/fakeroot/default.nix+3−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, getopt, libcap }:
1+{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }:
22
33stdenv.mkDerivation rec {
44 version = "1.23";
@@ -29,14 +29,12 @@ stdenv.mkDerivation rec {
2929 })
3030 ];
3131
32− buildInputs = [ getopt ]
32+ buildInputs = [ getopt gnused ]
3333 ++ stdenv.lib.optional (!stdenv.isDarwin) libcap
3434 ;
3535
3636 postUnpack = ''
37− for prog in getopt; do
38− sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in
39− done
37+ sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in
4038 '';
4139
4240 meta = {
pkgs/top-level/all-packages.nix+4−2
@@ -6641,7 +6641,9 @@ in
66416641 clang_37 = llvmPackages_37.clang;
66426642 clang_35 = wrapCC llvmPackages_35.clang;
66436643
6644− clang-tools = callPackage ../development/tools/clang-tools { };
6644+ clang-tools = callPackage ../development/tools/clang-tools {
6645+ llvmPackages = llvmPackages_latest;
6646+ };
66456647
66466648 clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { };
66476649
@@ -7674,7 +7676,7 @@ in
76747676 inherit (beam.interpreters)
76757677 erlang erlangR18 erlangR19 erlangR20 erlangR21
76767678 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
7677− elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
7679+ elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4
76787680 lfe lfe_1_2;
76797681
76807682 inherit (beam.packages.erlang)
pkgs/top-level/beam-packages.nix+1−1
@@ -61,7 +61,7 @@ rec {
6161 # Other Beam languages. These are built with `beam.interpreters.erlang`. To
6262 # access for example elixir built with different version of Erlang, use
6363 # `beam.packages.erlangR19.elixir`.
64− inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
64+ inherit (packages.erlang) elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4;
6565
6666 inherit (packages.erlang) lfe lfe_1_2;
6767 };
pkgs/top-level/python-packages.nix+2
@@ -1194,6 +1194,8 @@ in {
11941194
11951195 case = callPackage ../development/python-modules/case {};
11961196
1197+ cbor = callPackage ../development/python-modules/cbor {};
1198+
11971199 cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
11981200
11991201 cccolutils = callPackage ../development/python-modules/cccolutils {};