From 19afb22dd85f6e112fca58dba6ba832e97558591 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Sun, 5 Apr 2020 15:17:59 +0200 Subject: [PATCH 01/52] clj-kondo: 2020.03.20 -> 2020.04.05 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 163bfeb688a1..19b704e6b5fc 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ pname = "clj-kondo"; - version = "2020.03.20"; + version = "2020.04.05"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "05z80cdzk8aw3j0nxfynzwpb9hhpbl54bbrv18dpqj5dj893mbgm"; + sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187"; }; dontUnpack = true; From 94c416ccf428fb90be6539aa99d93f7776376e51 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 10 Apr 2020 23:47:13 +0300 Subject: [PATCH 02/52] gjo: init at 1.0.2 --- pkgs/tools/text/gjo/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/gjo/default.nix diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix new file mode 100644 index 000000000000..fd9a150feee7 --- /dev/null +++ b/pkgs/tools/text/gjo/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gjo"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "skanehira"; + repo = "gjo"; + rev = version; + sha256 = "1m5nkv42ri150fgj590nrl24wp90p7ygg9xdh9zblibmnqrvbz4z"; + }; + + doCheck = true; + + modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with stdenv.lib; { + description = "Small utility to create JSON objects"; + homepage = "https://github.com/skanehira/gjo"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 836e668e9ec5..6127824e64cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -940,6 +940,8 @@ in gjs = callPackage ../development/libraries/gjs { }; + gjo = callPackage ../tools/text/gjo { }; + glances = python3Packages.callPackage ../applications/system/glances { }; glasgow = with python3Packages; toPythonApplication glasgow; From 824d041cf5fa08dca6dad854473e6515d50f3422 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:43:34 +0200 Subject: [PATCH 03/52] ocamlPackages.ppx_cstruct: propagate dependencies Without propagation some builds of packages requiring ppx_cstruct would fail. --- pkgs/development/ocaml-modules/cstruct/ppx.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index b5c39533e733..22fe4ac47cf3 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -10,6 +10,5 @@ buildDunePackage { minimumOCamlVersion = "4.03"; - buildInputs = [ sexplib ppx_tools_versioned ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ]; } From 4bf689b3e082aca5e17d6bc71a7c3b9430bc41e7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:44:58 +0200 Subject: [PATCH 04/52] ocamlPackages.x509: 0.7.1 -> 0.11.0 This update contains the switch from nocrypto to mirage-crypto --- .../ocaml-modules/x509/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 22006d0693a5..d30b23aa3ee3 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,21 +1,26 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage , alcotest, cstruct-unix -, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult +, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk +, logs, base64 }: buildDunePackage rec { + minimumOCamlVersion = "4.07"; + pname = "x509"; - version = "0.7.1"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w"; + sha256 = "0gcs3vpmixxxx2q4b2iphb1xw1jffya1wkp0p1xbmsfcghzrj20m"; }; - buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ]; + useDune2 = true; - doCheck = lib.versionAtLeast ocaml.version "4.06"; + buildInputs = [ alcotest cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult logs base64 ]; + + doCheck = true; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-x509"; From 99ac3ce2bf071a21ed883e13c9fe7dd9c324e9e8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:45:56 +0200 Subject: [PATCH 05/52] ocamlPackages.tls: 0.10.4 -> 0.11.1 This update contains a switch to the dune build system as well as a switch from nocrypto to mirage-crypto. --- .../development/ocaml-modules/tls/default.nix | 44 +++++++------------ pkgs/top-level/ocaml-packages.nix | 4 +- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 9343ae5b1ecf..e425e2a3b7e4 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,38 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit -, lwt ? null}: +{ stdenv, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct +, cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng +, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime }: -with stdenv.lib; +buildDunePackage rec { + minimumOCamlVersion = "4.07"; -let withLwt = lwt != null; in + version = "0.11.1"; + pname = "tls"; -if !versionAtLeast ocaml.version "4.04" -then throw "tls is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.10.4"; - name = "ocaml${ocaml.version}-tls-${version}"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-tls"; - rev = version; - sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; + src = fetchurl { + url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; + sha256 = "0ms13fbaxgmpbviazlfa4hb7nmi7s22nklc7ns926b0rr1aq1069"; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib topkg ppx_sexp_conv ppx_cstruct ] - ++ optionals doCheck [ ounit cstruct-unix ]; - propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ - optional withLwt lwt; + useDune2 = true; - buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}"; + doCheck = true; + buildInputs = [ cstruct-unix ounit2 ]; - doCheck = versionAtLeast ocaml.version "4.06"; - checkPhase = "${topkg.run} test"; - - inherit (topkg) installPhase; + propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp + sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng + x509 domain-name fmt ocaml_lwt ptime ]; meta = with stdenv.lib; { homepage = "https://github.com/mirleft/ocaml-tls"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b976d36c7309..56ba2ff800ea 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -765,9 +765,7 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; - tls = callPackage ../development/ocaml-modules/tls { - lwt = ocaml_lwt; - }; + tls = callPackage ../development/ocaml-modules/tls { }; type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; From b5770e34ffb9a8b0b0b03b8658cf45192be78fc7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:56:06 +0200 Subject: [PATCH 06/52] ocamlPackages.otr: 0.3.6 -> 0.3.8 Contains switch from nocrypto to mirage-crypto --- .../development/ocaml-modules/otr/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index 866360856d8f..cec5d2ee0d07 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage -, cstruct, sexplib0, rresult, nocrypto, astring +{ lib, fetchurl, buildDunePackage +, cstruct, sexplib0, rresult, mirage-crypto, mirage-crypto-pk, astring, base64 +, mirage-crypto-rng }: buildDunePackage rec { pname = "otr"; - version = "0.3.6"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "hannesm"; - repo = "ocaml-otr"; - rev = version; - sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5"; + src = fetchurl { + url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; + sha256 = "18hn9l8wznqnlh2jf1hpnp36f1cx80ncwiiivsbj34llhgp3893d"; }; - propagatedBuildInputs = [ cstruct sexplib0 rresult nocrypto astring ]; + useDune2 = true; + + propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk + astring rresult base64 ]; doCheck = true; + checkInputs = [ mirage-crypto-rng ]; + meta = with lib; { homepage = "https://github.com/hannesm/ocaml-otr"; description = "Off-the-record messaging protocol, purely in OCaml"; From 081441122a351ce7b9a33b9a9908d9e9ba3d020c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:56:29 +0200 Subject: [PATCH 07/52] jackline: 2019-08-08 -> 2020-03-22 --- .../instant-messengers/jackline/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index b3fc9d105151..92857aa1a667 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchFromGitHub, ocamlPackages }: -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "2019-08-08"; + version = "unstable-2020-03-22"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "b934594010a563ded9c0f436e3fab8f1cae29856"; - sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc"; + rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa"; + sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c"; }; buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv - erm_xmpp tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib hex uutf + ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving + erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name + ocaml_lwt otr astring ptime mtime notty sexplib hex uutf + dns-client base64 ]; buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; @@ -25,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/hannesm/jackline"; - description = "Terminal-based XMPP client in OCaml"; + description = "minimalistic secure XMPP client in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; }; From a6f776bba5cae2ba7f357f689223f27b0a820450 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 16 Apr 2020 15:44:39 -0700 Subject: [PATCH 08/52] bs-platform: 7.2.0 -> 7.3.1 --- pkgs/development/compilers/bs-platform/build-bs-platform.nix | 2 +- pkgs/development/compilers/bs-platform/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index d7d0fe0b12be..71ba415d6202 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out - mkdir $out/lib/ocaml + mkdir -p $out/lib/ocaml cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 14347da98b83..ee4123a23c13 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -4,14 +4,14 @@ let in (build-bs-platform rec { inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "7.2.0"; + version = "7.3.1"; ocaml-version = "4.06.1"; src = fetchFromGitHub { owner = "BuckleScript"; repo = "bucklescript"; rev = version; - sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4"; + sha256 = "14vp6cl5ml7xb3pd0paqajb50qv62l8j5m8hi3b6fh0pm68j1yxd"; fetchSubmodules = true; }; }).overrideAttrs (attrs: { From 72e932d443d9e9b2d77dc68ad08047d826a3d217 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:20:00 -0500 Subject: [PATCH 09/52] chezmoi: 1.7.18 -> 1.8.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index beb7c41f906b..c42e8cacc73e 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.18"; + version = "1.8.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc"; + sha256 = "1ww8xcf57csazj3q2569irxg5il29jrx43mq5cif8dvn8xjm00nn"; }; - modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; + modSha256 = "1zmvav19nyqv6yp71mk3lx6szc5vwyf81m8kvcjj9rlzlygmcl8g"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" From b06164281c9fba70163d55e2f931ed7851f3f552 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 20 Apr 2020 10:36:37 +0100 Subject: [PATCH 10/52] citrix_workspace: add 2004 --- .../remote/citrix-workspace/default.nix | 15 +++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index 0936f4e75521..a62b1bf5ee15 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -24,7 +24,7 @@ , gtk_engines , alsaLib , zlib -, version ? "19.12.0" +, version ? "20.04.0" }: let @@ -71,7 +71,18 @@ let x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; x64suffix = "19"; x86suffix = "19"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; + }; + + "20.04.0" = { + major = "20"; + minor = "04"; + patch = "0"; + x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; + x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; + x64suffix = "21"; + x86suffix = "21"; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 562d27462c03..ab65febc1bfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2462,6 +2462,7 @@ in circus = callPackage ../tools/networking/circus { }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_20_04_0 = citrix_workspace_unwrapped.override { version = "20.04.0"; }; citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; From ba774d4179bafda699a145fb7e348b91816e2e4d Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Mon, 20 Apr 2020 16:59:16 +0200 Subject: [PATCH 11/52] vscode, vscodium: 1.44.1 -> 1.44.2 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d9a942328a3d..371adc36789a 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "15jg39hmlnicq0zrz77yar1bmn5y6gp2670dya2qm5klhva9hd0f"; - x86_64-darwin = "1ghqhn46jpbj3is8q5zcj0biyc7gwinhiz3qdpcnf88ga2blcsz8"; + x86_64-linux = "1n083pzp2dsz6z6rcl1ldcwhd4i03sjigdfslfardhc4v5lbvmv8"; + x86_64-darwin = "1qk3gscyskf4fwc8i09afr3wsyd1lwwycx6rf02wwh4n9py50b20"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.1"; + version = "1.44.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 63e6cc920bf3..fe96223b65f4 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "16qwhnxpwarnwvlxwvy13g687g1cnfzysq16qkykkhqig0cnalmb"; - x86_64-darwin = "1p9qkbj59bfc0kn9fzg99gqxbzwxq297qxivxcjflsapd712s4vm"; + x86_64-linux = "141hwj1a2bsgzpfk354dnnmg4ak00fss3xsgqplyk949pbk6v1af"; + x86_64-darwin = "0fi8nz1gayzw5dp6d3m7jsmij3jj4yjg5rk1s9w6falpgka76dm1"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.1"; + version = "1.44.2"; pname = "vscodium"; executableName = "codium"; From 015f46beba0d753572f617951a295fa134d7a6f5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 13:53:29 -0500 Subject: [PATCH 12/52] numpy: set lapack,blas library names correctly --- pkgs/development/python-modules/numpy/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 949d5e5898b3..7009d1d1cd03 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -21,9 +21,7 @@ let ${blas.implementation} = { include_dirs = "${blas}/include:${lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; - } // lib.optionalAttrs (blas.implementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; + libraries = "lapack,lapacke,blas,cblas"; }; }); }; From 382247d133351767588bfda094c1d77cbe26ab04 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 20 Apr 2020 20:54:49 +0200 Subject: [PATCH 13/52] dwm-status: 1.6.3 -> 1.6.4 --- pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 01887b3bcf16..568258ee2c40 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n"; + sha256 = "05dhd2gy7ysrnchdimrdd7jvzs1db9fyrk4ci7850jhrgavfd7c4"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i"; + cargoSha256 = "0zkbps8vsjcvy7x0sgb07kacszi57dlyq8j6ia6yy0jyqnvlaqa7"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" From 3c9c894f836fffa07a8d269f6394bdf2cbfdc940 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:46:45 -0500 Subject: [PATCH 14/52] =?UTF-8?q?blas,lapack:=20don=E2=80=99t=20patchelf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have some unused RPATHs we don’t want shrunk. These are used in MKL to dlopen based on architecture. --- pkgs/build-support/alternatives/blas/default.nix | 2 ++ pkgs/build-support/alternatives/lapack/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 36708ce8841a..bce0c7af2bc1 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation { dontConfigure = true; unpackPhase = "src=$PWD"; + dontPatchELF = true; + installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 24c339042a2f..75dc2ae3b343 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation { dontConfigure = true; unpackPhase = "src=$PWD"; + dontPatchELF = true; + installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig From f86d582ea7cdf9c969f2294d9dc953f36f2a63e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:49:56 -0500 Subject: [PATCH 15/52] doc/overlays.xml: add information on BLAS/LAPACK switching --- doc/using/overlays.xml | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index 26a888368abf..7732e0ac2179 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -137,4 +137,80 @@ self: super: Overlays are similar to other methods for customizing Nixpkgs, in particular the packageOverrides attribute described in . Indeed, packageOverrides acts as an overlay with only the super argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. +
+ Using overlays to configure alternatives + + Certain software has different implementations of the same + interface. Other distributions have functionality to switch + between these. For example, Debian provides DebianAlternatives. + Nixpkgs has what we call alternatives, which + are configured through overlays. + +
+ BLAS/LAPACK + + In Nixpkgs, we have multiple implementations of the BLAS/LAPACK + numerical linear algebra interfaces. They are: + + + + + OpenBLAS + + + The Nixpkgs attribute is openblas for + ILP64 and openblasCompat for LP64. This + is the default. + + + + + LAPACK + reference (also provides BLAS) + + + The Nixpkgs attribute is lapack-reference. + + + + + Intel + MKL (only works on x86 architecture) + + + The Nixpkgs attribute is mkl. + + + + + Introduced in PR + #83888, we are able to override the ‘blas’ and ‘lapack’ + packages to use different implementations, through the + ‘blasProvider’ and ‘lapackProvider’ argument. This can be used + to select a different provider. For example, an overlay can be + created that looks like: + + +self: super: + +{ + blas = super.blas.override { + blasProvider = self.mkl; + } + lapack = super.lapack.override { + lapackProvider = self.mkl; + } +} + + + This overlay uses Intel’s MKL library for both BLAS and LAPACK + interfaces. Note that the same can be accomplished at runtime + using LD_PRELOAD of libblas.so.3 and + liblapack.so.3. + +
+
From ff2f2644f8ea1b364dde5dfee2bc76027afccaf9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:50:55 -0500 Subject: [PATCH 16/52] blas,lapack: use isILP64 instead of is64bit This is a better name since we have multiple 64-bit things that could be referred to. LP64 : integer=32, long=64, pointer=64 ILP64 : integer=64, long=64, pointer=64 --- .../science/chemistry/octopus/default.nix | 2 +- .../science/machine-learning/shogun/default.nix | 2 +- pkgs/applications/science/math/R/default.nix | 2 +- pkgs/applications/science/math/giac/default.nix | 2 +- pkgs/applications/science/math/gmsh/default.nix | 2 +- pkgs/applications/science/math/sage/sage-env.nix | 2 +- .../applications/science/math/sage/sage-with-env.nix | 2 +- pkgs/applications/science/math/sage/sagelib.nix | 2 +- pkgs/build-support/alternatives/blas/default.nix | 12 ++++++------ pkgs/build-support/alternatives/lapack/default.nix | 10 +++++----- pkgs/development/compilers/julia/1.3.nix | 4 ++-- pkgs/development/compilers/julia/shared.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 6 +++--- pkgs/development/libraries/fflas-ffpack/default.nix | 2 +- pkgs/development/libraries/linbox/default.nix | 2 +- pkgs/development/libraries/qrupdate/default.nix | 2 +- .../libraries/science/math/arpack/default.nix | 2 +- .../libraries/science/math/ipopt/default.nix | 2 +- .../libraries/science/math/scalapack/default.nix | 2 +- .../libraries/science/math/scs/default.nix | 2 +- .../libraries/science/math/suitesparse/4.2.nix | 2 +- .../libraries/science/math/suitesparse/4.4.nix | 2 +- .../libraries/science/math/suitesparse/default.nix | 2 +- .../libraries/science/math/superlu/default.nix | 2 +- pkgs/development/libraries/sundials/2.x.nix | 2 +- pkgs/development/libraries/sundials/default.nix | 2 +- pkgs/development/ocaml-modules/lacaml/default.nix | 2 +- pkgs/development/ocaml-modules/owl/default.nix | 2 +- pkgs/development/python-modules/cvxopt/default.nix | 2 +- pkgs/development/python-modules/numpy/default.nix | 2 +- pkgs/tools/misc/hpl/default.nix | 2 +- pkgs/top-level/release-alternatives.nix | 6 +++--- 32 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index f30954367cf7..adb31d326509 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -2,7 +2,7 @@ , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 33871df87f33..031ca55a0480 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -13,7 +13,7 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let pname = "shogun"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 836ce004fff2..617a18265371 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -9,7 +9,7 @@ , static ? false }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { name = "R-3.6.3"; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index be3c1e6dcc88..ea9c921f19e1 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -5,7 +5,7 @@ }: assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 8ece2e7819cf..946beff8003f 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index c0dfeef1119b..626e1bf1ea92 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -54,7 +54,7 @@ , less }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); # This generates a `sage-env` shell file that will be sourced by sage on startup. # It sets up various environment variables, telling sage where to find its diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 77bc65c2be12..87c1e07f5307 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -23,7 +23,7 @@ }: # lots of segfaults with (64 bit) blas -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); # Wrapper that combined `sagelib` with `sage-env` to produce an actually # executable sage. No tests are run yet and no documentation is built. diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 92b4e8efa2ec..830d806a8bcd 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -53,7 +53,7 @@ , pplpy }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); # This is the core sage python package. Everything else is just wrappers gluing # stuff together. It is not very useful on its own though, since it will not diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index bce0c7af2bc1..45fb69eddb7d 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , lapack-reference, openblasCompat, openblas -, is64bit ? false -, blasProvider ? if is64bit then openblas else openblasCompat }: +, isILP64 ? false +, blasProvider ? if isILP64 then openblas else openblasCompat }: let blasFortranSymbols = [ @@ -31,12 +31,12 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; - is64bit = blasProvider.blas64 or false; + isILP64 = blasProvider.blas64 or false; blasImplementation = lib.getName blasProvider; in -assert is64bit -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; +assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; stdenv.mkDerivation { pname = "blas"; @@ -49,7 +49,7 @@ stdenv.mkDerivation { }; passthru = { - inherit is64bit; + inherit isILP64; provider = blasProvider; implementation = blasImplementation; }; @@ -134,6 +134,6 @@ Libs: -L$out/lib -lcblas EOF '' + stdenv.lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support - echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 75dc2ae3b343..c90eb43494d8 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , lapack-reference, openblasCompat, openblas -, is64bit ? false -, lapackProvider ? if is64bit then openblas else openblasCompat }: +, isILP64 ? false +, lapackProvider ? if isILP64 then openblas else openblasCompat }: let @@ -14,7 +14,7 @@ let in -assert is64bit -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; +assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; stdenv.mkDerivation { pname = "lapack"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { }; passthru = { - inherit is64bit; + inherit isILP64; provider = lapackProvider; implementation = lapackImplementation; }; @@ -108,6 +108,6 @@ Libs: -L$out/lib -llapacke EOF '' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support - echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ''); } diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 49dc17a27f45..b67a78b4a5ab 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -12,7 +12,7 @@ , CoreServices, ApplicationServices }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); with stdenv.lib; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if blas.is64bit then "1" else "0"}" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 92e3d4a5c14b..29ac41150506 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -22,7 +22,7 @@ with stdenv.lib; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let dsfmtVersion = "2.2.3"; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if blas.is64bit then "1" else "0"}" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4d2bf40b3292..06d69ed8117f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -53,7 +53,7 @@ , darwin }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.0"; @@ -125,12 +125,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if blas.is64bit then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else ""; configureFlags = [ "--with-blas=blas" "--with-lapack=lapack" - (if blas.is64bit then "--enable-64" else "--disable-64") + (if blas.isILP64 then "--enable-64" else "--disable-64") ] ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 16a9e3e79d45..bc84039a9aa2 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,7 +2,7 @@ , gmpxx }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "fflas-ffpack"; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 6d25cb459870..2217996acdbc 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -10,7 +10,7 @@ , withSage ? false # sage support }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index f6c16583ad75..424502dce0d4 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ Makeconf '' - + stdenv.lib.optionalString blas.is64bit + + stdenv.lib.optionalString blas.isILP64 '' sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' ''; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a5fbb679df5b..0829557d0f3d 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString blas.is64bit "1"}" + "-DINTERFACE64=${optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 647fd82ec0e9..97374fb0d477 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, blas, lapack, gfortran }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index d20219860296..1cf9c2ed8d53 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -2,7 +2,7 @@ , gfortran, mpi, blas, lapack } : -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scalapack"; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 2dcb47f11baa..3820f2b95275 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 34a1fb7ad9e6..b1c1202c5780 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran, blas, lapack }: let - int_t = if blas.is64bit then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; in stdenv.mkDerivation rec { version = "4.2.1"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index b2b7e666b7ef..81a80c920b53 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -6,7 +6,7 @@ let version = "4.4.4"; name = "suitesparse-${version}"; - int_t = if blas.is64bit then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 48177987a7a2..f0480e1e2381 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "BLAS=-lblas" "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" - ] ++ stdenv.lib.optionals blas.is64bit [ + ] ++ stdenv.lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" ] ++ stdenv.lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 05ceb21387d3..ff59297bd839 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gfortran, blas, lapack}: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.1"; diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 08cbd52ba394..b54e537fb823 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -8,7 +8,7 @@ , gfortran , lapackSupport ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 8ed8d6cfcb55..46cf437d72ca 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -7,7 +7,7 @@ , gfortran , lapackSupport ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e4da2216a83d..23b38e469b4b 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lacaml"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index c84743a8da52..b306ee9ce6d2 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -11,7 +11,7 @@ , npy }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); assert blas.implementation == "openblas" && lapack.implementation == "openblas"; buildDunePackage rec { diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 9266f406b151..2b6d1b4d2484 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -14,7 +14,7 @@ , withFftw ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 7009d1d1cd03..f3d8dcba31d3 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -12,7 +12,7 @@ , setuptoolsBuildHook }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let cfg = writeTextFile { diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index c131de021806..d688f3adf30e 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, blas, lapack, mpi } : -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "hpl"; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index eef239d4e0a8..7479377bd302 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -59,7 +59,7 @@ in { blas = mapListToAttrs supportedSystems (system': let system = lib.systems.elaborate { system = system'; }; in mapListToAttrs (blasProviders system) (provider: let - is64bit = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); + isILP64 = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); pkgs = pkgsFun { config = { inherit allowUnfree; }; system = system'; @@ -68,13 +68,13 @@ in lapackProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; blas = super.blas.override { blasProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; })]; }; From a6a502fca05a308a727450978417240e2f6ee0d7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:51:34 -0500 Subject: [PATCH 17/52] magma: remove mklSupport flag This now relies on the "blas" and "lapack" packages. --- .../libraries/science/math/magma/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b34139e7f484..dbe162c60b34 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas -, mklSupport ? false, mkl ? null -}: - -assert !mklSupport || mkl != null; +{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }: with stdenv.lib; @@ -17,13 +13,10 @@ in stdenv.mkDerivation { name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ] - ++ (if mklSupport then [ mkl ] else [ lapack blas ]); + buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ]; doCheck = false; - MKLROOT = optionalString mklSupport mkl; - preConfigure = '' export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ ''; From d19089e1e7ef569399cd010bffed739ba6ffb1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Tue, 21 Apr 2020 02:07:53 +0200 Subject: [PATCH 18/52] nixos/tools: adapt for renamed console options --- nixos/modules/installer/tools/tools.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 655d77db157d..111286214248 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -111,10 +111,10 @@ in # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Select internationalisation properties. - # i18n = { - # consoleFont = "Lat2-Terminus16"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; # }; # Set your time zone. From fd580728d9e1bb51a56b15f85423c9622d0b04e8 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 21 Apr 2020 09:23:53 +0800 Subject: [PATCH 19/52] cargo-expand: 0.4.19 -> 0.5.0 --- .../tools/rust/cargo-expand/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 73dcb96201ed..8274c50f582d 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,25 +1,21 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.19"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "15izqd6nbpxjjymdmcpzjmaiygs1vdrpg9cw1nzmrkb8fc4h5ch5"; + sha256 = "1zpnhigsa0cyr3lj0h7z2xhi01zjrnakvvrgmqz4lyf5gabh9vcg"; }; - cargoSha256 = "0sbpymxhhwxg13w9821b17nda6p3ycqr81i7bj4fxil0n3sb910h"; + cargoSha256 = "1rdh1b240gcjbk3wc384x459lbp8dy9a9mgrampqjk1n115zgbzp"; - buildInputs = [ llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - - meta = with stdenv.lib; { - description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + meta = with lib; { + description = + "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; From 607522c78db958555de68ef6342857398f2002f4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Apr 2020 16:31:59 -0400 Subject: [PATCH 20/52] numpy: Use blas and lapack dev outputs for include dirs --- pkgs/development/python-modules/numpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index f3d8dcba31d3..4a062ca7b97d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -19,7 +19,7 @@ let name = "site.cfg"; text = (lib.generators.toINI {} { ${blas.implementation} = { - include_dirs = "${blas}/include:${lapack}/include"; + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; libraries = "lapack,lapacke,blas,cblas"; }; From 0caa375b4ceac2031b3b6d270019d476c9e61bd6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 23:32:03 -0500 Subject: [PATCH 21/52] blas,lapack: provide symlink for libmkl_rt.so This is needed for numpy to detect mkl correctly. --- pkgs/build-support/alternatives/blas/default.nix | 1 + pkgs/build-support/alternatives/lapack/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 45fb69eddb7d..90cafbf53ce0 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -135,5 +135,6 @@ EOF '' + stdenv.lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook + ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index c90eb43494d8..935150bdb7df 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -109,5 +109,6 @@ EOF '' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook + ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} ''); } From 8f58fa044dca8becdc865c2feb51e5048bf14fef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Apr 2020 00:29:52 -0500 Subject: [PATCH 22/52] blas,lapack: symlink headers when using mkl Some of these are necessary for things like python.pkgs.numexpr --- pkgs/build-support/alternatives/blas/default.nix | 1 + pkgs/build-support/alternatives/lapack/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 90cafbf53ce0..8bba49b45504 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -136,5 +136,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -sf ${blasProvider}/include/* $dev/include ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 935150bdb7df..e260ad1bd931 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -110,5 +110,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -sf ${lapackProvider}/include/* $dev/include ''); } From 1bdf4d121b75cf47aa58ab9db92ba162cb1151e9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Apr 2020 08:59:21 +0200 Subject: [PATCH 23/52] ocamlPackages.bigstringaf: disable tests for OCaml < 4.05 --- pkgs/development/ocaml-modules/bigstringaf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 0544ebbe6856..9f6810379aef 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigarray-compat }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat }: buildDunePackage rec { pname = "bigstringaf"; @@ -13,9 +13,9 @@ buildDunePackage rec { sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc"; }; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigarray-compat ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { description = "Bigstring intrinsics and fast blits based on memcpy/memmove"; From f2788cdf11ca733f0faf986137de90a66acd6aeb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Apr 2020 08:58:55 +0200 Subject: [PATCH 24/52] ocamlPackages.angstrom: disable tests for OCaml < 4.05 --- pkgs/development/ocaml-modules/angstrom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 1d3157bdbf1f..21482266c287 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, result, bigstringaf }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf }: buildDunePackage rec { pname = "angstrom"; @@ -13,14 +13,14 @@ buildDunePackage rec { sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2"; }; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf result ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } From 36632263e0a29e1df59187a72680622c4228e92c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Apr 2020 06:56:28 +0200 Subject: [PATCH 25/52] =?UTF-8?q?ocamlPackages.base64:=20fix=20tests=20for?= =?UTF-8?q?=20alcotest=20=E2=89=A5=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/base64/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index 2f53d74c9eb2..b2e3e0c5e74d 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchzip, buildDunePackage, alcotest, bos }: +{ lib, fetchpatch, fetchzip, buildDunePackage, alcotest, bos }: let version = "3.2.0"; in -buildDunePackage { +buildDunePackage rec { pname = "base64"; inherit version; @@ -13,9 +13,16 @@ buildDunePackage { minimumOCamlVersion = "4.03"; - buildInputs = [ alcotest bos ]; + buildInputs = [ bos ]; + + # Fix test-suite for alcotest ≥ 1.0 + patches = [(fetchpatch { + url = "https://github.com/mirage/ocaml-base64/commit/8d334d02aa52875158fae3e2fb8fe0a5596598d0.patch"; + sha256 = "0lvqdp98qavpzis1wgwh3ijajq79hq47898gsrk37fpyjbrdzf5q"; + })]; doCheck = true; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; From fc317e100af833c7f2411be39ababeb8c3565a91 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Apr 2020 07:15:32 +0200 Subject: [PATCH 26/52] =?UTF-8?q?ocamlPackages.digestif:=20fix=20tests=20f?= =?UTF-8?q?or=20alcotest=20=E2=89=A5=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/digestif/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index f0a98249d6da..d02104decba3 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, fetchpatch, buildDunePackage , bigarray-compat, eqaf, stdlib-shims , alcotest }: @@ -12,6 +12,12 @@ buildDunePackage rec { sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; }; + # Fix tests with alcotest ≥ 1 + patches = [ (fetchpatch { + url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch"; + sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv"; + })]; + buildInputs = lib.optional doCheck alcotest; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; From 974920ccd47fc4c1cc4a702b2d36f61d9392d53b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Apr 2020 07:38:11 +0200 Subject: [PATCH 27/52] =?UTF-8?q?ocamlPackages.alcotest:=200.8.5=20?= =?UTF-8?q?=E2=86=92=201.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/alcotest/default.nix | 45 +++++-------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index d485b997c28d..3ebf0f3ed6bd 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,45 +1,22 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune -, cmdliner, astring, fmt, result, uuidm +{ lib, buildDunePackage, fetchurl +, astring, cmdliner, fmt, uuidm, re, stdlib-shims }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.5"; - sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn"; - nativeBuildInputs = [ dune ]; - propagatedBuildInputs = [ uuidm ]; - buildPhase = "dune build -p alcotest"; - inherit (dune) installPhase; - } else { - version = "0.7.2"; - sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; - buildInputs = [ topkg ]; - nativeBuildInputs = [ ocamlbuild ]; - inherit (topkg) buildPhase installPhase; - }; -in +buildDunePackage rec { + pname = "alcotest"; + version = "1.0.1"; -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-alcotest-${version}"; - inherit (param) version buildPhase installPhase; - - src = fetchzip { - url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - inherit (param) sha256; + src = fetchurl { + url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; + sha256 = "1xlklxb83gamqbg8j5dzm5jk4mvcwkspxajh93p6vpw9ia1li1qc"; }; - nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []); - buildInputs = [ findlib ] ++ (param.buildInputs or []); + propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims ]; - propagatedBuildInputs = [ cmdliner astring fmt result ] - ++ (param.propagatedBuildInputs or []); - - createFindlibDestdir = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mirage/alcotest"; description = "A lightweight and colourful test framework"; - license = stdenv.lib.licenses.isc; + license = licenses.isc; maintainers = [ maintainers.ericbmerritt ]; }; } From 0412bde9423cbc26d68d1d744b22ec4e45bcbac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 20 Apr 2020 20:05:26 +0200 Subject: [PATCH 28/52] treewide: add bool type to enable options, or make use of mkEnableOption Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate. --- nixos/modules/programs/cdemu.nix | 1 + nixos/modules/programs/criu.nix | 1 + nixos/modules/programs/systemtap.nix | 1 + nixos/modules/programs/zsh/oh-my-zsh.nix | 1 + nixos/modules/services/amqp/rabbitmq.nix | 1 + nixos/modules/services/backup/mysql-backup.nix | 7 +------ .../services/backup/postgresql-backup.nix | 7 +------ nixos/modules/services/databases/clickhouse.nix | 5 +---- nixos/modules/services/databases/firebird.nix | 7 +------ nixos/modules/services/databases/memcached.nix | 7 +------ nixos/modules/services/databases/mongodb.nix | 7 +------ nixos/modules/services/databases/virtuoso.nix | 5 +---- nixos/modules/services/hardware/ratbagd.nix | 7 +------ nixos/modules/services/hardware/thermald.nix | 7 +------ nixos/modules/services/mail/spamassassin.nix | 5 +---- nixos/modules/services/misc/autofs.nix | 1 + nixos/modules/services/misc/cgminer.nix | 8 +------- nixos/modules/services/misc/devmon.nix | 7 +------ nixos/modules/services/misc/disnix.nix | 5 +---- nixos/modules/services/misc/felix.nix | 5 +---- nixos/modules/services/misc/ihaskell.nix | 1 + nixos/modules/services/misc/safeeyes.nix | 5 +---- nixos/modules/services/misc/svnserve.nix | 1 + nixos/modules/services/misc/synergy.nix | 16 ++++------------ .../services/network-filesystems/netatalk.nix | 6 ++---- .../services/network-filesystems/rsyncd.nix | 5 +---- .../services/network-filesystems/xtreemfs.nix | 6 ++++++ .../services/network-filesystems/yandex-disk.nix | 1 + nixos/modules/services/networking/amuled.nix | 1 + nixos/modules/services/networking/babeld.nix | 7 +------ nixos/modules/services/networking/bind.nix | 7 +------ nixos/modules/services/networking/bitlbee.nix | 1 + nixos/modules/services/networking/cntlm.nix | 7 +------ .../modules/services/networking/flashpolicyd.nix | 1 + nixos/modules/services/networking/gvpe.nix | 8 ++------ nixos/modules/services/networking/hostapd.nix | 1 + .../services/networking/ircd-hybrid/default.nix | 7 +------ nixos/modules/services/networking/mailpile.nix | 8 ++------ nixos/modules/services/networking/ntp/chrony.nix | 1 + nixos/modules/services/networking/ntp/ntpd.nix | 1 + nixos/modules/services/networking/openfire.nix | 7 +------ nixos/modules/services/networking/prayer.nix | 7 +------ nixos/modules/services/networking/quassel.nix | 7 +------ nixos/modules/services/networking/radvd.nix | 1 + nixos/modules/services/networking/rdnssd.nix | 1 + nixos/modules/services/networking/sabnzbd.nix | 6 ++---- .../services/networking/shairport-sync.nix | 1 + nixos/modules/services/networking/ssh/lshd.nix | 1 + nixos/modules/services/networking/xinetd.nix | 7 +------ nixos/modules/services/security/fprot.nix | 7 +------ .../modules/services/system/kerberos/default.nix | 7 +------ nixos/modules/services/system/localtime.nix | 1 + nixos/modules/services/system/uptimed.nix | 1 + .../services/web-servers/jboss/default.nix | 1 + .../x11/desktop-managers/enlightenment.nix | 1 + .../services/x11/desktop-managers/gnome3.nix | 1 + .../services/x11/desktop-managers/kodi.nix | 1 + .../services/x11/display-managers/startx.nix | 1 + nixos/modules/services/x11/hardware/wacom.nix | 1 + 59 files changed, 71 insertions(+), 175 deletions(-) diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix index 6a0185d362c5..a59cd93cadfc 100644 --- a/nixos/modules/programs/cdemu.nix +++ b/nixos/modules/programs/cdemu.nix @@ -8,6 +8,7 @@ in { options = { programs.cdemu = { enable = mkOption { + type = types.bool; default = false; description = '' cdemu for members of diff --git a/nixos/modules/programs/criu.nix b/nixos/modules/programs/criu.nix index 48cf5c88a9fc..1714e1331a48 100644 --- a/nixos/modules/programs/criu.nix +++ b/nixos/modules/programs/criu.nix @@ -8,6 +8,7 @@ in { options = { programs.criu = { enable = mkOption { + type = types.bool; default = false; description = '' Install criu along with necessary kernel options. diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix index ca81e018c9dc..360e106678e6 100644 --- a/nixos/modules/programs/systemtap.nix +++ b/nixos/modules/programs/systemtap.nix @@ -8,6 +8,7 @@ in { options = { programs.systemtap = { enable = mkOption { + type = types.bool; default = false; description = '' Install systemtap along with necessary kernel options. diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 932a780a356a..f24842a47919 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -39,6 +39,7 @@ in options = { programs.zsh.ohMyZsh = { enable = mkOption { + type = types.bool; default = false; description = '' Enable oh-my-zsh. diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index f80d6b3f1ba5..646708e01c48 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -17,6 +17,7 @@ in { options = { services.rabbitmq = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the RabbitMQ server, an Advanced Message diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index f58af82773f3..31d606b141a8 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -37,12 +37,7 @@ in services.mysqlBackup = { - enable = mkOption { - default = false; - description = '' - Whether to enable MySQL backups. - ''; - }; + enable = mkEnableOption "MySQL backups"; calendar = mkOption { type = types.str; diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 580c7ce68f1d..428861a7598a 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -44,12 +44,7 @@ in { options = { services.postgresqlBackup = { - enable = mkOption { - default = false; - description = '' - Whether to enable PostgreSQL dumps. - ''; - }; + enable = mkEnableOption "PostgreSQL dumps"; startAt = mkOption { default = "*-*-* 01:15:00"; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index dbabcae43ee5..27440fec4e10 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -11,10 +11,7 @@ with lib; services.clickhouse = { - enable = mkOption { - default = false; - description = "Whether to enable ClickHouse database server."; - }; + enable = mkEnableOption "ClickHouse database server"; }; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 042c9841df54..95837aa1cea6 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -40,12 +40,7 @@ in services.firebird = { - enable = mkOption { - default = false; - description = '' - Whether to enable the Firebird super server. - ''; - }; + enable = mkEnableOption "the Firebird super server"; package = mkOption { default = pkgs.firebirdSuper; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 89ff957babf5..f54bb6cc9b18 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -18,12 +18,7 @@ in services.memcached = { - enable = mkOption { - default = false; - description = " - Whether to enable Memcached. - "; - }; + enable = mkEnableOption "Memcached"; user = mkOption { default = "memcached"; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 12879afed477..4453a182990d 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -29,12 +29,7 @@ in services.mongodb = { - enable = mkOption { - default = false; - description = " - Whether to enable the MongoDB server. - "; - }; + enable = mkEnableOption "the MongoDB server"; package = mkOption { default = pkgs.mongodb; diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 0cc027cb1d74..6eb09e0a58fc 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -13,10 +13,7 @@ with lib; services.virtuoso = { - enable = mkOption { - default = false; - description = "Whether to enable Virtuoso Opensource database server."; - }; + enable = mkEnableOption "Virtuoso Opensource database server"; config = mkOption { default = ""; diff --git a/nixos/modules/services/hardware/ratbagd.nix b/nixos/modules/services/hardware/ratbagd.nix index 103e1d2315ae..01a8276750f2 100644 --- a/nixos/modules/services/hardware/ratbagd.nix +++ b/nixos/modules/services/hardware/ratbagd.nix @@ -10,12 +10,7 @@ in options = { services.ratbagd = { - enable = mkOption { - default = false; - description = '' - Whether to enable ratbagd for configuring gaming mice. - ''; - }; + enable = mkEnableOption "ratbagd for configuring gaming mice"; }; }; diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index 69577bbe0181..ecb529e9bf01 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -8,12 +8,7 @@ in { ###### interface options = { services.thermald = { - enable = mkOption { - default = false; - description = '' - Whether to enable thermald, the temperature management daemon. - ''; - }; + enable = mkEnableOption "thermald, the temperature management daemon"; debug = mkOption { type = types.bool; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 2d5fb40fad35..f6c0b9c794c9 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -12,10 +12,7 @@ in options = { services.spamassassin = { - enable = mkOption { - default = false; - description = "Whether to run the SpamAssassin daemon"; - }; + enable = mkEnableOption "the SpamAssassin daemon"; debug = mkOption { default = false; diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index f1742177326a..84f49f964b12 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -19,6 +19,7 @@ in services.autofs = { enable = mkOption { + type = types.bool; default = false; description = '' Mount filesystems on demand. Unmount them automatically. diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index 9fcae6452696..7635c2a0f4e9 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -31,13 +31,7 @@ in services.cgminer = { - enable = mkOption { - default = false; - description = '' - Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and - litecoin. - ''; - }; + enable = mkEnableOption "cgminer, an ASIC/FPGA/GPU miner for bitcoin and litecoin"; package = mkOption { default = pkgs.cgminer; diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix index 9dc8fee2964b..e4a3348646b1 100644 --- a/nixos/modules/services/misc/devmon.nix +++ b/nixos/modules/services/misc/devmon.nix @@ -8,12 +8,7 @@ let in { options = { services.devmon = { - enable = mkOption { - default = false; - description = '' - Whether to enable devmon, an automatic device mounting daemon. - ''; - }; + enable = mkEnableOption "devmon, an automatic device mounting daemon"; }; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index b7b6eb7cd66e..0776ac679088 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -17,10 +17,7 @@ in services.disnix = { - enable = mkOption { - default = false; - description = "Whether to enable Disnix"; - }; + enable = mkEnableOption "Disnix"; enableMultiUser = mkOption { type = types.bool; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index 188e45abc58b..21740c8c0b72 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -17,10 +17,7 @@ in services.felix = { - enable = mkOption { - default = false; - description = "Whether to enable the Apache Felix OSGi service"; - }; + enable = mkEnableOption "the Apache Felix OSGi service"; bundles = mkOption { type = types.listOf types.package; diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 11597706d0d1..684a242d7385 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -15,6 +15,7 @@ in options = { services.ihaskell = { enable = mkOption { + type = types.bool; default = false; description = "Autostart an IHaskell notebook service."; }; diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixos/modules/services/misc/safeeyes.nix index 1a33971d9227..6ecb0d13187c 100644 --- a/nixos/modules/services/misc/safeeyes.nix +++ b/nixos/modules/services/misc/safeeyes.nix @@ -16,10 +16,7 @@ in services.safeeyes = { - enable = mkOption { - default = false; - description = "Whether to enable the safeeyes OSGi service"; - }; + enable = mkEnableOption "the safeeyes OSGi service"; }; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 6292bc52b1e3..3335ed09d40e 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -18,6 +18,7 @@ in services.svnserve = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol."; }; diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index bfab8c534d8c..5b7cf3ac46c3 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -19,12 +19,8 @@ in # !!! All these option descriptions needs to be cleaned up. client = { - enable = mkOption { - default = false; - description = " - Whether to enable the Synergy client (receive keyboard and mouse events from a Synergy server). - "; - }; + enable = mkEnableOption "the Synergy client (receive keyboard and mouse events from a Synergy server)"; + screenName = mkOption { default = ""; description = '' @@ -47,12 +43,8 @@ in }; server = { - enable = mkOption { - default = false; - description = '' - Whether to enable the Synergy server (send keyboard and mouse events). - ''; - }; + enable = mkEnableOption "the Synergy server (send keyboard and mouse events)"; + configFile = mkOption { default = "/etc/synergy-server.conf"; description = "The Synergy server configuration file."; diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 5422d4dd4e26..7674c8f7fa8d 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -43,10 +43,7 @@ in options = { services.netatalk = { - enable = mkOption { - default = false; - description = "Whether to enable the Netatalk AFP fileserver."; - }; + enable = mkEnableOption "the Netatalk AFP fileserver"; port = mkOption { default = 548; @@ -65,6 +62,7 @@ in homes = { enable = mkOption { + type = types.bool; default = false; description = "Enable sharing of the UNIX server user home directories."; }; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index ccad64cfdb2a..fa29e18a9395 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -29,10 +29,7 @@ in options = { services.rsyncd = { - enable = mkOption { - default = false; - description = "Whether to enable the rsync daemon."; - }; + enable = mkEnableOption "the rsync daemon"; motd = mkOption { type = types.str; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index c93e201da56c..b8f8c1d71174 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -100,11 +100,13 @@ in dir = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable XtreemFS DIR service. ''; }; + uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; description = '' @@ -218,11 +220,13 @@ in mrc = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable XtreemFS MRC service. ''; }; + uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; description = '' @@ -354,11 +358,13 @@ in osd = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable XtreemFS OSD service. ''; }; + uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; description = '' diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 0aa01ef9e6d9..cc73f13bf77a 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -21,6 +21,7 @@ in services.yandex-disk = { enable = mkOption { + type = types.bool; default = false; description = " Whether to enable Yandex-disk client. See https://disk.yandex.ru/ diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 57f02542eafd..1128ee2c3e61 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -16,6 +16,7 @@ in services.amule = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time. diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index de863461eab2..e62c74d0069d 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -35,12 +35,7 @@ in services.babeld = { - enable = mkOption { - default = false; - description = '' - Whether to run the babeld network routing daemon. - ''; - }; + enable = mkEnableOption "the babeld network routing daemon"; interfaceDefaults = mkOption { default = null; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index e3b95afb3d86..faad88635759 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -68,12 +68,7 @@ in services.bind = { - enable = mkOption { - default = false; - description = " - Whether to enable BIND domain name server. - "; - }; + enable = mkEnableOption "BIND domain name server"; cacheNetworks = mkOption { default = ["127.0.0.0/24"]; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 01a16698384a..9ebf382fce42 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -48,6 +48,7 @@ in services.bitlbee = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to run the BitlBee IRC to other chat network gateway. diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 4e4e3104c3a8..5b5068e43d7c 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -33,12 +33,7 @@ in options.services.cntlm = { - enable = mkOption { - default = false; - description = '' - Whether to enable the cntlm, which start a local proxy. - ''; - }; + enable = mkEnableOption "cntlm, which starts a local proxy"; username = mkOption { description = '' diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix index 9c51b88ef677..7f25083307c7 100644 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ b/nixos/modules/services/networking/flashpolicyd.nix @@ -39,6 +39,7 @@ in services.flashpolicyd = { enable = mkOption { + type = types.bool; default = false; description = '' diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 3ef3548e0a08..92e87cd4640d 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -42,12 +42,8 @@ in { options = { services.gvpe = { - enable = mkOption { - default = false; - description = '' - Whether to run gvpe - ''; - }; + enable = lib.mkEnableOption "gvpe"; + nodename = mkOption { default = null; description ='' diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 2915b54f05b4..12c0626a9414 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -49,6 +49,7 @@ in services.hostapd = { enable = mkOption { + type = types.bool; default = false; description = '' Enable putting a wireless interface into infrastructure mode, diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index b236552eb653..91d0bf437d69 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -36,12 +36,7 @@ in services.ircdHybrid = { - enable = mkOption { - default = false; - description = " - Enable IRCD. - "; - }; + enable = mkEnableOption "IRCD"; serverName = mkOption { default = "hades.arpa"; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index c42d3d5a44cb..b79ee11d17db 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -18,12 +18,8 @@ in options = { services.mailpile = { - enable = mkOption { - default = false; - description = " - Whether to enable Mailpile the mail client. - "; - }; + enable = mkEnableOption "Mailpile the mail client"; + hostname = mkOption { default = "localhost"; description = "Listen to this hostname or ip."; diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index f1062edaa05b..b7e4c89a155c 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -30,6 +30,7 @@ in options = { services.chrony = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to synchronise your machine's time using chrony. diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 54ff054d84c7..51398851adc6 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -40,6 +40,7 @@ in services.ntp = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to synchronise your machine's time using ntpd, as a peer in diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix index 4059eb3db83d..c74f3611f79e 100644 --- a/nixos/modules/services/networking/openfire.nix +++ b/nixos/modules/services/networking/openfire.nix @@ -9,12 +9,7 @@ with lib; services.openfire = { - enable = mkOption { - default = false; - description = " - Whether to enable OpenFire XMPP server. - "; - }; + enable = mkEnableOption "OpenFire XMPP server"; usePostgreSQL = mkOption { default = true; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 9c9eeba23da2..f04dac01d9b8 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -41,12 +41,7 @@ in services.prayer = { - enable = mkOption { - default = false; - description = '' - Whether to run the prayer webmail http server. - ''; - }; + enable = mkEnableOption "the prayer webmail http server"; port = mkOption { default = "2080"; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 52ecd90b7c69..da723ec86adf 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -16,12 +16,7 @@ in services.quassel = { - enable = mkOption { - default = false; - description = '' - Whether to run the Quassel IRC client daemon. - ''; - }; + enable = mkEnableOption "the Quassel IRC client daemon"; certificateFile = mkOption { type = types.nullOr types.str; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 020faa34922a..f4b00c9b356e 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -19,6 +19,7 @@ in options = { services.radvd.enable = mkOption { + type = types.bool; default = false; description = '' diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index bccab805beeb..469504c43172 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -17,6 +17,7 @@ in options = { services.rdnssd.enable = mkOption { + type = types.bool; default = false; #default = config.networking.enableIPv6; description = diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index 62b24d4377f8..ff5aef7d1cb4 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -15,10 +15,8 @@ in options = { services.sabnzbd = { - enable = mkOption { - default = false; - description = "Whether to enable the sabnzbd server."; - }; + enable = mkEnableOption "the sabnzbd server"; + configFile = mkOption { default = "/var/lib/sabnzbd/sabnzbd.ini"; description = "Path to config file."; diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 2e988e0ca2e0..b4b86a2d55be 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -17,6 +17,7 @@ in services.shairport-sync = { enable = mkOption { + type = types.bool; default = false; description = '' Enable the shairport-sync daemon. diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index eca599afb33b..892e59778c34 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -19,6 +19,7 @@ in services.lshd = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the GNU lshd SSH2 daemon, which allows diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 8dc6f845ed85..2f527ab156aa 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -44,12 +44,7 @@ in options = { - services.xinetd.enable = mkOption { - default = false; - description = '' - Whether to enable the xinetd super-server daemon. - ''; - }; + services.xinetd.enable = mkEnableOption "the xinetd super-server daemon"; services.xinetd.extraDefaults = mkOption { default = ""; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index f203f2abc033..3a0b08b3c6d8 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -10,12 +10,7 @@ in { services.fprot = { updater = { - enable = mkOption { - default = false; - description = '' - Whether to enable automatic F-Prot virus definitions database updates. - ''; - }; + enable = mkEnableOption "automatic F-Prot virus definitions database updates"; productData = mkOption { description = '' diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index c55241c4cff1..9a1e67399010 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -51,12 +51,7 @@ in ###### interface options = { services.kerberos_server = { - enable = mkOption { - default = false; - description = '' - Enable the kerberos authentification server. - ''; - }; + enable = lib.mkEnableOption "the kerberos authentification server"; realms = mkOption { type = types.attrsOf (types.submodule realm); diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index 74925c5e2c47..8f8e2e2e9339 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -8,6 +8,7 @@ in { options = { services.localtime = { enable = mkOption { + type = types.bool; default = false; description = '' Enable localtime, simple daemon for keeping the system diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index 3c9978ab2269..1e256c51408e 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -10,6 +10,7 @@ in options = { services.uptimed = { enable = mkOption { + type = types.bool; default = false; description = '' Enable uptimed, allowing you to track diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index d28724281a83..3a125982831b 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -24,6 +24,7 @@ in services.jboss = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities."; }; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 32c9a40e535c..1690a7d51a88 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -23,6 +23,7 @@ in options = { services.xserver.desktopManager.enlightenment.enable = mkOption { + type = types.bool; default = false; description = "Enable the Enlightenment desktop environment."; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index ac8e70c52bcc..bbc7feb2d049 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -72,6 +72,7 @@ in services.xserver.desktopManager.gnome3 = { enable = mkOption { + type = types.bool; default = false; description = "Enable Gnome 3 desktop manager."; }; diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index e997b9a11343..bdae9c3afdb7 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -10,6 +10,7 @@ in options = { services.xserver.desktopManager.kodi = { enable = mkOption { + type = types.bool; default = false; description = "Enable the kodi multimedia center."; }; diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index 570469843586..3980203b9457 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -15,6 +15,7 @@ in options = { services.xserver.displayManager.startx = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the dummy "startx" pseudo-display manager, diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index a27889c36a70..dad2b308d1b4 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -15,6 +15,7 @@ in services.xserver.wacom = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the Wacom touchscreen/digitizer/tablet. From 1a36927174685b6c9d27691e45ae6af90a2f649f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:20:00 -0500 Subject: [PATCH 29/52] ocamlformat: 0.14.0 -> 0.14.1 Changelog: https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.14.1 --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index da134562e32b..9a034a2b0473 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,7 +2,7 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.14.0"; + version = "0.14.1"; minimumOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ with ocamlPackages; buildDunePackage rec { src = fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; }; buildInputs = [ From 666042141ed2039fdb136ccc89ca1aff6a495ec4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 21 Apr 2020 14:02:17 +0200 Subject: [PATCH 30/52] git: Fix the update.sh script and use HTTPS The syntax is ${parameter:-word} (i.e. previously this used "latestTag" instead of the actual value). (Fixes a regression from #85278.) Also: Even though getting the latest tag isn't really security critical (as long as Git itself is secure against untrusted input), I'd prefer to switch from the Git to the HTTPS protocol (for authentication of the server and encryption + uses a standard port). --- .../version-management/git-and-tools/git/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index d0bc413fb893..54574722b02b 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -4,8 +4,8 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" -targetVersion="${1:-latestTag}" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +targetVersion="${1:-$latestTag}" if [ ! "${oldVersion}" = "${targetVersion}" ]; then update-source-version git "${targetVersion}" From 05cfa5ff9973b362574d10880d1cdd47849ae4b4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 07:30:07 -0500 Subject: [PATCH 31/52] opam: 2.0.6 -> 2.0.7 --- pkgs/development/tools/ocaml/opam/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index f1028208dae9..fdf25b930cb2 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -55,13 +55,13 @@ let sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.6.zip"; - sha256 = "076070qwf7rqp5bh0mmgc5b3vyihgp4qpkd6fscxzya4in66bzf8"; + url = "https://github.com/ocaml/opam/archive/2.0.7.zip"; + sha256 = "03yxj4hw9p5dh34b1yzl3xd0l1v2l2az0n7ix453yjrkn0wn0xic"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.0.6"; + version = "2.0.7"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -117,4 +117,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.6 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.7 -p opam-shebangs.patch From 9d81c54b3187e4225713a32dcae82930138e62b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 07:26:00 -0500 Subject: [PATCH 32/52] opam: add marsam to maintainers --- pkgs/development/tools/ocaml/opam/default.nix | 2 +- pkgs/development/tools/ocaml/opam/opam.nix.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index fdf25b930cb2..9e95db79dd0b 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - maintainers = [ maintainers.henrytill ]; + maintainers = [ maintainers.henrytill maintainers.marsam ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 605d0c41cae9..828e209fac61 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -123,7 +123,7 @@ print <<'EOF'; meta = with stdenv.lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - maintainers = [ maintainers.henrytill ]; + maintainers = [ maintainers.henrytill maintainers.marsam ]; platforms = platforms.all; }; } From 1da6613de14e192d8c7f477779ec25e187ee5ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 21 Apr 2020 16:41:41 +0200 Subject: [PATCH 33/52] release-combined: Remove unused value `allSupportedNixpkgs`. It was made obsolete by commit 2de3caf0 - nixos/release-combined.nix: List constituents of the 'tested' job by name see also https://github.com/NixOS/nixpkgs/commit/f996744fd32f255b7fd33d9e83d9ef688097b367#r38642487. --- nixos/release-combined.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 87783c660953..f4f99e71a90c 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -20,11 +20,6 @@ let else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set else set; - allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { - supportedSystems = supportedSystems ++ limitedSupportedSystems; - nixpkgs = nixpkgsSrc; - })) [ "unstable" ]; - in rec { nixos = removeMaintainers (import ./release.nix { From 3c41d61514029d5aa4ea748c1e46098767ae448b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Apr 2020 11:03:10 -0500 Subject: [PATCH 34/52] doc/overlays.xml: update documentation for BLAS/LAPACK This expands the documentation and explains how to assert LP64. --- doc/languages-frameworks/python.section.md | 29 ++-------------- doc/using/overlays.xml | 40 +++++++++++++++++++++- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index f8884785e90d..e6f0b64fa9cc 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1290,32 +1290,9 @@ self: super: { ### How to use Intel's MKL with numpy and scipy? -A `site.cfg` is created that configures BLAS based on the `blas` parameter of -the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending on -`numpy` will be built with `mkl`. - -The following is an overlay that configures `numpy` to use `mkl`: - -```nix -self: super: { - python37 = super.python37.override { - packageOverrides = python-self: python-super: { - numpy = python-super.numpy.override { - blas = super.pkgs.mkl; - }; - }; - }; -} -``` - -`mkl` requires an `openmp` implementation when running with multiple processors. -By default, `mkl` will use Intel's `iomp` implementation if no other is -specified, but this is a runtime-only dependency and binary compatible with the -LLVM implementation. To use that one instead, Intel recommends users set it with -`LD_PRELOAD`. - -Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms; -moreover, Hydra is not building and distributing pre-compiled binaries using it. +MKL can be configured using an overlay. See the section “[Using +overlays to configure +alternatives](#sec-overlays-alternatives-blas-lapack)”. ### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index 7732e0ac2179..5f808839dd0d 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -177,7 +177,7 @@ self: super: Intel - MKL (only works on x86 architecture) + MKL (only works on x86 architecture, unfree) The Nixpkgs attribute is mkl. @@ -211,6 +211,44 @@ self: super: using LD_PRELOAD of libblas.so.3 and liblapack.so.3. + + Intel MKL requires an openmp implementation + when running with multiple processors. By default, + mkl will use Intel’s iomp + implementation if no other is specified, but this is a + runtime-only dependency and binary compatible with the LLVM + implementation. To use that one instead, Intel recommends users + set it with LD_PRELOAD. Note that + mkl is only available on + x86_64-linux and + x86_64-darwin. Moreover, Hydra is not build + and distributing pre-compiled binaries using it. + + + For BLAS/LAPACK switching to work correctly, all packages must + depend on blas or lapack. + This ensures that only one BLAS/LAPACK library is used at one + time. There are two versions versions of BLAS/LAPACK currently + in the wild, LP64 (integer size = 32 bits) + and ILP64 (integer size = 64 bits). Some + software needs special flags or patches to work with + ILP64. You can check if + ILP64 is used in Nixpkgs with + blas.isILP64 and + lapack.isILP64. Some software does NOT work + with ILP64, and derivations need to specify + an assertion to prevent this. You can prevent + ILP64 from being used with the following: + + +{ stdenv, blas, lapack, ... }: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation { + ... +} + From c844633cc70309d74dbf13850b8af56bbdbc694c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2020 17:31:27 +0200 Subject: [PATCH 35/52] mautrix-whatsapp: 2020-04-12 -> 2020-04-21 --- pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 924209174e7d..5e011f17b70f 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-12"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "44bb623e7a7486a0cdd13fd67b2aaca2ddba20ce"; - sha256 = "1fwxn6511pq9fdc8d2jp4vgkm1zag55pig75qdxfn63hl3i2607k"; + rev = "53fe1b18184fc0967658805abc8560641f8d2cb0"; + sha256 = "0rahj9v7cgvk4w3m41jbs8vnya37dhq5wxyhyg74kwrv8a2nqxra"; }; - modSha256 = "04pdap1q7zsa1wv2h0j9104fawn95g37yqslmp2mq7722hiqhp9x"; + modSha256 = "0jn88a4hagwfkw9bv8cg12ywsg35znmfkmhi1v7k2qpj5qzi81w6"; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; From 68684b637631b25d96a8552fd3b8741a456f8a7f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2020 17:31:40 +0200 Subject: [PATCH 36/52] stellarium: 0.20.0 -> 0.20.1 https://github.com/Stellarium/stellarium/releases/tag/v0.20.1 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index a0cd535f362c..7ef7776c0fe8 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4"; + sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; From 25b9bca759f3fa914c51bcf01de552446c507822 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2020 17:34:13 +0200 Subject: [PATCH 37/52] mongodb_3_4: fix license As noted in #83433, the 3.4 branch of `mongodb` is still licensed under AGPL[1]. [1] https://github.com/mongodb/mongo/blob/r3.4.24/README --- pkgs/servers/nosql/mongodb/mongodb.nix | 6 ++++-- pkgs/servers/nosql/mongodb/v3_4.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index e3d277ba5afb..8ffdbcd63c4c 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -6,7 +6,9 @@ with stdenv.lib; -{ version, sha256, patches ? [] }@args: +{ version, sha256, patches ? [] +, license ? stdenv.lib.licenses.sspl +}@args: let python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); @@ -109,7 +111,7 @@ in stdenv.mkDerivation rec { meta = { description = "A scalable, high-performance, open source NoSQL database"; homepage = "http://www.mongodb.org"; - license = licenses.sspl; + inherit license; maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index 2f02ae7f72ad..e1c71bc13f7a 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -12,4 +12,5 @@ in buildMongoDB { version = "3.4.24"; sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr"; patches = [ ./forget-build-dependencies-3-4.patch ]; + license = stdenv.lib.licenses.agpl3; } From 790748c249beccc60b0f28f4e81396591ff86830 Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 21 Apr 2020 18:26:05 +0200 Subject: [PATCH 38/52] openrct2: 0.2.4 -> 0.2.6 --- pkgs/games/openrct2/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 48114cb766c4..b519e0c7e925 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -4,21 +4,20 @@ }: let - name = "openrct2-${version}"; - version = "0.2.4"; + version = "0.2.6"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h"; + sha256 = "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.12"; - sha256 = "0vfhyldc8nfvkg4d9kry669haxz2165walbxzgza7pqpnd7aqgrf"; + rev = "v1.0.14"; + sha256 = "1bqbia5y73v4r0sv5cvi5729jh2ns7cxn557blh715yxswk91590"; }; title-sequences-src = fetchFromGitHub { @@ -29,7 +28,8 @@ let }; in stdenv.mkDerivation { - inherit name; + inherit version; + pname = "openrct2"; src = openrct2-src; @@ -61,12 +61,11 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; - makeFlags = ["all" "g2"]; + enableParallelBuilding = true; preFixup = "ln -s $out/share/openrct2 $out/bin/data"; From e43a6c946882ac8d1c8a63bd7925d242f2fda44d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Apr 2020 08:31:45 +0800 Subject: [PATCH 39/52] mu: minor cleanup --- pkgs/tools/networking/mu/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index ae1ca3f77611..aa1e004d1afc 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - preBuild = '' # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; + platforms = platforms.mesaPlatforms; }; } From c93e4cba929acd07f94e51c21fa731746848882e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 21 Apr 2020 12:18:59 +0200 Subject: [PATCH 40/52] apostrophe: unstable-2020-03-29 -> 2.2.0.2 --- pkgs/applications/editors/apostrophe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 623f86a61c2c..391a87345632 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "unstable-2020-03-29"; + version = "2.2.0.2"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; - rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb"; - sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx"; + rev = "v${version}"; + sha256 = "13wvfkg0jw9mayd9ifzkqnhf8fmfjgr1lsj4niqbyrw130y9r9f6"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils From 6ca23cac61dc0b57098ce2f9e921d96a34ddc34b Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 20 Apr 2020 18:18:52 +0300 Subject: [PATCH 41/52] psi-plus: 1.4.984 -> 1.4.1086 --- .../instant-messengers/psi-plus/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 010c06e0c2ac..bd9d706d4e30 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,26 +6,15 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.984"; + version = "1.4.1086"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "1nii2nfi37i6mn79xmygscmm8ax75ky244wxkzlga0ya8i8wfjh7"; + sha256 = "0war4hbjs1m7ll6rvpl3lj44lb0p5fi0g2siinnxpjffz2ydi97p"; }; - resources = fetchFromGitHub { - owner = "psi-plus"; - repo = "resources"; - rev = "2f1c12564f7506bf902a26040fdb47ead4df6b73"; - sha256 = "1dgm9k052fq7f2bpx13kchg7sxb227dkn115lyspzvhnhprnypz2"; - }; - - postUnpack = '' - cp -a "${resources}/iconsets" "$sourceRoot" - ''; - cmakeFlags = [ "-DENABLE_PLUGINS=ON" ]; @@ -38,8 +27,6 @@ stdenv.mkDerivation rec { libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; From d8d6ecc418a7caed9e598ea814f75e6aa2881313 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 11 Mar 2020 09:08:10 +1100 Subject: [PATCH 42/52] mosdepth: 0.2.6 -> 0.2.9 --- pkgs/applications/science/biology/mosdepth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 569c63afa7a1..21af5b82207b 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -4,8 +4,8 @@ let hts-nim = fetchFromGitHub { owner = "brentp"; repo = "hts-nim"; - rev = "v0.2.14"; - sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3"; + rev = "v0.3.4"; + sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; }; docopt = fetchFromGitHub { @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "mosdepth"; - version = "0.2.6"; + version = "0.2.9"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk"; + sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849"; }; buildInputs = [ nim ]; From 31edad38b15066c1897cff229ace0b4946e01915 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 20 Apr 2020 08:55:38 +0200 Subject: [PATCH 43/52] kanboard: 1.2.13 -> 1.2.14 --- pkgs/applications/misc/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 9e2857c960fc..e6193d435639 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk"; + sha256 = "11bwajzidnyagdyip7i8rwni1f66acv0k4lybdm0mc4195anivjh"; }; dontBuild = true; From 0d0dd76a7a76bd66629d7c2cf3d4d1d45825762b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 19 Apr 2020 22:51:08 -0700 Subject: [PATCH 44/52] tailscale: 0.97-0 -> 0.97-219. Signed-off-by: David Anderson --- pkgs/servers/tailscale/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e4cc0889c31f..24a8aa66151a 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "0.97"; + version = "0.97-219"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; - rev = "v${version}"; - sha256 = "0ckjqhj99c25h8xgyfkrd19nw5w4a7972nvba9r5faw5micjs02n"; + # Tailscale uses "git describe" as version numbers. v0.97-219 + # means "tag v0.97 plus 219 commits", which is what this rev is. + rev = "afbfe4f217a2a202f0eefe943c7c1ef648311339"; + sha256 = "1an897ys3gycdmclqd0yqs9f7q88zxqxyc6r0gcgs4678svxhb68"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,7 +18,7 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - modSha256 = "0anpakcqz4irwxnm0iwm7wqzh84kv3yxxdvyr38154pbd0ys5pa2"; + modSha256 = "1xgdhbck3pkix10lfshzdszrv6d3p0hbx8jdjvswz7jjd0vzm4x1"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' From 080e82493b3cf03aace648698fe2493cc90347db Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 20 Mar 2020 13:31:34 +0100 Subject: [PATCH 45/52] metals: 0.8.3 -> 0.8.4 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 638fae592a54..4cd87480070a 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.3"; + version = "0.8.4"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1l196glr7rbsvrqmq6i7iw532jkz8d1w5m9nh0kh5z12visc7bkk"; + outputHash = "1r8aff082m3kh6wy5diyvq8bzg5x4dp1da9sfz223ii0kc1yp6w5"; }; in stdenv.mkDerivation rec { From 55061fcd0b67588e8bc3b0741a08f559c13b8a48 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 16 Apr 2020 10:26:21 +0200 Subject: [PATCH 46/52] trilium: 0.40.5 -> 0.40.7 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 18c512874db4..967f91d962e1 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,7 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.40.5"; + version = "0.40.7"; in { @@ -30,7 +30,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi"; + sha256 = "0xi3bb0kbphbgpk2wlsad509g0hwwb259q2vkv0kgyr4i4wcyc1f"; }; # Fetch from source repo, no longer included in release. @@ -78,7 +78,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7"; + sha256 = "15bspngnnbq6mhp1f82j9hccg0ymhm6i4rddpgz3n7dw5wxdj0sm"; }; nativeBuildInputs = [ From 42d290316ccf1d2b6d64e8feef148a4bcd2f994c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 15 Apr 2020 23:09:56 +0300 Subject: [PATCH 47/52] xournalpp: 1.0.17 -> 1.0.18 --- pkgs/applications/graphics/xournalpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 65aa17e3b4ee..ba396bfd92c5 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw"; + sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; From de14e60d020f38286514f7752e1589b241558414 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 18 Apr 2020 21:03:19 +0200 Subject: [PATCH 48/52] sidequest: 0.8.7-> 0.10.2 --- pkgs/applications/misc/sidequest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 3638a1d18809..6c55c3157f5c 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.8.7"; + version = "0.10.2"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1hbr6ml689zq4k3mzmn2xcn4r4dy717rgq3lgm32pzwgy5w92i2j"; + sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88"; }; buildInputs = [ makeWrapper ]; From c970d3b10594df7efb882bf43c177115e3ca516c Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Thu, 16 Apr 2020 04:27:55 +0200 Subject: [PATCH 49/52] ili2c: 5.0.0 -> 5.0.8 --- pkgs/tools/misc/ili2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 4d78f797f109..43eed8367c47 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ili2c"; - version = "5.0.0"; + version = "5.0.8"; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "claeis"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0xps2343d5gdr2aj8j3l4cjq4k9zbxxlhnp8sjlhxh1wdczxlwx6"; + sha256 = "1yhsyh940kb33y2n6xl7zhf0f6q0nrxbyg6c4g5n2imllpn54sgi"; }; buildPhase = "ant jar"; From 09d82f63a402120ffa2f9ce1fb55eb4fa42685d8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 14 Apr 2020 15:53:52 +0200 Subject: [PATCH 50/52] transifex-client: 0.13.6 -> 0.13.9 --- pkgs/tools/text/transifex-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 403adaf71b6f..ac10564c9f76 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.6"; + version = "0.13.9"; propagatedBuildInputs = [ urllib3 requests python-slugify six setuptools @@ -11,13 +11,13 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0y6pprlmkmi7wfqr3k70sb913qa70p3i90q5mravrai7cr32y1w8"; + sha256 = "0lgd77vrddvyn8afkxr7a7hblmp4k5sr0i9i1032xdih2bipdd9f"; }; prePatch = '' substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \ --replace "six==1.11.0" "six>=1.11.0" \ - --replace "python-slugify==1.2.6" "python-slugify>=1.2.6" + --replace "python-slugify<2.0.0" "python-slugify>2.0.0" ''; # Requires external resources From b4a7b66d829afee50aef67fc641d79d6ed1001ab Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 14 Apr 2020 12:41:31 +0300 Subject: [PATCH 51/52] openmpt123: 0.4.11 -> 0.4.12 --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index aebc7dc7baa7..de903bf32768 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.4.11"; + version = "0.4.12"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1g96bpwh419s429wb387lkmhjsn3ldsjrzrb8h9p3wva5z6943i6"; + sha256 = "0q2yf9g6hcwvr2nk3zggkscyf0np6i03q2g7fx10i2kcdr3n9k8c"; }; enableParallelBuilding = true; From b1e93ddf4dc49bdfb3e545f25f6896a44fe70063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Apr 2020 17:37:57 +0100 Subject: [PATCH 52/52] ferm: 2.4.1 -> 2.5.1 --- pkgs/tools/networking/ferm/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 8fcdeb234ec3..855a57b7720f 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -3,23 +3,27 @@ let inherit (stdenv.lib.versions) majorMinor; in stdenv.mkDerivation rec { - version = "2.5"; + version = "2.5.1"; pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; - sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p"; + sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb"; }; - buildInputs = [ perl ipset ebtables iptables makeWrapper ]; - preConfigure = '' - substituteInPlace config.mk --replace "PERL = /usr/bin/perl" "PERL = ${perl}/bin/perl" - substituteInPlace config.mk --replace "PREFIX = /usr" "PREFIX = $out" - ''; + # perl is used at build time to gather the ferm version. + nativeBuildInputs = [ makeWrapper perl ]; + buildInputs = [ perl ]; + + makeFlags = [ + "PERL=perl" + "PREFIX=${placeholder "out"}" + ]; + postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${iptables}/bin:${ipset}/bin:${ebtables}/bin" + wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}" done '';