From 55fb0c955b4e2e89012dbb7c1665f536426f4826 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Sun, 15 Dec 2019 15:05:57 +0000 Subject: [PATCH 01/95] kodi: add option for GBM backend --- pkgs/applications/video/kodi/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 8edc99c5f028..8246212280a2 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -30,6 +30,7 @@ , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null +, useGbm ? false, mesa ? null, libinput ? null }: assert dbusSupport -> dbus != null; @@ -183,6 +184,11 @@ in stdenv.mkDerivation { wayland waylandpp # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev + ] + ++ lib.optional useGbm [ + libxkbcommon.dev + mesa.dev + libinput.dev ]; nativeBuildInputs = [ @@ -206,6 +212,9 @@ in stdenv.mkDerivation { ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" + ] ++ lib.optional useGbm [ + "-DCORE_PLATFORM_NAME=gbm" + "-DGBM_RENDER_SYSTEM=gles" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae495eb019ba..594c26d16552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22074,6 +22074,8 @@ in kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodi = wrapKodi { @@ -22084,6 +22086,10 @@ in kodi = kodiPlainWayland; }; + kodi-gbm = wrapKodi { + kodi = kodiGBM; + }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = From 98f6a60460ca1bc11a4e7a2a71fedbdcf55c9282 Mon Sep 17 00:00:00 2001 From: cw <789@webuhu.at> Date: Tue, 17 Mar 2020 06:54:06 +0100 Subject: [PATCH 02/95] erlangR22: 22.1.7 -> 22.3 --- pkgs/development/interpreters/erlang/R22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 88fe21453a82..7596ad9e2f10 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.1.7"; - sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62"; + version = "22.3"; + sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From c7e4c3b5a31766a858a44553fb32990554b97f17 Mon Sep 17 00:00:00 2001 From: davidak Date: Tue, 17 Mar 2020 15:34:43 +0100 Subject: [PATCH 03/95] nixos/phpfpm: add example to socket --- nixos/modules/services/web-servers/phpfpm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 2c73da103946..3db19c781d03 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -47,6 +47,7 @@ let Path to the unix socket file on which to accept FastCGI requests. This option is read-only and managed by NixOS. ''; + example = "${runtimeDir}/.sock"; }; listen = mkOption { From f4a7afe4717559dde48b1951804b5f39f5652912 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 18 Mar 2020 20:49:25 -0400 Subject: [PATCH 04/95] maintainers: update entry for notbandali (previously aminb) --- maintainers/maintainer-list.nix | 11 ++++++++--- pkgs/development/tools/alloy/default.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 336ee7a88306..22033f143cd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -412,10 +412,15 @@ githubId = 20530052; name = "Andrew Miloradovsky"; }; - aminb = { - email = "amin@aminb.org"; - github = "aminb"; + notbandali = { name = "Amin Bandali"; + email = "bandali@gnu.org"; + github = "notbandali"; + githubId = 1254858; + keys = [{ + longkeyid = "rsa4096/0xA21A020248816103"; + fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; + }]; }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 0b34055274d0..01706bd9b681 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -45,7 +45,7 @@ let generic = { major, version, src }: downloadPage = http://alloytools.org/download.html; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ aminb ]; + maintainers = with maintainers; [ notbandali ]; }; }; From 7cf8f4f2ccc4ce94dad1cce15bc22566d00e2cdf Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 20 Mar 2020 12:00:00 +0000 Subject: [PATCH 05/95] exiv2: fix CVE-2019-20421 --- pkgs/development/libraries/exiv2/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index dc7610ee1782..d92f7ffc4fde 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , zlib , expat , cmake @@ -23,6 +24,16 @@ stdenv.mkDerivation rec { sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; + patches = [ + # CVE-2019-20421 + # included in next release + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch"; + sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc"; + excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ]; + }) + ]; + cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" From ac367b9946c863b2d9cae4907d5af8cf2c1bad1a Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 20 Mar 2020 14:30:44 +0100 Subject: [PATCH 06/95] cri-o: v1.17.0 -> v1.17.1 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 274468334ee4..793d34a0dcca 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -20,7 +20,7 @@ let buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; in buildGoPackage rec { project = "cri-o"; - version = "1.17.0"; + version = "1.17.1"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -29,7 +29,7 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0xjmylf0ww23qqcg7kw008px6608r4qq6q57pfqis0661kp6f24j"; + sha256 = "0zipigjcnhcnn0w69dkd8312qb6z98l65ir175wp3jfvj4cx3g28"; }; outputs = [ "bin" "out" ]; From 98eb1461646fc9f1c3c7d06915ffc3651099758b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 Mar 2020 17:16:02 +0100 Subject: [PATCH 07/95] =?UTF-8?q?pjsip:=202.9=20=E2=86=92=202.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/pjsip/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index c9df5d3fbe37..f3d41219470d 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, openssl, libsamplerate, alsaLib }: +{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }: stdenv.mkDerivation rec { pname = "pjsip"; - version = "2.9"; + version = "2.10"; - src = fetchurl { - url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi"; + src = fetchFromGitHub { + owner = pname; + repo = "pjproject"; + rev = version; + sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; }; patches = [ ./fix-aarch64.patch ]; From 79f6b312ba7015ce74dc3f64f0a31e35cb0af5bc Mon Sep 17 00:00:00 2001 From: mehlon <> Date: Tue, 24 Mar 2020 17:19:42 +0100 Subject: [PATCH 08/95] tor-browser-bundle-bin: 9.0.6 -> 9.0.7 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index a8a426b61626..62ad9e2cd891 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.6"; + version = "9.0.7"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1vk1pww8zmpjd5snyfz0if9v17g140ymlp6navxp28snzlffahss"; + sha256 = "11pgafa2lgj35s6kacy1b7pnzjg3ckqjxg0pf0aywxvc2qr3syv1"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0bhikdilfz31iilgb48mayy9f4lilycq24pqsrq7w3dqdjg4v55v"; + sha256 = "1mjz41n53gxpaxx7jdxk226f085v23kwr31m20vv4ar4vxfa42d8"; }; }; in From db5bde234287ea3ffa0f77ad00b8dbe5140dc093 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Mar 2020 08:44:34 +0100 Subject: [PATCH 09/95] =?UTF-8?q?coqPackages.coqhammer:=201.1=20=E2=86=92?= =?UTF-8?q?=201.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coq-modules/coqhammer/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 83a505017fbc..7d9ec5e7312b 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -3,17 +3,25 @@ let params = { "8.8" = { + version = "1.1"; sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.9" = { - sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; + version = "1.1.1"; + sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; + }; + "8.10" = { + version = "1.1.1"; + sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df"; }; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { - version = "1.1"; + inherit (param) version; name = "coq${coq.coq-version}-coqhammer-${version}"; src = fetchFromGitHub { @@ -31,8 +39,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ - ocaml findlib camlp5 - ]); + ocaml findlib + ]) ++ (param.buildInputs or []); preInstall = '' mkdir -p $out/bin From bbb35868846a7e3ec97803e41693a5593018760f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Mar 2020 01:22:02 +0000 Subject: [PATCH 10/95] spice-vdagent: 0.19.0 -> 0.20.0 --- pkgs/applications/virtualization/spice-vdagent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 6f5cbeb7ed46..22aa31a6dea3 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, libdrm, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.19.0"; + name = "spice-vdagent-0.20.0"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3"; + sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; postPatch = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { to the client resolution * Multiple displays ''; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.aboseley ]; platforms = stdenv.lib.platforms.linux; From 7613ae0ea79e9de8481b6cd4c7272ac0d08297ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Mar 2020 02:06:27 +0000 Subject: [PATCH 11/95] solr: 8.4.1 -> 8.5.0 --- pkgs/servers/search/solr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 701d3880cbd0..0da61861207c 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.4.1"; + version = "8.5.0"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc"; + sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y"; }; nativeBuildInputs = [ makeWrapper ]; From 575f9aa57d0922850df20fbd7674e00759c562b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Mar 2020 02:09:35 +0000 Subject: [PATCH 12/95] subunit: 1.1.0 -> 1.4.0 --- pkgs/development/libraries/subunit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index 9a5f4db2debb..bf3b6a9ffd13 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "subunit"; - version = "1.1.0"; + version = "1.4.0"; src = fetchurl { url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; + sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A streaming protocol for test results"; - homepage = https://launchpad.net/subunit; + homepage = "https://launchpad.net/subunit"; license = licenses.asl20; platforms = platforms.all; }; From cc03fb4210c472e7ed172079af0a4016228bbee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Thu, 26 Mar 2020 11:28:31 +0100 Subject: [PATCH 13/95] libtorrent-raster: 1.1.11 -> 1.2.5; qbittorrent: 4.2.1 -> 4.2.2 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 8ab83c8a4ba4..3dd55f3c5b85 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil"; + sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 26605eb41dbd..f910964a2cac 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.1.11"; + version = "1.2.5"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -17,13 +17,14 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent_${formattedVersion}"; + rev = "libtorrent-${formattedVersion}"; sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; }; enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; + preConfigure = "./autotool.sh"; postInstall = '' From 59613f5ca55102e98acae3bb31975fe1a40bb5e6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 18:58:17 +0200 Subject: [PATCH 14/95] connman: format argument lists and inputs --- pkgs/tools/networking/connman/default.nix | 44 +++++++++++++++++++---- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index e58b8362f951..986bb16c9a30 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, - openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, - wpa_supplicant, readline6, pptp, ppp }: +{ stdenv +, fetchurl +, pkgconfig +, openconnect +, file +, gawk, + openvpn +, vpnc +, glib +, dbus +, iptables +, gnutls +, polkit, + wpa_supplicant +, readline6 +, pptp +, ppp +}: stdenv.mkDerivation rec { pname = "connman"; @@ -10,11 +25,26 @@ stdenv.mkDerivation rec { sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; }; - buildInputs = [ openconnect polkit - openvpn vpnc glib dbus iptables gnutls - wpa_supplicant readline6 pptp ppp ]; + buildInputs = [ + openconnect + polkit + openvpn + vpnc + glib + dbus + iptables + gnutls + wpa_supplicant + readline6 + pptp + ppp + ]; - nativeBuildInputs = [ pkgconfig file gawk ]; + nativeBuildInputs = [ + pkgconfig + file + gawk + ]; preConfigure = '' export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant From 7cdd874589bac5dc12dae3b9e71860a2b01d7ab3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 18:58:25 +0200 Subject: [PATCH 15/95] connman: 1.37 -> 1.38 --- pkgs/tools/networking/connman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 986bb16c9a30..3381f77c96c5 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { pname = "connman"; - version = "1.37"; + version = "1.38"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; + sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; }; buildInputs = [ From bc4d2abac88340da99903a296d8d66c0e173fb38 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 18:59:17 +0200 Subject: [PATCH 16/95] connman: remove unneeded deps --- pkgs/tools/networking/connman/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 3381f77c96c5..fde73fa9aa38 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -3,7 +3,6 @@ , pkgconfig , openconnect , file -, gawk, openvpn , vpnc , glib @@ -11,7 +10,6 @@ , iptables , gnutls , polkit, - wpa_supplicant , readline6 , pptp , ppp @@ -34,7 +32,6 @@ stdenv.mkDerivation rec { dbus iptables gnutls - wpa_supplicant readline6 pptp ppp @@ -43,13 +40,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig file - gawk ]; preConfigure = '' - export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant export PPPD=${ppp}/sbin/pppd - export AWK=${gawk}/bin/gawk sed -i "s/\/usr\/bin\/file/file/g" ./configure ''; From 184d7412923fa438e27ede97a6f840714248650f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 18:59:50 +0200 Subject: [PATCH 17/95] connman: remove unneeded hooks --- pkgs/tools/networking/connman/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index fde73fa9aa38..6c96c3448388 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PPPD=${ppp}/sbin/pppd sed -i "s/\/usr\/bin\/file/file/g" ./configure ''; @@ -71,10 +70,6 @@ stdenv.mkDerivation rec { "--enable-iwd" ]; - postInstall = '' - cp ./client/connmanctl $out/sbin/connmanctl - ''; - meta = with stdenv.lib; { description = "A daemon for managing internet connections"; homepage = https://01.org/connman; From e9569a0a039e4cd12edfcce51c96d060f8266a83 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 19:01:35 +0200 Subject: [PATCH 18/95] connman: quote out in configure flag --- pkgs/tools/networking/connman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 6c96c3448388..5f5bed3cbced 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--sysconfdir=\${out}/etc" + "--sysconfdir=${placeholder "out"}/etc" "--localstatedir=/var" "--with-dbusconfdir=${placeholder "out"}/share" "--with-dbusdatadir=${placeholder "out"}/share" From e55ad4897d9c8df11ae3fed79af489c909b7df69 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 19:01:44 +0200 Subject: [PATCH 19/95] connman: quote homepage --- pkgs/tools/networking/connman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 5f5bed3cbced..d65061648b6a 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A daemon for managing internet connections"; - homepage = https://01.org/connman; + homepage = "https://01.org/connman"; maintainers = [ maintainers.matejc ]; platforms = platforms.linux; license = licenses.gpl2; From a0e966d7979d0f0464949b9c7e37aa5593c00ecc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 19:02:43 +0200 Subject: [PATCH 20/95] connman: upgrade to readline latest --- pkgs/tools/networking/connman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index d65061648b6a..77cdcd0cc3ef 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -10,7 +10,7 @@ , iptables , gnutls , polkit, -, readline6 +, readline , pptp , ppp }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dbus iptables gnutls - readline6 + readline pptp ppp ]; From 50ce1e646915cd402c21606924429dea51d87470 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 19:03:52 +0200 Subject: [PATCH 21/95] connman: doCheck and split outputs --- pkgs/tools/networking/connman/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 77cdcd0cc3ef..2f6e835bc84a 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { vpnc glib dbus + libmnl iptables gnutls readline @@ -69,6 +70,9 @@ stdenv.mkDerivation rec { "--with-pptp=${pptp}/sbin/pptp" "--enable-iwd" ]; + doCheck = true; + + outputs = [ "out" "dev" ]; meta = with stdenv.lib; { description = "A daemon for managing internet connections"; From 53d8831b6232fc4fc7a9201f0695fd7fc1daa81d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 19:04:56 +0200 Subject: [PATCH 22/95] connman: cleanup build from the groundup --- pkgs/tools/networking/connman/default.nix | 153 +++++++++++++++++----- 1 file changed, 121 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 2f6e835bc84a..9da12e158f94 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,20 +1,57 @@ { stdenv , fetchurl , pkgconfig -, openconnect , file - openvpn -, vpnc , glib +# always required runtime dependencies , dbus -, iptables +, libmnl , gnutls -, polkit, , readline -, pptp -, ppp +# Choices one has to decide +, firewallType ? "iptables" # or "nftables" +, iptables ? null +, libnftnl ? null # for nftables +, dnsType ? "internal" # or "systemd-resolved" +# optional features which are turned *on* by default +, enableOpenconnect ? true +, openconnect ? null +, enableOpenvpn ? true +, openvpn ? null +, enableVpnc ? true +, vpnc ? true +, enablePolkit ? true +, polkit ? null +, enablePptp ? true +, pptp ? null +, ppp ? null +, enableLoopback ? true +, enableEthernet ? true +, enableWireguard ? true +, enableGadget ? true +, enableWifi ? true +, enableBluetooth ? true +, enableOfono ? true +, enableDundee ? true +, enablePacrunner ? true +, enableNeard ? true +, enableWispr ? true +, enableTools ? true +, enableStats ? true +, enableClient ? true +, enableDatafiles ? true +# optional features which are turned *off* by default +, enableNetworkManager ? false +, networkmanager ? null +, enableHh2serialGps ? false +, enableL2tp ? false +, enableIospm ? false +, enableTist ? false }: +assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; + stdenv.mkDerivation rec { pname = "connman"; version = "1.38"; @@ -24,55 +61,107 @@ stdenv.mkDerivation rec { }; buildInputs = [ - openconnect - polkit - openvpn - vpnc glib dbus libmnl - iptables gnutls readline - pptp - ppp ]; nativeBuildInputs = [ pkgconfig file - ]; + ] + ++ stdenv.lib.optionals (enableOpenvpn) [ openvpn ] + ++ stdenv.lib.optionals (enableOpenconnect) [ openconnect ] + ++ stdenv.lib.optionals (enableVpnc) [ vpnc ] + ++ stdenv.lib.optionals (enablePolkit) [ polkit ] + ++ stdenv.lib.optionals (enablePptp) [ pptp ppp ] + ++ stdenv.lib.optionals (firewallType == "iptables") [ iptables ] + ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ] + ; + # Fix file program not found preConfigure = '' sed -i "s/\/usr\/bin\/file/file/g" ./configure ''; configureFlags = [ + # directories flags "--sysconfdir=${placeholder "out"}/etc" "--localstatedir=/var" "--with-dbusconfdir=${placeholder "out"}/share" "--with-dbusdatadir=${placeholder "out"}/share" + "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" + "--with-dns-backend=${dnsType}" + "--with-firewall=${firewallType}" + # production build flags "--disable-maintainer-mode" - "--enable-openconnect=builtin" - "--with-openconnect=${openconnect}/sbin/openconnect" - "--enable-openvpn=builtin" - "--with-openvpn=${openvpn}/sbin/openvpn" - "--enable-vpnc=builtin" - "--with-vpnc=${vpnc}/sbin/vpnc" "--enable-session-policy-local=builtin" - "--enable-client" - "--enable-bluetooth" - "--enable-wifi" - "--enable-polkit" + # This is for building and running tests (probably enabled by default), + # --enable-tests installs the tests as well "--enable-tools" - "--enable-datafiles" - "--enable-pptp" - "--with-pptp=${pptp}/sbin/pptp" - "--enable-iwd" - ]; - doCheck = true; + ] + ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ] + ++ stdenv.lib.optionals (!enableEthernet) [ "--disable-ethernet" ] + ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ] + ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ] + ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ] + # We (almost) always turn on IWD support as it doesn't require any new dependencies + # and it's easier for the NixOS module to use only 1 connmand package when + # IWD is requested + ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ] + ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ] + ++ stdenv.lib.optionals (!enableOfono) [ "--disable-ofono" ] + ++ stdenv.lib.optionals (!enableDundee) [ "--disable-dundee" ] + ++ stdenv.lib.optionals (!enablePacrunner) [ "--disable-pacrunner" ] + ++ stdenv.lib.optionals (!enableNeard) [ "--disable-neard" ] + ++ stdenv.lib.optionals (!enableWispr) [ "--disable-wispr" ] + ++ stdenv.lib.optionals (!enableTools) [ "--disable-tools" ] + ++ stdenv.lib.optionals (!enableStats) [ "--disable-stats" ] + ++ stdenv.lib.optionals (!enableClient) [ "--disable-client" ] + ++ stdenv.lib.optionals (!enableDatafiles) [ "--disable-datafiles" ] + ++ stdenv.lib.optionals (enableOpenconnect) [ + "--enable-openconnect=builtin" + "--with-openconnect=${openconnect}/sbin/openconnect" + ] + ++ stdenv.lib.optionals (enableOpenvpn) [ + "--enable-openvpn=builtin" + "--with-openvpn=${openvpn}/sbin/openvpn" + ] + ++ stdenv.lib.optionals (enableVpnc) [ + "--enable-vpnc=builtin" + "--with-vpnc=${vpnc}/sbin/vpnc" + ] + ++ stdenv.lib.optionals (enablePolkit) [ + "--enable-polkit" + ] + ++ stdenv.lib.optionals (enablePptp) [ + "--enable-pptp" + "--with-pptp=${pptp}/sbin/pptp" + ] + ++ stdenv.lib.optionals (!enableWireguard) [ + "--disable-wireguard" + ] + ++ stdenv.lib.optionals (enableNetworkManager) [ + "--enable-nmcompat" + ] + ++ stdenv.lib.optionals (enableHh2serialGps) [ + "--enable-hh2serial-gps" + ] + ++ stdenv.lib.optionals (enableL2tp) [ + "--enable-l2tp" + ] + ++ stdenv.lib.optionals (enableIospm) [ + "--enable-iospm" + ] + ++ stdenv.lib.optionals (enableTist) [ + "--enable-tist" + ] + ; - outputs = [ "out" "dev" ]; + doCheck = true; meta = with stdenv.lib; { description = "A daemon for managing internet connections"; From ce502a41eb4c1c60394501975f003cd4fa3f60e7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Feb 2020 19:05:37 +0200 Subject: [PATCH 23/95] connman: Add 2 more build flavors --- pkgs/top-level/all-packages.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30bc0af360ec..2a4a1876581d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2551,6 +2551,36 @@ in conspy = callPackage ../os-specific/linux/conspy {}; connman = callPackage ../tools/networking/connman { }; + connmanThin = callPackage ../tools/networking/connman { + enableOpenconnect = false; + enableOpenvpn = false; + enableVpnc = false; + vpnc = false; + enablePolkit = false; + enablePptp = false; + enableLoopback = false; + # enableEthernet = false; + enableWireguard = false; + enableGadget = false; + # enableWifi = false; + enableBluetooth = false; + enableOfono = false; + enableDundee = false; + enablePacrunner = false; + enableNeard = false; + enableWispr = false; + enableTools = false; + enableStats = false; + enableClient = false; + # enableDatafiles = false; + }; + connmanFull = callPackage ../tools/networking/connman { + enableNetworkManager = true; + enableHh2serialGps = true; + enableL2tp = true; + enableIospm = true; + enableTist = true; + }; connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; From cdc20ac30ef15082c7486cee98240a7c0586c623 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 2 Mar 2020 00:49:36 +0200 Subject: [PATCH 24/95] connman: Fix comments after @erikarvstedt's comments --- pkgs/tools/networking/connman/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 9da12e158f94..a2338e4554f6 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -8,7 +8,7 @@ , libmnl , gnutls , readline -# Choices one has to decide +# configureable options , firewallType ? "iptables" # or "nftables" , iptables ? null , libnftnl ? null # for nftables @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ] ; - # Fix file program not found + # fix invalid path to 'file' preConfigure = '' sed -i "s/\/usr\/bin\/file/file/g" ./configure ''; @@ -99,8 +99,8 @@ stdenv.mkDerivation rec { # production build flags "--disable-maintainer-mode" "--enable-session-policy-local=builtin" - # This is for building and running tests (probably enabled by default), - # --enable-tests installs the tests as well + # for building and running tests + # --enable-tests # installs the tests, we don't want that "--enable-tools" ] ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ] @@ -108,8 +108,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ] ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ] ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ] - # We (almost) always turn on IWD support as it doesn't require any new dependencies - # and it's easier for the NixOS module to use only 1 connmand package when + # enable IWD support for wifi as it doesn't require any new dependencies + # and it's easier for the NixOS module to use only one connman package when # IWD is requested ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ] ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a4a1876581d..5ed0b8d55a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2559,10 +2559,10 @@ in enablePolkit = false; enablePptp = false; enableLoopback = false; - # enableEthernet = false; + # enableEthernet = false; # If disabled no ethernet connection can be performed enableWireguard = false; enableGadget = false; - # enableWifi = false; + # enableWifi = false; # If disabled no WiFi connection can be performed enableBluetooth = false; enableOfono = false; enableDundee = false; @@ -2572,7 +2572,7 @@ in enableTools = false; enableStats = false; enableClient = false; - # enableDatafiles = false; + # enableDatafiles = false; # If disabled, configuration and data files are not installed }; connmanFull = callPackage ../tools/networking/connman { enableNetworkManager = true; From e59deafc2d06417db92bda5d3713ae928fb7ec60 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 2 Mar 2020 00:51:14 +0200 Subject: [PATCH 25/95] connman: Use global reference to lib.optionals --- pkgs/tools/networking/connman/default.nix | 70 ++++++++++++----------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index a2338e4554f6..d0242e1e4610 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -52,6 +52,8 @@ assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; +let inherit (stdenv.lib) optionals; + stdenv.mkDerivation rec { pname = "connman"; version = "1.38"; @@ -72,13 +74,13 @@ stdenv.mkDerivation rec { pkgconfig file ] - ++ stdenv.lib.optionals (enableOpenvpn) [ openvpn ] - ++ stdenv.lib.optionals (enableOpenconnect) [ openconnect ] - ++ stdenv.lib.optionals (enableVpnc) [ vpnc ] - ++ stdenv.lib.optionals (enablePolkit) [ polkit ] - ++ stdenv.lib.optionals (enablePptp) [ pptp ppp ] - ++ stdenv.lib.optionals (firewallType == "iptables") [ iptables ] - ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ] + ++ optionals (enableOpenvpn) [ openvpn ] + ++ optionals (enableOpenconnect) [ openconnect ] + ++ optionals (enableVpnc) [ vpnc ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] ; # fix invalid path to 'file' @@ -103,60 +105,60 @@ stdenv.mkDerivation rec { # --enable-tests # installs the tests, we don't want that "--enable-tools" ] - ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ] - ++ stdenv.lib.optionals (!enableEthernet) [ "--disable-ethernet" ] - ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ] - ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ] - ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ] + ++ optionals (!enableLoopback) [ "--disable-loopback" ] + ++ optionals (!enableEthernet) [ "--disable-ethernet" ] + ++ optionals (!enableWireguard) [ "--disable-wireguard" ] + ++ optionals (!enableGadget) [ "--disable-gadget" ] + ++ optionals (!enableWifi) [ "--disable-wifi" ] # enable IWD support for wifi as it doesn't require any new dependencies # and it's easier for the NixOS module to use only one connman package when # IWD is requested - ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ] - ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ] - ++ stdenv.lib.optionals (!enableOfono) [ "--disable-ofono" ] - ++ stdenv.lib.optionals (!enableDundee) [ "--disable-dundee" ] - ++ stdenv.lib.optionals (!enablePacrunner) [ "--disable-pacrunner" ] - ++ stdenv.lib.optionals (!enableNeard) [ "--disable-neard" ] - ++ stdenv.lib.optionals (!enableWispr) [ "--disable-wispr" ] - ++ stdenv.lib.optionals (!enableTools) [ "--disable-tools" ] - ++ stdenv.lib.optionals (!enableStats) [ "--disable-stats" ] - ++ stdenv.lib.optionals (!enableClient) [ "--disable-client" ] - ++ stdenv.lib.optionals (!enableDatafiles) [ "--disable-datafiles" ] - ++ stdenv.lib.optionals (enableOpenconnect) [ + ++ optionals (enableWifi) [ "--enable-iwd" ] + ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ] + ++ optionals (!enableOfono) [ "--disable-ofono" ] + ++ optionals (!enableDundee) [ "--disable-dundee" ] + ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ] + ++ optionals (!enableNeard) [ "--disable-neard" ] + ++ optionals (!enableWispr) [ "--disable-wispr" ] + ++ optionals (!enableTools) [ "--disable-tools" ] + ++ optionals (!enableStats) [ "--disable-stats" ] + ++ optionals (!enableClient) [ "--disable-client" ] + ++ optionals (!enableDatafiles) [ "--disable-datafiles" ] + ++ optionals (enableOpenconnect) [ "--enable-openconnect=builtin" "--with-openconnect=${openconnect}/sbin/openconnect" ] - ++ stdenv.lib.optionals (enableOpenvpn) [ + ++ optionals (enableOpenvpn) [ "--enable-openvpn=builtin" "--with-openvpn=${openvpn}/sbin/openvpn" ] - ++ stdenv.lib.optionals (enableVpnc) [ + ++ optionals (enableVpnc) [ "--enable-vpnc=builtin" "--with-vpnc=${vpnc}/sbin/vpnc" ] - ++ stdenv.lib.optionals (enablePolkit) [ + ++ optionals (enablePolkit) [ "--enable-polkit" ] - ++ stdenv.lib.optionals (enablePptp) [ + ++ optionals (enablePptp) [ "--enable-pptp" "--with-pptp=${pptp}/sbin/pptp" ] - ++ stdenv.lib.optionals (!enableWireguard) [ + ++ optionals (!enableWireguard) [ "--disable-wireguard" ] - ++ stdenv.lib.optionals (enableNetworkManager) [ + ++ optionals (enableNetworkManager) [ "--enable-nmcompat" ] - ++ stdenv.lib.optionals (enableHh2serialGps) [ + ++ optionals (enableHh2serialGps) [ "--enable-hh2serial-gps" ] - ++ stdenv.lib.optionals (enableL2tp) [ + ++ optionals (enableL2tp) [ "--enable-l2tp" ] - ++ stdenv.lib.optionals (enableIospm) [ + ++ optionals (enableIospm) [ "--enable-iospm" ] - ++ stdenv.lib.optionals (enableTist) [ + ++ optionals (enableTist) [ "--enable-tist" ] ; From be59cb3be8e74a799202e36c76aa44dc26d3ba20 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 2 Mar 2020 00:51:52 +0200 Subject: [PATCH 26/95] connman: Use patchPhase instead of preConfigure --- pkgs/tools/networking/connman/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index d0242e1e4610..9fcacd29ebef 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -84,8 +84,10 @@ stdenv.mkDerivation rec { ; # fix invalid path to 'file' - preConfigure = '' + patchPhase = '' + runHook prePatch sed -i "s/\/usr\/bin\/file/file/g" ./configure + runHook postPatch ''; configureFlags = [ From 3b89674dc3608381c6a447e52e7b512ece4f74db Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 2 Mar 2020 11:10:21 +0200 Subject: [PATCH 27/95] connman: declare build flavors idiomaticly Use tesseract as a source for inspiration - rename default.nix -> connman.nix and declare build flavors in default.nix . --- pkgs/tools/networking/connman/connman.nix | 177 +++++++++++++++++++ pkgs/tools/networking/connman/default.nix | 205 ++++------------------ pkgs/top-level/all-packages.nix | 36 +--- 3 files changed, 215 insertions(+), 203 deletions(-) create mode 100644 pkgs/tools/networking/connman/connman.nix diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix new file mode 100644 index 000000000000..f79b9875b9bc --- /dev/null +++ b/pkgs/tools/networking/connman/connman.nix @@ -0,0 +1,177 @@ +{ stdenv +, fetchurl +, pkgconfig +, file +, glib +# always required runtime dependencies +, dbus +, libmnl +, gnutls +, readline +# configureable options +, firewallType ? "iptables" # or "nftables" +, iptables ? null +, libnftnl ? null # for nftables +, dnsType ? "internal" # or "systemd-resolved" +# optional features which are turned *on* by default +, enableOpenconnect ? true +, openconnect ? null +, enableOpenvpn ? true +, openvpn ? null +, enableVpnc ? true +, vpnc ? true +, enablePolkit ? true +, polkit ? null +, enablePptp ? true +, pptp ? null +, ppp ? null +, enableLoopback ? true +, enableEthernet ? true +, enableWireguard ? true +, enableGadget ? true +, enableWifi ? true +, enableBluetooth ? true +, enableOfono ? true +, enableDundee ? true +, enablePacrunner ? true +, enableNeard ? true +, enableWispr ? true +, enableTools ? true +, enableStats ? true +, enableClient ? true +, enableDatafiles ? true +# optional features which are turned *off* by default +, enableNetworkManager ? false +, networkmanager ? null +, enableHh2serialGps ? false +, enableL2tp ? false +, enableIospm ? false +, enableTist ? false +}: + +assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; + +let inherit (stdenv.lib) optionals; in + +stdenv.mkDerivation rec { + pname = "connman"; + version = "1.38"; + src = fetchurl { + url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; + sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; + }; + + buildInputs = [ + glib + dbus + libmnl + gnutls + readline + ]; + + nativeBuildInputs = [ + pkgconfig + file + ] + ++ optionals (enableOpenvpn) [ openvpn ] + ++ optionals (enableOpenconnect) [ openconnect ] + ++ optionals (enableVpnc) [ vpnc ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ; + + # fix invalid path to 'file' + patchPhase = '' + runHook prePatch + sed -i "s/\/usr\/bin\/file/file/g" ./configure + runHook postPatch + ''; + + configureFlags = [ + # directories flags + "--sysconfdir=${placeholder "out"}/etc" + "--localstatedir=/var" + "--with-dbusconfdir=${placeholder "out"}/share" + "--with-dbusdatadir=${placeholder "out"}/share" + "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" + "--with-dns-backend=${dnsType}" + "--with-firewall=${firewallType}" + # production build flags + "--disable-maintainer-mode" + "--enable-session-policy-local=builtin" + # for building and running tests + # "--enable-tests" # installs the tests, we don't want that + "--enable-tools" + ] + ++ optionals (!enableLoopback) [ "--disable-loopback" ] + ++ optionals (!enableEthernet) [ "--disable-ethernet" ] + ++ optionals (!enableWireguard) [ "--disable-wireguard" ] + ++ optionals (!enableGadget) [ "--disable-gadget" ] + ++ optionals (!enableWifi) [ "--disable-wifi" ] + # enable IWD support for wifi as it doesn't require any new dependencies + # and it's easier for the NixOS module to use only one connman package when + # IWD is requested + ++ optionals (enableWifi) [ "--enable-iwd" ] + ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ] + ++ optionals (!enableOfono) [ "--disable-ofono" ] + ++ optionals (!enableDundee) [ "--disable-dundee" ] + ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ] + ++ optionals (!enableNeard) [ "--disable-neard" ] + ++ optionals (!enableWispr) [ "--disable-wispr" ] + ++ optionals (!enableTools) [ "--disable-tools" ] + ++ optionals (!enableStats) [ "--disable-stats" ] + ++ optionals (!enableClient) [ "--disable-client" ] + ++ optionals (!enableDatafiles) [ "--disable-datafiles" ] + ++ optionals (enableOpenconnect) [ + "--enable-openconnect=builtin" + "--with-openconnect=${openconnect}/sbin/openconnect" + ] + ++ optionals (enableOpenvpn) [ + "--enable-openvpn=builtin" + "--with-openvpn=${openvpn}/sbin/openvpn" + ] + ++ optionals (enableVpnc) [ + "--enable-vpnc=builtin" + "--with-vpnc=${vpnc}/sbin/vpnc" + ] + ++ optionals (enablePolkit) [ + "--enable-polkit" + ] + ++ optionals (enablePptp) [ + "--enable-pptp" + "--with-pptp=${pptp}/sbin/pptp" + ] + ++ optionals (!enableWireguard) [ + "--disable-wireguard" + ] + ++ optionals (enableNetworkManager) [ + "--enable-nmcompat" + ] + ++ optionals (enableHh2serialGps) [ + "--enable-hh2serial-gps" + ] + ++ optionals (enableL2tp) [ + "--enable-l2tp" + ] + ++ optionals (enableIospm) [ + "--enable-iospm" + ] + ++ optionals (enableTist) [ + "--enable-tist" + ] + ; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A daemon for managing internet connections"; + homepage = "https://01.org/connman"; + maintainers = [ maintainers.matejc ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 9fcacd29ebef..34aee7f78794 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,177 +1,38 @@ -{ stdenv -, fetchurl -, pkgconfig -, file -, glib -# always required runtime dependencies -, dbus -, libmnl -, gnutls -, readline -# configureable options -, firewallType ? "iptables" # or "nftables" -, iptables ? null -, libnftnl ? null # for nftables -, dnsType ? "internal" # or "systemd-resolved" -# optional features which are turned *on* by default -, enableOpenconnect ? true -, openconnect ? null -, enableOpenvpn ? true -, openvpn ? null -, enableVpnc ? true -, vpnc ? true -, enablePolkit ? true -, polkit ? null -, enablePptp ? true -, pptp ? null -, ppp ? null -, enableLoopback ? true -, enableEthernet ? true -, enableWireguard ? true -, enableGadget ? true -, enableWifi ? true -, enableBluetooth ? true -, enableOfono ? true -, enableDundee ? true -, enablePacrunner ? true -, enableNeard ? true -, enableWispr ? true -, enableTools ? true -, enableStats ? true -, enableClient ? true -, enableDatafiles ? true -# optional features which are turned *off* by default -, enableNetworkManager ? false -, networkmanager ? null -, enableHh2serialGps ? false -, enableL2tp ? false -, enableIospm ? false -, enableTist ? false -}: +{ callPackage, lowPrio }: -assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; -assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; - -let inherit (stdenv.lib) optionals; - -stdenv.mkDerivation rec { - pname = "connman"; - version = "1.38"; - src = fetchurl { - url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; +{ + connmanFull = callPackage ./connman.nix { + enableNetworkManager = true; + enableHh2serialGps = true; + enableL2tp = true; + enableIospm = true; + enableTist = true; }; - buildInputs = [ - glib - dbus - libmnl - gnutls - readline - ]; + connmanMinimal = lowPrio (callPackage ./connman.nix { + enableOpenconnect = false; + enableOpenvpn = false; + enableVpnc = false; + vpnc = false; + enablePolkit = false; + enablePptp = false; + enableLoopback = false; + # enableEthernet = false; # If disabled no ethernet connection can be performed + enableWireguard = false; + enableGadget = false; + # enableWifi = false; # If disabled no WiFi connection can be performed + enableBluetooth = false; + enableOfono = false; + enableDundee = false; + enablePacrunner = false; + enableNeard = false; + enableWispr = false; + enableTools = false; + enableStats = false; + enableClient = false; + # enableDatafiles = false; # If disabled, configuration and data files are not installed + }); - nativeBuildInputs = [ - pkgconfig - file - ] - ++ optionals (enableOpenvpn) [ openvpn ] - ++ optionals (enableOpenconnect) [ openconnect ] - ++ optionals (enableVpnc) [ vpnc ] - ++ optionals (enablePolkit) [ polkit ] - ++ optionals (enablePptp) [ pptp ppp ] - ++ optionals (firewallType == "iptables") [ iptables ] - ++ optionals (firewallType == "nftables") [ libnftnl ] - ; - - # fix invalid path to 'file' - patchPhase = '' - runHook prePatch - sed -i "s/\/usr\/bin\/file/file/g" ./configure - runHook postPatch - ''; - - configureFlags = [ - # directories flags - "--sysconfdir=${placeholder "out"}/etc" - "--localstatedir=/var" - "--with-dbusconfdir=${placeholder "out"}/share" - "--with-dbusdatadir=${placeholder "out"}/share" - "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" - "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" - "--with-dns-backend=${dnsType}" - "--with-firewall=${firewallType}" - # production build flags - "--disable-maintainer-mode" - "--enable-session-policy-local=builtin" - # for building and running tests - # --enable-tests # installs the tests, we don't want that - "--enable-tools" - ] - ++ optionals (!enableLoopback) [ "--disable-loopback" ] - ++ optionals (!enableEthernet) [ "--disable-ethernet" ] - ++ optionals (!enableWireguard) [ "--disable-wireguard" ] - ++ optionals (!enableGadget) [ "--disable-gadget" ] - ++ optionals (!enableWifi) [ "--disable-wifi" ] - # enable IWD support for wifi as it doesn't require any new dependencies - # and it's easier for the NixOS module to use only one connman package when - # IWD is requested - ++ optionals (enableWifi) [ "--enable-iwd" ] - ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ] - ++ optionals (!enableOfono) [ "--disable-ofono" ] - ++ optionals (!enableDundee) [ "--disable-dundee" ] - ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ] - ++ optionals (!enableNeard) [ "--disable-neard" ] - ++ optionals (!enableWispr) [ "--disable-wispr" ] - ++ optionals (!enableTools) [ "--disable-tools" ] - ++ optionals (!enableStats) [ "--disable-stats" ] - ++ optionals (!enableClient) [ "--disable-client" ] - ++ optionals (!enableDatafiles) [ "--disable-datafiles" ] - ++ optionals (enableOpenconnect) [ - "--enable-openconnect=builtin" - "--with-openconnect=${openconnect}/sbin/openconnect" - ] - ++ optionals (enableOpenvpn) [ - "--enable-openvpn=builtin" - "--with-openvpn=${openvpn}/sbin/openvpn" - ] - ++ optionals (enableVpnc) [ - "--enable-vpnc=builtin" - "--with-vpnc=${vpnc}/sbin/vpnc" - ] - ++ optionals (enablePolkit) [ - "--enable-polkit" - ] - ++ optionals (enablePptp) [ - "--enable-pptp" - "--with-pptp=${pptp}/sbin/pptp" - ] - ++ optionals (!enableWireguard) [ - "--disable-wireguard" - ] - ++ optionals (enableNetworkManager) [ - "--enable-nmcompat" - ] - ++ optionals (enableHh2serialGps) [ - "--enable-hh2serial-gps" - ] - ++ optionals (enableL2tp) [ - "--enable-l2tp" - ] - ++ optionals (enableIospm) [ - "--enable-iospm" - ] - ++ optionals (enableTist) [ - "--enable-tist" - ] - ; - - doCheck = true; - - meta = with stdenv.lib; { - description = "A daemon for managing internet connections"; - homepage = "https://01.org/connman"; - maintainers = [ maintainers.matejc ]; - platforms = platforms.linux; - license = licenses.gpl2; - }; + # All the defaults + connman = callPackage ./connman.nix { }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ed0b8d55a8e..2827e84b7a47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2550,37 +2550,11 @@ in conspy = callPackage ../os-specific/linux/conspy {}; - connman = callPackage ../tools/networking/connman { }; - connmanThin = callPackage ../tools/networking/connman { - enableOpenconnect = false; - enableOpenvpn = false; - enableVpnc = false; - vpnc = false; - enablePolkit = false; - enablePptp = false; - enableLoopback = false; - # enableEthernet = false; # If disabled no ethernet connection can be performed - enableWireguard = false; - enableGadget = false; - # enableWifi = false; # If disabled no WiFi connection can be performed - enableBluetooth = false; - enableOfono = false; - enableDundee = false; - enablePacrunner = false; - enableNeard = false; - enableWispr = false; - enableTools = false; - enableStats = false; - enableClient = false; - # enableDatafiles = false; # If disabled, configuration and data files are not installed - }; - connmanFull = callPackage ../tools/networking/connman { - enableNetworkManager = true; - enableHh2serialGps = true; - enableL2tp = true; - enableIospm = true; - enableTist = true; - }; + inherit (callPackage ../tools/networking/connman {}) + connmanFull + connmanMinimal + connman + ; connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; From fa5f7b89c4b23f46acfcc29b4d683260937967b4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 2 Mar 2020 11:13:45 +0200 Subject: [PATCH 28/95] connman: Switch to postPatch from patchPhase --- pkgs/tools/networking/connman/connman.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index f79b9875b9bc..c700d6864a97 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -84,10 +84,8 @@ stdenv.mkDerivation rec { ; # fix invalid path to 'file' - patchPhase = '' - runHook prePatch + postPatch = '' sed -i "s/\/usr\/bin\/file/file/g" ./configure - runHook postPatch ''; configureFlags = [ From a3d2e48a62412029adf6e6b3d5d4d2cb0bf5bae2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 3 Mar 2020 22:33:49 +0200 Subject: [PATCH 29/95] connmanMinimal: remove use of lowPrio --- pkgs/tools/networking/connman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 34aee7f78794..b2b62cf01b72 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lowPrio }: +{ callPackage }: { connmanFull = callPackage ./connman.nix { @@ -9,7 +9,7 @@ enableTist = true; }; - connmanMinimal = lowPrio (callPackage ./connman.nix { + connmanMinimal = callPackage ./connman.nix { enableOpenconnect = false; enableOpenvpn = false; enableVpnc = false; @@ -31,7 +31,7 @@ enableStats = false; enableClient = false; # enableDatafiles = false; # If disabled, configuration and data files are not installed - }); + }; # All the defaults connman = callPackage ./connman.nix { }; From 22b27dd635b9f6d1b77720cfb3ebbc6d753c0ca5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 4 Mar 2020 09:45:45 +0200 Subject: [PATCH 30/95] connman: remove import of networkmanager --- pkgs/tools/networking/connman/connman.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index c700d6864a97..d72b6b90c5e5 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -42,7 +42,6 @@ , enableDatafiles ? true # optional features which are turned *off* by default , enableNetworkManager ? false -, networkmanager ? null , enableHh2serialGps ? false , enableL2tp ? false , enableIospm ? false From aa44c23c7ab30a2c8d8b355bab6d533fb861fe75 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 4 Mar 2020 09:48:01 +0200 Subject: [PATCH 31/95] connman: reverse order of build flavors declaration --- pkgs/tools/networking/connman/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index b2b62cf01b72..9e87c9742ea0 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,6 +1,9 @@ { callPackage }: { + # All the defaults + connman = callPackage ./connman.nix { }; + connmanFull = callPackage ./connman.nix { enableNetworkManager = true; enableHh2serialGps = true; @@ -32,7 +35,4 @@ enableClient = false; # enableDatafiles = false; # If disabled, configuration and data files are not installed }; - - # All the defaults - connman = callPackage ./connman.nix { }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2827e84b7a47..7600213d1a89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2551,9 +2551,9 @@ in conspy = callPackage ../os-specific/linux/conspy {}; inherit (callPackage ../tools/networking/connman {}) + connman connmanFull connmanMinimal - connman ; connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; From b03bf779aee312b610b1596682963b7569468630 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 4 Mar 2020 18:56:49 +0200 Subject: [PATCH 32/95] connman: remove unneeded deps from nativeBuildInputs --- pkgs/tools/networking/connman/connman.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index d72b6b90c5e5..512194872205 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -73,9 +73,6 @@ stdenv.mkDerivation rec { pkgconfig file ] - ++ optionals (enableOpenvpn) [ openvpn ] - ++ optionals (enableOpenconnect) [ openconnect ] - ++ optionals (enableVpnc) [ vpnc ] ++ optionals (enablePolkit) [ polkit ] ++ optionals (enablePptp) [ pptp ppp ] ++ optionals (firewallType == "iptables") [ iptables ] From 2773498fc0315ce63559c833524616fdab000484 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Mar 2020 18:15:11 +0100 Subject: [PATCH 33/95] =?UTF-8?q?coqPackages.paramcoq:=201.1.1=20=E2=86=92?= =?UTF-8?q?=201.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coq-modules/paramcoq/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index a57d1bc9088d..67e420b4e89e 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,33 +3,40 @@ let params = { "8.7" = { - version = "1.1.1+coq8.7"; - sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l"; + sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.8" = { - version = "1.1.1"; - sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh"; + sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.9" = { - version = "1.1.1+coq8.9"; - sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; + sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; + }; + "8.10" = { + sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; + }; + "8.11" = { + sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; }; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { - inherit (param) version; + version = "1.1.2"; name = "coq${coq.coq-version}-paramcoq-${version}"; src = fetchFromGitHub { owner = "coq-community"; repo = "paramcoq"; - rev = "v${version}"; + rev = "v${version}+coq${coq.coq-version}"; inherit (param) sha256; }; buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]) + ++ (with coq.ocamlPackages; [ ocaml findlib ]) + ++ (param.buildInputs or []) ; installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; From 39921bd43ba6ccd273f4337098b71eb851e9c77d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Mar 2020 02:17:27 -0400 Subject: [PATCH 34/95] mame: add darwin support --- pkgs/misc/emulators/mame/default.nix | 28 +++++++++++++++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index 995fd72a6e22..2b05a921590f 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,14 +1,17 @@ { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: +with stdenv; + let majorVersion = "0"; minorVersion = "219"; desktopItem = makeDesktopItem { name = "MAME"; - exec = "mame${stdenv.lib.optionalString stdenv.is64bit "64"}"; + exec = "mame${lib.optionalString stdenv.is64bit "64"}"; desktopName = "MAME"; genericName = "MAME is a multi-purpose emulation framework"; categories = "System;Emulator;"; @@ -27,13 +30,22 @@ in mkDerivation { }; hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ]; - makeFlags = [ "TOOLS=1" ]; + makeFlags = [ + "TOOLS=1" + "USE_LIBSDL=1" + ] + ++ lib.optionals stdenv.cc.isClang [ "CC=clang" "CXX=clang++" ] + ; dontWrapQtApps = true; - buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ]; + buildInputs = + [ SDL2 SDL2_ttf qtbase libXinerama ] + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] + ; nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ]; # by default MAME assumes that paths with stock resources @@ -58,16 +70,18 @@ in mkDerivation { installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6 mv artwork plugins samples ${dest} - + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share ln -s ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Is a multi-purpose emulation framework"; homepage = https://www.mamedev.org/; license = with licenses; [ bsd3 gpl2Plus ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.unix; + # makefile needs fixes for install target + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ gnidorah ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e469380abbd..6c3a8a4d430d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25517,7 +25517,9 @@ in icu = icu58; }; - mame = libsForQt5.callPackage ../misc/emulators/mame { }; + mame = libsForQt5.callPackage ../misc/emulators/mame { + inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; + }; martyr = callPackage ../development/libraries/martyr { }; From f0f6527e9704501294c1cd25cb4a8b9f314ee4cd Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 27 Mar 2020 18:10:21 +0100 Subject: [PATCH 35/95] matrix-dl: init at (unstable-)2019-09-22 --- .../instant-messengers/matrix-dl/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/matrix-dl/default.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix new file mode 100644 index 000000000000..21d521872145 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "matrix-dl-unstable"; + version = "2019-09-22"; + + src = fetchFromGitHub { + owner = "rubo77"; + repo = "matrix-dl"; + rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69"; + sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q"; + }; + + propagatedBuildInputs = with python3Packages; [ + matrix-client + ]; + + meta = with lib; { + description = "Download backlogs from Matrix as raw text"; + homepage = src.meta.homepage; + license = licenses.unfree; + maintainers = with maintainers; [ aw ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1f57640d54..b27ac31e739c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20689,6 +20689,8 @@ in canonicaljson; }; + matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { }; + matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; From 220636999b63035b5a1cab65243bd3913a28a6d8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 27 Mar 2020 22:17:01 +0100 Subject: [PATCH 36/95] Revert "luaPackages.luv: 1.30.0-0 -> 1.34.1-1" This reverts commit eaa47284113cda19a037b7fcbaa892ddb596b813. With 81461cff5f540c92e5030f62b89ee7b64e85c6df luv also needs to be downgraded until luarocks can be updated to 3.3.1 again. Fixes #82727 --- pkgs/development/lua-modules/generated-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 33946b7213aa..edc09421baf7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.34.1-1"; + version = "1.30.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.34.1-1.src.rock; - sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0"; + url = https://luarocks.org/luv-1.30.0-0.src.rock; + sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; From 0b1e4118b40c5c7daaa160fe353ec4001f80d83e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Mar 2020 23:45:02 +0000 Subject: [PATCH 37/95] python27Packages.mayavi: 4.7.0 -> 4.7.1 --- pkgs/development/python-modules/mayavi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index d7a821915f20..ffdf97475837 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.7.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44"; + sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; }; # Discovery of 'vtk' in setuptools is not working properly, due to a missing @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "3D visualization of scientific data in Python"; - homepage = https://github.com/enthought/mayavi; + homepage = "https://github.com/enthought/mayavi"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; From d85fb28414502e6c4f2618ea50abe4c9b7b0fdd0 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Thu, 26 Mar 2020 14:33:57 +0100 Subject: [PATCH 38/95] nixos/tests/hibernate: disable for platforms other than x86_64 Due to 9pnet_virtio bugs, /nix is no longer available after hibernation. It happens to work on x86_64, but not on other platforms. --- nixos/tests/all-tests.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 51b463747b0e..7c0550dfa090 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -120,7 +120,10 @@ in handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; - hibernate = handleTest ./hibernate.nix {}; + # 9pnet_virtio used to mount /nix partition doesn't support + # hibernation. This test happens to work on x86_64-linux but + # not on other platforms. + hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {}; hitch = handleTest ./hitch {}; hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; home-assistant = handleTest ./home-assistant.nix {}; From 480397693ef6e9ca92ab6e1d015e31232d62f2c7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 28 Mar 2020 12:06:54 +0300 Subject: [PATCH 39/95] nixos/connman: add option to use specific package --- nixos/modules/services/networking/connman.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index e8eadc4e187d..53adc337fa47 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -77,6 +77,13 @@ in { ''; }; + package = mkOption { + type = types.path; + description = "The connman package / build flavor"; + default = connman; + example = literalExample "pkgs.connmanFull"; + }; + }; }; @@ -93,7 +100,7 @@ in { message = "You can not use services.connman with networking.networkmanager"; }]; - environment.systemPackages = [ connman ]; + environment.systemPackages = [ cfg.package ]; systemd.services.connman = { description = "Connection service"; @@ -105,7 +112,7 @@ in { BusName = "net.connman"; Restart = "on-failure"; ExecStart = toString ([ - "${pkgs.connman}/sbin/connmand" + "${cfg.package}/sbin/connmand" "--config=${configFile}" "--nodaemon" ] ++ optional enableIwd "--wifi=iwd_agent" @@ -122,7 +129,7 @@ in { serviceConfig = { Type = "dbus"; BusName = "net.connman.vpn"; - ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n"; + ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; StandardOutput = "null"; }; }; @@ -132,7 +139,7 @@ in { serviceConfig = { Name = "net.connman.vpn"; before = [ "connman" ]; - ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n"; + ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; User = "root"; SystemdService = "connman-vpn.service"; }; From bffec3d88448c57c84527fe02bdfc988573b3db2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 28 Mar 2020 12:28:29 +0300 Subject: [PATCH 40/95] nixos/connman: add TODOs regarding connman + network-manager --- nixos/modules/services/networking/connman.nix | 2 ++ pkgs/tools/networking/connman/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 53adc337fa47..6ccc2dffb267 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -96,6 +96,8 @@ in { assertion = !config.networking.useDHCP; message = "You can not use services.connman with networking.useDHCP"; }{ + # TODO: connman seemingly can be used along network manager and + # connmanFull supports this - so this should be worked out somehow assertion = !config.networking.networkmanager.enable; message = "You can not use services.connman with networking.networkmanager"; }]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 9e87c9742ea0..ccceaa30b043 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -5,6 +5,8 @@ connman = callPackage ./connman.nix { }; connmanFull = callPackage ./connman.nix { + # TODO: Why is this in `connmanFull` and not the default build? See TODO in + # nixos/modules/services/networking/connman.nix (near the assertions) enableNetworkManager = true; enableHh2serialGps = true; enableL2tp = true; From 49eec08cc8ac3213f0ce0a05a4f0bf9bbe9385f0 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 28 Mar 2020 14:00:11 +0100 Subject: [PATCH 41/95] netbeans: 11.2 -> 11.3 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 0fddddbaacf5..eced6780c2f2 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.2"; + version = "11.3"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "d589481808832c4f0391ee1ecb8e18202cebeee8bd844cb4bdbf6125113b41f9138a34c4c2ef1fdf228294ef8c24b242ffec9ba5fdc4f1d288db4a3f19ba1509"; + sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6"; }; buildCommand = '' From f77a42d32e06c0500839d308844c1a65e2c768c3 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 28 Mar 2020 14:00:43 +0100 Subject: [PATCH 42/95] netbeans: added myself to maintainers list --- maintainers/maintainer-list.nix | 8 ++++++-- pkgs/applications/editors/netbeans/default.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b59199bc767c..56a19fabad2d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -645,6 +645,12 @@ githubId = 10285250; name = "Artur E. Ruuge"; }; + asbachb = { + email = "asbachb-nixpkgs-5c2a@impl.it"; + github = "asbachb"; + githubId = 1482768; + name = "Benjamin Asbach"; + }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; github = "ashalkhakov"; @@ -8328,5 +8334,3 @@ name = "Xavier Zwirtz"; }; } - - diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index eced6780c2f2..b2a13e3db7cd 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { description = "An integrated development environment for Java, C, C++ and PHP"; homepage = "https://netbeans.apache.org/"; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sander rszibele ]; + maintainers = with stdenv.lib.maintainers; [ sander rszibele asbachb ]; platforms = stdenv.lib.platforms.unix; }; } From 97f09ff09fcc0964d9a4c2b037c9340c8836ed74 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 27 Mar 2020 21:52:48 -0400 Subject: [PATCH 43/95] pythonPackages.ntlm-auth: 1.0.3 -> 1.4.0 to fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On master and 20.03, this is failing to build on `python 3.8`. https://hydra.nixos.org/build/115517329 https://hydra.nixos.org/build/114714922 CC @NixOS/nixos-release-managers ZHF: #80379 Co-Authored-By: Niklas Hambüchen --- pkgs/development/python-modules/ntlm-auth/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix index e4bbe0fb4302..14900d5c55db 100644 --- a/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -3,22 +3,23 @@ , fetchFromGitHub , mock , pytest +, requests , unittest2 , six }: buildPythonPackage rec { pname = "ntlm-auth"; - version = "1.0.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jborean93"; repo = "ntlm-auth"; rev = "v${version}"; - sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz"; + sha256 = "168k3ygwbvnfcwn7q1nv3vvy6b9jc4cnpix0xgg5j8av7v1x0grn"; }; - checkInputs = [ mock pytest unittest2 ]; + checkInputs = [ mock pytest requests unittest2 ]; propagatedBuildInputs = [ six ]; # Functional tests require networking @@ -28,8 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "Calculates NTLM Authentication codes"; - homepage = https://github.com/jborean93/ntlm-auth; - license = licenses.lgpl3; + homepage = "https://github.com/jborean93/ntlm-auth"; + license = licenses.mit; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; }; From c8de31baa6d820c9275d4708c296c4af370cf63b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 28 Mar 2020 20:45:46 +0100 Subject: [PATCH 44/95] buildRustCrateTests: Fix link order test on darwin As it turns out Darwin does most of the things differently then "normal" systems. They are using a different shared library extension and require an obscure commandline parameter that has to be added to every build system out there. That issue seems to be with clang on Darwin as on Linux that flag isn't required to build the very same tests (when using clang). After adjusting these two details the tests are running fine on the darwin box that I was able to obtain. --- .../rust/build-rust-crate/test/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 2251a1b40f2e..598b5daed1be 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1,4 +1,13 @@ -{ lib, buildRustCrate, runCommand, runCommandCC, writeTextFile, symlinkJoin, callPackage, releaseTools }: +{ lib +, stdenv +, buildRustCrate +, runCommand +, runCommandCC +, writeTextFile +, symlinkJoin +, callPackage +, releaseTools +}: let mkCrate = args: let p = { @@ -284,12 +293,18 @@ let ]; }; buildInputs = let - compile = name: text: runCommandCC name {} '' - mkdir -p $out/lib - $CC -shared -o $out/lib/${name}.so ${writeTextFile { + compile = name: text: let + src = writeTextFile { name = "${name}-src.c"; inherit text; - }} + }; + in runCommandCC name {} '' + mkdir -p $out/lib + # Note: On darwin (which defaults to clang) we have to add + # `-undefined dynamic_lookup` as otherwise the compilation fails. + cc -shared \ + ${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \ + -o $out/lib/${name}${stdenv.hostPlatform.extensions.sharedLibrary} ${src} ''; b = compile "libb" '' #include From 3a3860fe481067ef108289defb81117279281f0a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Mar 2020 02:52:33 +0100 Subject: [PATCH 45/95] mixx: Build with libshout 2.4.1 Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it with 2.4.1 instead. This actually fixes the problem. Signed-off-by: Matthias Beyer --- pkgs/applications/audio/mixxx/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 1247534b1e83..a7fc3aef078d 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, chromaprint +{ stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile @@ -6,6 +6,17 @@ , qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk }: +let + # Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it + # with 2.4.1 instead. + libshout241 = libshout.overrideAttrs (o: rec { + name = "libshout-2.4.1"; + src = fetchurl { + url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k"; + }; + }); +in mkDerivation rec { pname = "mixxx"; version = "2.2.3"; @@ -18,7 +29,7 @@ mkDerivation rec { }; buildInputs = [ - chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile + chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg qtx11extras rubberband scons sqlite taglib upower vamp-plugin-sdk ]; From 63a3a81863a46056b80e1bbed5696c06717f6774 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 28 Mar 2020 22:27:38 +0100 Subject: [PATCH 46/95] mutt: 1.13.4 -> 1.13.5 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 143153d4d9ff..a53e1abc1861 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.13.4"; + version = "1.13.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm"; + sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"; }; patches = optional smimeSupport (fetchpatch { From b938ab99e054eaed93a72e3ff772f1e537b072a5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 28 Mar 2020 22:32:34 +0100 Subject: [PATCH 47/95] vorta: init at 0.6.24 Simple QT5-based desktop client[1] for `borgbackup`[2]. [1] https://vorta.borgbase.com/ [2] https://borgbackup.readthedocs.io/en/stable/ --- pkgs/applications/backup/vorta/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/backup/vorta/default.nix diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix new file mode 100644 index 000000000000..1a4d1832c7e1 --- /dev/null +++ b/pkgs/applications/backup/vorta/default.nix @@ -0,0 +1,42 @@ +{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5 +, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage +, appdirs, setuptools, qt5 +}: + +buildPythonApplication rec { + pname = "vorta"; + version = "0.6.24"; + + src = fetchFromGitHub { + owner = "borgbase"; + repo = "vorta"; + rev = "v${version}"; + sha256 = "1xc4cng4npc7g739qd909a8wim6s6sn8h8bb1wpxzg4gcnfyin8z"; + }; + + postPatch = '' + sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg + ''; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + propagatedBuildInputs = [ + paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle + secretstorage appdirs setuptools + ]; + + # QT setup in tests broken. + doCheck = false; + + postFixup = '' + wrapQtApp $out/bin/vorta + ''; + + meta = with lib; { + license = licenses.gpl3; + homepage = "https://vorta.borgbase.com/"; + maintainers = with maintainers; [ ma27 ]; + description = "Desktop Backup Client for Borg"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faead3d9df75..e6e44e98f944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3080,6 +3080,8 @@ in volctl = callPackage ../tools/audio/volctl { }; + vorta = python3Packages.callPackage ../applications/backup/vorta { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wev = callPackage ../tools/misc/wev { }; From c9042b95810ea0e638980dce45c06534394202ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 Mar 2020 19:23:28 -0300 Subject: [PATCH 48/95] theme-jade1: 1.6 -> 1.7 --- pkgs/data/themes/jade1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index cba38cb297a8..7398c417933f 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-jade-1"; rev = "v${version}"; - sha256 = "1lnajrsikw6dljf6dvgmj8aqwywmgdp34h3xsc0xiyq07arhp606"; + sha256 = "19vg95bf0ylmfhg0frs2k0k7c0wfn933h06wrklb9p5qy84hfig3"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; + description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; From bd5324c4fcb990715c64fc40c19341947e04bf17 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Mar 2020 22:09:13 +0100 Subject: [PATCH 49/95] hydra: 2020-02-06 -> 2020-03-{24,27} Upgrades Hydra to the latest master/flake branch. To perform this upgrade, it's needed to do a non-trivial db-migration which provides a massive performance-improvement[1]. The basic ideas behind multi-step upgrades of services between NixOS versions have been gathered already[2]. For further context it's recommended to read this first. Basically, the following steps are needed: * Upgrade to a non-breaking version of Hydra with the db-changes (columns are still nullable here). If `system.stateVersion` is set to something older than 20.03, the package will be selected automatically, otherwise `pkgs.hydra-migration` needs to be used. * Run `hydra-backfill-ids` on the server. * Deploy either `pkgs.hydra-unstable` (for Hydra master) or `pkgs.hydra-flakes` (for flakes-support) to activate the optimization. The steps are also documented in the release-notes and in the module using `warnings`. `pkgs.hydra` has been removed as latest Hydra doesn't compile with `pkgs.nixStable` and to ensure a graceful migration using the newly introduced packages. To verify the approach, a simple vm-test has been added which verifies the migration steps. [1] https://github.com/NixOS/hydra/pull/711 [2] https://github.com/NixOS/nixpkgs/pull/82353#issuecomment-598269471 --- nixos/doc/manual/release-notes/rl-2003.xml | 60 ++++++ .../continuous-integration/hydra/default.nix | 33 +++- nixos/tests/all-tests.nix | 1 + nixos/tests/hydra/common.nix | 47 +++++ nixos/tests/hydra/db-migration.nix | 86 +++++++++ nixos/tests/hydra/default.nix | 139 +++++--------- pkgs/development/tools/misc/hydra/common.nix | 135 ++++++++++++++ pkgs/development/tools/misc/hydra/default.nix | 171 ++++-------------- pkgs/top-level/all-packages.nix | 3 +- 9 files changed, 444 insertions(+), 231 deletions(-) create mode 100644 nixos/tests/hydra/common.nix create mode 100644 nixos/tests/hydra/db-migration.nix create mode 100644 pkgs/development/tools/misc/hydra/common.nix diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 7674b0a5c0de..76b12af362f8 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -697,6 +697,66 @@ auth required pam_succeed_if.so uid >= 1000 quiet + + + Hydra has gained a massive performance improvement due to + some database schema + changes by adding several IDs and better indexing. However, it's necessary + to upgrade Hydra in multiple steps: + + + + At first, an older version of Hydra needs to be deployed which adds those + (nullable) columns. When having set stateVersion + to a value older than 20.03, this package will be selected + by default from the module when upgrading. Otherwise, the package can be deployed using + the following config: +{ pkgs, ... }: { + services.hydra.package = pkgs.hydra-migration; +} + + + + + Automatically fill the newly added ID columns on the server by running the following + command: + +$ hydra-backfill-ids + + + Please note that this process can take a while depending on your database-size! + + + + + + Deploy a newer version of Hydra to activate the DB optimizations. You can choose from + either hydra-unstable (latest master compiled + against nixUnstable) and hydra-flakes (latest + version with flake-support). + + + If your stateVersion is set to + 20.03 or greater, hydra-unstable will be used + automatically! This will break your setup if you didn't run the migration. + + + Please note that Hydra is currently not available with nixStable + as this doesn't compile anymore. + + + + + + pkgs.hydra has been removed to ensure a graceful database-migration + using the dedicated package-attributes. If you still have pkgs.hydra + defined in e.g. an overlay, an assertion error will be thrown. To circumvent this, + you need to set to pkgs.hydra + explicitly and make sure you know what you're doing! + + + + diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 8b56207590a1..0c335f14f785 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -37,6 +37,8 @@ let haveLocalDB = cfg.dbi == localDB; + inherit (config.system) stateVersion; + in { @@ -63,8 +65,7 @@ in }; package = mkOption { - type = types.path; - default = pkgs.hydra; + type = types.package; defaultText = "pkgs.hydra"; description = "The Hydra package."; }; @@ -194,6 +195,34 @@ in config = mkIf cfg.enable { + warnings = optional (cfg.package.migration or false) '' + You're currently deploying an older version of Hydra which is needed to + make some required database changes[1]. As soon as this is done, it's recommended + to run `hydra-backfill-ids` and set `services.hydra.package` to either `pkgs.hydra-unstable` + or `pkgs.hydra-flakes` after that. + + [1] https://github.com/NixOS/hydra/pull/711 + ''; + + services.hydra.package = with pkgs; + mkDefault ( + if pkgs ? hydra + then throw '' + The Hydra package doesn't exist anymore in `nixpkgs`! It probably exists + due to an overlay. To upgrade Hydra, you need to take two steps as some + bigger changes in the database schema were implemented recently[1]. You first + need to deploy `pkgs.hydra-migration`, run `hydra-backfill-ids` on the server + and then deploy either `pkgs.hydra-unstable` or `pkgs.hydra-flakes`. + + If you want to use `pkgs.hydra` from your overlay, please set `services.hydra.package` + explicitly to `pkgs.hydra` and make sure you know what you're doing. + + [1] https://github.com/NixOS/hydra/pull/711 + '' + else if versionOlder stateVersion "20.03" then hydra-migration + else hydra-unstable + ); + users.groups.hydra = { gid = config.ids.gids.hydra; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3501c551625d..265c93298f3c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -127,6 +127,7 @@ in home-assistant = handleTest ./home-assistant.nix {}; hound = handleTest ./hound.nix {}; hydra = handleTest ./hydra {}; + hydra-db-migration = handleTest ./hydra/db-migration.nix {}; i3wm = handleTest ./i3wm.nix {}; icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix new file mode 100644 index 000000000000..f612717dc968 --- /dev/null +++ b/nixos/tests/hydra/common.nix @@ -0,0 +1,47 @@ +{ system, ... }: +{ + baseConfig = { pkgs, ... }: let + trivialJob = pkgs.writeTextDir "trivial.nix" '' + { trivial = builtins.derivation { + name = "trivial"; + system = "${system}"; + builder = "/bin/sh"; + allowSubstitutes = false; + preferLocalBuild = true; + args = ["-c" "echo success > $out; exit 0"]; + }; + } + ''; + + createTrivialProject = pkgs.stdenv.mkDerivation { + name = "create-trivial-project"; + dontUnpack = true; + buildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; + postFixup = '' + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + ''; + }; + in { + virtualisation.memorySize = 2048; + time.timeZone = "UTC"; + environment.systemPackages = [ createTrivialProject pkgs.jq ]; + services.hydra = { + enable = true; + # Hydra needs those settings to start up, so we add something not harmfull. + hydraURL = "example.com"; + notificationSender = "example@example.com"; + extraConfig = '' + email_notification = 1 + ''; + }; + services.postfix.enable = true; + nix = { + buildMachines = [{ + hostName = "localhost"; + systems = [ system ]; + }]; + binaryCaches = []; + }; + }; +} diff --git a/nixos/tests/hydra/db-migration.nix b/nixos/tests/hydra/db-migration.nix new file mode 100644 index 000000000000..aa1c81c9e775 --- /dev/null +++ b/nixos/tests/hydra/db-migration.nix @@ -0,0 +1,86 @@ +{ system ? builtins.currentSystem, ... }: + +let inherit (import ./common.nix { inherit system; }) baseConfig; in + +{ mig = import ../make-test-python.nix ({ pkgs, lib, ... }: { + name = "hydra-db-migration"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes = { + original = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + + # An older version of Hydra before the db change + # for testing purposes. + services.hydra.package = pkgs.hydra-migration.overrideAttrs (old: { + inherit (old) pname; + version = "2020-02-06"; + src = pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; + sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; + }; + }); + }; + + migration_phase1 = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + services.hydra.package = pkgs.hydra-migration; + }; + + finished = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + services.hydra.package = pkgs.hydra-unstable; + }; + }; + + testScript = { nodes, ... }: let + next = nodes.migration_phase1.config.system.build.toplevel; + finished = nodes.finished.config.system.build.toplevel; + in '' + original.start() + original.wait_for_unit("multi-user.target") + original.wait_for_unit("postgresql.service") + original.wait_for_unit("hydra-init.service") + original.require_unit_state("hydra-queue-runner.service") + original.require_unit_state("hydra-evaluator.service") + original.require_unit_state("hydra-notify.service") + original.succeed("hydra-create-user admin --role admin --password admin") + original.wait_for_open_port(3000) + original.succeed("create-trivial-project.sh") + original.wait_until_succeeds( + 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' + ) + + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + assert "jobset_id" not in out + + original.succeed( + "${next}/bin/switch-to-configuration test >&2" + ) + original.wait_for_unit("hydra-init.service") + + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + assert "jobset_id|integer|||" in out + + original.succeed("hydra-backfill-ids") + + original.succeed( + "${finished}/bin/switch-to-configuration test >&2" + ) + original.wait_for_unit("hydra-init.service") + + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + assert "jobset_id|integer||not null|" in out + + original.wait_until_succeeds( + 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' + ) + + original.shutdown() + ''; + }); +} diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 1c0ed3369b1c..5d94eb91bf5b 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -3,102 +3,57 @@ , pkgs ? import ../../.. { inherit system config; } }: +with import ../../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + let - trivialJob = pkgs.writeTextDir "trivial.nix" '' - { trivial = builtins.derivation { - name = "trivial"; - system = "${system}"; - builder = "/bin/sh"; - allowSubstitutes = false; - preferLocalBuild = true; - args = ["-c" "echo success > $out; exit 0"]; - }; - } - ''; + inherit (import ./common.nix { inherit system; }) baseConfig; - createTrivialProject = pkgs.stdenv.mkDerivation { - name = "create-trivial-project"; - dontUnpack = true; - buildInputs = [ pkgs.makeWrapper ]; - installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; - postFixup = '' - wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + hydraPkgs = { + inherit (pkgs) hydra-migration hydra-unstable hydra-flakes; + }; + + makeHydraTest = with pkgs.lib; name: package: makeTest { + name = "hydra-${name}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ pstn lewo ma27 ]; + }; + + machine = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + services.hydra = { inherit package; }; + }; + + testScript = '' + # let the system boot up + machine.wait_for_unit("multi-user.target") + # test whether the database is running + machine.wait_for_unit("postgresql.service") + # test whether the actual hydra daemons are running + machine.wait_for_unit("hydra-init.service") + machine.require_unit_state("hydra-queue-runner.service") + machine.require_unit_state("hydra-evaluator.service") + machine.require_unit_state("hydra-notify.service") + + machine.succeed("hydra-create-user admin --role admin --password admin") + + # create a project with a trivial job + machine.wait_for_open_port(3000) + + # make sure the build as been successfully built + machine.succeed("create-trivial-project.sh") + + machine.wait_until_succeeds( + 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' + ) + + machine.wait_until_succeeds( + 'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"' + ) ''; }; - callTest = f: f { inherit system pkgs; }; - - hydraPkgs = { - inherit (pkgs) nixStable nixUnstable nixFlakes; - }; - - tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix: - callTest (import ../make-test-python.nix ({ pkgs, lib, ... }: - { - name = "hydra-with-${name}"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn lewo ma27 ]; - }; - - machine = { pkgs, ... }: - { - virtualisation.memorySize = 1024; - time.timeZone = "UTC"; - - environment.systemPackages = [ createTrivialProject pkgs.jq ]; - services.hydra = { - enable = true; - - #Hydra needs those settings to start up, so we add something not harmfull. - hydraURL = "example.com"; - notificationSender = "example@example.com"; - - package = pkgs.hydra.override { inherit nix; }; - - extraConfig = '' - email_notification = 1 - ''; - }; - services.postfix.enable = true; - nix = { - buildMachines = [{ - hostName = "localhost"; - systems = [ system ]; - }]; - - binaryCaches = []; - }; - }; - - testScript = '' - # let the system boot up - machine.wait_for_unit("multi-user.target") - # test whether the database is running - machine.wait_for_unit("postgresql.service") - # test whether the actual hydra daemons are running - machine.wait_for_unit("hydra-init.service") - machine.require_unit_state("hydra-queue-runner.service") - machine.require_unit_state("hydra-evaluator.service") - machine.require_unit_state("hydra-notify.service") - - machine.succeed("hydra-create-user admin --role admin --password admin") - - # create a project with a trivial job - machine.wait_for_open_port(3000) - - # make sure the build as been successfully built - machine.succeed("create-trivial-project.sh") - - machine.wait_until_succeeds( - 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' - ) - - machine.wait_until_succeeds( - 'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"' - ) - ''; - }))); - in - tests + +mapAttrs makeHydraTest hydraPkgs diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix new file mode 100644 index 000000000000..7310ee949721 --- /dev/null +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -0,0 +1,135 @@ +{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub +, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx +, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt +, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json +, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar +, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null +, migration ? false +}: + +with stdenv; + +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + +let + perlDeps = buildEnv { + name = "hydra-perl-deps"; + paths = with perlPackages; lib.closePropagation + [ ModulePluggable + CatalystActionREST + CatalystAuthenticationStoreDBIxClass + CatalystDevel + CatalystDispatchTypeRegex + CatalystPluginAccessLog + CatalystPluginAuthorizationRoles + CatalystPluginCaptcha + CatalystPluginSessionStateCookie + CatalystPluginSessionStoreFastMmap + CatalystPluginStackTrace + CatalystPluginUnicodeEncoding + CatalystTraitForRequestProxyBase + CatalystViewDownload + CatalystViewJSON + CatalystViewTT + CatalystXScriptServerStarman + CatalystXRoleApplicator + CryptRandPasswd + DBDPg + DBDSQLite + DataDump + DateTime + DigestSHA1 + EmailMIME + EmailSender + FileSlurp + IOCompress + IPCRun + JSON + JSONAny + JSONXS + LWP + LWPProtocolHttps + NetAmazonS3 + NetPrometheus + NetStatsd + PadWalker + Readonly + SQLSplitStatement + SetScalar + Starman + SysHostnameLong + TermSizeAny + TestMore + TextDiff + TextTable + XMLSimple + nix + nix.perl-bindings + git + boehmgc + ]; + }; +in stdenv.mkDerivation rec { + pname = "hydra"; + + inherit stdenv src version; + + buildInputs = + [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx + gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt + perlDeps perl nix + postgresql # for running the tests + nlohmann_json + boost + ]; + + hydraPath = lib.makeBinPath ( + [ sqlite subversion openssh nix coreutils findutils pixz + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar + ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; + + NIX_CFLAGS_COMPILE = "-pthread"; + + shellHook = '' + PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH + PERL5LIB=$(pwd)/src/lib:$PERL5LIB; + ''; + + enableParallelBuilding = true; + + preCheck = '' + patchShebangs . + export LOGNAME=''${LOGNAME:-foo} + ''; + + postInstall = '' + mkdir -p $out/nix-support + for i in $out/bin/*; do + read -n 4 chars < $i + if [[ $chars =~ ELF ]]; then continue; fi + wrapProgram $i \ + --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ + --prefix PATH ':' $out/bin:$hydraPath \ + --set HYDRA_RELEASE ${version} \ + --set HYDRA_HOME $out/libexec/hydra \ + --set NIX_RELEASE ${nix.name or "unknown"} + done + ''; # */ + + dontStrip = true; + + passthru = { inherit perlDeps migration; }; + + meta = with stdenv.lib; { + description = "Nix-based continuous build system"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 72aecf20ca39..35c069211b3f 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,143 +1,42 @@ -{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json -, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook -}: +{ fetchFromGitHub, nixStable, nixUnstable, callPackage, nixFlakes }: -with stdenv; - -if lib.versions.major nix.version == "1" - then throw "This Hydra version doesn't support Nix 1.x" -else - -let - perlDeps = buildEnv { - name = "hydra-perl-deps"; - paths = with perlPackages; lib.closePropagation - [ ModulePluggable - CatalystActionREST - CatalystAuthenticationStoreDBIxClass - CatalystDevel - CatalystDispatchTypeRegex - CatalystPluginAccessLog - CatalystPluginAuthorizationRoles - CatalystPluginCaptcha - CatalystPluginSessionStateCookie - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginUnicodeEncoding - CatalystTraitForRequestProxyBase - CatalystViewDownload - CatalystViewJSON - CatalystViewTT - CatalystXScriptServerStarman - CatalystXRoleApplicator - CryptRandPasswd - DBDPg - DBDSQLite - DataDump - DateTime - DigestSHA1 - EmailMIME - EmailSender - FileSlurp - IOCompress - IPCRun - JSON - JSONAny - JSONXS - LWP - LWPProtocolHttps - NetAmazonS3 - NetPrometheus - NetStatsd - PadWalker - Readonly - SQLSplitStatement - SetScalar - Starman - SysHostnameLong - TermSizeAny - TestMore - TextDiff - TextTable - XMLSimple - nix - nix.perl-bindings - git - boehmgc - ]; - }; -in stdenv.mkDerivation rec { - pname = "hydra"; - version = "2020-02-06"; - - inherit stdenv; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = pname; - rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; - sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; +{ + # Package for phase-1 of the db migration for Hydra. + # https://github.com/NixOS/hydra/pull/711 + hydra-migration = callPackage ./common.nix { + version = "2020-02-10"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a"; + sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3"; + }; + nix = nixStable; + migration = true; }; - buildInputs = - [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt - guile # optional, for Guile + Guix support - perlDeps perl nix - postgresql # for running the tests - nlohmann_json - boost - ]; + # Hydra from latest master (or flakes) branch. Contains breaking changes, + # so when having an older version, `pkgs.hydra-migration` should be deployed first. - hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar - ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); + hydra-unstable = callPackage ./common.nix { + version = "2020-03-24"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "12cc46cdb36321acd4c982429a86eb0f8f3cc969"; + sha256 = "10ipxzdxr47c8w5jg69mbax2ykc7lb5fs9bbdd3iai9wzyfz17ln"; + }; + nix = nixUnstable; + }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - - NIX_CFLAGS_COMPILE = "-pthread"; - - shellHook = '' - PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH - PERL5LIB=$(pwd)/src/lib:$PERL5LIB; - ''; - - enableParallelBuilding = true; - - preCheck = '' - patchShebangs . - export LOGNAME=''${LOGNAME:-foo} - ''; - - postInstall = '' - mkdir -p $out/nix-support - for i in $out/bin/*; do - read -n 4 chars < $i - if [[ $chars =~ ELF ]]; then continue; fi - wrapProgram $i \ - --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ - --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name or "unknown"} - done - ''; # */ - - dontStrip = true; - - passthru.perlDeps = perlDeps; - - meta = with stdenv.lib; { - description = "Nix-based continuous build system"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + hydra-flakes = callPackage ./common.nix { + version = "2020-03-27"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "a7540b141d085a7e78c21fda8e8c05907c659b34"; + sha256 = "08fs7593w5zs8vh4c66gvrxk6s840pp6hj8nwf51wsa27kg5a943"; + }; + nix = nixFlakes; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0341fd97bc0b..bbd9acd37ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12249,7 +12249,8 @@ in hwloc = callPackage ../development/libraries/hwloc {}; - hydra = callPackage ../development/tools/misc/hydra { }; + inherit (callPackage ../development/tools/misc/hydra { }) + hydra-migration hydra-unstable hydra-flakes; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; From 7a7d7b1215201259bfbc57972cdef4b950deea47 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 28 Mar 2020 23:32:33 +0100 Subject: [PATCH 50/95] findomain: 1.4.2 -> 1.4.5 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index c78a6ad55267..d5e801a6f920 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.2"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x"; + sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb"; }; - cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx"; + cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From f8ccef5edb3ffb02dc4d2ed46b3428aef0847f76 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 28 Mar 2020 18:37:24 -0400 Subject: [PATCH 51/95] riot-desktop: fix StartupWMClass It seems the quoting breaks it just like in da587daae5feae652cd7ee6e8799ccd5021561a3 (cherry picked from commit e50bb280cbf5339ed671b0a7208e6aba4002c713) --- .../networking/instant-messengers/riot/riot-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 87342115e1e4..8218e0de9deb 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -70,7 +70,7 @@ in mkYarnPackage rec { comment = meta.description; categories = "Network;InstantMessaging;Chat;"; extraEntries = '' - StartupWMClass="riot" + StartupWMClass=riot ''; }; From de4b549f65ccb491abb8ca80fbe805806db2ae3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Mar 2020 14:54:31 +0000 Subject: [PATCH 52/95] xml2rfc: 2.37.3 -> 2.41.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index cf4eadd99d89..b2bd5af56c8c 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.37.3"; + version = "2.41.0"; src = fetchPypi { inherit pname version; - sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad"; + sha256 = "0xmhgn62a8a7282yd003zz63mrgyajb6sg29bfyllx3mxmdlb0iz"; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; - homepage = https://tools.ietf.org/tools/xml2rfc/trac/; + homepage = "https://tools.ietf.org/tools/xml2rfc/trac/"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; From 596b601dfa8e8412fbc6db7748f6e4fb359a7731 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 28 Mar 2020 01:49:20 +0000 Subject: [PATCH 53/95] plex-mpv-shim: v1.7.12 -> v1.7.14 --- pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 019d080f9739..df72e200e62a 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.7.12"; + version = "1.7.14"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "0l13g4vkvcd1q4lkdkbgv4hgkx5pql6ym2fap35581z7rzy9jhkq"; + sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; From 3c4ab13243b50d851510dc32c3f7e9605d6155bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Mar 2020 00:18:44 +0100 Subject: [PATCH 54/95] nixos/nginx: fix eval Fixes a typo introduced in https://github.com/NixOS/nixpkgs/pull/83611 --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index fd230a76499b..8d49dc66eb1a 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -176,7 +176,7 @@ let ${optionalString (cfg.httpConfig != "") '' http { - ${common.httpConfig} + ${commonHttpConfig} ${cfg.httpConfig} }''} From d5b7f97098a52ebc15769cdb2d55dfbfaa994480 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Mar 2020 00:23:47 +0000 Subject: [PATCH 55/95] python27Packages.globus-sdk: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 45ae5fe00ded..348c32174a25 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz"; + sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2"; }; checkPhase = '' From a15897c0cd5990f92da00c6dd3f5b9fb8ae948bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Mar 2020 02:58:28 +0000 Subject: [PATCH 56/95] python27Packages.qdarkstyle: 2.8 -> 2.8.1 --- pkgs/development/python-modules/qdarkstyle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index a1893c88e0e0..6b9b94b603f4 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475"; + sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"; }; # No tests available @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A dark stylesheet for Python and Qt applications"; - homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet; + homepage = "https://github.com/ColinDuquesnoy/QDarkStyleSheet"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; From df2984dbf9afab610c65a3ee4c4975d2a536260a Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Sun, 29 Mar 2020 00:15:41 +0100 Subject: [PATCH 57/95] wofi: fix hash mismatch between fetchurl and fetchpatch --- pkgs/applications/misc/wofi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 3c14219b141d..76cd044c6298 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49"; - sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh"; + sha256 = "1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb"; }) ]; From c2600f042421cc7ab40305e057d266e0cab23b08 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Sun, 29 Mar 2020 00:17:32 +0100 Subject: [PATCH 58/95] wofi: changed maintainer after @erictapen request --- pkgs/applications/misc/wofi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 76cd044c6298..37b991e6d476 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ elyhaka ]; platforms = with platforms; linux; }; } From 2ae5cf317f621265e6706f2764114d13d721ebfd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 29 Mar 2020 09:32:01 +1000 Subject: [PATCH 59/95] Revert "gitAndTools.gh: fix build on darwin" This reverts commit a51275f3b5f82fe3e45ff4536ee2994c9fc4029a. Not needed now that Security is propagated via go in https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9 --- .../version-management/git-and-tools/default.nix | 4 +--- .../version-management/git-and-tools/gh/default.nix | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a4b3ac1a65aa..8df8d96e6411 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,9 +30,7 @@ let diff-so-fancy = callPackage ./diff-so-fancy { }; - gh = callPackage ./gh { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gh = callPackage ./gh { }; ghq = callPackage ./ghq { }; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index e655813d3403..e74bd78fc59b 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec { pname = "gh"; @@ -20,7 +20,6 @@ buildGoModule rec { subPackages = [ "cmd/gh" ]; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' for shell in bash fish zsh; do $out/bin/gh completion -s $shell > gh.$shell @@ -28,7 +27,7 @@ buildGoModule rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; license = licenses.mit; From dc88e94ff1f4bf74759ed49c14cc0bae2e160c34 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Mar 2020 00:50:16 +0100 Subject: [PATCH 60/95] hydra-unstable: Fix eval with allowAliases = false * Catalyst::Plugin::Unicode::Encoding has been merged into Catalyst::Runtime * Test::More is apparently part of Perl core modules since 5.6.2 --- pkgs/development/tools/misc/hydra/common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 7310ee949721..983f144efb66 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -28,7 +28,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystPluginUnicodeEncoding + CatalystRuntime CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -61,7 +61,6 @@ let Starman SysHostnameLong TermSizeAny - TestMore TextDiff TextTable XMLSimple From 2c133fbb4ba6106b20a845037ef4a3453bc3a779 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Mar 2020 01:06:43 +0100 Subject: [PATCH 61/95] nixos/tests/mongodb: also test mongodb-3_4 --- nixos/tests/mongodb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index ee7fc50f7ecc..a637ec4bfc00 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes = { node = {...}: { environment.systemPackages = with pkgs; [ -# mongodb-3_4 + mongodb-3_4 mongodb-3_6 mongodb-4_0 ]; @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' node.start() '' -# + runMongoDBTest pkgs.mongodb-3_4 + + runMongoDBTest pkgs.mongodb-3_4 + runMongoDBTest pkgs.mongodb-3_6 + runMongoDBTest pkgs.mongodb-4_0 + '' From 4c931a821703b5fbfdbca931dbaa28390efc7070 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 28 Mar 2020 21:48:56 -0400 Subject: [PATCH 62/95] higan: fix darwin build --- pkgs/misc/emulators/higan/default.nix | 51 +++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index c1e64d26b476..63a7e1c43db3 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl -, p7zip, pkgconfig +, p7zip, pkgconfig, libicns , libX11, libXv , udev , libGLU, libGL, SDL +, Carbon, Cocoa, OpenGL, OpenAL , libao, openal, libpulseaudio , gtk2, gtksourceview , runtimeShell }: @@ -21,11 +22,24 @@ stdenv.mkDerivation rec { }; patches = [ ./0001-change-flags.diff ]; - postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp"; + postPatch = '' + sed '1i#include ' -i higan/fc/ppu/ppu.cpp + + for file in icarus/GNUmakefile higan/target-tomoko/GNUmakefile; do + substituteInPlace "$file" \ + --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \ + 'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png' + done + ''; + + nativeBuildInputs = [ p7zip pkgconfig ] + ++ optional stdenv.isDarwin [ libicns ]; buildInputs = - [ p7zip pkgconfig libX11 libXv udev libGLU libGL - SDL libao openal libpulseaudio gtk2 gtksourceview ]; + [ SDL libao ] + ++ optionals stdenv.isLinux [ openal libpulseaudio udev libX11 libXv libGLU libGL gtk2 gtksourceview ] + ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ] + ; unpackPhase = '' 7z x $src @@ -38,27 +52,36 @@ stdenv.mkDerivation rec { ''; # Now the cheats file will be distributed separately - installPhase = '' - install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps - install -m 755 icarus/out/icarus $out/bin/ - install -m 755 higan/out/higan $out/bin/ - install -m 644 higan/data/higan.desktop $out/share/applications/ - install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png - install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png + installPhase = (if !stdenv.isDarwin then '' + mkdir -p "$out"/bin "$out"/share/applications "$out"/share/pixmaps + install -m 755 icarus/out/icarus "$out"/bin/ + install -m 755 higan/out/higan "$out"/bin/ + install -m 644 higan/data/higan.desktop "$out"/share/applications/ + install -m 644 higan/data/higan.png "$out"/share/pixmaps/higan-icon.png + install -m 644 higan/resource/logo/higan.png "$out"/share/pixmaps/higan-logo.png + '' else '' + mkdir "$out" + mv higan/out/higan.app "$out"/ + mv icarus/out/icarus.app "$out"/ + '') + '' + mkdir -p "$out"/share/higan cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/systems/* $out/share/higan/ + higan/systems/* "$out"/share/higan/ ''; - fixupPhase = '' + fixupPhase = let + dest = if !stdenv.isDarwin then "\\$HOME/.local/share/higan" else "\\$HOME/Library/Application Support/higan"; + in '' # A dirty workaround, suggested by @cpages: # we create a first-run script to populate # the local $HOME with all the auxiliary # stuff needed by higan at runtime + mkdir -p "$out"/bin cat < $out/bin/higan-init.sh #!${runtimeShell} - cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ + cp --recursive --update $out/share/higan/*.sys "${dest}"/ EOF diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e469380abbd..0da667c85ef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26305,6 +26305,7 @@ in higan = callPackage ../misc/emulators/higan { inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; bullet = callPackage ../development/libraries/bullet { From 4c36e14386b2019371b2eb3075730ee0b0e81365 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Mar 2020 02:18:40 +0000 Subject: [PATCH 63/95] drawio: 12.6.5 -> 12.9.3 --- pkgs/applications/graphics/drawio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 2a7efea52713..dcf162771799 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.6.5"; + version = "12.9.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "14x4h680q3w9wsdmivy2k1bggb09vdm3a3wrpfwd79dbaagjk4lc"; + sha256 = "1jhw3p5r9dgn7320ca9n6hzyv2x557a8m9mh80vgrccd6i2mgm5i"; }; nativeBuildInputs = [ @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A desktop application for creating diagrams"; - homepage = https://about.draw.io/; + homepage = "https://about.draw.io/"; license = licenses.asl20; maintainers = with maintainers; [ danieldk ]; platforms = [ "x86_64-linux" ]; From 0ebeec9183b9d043a05e9816708b22c92284c0b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 29 Mar 2020 09:39:31 +0200 Subject: [PATCH 64/95] exiv2: name the patch as usual That allows automatic detection of CVEs being fixed (e.g. by vulnix) --- pkgs/development/libraries/exiv2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index d92f7ffc4fde..819f94cc44f5 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { }; patches = [ - # CVE-2019-20421 # included in next release (fetchpatch { + name = "cve-2019-20421.patch"; url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch"; sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc"; excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ]; From 30dc2309970c5aec7bde9093570137560502940c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 29 Mar 2020 10:22:55 +0000 Subject: [PATCH 65/95] avldrums-lv2: alias to x42-avldrums (#83665) Fixes #83649 --- .../audio/avldrums-lv2/default.nix | 29 ------------------- .../audio/x42-avldrums/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/audio/avldrums-lv2/default.nix diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix deleted file mode 100644 index d71718c32a82..000000000000 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }: - -stdenv.mkDerivation rec { - pname = "avldrums.lv2"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "x42"; - repo = pname; - rev = "v${version}"; - sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv"; - fetchSubmodules = true; - }; - - installFlags = [ "PREFIX=$(out)" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - pango cairo libGLU lv2 - ]; - - meta = with stdenv.lib; { - description = "Dedicated AVLDrumkits LV2 Plugin"; - homepage = http://x42-plugins.com/x42/x42-avldrums; - license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 5de51e23d731..b34062672f9a 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = https://x42-plugins.com/x42/x42-avldrums; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ magnetophon orivej ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c81a51ae4dad..88e7d4d9e844 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -46,6 +46,7 @@ mapAliases ({ asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 + avldrums-lv2 = x42-avldrums; # added 2020-03-29 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab765f45d8fb..8d6eb691acd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -718,8 +718,6 @@ in avfs = callPackage ../tools/filesystems/avfs { }; - avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { }; - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; From 036abcf58d1655d46a3f8a4209b9821754bbc1c4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 09:41:09 +0200 Subject: [PATCH 66/95] pythonPackages.py2to3: fix pname Applying parseDrvName results in incorrect name and version otherwise. https://github.com/NixOS/nixos-homepage/issues/306#issuecomment-531187598 --- pkgs/development/python-modules/3to2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 4e6c0f9214c2..123cf3f4741a 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "3to2"; + pname = "py3to2"; version = "1.1.1"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "3to2"; extension = "zip"; sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; }; From 782b304dba903ca82763b152e0727187628a32b0 Mon Sep 17 00:00:00 2001 From: Peter Kolloch Date: Sat, 28 Mar 2020 15:23:12 +0100 Subject: [PATCH 67/95] buildRustCrate: Add tests for checking files in outputs. ...and remove superfluous dependency files (*.d). ...and copy dSYM directories on Mac OS when in release=false mode. --- .../rust/build-rust-crate/install-crate.nix | 4 +- .../rust/build-rust-crate/lib.sh | 2 - .../rust/build-rust-crate/test/default.nix | 138 +++++++++++++++++- 3 files changed, 134 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix index 5ba7b69bedc5..f4a4dcdb0d94 100644 --- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix @@ -14,7 +14,7 @@ if !buildTests then '' fi if [[ "$(ls -A target/lib)" ]]; then mkdir -p $lib/lib - cp target/lib/* $lib/lib #*/ + cp -r target/lib/* $lib/lib #*/ for library in $lib/lib/*.so $lib/lib/*.dylib; do #*/ ln -s $library $(echo $library | sed -e "s/-${metadata}//") done @@ -26,7 +26,7 @@ if !buildTests then '' if [[ -d target/bin ]]; then if [[ "$(ls -A target/bin)" ]]; then mkdir -p $out/bin - cp -P target/bin/* $out/bin # */ + cp -rP target/bin/* $out/bin # */ fi fi runHook postInstall diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 6cf3481754b2..3bf1992cecd8 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -14,7 +14,6 @@ build_lib() { --crate-name $CRATE_NAME \ $lib_src \ --out-dir target/lib \ - --emit=dep-info,link \ -L dependency=target/deps \ --cap-lints allow \ $LIB_RUSTC_OPTS \ @@ -45,7 +44,6 @@ build_bin() { --crate-type bin \ $BIN_RUSTC_OPTS \ --out-dir target/bin \ - --emit=dep-info,link \ -L dependency=target/deps \ $LINK \ $EXTRA_LIB \ diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 598b5daed1be..fba938f62372 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1,13 +1,14 @@ { lib -, stdenv , buildRustCrate -, runCommand -, runCommandCC -, writeTextFile -, symlinkJoin , callPackage , releaseTools +, runCommand +, runCommandCC +, stdenv +, symlinkJoin +, writeTextFile }: + let mkCrate = args: let p = { @@ -103,6 +104,58 @@ let '' ); + /* Returns a derivation that asserts that the crate specified by `crateArgs` + has the specified files as output. + + `name` is used as part of the derivation name that performs the checking. + + `crateArgs` is passed to `mkCrate` to build the crate with `buildRustCrate`. + + `expectedFiles` contains a list of expected file paths in the output. E.g. + `[ "./bin/my_binary" ]`. + + `output` specifies the name of the output to use. By default, the default + output is used but e.g. `output = "lib";` will cause the lib output + to be checked instead. You do not need to specify any directories. + */ + assertOutputs = { name, crateArgs, expectedFiles, output? null }: + assert (builtins.isString name); + assert (builtins.isAttrs crateArgs); + assert (builtins.isList expectedFiles); + + let + crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); + crateOutput = if output == null then crate else crate."${output}"; + expectedFilesFile = writeTextFile { + name = "expected-files-${name}"; + text = + let sorted = builtins.sort (a: b: a$actualFiles + diff -q ${expectedFilesFile} $actualFiles >/dev/null || { + echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2 + echo === Got: + sed -e 's/^/ /' $actualFiles + echo === Expected: + sed -e 's/^/ /' ${expectedFilesFile} + echo === Diff: + diff -u ${expectedFilesFile} $actualFiles |\ + tail -n +3 |\ + sed -e 's/^/ /' + exit 1 + } + touch $out + '' + ; + in rec { tests = let @@ -361,7 +414,80 @@ let }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); - in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { + tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases; + in tests // rec { + + crateBinWithPathOutputs = assertOutputs { + name="crateBinWithPath"; + crateArgs = { + crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; + src = mkBin "src/foobar.rs"; + }; + expectedFiles = [ + "./bin/test_binary1" + ]; + }; + + crateBinWithPathOutputsDebug = assertOutputs { + name="crateBinWithPath"; + crateArgs = { + release = false; + crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; + src = mkBin "src/foobar.rs"; + }; + expectedFiles = [ + "./bin/test_binary1" + ] ++ lib.optionals stdenv.isDarwin [ + # On Darwin, the debug symbols are in a seperate directory. + "./bin/test_binary1.dSYM/Contents/Info.plist" + "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" + ]; + }; + + crateBinNoPath1Outputs = assertOutputs { + name="crateBinNoPath1"; + crateArgs = { + crateBin = [{ name = "my-binary2"; }]; + src = mkBin "src/my_binary2.rs"; + }; + expectedFiles = [ + "./bin/my-binary2" + ]; + }; + + crateLibOutputs = assertOutputs { + name="crateLib"; + output="lib"; + crateArgs = { + libName = "test_lib"; + type = [ "rlib" ]; + libPath = "src/lib.rs"; + src = mkLib "src/lib.rs"; + }; + expectedFiles = [ + "./nix-support/propagated-build-inputs" + "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/link" + ]; + }; + + crateLibOutputsDebug = assertOutputs { + name="crateLib"; + output="lib"; + crateArgs = { + release = false; + libName = "test_lib"; + type = [ "rlib" ]; + libPath = "src/lib.rs"; + src = mkLib "src/lib.rs"; + }; + expectedFiles = [ + "./nix-support/propagated-build-inputs" + "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/link" + ]; + }; + brotliTest = let pkg = brotliCrates.brotli_2_5_0 {}; in runCommand "run-brotli-test-cmd" { From 76d2557df8ae14014d0e600dec4d068bbea10133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 05:57:57 +0000 Subject: [PATCH 68/95] amp: fix strict deps build --- pkgs/applications/editors/amp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 625a5d3c0abe..9be6d56ab345 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin + nativeBuildInputs = [ cmake pkgconfig python3 ]; + buildInputs = [ openssl xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); # Tests need to write to the theme directory in HOME. From 49787b63b940d3385781af4d28b61b7ae2c98049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 06:02:57 +0000 Subject: [PATCH 69/95] cargo-update: fix strict deps build --- pkgs/tools/package-management/cargo-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index c0a1e8edc0f4..8dc07d287d2d 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ]; cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libgit2 libssh2 openssl zlib ] ++ stdenv.lib.optional stdenv.isDarwin curl; meta = with stdenv.lib; { From 22fe76d27db30c0a6017395ef0370d94272da02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:18:32 +0000 Subject: [PATCH 70/95] fluxus: fix hash definition error: unknown hash algorithm '', at /home/s1691654/git/nixpkgs/pkgs/build-support/fetchurl/default. (use '--show-trace' to show detailed location information) --- pkgs/applications/graphics/fluxus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index a80940711013..e31b5fae9c4d 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "nebogeo"; repo = "fluxus"; rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400"; - hash = "sha256:0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28"; + sha256 = "0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28"; }; buildInputs = [ From 649eecd6319b53b213edf92c1f2785f1db89c3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:22:38 +0000 Subject: [PATCH 71/95] httplz: fix strict deps build --- pkgs/tools/networking/httplz/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 5d59010ac1ef..c4f003f884fc 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -12,10 +12,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - openssl pkgconfig - ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; From 0322dc52b8c3c010bd63876de38be0941be56349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:24:48 +0000 Subject: [PATCH 72/95] hydra-cli: fix strict deps build --- pkgs/development/tools/misc/hydra-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 5cdd9b0ce1d6..b585d27b710f 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za"; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig - openssl ]; meta = with stdenv.lib; { From 8ccfa1e21202bed829a1388b3165d83f7ab17bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:30:16 +0000 Subject: [PATCH 73/95] gnome-podcasts: fix strict deps build --- pkgs/applications/audio/gnome-podcasts/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 47945de78330..261750859940 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { rustc python3 wrapGAppsHook + glib ]; buildInputs = [ From 2e74a9b1bf89bb9fc9d61ce120b4570650853f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:33:20 +0000 Subject: [PATCH 74/95] vdirsyncer: fix strict deps build --- pkgs/tools/misc/vdirsyncer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 52eec555b165..3ee7787a8a45 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; propagatedBuildInputs = with python3Packages; [ From 5a1bffc7eb9a18940789452e26ecf63ddd1a997a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:35:07 +0000 Subject: [PATCH 75/95] fractal: fix strict deps build --- .../networking/instant-messengers/fractal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 896ca4f38a61..47153779e403 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { python3 rustc wrapGAppsHook + glib ]; buildInputs = [ @@ -84,4 +85,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } - From 756a16e733231c8a0bad5285d3180c8524e0ca78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:45:34 +0000 Subject: [PATCH 76/95] panopticon: fix strict deps build --- pkgs/development/tools/analysis/panopticon/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 85fd8c93529e..e2c174783d4b 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec { qtsvg qtquickcontrols2 qtgraphicaleffects - pkgconfig git ]; From 0c3759abdf2119c574c6dd614c8fe5465081d0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:52:53 +0000 Subject: [PATCH 77/95] parallel-rust: remove - package has no maintainer - upstream is dead - build is broken --- pkgs/tools/misc/parallel-rust/default.nix | 25 ------------------- .../fix_cargo_lock_version.patch | 12 --------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 39 deletions(-) delete mode 100644 pkgs/tools/misc/parallel-rust/default.nix delete mode 100644 pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix deleted file mode 100644 index 213e8c8e378a..000000000000 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "parallel-rust"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "mmstick"; - repo = "parallel"; - rev = version; - sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; - }; - - cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n"; - - patches = [ ./fix_cargo_lock_version.patch ]; - - meta = with stdenv.lib; { - description = "A command-line CPU load balancer written in Rust"; - homepage = https://github.com/mmstick/parallel; - license = licenses.mit; - maintainers = []; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch deleted file mode 100644 index 75a1ba35e129..000000000000 --- a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index c01308d..dba3927 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,6 +1,6 @@ - [root] - name = "parallel" --version = "0.11.2" -+version = "0.11.3" - dependencies = [ - "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab765f45d8fb..0e50b0f1b56c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2095,8 +2095,6 @@ in precice = callPackage ../development/libraries/precice { }; - parallel-rust = callPackage ../tools/misc/parallel-rust { }; - pueue = callPackage ../applications/misc/pueue { }; pixiecore = callPackage ../tools/networking/pixiecore {}; From 432442eb8c983211d49fd96cd90d966f48a425a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:57:24 +0000 Subject: [PATCH 78/95] parinfer-rust: fix strict deps build --- pkgs/development/tools/parinfer-rust/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index a313683f2ae5..d016d21b738c 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl"; - buildInputs = [ llvmPackages.libclang llvmPackages.clang ]; + nativeBuildInputs = [ llvmPackages.clang ]; + buildInputs = [ llvmPackages.libclang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; postInstall = '' From e841dce44a2a3e02446b6d6c062cbf1c9f1cf8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 07:59:33 +0000 Subject: [PATCH 79/95] rink: fix strict deps build --- pkgs/applications/science/misc/rink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 1bb74ec17a34..839fc8f95463 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0shlh0m9k0iqxpv9zmiw7a6v197swrvpz9x6qzhximzkdwni9gz9"; - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ openssl gmp ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl gmp ncurses ]; # Some tests fail and/or attempt to use internet servers. doCheck = false; From dbd8e0e162f3c63847fc9cb1fdc69cb675598ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 08:02:25 +0000 Subject: [PATCH 80/95] ripasso-cursive: fix strict deps build --- pkgs/tools/security/ripasso/cursive.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 70c4ee864b64..c8a55d3f397f 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -16,9 +16,9 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gpgme python3 ]; buildInputs = [ - ncurses python3 openssl libgpgerror gpgme xorg.libxcb + ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' From 8f95431dac46c5971b71e15ff49340b6f3af0367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 08:03:21 +0000 Subject: [PATCH 81/95] newsboat: fix strict deps build --- .../networking/feedreaders/newsboat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 15328c56d27b..5b97859304cb 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig asciidoctor - ] - ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; + gettext + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; - buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ] + buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] ++ stdenv.lib.optional stdenv.isDarwin Security; postBuild = '' From b6841031910e0e6d24ff2092c392b2f4bbe25f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 08:05:21 +0000 Subject: [PATCH 82/95] tensorman: fix strict deps build --- pkgs/tools/misc/tensorman/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index eca80cbcadf3..85091a41b126 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with stdenv.lib; { From 965dc7bb2471aa3f6d4a8343cd39b9075fc29152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 08:07:29 +0000 Subject: [PATCH 83/95] uutils-coreutils: fix strict deps build --- pkgs/tools/misc/uutils-coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 9c58785e84ea..09c29a0af1fb 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage { [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ cmake cargo sphinx ]; + buildInputs = lib.optional stdenv.isDarwin Security; # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults buildPhase = ""; From e1bea9e8b131e6830c2bd929f10873660bb169ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 08:18:27 +0000 Subject: [PATCH 84/95] vector: fix strict deps build --- pkgs/tools/misc/vector/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 17e764698d52..c441242885e6 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; - buildInputs = [ openssl pkg-config protobuf rdkafka ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library From 5f092581142897341630b43be30dbdc6a02b0b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Mar 2020 08:23:57 +0000 Subject: [PATCH 85/95] sequoia: fix strict deps build --- pkgs/tools/security/sequoia/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index fe0b13bbb973..d1a24f49d802 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.libclang llvmPackages.clang ensureNewerSourcesForZipFilesHook + capnproto ] ++ lib.optionals pythonSupport [ pythonPackages.setuptools ] ; @@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - capnproto - ] - ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] ; From 5b6dbb5e18efde69e375752ec5d13cb9bf2f3cf2 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 29 Mar 2020 12:41:34 +0200 Subject: [PATCH 86/95] kitty: 0.17.1 -> 0.17.2 https://github.com/kovidgoyal/kitty/releases/tag/v0.17.2 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 6860f04f99c1..9269add3173b 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.1"; + version = "0.17.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f"; + sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq"; }; buildInputs = [ From 264365247f397fe9740be311fc2da46b9d996b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 Mar 2020 22:14:41 -0300 Subject: [PATCH 87/95] iconpack-jade: init at 1.22 --- pkgs/data/icons/iconpack-jade/default.nix | 38 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/icons/iconpack-jade/default.nix diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix new file mode 100644 index 000000000000..1b42c1af6125 --- /dev/null +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "iconpack-jade"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = pname; + rev = "v${version}"; + sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x"; + }; + + nativeBuildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out/share/icons + cp -a Jade* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Icon pack based upon Faenza and Mint-X"; + homepage = "https://github.com/madmaxms/iconpack-jade"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d6eb691acd0..f5691c4a7a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17803,6 +17803,8 @@ in ibm-plex = callPackage ../data/fonts/ibm-plex { }; + iconpack-jade = callPackage ../data/icons/iconpack-jade { }; + iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; inconsolata = callPackage ../data/fonts/inconsolata {}; From d4152d0205529b8fac619020c7ea2a2fec4ab81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 6 Mar 2020 17:59:43 +0100 Subject: [PATCH 88/95] cargo-asm: 0.1.17 -> 2019-12-24 cargo-asm hasn't seen any new releases since 2018 (and even then it was spotty). But there have been improvements since then, so switch to dated releases that use a working git commit. --- pkgs/development/tools/rust/cargo-asm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 9d2279fe5982..7c1361f6d270 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-asm"; - version = "0.1.17"; + version = "2019-12-24"; src = fetchFromGitHub { owner = "gnzlbg"; repo = "cargo-asm"; - rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145"; - sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws"; + rev = "577f890ebd4a09c8265710261e976fe7bfce8668"; + sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb"; }; - cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb"; + cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 2346014aae514debb0b7d252a55d85b1331254fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 4 Mar 2020 19:33:35 +0100 Subject: [PATCH 89/95] bgpq3: init at 0.1.35 --- pkgs/tools/networking/bgpq3/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/bgpq3/default.nix diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/tools/networking/bgpq3/default.nix new file mode 100644 index 000000000000..e3d2218b0c97 --- /dev/null +++ b/pkgs/tools/networking/bgpq3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "bgpq3"; + version = "0.1.35"; + + src = fetchFromGitHub { + owner = "snar"; + repo = pname; + rev = "v${version}"; + sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj"; + }; + + # Fix binary install location. Remove with next upstream release. + preInstall = "mkdir -p $out/bin"; + + meta = with stdenv.lib; { + description = "bgp filtering automation tool"; + homepage = "https://github.com/snar/bgpq3"; + license = licenses.bsd2; + maintainers = with maintainers; [ b4dm4n ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5691c4a7a9f..5b40f018f6cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18582,6 +18582,8 @@ in bgpdump = callPackage ../tools/networking/bgpdump { }; + bgpq3 = callPackage ../tools/networking/bgpq3 { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; From f77e60466ff3e28b256c43a96d96cd465b15638d Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Tue, 25 Feb 2020 13:13:00 -0500 Subject: [PATCH 90/95] pythonPackages.fipy: 3.3 -> 3.4.1 --- pkgs/development/python-modules/fipy/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 7fbf14cf7de0..76fda47c6a94 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -14,6 +14,8 @@ , gmsh , python , stdenv +, openssh +, fetchurl }: let @@ -21,12 +23,11 @@ let in buildPythonPackage rec { pname = "fipy"; - version = "3.3"; + version = "3.4.1"; - src = fetchPypi { - pname = "FiPy"; - inherit version; - sha256 = "11agpg3d6yrns8igkpml1mxy3mkqkjq2yrw1mw12y07dkk12ii19"; + src = fetchurl { + url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz"; + sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk"; }; propagatedBuildInputs = [ @@ -38,11 +39,13 @@ in mpi4py future scikit-fmm + openssh ] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs; checkInputs = not_darwin_inputs; checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules ''; From 773c84d944ea27f4eee0e322425db5bb3ff8af91 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Tue, 25 Feb 2020 13:39:13 -0500 Subject: [PATCH 91/95] pythonPackages.sfepy: 2019.2 -> 2019.4 - Bump the version number to fix incompatibility with Numpy 1.18.1 - Remove broken test to fix incompatibility with Numpy 1.18.1 --- pkgs/development/python-modules/sfepy/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 36f4f82cb3fe..6a7bb38a74d1 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { name = "sfepy_${version}"; - version = "2019.2"; + version = "2019.4"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj"; + sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { postPatch = '' # broken test rm tests/test_homogenization_perfusion.py + rm tests/test_splinebox.py # slow tests rm tests/test_input_*.py From 95e15a991ac93dafc9b4ac620086013c815bdcbd Mon Sep 17 00:00:00 2001 From: Rakesh Gupta Date: Tue, 24 Mar 2020 09:41:58 +0530 Subject: [PATCH 92/95] pythonPackages.variants: init at 0.2.0 --- .../python-modules/variants/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/variants/default.nix diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix new file mode 100644 index 000000000000..af2224e3536e --- /dev/null +++ b/pkgs/development/python-modules/variants/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, fetchPypi +, pytestrunner +, setuptools_scm +, pytest +, lib +}: +buildPythonPackage rec { + pname = "variants"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version ; + sha256 = "511f75b4cf7483c27e4d86d9accf2b5317267900c166d17636beeed118929b90"; + }; + + nativeBuildInputs = [ + pytestrunner + setuptools_scm + ]; + + checkInputs = [ + pytest + ]; + + meta = with lib; { + description = "Library providing syntactic sugar for creating variant forms of a canonical function"; + homepage = "https://github.com/python-variants/variants"; + license = licenses.asl20; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b467ac523888..08f9904e5483 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5839,6 +5839,8 @@ in { user-agents = callPackage ../development/python-modules/user-agents { }; + variants = callPackage ../development/python-modules/variants { }; + verboselogs = callPackage ../development/python-modules/verboselogs { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; From 439f0839316e87c8e2d44cdca1d9e3ffa6760e38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Mar 2020 11:08:29 +0000 Subject: [PATCH 93/95] bindfs: 1.14.3 -> 1.14.4 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 834aa7290abc..f13439482db4 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.3"; + version = "1.14.4"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw"; + sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; }; dontStrip = true; From d2702c915fce87a14db944e85105f958a0b49e2c Mon Sep 17 00:00:00 2001 From: Guanpeng Xu Date: Sun, 29 Mar 2020 20:03:53 +0800 Subject: [PATCH 94/95] mathematica: 12.0.0 -> 12.1.0 --- pkgs/applications/science/math/mathematica/default.nix | 7 +++++-- pkgs/applications/science/math/mathematica/l10ns.nix | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 7cd1b2eb99fa..5553bb0505fa 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -9,6 +9,7 @@ , freetype , gcc , glib +, libssh2 , ncurses , opencv , openssl @@ -44,9 +45,11 @@ stdenv.mkDerivation rec { gcc.cc gcc.libc glib + libssh2 ncurses opencv openssl + stdenv.cc.cc.lib unixODBC xkeyboard_config libxml2 @@ -93,7 +96,7 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/Mathematica/Executables for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path + sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}\n" $path done # Fix xkeyboard config path for Qt @@ -102,7 +105,7 @@ stdenv.mkDerivation rec { done # Remove some broken libraries - rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* + rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* ''; preFixup = '' diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 51fb489be7ec..c75c91be059c 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -7,6 +7,12 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "12.1.0"; + lang = "en"; + language = "English"; + sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7"; + } { version = "12.0.0"; lang = "en"; From cfb435732a6360a75b93dd9718d5b86ae6bf9f8c Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 29 Mar 2020 13:21:25 +0200 Subject: [PATCH 95/95] pythonPackages.ftputil: fix build Some tests assume execution before 2020. --- pkgs/development/python-modules/ftputil/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index d3d338a2c8d3..5e367644a1c8 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -13,10 +13,11 @@ buildPythonPackage rec { checkPhase = '' touch Makefile - # Disable tests that require network access or access /home + # Disable tests that require network access or access /home or assume execution before year 2020 py.test test \ -k "not test_public_servers and not test_real_ftp \ - and not test_set_parser and not test_repr" + and not test_set_parser and not test_repr \ + and not test_conditional_upload and not test_conditional_download_with_older_target" ''; meta = with lib; {