From e2b87969834f132457e11f09025845d68b6cf185 Mon Sep 17 00:00:00 2001 From: Alex Vorobiev Date: Mon, 21 May 2018 22:56:03 -0500 Subject: [PATCH 001/110] pythonPackages.clustershell: init at 1.8 --- .../python-modules/clustershell/default.nix | 89 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/python-modules/clustershell/default.nix diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix new file mode 100644 index 000000000000..617b0ea101fc --- /dev/null +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -0,0 +1,89 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +, nose, bc, hostname, coreutils, bash, gnused +}: + +buildPythonPackage rec { + pname = "ClusterShell"; + version = "1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bm0pq8w2rql9q9i2bhs865rqvb6zck3h3gkb1d0mh59arrr7p4m"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + postPatch = '' + substituteInPlace lib/ClusterShell/Worker/Ssh.py \ + --replace '"ssh"' '"${openssh}/bin/ssh"' \ + --replace '"scp"' '"${openssh}/bin/scp"' + + substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ + --replace '"/bin/sh"' '"${bash}/bin/sh"' + ''; + + checkInputs = [ nose bc hostname coreutils gnused ]; + + # Many tests want to open network connections + # https://github.com/cea-hpc/clustershell#test-suite + # + # Several tests fail on Darwin + checkPhase = '' + for f in tests/*; do + substituteInPlace $f \ + --replace '/bin/hostname' '${hostname}/bin/hostname' \ + --replace '/bin/sleep' '${coreutils}/bin/sleep' \ + --replace '"sleep' '"${coreutils}/bin/sleep' \ + --replace '/bin/echo' '${coreutils}/bin/echo' \ + --replace '/bin/uname' '${coreutils}/bin/uname' \ + --replace '/bin/false' '${coreutils}/bin/false' \ + --replace '/bin/true' '${coreutils}/bin/true' \ + --replace '/usr/bin/printf' '${coreutils}/bin/printf' \ + --replace '"sed' '"${gnused}/bin/sed' \ + --replace ' sed ' ' ${gnused}/bin/sed ' + done + + rm tests/CLIClushTest.py + rm tests/TreeWorkerTest.py + rm tests/TaskDistantMixin.py + rm tests/TaskDistantTest.py + rm tests/TaskDistantPdshMixin.py + rm tests/TaskDistantPdshTest.py + rm tests/TaskRLimitsTest.py + + nosetests -v \ + -e test_channel_ctl_shell_remote1 \ + -e test_channel_ctl_shell_remote2 \ + -e test_fromall_grouplist \ + -e test_rank_placeholder \ + -e test_engine_on_the_fly_launch \ + -e test_ev_pickup_fanout \ + -e test_ev_pickup_fanout_legacy \ + -e test_timeout \ + -e test_008_broken_pipe_on_write \ + -e testLocalBufferRCGathering \ + -e testLocalBuffers \ + -e testLocalErrorBuffers \ + -e testLocalFanout \ + -e testLocalRetcodes \ + -e testLocalRCBufferGathering \ + -e testLocalSingleLineBuffers \ + -e testLocalWorkerFanout \ + -e testSimpleMultipleCommands \ + -e testClushConfigSetRlimit \ + -e testTimerInvalidateInHandler \ + -e testTimerSetNextFireInHandler \ + -e test_channel_ctl_shell_mlocal1 \ + -e test_channel_ctl_shell_mlocal2 \ + -e test_channel_ctl_shell_mlocal3 \ + -e test_node_placeholder \ + tests/*.py + ''; + + meta = with stdenv.lib; { + description = "Scalable Python framework for cluster administration"; + homepage = https://cea-hpc.github.io/clustershell; + license = licenses.lgpl21; + maintainers = [ maintainers.alexvorobiev ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 204a49e63b48..d36aab408ede 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -225,6 +225,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + clustershell = callPackage ../development/python-modules/clustershell { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dbf = callPackage ../development/python-modules/dbf { }; From cc9d1d8b6d8f9d7f0098a8384305cf954c820941 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 12:06:34 -0700 Subject: [PATCH 002/110] fldigi: 4.0.16 -> 4.0.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fldigi/versions. These checks were done: - built on NixOS - /nix/store/87mml563vxqamznb9i9kfyi1pz9ldkxj-fldigi-4.0.17/bin/fldigi passed the binary check. - Warning: no invocation of /nix/store/87mml563vxqamznb9i9kfyi1pz9ldkxj-fldigi-4.0.17/bin/flarq had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 4.0.17 with grep in /nix/store/87mml563vxqamznb9i9kfyi1pz9ldkxj-fldigi-4.0.17 - directory tree listing: https://gist.github.com/fa90913d77a29b869e48c2c455710bd7 - du listing: https://gist.github.com/9172dd2cacb00accaffafe285aacea29 --- pkgs/applications/audio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 246e02c53c72..fc01a543e285 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.16"; + version = "4.0.17"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; + sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio From 56ef1068488c64af7c1e5b811caa24255a818bf4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 22 Jun 2018 12:02:35 +0200 Subject: [PATCH 003/110] chrony: disable the whole timesyncd module when chronyd is enabled Peviously only the timesyncd systemd unit was disabled. This meant that when you activate a system that has chronyd enabled the following strange startup behaviour takes place: systemd[1]: Starting chrony NTP daemon... systemd[1]: Stopping Network Time Synchronization... systemd[1]: Stopped chrony NTP daemon. systemd[1]: Starting Network Time Synchronization... --- nixos/modules/services/networking/chrony.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index 9bf266b38054..c287ca01feb5 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -109,7 +109,7 @@ in home = stateDir; }; - systemd.services.timesyncd.enable = mkForce false; + services.timesyncd.enable = mkForce false; systemd.services.chronyd = { description = "chrony NTP daemon"; From 67e13d60c4de9464a48bb537479534e778a65751 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Fri, 22 Jun 2018 17:32:07 +0200 Subject: [PATCH 004/110] x2goclient: fix build with qt 5.11 --- .../networking/remote/x2goclient/default.nix | 4 +++- .../networking/remote/x2goclient/qt511.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/remote/x2goclient/qt511.patch diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a4d2e85a9119..f160dabc56c6 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' + patches = [ ./qt511.patch ]; + + postPatch = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch new file mode 100644 index 000000000000..8f02cd62277d --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/printwidget.cpp b/src/printwidget.cpp +index 58a8af7..131d340 100644 +--- a/src/printwidget.cpp ++++ b/src/printwidget.cpp +@@ -23,6 +23,7 @@ + #include "x2gosettings.h" + #include "x2gologdebug.h" + #include ++#include + #ifdef Q_OS_WIN + #include "wapi.h" + #endif +-- +2.17.1 + From 89fc0fb2c906cdad7fdf707e09bb5c2f6e66c07c Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 22 Jun 2018 18:17:37 +0200 Subject: [PATCH 005/110] phpPackages.apcu51: 5.1.8 -> 5.1.11 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a1015c780241..dd362bf5956f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -18,8 +18,8 @@ let }; apcu51 = assert isPhp7; buildPecl { - name = "apcu-5.1.8"; - sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce"; + name = "apcu-5.1.11"; + sha256 = "0nz9m3fbxgyc2ij63yqmxm06a1f51g8rkxk85f85ziqdin66q2f1"; buildInputs = [ pkgs.pcre ]; doCheck = true; checkTarget = "test"; From 1f396441a6823e0af0ed40aa74dab435a95519c8 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 22 Jun 2018 18:17:51 +0200 Subject: [PATCH 006/110] phpPackages.apcu40: 4.0.7 -> 4.0.11 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index dd362bf5956f..8767742f5d0b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -12,8 +12,8 @@ let apcu = if isPhp7 then apcu51 else apcu40; apcu40 = assert !isPhp7; buildPecl { - name = "apcu-4.0.7"; - sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp"; + name = "apcu-4.0.11"; + sha256 = "002d1gklkf0z170wkbhmm2z1p9p5ghhq3q1r9k54fq1sq4p30ks5"; buildInputs = [ pkgs.pcre ]; }; From 5bfdf34bed463d0cfedef871e44e5ac4499ad3fb Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Fri, 22 Jun 2018 17:44:05 +0200 Subject: [PATCH 007/110] libxml2: add enableStatic argument If `enableStatic` is set to true, the output `static` contains the static library. --- pkgs/development/libraries/libxml2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index be2f83cb498e..8a3d7abdfa57 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,6 +3,7 @@ , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform , icuSupport ? false, icu ? null +, enableStatic ? false }: let @@ -18,7 +19,8 @@ in stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "man" "doc" ] - ++ lib.optional pythonSupport "py"; + ++ lib.optional pythonSupport "py" + ++ lib.optional enableStatic "static"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; buildInputs = lib.optional pythonSupport python @@ -32,7 +34,8 @@ in stdenv.mkDerivation rec { configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ lib.optional icuSupport "--with-icu" - ++ [ "--exec_prefix=$dev" ]; + ++ [ "--exec_prefix=$dev" ] + ++ lib.optional enableStatic "--enable-static"; enableParallelBuilding = true; @@ -57,6 +60,8 @@ in stdenv.mkDerivation rec { moveToOutput bin/xml2-config "$dev" moveToOutput lib/xml2Conf.sh "$dev" moveToOutput share/man/man1 "$bin" + '' + lib.optionalString enableStatic '' + moveToOutput lib/libxml2.a "$static" ''; passthru = { inherit version; pythonSupport = pythonSupport; }; From 48aa44ea84c0a5cee1700c21e9a832e519b0a065 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 22 Jun 2018 20:35:37 -0500 Subject: [PATCH 008/110] libtorrentRasterbar: fix build, restructure --- .../libtorrent-rasterbar/default.nix | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 5323b757b2bc..0ef2802aec1d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib +, boost, openssl, libtool, python, libiconv, geoip }: -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; +let version = "1.1.7"; + formattedVersion = lib.replaceChars ["."] ["_"] version; +in stdenv.mkDerivation { + name = "libtorrent-rasterbar-${version}"; - src = - let formattedVersion = lib.replaceChars ["."] ["_"] version; - in fetchurl { - url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; - sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; - }; + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent-${formattedVersion}"; + sha256 = "073nb7yca5jg1i8z5h76qrmddl2hdy8fc1pnchkg574087an31r3"; + }; -patches = [ - (fetchpatch { - url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; - sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc"; - }) -]; + patches = [ + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; + sha256 = "1bdv0icqzbg1il60sckcly4y22lkdbkkwdjadwdzxv7cdj586bzd"; + }) + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81.patch"; + sha256 = "1cscqpc6fq9iwspww930dsxf0yb01bgrghzf5hdhl09a87r6q2zg"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; - preConfigure = "./autotool.sh"; configureFlags = [ @@ -32,12 +39,8 @@ patches = [ "--with-libiconv=yes" ]; - enableParallelBuilding = true; - - doCheck = false; # fails to link - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; + homepage = "http://www.rasterbar.com/products/libtorrent"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; From 10c4d7d05ee990627e6f40baab803c6bc9394fc5 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sat, 23 Jun 2018 01:12:00 -0500 Subject: [PATCH 009/110] libtorrentRasterbar: fix homepage url --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 0ef2802aec1d..d0b2d79e9fab 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = "http://www.rasterbar.com/products/libtorrent"; + homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; From 722fcfc4ea204a183ebb8cda1dc890797a57dba6 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Mon, 14 May 2018 07:48:17 +0200 Subject: [PATCH 010/110] bazel: 0.12 -> 0.13 --- .../tools/build-managers/bazel/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 941004234011..889c147569d9 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { - version = "0.12.0"; + version = "0.13.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; + sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; }; sourceRoot = "."; @@ -64,14 +64,17 @@ stdenv.mkDerivation rec { --replace /bin/bash ${customBash}/bin/bash \ --replace /usr/bin/env ${coreutils}/bin/env done + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/sh ${customBash}/bin/bash echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; From 6f03c349ed4dff3f5d7e3ae7df141b0db954eb38 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Mon, 14 May 2018 07:57:34 +0200 Subject: [PATCH 011/110] bazel: Set mboes as maintainer As per #39585 --- pkgs/development/tools/build-managers/bazel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 889c147569d9..1dac9513f948 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; - maintainers = [ maintainers.philandstuff ]; + maintainers = [ maintainers.mboes ]; platforms = platforms.linux ++ platforms.darwin; }; From e3856304348405e8de2840a5faed37e3e0e9d114 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 23 Jun 2018 13:21:09 +0200 Subject: [PATCH 012/110] pgmanage: 10.1.1 -> 10.3.0 Release notes: https://github.com/pgManage/pgManage/releases/tag/v10.3.0 Also fixes #40247 --- pkgs/applications/misc/pgmanage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index d08b183d9d00..23ab0f8d34ad 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.1.1"; + version = "10.3.0"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; + sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj"; }; patchPhase = '' From 68fa306be68e67400cdf44b6dfd7f1018ea3fca5 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 23 Jun 2018 13:32:13 +0200 Subject: [PATCH 013/110] pgmanage: remove deprecated postage alias The following has been removed: * The `services.postage` alias for the `services.pgmanage` module * The `postage` alias for the `pgmanage` package --- nixos/modules/services/databases/pgmanage.nix | 68 +++++++------------ pkgs/top-level/aliases.nix | 1 - 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index d1b48c06440e..1a34c7f5ecee 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -41,7 +41,9 @@ let pgmanage = "pgmanage"; - pgmanageOptions = { +in { + + options.services.pgmanage = { enable = mkEnableOption "PostgreSQL Administration for the web"; package = mkOption { @@ -176,47 +178,29 @@ let }; }; - -in { - - options.services.pgmanage = pgmanageOptions; - - # This is deprecated and should be removed for NixOS-18.03. - options.services.postage = pgmanageOptions; - - config = mkMerge [ - { assertions = [ - { assertion = !config.services.postage.enable; - message = - "services.postage is deprecated in favour of pgmanage. " + - "They have the same options so just substitute postage for pgmanage." ; - } - ]; - } - (mkIf cfg.enable { - systemd.services.pgmanage = { - description = "pgmanage - PostgreSQL Administration for the web"; - wants = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = pgmanage; - Group = pgmanage; - ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + - optionalString cfg.localOnly " --local-only=true"; - }; + config = mkIf cfg.enable { + systemd.services.pgmanage = { + description = "pgmanage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = pgmanage; + Group = pgmanage; + ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; }; - users = { - users."${pgmanage}" = { - name = pgmanage; - group = pgmanage; - home = cfg.sqlRoot; - createHome = true; - }; - groups."${pgmanage}" = { - name = pgmanage; - }; + }; + users = { + users."${pgmanage}" = { + name = pgmanage; + group = pgmanage; + home = cfg.sqlRoot; + createHome = true; }; - }) - ]; + groups."${pgmanage}" = { + name = pgmanage; + }; + }; + }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5dafcfe22575..b653dfc7db69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -219,7 +219,6 @@ mapAliases ({ pltScheme = racket; # just to be sure polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postage = pgmanage; # added 2017-11-03 procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 From 0d5eb901ad99275d0c0f787957b5db81c38612b2 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 23 Jun 2018 04:34:55 -0700 Subject: [PATCH 014/110] treewide: http -> https --- pkgs/applications/graphics/kipi-plugins/default.nix | 2 +- pkgs/applications/misc/gnss-sdr/default.nix | 2 +- pkgs/applications/misc/librecad/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- pkgs/applications/misc/pcmanx-gtk2/default.nix | 2 +- pkgs/applications/networking/ids/daq/default.nix | 2 +- .../networking/mailreaders/claws-mail/default.nix | 2 +- pkgs/applications/networking/ostinato/default.nix | 2 +- pkgs/applications/science/astronomy/gravit/default.nix | 2 +- pkgs/applications/science/logic/celf/default.nix | 2 +- pkgs/applications/science/logic/mcrl2/default.nix | 2 +- pkgs/applications/window-managers/i3/lock-color.nix | 2 +- pkgs/data/misc/brise/default.nix | 2 +- pkgs/development/compilers/fsharp/default.nix | 2 +- pkgs/development/compilers/fsharp41/default.nix | 2 +- pkgs/development/compilers/nasm/default.nix | 2 +- pkgs/development/compilers/neko/default.nix | 2 +- pkgs/development/compilers/opendylan/bin.nix | 2 +- pkgs/development/compilers/opendylan/default.nix | 2 +- pkgs/development/libraries/allegro/5.nix | 2 +- pkgs/development/libraries/allegro/default.nix | 2 +- pkgs/development/libraries/cpp-netlib/default.nix | 2 +- .../libraries/dleyna-connector-dbus/default.nix | 2 +- pkgs/development/libraries/dleyna-core/default.nix | 2 +- pkgs/development/libraries/dleyna-renderer/default.nix | 2 +- pkgs/development/libraries/dleyna-server/default.nix | 2 +- pkgs/development/libraries/ldb/default.nix | 2 +- pkgs/development/libraries/librime/default.nix | 2 +- pkgs/development/libraries/libtomcrypt/default.nix | 2 +- pkgs/development/libraries/libtommath/default.nix | 2 +- pkgs/development/libraries/minixml/default.nix | 2 +- pkgs/development/libraries/mpfr/default.nix | 2 +- pkgs/development/libraries/nanomsg/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/development/libraries/pangomm/default.nix | 2 +- pkgs/development/libraries/pangox-compat/default.nix | 2 +- pkgs/development/libraries/uri/default.nix | 2 +- pkgs/development/tools/jira_cli/default.nix | 2 +- .../tools/misc/editorconfig-core-c/default.nix | 2 +- pkgs/development/tools/node-webkit/nw12.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 2 +- pkgs/games/astromenace/default.nix | 2 +- pkgs/games/openxcom/default.nix | 2 +- pkgs/misc/emulators/fs-uae/default.nix | 2 +- pkgs/misc/emulators/pcsx2/default.nix | 2 +- pkgs/misc/screensavers/electricsheep/default.nix | 2 +- pkgs/os-specific/linux/odp-dpdk/default.nix | 2 +- pkgs/servers/irc/ngircd/default.nix | 2 +- pkgs/tools/X11/keynav/default.nix | 2 +- pkgs/tools/backup/partclone/default.nix | 2 +- pkgs/tools/networking/hans/default.nix | 2 +- pkgs/tools/security/libacr38u/default.nix | 2 +- pkgs/tools/security/pcsc-cyberjack/default.nix | 2 +- pkgs/tools/virtualization/aws/default.nix | 2 +- pkgs/top-level/python-packages.nix | 10 +++++----- 55 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index d27fdb8b53be..48a94a5253d0 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Plugins for KDE-based image applications"; license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 68b494927915..0bb0926f048a 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source Global Navigation Satellite Systems software-defined receiver"; - homepage = http://gnss-sdr.org/; + homepage = https://gnss-sdr.org/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index bfb658098b73..ca9a90777e33 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A 2D CAD package based upon Qt"; - homepage = http://librecad.org; + homepage = https://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index d78caa24e462..1857c3118ddd 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://mupdf.com; + homepage = https://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 7448b8e6648b..7fdfbd84d2f6 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pcman.ptt.cc; + homepage = https://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; maintainers = [ maintainers.sifmelcara ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 8f4b54cec86a..3dc154351d2f 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 4d3c8a797412..057c051c6259 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = { description = "The user-friendly, lightweight, and fast email client"; - homepage = http://www.claws-mail.org/; + homepage = https://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin ]; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index c03202517747..962f10a99c01 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; - homepage = http://ostinato.org; + homepage = https://ostinato.org; license = licenses.gpl3; maintainers = with maintainers; [ rick68 ]; platforms = with platforms; linux ++ darwin ++ cygwin; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index d572dd55b2b2..7ff9cc517c6e 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gravit-0.5.1"; src = fetchurl { - url = "http://gravit.slowchop.com/media/downloads/${name}.tgz"; + url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix index 669cd46cd2ec..708270f772fd 100644 --- a/pkgs/applications/science/logic/celf/default.nix +++ b/pkgs/applications/science/logic/celf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linear logic programming system"; - homepage = http://github.com/clf/celf; + homepage = https://github.com/clf/celf; license = licenses.gpl3; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 6e8797fcc40b..ec717002c2d6 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { that can be used for modelling, validation and verification of concurrent systems and protocols ''; - homepage = http://www.mcrl2.org/; + homepage = https://www.mcrl2.org/; license = licenses.boost; maintainers = with maintainers; [ moretea ]; platforms = platforms.unix; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 2e50d35d4417..fa1ddcf810b7 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { - clock: time/date with configurable format - keyboard-layout ''; - homepage = http://github.com/PandorasFox/i3lock-color; + homepage = https://github.com/PandorasFox/i3lock-color; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index 6c59a0faf049..54b54d278ffb 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { to support various Chinese input methods, including those based on modern dialects or historical diasystems of the Chinese language. ''; - homepage = http://rime.im; + homepage = https://rime.im; # Note that individual packages in this collection # may be released under different licenses license = licenses.gpl3; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 5c1f931da9a2..f9f083f04d75 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = http://fsharp.org/; + homepage = https://fsharp.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 354723dfa740..3ce7ae60e114 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = http://fsharp.org/; + homepage = https://fsharp.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 89dd7dc3fdc5..1676ce4884d9 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nasm.us/; + homepage = https://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; maintainers = with maintainers; [ pSub willibutz ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 42a585ff51f0..e2aa5736c7a3 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-level dynamically typed programming language"; - homepage = http://nekovm.org; + homepage = https://nekovm.org; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index d3f654749b04..1abf44f23495 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://opendylan.org; + homepage = https://opendylan.org; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 95f4dc5b215f..d00080282d7c 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; meta = { - homepage = http://opendylan.org; + homepage = https://opendylan.org; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index e20b2700f0e2..5e82a1a3c6be 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = http://liballeg.org/; + homepage = https://liballeg.org/; license = licenses.zlib; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 12b2cbf07071..21d9ce23d319 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = http://liballeg.org/; + homepage = https://liballeg.org/; license = licenses.free; # giftware maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index e5391e7100d5..badfc630a47e 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of open-source libraries for high level network programming"; - homepage = http://cpp-netlib.org; + homepage = https://cpp-netlib.org; license = licenses.boost; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index e3815165f6e3..d52f1b6a2cff 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A D-Bus API for the dLeyna services"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 11cfa31c04b6..787030eed987 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index a8ea7e8bd627..99af28111a76 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover and manipulate Digital Media Renderers"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index b4885145f6e4..79b0155c9132 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 356433b54eb5..10441b9b871e 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A LDAP-like embedded database"; - homepage = http://ldb.samba.org/; + homepage = https://ldb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index e6d2612fe626..5be9a2de94e5 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://rime.im/; + homepage = https://rime.im/; description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index e30f699f103d..d6915fe4cd3f 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libtom.net/LibTomCrypt/; + homepage = https://www.libtom.net/LibTomCrypt/; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index cd13eef156d0..8c88dd97ec41 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libtom.net/LibTomMath/; + homepage = https://www.libtom.net/LibTomMath/; description = "A library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index fa4758d0877a..6779268dbdc1 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small XML library"; - homepage = http://www.minixml.org; + homepage = https://www.msweet.org/mxml/; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index d75d9d6b9d90..afb44dd80f91 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.mpfr.org/; + homepage = https://www.mpfr.org/; description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 07bd4e7e9fbe..f50b64fca3ed 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description= "Socket library that provides several common communication patterns"; - homepage = http://nanomsg.org/; + homepage = https://nanomsg.org/; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index d880d41c7084..9a27901c862d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Pango forms the core of text and font handling for GTK+-2.x. ''; - homepage = http://www.pango.org/; + homepage = https://www.pango.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index b5ec5198975e..93c2501a6203 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; - homepage = http://www.pango.org/; + homepage = https://www.pango.org/; license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 8154fca29e84..2d6b678f6570 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A compatibility library for pango>1.30.*"; - homepage = http://www.pango.org/; + homepage = https://www.pango.org/; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index bec6f2d0f4bc..46eac0fb88bb 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "C++ URI library"; - homepage = http://cpp-netlib.org; + homepage = https://cpp-netlib.org; license = stdenv.lib.licenses.boost; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 37b76c50e902..f1c6e1f8ca6e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A command line interface to Jira"; - homepage = http://github.com/alisaifee/jira-cli; + homepage = https://github.com/alisaifee/jira-cli; maintainers = with maintainers; [ nyarly ]; license = licenses.mit; }; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index a0d6e49c0258..2eda1f044ce8 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://editorconfig.org/; + homepage = https://editorconfig.org/; description = "EditorConfig core library written in C"; longDescription = '' EditorConfig makes it easy to maintain the correct coding style when diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 8e2953839b71..f09dbfdb1653 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { version = "0.12.3"; src = fetchurl { - url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; + url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 6a2995b2bbe0..90aec83be986 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = http://nwjs.io/; + homepage = https://nwjs.io/; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 737f31d6e105..91959a1c942b 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; - homepage = http://www.viewizard.com/; + homepage = https://www.viewizard.com/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 30470e98c58d..a936ca134122 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; - homepage = http://openxcom.org; + homepage = https://openxcom.org; repositories.git = https://github.com/SupSuper/OpenXcom.git; maintainers = [ stdenv.lib.maintainers.cpages ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 6d462c0e3797..9856c93eda2d 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { create customized Amigas. ''; license = licenses.gpl2Plus; - homepage = http://fs-uae.net; + homepage = https://fs-uae.net; maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 2e28fd297ec0..95e94eeaff51 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. ''; - homepage = http://pcsx2.net; + homepage = https://pcsx2.net; maintainers = with maintainers; [ hrdinka ]; # PCSX2's source code is released under LGPLv3+. It However ships diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 17cf99d8b00c..6b28c39f7679 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; - homepage = http://electricsheep.org/; + homepage = https://electricsheep.org/; maintainers = with maintainers; [ nand0p fpletz ]; platforms = platforms.linux; license = licenses.gpl1; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index ff408b6a6248..bead5f84eac9 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Data Plane optimized for DPDK"; - homepage = http://www.opendataplane.org; + homepage = https://www.opendataplane.org; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index bdd88db09844..f3b67741c191 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; - homepage = http://ngircd.barton.de; + homepage = https://ngircd.barton.de; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 23e528297eef..1e7b4e58c171 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generate X11 mouse clicks from keyboard"; - homepage = http://www.semicomplete.com/projects/keynav/; + homepage = https://www.semicomplete.com/projects/keynav/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 758146fcc00b..021f783e0fdd 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition. ''; - homepage = http://partclone.org; + homepage = https://partclone.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 82e105c3a3be..6fd4ab361630 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { the situation that your Internet access is firewalled, but pings are allowed. ''; - homepage = http://code.gerade.org/hans/; + homepage = https://code.gerade.org/hans/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 5eb659f40c3a..d858ed3fd6d3 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { The package is based on the debian package libacr38u. ''; - homepage = http://www.acs.com.hk; + homepage = https://www.acs.com.hk; license = licenses.lgpl2Plus; maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 82b7110189c7..b74905b6e7e2 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; - homepage = http://www.reiner-sct.com/; + homepage = https://www.reiner-sct.com/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 5e0c13f9d951..893d4f2aec23 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.timkay.com/aws/; + homepage = https://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 484d2bc8c62b..a6e4100ea499 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2285,7 +2285,7 @@ in { ''; meta = { - homepage = "http://editorconfig.org"; + homepage = https://editorconfig.org; description = "EditorConfig File Locator and Interpreter for Python"; license = stdenv.lib.licenses.psfl; }; @@ -7772,7 +7772,7 @@ in { meta = { description = "EditorConfig File Locator and Interpreter for Python"; - homepage = "http://editorconfig.org/"; + homepage = https://editorconfig.org/; license = licenses.psfl; }; }; @@ -9147,7 +9147,7 @@ in { ]; meta = with stdenv.lib; { - homepage = "http://github.com/bcwaldon/warlock"; + homepage = https://github.com/bcwaldon/warlock; }; }; @@ -11591,7 +11591,7 @@ in { doCheck = false; meta = { - homepage = "http://github.com/mongodb/mongo-python-driver"; + homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; description = "Python driver for MongoDB "; }; @@ -12797,7 +12797,7 @@ in { meta = { description = "sqlite-backed dictionary"; - homepage = "http://github.com/Yelp/sqlite3dbm"; + homepage = https://github.com/Yelp/sqlite3dbm; license = licenses.asl20; }; }; From 99ed01e1042116b430a5074f76ea9e1bbd458217 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 08:42:39 -0700 Subject: [PATCH 015/110] xmlsec: 1.2.25 -> 1.2.26 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmlsec/versions. These checks were done: - built on NixOS - /nix/store/abvl1x7fq46597zs54989mzlbfs7fq6i-xmlsec-1.2.26/bin/.xmlsec1-wrapped passed the binary check. - /nix/store/abvl1x7fq46597zs54989mzlbfs7fq6i-xmlsec-1.2.26/bin/xmlsec1 passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 1.2.26 with grep in /nix/store/abvl1x7fq46597zs54989mzlbfs7fq6i-xmlsec-1.2.26 - directory tree listing: https://gist.github.com/e9e137ae925e9687577596baffb336c3 - du listing: https://gist.github.com/dda9ad69863fe80d1ea4126315585b0c --- pkgs/development/libraries/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 32ce856eddd3..e17ac6d15075 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, nss, makeWrapper }: let - version = "1.2.25"; + version = "1.2.26"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; + sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; }; outputs = [ "out" "dev" ]; From ffdf8192b339c6facab0efbbccd679b0bdb230dd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:41:12 -0500 Subject: [PATCH 016/110] ghc843: apparently need LLVM when building against musl too --- pkgs/development/compilers/ghc/8.4.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index ac3578927bd5..4d2f3894f178 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. From 7997c2ad4c49e90711ee537a57f90534941b2205 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 23 Jun 2018 13:19:34 -0400 Subject: [PATCH 017/110] =?UTF-8?q?mpage:=20fix=20urls=20from=20mesa=20?= =?UTF-8?q?=E2=86=92=20glu=20transition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Find/replace error in 0acec7e984ff38b7a296a459ba4b539a3b719c1b. --- pkgs/tools/text/mpage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 47e6766d21fa..4ebe62ef9a5f 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "mpage-2.5.6"; src = fetchurl { - url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz"; + url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.libGLU_combined.nl/pub/mpage/; + homepage = http://www.mesa.nl/pub/mpage/; platforms = stdenv.lib.platforms.linux; }; } From 798ad38c35cabd845241d120553b9cdf2c150b41 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Jun 2018 13:38:29 -0400 Subject: [PATCH 018/110] boost: use default toolset option for 1.66 & 1.67 we were overriding the default toolset option. This meant that gcc-cross was not being selected properly, breaking the cross toolchain. /cc @dtzWill --- pkgs/development/libraries/boost/1.66.nix | 2 -- pkgs/development/libraries/boost/1.67.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index 02cf511a6fdf..932ebdcb463a 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 2831104410b1..8b9e7ccca7f1 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) From 3e49430922ca5fea91de12984be2478fee4f97fa Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 12:53:45 -0500 Subject: [PATCH 019/110] ghc822: useLLVM when building against musl too --- pkgs/development/compilers/ghc/8.2.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 2d49742c6510..fefd07b12043 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. From 75a006c32e76c147cd85969b28a173beacf788ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 09:46:51 -0700 Subject: [PATCH 020/110] tbb: 2018_U4 -> 2018_U5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tbb/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2018_U5 with grep in /nix/store/xhqkrh6rrs3ji21v1rdicm3f50j1ildx-tbb-2018_U5 - directory tree listing: https://gist.github.com/cfe37285702751a390a4ccdcf83b000e - du listing: https://gist.github.com/ef220dc185b398311333a7d43930787a --- pkgs/development/libraries/tbb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b9fba467457e..a7b7f5243fb0 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U4"; + version = "2018_U5"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "00y7b4x0blkn0cymnrbh6fw7kp4xcdp4bi14rj33sl1lypawa1j6"; + sha256 = "080df8h2whnly6n9pslpg07dc9vr0p45gqgy9qijpjvxkjwfkdkp"; }; makeFlags = concatStringsSep " " ( From 96cfd14fd277209eb551f7f5be33a417d94f2fd8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:29:22 -0500 Subject: [PATCH 021/110] llvm-3.9: patches to fix w/musl Mostly same as used with LLVM 4.0 --- .../llvm/3.9/dynamiclibrary-musl.patch | 33 +++++++++++++++++++ pkgs/development/compilers/llvm/3.9/llvm.nix | 5 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/3.9/dynamiclibrary-musl.patch diff --git a/pkgs/development/compilers/llvm/3.9/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/3.9/dynamiclibrary-musl.patch new file mode 100644 index 000000000000..d5d7f07b5e11 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.9/dynamiclibrary-musl.patch @@ -0,0 +1,33 @@ +From d12ecb83d01dcb580dd94f4d57828f33d3eb4c35 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Thu, 18 Feb 2016 15:33:21 +0100 +Subject: [PATCH 3/3] Fix DynamicLibrary to build with musl libc + +stdin/out/err is part of the libc and not the kernel so we check for the +specific libc that does the unexpected instead of linux. + +This is needed for making it build with musl libc. +--- + lib/Support/DynamicLibrary.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp +index 9a7aeb5..0c1c8f8 100644 +--- a/lib/Support/DynamicLibrary.cpp ++++ b/lib/Support/DynamicLibrary.cpp +@@ -140,10 +140,10 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { + #define EXPLICIT_SYMBOL(SYM) \ + if (!strcmp(symbolName, #SYM)) return &SYM + +-// On linux we have a weird situation. The stderr/out/in symbols are both ++// On GNU libc we have a weird situation. The stderr/out/in symbols are both + // macros and global variables because of standards requirements. So, we + // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. +-#if defined(__linux__) and !defined(__ANDROID__) ++#if defined(__GLIBC__) + { + EXPLICIT_SYMBOL(stderr); + EXPLICIT_SYMBOL(stdout); +-- +2.7.3 + diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 71b67aa7dc57..c325da3e7376 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -62,7 +62,10 @@ in stdenv.mkDerivation rec { url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch; sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl"; }) - ]; + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ./dynamiclibrary-musl.patch + ]; postPatch = "" + '' From 04fb62878089f4a3a41943f78398d29e23eb6a39 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:30:41 -0500 Subject: [PATCH 022/110] llvm_39: unconditionally apply sigaltstack fix (as we do on other LLVM builds) --- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index c325da3e7376..fa9b9560225c 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ From f0c154a1097b9e25cde8561454d3e60c35f46d86 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:32:38 -0500 Subject: [PATCH 023/110] llvm_39: apply llvm_4 compiler-rt patch for musl as well --- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 + .../llvm/3.9/sanitizers-nongnu.patch | 368 ++++++++++++++++++ 2 files changed, 370 insertions(+) create mode 100644 pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index fa9b9560225c..31677b0ef400 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -107,6 +107,8 @@ in stdenv.mkDerivation rec { substituteInPlace lib/esan/esan_sideline_linux.cpp \ --replace 'struct sigaltstack' 'stack_t' ) + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation diff --git a/pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch new file mode 100644 index 000000000000..5bd858f8ae79 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch @@ -0,0 +1,368 @@ +From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001 +From: Matthias Maier +Date: Fri, 5 May 2017 17:47:39 +0000 +Subject: [PATCH] Musl patches + +Ported to compiler-rt-sanitizers-4.0.0. Taken from + + https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- + lib/sanitizer_common/sanitizer_platform.h | 7 ++++ + .../sanitizer_platform_interceptors.h | 2 +- + .../sanitizer_platform_limits_posix.cc | 39 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 46 insertions(+), 32 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index c051573dd..e295f6004 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -39,7 +39,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #else +@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 6e908ac01..8f23d9adc 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + return real == wrapper; + } + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 27a66c882..3b559a303 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 0a687f620..0852d97d7 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX ++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 4ed9afedf..64f584e93 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -100,7 +100,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -361,7 +361,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index f99f0b594..3a773a94e 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -180,11 +180,11 @@ void InitTlsSize() { + } + #else + void InitTlsSize() { } +-#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \ +- && SANITIZER_LINUX && !SANITIZER_ANDROID ++ && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -338,7 +338,7 @@ uptr ThreadSelf() { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr) dtv[2]; + *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #else +@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) { + + #if !SANITIZER_GO + uptr GetTlsSize() { +-#if SANITIZER_FREEBSD || SANITIZER_ANDROID ++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index d9a8e8df1..fe01c5744 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -162,6 +162,13 @@ + # define SANITIZER_PPC64V2 0 + #endif + ++ ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index 62875d11a..212e6e882 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -23,7 +23,7 @@ + # define SI_NOT_WINDOWS 0 + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 683f019d7..fd4880962 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,8 @@ + + #include "sanitizer_platform.h" + ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -252,7 +257,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index 3313288a7..103c7b6b9 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -287,7 +287,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + __res_state *statp = (__res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + From b39fb5525b4595d5ef647c817f72ee975807fe06 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:34:18 -0500 Subject: [PATCH 024/110] llvm_39: set triples as well --- pkgs/development/compilers/llvm/3.9/llvm.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 31677b0ef400..94a8d379fb2c 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -134,6 +134,10 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' From a1bf9b60943a777a1d2bd2360933729736ec7226 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:37:55 -0500 Subject: [PATCH 025/110] llvm_39: disable sanitizers/xray bits when using musl Don't have a fix for this handy and don't need it yet so for now just disable. --- pkgs/development/compilers/llvm/3.9/llvm.nix | 6 +- .../llvm/3.9/sanitizers-nongnu.patch | 368 ------------------ 2 files changed, 4 insertions(+), 370 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 94a8d379fb2c..8fe1ac46ce9a 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -107,8 +107,6 @@ in stdenv.mkDerivation rec { substituteInPlace lib/esan/esan_sideline_linux.cpp \ --replace 'struct sigaltstack' 'stack_t' ) - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -138,6 +136,10 @@ in stdenv.mkDerivation rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch deleted file mode 100644 index 5bd858f8ae79..000000000000 --- a/pkgs/development/compilers/llvm/3.9/sanitizers-nongnu.patch +++ /dev/null @@ -1,368 +0,0 @@ -From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001 -From: Matthias Maier -Date: Fri, 5 May 2017 17:47:39 +0000 -Subject: [PATCH] Musl patches - -Ported to compiler-rt-sanitizers-4.0.0. Taken from - - https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch ---- - lib/asan/asan_linux.cc | 4 +-- - lib/interception/interception_linux.cc | 2 +- - lib/interception/interception_linux.h | 2 +- - lib/msan/msan_linux.cc | 2 +- - .../sanitizer_common_interceptors_ioctl.inc | 4 +-- - lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- - lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- - lib/sanitizer_common/sanitizer_platform.h | 7 ++++ - .../sanitizer_platform_interceptors.h | 2 +- - .../sanitizer_platform_limits_posix.cc | 39 +++++++++++++--------- - lib/tsan/rtl/tsan_platform_linux.cc | 2 +- - 11 files changed, 46 insertions(+), 32 deletions(-) - -diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc -index c051573dd..e295f6004 100644 ---- a/lib/asan/asan_linux.cc -+++ b/lib/asan/asan_linux.cc -@@ -39,7 +39,7 @@ - #include - #endif - --#if SANITIZER_ANDROID || SANITIZER_FREEBSD -+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU - #include - extern "C" void* _DYNAMIC; - #else -@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { - UNIMPLEMENTED(); - } - --#if SANITIZER_ANDROID -+#if SANITIZER_ANDROID || SANITIZER_NONGNU - // FIXME: should we do anything for Android? - void AsanCheckDynamicRTPrereqs() {} - void AsanCheckIncompatibleRT() {} -diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc -index 6e908ac01..8f23d9adc 100644 ---- a/lib/interception/interception_linux.cc -+++ b/lib/interception/interception_linux.cc -@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, - return real == wrapper; - } - --#if !defined(__ANDROID__) // android does not have dlvsym -+#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym - void *GetFuncAddrVer(const char *func_name, const char *ver) { - return dlvsym(RTLD_NEXT, func_name, ver); - } -diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h -index 27a66c882..3b559a303 100644 ---- a/lib/interception/interception_linux.h -+++ b/lib/interception/interception_linux.h -@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); - (::__interception::uptr) & (func), \ - (::__interception::uptr) & WRAP(func)) - --#if !defined(__ANDROID__) // android does not have dlvsym -+#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym - #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ - (::__interception::real_##func = (func##_f)( \ - unsigned long)::__interception::GetFuncAddrVer(#func, symver)) -diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc -index 0a687f620..0852d97d7 100644 ---- a/lib/msan/msan_linux.cc -+++ b/lib/msan/msan_linux.cc -@@ -13,7 +13,7 @@ - //===----------------------------------------------------------------------===// - - #include "sanitizer_common/sanitizer_platform.h" --#if SANITIZER_FREEBSD || SANITIZER_LINUX -+#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU - - #include "msan.h" - #include "msan_thread.h" -diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 4ed9afedf..64f584e93 100644 ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -100,7 +100,7 @@ static void ioctl_table_fill() { - _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); - #endif - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX && !SANITIZER_NONGNU - // Conflicting request ids. - // _(CDROMAUDIOBUFSIZ, NONE, 0); - // _(SNDCTL_TMR_CONTINUE, NONE, 0); -@@ -361,7 +361,7 @@ static void ioctl_table_fill() { - _(VT_WAITACTIVE, NONE, 0); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE - _(CYGETDEFTHRESH, WRITE, sizeof(int)); - _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc -index 469c8eb7e..24f87867d 100644 ---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc -+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc -@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { - } - } - --#if !SANITIZER_ANDROID -+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU - PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, - void *old_rlim) { - if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); -diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc -index f99f0b594..3a773a94e 100644 ---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc -+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc -@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { - #endif - } - --#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO -+#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU - static uptr g_tls_size; - - #ifdef __i386__ -@@ -180,11 +180,11 @@ void InitTlsSize() { - } - #else - void InitTlsSize() { } --#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO -+#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU - - #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ - || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \ -- && SANITIZER_LINUX && !SANITIZER_ANDROID -+ && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - // sizeof(struct pthread) from glibc. - static atomic_uintptr_t kThreadDescriptorSize; - -@@ -338,7 +338,7 @@ uptr ThreadSelf() { - - #if !SANITIZER_GO - static void GetTls(uptr *addr, uptr *size) { --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) - *addr = ThreadSelf(); - *size = GetTlsSize(); -@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) { - *addr = (uptr) dtv[2]; - *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); - } --#elif SANITIZER_ANDROID -+#elif SANITIZER_ANDROID || SANITIZER_NONGNU - *addr = 0; - *size = 0; - #else -@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) { - - #if !SANITIZER_GO - uptr GetTlsSize() { --#if SANITIZER_FREEBSD || SANITIZER_ANDROID -+#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU - uptr addr, size; - GetTls(&addr, &size); - return size; -diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h -index d9a8e8df1..fe01c5744 100644 ---- a/lib/sanitizer_common/sanitizer_platform.h -+++ b/lib/sanitizer_common/sanitizer_platform.h -@@ -162,6 +162,13 @@ - # define SANITIZER_PPC64V2 0 - #endif - -+ -+#if defined(__linux__) && !defined(__GLIBC__) -+# define SANITIZER_NONGNU 1 -+#else -+# define SANITIZER_NONGNU 0 -+#endif -+ - // By default we allow to use SizeClassAllocator64 on 64-bit platform. - // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 - // does not work well and we need to fallback to SizeClassAllocator32. -diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h -index 62875d11a..212e6e882 100644 ---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h -+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h -@@ -23,7 +23,7 @@ - # define SI_NOT_WINDOWS 0 - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - # define SI_LINUX_NOT_ANDROID 1 - #else - # define SI_LINUX_NOT_ANDROID 0 -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index 683f019d7..fd4880962 100644 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -14,6 +14,8 @@ - - #include "sanitizer_platform.h" - -+#define _LINUX_SYSINFO_H -+ - #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC - // Tests in this file assume that off_t-dependent data structures match the - // libc ABI. For example, struct dirent here is what readdir() function (as -@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - #include --#include -+# if !SANITIZER_NONGNU -+# include -+# endif - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - #if HAVE_RPC_XDR_H - # include - #elif HAVE_TIRPC_RPC_XDR_H -@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include -+// #include -+#include - #include - #include - #include -@@ -252,7 +257,7 @@ namespace __sanitizer { - unsigned struct_itimerspec_sz = sizeof(struct itimerspec); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned struct_ustat_sz = sizeof(struct ustat); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); -@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); - unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU - int glob_nomatch = GLOB_NOMATCH; - int glob_altdirfunc = GLOB_ALTDIRFUNC; - #endif -@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned struct_termios_sz = sizeof(struct termios); - unsigned struct_winsize_sz = sizeof(struct winsize); - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX && !SANITIZER_NONGNU - unsigned struct_arpreq_sz = sizeof(struct arpreq); - unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); - unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); -@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned struct_vt_mode_sz = sizeof(struct vt_mode); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); - unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) -@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; - unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; - unsigned IOCTL_CYGETMON = CYGETMON; -@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); - CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU - CHECK_TYPE_SIZE(glob_t); - CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); - CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); -@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec); - CHECK_SIZE_AND_OFFSET(iovec, iov_base); - CHECK_SIZE_AND_OFFSET(iovec, iov_len); - -+#if !SANITIZER_NONGNU - CHECK_TYPE_SIZE(msghdr); - CHECK_SIZE_AND_OFFSET(msghdr, msg_name); - CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); -@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr); - CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); - CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); - CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); -+#endif - - COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); - CHECK_SIZE_AND_OFFSET(dirent, d_ino); -@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); - - CHECK_TYPE_SIZE(ether_addr); - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU - CHECK_TYPE_SIZE(ipc_perm); - # if SANITIZER_FREEBSD - CHECK_SIZE_AND_OFFSET(ipc_perm, key); -@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); - CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); - #endif - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX && !SANITIZER_NONGNU - COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); - #endif - -@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); - COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); - CHECK_SIZE_AND_OFFSET(FILE, _flags); - CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); -@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); - CHECK_SIZE_AND_OFFSET(FILE, _fileno); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); - CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); - CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); -diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc -index 3313288a7..103c7b6b9 100644 ---- a/lib/tsan/rtl/tsan_platform_linux.cc -+++ b/lib/tsan/rtl/tsan_platform_linux.cc -@@ -287,7 +287,7 @@ void InitializePlatform() { - // This is required to properly "close" the fds, because we do not see internal - // closes within glibc. The code is a pure hack. - int ExtractResolvFDs(void *state, int *fds, int nfd) { --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - int cnt = 0; - __res_state *statp = (__res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { --- -2.16.2 - From 182de524a1339cf00b186fe277a5aeefc3ac982c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:45:55 -0500 Subject: [PATCH 026/110] llvm_{39,4}: refactor to use same patch file --- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- .../llvm/4/dynamiclibrary-musl.patch | 33 ------------------- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- .../llvm/{3.9 => }/dynamiclibrary-musl.patch | 0 4 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch rename pkgs/development/compilers/llvm/{3.9 => }/dynamiclibrary-musl.patch (100%) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 8fe1ac46ce9a..708e471bd4ac 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { }) ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../TLI-musl.patch - ./dynamiclibrary-musl.patch + ../dynamiclibrary-musl.patch ]; postPatch = "" diff --git a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch deleted file mode 100644 index d5d7f07b5e11..000000000000 --- a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d12ecb83d01dcb580dd94f4d57828f33d3eb4c35 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Thu, 18 Feb 2016 15:33:21 +0100 -Subject: [PATCH 3/3] Fix DynamicLibrary to build with musl libc - -stdin/out/err is part of the libc and not the kernel so we check for the -specific libc that does the unexpected instead of linux. - -This is needed for making it build with musl libc. ---- - lib/Support/DynamicLibrary.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp -index 9a7aeb5..0c1c8f8 100644 ---- a/lib/Support/DynamicLibrary.cpp -+++ b/lib/Support/DynamicLibrary.cpp -@@ -140,10 +140,10 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { - #define EXPLICIT_SYMBOL(SYM) \ - if (!strcmp(symbolName, #SYM)) return &SYM - --// On linux we have a weird situation. The stderr/out/in symbols are both -+// On GNU libc we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we - // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. --#if defined(__linux__) and !defined(__ANDROID__) -+#if defined(__GLIBC__) - { - EXPLICIT_SYMBOL(stderr); - EXPLICIT_SYMBOL(stdout); --- -2.7.3 - diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index a371296db326..06bcd74456c4 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation (rec { patch -p0 < ${../aarch64.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} - patch -p1 -i ${./dynamiclibrary-musl.patch} + patch -p1 -i ${../dynamiclibrary-musl.patch} patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; diff --git a/pkgs/development/compilers/llvm/3.9/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch similarity index 100% rename from pkgs/development/compilers/llvm/3.9/dynamiclibrary-musl.patch rename to pkgs/development/compilers/llvm/dynamiclibrary-musl.patch From 4ef4e0f44b4a4ed7d0cb6082ef24f2ce25d556b8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:47:04 -0500 Subject: [PATCH 027/110] llvm_38: always apply sigaltstack patch --- pkgs/development/compilers/llvm/3.8/llvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 2c65234b6a47..30d40a84b4e7 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ From 68351290ad701dd655311a9fb557266993362d00 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:51:22 -0500 Subject: [PATCH 028/110] llvm_38: musl patches + options Same as those added to llvm_39 a few commits ago. --- pkgs/development/compilers/llvm/3.8/llvm.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 30d40a84b4e7..b847a67e7e3f 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -36,8 +36,12 @@ in stdenv.mkDerivation rec { # Fix a segfault in llc # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html - patches = [ ./D17533-1.patch ] ++ - stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; + patches = [ ./D17533-1.patch ] + ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ../dynamiclibrary-musl.patch + ]; # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is @@ -81,6 +85,14 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' From ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:55:48 -0500 Subject: [PATCH 029/110] llvm_4: refactor patch location, will be sharing shortly --- pkgs/development/compilers/llvm/4/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/4/libc++abi.nix | 2 +- .../{4/libc++/max_align_t.patch => libcxx-max_align_t.patch} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/llvm/{4/libc++/max_align_t.patch => libcxx-max_align_t.patch} (100%) diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 718abc420a97..6ce9c0d4792b 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./xlocale-glibc-2.26.patch ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ./max_align_t.patch + ../../libcxx-max_align_t.patch ]; prePatch = '' diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 41eb40e124eb..5eeec395b97a 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch similarity index 100% rename from pkgs/development/compilers/llvm/4/libc++/max_align_t.patch rename to pkgs/development/compilers/llvm/libcxx-max_align_t.patch From dd4299a27c1cfdb8ac8e355c96051f278ec9734a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:59:12 -0500 Subject: [PATCH 030/110] llvm_39: musl patches, same as llvm_4 --- pkgs/development/compilers/llvm/3.9/libc++/default.nix | 9 +++++++-- pkgs/development/compilers/llvm/3.9/libc++abi.nix | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 7e5c30bdfd35..da18e10c68a6 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ./xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -25,7 +30,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dc508757ab6d..dffb207a32b6 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin From e4fffae0cfa8d3b5c1337c1c07573ee8e8eb7aaa Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 12:06:41 -0500 Subject: [PATCH 031/110] llvmPackages_39.libcxx: minor cleanup --- pkgs/development/compilers/llvm/3.9/libc++/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index da18e10c68a6..bd2cc19d2e0b 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -24,12 +24,13 @@ stdenv.mkDerivation rec { ../../libcxx-max_align_t.patch ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; From ae78847b50fc28ac9c219d7d35e89290107f8fae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 12:08:32 -0500 Subject: [PATCH 032/110] clang_39: fix w/musl (same as clang_4) --- pkgs/development/compilers/llvm/3.9/clang/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 1f6d80ab3be9..f597c559dba6 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -29,6 +29,8 @@ let postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; outputs = [ "out" "lib" "python" ]; From 0b7cc25d19e910a00d39e45813976692ebf02749 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 12:09:57 -0500 Subject: [PATCH 033/110] clang_38: musl fixup, cmake should be nativeBuildInput --- pkgs/development/compilers/llvm/3.8/clang/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 05893704d872..cc25a41b0400 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -13,7 +13,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libxml2 llvm python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" @@ -27,6 +28,8 @@ let postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; outputs = [ "out" "lib" "python" ]; From db7041a0471924ad17c9bf6308fbfd4eea15209c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 12:11:18 -0500 Subject: [PATCH 034/110] libc++{,abi}_38: musl fixes, cmake is nativeBuildInput --- .../compilers/llvm/3.8/libc++/default.nix | 13 ++++++++++--- pkgs/development/compilers/llvm/3.8/libc++abi.nix | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index cc3f5545146c..5a0410302f2f 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -17,15 +17,22 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ../../3.9/libc++/xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 45fb7b5be4f6..8b25681c2dbf 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin From 469cca0ac701279d20473a2e4cafe86bdcd2a469 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 23 Jun 2018 17:25:09 -0400 Subject: [PATCH 035/110] nim: disable checks on darwin These time out for some reason: https://hydra.nixos.org/job/nixpkgs/trunk/nim.x86_64-darwin --- pkgs/development/compilers/nim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index de383410b9c6..a4b706d35aa5 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0"; }; - doCheck = true; + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; From 28c476dbf189a99e4f26ee4d5be6ae8c0e2d253b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 23 Jun 2018 17:31:44 -0400 Subject: [PATCH 036/110] picolisp: broken on darwin --- pkgs/development/interpreters/picolisp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 6f7f2df96bff..e2b64fd4e028 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = https://picolisp.com/; license = licenses.mit; platforms = platforms.all; + broken = stdenv.isDarwin; # times out maintainers = with maintainers; [ raskin tohl ]; }; From 8e81c7c7a6953ef585a6c31f23402302adbc188f Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sat, 23 Jun 2018 23:32:00 +0200 Subject: [PATCH 037/110] x2goclient: 4.1.1.1 -> 4.1.2.0 --- pkgs/applications/networking/remote/x2goclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index f160dabc56c6..a1a1f12a8c1c 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -3,11 +3,11 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.1.1.1"; + version = "4.1.2.0"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; + sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn"; }; buildInputs = [ cups libssh libXpm nxproxy openldap openssh From 9bfd3ade2e894be2459d9cf4e31df84c308467df Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 23 Jun 2018 17:33:25 -0400 Subject: [PATCH 038/110] gravit: only build on linux --- pkgs/applications/science/astronomy/gravit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index d572dd55b2b2..9910ec2c7981 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.mesaPlatforms; + hydraPlatforms = platforms.linux; # darwin times out }; } From 92f0bec7c48b4b127a60b1ba9de9cfcf7e05467f Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 23 Jun 2018 17:35:01 -0400 Subject: [PATCH 039/110] chocolate-doom: only build on linux darwin build times out on sdl-config --- pkgs/games/chocolate-doom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 37176750763f..56a926e63f6d 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } From e09861f11f545a9449bbfc4a22fbe1d5796438b0 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 23 Jun 2018 17:35:31 -0400 Subject: [PATCH 040/110] gravit: fix eval --- pkgs/applications/science/astronomy/gravit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 9910ec2c7981..5a5a48b35506 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.mesaPlatforms; - hydraPlatforms = platforms.linux; # darwin times out + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out }; } From 6127ec1665cb99c9ecb5a31ae040f7942e007eaa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Jun 2018 17:46:07 -0400 Subject: [PATCH 041/110] treewide: disable sdl-config darwin time outs sdl-config has an issue on hydra where it will hang when run on Darwin. This is probably related to the headless mode that is set up & the sdl-config program waiting for a graphical to finish. --- pkgs/games/ball-and-paddle/default.nix | 2 ++ pkgs/games/freeciv/default.nix | 1 + pkgs/games/freedink/default.nix | 1 + pkgs/games/lbreakout2/default.nix | 1 + 4 files changed, 5 insertions(+) diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index dbd2814a6fb6..1391ca70223a 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.unix; + + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index ee93d162396d..8003468f50fa 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ pierron ]; platforms = platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index c1bfda9e2f2f..d5efe2b3ebd9 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -54,5 +54,6 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 5ab9954739b2..b5f858b99ad7 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } From fb1852f4246f1c40b68fa435e31d22b250b4e417 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Jun 2018 17:47:52 -0400 Subject: [PATCH 042/110] agda-stdlib: broken on darwin --- pkgs/development/libraries/agda/agda-stdlib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index c72572139c68..331039ec329f 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -23,6 +23,7 @@ agda.mkDerivation (self: rec { description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ jwiegley fuuzetsu mudri ]; }; }) From 680957d8b27de04d04a6502ef06f1a7ac7a930c4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Jun 2018 17:48:19 -0400 Subject: [PATCH 043/110] pyserial: disable install check on darwin --- pkgs/development/python-modules/pyserial/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 95ab0f339b06..e8de912c3754 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, hostPlatform }: buildPythonPackage rec { pname = "pyserial"; @@ -11,6 +11,7 @@ buildPythonPackage rec { }; checkPhase = "python -m unittest discover -s test"; + doInstallCheck = !hostPlatform.isDarwin; # broken on darwin meta = with lib; { homepage = "https://github.com/pyserial/pyserial"; From aef546444c75e73d61a0171dd81267b5b1fddf66 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 6 Jun 2018 14:38:05 -0700 Subject: [PATCH 044/110] minikube: bundle kvm2 driver --- .../networking/cluster/minikube/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 97bcb1bd1b4d..217998bbf82a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,7 +1,15 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm, - gpgme, makeWrapper, hostPlatform, vmnet, python }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu +, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig +, docker-machine-kvm, docker-machine-kvm2 +, extraDrivers ? [] +}: -let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ]; +let + drivers = stdenv.lib.filter (d: d != null) (extraDrivers + ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]); + + binPath = drivers + ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]); in buildGoPackage rec { pname = "minikube"; From bee228d9b46f2aeb7c389c1c5c67b16678e3ca02 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 23 Jun 2018 19:08:32 -0400 Subject: [PATCH 045/110] exult: only build on linux It currently times out on finding sdl-config: https://hydra.nixos.org/job/nixpkgs/staging/exult.x86_64-darwin --- pkgs/games/exult/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 28d273ad5cc4..2fe76649d552 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { description = "A reimplementation of the Ultima VII game engine"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out }; } From 9c1edbddeefaa73513da566f02a0913f36d5bf22 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 24 Jun 2018 01:49:22 +0200 Subject: [PATCH 046/110] unvanquished: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hasn’t been building or upgraded since 2015: https://github.com/NixOS/nixpkgs/issues/9781 --- pkgs/games/unvanquished/default.nix | 69 ----------------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 71 deletions(-) delete mode 100644 pkgs/games/unvanquished/default.nix diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix deleted file mode 100644 index 5ea84b9ef41f..000000000000 --- a/pkgs/games/unvanquished/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses -, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore -, makeWrapper }: -stdenv.mkDerivation rec { - name = "unvanquished-${version}"; - version = "0.13.1"; - src = fetchurl { - url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz"; - sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2"; - }; - buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl - nettle openal speex libogg libvorbis libtheora xvidcore - makeWrapper ]; - preConfigure = ''prefix="$prefix/opt"''; - postInstall = '' - # cp -r ../main "$prefix/Unvanquished/" - mkdir -p "$out/bin" - substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell} - cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3" - makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \ - --run '[ -f ~/.Unvanquished/main/md5sums ] && - cd ~/.Unvanquished/main/ && - md5sum --quiet -c md5sums || - unvanquished-download-pk3' \ - --run "cd '$prefix/Unvanquished'" - makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \ - --run '[ -f ~/.Unvanquished/main/md5sums ] && - cd ~/.Unvanquished/main/ && - md5sum --quiet -c md5sums || - unvanquished-download-pk3' \ - --run "cd '$prefix/Unvanquished'" - ''; - - meta = { - description = "FPS game set in a futuristic, sci-fi setting"; - longDescription = '' - Unvanquished is a free, open-source first-person shooter - combining real-time strategy elements with a futuristic, sci-fi - setting. It is available for Windows, Linux, and macOS. - - Features: - - * Two teams - Play as either the technologically advanced humans or the highly - adaptable aliens, with a fresh gameplay experience on both - sides. - - * Build a base - Construct and maintain your base with a variety of useful - structures, or group up with teammates to take on the other - team. - - * Level up - Earn rewards for victories against the other team, whether it's - a deadly new weapon or access to a whole new alien form. - - * Customize - Compatibility with Quake 3 file formats and modification tools - allows for extensive customization of the game and its - setting. - ''; - homepage = http://unvanquished.net; - #license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; - # This package can take a lot of disk space, so unavailable from channel - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdf2d83fe3fc..5bbcd2f81ba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19749,8 +19749,6 @@ with pkgs; unnethack = callPackage ../games/unnethack { }; - unvanquished = callPackage ../games/unvanquished { }; - uqm = callPackage ../games/uqm { }; urbanterror = callPackage ../games/urbanterror { }; From db7d403b638969cabaec219bc1e6bb6271097f30 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 20:21:02 -0500 Subject: [PATCH 047/110] dmraid: patch to fix users of dmraid I hoped that setting -D_GNU_SOURCE in the build would avoid the need for this patch -- but that only fixes the build itself, this patch adds the define so headers work elsewhere. Particularly, this fixes libblockdev w/musl -- before this change it fails to "detect" headers for dmraid.h since it doesn't compile. --- pkgs/os-specific/linux/dmraid/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 73ae6801bc2b..c2e950b4ba48 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { stripLen = 2; extraPrefix = "1.0.0.rc16/"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch"; + sha256 = "0msnq39qnzg3b1pdksnz1dgqwa3ak03g41pqh0lw3h7w5rjc016k"; + stripLen = 2; + extraPrefix = "1.0.0.rc16/"; + }) ]; postPatch = '' From 4f6d61e5cfbf64ce333c17b54cc307ba582aae18 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Jun 2018 22:05:26 -0400 Subject: [PATCH 048/110] cc-wrapper: disable stackprotector for mingw It seems to break things. --- pkgs/build-support/cc-wrapper/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 803d8b9fa12e..aca96f58ed97 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -280,6 +280,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" pic" '' + + optionalString targetPlatform.isMinGW '' + hardening_unsupported_flags+=" stackprotector" + '' + + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh From ff4351ac3b7662d2a07de9c8f4676516bb56dc35 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 24 Jun 2018 05:10:38 +0300 Subject: [PATCH 049/110] amarok: fix building against Qt-5.11 --- pkgs/applications/audio/amarok/kf5.nix | 2 ++ pkgs/applications/audio/amarok/qt5_11.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/applications/audio/amarok/qt5_11.patch diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix index a4ac2943bfbc..461fc260207d 100644 --- a/pkgs/applications/audio/amarok/kf5.nix +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -21,6 +21,8 @@ in mkDerivation { sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; }; + patches = [ ./qt5_11.patch ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ qca-qt5 qjson qtscript qtwebkit diff --git a/pkgs/applications/audio/amarok/qt5_11.patch b/pkgs/applications/audio/amarok/qt5_11.patch new file mode 100644 index 000000000000..36041c136c8b --- /dev/null +++ b/pkgs/applications/audio/amarok/qt5_11.patch @@ -0,0 +1,11 @@ +--- a/src/aboutdialog/ExtendedAboutDialog.cpp ++++ b/src/aboutdialog/ExtendedAboutDialog.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include + From f45211bd6d0f16c3a3c9919f163a060c9f804ca2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Jun 2018 22:43:05 -0400 Subject: [PATCH 050/110] boost: use standardized system information --- pkgs/development/libraries/boost/generic.nix | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index efe1151359d7..00c6d279c7ac 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , which , buildPackages, buildPlatform, hostPlatform -, toolset ? /**/ if stdenv.cc.isClang then "clang" - else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross" +, toolset ? /**/ if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false @@ -58,16 +57,26 @@ let "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" + + # TODO: make this unconditional + ] ++ optionals (hostPlatform != buildPlatform) [ + "address-model=${toString hostPlatform.parsed.cpu.bits}" + "architecture=${toString hostPlatform.parsed.cpu.family}" + "binary-format=${toString hostPlatform.parsed.kernel.execFormat.name}" + "target-os=${toString hostPlatform.parsed.kernel.name}" + + # adapted from table in boost manual + # https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html + "abi=${if hostPlatform.parsed.cpu.family == "arm" then "aapcs" + else if hostPlatform.isWindows then "ms" + else if hostPlatform.isMips then "o32" + else "sysv"}" ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" ++ optionals (hostPlatform.libc == "msvcrt") [ - "target-os=windows" "threadapi=win32" - "binary-format=pe" - "address-model=${toString hostPlatform.parsed.cpu.bits}" - "architecture=x86" ]); in From 298014d4e3ea6095910e22343149dd2cc5ac1bc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 21:54:57 -0700 Subject: [PATCH 051/110] imagemagick7: 7.0.7-35 -> 7.0.8-2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/imagemagick/versions. These checks were done: - built on NixOS - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/animate passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/compare passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/composite passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/conjure passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/convert passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/display passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/identify passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/import passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/magick-script passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/mogrify passed the binary check. - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/montage passed the binary check. - Warning: no invocation of /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/stream had a zero exit code or showed the expected version - /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/magick passed the binary check. - 12 of 13 passed binary check by having a zero exit code. - 0 of 13 passed binary check by having the new version present in output. - found 7.0.8-2 with grep in /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2 - directory tree listing: https://gist.github.com/de6e213f2639e6aea0a5c353ee83f68b - du listing: https://gist.github.com/936da3ad90cfeb17b4597d3a305dbffb --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9e97a1d755aa..fb390c0995e0 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-35"; - sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz"; + version = "7.0.8-2"; + sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267"; patches = []; }; in From ed68e533b55c86ee32c8275044c405eec8c51ffd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 22:18:42 -0700 Subject: [PATCH 052/110] kotlin: 1.2.41 -> 1.2.50 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions. These checks were done: - built on NixOS - /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/kotlin passed the binary check. - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/kotlin-dce-js had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/kotlinc had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/kotlinc-js had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/kotlinc-jvm had a zero exit code or showed the expected version - /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/.kotlin-wrapped passed the binary check. - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/.kotlin-dce-js-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/.kotlinc-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/.kotlinc-js-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50/bin/.kotlinc-jvm-wrapped had a zero exit code or showed the expected version - 2 of 10 passed binary check by having a zero exit code. - 0 of 10 passed binary check by having the new version present in output. - found 1.2.50 with grep in /nix/store/1kjxxx12sxgrggmqggadviahxjhngv4p-kotlin-1.2.50 - directory tree listing: https://gist.github.com/7d95bbd681ebe9729db46873f969f4fc - du listing: https://gist.github.com/3802b96fcef5fe86923e965fb53fc6b0 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 76f29eeaa0c0..342051230030 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.41"; + version = "1.2.50"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg"; + sha256 = "1abis73ij334vfwn9k4s9rsa1va7h31a9g97g84i2rrp7cq2q1mw"; }; propagatedBuildInputs = [ jre ] ; From 8055c91f9d0f89c7afb3f1273107d7a18dd56b91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 01:23:49 -0700 Subject: [PATCH 053/110] gpodder: 3.10.2 -> 3.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpodder/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/gpo had a zero exit code or showed the expected version - /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/gpodder passed the binary check. - Warning: no invocation of /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/gpodder-migrate2tres had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/..gpo-wrapped-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/.gpo-wrapped had a zero exit code or showed the expected version - /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/..gpodder-wrapped-wrapped passed the binary check. - /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/.gpodder-wrapped passed the binary check. - Warning: no invocation of /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/..gpodder-migrate2tres-wrapped-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3/bin/.gpodder-migrate2tres-wrapped had a zero exit code or showed the expected version - 3 of 9 passed binary check by having a zero exit code. - 0 of 9 passed binary check by having the new version present in output. - found 3.10.3 with grep in /nix/store/8rqasrwlljygffj6i4nf8v8v75bhc255-gpodder-3.10.3 - directory tree listing: https://gist.github.com/40569f5fea3ccd68574abaead2e57c56 - du listing: https://gist.github.com/7491af6e9fa6d0fbe76c75499dba579b --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 68315373a023..678ea529dc44 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.10.2"; + version = "3.10.3"; format = "other"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "gpodder"; repo = "gpodder"; rev = version; - sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04"; + sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l"; }; postPatch = with stdenv.lib; '' From c5a37a494a43f2f0226480daf723895bfd3d509c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 05:58:51 -0700 Subject: [PATCH 054/110] aws-sdk-cpp: 1.4.65 -> 1.4.70 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.4.70 with grep in /nix/store/az7vd5kvng3vgvdgn2ayk75and1gz4ll-aws-sdk-cpp-1.4.70 - directory tree listing: https://gist.github.com/d3c4e72fb9bc640c6c78344c7b6630b6 - du listing: https://gist.github.com/63d41f84084209f15d11cb23e00e5c3c --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 034e8c961be0..523d3e7ba63f 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.65"; + version = "1.4.70"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0266d2gar9wi0p4plapcp4bms93nn61rdvpd8ik5h6hgqvdb3fl2"; + sha256 = "09yybp1nh3w6m3cychx44vvplsy27rxjs948g5gs5qdcgdyx0yx0"; }; # FIXME: might be nice to put different APIs in different outputs From 222524b5e687c0ceb87f4fdc396306a9d5295ffe Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 24 Jun 2018 14:59:18 +0200 Subject: [PATCH 055/110] gfortran: fix darwin build on hydra All the warnings about unused -isystem arguments causes the build log to exceed the hydra limit. --- pkgs/development/compilers/gcc/7/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index fab9b8fe7458..d671743ee629 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -254,6 +254,9 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools) ; + # TODO: Use optionalString with next rebuild. + ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' From 9db625c7abf14487d7b4e6b9d9f1653e1f322cc9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 May 2018 05:58:52 +0200 Subject: [PATCH 056/110] =?UTF-8?q?ostree:=202018.4=20=E2=86=92=202018.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update, clean-up dependencies and add installed tests. --- nixos/release.nix | 1 + nixos/tests/ostree.nix | 21 +++++++++ pkgs/tools/misc/ostree/default.nix | 70 ++++++++++++++++++++---------- 3 files changed, 69 insertions(+), 23 deletions(-) create mode 100644 nixos/tests/ostree.nix diff --git a/nixos/release.nix b/nixos/release.nix index 881c9bafb4cb..e494fa35029f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -314,6 +314,7 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; + tests.ostree = callTest tests/ostree.nix {}; tests.osquery = callTest tests/osquery.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix new file mode 100644 index 000000000000..8b19004874e7 --- /dev/null +++ b/nixos/tests/ostree.nix @@ -0,0 +1,21 @@ +# run installed tests +import ./make-test.nix ({ pkgs, lib, ... }: { + name = "ostree"; + + meta = { + maintainers = pkgs.ostree.meta.maintainers; + }; + + # TODO: Wrap/patch the tests directly in the package + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ])) + ]; + + environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share"); + ''; +}) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a437eba49574..98154d9d5628 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,40 +1,56 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3 +, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3 }: let + version = "2018.6"; + libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "0c82203cd459a35cc3f471e3205355e9fb79160f"; - sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc"; + owner = "GNOME"; + repo = "libglnx"; + rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; + sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; }; bsdiff-src = fetchFromGitHub { - owner = "mendsley"; - repo = "bsdiff"; - rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + owner = "mendsley"; + repo = "bsdiff"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - - version = "2018.4"; in stdenv.mkDerivation { name = "ostree-${version}"; + outputs = [ "out" "dev" "man" "installedTests" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "ostreedev"; - repo = "ostree"; - sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr"; + rev = "v${version}"; + owner = "ostreedev"; + repo = "ostree"; + sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; }; + patches = [ + # Tests access the helper using relative path + # https://github.com/ostreedev/ostree/issues/1593 + (fetchpatch { + url = https://github.com/ostreedev/ostree/pull/1633.patch; + sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; + buildInputs = [ + glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap + libarchive bzip2 xz + utillinuxMinimal # for libmount + (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests + ]; prePatch = '' rmdir libglnx bsdiff @@ -44,16 +60,24 @@ in stdenv.mkDerivation { preConfigure = '' env NOCONFIGURE=1 ./autogen.sh - - configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system" ''; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" + "--enable-installed-tests" + ]; + + makeFlags = [ + "installed_testdir=$(installedTests)/libexec/installed-tests/libostree" + "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" + ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = https://ostree.readthedocs.io/en/latest/; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } - From 264bcd67cbf5c1702b55862315c9d5ab0a1ce47b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Jun 2018 02:52:41 +0200 Subject: [PATCH 057/110] libsolv: enable complex deps This is required for recent libdnf used by rpm-ostree. --- pkgs/development/libraries/libsolv/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2d5fa20c7cf8..9db56aa3a9ec 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: +{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { rev = "0.6.34"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; }; - cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; + cmakeFlags = [ + "-DENABLE_COMPLEX_DEPS=true" + "-DENABLE_RPMMD=true" + "-DENABLE_RPMDB=true" + "-DENABLE_PUBKEY=true" + "-DENABLE_RPMDB_BYRPMHEADER=true" + ]; - buildInputs = [ cmake zlib expat rpm db ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ zlib expat rpm db ]; meta = with stdenv.lib; { description = "A free package dependency solver"; From 3678f40632c3182e855245ce6066ee4455686353 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Jun 2018 03:06:15 +0200 Subject: [PATCH 058/110] =?UTF-8?q?rpm-ostree:=202016.10=20=E2=86=92=20201?= =?UTF-8?q?8.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/rpm-ostree/default.nix | 72 +++++++++++++++----------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 8c2845dc8ebd..75b9dd15fb7f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,40 +1,57 @@ -{ stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, - gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: +{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, + gobjectIntrospection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake, + libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, + bubblewrap, pcre, check, python }: let libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"; - sha256 = "1npb9zbyb4bl0nxqf0pcqankcwzs3k1x8i2wkdwhgak4qcvxvfqn"; + owner = "GNOME"; + repo = "libglnx"; + rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97"; + sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs"; }; libdnf-src = fetchFromGitHub { - owner = "rpm-software-management"; - repo = "libhif"; - rev = "b69552b3b3a42fd41698a925d5f5f623667bac63"; - sha256 = "0h6k09rb4imzbmsn7mspwl0js2awqdpb4ysdqq550vw2nr0dzszr"; + owner = "rpm-software-management"; + repo = "libdnf"; + rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49"; + sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci"; }; - version = "2016.10"; + version = "2018.5"; in stdenv.mkDerivation { name = "rpm-ostree-${version}"; + outputs = [ "out" "dev" "man" "devdoc" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "projectatomic"; - repo = "rpm-ostree"; - sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; + rev = "v${version}"; + owner = "projectatomic"; + repo = "rpm-ostree"; + sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig which autoconf automake libtool cmake gperf + gobjectIntrospection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + ]; buildInputs = [ - which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 - cmake pcre check python - # FIXME: get rid of this once libarchive properly propagates this - acl + libcap ostree rpm glib systemd polkit bubblewrap + json-glib libarchive libsolv librepo + pcre check python + ]; + + patches = [ + # Use gdbus-codegen from PATH + (fetchpatch { + url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch; + sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp"; + }) + ]; + + configureFlags = [ + "--enable-gtk-doc" + "--with-bubblewrap=${bubblewrap}/bin/bwrap" ]; dontUseCmakeConfigure = true; @@ -47,14 +64,11 @@ in stdenv.mkDerivation { # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ - # See https://github.com/projectatomic/rpm-ostree/issues/480 - substituteInPlace src/libpriv/rpmostree-unpacker.c --replace 'include ' "" - # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \' # Let's not hardcode the rpm-gpg path... - substituteInPlace libdnf/libdnf/dnf-keyring.c \ + substituteInPlace libdnf/libdnf/dnf-keyring.cpp \ --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' ''; @@ -64,10 +78,10 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; - homepage = "https://rpm-ostree.readthedocs.io/en/latest/"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://rpm-ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.linux; }; } From d91f77c48248123f59e19aad5e64a0a9cf3cf620 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Jun 2018 03:24:41 +0200 Subject: [PATCH 059/110] libgsystem: remove --- .../libraries/libgsystem/default.nix | 31 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/development/libraries/libgsystem/default.nix diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix deleted file mode 100644 index e29b3ed89dea..000000000000 --- a/pkgs/development/libraries/libgsystem/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, glib, attr, systemd -}: - -stdenv.mkDerivation { - name = "libgsystem-2015.1"; - - meta = with stdenv.lib; { - description = "GIO-based library with Unix/Linux specific API"; - homepage = "https://wiki.gnome.org/Projects/LibGSystem"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; - - src = fetchFromGitHub { - owner = "GNOME"; - repo = "libgsystem"; - rev = "v2015.1"; - sha256 = "0j5dqn1pnspfxifklw4wkikqlbxr4faib07550n5gi58m89gg68n"; - }; - - nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc gobjectIntrospection - ]; - - propagatedBuildInputs = [ glib attr systemd ]; - - preAutoreconf = '' - mkdir m4 - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bbcd2f81ba7..ad5995b6225d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10141,8 +10141,6 @@ with pkgs; libgssglue = callPackage ../development/libraries/libgssglue { }; - libgsystem = callPackage ../development/libraries/libgsystem { }; - libgudev = callPackage ../development/libraries/libgudev { }; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; From c33e216905fe7548aa7094d0965e36c117ab66b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jun 2018 17:00:14 +0200 Subject: [PATCH 060/110] =?UTF-8?q?flatpak:=200.11.8.3=20=E2=86=92=200.99.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/flatpak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index b62d764a2c65..9f704dc6a089 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.11.8.3"; + version = "0.99.1"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1dgkr1kr00111vsrql2ng2sw2b2j9axmay0fl6p540j952v3yimy"; + sha256 = "0f0mfmnc531pifrpkp1qv20wvbvi4la41rwyb3m8lnh1q5bmrch0"; }; patches = [ From 5222f3699397d2a7e9598f6eec17e61d92e15609 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jun 2018 17:00:34 +0200 Subject: [PATCH 061/110] =?UTF-8?q?flatpak-builder:=200.10.10=20=E2=86=92?= =?UTF-8?q?=200.99.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/flatpak-builder/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 351ec2c77dba..5552bdcc5e6c 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -19,6 +19,7 @@ , bzip2 , coreutils , cpio +, curl , elfutils , flatpak , gitMinimal @@ -35,7 +36,7 @@ }: let - version = "0.10.10"; + version = "0.99.1"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -43,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2"; + sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; }; nativeBuildInputs = [ @@ -62,6 +63,7 @@ in stdenv.mkDerivation rec { buildInputs = [ acl bzip2 + curl elfutils flatpak glib From 7e3db3490ed73b4180cc26c59ba695ce14bfa0d7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 24 Jun 2018 16:08:35 +0200 Subject: [PATCH 062/110] libreoffice: cleanup and update 1. For some reason libreoffice-still was still referencing the Fresh expression. 2. Moved gdb from buildInputs to nativeBuildInputs. 3. Minor update for both branches. --- .../libreoffice/default-primary-src.nix | 4 ++-- .../office/libreoffice/default.nix | 7 +++--- .../libreoffice/libreoffice-srcs-still.nix | 10 ++++---- .../office/libreoffice/libreoffice-srcs.nix | 24 +++++++++---------- .../office/libreoffice/still-primary-src.nix | 4 ++-- .../applications/office/libreoffice/still.nix | 12 +++++----- pkgs/top-level/all-packages.nix | 18 ++++++++++---- 7 files changed, 43 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index ded099632460..87fe343613e5 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "0"; - patch = "4"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch"; + sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1d309fae9af7..e3ff0b594b4e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6"; + sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f"; + sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9"; }; }; @@ -264,10 +264,9 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme gettext - gdb ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index e82fa241c00c..36500166dccf 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -581,11 +581,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; + md5 = ""; + md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; } { name = "officeotron-0.7.4-master.jar"; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 251aa44a2c58..66d1baed2dae 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.58.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; - sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; + name = "curl-7.60.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz"; + sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5"; md5 = ""; - md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; + md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -455,11 +455,11 @@ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-12-14.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; - sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; + name = "language-subtag-registry-2018-03-30.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; + sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; md5 = ""; - md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; + md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -623,11 +623,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; - sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; md5 = ""; - md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; } { name = "officeotron-0.7.4-master.jar"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index b1aa10800d6f..22216af3723c 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "5"; minor = "4"; - patch = "6"; + patch = "7"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; + sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 52baed720c5f..dbfeb0f2fe86 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme +, defaultIconTheme, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; + sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; + sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl"; }; }; @@ -238,6 +238,7 @@ in stdenv.mkDerivation rec { "--without-system-libstaroffice" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-xmlsec" ]; checkPhase = '' @@ -258,12 +259,11 @@ in stdenv.mkDerivation rec { python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme - librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy + librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme - gdb ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad5995b6225d..bbd89c32fccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16793,7 +16793,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice { + libreoffice-args = { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; @@ -16816,12 +16816,20 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); + libreoffice-unwrapped =callPackage ../applications/office/libreoffice + (libreoffice-args // { + }); + libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + (libreoffice-args // { + poppler = poppler_0_61; + }); + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libreoffice-unwrapped; + }); libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libreoffice-unwrapped.override { - poppler = poppler_0_61; - }; + libreoffice = libreoffice-still-unwrapped; }); liferea = callPackage ../applications/networking/newsreaders/liferea { From a85a0b100eb3bd55894d42c2ac43d774ed8385af Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Jun 2018 16:43:17 +0200 Subject: [PATCH 063/110] python.pkgs.hbmqtt: fix for websockets 5.0 --- pkgs/development/python-modules/hbmqtt/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index ade4111c5a3b..3899be92b1e9 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { @@ -12,6 +12,13 @@ buildPythonPackage rec { sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beerfactory/hbmqtt/commit/75a85d1ea4cb41f2a15f2681d3114da7158942ae.patch"; + sha256 = "0bl4v5zxp4kz2w7riwrx48f7yqmp7pxg79g9qavkda0i85lxswnp"; + }) + ]; + propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; checkInputs = [ nose ]; From 8469c976154d73ee9a1e1d2750e2c05eed9bbc1d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Jun 2018 16:49:12 +0200 Subject: [PATCH 064/110] python.pkgs.user-agents: disable tests The ua-parser bump 0.8.0 seems to have changed some behaviour. The user-agents is still working in principle, though. --- pkgs/development/python-modules/user-agents/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 6b14eebb310f..07cbdc57ef9e 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ua-parser ]; + doCheck = false; # some tests fail due to ua-parser bump to 0.8.0 + meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; homepage = https://github.com/selwin/python-user-agents; From fdf015b8a3eab398f106d0807669778fa1e4458a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Jun 2018 17:10:26 +0200 Subject: [PATCH 065/110] python.pkgs.netdisco: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/netdisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 412d42bafddd..af7e4dde59e3 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "netdisco"; - version = "1.4.0"; + version = "1.5.0"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = pname; rev = version; - sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1"; + sha256 = "1lr0zpzdjkhcaihyxq8wv7c1wjm7xgx2sl8xmwp1kyivkgybk6n9"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; From 7ae00b3cc89e533ba9bf03e976271ebcaca6e978 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Jun 2018 16:55:45 +0200 Subject: [PATCH 066/110] python: home-assistant-frontend: 20180607.0 -> 20180622.1 --- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 38dc4f73fb8c..665c9e2867d0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180607.0"; + version = "20180622.1"; src = fetchPypi { inherit pname version; - sha256 = "22ac0b7615c9c7e6700db250079d8a1041c8d40788375402701adaace8b21889"; + sha256 = "1kzz1cmnpmsnrbc9amjcg8rb4a544xx2mpq4g23si6rk46b7n0x7"; }; propagatedBuildInputs = [ user-agents ]; From 57666529d783cfaf08ea87bdc819926290f2c167 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Jun 2018 16:56:45 +0200 Subject: [PATCH 067/110] home-assistant: 0.69.1 -> 0.72.0 --- .../home-assistant/component-packages.nix | 54 +++++++++++++++++-- pkgs/servers/home-assistant/default.nix | 32 +++++------ 2 files changed, 65 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e2acee87d1ab..7bf7d6237488 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.69.1"; + version = "0.72.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -91,11 +91,14 @@ "binary_sensor.hikvision" = ps: with ps; [ ]; "binary_sensor.hive" = ps: with ps; [ ]; "binary_sensor.homematic" = ps: with ps; [ pyhomematic ]; + "binary_sensor.homematicip_cloud" = ps: with ps; [ ]; + "binary_sensor.hydrawise" = ps: with ps; [ ]; "binary_sensor.ihc" = ps: with ps; [ ]; "binary_sensor.insteon_plm" = ps: with ps; [ ]; "binary_sensor.iss" = ps: with ps; [ ]; "binary_sensor.isy994" = ps: with ps; [ ]; "binary_sensor.knx" = ps: with ps; [ ]; + "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; "binary_sensor.maxcube" = ps: with ps; [ ]; "binary_sensor.modbus" = ps: with ps; [ ]; @@ -111,6 +114,7 @@ "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; "binary_sensor.raincloud" = ps: with ps; [ ]; + "binary_sensor.rainmachine" = ps: with ps; [ ]; "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; @@ -130,6 +134,7 @@ "binary_sensor.threshold" = ps: with ps; [ ]; "binary_sensor.trend" = ps: with ps; [ numpy ]; "binary_sensor.upcloud" = ps: with ps; [ ]; + "binary_sensor.uptimerobot" = ps: with ps; [ ]; "binary_sensor.velbus" = ps: with ps; [ ]; "binary_sensor.vera" = ps: with ps; [ ]; "binary_sensor.verisure" = ps: with ps; [ ]; @@ -137,6 +142,7 @@ "binary_sensor.vultr" = ps: with ps; [ vultr ]; "binary_sensor.wemo" = ps: with ps; [ ]; "binary_sensor.wink" = ps: with ps; [ ]; + "binary_sensor.wirelesstag" = ps: with ps; [ ]; "binary_sensor.workday" = ps: with ps; [ ]; "binary_sensor.xiaomi_aqara" = ps: with ps; [ ]; "binary_sensor.zha" = ps: with ps; [ ]; @@ -146,7 +152,7 @@ "bloomsky" = ps: with ps; [ ]; "bmw_connected_drive" = ps: with ps; [ ]; "browser" = ps: with ps; [ ]; - "calendar" = ps: with ps; [ ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; "calendar.caldav" = ps: with ps; [ ]; "calendar.demo" = ps: with ps; [ ]; "calendar.google" = ps: with ps; [ ]; @@ -162,6 +168,7 @@ "camera.canary" = ps: with ps; [ ha-ffmpeg ]; "camera.demo" = ps: with ps; [ ]; "camera.doorbird" = ps: with ps; [ ]; + "camera.familyhub" = ps: with ps; [ ]; "camera.ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "camera.foscam" = ps: with ps; [ ]; "camera.generic" = ps: with ps; [ ]; @@ -181,9 +188,11 @@ "camera.uvc" = ps: with ps; [ ]; "camera.verisure" = ps: with ps; [ ]; "camera.xeoma" = ps: with ps; [ ]; + "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; "camera.yi" = ps: with ps; [ ha-ffmpeg ]; "camera.zoneminder" = ps: with ps; [ ]; "canary" = ps: with ps; [ ]; + "cast" = ps: with ps; [ PyChromecast ]; "climate" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ]; @@ -197,6 +206,7 @@ "climate.heatmiser" = ps: with ps; [ ]; "climate.hive" = ps: with ps; [ ]; "climate.homematic" = ps: with ps; [ pyhomematic ]; + "climate.homematicip_cloud" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; "climate.knx" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ]; @@ -218,6 +228,7 @@ "climate.venstar" = ps: with ps; [ ]; "climate.vera" = ps: with ps; [ ]; "climate.wink" = ps: with ps; [ ]; + "climate.zhong_hong" = ps: with ps; [ ]; "climate.zwave" = ps: with ps; [ ]; "cloud" = ps: with ps; [ aiohttp-cors warrant ]; "cloud.auth_api" = ps: with ps; [ ]; @@ -231,7 +242,7 @@ "config.config_entries" = ps: with ps; [ voluptuous-serialize ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; - "config.entity_registry" = ps: with ps; [ ]; + "config.entity_registry" = ps: with ps; [ aiohttp-cors ]; "config.group" = ps: with ps; [ ]; "config.hassbian" = ps: with ps; [ ]; "config.script" = ps: with ps; [ ]; @@ -258,6 +269,7 @@ "cover.rflink" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ]; + "cover.ryobi_gdo" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ]; @@ -288,6 +300,7 @@ "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; "device_tracker.ddwrt" = ps: with ps; [ ]; "device_tracker.demo" = ps: with ps; [ ]; + "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ]; "device_tracker.google_maps" = ps: with ps; [ ]; @@ -407,6 +420,7 @@ "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; + "hydrawise" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; "ihc.const" = ps: with ps; [ ]; @@ -415,6 +429,7 @@ "image_processing.demo" = ps: with ps; [ ]; "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ]; + "image_processing.facebox" = ps: with ps; [ ]; "image_processing.microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; "image_processing.microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "image_processing.openalpr_cloud" = ps: with ps; [ ]; @@ -440,6 +455,7 @@ "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; + "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; @@ -459,6 +475,7 @@ "light.hive" = ps: with ps; [ ]; "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; + "light.homematicip_cloud" = ps: with ps; [ ]; "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; @@ -473,6 +490,7 @@ "light.litejet" = ps: with ps; [ ]; "light.lutron" = ps: with ps; [ ]; "light.lutron_caseta" = ps: with ps; [ ]; + "light.lw12wifi" = ps: with ps; [ ]; "light.mochad" = ps: with ps; [ ]; "light.mqtt" = ps: with ps; [ paho-mqtt ]; "light.mqtt_json" = ps: with ps; [ paho-mqtt ]; @@ -518,6 +536,7 @@ "lock.demo" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; + "lock.kiwi" = ps: with ps; [ ]; "lock.lockitron" = ps: with ps; [ ]; "lock.mqtt" = ps: with ps; [ paho-mqtt ]; "lock.nello" = ps: with ps; [ ]; @@ -528,6 +547,7 @@ "lock.verisure" = ps: with ps; [ ]; "lock.volvooncall" = ps: with ps; [ ]; "lock.wink" = ps: with ps; [ ]; + "lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logentries" = ps: with ps; [ ]; @@ -559,11 +579,13 @@ "media_player.directv" = ps: with ps; [ ]; "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; + "media_player.epson" = ps: with ps; [ ]; "media_player.firetv" = ps: with ps; [ ]; "media_player.frontier_silicon" = ps: with ps; [ ]; "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; "media_player.hdmi_cec" = ps: with ps; [ ]; + "media_player.horizon" = ps: with ps; [ ]; "media_player.itunes" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; @@ -589,7 +611,7 @@ "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ ]; "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; - "media_player.spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "media_player.spotify" = ps: with ps; [ aiohttp-cors ]; "media_player.squeezebox" = ps: with ps; [ ]; "media_player.ue_smart_radio" = ps: with ps; [ ]; "media_player.universal" = ps: with ps; [ ]; @@ -616,7 +638,11 @@ "namecheapdns" = ps: with ps; [ ]; "neato" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; + "nest.config_flow" = ps: with ps; [ ]; + "nest.const" = ps: with ps; [ ]; + "nest.local_auth" = ps: with ps; [ ]; "netatmo" = ps: with ps; [ ]; + "netgear_lte" = ps: with ps; [ ]; "no_ip" = ps: with ps; [ ]; "notify" = ps: with ps; [ ]; "notify.apns" = ps: with ps; [ ]; @@ -633,6 +659,7 @@ "notify.ecobee" = ps: with ps; [ ]; "notify.facebook" = ps: with ps; [ ]; "notify.file" = ps: with ps; [ ]; + "notify.flock" = ps: with ps; [ ]; "notify.free_mobile" = ps: with ps; [ ]; "notify.gntp" = ps: with ps; [ ]; "notify.group" = ps: with ps; [ ]; @@ -652,8 +679,8 @@ "notify.message_bird" = ps: with ps; [ ]; "notify.mycroft" = ps: with ps; [ ]; "notify.mysensors" = ps: with ps; [ ]; + "notify.netgear_lte" = ps: with ps; [ ]; "notify.nfandroidtv" = ps: with ps; [ ]; - "notify.nma" = ps: with ps; [ ]; "notify.prowl" = ps: with ps; [ ]; "notify.pushbullet" = ps: with ps; [ pushbullet ]; "notify.pushetta" = ps: with ps; [ ]; @@ -712,6 +739,7 @@ "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; + "sabnzbd" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; @@ -799,6 +827,7 @@ "sensor.file" = ps: with ps; [ ]; "sensor.filesize" = ps: with ps; [ ]; "sensor.filter" = ps: with ps; [ ]; + "sensor.fints" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ aiohttp-cors ]; "sensor.fixer" = ps: with ps; [ ]; "sensor.folder" = ps: with ps; [ ]; @@ -822,6 +851,7 @@ "sensor.homematicip_cloud" = ps: with ps; [ ]; "sensor.hp_ilo" = ps: with ps; [ ]; "sensor.htu21d" = ps: with ps; [ ]; + "sensor.hydrawise" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; "sensor.ihc" = ps: with ps; [ ]; "sensor.imap" = ps: with ps; [ aioimaplib ]; @@ -830,6 +860,7 @@ "sensor.insteon_plm" = ps: with ps; [ ]; "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "sensor.iota" = ps: with ps; [ ]; + "sensor.iperf3" = ps: with ps; [ ]; "sensor.irish_rail_transport" = ps: with ps; [ ]; "sensor.isy994" = ps: with ps; [ ]; "sensor.juicenet" = ps: with ps; [ ]; @@ -865,7 +896,9 @@ "sensor.nest" = ps: with ps; [ ]; "sensor.netatmo" = ps: with ps; [ ]; "sensor.netdata" = ps: with ps; [ ]; + "sensor.netgear_lte" = ps: with ps; [ ]; "sensor.neurio_energy" = ps: with ps; [ ]; + "sensor.nsw_fuel_station" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; "sensor.nzbget" = ps: with ps; [ ]; "sensor.octoprint" = ps: with ps; [ ]; @@ -891,6 +924,7 @@ "sensor.radarr" = ps: with ps; [ ]; "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; + "sensor.rainmachine" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; @@ -971,6 +1005,7 @@ "sensor.waze_travel_time" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; "sensor.wink" = ps: with ps; [ ]; + "sensor.wirelesstag" = ps: with ps; [ ]; "sensor.worldclock" = ps: with ps; [ ]; "sensor.worldtidesinfo" = ps: with ps; [ ]; "sensor.worxlandroid" = ps: with ps; [ ]; @@ -996,6 +1031,8 @@ "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; + "sonos" = ps: with ps; [ ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ websockets ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; @@ -1030,13 +1067,16 @@ "switch.hive" = ps: with ps; [ ]; "switch.homekit_controller" = ps: with ps; [ ]; "switch.homematic" = ps: with ps; [ pyhomematic ]; + "switch.homematicip_cloud" = ps: with ps; [ ]; "switch.hook" = ps: with ps; [ ]; + "switch.hydrawise" = ps: with ps; [ ]; "switch.ihc" = ps: with ps; [ ]; "switch.insteon_local" = ps: with ps; [ ]; "switch.insteon_plm" = ps: with ps; [ ]; "switch.isy994" = ps: with ps; [ ]; "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; + "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; "switch.lutron_caseta" = ps: with ps; [ ]; @@ -1087,6 +1127,7 @@ "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; "switch.wemo" = ps: with ps; [ ]; "switch.wink" = ps: with ps; [ ]; + "switch.wirelesstag" = ps: with ps; [ ]; "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; "switch.zha" = ps: with ps; [ ]; @@ -1138,12 +1179,14 @@ "vultr" = ps: with ps; [ vultr ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waterfurnace" = ps: with ps; [ ]; + "watson_iot" = ps: with ps; [ ]; "weather" = ps: with ps; [ ]; "weather.bom" = ps: with ps; [ ]; "weather.buienradar" = ps: with ps; [ ]; "weather.darksky" = ps: with ps; [ ]; "weather.demo" = ps: with ps; [ ]; "weather.ecobee" = ps: with ps; [ ]; + "weather.ipma" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.yweather" = ps: with ps; [ yahooweather ]; @@ -1152,6 +1195,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; + "wirelesstag" = ps: with ps; [ ]; "xiaomi_aqara" = ps: with ps; [ ]; "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index fbc233398735..d1315611157a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -7,18 +7,25 @@ let py = python3.override { packageOverrides = self: super: { - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.1.3"; + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.18.4"; src = oldAttrs.src.override { inherit version; - sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; + sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; }); - pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { - version = "3.4.2"; + urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { + version = "1.22"; src = oldAttrs.src.override { inherit version; - sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5"; + sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + }; + }); + idna = super.idna.overridePythonAttrs (oldAttrs: rec { + version = "2.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "13qaab6d0s15gknz8v3zbcfmbj6v86hn9pjxgkdf62ch13imssic"; }; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { @@ -42,13 +49,6 @@ let sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d"; }; }); - async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { - version = "2.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; - }; - }); # used by check_config script # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec { @@ -74,7 +74,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.69.1"; + hassVersion = "0.72.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4"; + sha256 = "1jz16ikxdh8bkscjs5pczvjqbfllz8avs11gkw8a97c2lds8la76"; }; propagatedBuildInputs = [ @@ -109,7 +109,7 @@ in with py.pkgs; buildPythonApplication rec { # Some basic components should be tested however py.test \ tests/components/{group,http} \ - tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py + tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; From 4d37ce919923767cf1d414f48aa3535e41b98265 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Jun 2018 17:47:06 +0200 Subject: [PATCH 068/110] snapcast: init at 0.14.0 --- pkgs/applications/audio/snapcast/default.nix | 54 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/audio/snapcast/default.nix diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix new file mode 100644 index 000000000000..3afd73493b05 --- /dev/null +++ b/pkgs/applications/audio/snapcast/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, asio, alsaLib, avahi, libogg, libvorbis, flac }: + +let + + popl = stdenv.mkDerivation rec { + name = "popl-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "popl"; + rev = "v${version}"; + sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i"; + }; + nativeBuildInputs = [ cmake ]; + }; + + aixlog = stdenv.mkDerivation rec { + name = "aixlog-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "aixlog"; + rev = "v${version}"; + sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + }; + nativeBuildInputs = [ cmake ]; + }; + +in + +stdenv.mkDerivation rec { + name = "snapcast-${version}"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapcast"; + rev = "v${version}"; + sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ]; + + meta = with lib; { + description = "Synchronous multi-room audio player"; + homepage = https://github.com/badaix/snapcast; + maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbd89c32fccc..7c5ecb49bc3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5056,6 +5056,8 @@ with pkgs; snabb = callPackage ../tools/networking/snabb { } ; + snapcast = callPackage ../applications/audio/snapcast { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; From 24a322498e8681c3f016d07fe1fb198188ffc591 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 24 Jun 2018 19:05:30 +0300 Subject: [PATCH 069/110] calligra: fix building against Qt-5.11 --- pkgs/applications/office/calligra/default.nix | 2 + .../applications/office/calligra/qt5_11.patch | 98 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 pkgs/applications/office/calligra/qt5_11.patch diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 01014e6687cb..80046ecb2cd5 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -23,6 +23,8 @@ mkDerivation rec { sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; + patches = [ ./qt5_11.patch ]; + enableParallelBuilding = true; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch new file mode 100644 index 000000000000..66ff8c6eedcd --- /dev/null +++ b/pkgs/applications/office/calligra/qt5_11.patch @@ -0,0 +1,98 @@ +diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +index 0ffdcf6..cdca006 100644 +--- a/libs/widgets/KoCsvImportDialog.cpp ++++ b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include + #include + #include + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..a3816f9 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp ++++ b/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +index c0d5136..d2a772e 100644 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp ++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include ++#include + + // Calligra + #include +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp ++++ b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp ++++ b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties.cpp ++++ b/words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include + ++#include + #include + + const int KWAnchoringProperties::vertRels[4][20] = { +diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp +index e38599a..7e8b2d5 100644 +--- a/words/part/dialogs/KWRunAroundProperties.cpp ++++ b/words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + { +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index ae743da..3007f91 100644 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include From 40334168454d4605c217342f514692445a5f1a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sun, 24 Jun 2018 18:31:54 +0200 Subject: [PATCH 070/110] Mark more unfree licenses as unfree. See also #20256. --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index a0b0f8727afb..c4ccea457e20 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -122,26 +122,31 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { cc-by-nc-sa-20 = spdx { spdxId = "CC-BY-NC-SA-2.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0"; + free = false; }; cc-by-nc-sa-25 = spdx { spdxId = "CC-BY-NC-SA-2.5"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5"; + free = false; }; cc-by-nc-sa-30 = spdx { spdxId = "CC-BY-NC-SA-3.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0"; + free = false; }; cc-by-nc-sa-40 = spdx { spdxId = "CC-BY-NC-SA-4.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0"; + free = false; }; cc-by-nd-30 = spdx { spdxId = "CC-BY-ND-3.0"; fullName = "Creative Commons Attribution-No Derivative Works v3.00"; + free = false; }; cc-by-sa-25 = spdx { @@ -455,6 +460,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { msrla = { fullName = "Microsoft Research License Agreement"; url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; + free = false; }; ncsa = spdx { From 7b38992812bf5706ae3864b192d52d76a884fc3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:07:54 -0700 Subject: [PATCH 071/110] mate.mate-icon-theme: 1.20.0 -> 1.20.1 (#42237) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-icon-theme/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.20.1 with grep in /nix/store/sqb3ppyysd75gan41g7r3466gc01sxiz-mate-icon-theme-1.20.1 - directory tree listing: https://gist.github.com/a482def5741d5681816fc5e7c8d14264 - du listing: https://gist.github.com/10c651e4bf3c2f51c245c47429b3bb45 --- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 7291b475fe16..115384584a68 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5"; + sha256 = "1xzlwmwz1jnksa4rs0smkxhqv3j50y78cf9y5g6aki9iw4dvhvva"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; From 593ab50d69e82c69927a747e465aac1240a9e5f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:08:31 -0700 Subject: [PATCH 072/110] spice-vdagent: 0.17.0 -> 0.18.0 (#42204) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spice-vdagent/versions. These checks were done: - built on NixOS - /nix/store/jn5icaw3pkbvyh2j34lqnx8w1ikqj7k2-spice-vdagent-0.18.0/bin/spice-vdagent passed the binary check. - /nix/store/jn5icaw3pkbvyh2j34lqnx8w1ikqj7k2-spice-vdagent-0.18.0/bin/spice-vdagentd passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.18.0 with grep in /nix/store/jn5icaw3pkbvyh2j34lqnx8w1ikqj7k2-spice-vdagent-0.18.0 - directory tree listing: https://gist.github.com/b66bf12f870f109e97e063ee890be440 - du listing: https://gist.github.com/6bd67c42fafb9c4b45a004edcf1807fb --- pkgs/applications/virtualization/spice-vdagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 15ae244b3291..9c16733e4a07 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -2,10 +2,10 @@ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.17.0"; + name = "spice-vdagent-0.18.0"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"; + sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; }; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out From 246b7c4b118c4534953a8e0488ad199dfe68fc38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:09:12 -0700 Subject: [PATCH 073/110] mate.mate-desktop: 1.20.3 -> 1.21.0 (#41991) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-desktop/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/dx51na6smf7cpbav7zgb2x5xyyfbpcbp-mate-desktop-1.21.0/bin/mate-color-select had a zero exit code or showed the expected version - /nix/store/dx51na6smf7cpbav7zgb2x5xyyfbpcbp-mate-desktop-1.21.0/bin/mate-about passed the binary check. - Warning: no invocation of /nix/store/dx51na6smf7cpbav7zgb2x5xyyfbpcbp-mate-desktop-1.21.0/bin/.mate-color-select-wrapped had a zero exit code or showed the expected version - /nix/store/dx51na6smf7cpbav7zgb2x5xyyfbpcbp-mate-desktop-1.21.0/bin/.mate-about-wrapped passed the binary check. - 2 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 1.21.0 with grep in /nix/store/dx51na6smf7cpbav7zgb2x5xyyfbpcbp-mate-desktop-1.21.0 - directory tree listing: https://gist.github.com/b54e2f1e430d08d273ba8dab30a7f562 - du listing: https://gist.github.com/74e6289b7a86dee591389adc61e024ed --- pkgs/desktops/mate/mate-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 09f8da17e096..124cd644467e 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "1.20.3"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "132z1wwmh5115cpgkx9w6hzkk87f1vh66paaf3b2d2qfci7myffs"; + sha256 = "0qd76p5zqgifiawkgv2casb9ll55j4qq4pfxgxj3j5zvjr3dgr47"; }; nativeBuildInputs = [ From 7f60464262ab54d530e933bc42953b00f7101201 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:18:21 -0700 Subject: [PATCH 074/110] efivar: 35 -> 36 (#42282) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/efivar/versions. These checks were done: - built on NixOS - /nix/store/9id78fkv7cf4bd6rwv06a0pz2dnr5ip3-efivar-36-bin/bin/efivar passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 36 with grep in /nix/store/9id78fkv7cf4bd6rwv06a0pz2dnr5ip3-efivar-36-bin - directory tree listing: https://gist.github.com/f6b2229b6bfb146aa1c4be22eae3162b - du listing: https://gist.github.com/e6239ef936ac1f133d5f4ccc6bc653f4 --- pkgs/tools/system/efivar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 6c0bcb406218..8f1367d3fdce 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "35"; + version = "36"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh"; + sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n"; }; nativeBuildInputs = [ pkgconfig ]; From 832c5cb5d89d3b4c3f2ead24431c716a539fb122 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:19:39 -0700 Subject: [PATCH 075/110] kcgi: 0.10.5 -> 0.10.6 (#42251) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kcgi/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/zfgvy8w6832756z0mybwrpxznnr39pqg-kcgi-0.10.6/bin/kfcgi had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/e0524d16c83a499d44fe13e543d45b8d - du listing: https://gist.github.com/67464d0f35874e292aa1c006a7ab50f1 --- pkgs/development/web/kcgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 6d91007e4860..4b04f70a2c2e 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "kcgi"; - version = "0.10.5"; + version = "0.10.6"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; name = "${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "kristapsdz"; repo = pname; rev = "VERSION_${underscoreVersion}"; - sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw"; + sha256 = "0vaqz7krlvkjlc0189pkcj1al1p5ic577dn6bb4ivca1bss1i3m2"; }; patchPhase = ''substituteInPlace configure \ --replace /usr/local / From 05fd6a0c87b8e2dab3a36982a0ea2f06938446d6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 24 Jun 2018 20:21:33 +0300 Subject: [PATCH 076/110] quassel: fix building against Qt-5.11 --- .../networking/irc/quassel/default.nix | 2 + .../networking/irc/quassel/qt5_11.patch | 72 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/applications/networking/irc/quassel/qt5_11.patch diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 739842bbec3a..9de394422279 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -71,6 +71,8 @@ in with stdenv; mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; + patches = [ ./qt5_11.patch ]; + meta = with stdenv.lib; { homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; diff --git a/pkgs/applications/networking/irc/quassel/qt5_11.patch b/pkgs/applications/networking/irc/quassel/qt5_11.patch new file mode 100644 index 000000000000..45e43d7f96be --- /dev/null +++ b/pkgs/applications/networking/irc/quassel/qt5_11.patch @@ -0,0 +1,72 @@ +From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001 +From: Manuel Nickschas +Date: Thu, 3 May 2018 23:19:34 +0200 +Subject: [PATCH] cmake: Fix build with Qt 5.11 + +Qt 5.11 removes the qt5_use_modules function, so add a copy. If +present, the Qt-provided function will be used instead. + +Closes GH-355. +--- + cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake +index 652c0042..d77ba1cf 100644 +--- a/cmake/QuasselMacros.cmake ++++ b/cmake/QuasselMacros.cmake +@@ -5,6 +5,9 @@ + # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake: + # (C) 2005-2009 Kitware, Inc. + # ++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified): ++# (C) 2005-2011 Kitware, Inc. ++# + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type) + endforeach() + endfunction() + ++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version. ++# If present, the Qt-provided version will be used automatically instead. ++function(qt5_use_modules _target _link_type) ++ if (NOT TARGET ${_target}) ++ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.") ++ endif() ++ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) ++ set(_qt5_modules ${ARGN}) ++ set(_qt5_link_type ${_link_type}) ++ else() ++ set(_qt5_modules ${_link_type} ${ARGN}) ++ endif() ++ ++ if ("${_qt5_modules}" STREQUAL "") ++ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.") ++ endif() ++ foreach(_module ${_qt5_modules}) ++ if (NOT Qt5${_module}_FOUND) ++ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) ++ if (NOT Qt5${_module}_FOUND) ++ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") ++ endif() ++ endif() ++ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES}) ++ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS}) ++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS}) ++ if (Qt5_POSITION_INDEPENDENT_CODE ++ AND (CMAKE_VERSION VERSION_LESS 2.8.12 ++ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ++ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) ++ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) ++ endif() ++ endforeach() ++endfunction() ++ + # Some wrappers for simplifying dual-Qt support + + function(qt_use_modules) +-- +2.16.2 + From 25050e360682300db311aff3a76874965ea1f417 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:26:13 -0700 Subject: [PATCH 077/110] shards: 0.8.0 -> 0.8.1 (#42444) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shards/versions. These checks were done: - built on NixOS - /nix/store/b67b2aq0jfy3mmvb3nvz40jx1ngkkg5c-shards-0.8.1/bin/shards passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.8.1 with grep in /nix/store/b67b2aq0jfy3mmvb3nvz40jx1ngkkg5c-shards-0.8.1 - directory tree listing: https://gist.github.com/a3f46fb5f7b8b4f3120256553c24abd7 - du listing: https://gist.github.com/65b9cb67bb536055ff79ee577f5ec3dc --- pkgs/development/tools/build-managers/shards/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 286190436bff..9fb7c0e64b80 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shards-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; - sha256 = "02v69xl7x6sn0ddn29mjx3srwk4fyz0hz2pwaqa25fwwyhxvyn3p"; + sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm"; }; buildInputs = [ crystal libyaml which ]; From 368623fe70f569c007e0c0171ff2821e605e97d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:26:59 -0700 Subject: [PATCH 078/110] Xaw3d: 1.6.2 -> 1.6.3 (#42417) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/Xaw3d/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.6.3 with grep in /nix/store/p7q0v9qpcijqpb6qq0zpw1aqxfxirb4n-Xaw3d-1.6.3 - directory tree listing: https://gist.github.com/27b4fc05ea0d4751eb7c7dadc48953a9 - du listing: https://gist.github.com/1eaddadb1913f4473d1335eaa0d7fc4d --- pkgs/development/libraries/Xaw3d/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f28ab55010b6..0a71186cd4c7 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: stdenv.mkDerivation { - name = "Xaw3d-1.6.2"; + name = "Xaw3d-1.6.3"; src = fetchurl { - url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2; - sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; + url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; + sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [imake gccmakedep libXpm libXp bison flex]; From 15ec13dad127baa7b1385d55679cea50ee1fd8d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:34:28 -0700 Subject: [PATCH 079/110] php: 7.2.6 -> 7.2.7 (#42461) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/php/versions. These checks were done: - built on NixOS - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phar.phar passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phar passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phpdbg passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php-cgi passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/pear passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/peardev passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/pecl passed the binary check. - /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php-fpm passed the binary check. - 9 of 9 passed binary check by having a zero exit code. - 0 of 9 passed binary check by having the new version present in output. - found 7.2.7 with grep in /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7 - directory tree listing: https://gist.github.com/6ecb6c21e261466b865908a41564ca3e - du listing: https://gist.github.com/2ca1dc05af5d5240a6b63fadd59ee0d0 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a669d71036a8..cede1b67475b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.6"; - sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf"; + version = "7.2.7"; + sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc"; }; } From 92f66343d95fe0cf9fb12dcb5151507aa56b033f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 10:36:39 -0700 Subject: [PATCH 080/110] mate.mate-terminal: 1.20.0 -> 1.20.1 (#42485) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-terminal/versions. These checks were done: - built on NixOS - /nix/store/d64r6l493bv3f6xyxxfw41w1r765lk2q-mate-terminal-1.20.1/bin/mate-terminal passed the binary check. - /nix/store/d64r6l493bv3f6xyxxfw41w1r765lk2q-mate-terminal-1.20.1/bin/mate-terminal.wrapper passed the binary check. - /nix/store/d64r6l493bv3f6xyxxfw41w1r765lk2q-mate-terminal-1.20.1/bin/.mate-terminal-wrapped passed the binary check. - /nix/store/d64r6l493bv3f6xyxxfw41w1r765lk2q-mate-terminal-1.20.1/bin/.mate-terminal.wrapper-wrapped passed the binary check. - 4 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 1.20.1 with grep in /nix/store/d64r6l493bv3f6xyxxfw41w1r765lk2q-mate-terminal-1.20.1 - directory tree listing: https://gist.github.com/5e7716c45202939e7965bf76c7f86be7 - du listing: https://gist.github.com/b84bea1f0cc9eb94683e90ab7f4c30d2 --- pkgs/desktops/mate/mate-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index b90211ae0611..036f996da6aa 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az"; + sha256 = "0yfr857mpxy35zzdmicvd7mpwka8s1h0rqagfjqc2p1gv4a7ka97"; }; buildInputs = [ From f73859a068b76cc79a51ed759213868382b70acf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 24 Jun 2018 19:43:04 +0200 Subject: [PATCH 081/110] ocaml: 4.07.0+beta2 -> 4.07.0+rc1 (#42257) --- pkgs/development/compilers/ocaml/4.07.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index b39d57cc092b..5a3e75e648d9 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "07"; - patch_version = "0+beta2"; - sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n"; + patch_version = "0+rc1"; + sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8"; # If the executable is stripped it does not work dontStrip = true; From 4ea0be20be802289c7eca31f0c2056db33b03d5c Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Sun, 24 Jun 2018 20:50:10 +0300 Subject: [PATCH 082/110] gitkraken: 3.6.3 -> 3.6.4 (#42414) --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dc983e003365..db2fdf0199e3 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1bl4zz4k9whv5q6bkf6hyki26dkjhm19rzx2800zzadbrdgs7iz4"; + sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x"; }; libPath = makeLibraryPath [ From f02ff111a1091dad219e1eeb4276a2def632b5c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 11:11:35 -0700 Subject: [PATCH 083/110] cfr: 0.128 -> 0.130 (#42528) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cfr/versions. These checks were done: - built on NixOS - /nix/store/qfb3yaadxcg1jgkb1fqacki5sfkpkgil-cfr-0.130/bin/cfr passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.130 with grep in /nix/store/qfb3yaadxcg1jgkb1fqacki5sfkpkgil-cfr-0.130 - directory tree listing: https://gist.github.com/99807c8d52305df534377a48b6961987 - du listing: https://gist.github.com/b8349cb82a3ec2d338d78686d712e87f --- pkgs/development/tools/java/cfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 39677ba719e2..4beef3de2723 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.128"; + version = "0.130"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix"; + sha256 = "0zy63jxl05f0wm9s344y846hzqn0zk34w6qpbf48a98si5ciwsmn"; }; buildInputs = [ makeWrapper ]; From ff0641ceea9e652e0f21f6805a2b618cde6597a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 11:14:38 -0700 Subject: [PATCH 084/110] gmailieer: 0.6 -> 0.9 (#42506) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gmailieer/versions. These checks were done: - built on NixOS - /nix/store/lxb0r3f9b3x3ciwwrlgryiw9x7mva5zd-gmailieer-0.9/bin/.gmi-wrapped passed the binary check. - /nix/store/lxb0r3f9b3x3ciwwrlgryiw9x7mva5zd-gmailieer-0.9/bin/gmi passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.9 with grep in /nix/store/lxb0r3f9b3x3ciwwrlgryiw9x7mva5zd-gmailieer-0.9 - directory tree listing: https://gist.github.com/fbddf9ea6ad63fe7033a867a1d9f7c43 - du listing: https://gist.github.com/53e43ad67f9d4f480369c2c29949134c --- pkgs/applications/networking/gmailieer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index 9b738fe3863f..6d134708a5eb 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer-${version}"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76"; + sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk"; }; propagatedBuildInputs = with python3Packages; [ From 6ab9ba69975ec50cfc1bc1f8c04777860fe421d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 11:15:14 -0700 Subject: [PATCH 085/110] conan: 1.4.4 -> 1.4.5 (#42517) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/conan/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/.conan_server-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/conan_server had a zero exit code or showed the expected version - /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/.conan_build_info-wrapped passed the binary check. - /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/conan_build_info passed the binary check. - Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/.conan-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/conan had a zero exit code or showed the expected version - 2 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 1.4.5 with grep in /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5 - directory tree listing: https://gist.github.com/25fd7dbaab3b2c2b870221856de5199b - du listing: https://gist.github.com/b94750efe01cb63b9541d4b897485f62 --- pkgs/development/tools/build-managers/conan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 494866d27d8c..46433233992b 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,12 +20,12 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.4.4"; + version = "1.4.5"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1g03f8rw9l198w9ph0gi0q3g84ilp1dxxc9nmj0dgnymcfgpf89n"; + sha256 = "1mjakrv1d7la3lrxsv6jjqprqwmslpjmfxkw3z7pk56rzlp99nv2"; }; postPatch = '' From 741d146826ed7503060ea19cab87e388bf0f9c44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 11:15:40 -0700 Subject: [PATCH 086/110] debootstrap: 1.0.102 -> 1.0.103 (#42514) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions. These checks were done: - built on NixOS - /nix/store/ysxn2fpiivgri65bcqf9z2ys794vv7xk-debootstrap-1.0.103/bin/debootstrap passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.0.103 with grep in /nix/store/ysxn2fpiivgri65bcqf9z2ys794vv7xk-debootstrap-1.0.103 - directory tree listing: https://gist.github.com/06c1aec1c5c510a9ce4b0895c3a4fea2 - du listing: https://gist.github.com/81f3607504e359d1e330c44eb817d04b --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 21f91691a718..715996e8f61a 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.102"; + version = "1.0.103"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1i8fnxyf073dqywcvj6n32k1crzl7bwlmn373n5342pz71rmqrq9"; + sha256 = "07qqbm50ji1j04hgv1fmy7y1jwl4rjh8q57znh9g3rr4j6fmax7q"; }; buildInputs = [ dpkg gettext gawk perl ]; From 7f1dcab27770dd5e7bfec78b6202cf5ea1a45cf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 11:16:38 -0700 Subject: [PATCH 087/110] kubernetes: 1.10.4 -> 1.10.5 (#42498) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kubernetes/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/.kube-addons-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kube-addons had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/conversion-gen had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/deepcopy-gen had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/defaulter-gen had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/e2e.test had a zero exit code or showed the expected version - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/gendocs passed the binary check. - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/genkubedocs had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/genman had a zero exit code or showed the expected version - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/genyaml passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/go-bindata passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kube-apiserver passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kube-controller-manager passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kube-proxy passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kube-scheduler passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kubeadm passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kubectl passed the binary check. - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/kubelet passed the binary check. - Warning: no invocation of /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/openapi-gen had a zero exit code or showed the expected version - /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5/bin/teststale passed the binary check. - 11 of 20 passed binary check by having a zero exit code. - 5 of 20 passed binary check by having the new version present in output. - found 1.10.5 with grep in /nix/store/wvgp2pcmxsvzxvbl0a4w0qmwgkw2nifq-kubernetes-1.10.5 - directory tree listing: https://gist.github.com/f66eb35eb29445af12d98c6605753493 - du listing: https://gist.github.com/30b38d2640ef11a2252df16c7bfd6063 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 59b3ab7e8b4c..6bd7ba3eac2c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0q1llnqy83fkx3vhcfjyl3frd41h7g1cvl38lfhsz1z1v9av3bpd"; + sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2"; }; # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies From 49f20e7c1ee0419a8dd6876e5a2d2de47cc21f77 Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Sun, 24 Jun 2018 20:16:59 +0200 Subject: [PATCH 088/110] =?UTF-8?q?restic:=200.9.0=20=E2=86=92=200.9.1=20(?= =?UTF-8?q?#42404)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/backup/restic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 9f9714e6d99a..a7f90b3b3037 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.0"; + version = "0.9.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y"; + sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv"; }; buildPhase = '' From 8cf8c4bac28e5305b08bc1b636fa26597bd8279f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 24 Jun 2018 20:26:58 +0200 Subject: [PATCH 089/110] stellarium: 0.16.1 -> 0.18.0 (#42357) --- .../science/astronomy/stellarium/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3c7af809b884..945294c556f4 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,25 +1,32 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation, lib, fetchFromGitHub , cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools -, qtmultimedia, qtlocation +, qtmultimedia, qtlocation, makeWrapper, qtbase }: mkDerivation rec { name = "stellarium-${version}"; - version = "0.16.1"; + version = "0.18.0"; - src = fetchurl { - url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "087x6mbcn2yj8d3qi382vfkzgdwmanxzqi5l1x3iranxmx9c40dh"; + src = fetchFromGitHub { + owner = "Stellarium"; + repo = "stellarium"; + rev = "v${version}"; + sha256 = "11rh4gan8bhqb2n6a94g773drbq4ffii7aqjwxv97r036579azb2"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools - qtmultimedia qtlocation + qtmultimedia qtlocation qtbase makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/stellarium \ + --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins" + ''; + meta = with lib; { description = "Free open-source planetarium"; homepage = http://stellarium.org/; From 32b2f28e609c864a32fc130968ed2e3dbebf0b6a Mon Sep 17 00:00:00 2001 From: averelld Date: Sun, 24 Jun 2018 20:38:51 +0200 Subject: [PATCH 090/110] keepassxc: fix build with qt 5.11 (#42381) --- pkgs/applications/misc/keepassx/community.nix | 6 +++++- pkgs/applications/misc/keepassx/qt511.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/keepassx/qt511.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145d..5c5769db1b46 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -47,7 +47,11 @@ stdenv.mkDerivation rec { --replace "/usr/local/share/man" "../share/man" ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; - patches = [ ./darwin.patch ]; + + patches = [ + ./darwin.patch + ./qt511.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch new file mode 100644 index 000000000000..b4d312c8c263 --- /dev/null +++ b/pkgs/applications/misc/keepassx/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp +index 6fd65c1a..e99275b0 100644 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.17.1 + From 3bb305515f9312d5f9f3162858c50a283ff48d08 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 11 Jun 2018 19:31:05 -0400 Subject: [PATCH 091/110] mariadb: provide multiple src url mirrors Both mariadb.com and mariadb.org appear to be canonical upstream sources, and have identical sha256 hashes at these URLs. For the third-party mirrors, if we are just going to provide one URL, it should be an HTTPS url instead of FTP or SSH, which many users may not be able to access due to network security configurations. --- pkgs/servers/sql/mariadb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 4b254262f9f1..d12621a4608a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -25,7 +25,10 @@ common = rec { # attributes common to both builds version = "10.2.15"; src = fetchurl { - url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; + urls = [ + "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" + "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" + ]; sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik"; name = "mariadb-${version}.tar.gz"; }; @@ -180,7 +183,7 @@ connector-c = stdenv.mkDerivation rec { version = "2.3.6"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; + url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/"; sha256 = "15iy5iqp0njbwbn086x2dq8qnbkaci7ydvi84cf5z8fxvljis9vb"; name = "mariadb-connector-c-${version}-src.tar.gz"; }; From 01c7edd4f4608dbc7aba2a1f89fba347c4a34f23 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 12:37:59 -0700 Subject: [PATCH 092/110] godot: 3.0.3 -> 3.0.4 (#42507) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/godot/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/wavl2nim76s48xwjpq95wsxgsxvrb4sn-godot-3.0.4/bin/godot had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.0.4 with grep in /nix/store/wavl2nim76s48xwjpq95wsxgsxvrb4sn-godot-3.0.4 - directory tree listing: https://gist.github.com/bdbe8596726721b6c715d84c81579c57 - du listing: https://gist.github.com/6235762e4766106db266094344e36ae7 --- pkgs/development/tools/godot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index ec5809b85aa8..d3ed7624b7a1 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "060jb5jip1si32a0sm1mmkvy3nldl1cjb82kjh5wihzllph93sxd"; + sha256 = "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4"; }; nativeBuildInputs = [ pkgconfig ]; From 56284be194d1376b9e8a87d3d06d8c3ad27e7e4a Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sun, 24 Jun 2018 20:39:45 +0100 Subject: [PATCH 093/110] tmuxinator: 0.10.1 -> 0.11.3 (#42428) --- pkgs/tools/misc/tmuxinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 938092c23872..1f50eef0ed00 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.10.1"; - source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi"; + version = "0.11.3"; + source.sha256 = "1l9pnfmfxjrszzqbw8w2r6akdi7g52q9iga01bxmy2nm27mbv2q1"; erubis = buildRubyGem rec { inherit ruby; From bc56e42e27183f234e8b67cdacd0af80f2c0c0d9 Mon Sep 17 00:00:00 2001 From: Elmar Athmer Date: Sun, 24 Jun 2018 21:40:39 +0200 Subject: [PATCH 094/110] hcloud: 1.4.0 -> 1.5.0 (#42500) --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index c4f6e2565f67..daa3713a8d16 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,17 +2,17 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.4.0"; + version = "1.5.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1mysw091ddi3abijvciyy73ff31vqq7zb37w30sp3vhm5vq38nn2"; + sha256 = "1pbfa977ihqn7j3ynyqghxjw0wmq0vgha4lsshdpf5xr2n3w0r8l"; }; - buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; From dca857e2accca243a632679928952c886eaac7a6 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Sun, 24 Jun 2018 21:53:00 +0200 Subject: [PATCH 095/110] phpPackages.composer: 1.6.3 -> 1.6.5 (#42369) From 3f32f7ab986216b59cd0c44afaa3660ea62a4def Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Sun, 24 Jun 2018 21:55:48 +0200 Subject: [PATCH 096/110] phpPackages.imagick: 3.4.3RC1 -> 3.4.3 (#42384) --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a2e54a16d045..f62c1154c9d2 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -107,8 +107,8 @@ let }; imagick = buildPecl { - name = "imagick-3.4.3RC1"; - sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; + name = "imagick-3.4.3"; + sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pcre ]; From 6d58b9b86864e9bc1ebb7ebed7dd1e2fe927891e Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Sun, 24 Jun 2018 22:01:04 +0200 Subject: [PATCH 097/110] phpPackages.psysh: init at 0.9.6 (#42377) --- pkgs/top-level/php-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f62c1154c9d2..f50a3fe37d71 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -494,4 +494,30 @@ let maintainers = with maintainers; [ cmcdragonkai etu ]; }; }; + + psysh = pkgs.stdenv.mkDerivation rec { + name = "psysh-${version}"; + version = "0.9.6"; + + src = pkgs.fetchurl { + url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; + sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6"; + }; + + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + tar -xzf $src -C $out/bin + wrapProgram $out/bin/psysh + ''; + + meta = with pkgs.lib; { + description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; + license = licenses.mit; + homepage = https://psysh.org/; + maintainers = with maintainers; [ caugner ]; + }; + }; }; in self From db493ad552a35ddc14dd6bd526a3aa17edf06a18 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 Jun 2018 00:11:55 +0200 Subject: [PATCH 098/110] nixos/npm: add `npm` to the system closure by default (#42420) --- nixos/modules/programs/npm.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix index 7ef172355c1f..5fdd4fa841a1 100644 --- a/nixos/modules/programs/npm.nix +++ b/nixos/modules/programs/npm.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -39,6 +39,8 @@ in environment.etc."npmrc".text = cfg.npmrc; environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc"; + + environment.systemPackages = [ pkgs.nodePackages.npm ]; }; } From 3428b44610cc270a1985fdb09169146c4eba18a3 Mon Sep 17 00:00:00 2001 From: Grigory Chereshnev Date: Mon, 25 Jun 2018 01:12:54 +0300 Subject: [PATCH 099/110] ivan: 052 -> 053 (#42413) --- pkgs/games/ivan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 50b9f03d4bc9..3431be5359ea 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "052"; + version = "053"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "1vvwb33jw4ppwsqlvaxq3b8npdzh9j9jfangyzszp5sfnnd7fj5b"; + sha256 = "1r3fcccgpjmzzkg0lfmq76igjapr01kh97vz671z60jg7gyh301b"; }; buildInputs = [SDL2 SDL2_mixer libpng pcre]; From cd4c5a3cf6c99bc752997f60b5606ff39cb89069 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sun, 24 Jun 2018 22:19:01 +0000 Subject: [PATCH 100/110] streamlink: 0.12.1 -> 0.13.0 (#42336) --- pkgs/applications/video/streamlink/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 3f5f0c05c308..6885caa7d60e 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,19 +1,25 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.12.1"; + version = "0.13.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "0r63fjp5qhnbp5kr4w2nn3gnj0wr0ik1pw1gyry8jl9rp2jq9db5"; + sha256 = "17i5j5a69d28abg13md2r2ycxgmd5h1pjy0pgca1zcqaqfq4v05x"; }; - checkInputs = with pythonPackages; [ pytest mock requests-mock ]; + postPatch = '' + # Fix failing test. This can be removed after version 0.13.0, see: + # https://github.com/streamlink/streamlink/commit/a27e1a2d8eec6eb23c6e1dc280c6afc1cd0b5b32 + substituteInPlace tests/test_plugin.py --replace "lambda: datetime" "datetime" + ''; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ]; + checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; + + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { homepage = https://github.com/streamlink/streamlink; From f3a155e656858d6b67f7c18bfc8379bf8badc061 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 25 Jun 2018 00:19:58 +0200 Subject: [PATCH 101/110] ocamlPackages.merlin: 3.0.5 -> 3.1.0 (#42386) --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index d09f06623a7e..4ad1bfb3234d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.5"; + version = "3.1.0"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy"; + sha256 = "1vf0c2mmflp94r8hshb44lsvnfdy03ld6mld2n79cdxr3zl24ci2"; }; buildInputs = [ ocaml findlib yojson ] From 3a1033c6d95d2f2dac18b3c8495173716c2b68e3 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sun, 24 Jun 2018 18:25:14 -0400 Subject: [PATCH 102/110] autokey: init at 0.94.1 (#42355) --- pkgs/applications/office/autokey/default.nix | 38 +++++++++++++++++++ .../autokey/remove-requires-dbus-python.patch | 11 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/applications/office/autokey/default.nix create mode 100644 pkgs/applications/office/autokey/remove-requires-dbus-python.patch diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix new file mode 100644 index 000000000000..fdff39e27f90 --- /dev/null +++ b/pkgs/applications/office/autokey/default.nix @@ -0,0 +1,38 @@ +{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection +, gtksourceview, gnome3, libappindicator-gtk3, libnotify }: + +python3Packages.buildPythonApplication rec { + name = "autokey-${version}"; + version = "0.94.1"; + + src = fetchFromGitHub { + owner = "autokey"; + repo = "autokey"; + rev = "v${version}"; + sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr"; + }; + + # Arch requires a similar work around—see + # https://aur.archlinux.org/packages/autokey-py3/?comments=all + patches = [ ./remove-requires-dbus-python.patch ]; + + # Tests appear to be broken with import errors within the project structure + doCheck = false; + + # Note: no dependencies included for Qt GUI because Qt ui is poorly + # maintained—see https://github.com/autokey/autokey/issues/51 + + buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview + libappindicator-gtk3 libnotify ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python pyinotify xlib pygobject3 ]; + + meta = { + homepage = https://github.com/autokey/autokey; + description = "Desktop automation utility for Linux and X11"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ pneumaticat ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch new file mode 100644 index 000000000000..73372e435291 --- /dev/null +++ b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -71,7 +71,7 @@ + 'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main'] + }, + scripts=['autokey-qt', 'autokey-run', 'autokey-shell'], +- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'], ++ install_requires=['pyinotify', 'python-xlib'], + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c5ecb49bc3f..871949df7bad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15009,6 +15009,8 @@ with pkgs; audio-recorder = callPackage ../applications/audio/audio-recorder { }; + autokey = callPackage ../applications/office/autokey { }; + autotrace = callPackage ../applications/graphics/autotrace {}; avocode = callPackage ../applications/graphics/avocode {}; From b197363ea7d17470ee8bc30d0518df4366d8a9fb Mon Sep 17 00:00:00 2001 From: leenaars Date: Mon, 25 Jun 2018 00:35:06 +0200 Subject: [PATCH 103/110] Update message to reflect nix 2.0 availability of imperative nix-update (#36123) --- default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index a4896a9bbeec..180815d4d6de 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,10 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins. This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade: - - If you are running NixOS, use `nixos-rebuild' to upgrade your system. + - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system. + + - Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively + upgrade Nix. You may use `nix-env --version' to check which version you have. - If you installed Nix using the install script (https://nixos.org/nix/install), it is safe to upgrade by running it again: From 18c99b5be98563790b01ddb8d80413720c5ef01d Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 25 Jun 2018 00:47:32 +0200 Subject: [PATCH 104/110] gitlab-runner: 10.8.0 -> 11.0.0 (#42391) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7fc0ecd1b2b4..33dc7c80c17a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.8.0"; + version = "11.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1cdc0p3gq6q324p087qv335y224bv61fbr8xar4kza7lcqblb41d"; + sha256 = "1wi2wza991hhys60c8f3rhad8dqargnb6i7xwfsxrjd26dsbif2b"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0xj0ym6mprrknxqrxqj3ydgabqgfdxrw3h1r0q8sggfxqrrs8y08"; + sha256 = "1y67zxxad2jy1rvfhdlp194fi0qgwrnlcs24zh5lzwvsnwvc13bg"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0j8xkwfxvmg1bqrmalqvl6k45yn54m16r3af5ckgr717xylywqb6"; + sha256 = "06p8fggnxn2afy0k4wjh44d1qby9n2j0mq6cl206cckzh2gfsknp"; }; patches = [ ./fix-shell-path.patch ]; From 8ed38fc722e0a2cb48f47ddbfd419ceb68226564 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 25 Jun 2018 00:47:53 +0200 Subject: [PATCH 105/110] ocamlPackages.cppo: 1.5.0 -> 1.6.4 (#42342) --- pkgs/development/tools/ocaml/cppo/default.nix | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index e778337ca5ca..d7d086e74f97 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,30 +1,43 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }: let pname = "cppo"; - version = "1.5.0"; webpage = "http://mjambon.com/${pname}.html"; in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "1.6.4"; + sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh"; + buildInputs = [ jbuilder ]; + extra = { + inherit (jbuilder) installPhase; + }; + } else { + version = "1.5.0"; + sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; + extra = { + createFindlibDestdir = true; + makeFlags = "PREFIX=$(out)"; + preBuild = '' + mkdir $out/bin + ''; + }; + } +; in + +stdenv.mkDerivation (rec { + + name = "${pname}-${param.version}"; src = fetchFromGitHub { owner = "mjambon"; repo = pname; - rev = "v${version}"; - sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; + rev = "v${param.version}"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; - - makeFlags = "PREFIX=$(out)"; - - preBuild = '' - mkdir $out/bin - ''; + buildInputs = [ ocaml findlib ocamlbuild ] ++ (param.buildInputs or []); meta = with stdenv.lib; { description = "The C preprocessor for OCaml"; @@ -35,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; -} +} // param.extra) From 1588d6a549675836c43b0caced47d1778e099236 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 25 Jun 2018 00:52:15 +0200 Subject: [PATCH 106/110] gopass: override GOPASS_CONFIG to fix completion generation (#42400) gopass tries to write a version number to it's configuaration, even when just generating the shell completion scripts. This fails, as /homeless-shelter is read-only inside the sandbox. As error messages are printed to stdout instead of stderr (see https://github.com/gopasspw/gopass/issues/877), the error message lands inside the completion script, thus breaking it. Workaround that by setting GOPASS_CONFIG to `/dev/null` --- pkgs/tools/security/gopass/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 2d7f8b86f009..25102fd07303 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -26,6 +26,9 @@ buildGoPackage rec { $bin/share/bash-completion/completions \ $bin/share/zsh/site-functions \ $bin/share/fish/vendor_completions.d + # by default, gopass tries to write configuration to /homeless-shelter + # during startup, which lands in stdout + export GOPASS_CONFIG=/dev/null $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish From 779d64f43d664392e057e4591c5c85d5ad4a5c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 25 Jun 2018 01:11:45 +0200 Subject: [PATCH 107/110] i3status-rust: 0.9.0.2018-03-31 -> 0.9.0.2018-06-22 (#42403) --- pkgs/applications/window-managers/i3/status-rust.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 014434011af0..11b7c49f5ebe 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2018-03-31"; + version = "0.9.0.2018-06-22"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "18f99299bcd5b63da4e315c8d78622c4bbf59c45"; - sha256 = "1pfcq3f724ri6jzchkgf96zd7lb5mc882r64ffx634gqf3n8ch41"; + rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00"; + sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd"; }; - cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h"; + cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq"; nativeBuildInputs = [ pkgconfig ]; From 6d1955e0c49720074505e090dac8b576a77efdd0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Jun 2018 22:36:50 -0500 Subject: [PATCH 108/110] Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0" This reverts commit 2624f9079617df6b1fffda8c10f6a7a35068ecdc, reversing changes made to 37aab4cbb5552bf021b20cf05d64e8ded6f3538a. See: https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096 Basically this breaks at least some users of fetchgit, so let's revert this until this is sorted out. --- .../git-and-tools/git/default.nix | 16 +++------------- .../git-and-tools/git/symlinks-in-bin.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 522a6fcd6a12..4e9b7d2428de 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.18.0"; + version = "2.17.1"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; + sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -40,6 +40,7 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch + ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch ./git-send-email-honor-PATH.patch @@ -276,21 +277,10 @@ EOF # XXX: I failed to understand why this one fails. # Could someone try to re-enable it on the next release ? - # Tested to fail: 2.18.0 disable_test t1700-split-index "null sha1" - - # Tested to fail: 2.18.0 - disable_test t7005-editor "editor with a space" - disable_test t7005-editor "core.editor with a space" - - # Tested to fail: 2.18.0 - disable_test t9902-completion "sourcing the completion script clears cached --options" '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit - # Fails largely due to assumptions about BOM - # Tested to fail: 2.18.0 - disable_test t0028-working-tree-encoding ''; diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch new file mode 100644 index 000000000000..0a581a61d46d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -2609,8 +2609,7 @@ + { test "$$bindir/" = "$$execdir/" || \ + for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ + $(RM) "$$execdir/$$p" && \ +- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ +- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ ++ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ + cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ + done; \ + } && \ From e6bf9c8a4581f883d10fcee573d4864be08fda1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 25 Jun 2018 09:12:24 +0200 Subject: [PATCH 109/110] Revert "python: click-log: 0.2.1 -> 0.3.2" This broke `vdirsyncer`, the only user of this package. This reverts commit 60ab4bd8516fbe142bfc61abfef95ad2820666ae. --- pkgs/development/python-modules/click-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index f5626859d066..7229488a700f 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click-log"; - version = "0.3.2"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124"; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; }; propagatedBuildInputs = [ click ]; From 7c9d95fef59e2bc80fbde535df235a93d6690cc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 16:10:08 +0100 Subject: [PATCH 110/110] python37: init at 3.7.0rc1 --- doc/languages-frameworks/python.section.md | 3 +- .../python/cpython/3.7/default.nix | 178 ++++++++++++++++++ .../python/cpython/3.7/no-ldconfig.patch | 100 ++++++++++ pkgs/top-level/all-packages.nix | 6 + pkgs/top-level/python-packages.nix | 3 +- 5 files changed, 288 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/python/cpython/3.7/default.nix create mode 100644 pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index d291b44c309c..7d70ce4a2abf 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as +Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python35`. The default interpreter, `python`, maps to `python2`. @@ -533,6 +533,7 @@ sets are * `pkgs.python34Packages` * `pkgs.python35Packages` * `pkgs.python36Packages` +* `pkgs.python37Packages` * `pkgs.pypyPackages` and the aliases diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix new file mode 100644 index 000000000000..aae1041a224a --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -0,0 +1,178 @@ +{ stdenv, fetchurl, fetchpatch +, glibc +, bzip2 +, expat +, libffi +, gdbm +, lzma +, ncurses +, openssl +, readline +, sqlite +, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false +, zlib +, callPackage +, self +, CF, configd +, python-setup-hook +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) +}: + +assert x11Support -> tcl != null + && tk != null + && xproto != null + && libX11 != null; +with stdenv.lib; + +let + majorVersion = "3.7"; + minorVersion = "0"; + minorVersionSuffix = "rc1"; + pythonVersion = majorVersion; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; + sitePackages = "lib/${libPrefix}/site-packages"; + + buildInputs = filter (p: p != null) [ + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + ++ optionals x11Support [ tcl tk libX11 xproto ] + ++ optionals stdenv.isDarwin [ CF configd ]; + +in stdenv.mkDerivation { + name = "python3-${version}"; + pythonVersion = majorVersion; + inherit majorVersion version; + + inherit buildInputs; + + src = fetchurl { + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; + sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9"; + }; + + NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; + + prePatch = optionalString stdenv.isDarwin '' + substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' + substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' + ''; + + patches = [ + ./no-ldconfig.patch + ]; + + postPatch = '' + '' + optionalString (x11Support && (tix != null)) '' + substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + ''; + + CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; + LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; + + configureFlags = [ + "--enable-shared" + "--with-threads" + "--without-ensurepip" + "--with-system-expat" + "--with-system-ffi" + ]; + + preConfigure = '' + for i in /usr /sw /opt /pkg; do # improve purity + substituteInPlace ./setup.py --replace $i /no-such-path + done + ${optionalString stdenv.isDarwin '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" + export MACOSX_DEPLOYMENT_TARGET=10.6 + ''} + ''; + + setupHook = python-setup-hook sitePackages; + + postInstall = '' + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* + && "$item" != */test/support + && "$item" != */test/libregrtest + && "$item" != */test/regrtest.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py + + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + + # Determinism: Windows installers were not deterministic. + # We're also not interested in building Windows installers. + find "$out" -name 'wininst*.exe' | xargs -r rm -f + + # Use Python3 as default python + ln -s "$out/bin/idle3" "$out/bin/idle" + ln -s "$out/bin/pydoc3" "$out/bin/pydoc" + ln -s "$out/bin/python3" "$out/bin/python" + ln -s "$out/bin/python3-config" "$out/bin/python-config" + ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" + + # Get rid of retained dependencies on -dev packages, and remove + # some $TMPDIR references to improve binary reproducibility. + # Note that the .pyc file of _sysconfigdata.py should be regenerated! + for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do + sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + done + + # Determinism: rebuild all bytecode + # We exclude lib2to3 because that's Python 2 code which fails + # We rebuild three times, once for each optimization level + # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. + # This is automatically used when `SOURCE_DATE_EPOCH` is set. + find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - + ''; + + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { + inherit libPrefix sitePackages x11Support; + executable = "${libPrefix}m"; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; + isPy3 = true; + isPy37 = true; + is_py3k = true; # deprecated + interpreter = "${self}/bin/${executable}"; + }; + + enableParallelBuilding = true; + + meta = { + homepage = http://python.org; + description = "A high-level dynamically-typed programming language"; + longDescription = '' + Python is a remarkably powerful dynamic programming language that + is used in a wide variety of application domains. Some of its key + distinguishing features include: clear, readable syntax; strong + introspection capabilities; intuitive object orientation; natural + expression of procedural code; full modularity, supporting + hierarchical packages; exception-based error handling; and very + high level dynamic data types. + ''; + license = licenses.psfl; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ fridh kragniz ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch new file mode 100644 index 000000000000..a1f9d68eb166 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch @@ -0,0 +1,100 @@ +From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Mon, 28 Aug 2017 09:24:06 +0200 +Subject: [PATCH] Don't use ldconfig + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + 1 file changed, 2 insertions(+), 68 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 5e8b31a854..7b45ce6c15 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -94,46 +94,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -255,34 +216,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.15.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 871949df7bad..4ddb9f72cc99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7412,6 +7412,7 @@ with pkgs; python34Full = python34.override{x11Support=true;}; python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; + python37Full = python37.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -7434,6 +7435,10 @@ with pkgs; inherit (darwin) CF configd; self = python36; }; + python37 = callPackage ../development/interpreters/python/cpython/3.7 { + inherit (darwin) CF configd; + self = python37; + }; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; @@ -7446,6 +7451,7 @@ with pkgs; python34Packages = python34.pkgs; python35Packages = python35.pkgs; python36Packages = recurseIntoAttrs python36.pkgs; + python37Packages = python37.pkgs; pypyPackages = pypy.pkgs; # Should eventually be moved inside Python interpreters. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a47c17a5a87a..7bb82de095ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26,6 +26,7 @@ let isPy34 = python.pythonVersion == "3.4"; isPy35 = python.pythonVersion == "3.5"; isPy36 = python.pythonVersion == "3.6"; + isPy37 = python.pythonVersion == "3.7"; isPyPy = python.executable == "pypy"; isPy3k = strings.substring 0 1 python.pythonVersion == "3"; @@ -132,7 +133,7 @@ let in { - inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication;