From 8cdab19f7b5d390b669c97e5a3ba4c9617ad64bd Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 6 May 2021 14:08:19 +0200 Subject: [PATCH 01/46] appgate-sdp: 5.3.3 -> 5.4.0 --- .../applications/networking/appgate-sdp/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index f6006468d85..e9e22741c41 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -33,6 +33,7 @@ , libXrandr , libXrender , libXtst +, libxkbcommon , libsecret , libuuid , libxcb @@ -81,6 +82,7 @@ let libXrandr libXrender libXtst + libxkbcommon libsecret libuuid libxcb @@ -97,11 +99,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8"; + sha256 = "sha256-2DzZ5JnFGBeaHtDf7CAXb/qv6kVI+sYMW5Nc25E3eNA="; }; dontConfigure = true; @@ -170,9 +172,14 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary done + # fail if there are missing dependencies + ldd $out/opt/appgate/appgate | grep -i 'not found' && exit 1 + ldd $out/opt/appgate/service/appgateservice.bin | grep -i 'not found' && exit 1 + ldd $out/opt/appgate/appgate-driver | grep -i 'not found' && exit 1 + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH - wrapProgram $out/bin/appgate --prefix PATH : ${xdg-utils}/bin + wrapProgram $out/bin/appgate --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; From 360abc8e2a66392c016fd1e60db2095cc8a7907e Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 27 Apr 2021 23:06:21 +0200 Subject: [PATCH 02/46] v8: Fix darwin build --- pkgs/development/libraries/v8/default.nix | 30 ++++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index d513e01b7a3..7c463aa0122 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, glib, pkg-config, icu +, gn, ninja, python, pythonPackages, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -55,6 +55,11 @@ stdenv.mkDerivation rec { doCheck = true; patches = [ + # Remove unrecognized clang debug flags + (fetchpatch { + url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch"; + sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1"; + }) ./darwin.patch ./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149 ]; @@ -78,6 +83,13 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace build/config/compiler/compiler.gni \ + --replace 'strip_absolute_paths_from_debug_symbols = true' \ + 'strip_absolute_paths_from_debug_symbols = false' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ + 'false' ''; gnFlags = [ @@ -85,6 +97,7 @@ stdenv.mkDerivation rec { "is_clang=${lib.boolToString stdenv.cc.isClang}" "use_sysroot=false" # "use_system_icu=true" + "clang_use_chrome_plugins=false" "is_component_build=false" "v8_use_external_startup_data=false" "v8_monolithic=true" @@ -93,16 +106,25 @@ stdenv.mkDerivation rec { "treat_warnings_as_errors=false" "v8_enable_i18n_support=true" "use_gold=false" - "use_system_xcode=true" + "init_stack_vars=false" # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; NIX_CFLAGS_COMPILE = "-O2"; + FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; - nativeBuildInputs = [ gn ninja pkg-config python ] - ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; + nativeBuildInputs = [ + gn + ninja + pkg-config + python + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + darwin.DarwinTools + pythonPackages.setuptools + ]; buildInputs = [ glib icu ]; ninjaFlags = [ ":d8" "v8_monolith" ]; From b1ae7fa5c4c9c2fedae0badcc075d4a06252fd4a Mon Sep 17 00:00:00 2001 From: Bruce Toll <4109762+tollb@users.noreply.github.com> Date: Wed, 12 May 2021 11:11:54 -0400 Subject: [PATCH 03/46] mdbtools: 0.8.2 -> 0.9.3 Updated to version 0.9.3. This addresses numerous issues, including an mdb-schema problem where debugging comments were included in the output. Updated github repository owner to reflect new upstream for mdbtools. Updated packaging to remove support for gmdb2. Upstream split out support for this largely unmaintained component to another repo: https://github.com/mdbtools/gmdb2. For more information, see: https://github.com/mdbtools/mdbtools/blob/dev/NEWS Note: Version tags in the repository are prefixed with a "v" starting with the 0.9.0 series. Also, the previous 0.8.2 tag does not exist in the new upstream mdbtools repository. The commit it pointed to is still present as: commit b753ff36a0f1d88ae8a300ed6712f4aa2ddb7d08 Author: Cyber Emissary Date: Fri Dec 28 08:03:02 2018 -0500 Bumped version to 0.8.2 and updated change log --- pkgs/tools/misc/mdbtools/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 1c327365916..b25a850311e 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,32 +1,26 @@ { stdenv, lib, fetchFromGitHub, glib, readline , bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper , txt2man, which -# withUi currently doesn't work. It compiles but fails to run. -, withUi ? false, gtk2, gnome2 }: -let - uiDeps = [ gtk2 ] ++ (with gnome2; [ GConf libglade libgnomeui gnome-doc-utils ]); - -in stdenv.mkDerivation rec { pname = "mdbtools"; - version = "0.8.2"; + version = "0.9.3"; src = fetchFromGitHub { - owner = "cyberemissary"; + owner = "mdbtools"; repo = "mdbtools"; - rev = version; - sha256 = "12rhf6rgnws6br5dn1l2j7i77q9p4l6ryga10jpax01vvzhr26qc"; + rev = "v${version}"; + sha256 = "11cv7hh8j8akpgm1a6pp7im6iacpgx6wzcg9n9rmb41j0fgxamdf"; }; configureFlags = [ "--disable-scrollkeeper" ]; nativeBuildInputs = [ pkg-config bison flex autoreconfHook txt2man which - ] ++ lib.optional withUi libxslt; + ]; - buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; + buildInputs = [ glib readline ]; enableParallelBuilding = true; From feebe402f55fcb38b873370bee8fa09979018e85 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 13 May 2021 15:29:25 +0300 Subject: [PATCH 04/46] treewide: remove duplicates SystemCallFilters --- nixos/modules/services/databases/redis.nix | 2 +- nixos/modules/services/misc/jellyfin.nix | 4 +--- nixos/modules/services/network-filesystems/samba-wsdd.nix | 2 +- nixos/modules/services/networking/croc.nix | 4 +--- nixos/modules/services/web-apps/shiori.nix | 5 +---- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 7ec10c0eb5a..c4d51958e23 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -331,7 +331,7 @@ in { PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @raw-io @reboot @resources @setuid @swap"; + SystemCallFilter = "~@cpu-emulation @debug @keyring @memlock @mount @obsolete @privileged @resources @setuid"; }; }; }; diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index c1b45864041..6d64acc0291 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -92,9 +92,7 @@ in SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" - - "~@chown" "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@module" - "~@obsolete" "~@privileged" "~@setuid" + "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" ]; }; }; diff --git a/nixos/modules/services/network-filesystems/samba-wsdd.nix b/nixos/modules/services/network-filesystems/samba-wsdd.nix index c68039c79e2..800ef448d37 100644 --- a/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -117,7 +117,7 @@ in { PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap"; + SystemCallFilter = "~@cpu-emulation @debug @mount @obsolete @privileged @resources"; }; }; }; diff --git a/nixos/modules/services/networking/croc.nix b/nixos/modules/services/networking/croc.nix index b218fab2196..9466adf71d8 100644 --- a/nixos/modules/services/networking/croc.nix +++ b/nixos/modules/services/networking/croc.nix @@ -72,9 +72,7 @@ in RuntimeDirectoryMode = "700"; SystemCallFilter = [ "@system-service" - "~@aio" "~@chown" "~@keyring" "~@memlock" - "~@privileged" "~@resources" "~@setuid" - "~@sync" "~@timer" + "~@aio" "~@keyring" "~@memlock" "~@privileged" "~@resources" "~@setuid" "~@sync" "~@timer" ]; SystemCallArchitectures = "native"; SystemCallErrorNumber = "EPERM"; diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixos/modules/services/web-apps/shiori.nix index 8f96dd9b5dd..a15bb9744a9 100644 --- a/nixos/modules/services/web-apps/shiori.nix +++ b/nixos/modules/services/web-apps/shiori.nix @@ -86,10 +86,7 @@ in { SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" - - "~@chown" "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" - "~@module" "~@obsolete" "~@privileged" "~@raw-io" - "~@resources" "~@setuid" + "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@resources" "~@setuid" ]; }; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index d811879b7b1..033e1584c11 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -850,7 +850,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@chown @cpu-emulation @debug @keyring @ipc @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap"; + SystemCallFilter = "~@cpu-emulation @debug @keyring @ipc @mount @obsolete @privileged @setuid"; }; }; From 895f68dcec1ad729fcef69dbe5e06462f4a06bdb Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Fri, 14 May 2021 08:08:51 -0700 Subject: [PATCH 05/46] spotify-qt: 3.5 -> 3.6 Signed-off-by: Ana Hobden --- pkgs/applications/audio/spotify-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 211e45f7b17..629cc4bd116 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "spotify-qt"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "kraxarn"; repo = pname; rev = "v${version}"; - sha256 = "1bgd0q4sbbww3lbrx2zwgaz0sl7qh195s4kvgsq16gv7ij82bskn"; + sha256 = "mKHyE6ZffMYYRLMpzMX53chyJyWxhTAaGvtBI3l6wkI="; }; buildInputs = [ libxcb qtbase qtsvg ]; From cc60f81e69154789ad3e23f0ec60110ed3f7aece Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 14 May 2021 17:27:25 +0200 Subject: [PATCH 06/46] writeDirectReferencesToFile: init --- doc/builders/trivial-builders.chapter.md | 21 ++++++++++ pkgs/build-support/trivial-builders.nix | 29 ++++++++++++++ pkgs/build-support/trivial-builders/test.nix | 20 ++++++++++ pkgs/build-support/trivial-builders/test.sh | 41 ++++++++++++++++++++ pkgs/test/default.nix | 2 + 5 files changed, 113 insertions(+) create mode 100644 pkgs/build-support/trivial-builders/test.nix create mode 100755 pkgs/build-support/trivial-builders/test.sh diff --git a/doc/builders/trivial-builders.chapter.md b/doc/builders/trivial-builders.chapter.md index 32944567c05..432183eaf0f 100644 --- a/doc/builders/trivial-builders.chapter.md +++ b/doc/builders/trivial-builders.chapter.md @@ -50,3 +50,24 @@ Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, ` ## `symlinkJoin` {#trivial-builder-symlinkJoin} This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. + +## `writeDirectReferencesToFile` {#trivial-builder-writeDirectReferencesToFile} + +Writes the set of references to the output file, that is, their immediate dependencies. + +This produces the equivalent of `nix-store -q --references`. + +For example, + +```nix +writeDirectReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'') +``` + +produces an output path `/nix/store/-runtime-references` containing + +```nix +/nix/store/-hello-2.10 +``` + +but none of `hello`'s dependencies, because those are not referenced directly +by `hi`'s output. diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 142a04f9a10..0bf67d21b3b 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -438,6 +438,35 @@ rec { done < graph ''; + /* + Write the set of references to a file, that is, their immediate dependencies. + + This produces the equivalent of `nix-store -q --references`. + */ + writeDirectReferencesToFile = path: runCommand "runtime-references" + { + exportReferencesGraph = ["graph" path]; + inherit path; + } + '' + touch ./references + while read p; do + read dummy + read nrRefs + if [[ $p == $path ]]; then + for ((i = 0; i < nrRefs; i++)); do + read ref; + echo $ref >>./references + done + else + for ((i = 0; i < nrRefs; i++)); do + read ref; + done + fi + done < graph + sort ./references >$out + ''; + /* Print an error message if the file with the specified name and * hash doesn't exist in the Nix store. This function should only diff --git a/pkgs/build-support/trivial-builders/test.nix b/pkgs/build-support/trivial-builders/test.nix new file mode 100644 index 00000000000..0902a537222 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test.nix @@ -0,0 +1,20 @@ +{ lib, nixosTest, path, writeText, hello, figlet, stdenvNoCC }: + +nixosTest { + name = "nixpkgs-trivial-builders"; + nodes.machine = { ... }: { + virtualisation.writableStore = true; + + # Test runs without network, so we don't substitute and prepare our deps + nix.binaryCaches = lib.mkForce []; + environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( + builtins.toJSON [hello figlet stdenvNoCC] + ); + }; + testScript = '' + machine.succeed(""" + cd ${lib.cleanSource path} + ./pkgs/build-support/trivial-builders/test.sh 2>/dev/console + """) + ''; +} diff --git a/pkgs/build-support/trivial-builders/test.sh b/pkgs/build-support/trivial-builders/test.sh new file mode 100755 index 00000000000..eec501ae601 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# -------------------------------------------------------------------------- # +# +# trivial-builders test +# +# -------------------------------------------------------------------------- # +# +# This file can be run independently (quick): +# +# $ pkgs/build-support/trivial-builders/test.sh +# +# or in the build sandbox with a ~20s VM overhead +# +# $ nix-build -A tests.trivial-builders +# +# -------------------------------------------------------------------------- # + +# strict bash +set -euo pipefail + +# debug +# set -x +# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' + +cd "$(dirname ${BASH_SOURCE[0]})" # nixpkgs root + +testDirectReferences() { + expr="$1" + diff -U3 \ + <(sort <$(nix-build --no-out-link --expr "with import ../../.. {}; writeDirectReferencesToFile ($expr)")) \ + <(nix-store -q --references $(nix-build --no-out-link --expr "with import ../../.. {}; ($expr)") | sort) +} + +testDirectReferences 'hello' +testDirectReferences 'figlet' +testDirectReferences 'writeText "hi" "hello"' +testDirectReferences 'writeText "hi" "hello ${hello}"' +testDirectReferences 'writeText "hi" "hello ${hello} ${figlet}"' + +echo 'OK!' diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 89656dde292..b9f05bdff8d 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -50,5 +50,7 @@ with pkgs; cuda = callPackage ./cuda { }; + trivial = callPackage ../build-support/trivial-builders/test.nix {}; + writers = callPackage ../build-support/writers/test.nix {}; } From ed4523186e452d185d8ba1d1eabe07ace33a4f87 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 15 May 2021 15:10:55 +0200 Subject: [PATCH 07/46] writeReferencesToFile: docs and tests --- doc/builders/trivial-builders.chapter.md | 26 +++++++++++++++++++++ pkgs/build-support/trivial-builders/test.sh | 16 +++++++++++++ 2 files changed, 42 insertions(+) diff --git a/doc/builders/trivial-builders.chapter.md b/doc/builders/trivial-builders.chapter.md index 432183eaf0f..bc1317cc49c 100644 --- a/doc/builders/trivial-builders.chapter.md +++ b/doc/builders/trivial-builders.chapter.md @@ -51,6 +51,32 @@ Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, ` This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. +## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile} + +Writes the closure of transitive dependencies to a file. + +This produces the equivalent of `nix-store -q --requisites`. + +For example, + +```nix +writeReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'') +``` + +produces an output path `/nix/store/-runtime-deps` containing + +```nix +/nix/store/-hello-2.10 +/nix/store/-hi +/nix/store/-libidn2-2.3.0 +/nix/store/-libunistring-0.9.10 +/nix/store/-glibc-2.32-40 +``` + +You can see that this includes `hi`, the original input path, +`hello`, which is a direct reference, but also +the other paths that are indirectly required to run `hello`. + ## `writeDirectReferencesToFile` {#trivial-builder-writeDirectReferencesToFile} Writes the set of references to the output file, that is, their immediate dependencies. diff --git a/pkgs/build-support/trivial-builders/test.sh b/pkgs/build-support/trivial-builders/test.sh index eec501ae601..3e21b000815 100755 --- a/pkgs/build-support/trivial-builders/test.sh +++ b/pkgs/build-support/trivial-builders/test.sh @@ -38,4 +38,20 @@ testDirectReferences 'writeText "hi" "hello"' testDirectReferences 'writeText "hi" "hello ${hello}"' testDirectReferences 'writeText "hi" "hello ${hello} ${figlet}"' + + +testClosure() { + expr="$1" + diff -U3 \ + <(sort <$(nix-build --no-out-link --expr "with import ../../.. {}; writeReferencesToFile ($expr)")) \ + <(nix-store -q --requisites $(nix-build --no-out-link --expr "with import ../../.. {}; ($expr)") | sort) +} + +testClosure 'hello' +testClosure 'figlet' +testClosure 'writeText "hi" "hello"' +testClosure 'writeText "hi" "hello ${hello}"' +testClosure 'writeText "hi" "hello ${hello} ${figlet}"' + + echo 'OK!' From 1dde95b786497c3b4e410ef276565ba6e660568d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 00:37:10 +0000 Subject: [PATCH 08/46] alembic: 1.8.0 -> 1.8.1 --- pkgs/development/libraries/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index cbfec4dd46a..333dbb053f5 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-c4SN3kNY8415+O/2AYuHNQFEmuTBtLaWj5fsj0yJ2vs="; + sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo="; }; outputs = [ "bin" "dev" "out" "lib" ]; From a741aa3fc426a7dd46ba40873c8df89681db2d7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 10:50:45 +0000 Subject: [PATCH 09/46] cargo-crev: 0.19.2 -> 0.19.4 --- pkgs/development/tools/rust/cargo-crev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 57866918f07..9e95ee4430c 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.19.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-aqvdAljAJsYtmxz/WtMrrnmJJRXDpqDjUn1LusoM8ns="; + sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q="; }; - cargoSha256 = "sha256-KwnZmehh0vdR1eSPBrY6yHJR6r7mhIEgfN4soEBDTjU="; + cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8="; nativeBuildInputs = [ perl pkg-config ]; From 351f9114b0b63eaa3d94e396330545e190774858 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sat, 24 Apr 2021 15:42:14 +0000 Subject: [PATCH 10/46] julia: init julia_16-bin at 1.6.1 Relevant patches lifted from the `release-1.6` branch of my Julia fork: https://git.sr.ht/~ninjin/julia-nix/tree/release-1.6 --- pkgs/development/compilers/julia/1.6-bin.nix | 73 +++++++++++++++++++ ...Skip-tempname-test-broken-in-sandbox.patch | 28 +++++++ ...x-Skip-chown-tests-broken-in-sandbox.patch | 27 +++++++ ...able-parallel-unit-tests-for-sandbox.patch | 30 ++++++++ pkgs/top-level/all-packages.nix | 4 + 5 files changed, 162 insertions(+) create mode 100644 pkgs/development/compilers/julia/1.6-bin.nix create mode 100644 pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch create mode 100644 pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch create mode 100644 pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix new file mode 100644 index 00000000000..19aab27ba74 --- /dev/null +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -0,0 +1,73 @@ +{ autoPatchelfHook, fetchurl, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "julia-bin"; + version = "1.6.1"; + + src = { + x86_64-linux = fetchurl { + url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; + sha256 = "01i5sm4vqb0y5qznql571zap19b42775drrcxnzsyhpaqgg8m23w"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # Julia’s source files are in different locations for source and binary + # releases. Thus we temporarily create a symlink to allow us to share patches + # with source releases. + prePatch = '' + ln -s share/julia/test + ''; + patches = [ + # Source release Nix patch(es) relevant for binary releases as well. + ./patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch + ./patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch + ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch + ]; + postPatch = '' + # Revert symlink hack. + rm test + + # Julia fails to pick up our Certification Authority root certificates, but + # it provides its own so we can simply disable the test. Patching in the + # dynamic path to ours require us to rebuild the Julia system image. + substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ + --replace '@test ca_roots_path() != bundled_ca_roots()' \ + '@test_skip ca_roots_path() != bundled_ca_roots()' + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + cp -r . $out + runHook postInstall + ''; + + # Breaks backtraces, etc. + dontStrip = true; + + doInstallCheck = true; + preInstallCheck = '' + # Some tests require read/write access to $HOME. + export HOME="$TMPDIR" + ''; + installCheckPhase = '' + runHook preInstallCheck + # Command lifted from `test/Makefile`. + $out/bin/julia \ + --check-bounds=yes \ + --startup-file=no \ + --depwarn=error \ + $out/share/julia/test/runtests.jl + runHook postInstallCheck + ''; + + meta = { + description = "High-level, high-performance dynamic language for technical computing."; + homepage = "https://julialang.org"; + # Bundled and linked with various GPL code, although Julia itself is MIT. + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ninjin raskin ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch new file mode 100644 index 00000000000..d47efe25c5a --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch @@ -0,0 +1,28 @@ +From ffe227676352a910754d96d92e9b06e475f28ff1 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 04:25:19 +0000 +Subject: [PATCH 2/6] nix: Skip `tempname` test broken in sandbox + +Reported upstream: + + https://github.com/JuliaLang/julia/issues/38873 +--- + test/file.jl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/file.jl b/test/file.jl +index 0f39bc7c14..bd4dd78f62 100644 +--- a/test/file.jl ++++ b/test/file.jl +@@ -95,7 +95,7 @@ end + @test dirname(t) == tempdir() + mktempdir() do d + t = tempname(d) +- @test dirname(t) == d ++ @test_skip dirname(t) == d + end + @test_throws ArgumentError tempname(randstring()) + end +-- +2.29.3 + diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch new file mode 100644 index 00000000000..e63c88c8fe3 --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch @@ -0,0 +1,27 @@ +From b20357fb1044d2c100172b1d5cbdf6c6d9bd3590 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 05:10:39 +0000 +Subject: [PATCH 3/6] nix: Skip `chown` tests broken in sandbox + +--- + test/file.jl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/file.jl b/test/file.jl +index bd4dd78f62..06fd4e49da 100644 +--- a/test/file.jl ++++ b/test/file.jl +@@ -503,8 +503,8 @@ if !Sys.iswindows() + @test stat(file).gid == 0 + @test stat(file).uid == 0 + else +- @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user +- @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup) ++ @test_skip @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user ++ @test_skip @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup) + end + else + # test that chown doesn't cause any errors for Windows +-- +2.29.3 + diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch new file mode 100644 index 00000000000..243a9cfd76a --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch @@ -0,0 +1,30 @@ +From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 04:37:44 +0000 +Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox + +Disabled by default due to lack of networking in the Nix sandbox. This +greatly speeds up the build process on a multi-core system. +--- + test/runtests.jl | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..2f8c19fa32 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on +- n = min(Sys.CPU_THREADS, length(tests)) ++ if net_on || haskey(ENV, "NIX_BUILD_CORES") ++ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS ++ n = min(x, Sys.CPU_THREADS, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end +-- +2.29.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1544ad8c68d..74260b966b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11113,6 +11113,10 @@ in julia-stable = julia_15; julia = julia-lts; + julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; + julia-stable-bin = julia_16-bin; + + jwasm = callPackage ../development/compilers/jwasm { }; knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; From 8949ae188a04bee92b57778ad4d94948fd4b4b0b Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Tue, 27 Apr 2021 14:39:21 +0000 Subject: [PATCH 11/46] julia: init julia_10-bin at 1.0.5 Almost as clean as it could be, but was forced to set `LD_LIBRARY_PATH` to work around a `Libdl` failure that is unique to v1.0.x. --- pkgs/development/compilers/julia/1.0-bin.nix | 72 +++++++++++++++ ...ip-tests-that-require-network-access.patch | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/julia/1.0-bin.nix create mode 100644 pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch diff --git a/pkgs/development/compilers/julia/1.0-bin.nix b/pkgs/development/compilers/julia/1.0-bin.nix new file mode 100644 index 00000000000..50c421bbd43 --- /dev/null +++ b/pkgs/development/compilers/julia/1.0-bin.nix @@ -0,0 +1,72 @@ +{ autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }: + +stdenv.mkDerivation rec { + pname = "julia-bin"; + version = "1.0.5"; + + src = { + x86_64-linux = fetchurl { + url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; + sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # Julia’s source files are in different locations for source and binary + # releases. Thus we temporarily create symlinks to allow us to share patches + # with source releases. + prePatch = '' + ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib + ln -s share/julia/test + ''; + patches = [ + # Source release Nix patch(es) relevant for binary releases as well. + ./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch + ]; + postPatch = '' + # Revert symlink hack. + rm stdlib test + ''; + + buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + cp -r . $out + # Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is + # only necessary on v1.0.x and a cleaner solution is welcome, but after + # staring at `strace` for a few hours this is as clean as I could make it. + wrapProgram $out/bin/julia \ + --suffix LD_LIBRARY_PATH : $out/lib + runHook postInstall + ''; + + # Breaks backtraces, etc. + dontStrip = true; + + doInstallCheck = true; + installCheckInputs = [ openssl ]; + preInstallCheck = '' + # Some tests require read/write access to $HOME. + export HOME="$TMPDIR" + ''; + installCheckPhase = '' + runHook preInstallCheck + # Command lifted from `test/Makefile`. + $out/bin/julia \ + --check-bounds=yes \ + --startup-file=no \ + --depwarn=error \ + $out/share/julia/test/runtests.jl + runHook postInstallCheck + ''; + + meta = { + description = "High-level, high-performance dynamic language for technical computing"; + homepage = "https://julialang.org"; + # Bundled and linked with various GPL code, although Julia itself is MIT. + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ninjin raskin ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch b/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch new file mode 100644 index 00000000000..0de1f7c010d --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch @@ -0,0 +1,87 @@ +From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Mon, 15 Mar 2021 05:55:18 +0000 +Subject: [PATCH 2/3] nix: Skip tests that require network access + +Necessary as the Nix build sandbox does not permit network access. +--- + stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++----------------- + test/file.jl | 4 ++-- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl +index 6145f87616..9cc7a001e5 100644 +--- a/stdlib/Sockets/test/runtests.jl ++++ b/stdlib/Sockets/test/runtests.jl +@@ -151,33 +151,33 @@ defaultport = rand(2000:4000) + end + + @testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin +- @test getnameinfo(ip"192.0.2.1") == "192.0.2.1" +- @test getnameinfo(ip"198.51.100.1") == "198.51.100.1" +- @test getnameinfo(ip"203.0.113.1") == "203.0.113.1" +- @test getnameinfo(ip"0.1.1.1") == "0.1.1.1" +- @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" +- @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" +- @test getnameinfo(ip"2001:db8::1") == "2001:db8::1" ++ @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1" ++ @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1" ++ @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1" ++ @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1" ++ @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" ++ @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" ++ @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1" + end + + @testset "getnameinfo on some valid IP addresses" begin + @test !isempty(getnameinfo(ip"::")::String) +- @test !isempty(getnameinfo(ip"0.0.0.0")::String) +- @test !isempty(getnameinfo(ip"10.1.0.0")::String) +- @test !isempty(getnameinfo(ip"10.1.0.255")::String) +- @test !isempty(getnameinfo(ip"10.1.255.1")::String) +- @test !isempty(getnameinfo(ip"255.255.255.255")::String) +- @test !isempty(getnameinfo(ip"255.255.255.0")::String) +- @test !isempty(getnameinfo(ip"192.168.0.1")::String) +- @test !isempty(getnameinfo(ip"::1")::String) ++ @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String) ++ @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String) ++ @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String) ++ @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String) ++ @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String) ++ @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String) ++ @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String) ++ @test_skip !isempty(getnameinfo(ip"::1")::String) + end + + @testset "getaddrinfo" begin +- let localhost = getnameinfo(ip"127.0.0.1")::String +- @test !isempty(localhost) && localhost != "127.0.0.1" +- @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) +- @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" +- @test try ++ let localhost = getnameinfo(ip"::")::String ++ @test_skip !isempty(localhost) && localhost != "127.0.0.1" ++ @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) ++ @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" ++ @test_skip try + getaddrinfo(localhost, IPv6)::IPv6 != ip"::" + catch ex + isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost +diff --git a/test/file.jl b/test/file.jl +index e86476f975..579276f82c 100644 +--- a/test/file.jl ++++ b/test/file.jl +@@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER) + else + @test_throws ErrorException symlink(file, "ba\0d") + end +-@test_throws ArgumentError download("good", "ba\0d") +-@test_throws ArgumentError download("ba\0d", "good") ++@test_skip @test_throws ArgumentError download("good", "ba\0d") ++@test_skip @test_throws ArgumentError download("ba\0d", "good") + + ################### + # walkdir # +-- +2.29.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74260b966b7..a3c56ab5516 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11113,9 +11113,12 @@ in julia-stable = julia_15; julia = julia-lts; + julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; - julia-stable-bin = julia_16-bin; + julia-lts-bin = julia_10-bin; + julia-stable-bin = julia_16-bin; + julia-bin = julia-lts-bin; jwasm = callPackage ../development/compilers/jwasm { }; From 348858f2971310be9fba9a8ce3ee214dad5630c0 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 16 May 2021 10:59:56 -0700 Subject: [PATCH 12/46] nixos/security.pki: handle PEMs w/o a final newline According to the ABNF grammar for PEM files described in [RFC 7468][1], an eol character (i.e. a newline) is not mandatory after the posteb line (i.e. "-----END CERTIFICATE-----" in the case of certificates). This commit makes our CA certificate bundler expression account for the possibility that files in config.security.pki.certificateFiles might not have final newlines, by using `awk` instead of `cat` to concatenate them. (`awk` prints a final newline from each input file even if the file doesn't end with a newline.) [1]: https://datatracker.ietf.org/doc/html/rfc7468#section-3 --- nixos/modules/security/ca.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 1c4ee421fc5..7df86e71423 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -10,15 +10,10 @@ let blacklist = cfg.caCertificateBlacklist; }; - caCertificates = pkgs.runCommand "ca-certificates.crt" - { files = - cfg.certificateFiles ++ - [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; - preferLocalBuild = true; - } - '' - cat $files > $out - ''; + caCertificates = pkgs.runCommand "ca-certificates.crt" { + files = cfg.certificateFiles ++ [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; + preferLocalBuild = true; + } "awk 1 $files > $out"; # awk ensures a newline between each pair of consecutive files in From 85c40fb0f85b89eb273e2cc47124200877782967 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 03:36:01 +0000 Subject: [PATCH 13/46] chezmoi: 2.0.11 -> 2.0.12 --- 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 b2916dab33c..b4fa271ff58 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-z9ALpoF2ZLigAG/uvoYVG1YTy+EM4bDQDDtxd3PgQW8="; + sha256 = "sha256-CF/Ers/w1ZGBSvRVxyNf1R4CwwidK9ItiFBCIjToYg0="; }; - vendorSha256 = "sha256-CYDFEVZ04csn4BjvwUvfOafEjucnDHyeYU7gNwO1xTQ="; + vendorSha256 = "sha256-tdd3uUxN+ZJ0hX4IqSM/xPZzcawtOa5xgjPhRrns5yM="; doCheck = false; From 20467ad058ade328d95aac43307dc1eceedfa56b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 05:18:48 +0000 Subject: [PATCH 14/46] findomain: 4.2.1 -> 4.3.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index cdea68e5698..018a210e4aa 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-yVjxwgReZhdArTXr1rUsU+pKIlxCVVf3NfR0znqzfxA="; + sha256 = "sha256-UC70XmhAVf2a2QO9bkIRE5vEsWyIA0DudZfKraNffGY="; }; - cargoSha256 = "sha256-t1/BQD8ostyMJh/HoZ7n3bKw5LfDZQeq03AO7JY0G8E="; + cargoSha256 = "sha256-Cdfh3smX6UjiG29L9hG22bOQQIjaNrv+okl153mIiso="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 74e27e2236429cdf5c35eb0ff9b489aaab52b6c3 Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Fri, 14 May 2021 00:49:07 -0300 Subject: [PATCH 15/46] slade-git: 3.1.2 -> 3.2.0 --- pkgs/applications/misc/slade/git.nix | 30 ++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index dfbfbe55669..f263c4ee74d 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,18 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub +, cmake +, pkg-config +, wxGTK +, sfml +, fluidsynth +, curl +, freeimage +, ftgl +, glew +, zip +, lua +, fmt +, mpg123 +}: stdenv.mkDerivation { - name = "slade-git-3.1.2.2018.01.29"; + name = "slade-git-3.2.0.2021.05.13"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "f7409c504b40c4962f419038db934c32688ddd2e"; - sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld"; + rev = "d2e249c89062a44c912a9b86951526edc8735ba0"; + sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg"; }; - cmakeFlags = ["-DNO_WEBVIEW=1"]; + cmakeFlags = [ + "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DWX_GTK3=OFF" + "-DNO_WEBVIEW=1" + ]; nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ]; meta = with lib; { description = "Doom editor"; From 28b48756d5d2da3bb659f11a4eb0b1231a47d1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 10:59:58 +0200 Subject: [PATCH 16/46] hetzner-kube: fix darwin build --- .../cluster/hetzner-kube/default.nix | 9 ++++ .../cluster/hetzner-kube/fix-home.patch | 53 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index d0afe6d2e43..f66e5f88e72 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,6 +11,13 @@ buildGoModule rec { sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; }; + patches = [ + # Use $HOME instead of the OS user database. + # Upstream PR: https://github.com/xetys/hetzner-kube/pull/346 + # Unfortunately, the PR patch does not apply against release. + ./fix-home.patch + ]; + vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h"; doCheck = false; @@ -25,6 +32,8 @@ buildGoModule rec { ]; postInstall = '' + # Need a writable home, because it fails if unable to write config. + export HOME=$TMP $out/bin/hetzner-kube completion bash > hetzner-kube $out/bin/hetzner-kube completion zsh > _hetzner-kube installShellCompletion --zsh _hetzner-kube diff --git a/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch b/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch new file mode 100644 index 00000000000..1b3bbae65f4 --- /dev/null +++ b/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch @@ -0,0 +1,53 @@ +diff --git a/cmd/cluster_kubeconfig.go b/cmd/cluster_kubeconfig.go +index 54cc0c9..fab288a 100644 +--- a/cmd/cluster_kubeconfig.go ++++ b/cmd/cluster_kubeconfig.go +@@ -6,7 +6,7 @@ import ( + "io/ioutil" + "log" + "os" +- "os/user" ++ "path/filepath" + "strings" + + "github.com/spf13/cobra" +@@ -52,9 +52,8 @@ Example 4: hetzner-kube cluster kubeconfig -n my-cluster -p > my-conf.yaml # pri + } else { + fmt.Println("create file") + +- usr, _ := user.Current() +- dir := usr.HomeDir +- path := fmt.Sprintf("%s/.kube", dir) ++ dir, _ := os.UserHomeDir() ++ path := filepath.Join(dir, ".kube") + + if _, err := os.Stat(path); os.IsNotExist(err) { + os.MkdirAll(path, 0755) +diff --git a/cmd/config.go b/cmd/config.go +index ce0f3e5..a03c4ba 100644 +--- a/cmd/config.go ++++ b/cmd/config.go +@@ -8,7 +8,6 @@ import ( + "io/ioutil" + "log" + "os" +- "os/user" + "path/filepath" + + "github.com/hetznercloud/hcloud-go/hcloud" +@@ -28,13 +27,8 @@ type AppSSHClient struct { + // NewAppConfig creates a new AppConfig struct using the locally saved configuration file. If no local + // configuration file is found a new config will be created. + func NewAppConfig() AppConfig { +- usr, err := user.Current() +- if err != nil { +- return AppConfig{} +- } +- if usr.HomeDir != "" { +- DefaultConfigPath = filepath.Join(usr.HomeDir, ".hetzner-kube") +- } ++ dir, _ := os.UserHomeDir() ++ DefaultConfigPath = filepath.Join(dir, ".hetzner-kube") + + appConf := AppConfig{ + Context: context.Background(), From 371d80c468a3cf7343cab49b780d5e08d40f6b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 22:27:23 +0200 Subject: [PATCH 17/46] libical: fix darwin build --- pkgs/development/libraries/libical/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index fa396e96650..d7eb085df7f 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -12,13 +12,12 @@ , libical , python3 , tzdata +, fixDarwinDylibNames , introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform -, gobject-introspection ? null -, vala ? null +, gobject-introspection +, vala }: -assert introspectionSupport -> gobject-introspection != null && vala != null; - stdenv.mkDerivation rec { pname = "libical"; version = "3.0.9"; @@ -47,6 +46,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals introspectionSupport [ gobject-introspection vala + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; installCheckInputs = [ # running libical-glib tests @@ -80,6 +81,13 @@ stdenv.mkDerivation rec { # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables doInstallCheck = true; enableParallelChecking = false; + preInstallCheck = if stdenv.isDarwin then '' + for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do + for lib in $(cd lib && ls *.3.dylib); do + install_name_tool -change $lib $out/lib/$lib $testexe + done + done + '' else null; installCheckPhase = '' runHook preInstallCheck From 04aa238c1a700680f19ecbaaae5e3012352b5342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 15 May 2021 22:39:02 +0200 Subject: [PATCH 18/46] gnucap: broken on darwin Gnucap relies on LD_LIBRARY_PATH both in its build process and in code, which Darwin does not understand. --- pkgs/applications/science/electronics/gnucap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/electronics/gnucap/default.nix b/pkgs/applications/science/electronics/gnucap/default.nix index c51e5de93d6..0ec10f2444f 100644 --- a/pkgs/applications/science/electronics/gnucap/default.nix +++ b/pkgs/applications/science/electronics/gnucap/default.nix @@ -21,6 +21,7 @@ It performs nonlinear dc and transient analyses, fourier analysis, and ac analys changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; platforms = platforms.all; + broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH maintainers = [ maintainers.raboof ]; }; } From 329ec3d17cd8392a3e01e5ac35dbbe114a719e5c Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 14 May 2021 10:37:36 +0200 Subject: [PATCH 19/46] influxdb2: 2.0.2 -> 2.0.6 * update libflux to version 0.115.0 * chronograf-ui has been renamed to influxdb-ui --- pkgs/servers/nosql/influxdb2/default.nix | 16 ++++++++-------- .../nosql/influxdb2/influx-ui-package.json | 11 ++++++----- .../nosql/influxdb2/influx-ui-yarndeps.nix | 8 ++++---- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 0f6cb5a438b..b6c41de8176 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -13,15 +13,15 @@ # dependencies nix expression. let - version = "2.0.2"; - shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out - libflux_version = "0.95.0"; + version = "2.0.6"; + shorthash = "4db98b4c9a"; # git rev-parse HEAD with 2.0.6 checked out + libflux_version = "0.115.0"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; rev = "v${version}"; - sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn"; + sha256 = "1x74p87csx4m4cgijk57xs75nikv3bnh7skgnzk30ab1ar13iirw"; }; ui = mkYarnPackage { @@ -31,7 +31,7 @@ let yarnNix = ./influx-ui-yarndeps.nix; configurePhase = '' cp -r $node_modules ui/node_modules - rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules + rsync -r $node_modules/../deps/influxdb-ui/node_modules/ ui/node_modules ''; INFLUXDB_SHA = shorthash; buildPhase = '' @@ -52,10 +52,10 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3"; + sha256 = "0zplwsk9xidv8l9sqbxqivy6q20ryd31fhrzspn1mjn4i45kkwz1"; }; sourceRoot = "source/libflux"; - cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h"; + cargoSha256 = "06gh466q7qkid0vs5scic0qqlz3h81yb00nwn8nwq8ppr5z2ijyq"; nativeBuildInputs = [ llvmPackages.libclang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; pkgcfg = '' @@ -80,7 +80,7 @@ in buildGoModule { nativeBuildInputs = [ go-bindata pkg-config ]; - vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; + vendorSha256 = "03pabm0h9q0v5dfdq9by2l2n32bz9imwalz0aw897vsrfhci0ldf"; subPackages = [ "cmd/influxd" "cmd/influx" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; diff --git a/pkgs/servers/nosql/influxdb2/influx-ui-package.json b/pkgs/servers/nosql/influxdb2/influx-ui-package.json index d57813bf2a8..1a3840f1548 100644 --- a/pkgs/servers/nosql/influxdb2/influx-ui-package.json +++ b/pkgs/servers/nosql/influxdb2/influx-ui-package.json @@ -1,12 +1,12 @@ { - "name": "chronograf-ui", - "version": "2.0.2", + "name": "influxdb-ui", + "version": "2.0.5", "private": false, - "license": "AGPL-3.0", + "license": "MIT", "description": "", "repository": { "type": "git", - "url": "github:influxdata/chronograf" + "url": "github:influxdata/ui" }, "engines": { "node": ">=10.5.0", @@ -40,6 +40,7 @@ "eslint:circleci": "eslint", "eslint:fix": "eslint --fix '{src,cypress}/**/*.{ts,tsx}'", "prettier": "prettier --config .prettierrc.json --check '{src,cypress}/**/*.{ts,tsx}'", + "prettier:circleci": "prettier --config .prettierrc.json --check", "prettier:fix": "prettier --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'", "tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck", "tsc:cypress": "tsc -p ./cypress/tsconfig.json --noEmit --pretty --skipLibCheck", @@ -134,7 +135,7 @@ "dependencies": { "@influxdata/clockface": "2.3.4", "@influxdata/flux": "^0.5.1", - "@influxdata/flux-lsp-browser": "^0.5.23", + "@influxdata/flux-lsp-browser": "^0.5.41", "@influxdata/giraffe": "0.29.0", "@influxdata/influx": "0.5.5", "@influxdata/influxdb-templates": "0.9.0", diff --git a/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix b/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix index 1779d270cf1..53795e76322 100644 --- a/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix +++ b/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix @@ -666,11 +666,11 @@ }; } { - name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz"; + name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz"; path = fetchurl { - name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz"; - url = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.23.tgz"; - sha1 = "b3d1579e26ff21a11771003cbcaebe5fef82d73c"; + name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz"; + url = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.41.tgz"; + sha1 = "abf6c5ad253317f34a9217ecfd250d78fe625a83"; }; } { From f37710e94ed4381f5a85a1e47fbc35c002c12303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 13:32:20 +0200 Subject: [PATCH 20/46] influxdb2: fix darwin build --- pkgs/servers/nosql/influxdb2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index b6c41de8176..1e65689444f 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -7,6 +7,8 @@ , mkYarnPackage , pkg-config , rustPlatform +, stdenv +, libiconv }: # Note for maintainers: use ./update-influxdb2.sh to update the Yarn @@ -57,6 +59,7 @@ let sourceRoot = "source/libflux"; cargoSha256 = "06gh466q7qkid0vs5scic0qqlz3h81yb00nwn8nwq8ppr5z2ijyq"; nativeBuildInputs = [ llvmPackages.libclang ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; pkgcfg = '' Name: flux @@ -71,6 +74,8 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; in buildGoModule { From 76417690557857f31f6909acb9b928d6f1f0e9de Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 17 May 2021 08:28:09 +0200 Subject: [PATCH 21/46] nixos/fancontrol: back to running as root regular users don't have write access to /sys/devices which is where the kernel endpoints are to control fan speed --- nixos/modules/services/hardware/fancontrol.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix index 3722db5bc51..5574c5a132e 100644 --- a/nixos/modules/services/hardware/fancontrol.nix +++ b/nixos/modules/services/hardware/fancontrol.nix @@ -31,16 +31,6 @@ in config = mkIf cfg.enable { - users = { - groups.lm_sensors = {}; - - users.fancontrol = { - isSystemUser = true; - group = "lm_sensors"; - description = "fan speed controller"; - }; - }; - systemd.services.fancontrol = { documentation = [ "man:fancontrol(8)" ]; description = "software fan control"; @@ -49,8 +39,6 @@ in serviceConfig = { ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}"; - Group = "lm_sensors"; - User = "fancontrol"; }; }; }; From eec3738f4c033b38b4ddd542f796418955258116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 12:20:21 +0200 Subject: [PATCH 22/46] hsetroot: fix darwin build --- pkgs/tools/X11/hsetroot/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 69842a7bd59..95ccd9586d9 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { libXinerama ]; + postPatch = lib.optionalString (!stdenv.cc.isGNU) '' + sed -i -e '/--no-as-needed/d' Makefile + ''; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' From f2dd3eac0e7b7d7b98c53895a162f28971e4e3bb Mon Sep 17 00:00:00 2001 From: David Date: Tue, 11 May 2021 18:08:11 +0200 Subject: [PATCH 23/46] rebar3-nix: init at 0.1.0 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/beam-modules/default.nix | 1 + .../beam-modules/rebar3-nix/default.nix | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/development/beam-modules/rebar3-nix/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c281a9dfc25..145e670254d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2511,6 +2511,12 @@ githubId = 1316469; name = "Naomi Morse"; }; + dlesl = { + email = "dlesl@dlesl.com"; + github = "dlesl"; + githubId = 28980797; + name = "David Leslie"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 3375fd61260..601505e1f48 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -23,6 +23,7 @@ let # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; + rebar3-nix = callPackage ./rebar3-nix { }; fetchHex = callPackage ./fetch-hex.nix { }; diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix new file mode 100644 index 00000000000..ff248700d78 --- /dev/null +++ b/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -0,0 +1,18 @@ +{ lib, buildRebar3, fetchFromGitHub }: +buildRebar3 rec { + name = "rebar3_nix"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "erlang-nix"; + repo = name; + rev = "v${version}"; + sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + }; + + meta = { + description = "nix integration for rebar3"; + license = lib.licenses.bsd3; + homepage = "https://github.com/erlang-nix/rebar3_nix"; + maintainers = with lib.maintainers; [ dlesl gleber ]; + }; +} From 34ea3cd906ae88e36561aa83f28bf9600745cbdb Mon Sep 17 00:00:00 2001 From: David Date: Tue, 11 May 2021 18:08:30 +0200 Subject: [PATCH 24/46] rebar3: add updateScript --- .../tools/build-managers/rebar3/default.nix | 30 +++++++++++++++++-- .../build-managers/rebar3/rebar-deps.nix | 3 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 16b630f36b9..95ffc0c957c 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, - fetchHex, erlang, makeWrapper }: + fetchHex, erlang, makeWrapper, + writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let version = "3.15.1"; owner = "erlang"; - deps = import ./rebar-deps.nix { inherit fetchHex; }; + deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; }; rebar3 = stdenv.mkDerivation rec { pname = "rebar3"; inherit version erlang; @@ -63,6 +64,31 @@ let license = lib.licenses.asl20; }; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -ox errexit + PATH=${ + lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + (rebar3WithPlugins { globalPlugins = [rebar3-nix]; }) + ] + } + latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + if [ "$latest" != "${version}" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3" + update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix" + tmpdir=$(mktemp -d) + cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir" + (cd "$tmpdir" && rebar3 nix lock -o "$nix_path/rebar-deps.nix") + else + echo "rebar3 is already up-to-date" + fi + ''; }; rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }: let diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 60dfc0b5b83..3aa1d1c165d 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,4 +1,5 @@ -{ fetchHex }: +# Generated by rebar3_nix +{ fetchHex, fetchFromGitHub }: { ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; From 9541ad60e1f3e560bae0fe348266aa6642f9b412 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 14 May 2021 01:31:41 +0200 Subject: [PATCH 25/46] gitkraken: 7.5.5 -> 7.6.0 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c8b95fa238f..247bb9b53ef 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.5.5"; + version = "7.6.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0l40ap0ck2ywjarmn7lmpw4qbsdkx717d9kmx67p4qlmbwpimqhg"; + sha256 = "11818d8ph9qqisdpkv46afhr79qq128gaz5d0n7b48dx25ih1jb9"; }; dontBuild = true; From b5f84d830b514435c5e37928ffce0300b8170d88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 15 May 2021 20:31:36 +0200 Subject: [PATCH 26/46] doc: Add anchors to dhall sections This will ensure the sections have stable links as well as prevent conflicts (pandoc uses heading text for ids and DocBook requires unique ids across the book). --- doc/languages-frameworks/dhall.section.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 6ff397237a8..d1adcbf736b 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -5,7 +5,7 @@ support for importing Dhall expressions, which is documented here: * [`dhall-lang.org` - Installing packages](https://docs.dhall-lang.org/tutorials/Language-Tour.html#installing-packages) -## Remote imports +## Remote imports {#ssec-dhall-remote-imports} Nixpkgs bypasses Dhall's support for remote imports using Dhall's semantic integrity checks. Specifically, any Dhall import can be protected by @@ -32,7 +32,7 @@ example, the Prelude Dhall package uses `pkgs.fetchFromGitHub` to fetch the to fetch Dhall code ensures that Dhall packages built using Nix remain pure and also behave well when built within a sandbox. -## Packaging a Dhall expression from scratch +## Packaging a Dhall expression from scratch {#ssec-dhall-packaging-expression} We can illustrate how Nixpkgs integrates Dhall by beginning from the following trivial Dhall expression with one dependency (the Prelude): @@ -117,7 +117,7 @@ in $ nix build --file ./example.nix dhallPackages.true ``` -## Contents of a Dhall package +## Contents of a Dhall package {#ssec-dhall-package-contents} The above package produces the following directory tree: @@ -224,7 +224,7 @@ $ cat ./result/source.dhall … ``` -## Packaging functions +## Packaging functions {#ssec-dhall-packaging-functions} We already saw an example of using `buildDhallPackage` to create a Dhall package from a single file, but most Dhall packages consist of more than one @@ -297,7 +297,7 @@ terms of `buildDhallPackage` that accepts the following arguments: Additionally, `buildDhallGitHubPackage` accepts the same arguments as `fetchFromGitHub`, such as `sha256` or `fetchSubmodules`. -## `dhall-to-nixpkgs` +## `dhall-to-nixpkgs` {#ssec-dhall-dhall-to-nixpkgs} You can use the `dhall-to-nixpkgs` command-line utility to automate packaging Dhall code. For example: @@ -342,7 +342,7 @@ $ dhall-to-nixpkgs directory ~/proj/dhall-semver } ``` -## Overriding dependency versions +## Overriding dependency versions {#ssec-dhall-overriding-dependency-versions} Suppose that we change our `true.dhall` example expression to depend on an older version of the Prelude (19.0.0): @@ -415,7 +415,7 @@ like this: }; ``` -## Overrides +## Overrides {#ssec-dhall-overrides} You can override any of the arguments to `buildDhallGitHubPackage` or `buildDhallDirectoryPackage` using the `overridePackage` attribute of a package. From 354e005d6c7a910fd009b90360545fed8ddba4a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 May 2021 01:32:18 +0200 Subject: [PATCH 27/46] nixos/dconf: fix d-bus activation dconf now supports autostarting the d-bus service using systemd's d-bus activation. https://gitlab.gnome.org/GNOME/dconf/-/commit/2781a8684855e4120c9948d8b40880bafafe1b12 On NixOS, that requires making systemd aware of the package. Fixes: https://github.com/NixOS/nixpkgs/issues/123265 --- nixos/modules/programs/dconf.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index ec85cb9d18c..298abac8afa 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -54,6 +54,8 @@ in services.dbus.packages = [ pkgs.dconf ]; + systemd.packages = [ pkgs.dconf ]; + # For dconf executable environment.systemPackages = [ pkgs.dconf ]; From 915abd3f08a06e02e06c2e6769749db4c9c38df4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 9 May 2021 22:49:12 +0700 Subject: [PATCH 28/46] coqPackages.aac-tactics: init --- .../coq-modules/aac-tactics/default.nix | 46 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/coq-modules/aac-tactics/default.nix diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix new file mode 100644 index 00000000000..445a0422446 --- /dev/null +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -0,0 +1,46 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "aac-tactics"; + + releaseRev = v: "v${v}"; + + release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY="; + release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM="; + release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU="; + release."8.10.0".sha256 = "sha256-Ny3AgfLAzrz3FnoUqejXLApW+krlkHBmYlo3gAG0JsM="; + release."8.9.0".sha256 = "sha256-6Pp0dgYEnVaSnkJR/2Cawt5qaxWDpBI4m0WAbQboeWY="; + release."8.8.0".sha256 = "sha256-mwIKp3kf/6i9IN3cyIWjoRtW8Yf8cc3MV744zzFM3u4="; + release."8.6.1".sha256 = "sha256-PfovQ9xJnzr0eh/tO66yJ3Yp7A5E1SQG46jLIrrbZFg="; + release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = "8.13"; out = "8.13.0"; } + { case = "8.12"; out = "8.12.0"; } + { case = "8.11"; out = "8.11.0"; } + { case = "8.10"; out = "8.10.0"; } + { case = "8.9"; out = "8.9.0"; } + { case = "8.8"; out = "8.8.0"; } + { case = "8.6"; out = "8.6.1"; } + { case = "8.5"; out = "8.5.0"; } + ] null; + + mlPlugin = true; + + meta = { + description = "Coq plugin providing tactics for rewriting universally quantified equations"; + longDescription = '' + This Coq plugin provides tactics for rewriting universally quantified + equations, modulo associativity and commutativity of some operator. + The tactics can be applied for custom operators by registering the + operators and their properties as type class instances. Many common + operator instances, such as for Z binary arithmetic and booleans, are + provided with the plugin. + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6027cd92d44..4ad5b7b0f15 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -13,6 +13,7 @@ let contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs {}); + aac-tactics = callPackage ../development/coq-modules/aac-tactics {}; autosubst = callPackage ../development/coq-modules/autosubst {}; bignums = if lib.versionAtLeast coq.coq-version "8.6" then callPackage ../development/coq-modules/bignums {} From 8ff27c0c094ca9d69f92f731116fb00476d1439d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 9 May 2021 22:49:35 +0700 Subject: [PATCH 29/46] coqPackages.relation-algebra: init --- .../coq-modules/relation-algebra/default.nix | 35 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/coq-modules/relation-algebra/default.nix diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix new file mode 100644 index 00000000000..da74215d537 --- /dev/null +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -0,0 +1,35 @@ +{ lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }: +with lib; + +mkCoqDerivation { + pname = "relation-algebra"; + owner = "damien-pous"; + + releaseRev = v: "v${v}"; + + release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU="; + release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM="; + release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos="; + release."1.7.2".sha256 = "sha256-f4oNjXspNMEz3AvhIeYO3avbUa1AThoC9DbcHMb5A2o="; + release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "1.7.5"; } + { case = isGe "8.12"; out = "1.7.4"; } + { case = isGe "8.11"; out = "1.7.3"; } + { case = isGe "8.10"; out = "1.7.2"; } + { case = isGe "8.9"; out = "1.7.1"; } + ] null; + + mlPlugin = true; + + propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ]; + + meta = { + description = "Relation algebra library for Coq"; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 4ad5b7b0f15..e89f1a57c90 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -69,6 +69,7 @@ let paramcoq = callPackage ../development/coq-modules/paramcoq {}; pocklington = callPackage ../development/coq-modules/pocklington {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; + relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; simple-io = callPackage ../development/coq-modules/simple-io { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; From f2e899e01a02e10ae0affd879bd445aa57eb05a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 09:26:47 +0000 Subject: [PATCH 30/46] nextdns: 1.10.1 -> 1.11.0 --- pkgs/applications/networking/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index b65ba8d94cf..a27f1fdad25 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow="; + sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8="; }; vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; From 9c6daedb29d870d1aee176b717d3769bb3191c06 Mon Sep 17 00:00:00 2001 From: Kanashimia Date: Sun, 16 May 2021 21:24:44 +0300 Subject: [PATCH 31/46] keepassxc: add readline support, minor refactor --- pkgs/applications/misc/keepassx/community.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index af259c199d8..fe09345349e 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -23,6 +23,7 @@ , qtsvg , qtx11extras , quazip +, readline , wrapQtAppsHook , yubikey-personalization , zlib @@ -51,13 +52,13 @@ stdenv.mkDerivation rec { sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ + NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -108,12 +109,14 @@ stdenv.mkDerivation rec { qtbase qtsvg qtx11extras + readline yubikey-personalization zlib ] - ++ lib.optional withKeePassKeeShareSecure quazip - ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; + ++ optional withKeePassKeeShareSecure quazip + ++ optional stdenv.isDarwin qtmacextras + ++ optional (stdenv.isDarwin && withKeePassTouchID) + darwin.apple_sdk.frameworks.LocalAuthentication; preFixup = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. @@ -123,8 +126,14 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.keepassxc; meta = { - description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; - longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; + description = "Offline password manager with many features."; + longDescription = '' + A community fork of KeePassX, which is itself a port of KeePass Password Safe. + The goal is to extend and improve KeePassX with new features and bugfixes, + to provide a feature-rich, fully cross-platform and modern open-source password manager. + Accessible via native cross-platform GUI, CLI, has browser integration + using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser) + ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato turion ]; From 734790006a73879bd15dd4601a85c0c646a75065 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 18 Mar 2021 10:47:35 +0100 Subject: [PATCH 32/46] platformio: 5.0.4 -> 5.1.1 --- pkgs/development/arduino/platformio/core.nix | 50 +++++++++++++++---- .../arduino/platformio/default.nix | 4 +- .../use-local-spdx-license-list.patch | 10 ++-- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 17e87f2cb6c..4f6f762bd74 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,9 +1,25 @@ -{ stdenv, lib, buildPythonApplication, bottle -, click, click-completion, colorama, semantic-version -, lockfile, pyserial, requests -, tabulate, pyelftools, marshmallow -, pytest, tox, jsondiff -, git, spdx-license-list-data +{ stdenv, lib, buildPythonApplication +, ajsonrpc +, bottle +, click +, click-completion +, colorama +, git +, jsondiff +, lockfile +, marshmallow +, pyelftools +, pyserial +, pytest +, requests +, semantic-version +, spdx-license-list-data +, starlette +, tabulate +, tox +, uvicorn +, wsproto +, zeroconf , version, src }: @@ -78,10 +94,24 @@ in buildPythonApplication rec { pname = "platformio"; inherit version src; - propagatedBuildInputs = [ - bottle click click-completion colorama git - lockfile pyserial requests semantic-version - tabulate pyelftools marshmallow + propagatedBuildInputs = [ + ajsonrpc + bottle + click + click-completion + colorama + git + lockfile + marshmallow + pyelftools + pyserial + requests + semantic-version + starlette + tabulate + uvicorn + wsproto + zeroconf ]; HOME = "/tmp"; diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index 194385e7952..312c2d1044b 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.0.4"; + version = "5.1.1"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84"; + sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00"; }; self = { diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 511d81c3b01..e0016adcf7d 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,11 +1,15 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index f293ba5a..a818271f 100644 +index addc4c5..514b0ad 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema): +@@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- spdx_data_url = "https://dl.bintray.com/platformio/dl-misc/spdx-licenses-3.json" +- version = "3.12" +- spdx_data_url = ( +- "https://raw.githubusercontent.com/spdx/license-list-data/" +- "v%s/json/licenses.json" % version +- ) - return json.loads(fetch_remote_content(spdx_data_url)) + return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json")) From 29158fc0ac28d3a826b57754552034d8030df199 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 12 Feb 2021 09:10:25 +0100 Subject: [PATCH 33/46] nixos/postgresql: fix description of ensureUsers.ensurePermissions `attrName` and `attrValue` are now in correct order. --- nixos/modules/services/databases/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index fdc05312ece..effc9182472 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -159,7 +159,7 @@ in For more information on how to specify the target and on which privileges exist, see the GRANT syntax. - The attributes are used as GRANT ''${attrName} ON ''${attrValue}. + The attributes are used as GRANT ''${attrValue} ON ''${attrName}. ''; example = literalExample '' { From 7423afb5e46a685b7804327d8b31ef723cadf26b Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 12 Feb 2021 09:12:30 +0100 Subject: [PATCH 34/46] nixos/molly-brown: fix description of certPath `allowKeysForGroup` is no longer available so this drops ``` security.acme.certs."example.com".allowKeysForGroup = true; ``` line. `SupplementaryGroups` should be enough for allowing access to certificates. --- nixos/modules/services/web-servers/molly-brown.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-servers/molly-brown.nix b/nixos/modules/services/web-servers/molly-brown.nix index e0587f3b471..58db9b9beda 100644 --- a/nixos/modules/services/web-servers/molly-brown.nix +++ b/nixos/modules/services/web-servers/molly-brown.nix @@ -41,7 +41,6 @@ in { As an example: - security.acme.certs."example.com".allowKeysForGroup = true; systemd.services.molly-brown.serviceConfig.SupplementaryGroups = [ config.security.acme.certs."example.com".group ]; From 16b0f078907b39fcdf1c938342c3529a49e3cafb Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 12 Feb 2021 09:20:25 +0100 Subject: [PATCH 35/46] nixos/nginx: fix comment about acme postRun not running as root As of 67a5d66 this is no longer true, since acme postRun runs as root. The idea of the service is good so reword a comment a bit. --- nixos/modules/services/web-servers/nginx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1a078ea6bd5..705f041eeab 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -867,8 +867,9 @@ in source = configFile; }; - # postRun hooks on cert renew can't be used to restart Nginx since renewal - # runs as the unprivileged acme user. sslTargets are added to wantedBy + before + # This service waits for all certificates to be available + # before reloading nginx configuration. + # sslTargets are added to wantedBy + before # which allows the acme-finished-$cert.target to signify the successful updating # of certs end-to-end. systemd.services.nginx-config-reload = let From d9252ffa6947a1179cfaf45f6d4a5c37ef72a65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 11:40:22 +0200 Subject: [PATCH 36/46] cfdg: use ffmpeg instead of ffmpeg_3 --- pkgs/tools/graphics/cfdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 9295bbe28d5..44a1e0d1d2a 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: +{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }: stdenv.mkDerivation rec { pname = "cfdg"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; - buildInputs = [ libpng bison flex ffmpeg_3 icu ]; + buildInputs = [ libpng bison flex ffmpeg icu ]; postPatch = '' sed -e "/YY_NO_UNISTD/a#include " -i src-common/cfdg.l From c05b1b567e3f11da82665880f9fd72d68fb2d52e Mon Sep 17 00:00:00 2001 From: roblabla Date: Tue, 11 May 2021 02:43:37 +0200 Subject: [PATCH 37/46] cargo-embed: 0.8.0 -> 0.10.1 --- pkgs/development/tools/rust/cargo-embed/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 989885e99a7..4fb994b3ee2 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,22 +1,24 @@ { lib , rustPlatform, fetchFromGitHub -, libusb1, pkg-config, rustfmt }: +, libusb1, libftdi1, pkg-config, rustfmt }: rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.8.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; + sha256 = "1z8n883cb4jca3phi9x2kwl01xclyr00l8jxgiyd28l2jik78i5k"; }; - cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + cargoSha256 = "1ir9qngxmja6cm42m40jqbga9mlfjllm23ca26wyigjv3025pi6i"; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 libftdi1 ]; + + cargoBuildFlags = [ "--features=ftdi" ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; From 13300901559f0bd655ce4b942f998a242bed1bfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 09:57:23 +0000 Subject: [PATCH 38/46] cargo-cache: 0.6.1 -> 0.6.2 --- pkgs/development/tools/rust/cargo-cache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 71d4646c1a1..092a0a10b1a 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY="; + sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM="; }; - cargoSha256 = "sha256-OpqVP097GYiARq7gbsMGFFGkFaQz3qeux12aMJj7W3Y="; + cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From ff6d2142ce18b323165a772a8d3f77fed86fa233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 11:28:31 +0200 Subject: [PATCH 39/46] ghostwriter: 2.0.0 -> 2.0.1 https://github.com/wereturtle/ghostwriter/releases/tag/2.0.1 --- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 4d6eafaa0f0..d23b42811b8 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-5O2W7ZQeDkNzwi6t9MfNbv4fmNvak1AcMnzJTE1F9L8="; + sha256 = "sha256-bNVhYwX60F3lrP9UmZSntfz83vbmHe9tu/4nUgzUWR4="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; From 6569cadf665d5dd52460639ee9ef8ac143884f03 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Mon, 17 May 2021 11:21:16 +0200 Subject: [PATCH 40/46] cargo-flash: fix build Since v0.10.0 cargo-flash uses sentry for logging, which requires openssl. --- pkgs/development/tools/rust/cargo-flash/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index b615ebeaf39..a2679b53c4b 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchFromGitHub , libusb1 +, openssl , pkg-config , rustfmt , Security @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-P7xyg9I1MhmiKlyAI9cvABcYKNxB6TSvTgMsMk5KxAQ="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; From cd8f3e6c448c1622b26a80c62e03e42857ec099b Mon Sep 17 00:00:00 2001 From: DavHau Date: Sat, 15 May 2021 01:46:36 +0700 Subject: [PATCH 41/46] python3Packages.scikitlearn: rename to scikit-learn --- nixos/modules/services/development/jupyter/default.nix | 2 +- nixos/modules/services/development/jupyterhub/default.nix | 2 +- pkgs/development/python-modules/batchgenerators/default.nix | 4 ++-- .../python-modules/bayesian-optimization/default.nix | 4 ++-- pkgs/development/python-modules/cnvkit/default.nix | 4 ++-- pkgs/development/python-modules/dask-glm/default.nix | 4 ++-- pkgs/development/python-modules/dask-ml/default.nix | 4 ++-- pkgs/development/python-modules/dftfit/default.nix | 4 ++-- pkgs/development/python-modules/gensim/default.nix | 4 ++-- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- pkgs/development/python-modules/hmmlearn/default.nix | 4 ++-- pkgs/development/python-modules/hyppo/default.nix | 4 ++-- pkgs/development/python-modules/ignite/default.nix | 4 ++-- pkgs/development/python-modules/imbalanced-learn/0.4.nix | 4 ++-- .../development/python-modules/imbalanced-learn/default.nix | 4 ++-- pkgs/development/python-modules/kmapper/default.nix | 4 ++-- pkgs/development/python-modules/librosa/default.nix | 4 ++-- pkgs/development/python-modules/lightgbm/default.nix | 4 ++-- pkgs/development/python-modules/mlrose/default.nix | 4 ++-- pkgs/development/python-modules/mlxtend/default.nix | 6 +++--- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- pkgs/development/python-modules/moviepy/default.nix | 6 +++--- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- pkgs/development/python-modules/osmnx/default.nix | 4 ++-- pkgs/development/python-modules/persim/default.nix | 4 ++-- pkgs/development/python-modules/ppscore/default.nix | 4 ++-- pkgs/development/python-modules/pygbm/default.nix | 4 ++-- pkgs/development/python-modules/pynndescent/default.nix | 4 ++-- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- pkgs/development/python-modules/qiskit-aqua/default.nix | 4 ++-- pkgs/development/python-modules/qiskit-ignis/default.nix | 4 ++-- pkgs/development/python-modules/ripser/default.nix | 4 ++-- pkgs/development/python-modules/scikit-bio/default.nix | 4 ++-- .../python-modules/{scikitlearn => scikit-learn}/0.20.nix | 0 .../{scikitlearn => scikit-learn}/default.nix | 0 pkgs/development/python-modules/scikit-optimize/default.nix | 4 ++-- pkgs/development/python-modules/scikit-tda/default.nix | 4 ++-- pkgs/development/python-modules/seqeval/default.nix | 4 ++-- pkgs/development/python-modules/shap/default.nix | 4 ++-- pkgs/development/python-modules/sklearn-deap/default.nix | 4 ++-- pkgs/development/python-modules/skorch/default.nix | 4 ++-- pkgs/development/python-modules/textacy/default.nix | 4 ++-- pkgs/development/python-modules/umap-learn/default.nix | 4 ++-- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- pkgs/development/python-modules/word2vec/default.nix | 4 ++-- pkgs/development/python-modules/xgboost/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- pkgs/top-level/python2-packages.nix | 2 +- 49 files changed, 94 insertions(+), 92 deletions(-) rename pkgs/development/python-modules/{scikitlearn => scikit-learn}/0.20.nix (100%) rename pkgs/development/python-modules/{scikitlearn => scikit-learn}/default.nix (100%) diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index 6a5fd6b2940..21b84b3bcda 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -131,7 +131,7 @@ in { env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ ipykernel pandas - scikitlearn + scikit-learn ])); in { displayName = "Python 3 for machine learning"; diff --git a/nixos/modules/services/development/jupyterhub/default.nix b/nixos/modules/services/development/jupyterhub/default.nix index f1dcab68b00..a1df4468cff 100644 --- a/nixos/modules/services/development/jupyterhub/default.nix +++ b/nixos/modules/services/development/jupyterhub/default.nix @@ -117,7 +117,7 @@ in { env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ ipykernel pandas - scikitlearn + scikit-learn ])); in { displayName = "Python 3 for machine learning"; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 8706a31d571..336c6b2e513 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -8,7 +8,7 @@ , numpy , pillow , scipy -, scikitlearn +, scikit-learn , scikitimage , threadpoolctl }: @@ -28,7 +28,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - future numpy pillow scipy scikitlearn scikitimage threadpoolctl + future numpy pillow scipy scikit-learn scikitimage threadpoolctl ]; checkInputs = [ pytestCheckHook unittest2 ]; diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index c41181ca7b0..1e896d82678 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python -, scikitlearn +, scikit-learn , scipy , pytest , isPy27 @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - scikitlearn + scikit-learn scipy ]; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 5baa28e4bd7..6347c8552bf 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -6,7 +6,7 @@ , biopython , numpy , scipy -, scikitlearn +, scikit-learn , pandas , matplotlib , reportlab @@ -42,7 +42,7 @@ buildPythonPackage rec { biopython numpy scipy - scikitlearn + scikit-learn pandas matplotlib reportlab diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index d091785db11..9072a691c20 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -7,7 +7,7 @@ , multipledispatch , setuptools-scm , scipy -, scikitlearn +, scikit-learn , pytestCheckHook }: @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; + propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikit-learn ]; meta = with lib; { homepage = "https://github.com/dask/dask-glm/"; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index b02c9a71a6b..ff1b145ee8a 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -6,7 +6,7 @@ , numpy, toolz # dask[array] , numba , pandas -, scikitlearn +, scikit-learn , scipy , dask-glm , six @@ -39,7 +39,7 @@ buildPythonPackage rec { numpy packaging pandas - scikitlearn + scikit-learn scipy six toolz diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 73791bdaa9a..778b8c3d984 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -8,7 +8,7 @@ , pandas , scipy , numpy -, scikitlearn +, scikit-learn , lammps-cython , pymatgen-lammps , pytestrunner @@ -34,7 +34,7 @@ buildPythonPackage rec { pandas scipy numpy - scikitlearn + scikit-learn lammps-cython pymatgen-lammps ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index be6321f86ca..b6b6f42b3c3 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -5,7 +5,7 @@ , six , scipy , smart_open -, scikitlearn, testfixtures, unittest2 +, scikit-learn, testfixtures, unittest2 , isPy3k }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ smart_open numpy six scipy ]; - checkInputs = [ scikitlearn testfixtures unittest2 ]; + checkInputs = [ scikit-learn testfixtures unittest2 ]; # Two tests fail. # diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index b4e8803784b..758f988a239 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -8,7 +8,7 @@ , matplotlib , networkx , numpy -, scikitlearn +, scikit-learn , scipy , seaborn }: @@ -31,7 +31,7 @@ buildPythonPackage rec { matplotlib networkx numpy - scikitlearn + scikit-learn scipy seaborn ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index d2590d14955..269062a1e71 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -5,7 +5,7 @@ , numpy , pytestCheckHook , scipy -, scikitlearn +, scikit-learn , fetchPypi , joblib , six @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ]; + propagatedBuildInputs = [ numpy scipy scikit-learn joblib six ]; preCheck = '' cd hdbscan/tests rm __init__.py diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 8d2afcf5e72..eb7e05afff7 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }: +{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }: buildPythonPackage rec { pname = "hmmlearn"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm cython ]; - propagatedBuildInputs = [ numpy scikitlearn ]; + propagatedBuildInputs = [ numpy scikit-learn ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index cc0b569d9b2..9fdeca082b2 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pytestcov , numba , numpy -, scikitlearn +, scikit-learn , scipy , matplotlib , seaborn @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numba numpy - scikitlearn + scikit-learn scipy ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 71bed73f9d7..f745b735f34 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -8,7 +8,7 @@ , mock , pytorch , pynvml -, scikitlearn +, scikit-learn , tqdm }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; - propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index 96ba16b1cd1..6709092ca95 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: +{ lib, buildPythonPackage, fetchPypi, scikit-learn, pandas, nose, pytest }: buildPythonPackage rec { pname = "imbalanced-learn"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083"; }; - propagatedBuildInputs = [ scikitlearn ]; + propagatedBuildInputs = [ scikit-learn ]; checkInputs = [ nose pytest pandas ]; checkPhase = '' export HOME=$PWD diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index cf3fca9aa03..aad2e3e07a4 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -4,7 +4,7 @@ , isPy27 , pandas , pytestCheckHook -, scikitlearn +, scikit-learn }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w"; }; - propagatedBuildInputs = [ scikitlearn ]; + propagatedBuildInputs = [ scikit-learn ]; checkInputs = [ pytestCheckHook pandas ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index abba8354399..87f22172c49 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, scikitlearn +, scikit-learn , numpy , scipy , jinja2 @@ -25,7 +25,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - scikitlearn + scikit-learn numpy scipy jinja2 diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index ce8f2a73fa7..45f6bffd661 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -4,7 +4,7 @@ , joblib , matplotlib , six -, scikitlearn +, scikit-learn , decorator , audioread , resampy @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839"; }; - propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ]; + propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; # No tests # 1. Internet connection is required diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 1018ceaec4b..a887c3ec8af 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -4,7 +4,7 @@ , cmake , numpy , scipy -, scikitlearn +, scikit-learn , llvmPackages ? null }: @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy - scikitlearn + scikit-learn ]; postConfigure = '' diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index b17b56b8f9e..2187f272680 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, scikitlearn +, scikit-learn , pytestCheckHook , pytest-randomly }: @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ scikitlearn ]; + propagatedBuildInputs = [ scikit-learn ]; checkInputs = [ pytest-randomly pytestCheckHook ]; postPatch = '' diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 44402b36ec0..4692dc61c22 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , scipy , numpy -, scikitlearn +, scikit-learn , pandas , matplotlib , joblib @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ scipy numpy - scikitlearn + scikit-learn pandas matplotlib joblib @@ -45,7 +45,7 @@ buildPythonPackage rec { license= licenses.bsd3; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; - # incompatible with nixpkgs scikitlearn version + # incompatible with nixpkgs scikit-learn version broken = true; }; } diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index bed191c39e3..d8add2608b6 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -11,7 +11,7 @@ , matplotlib , nibabel , pandas -, scikitlearn +, scikit-learn }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { matplotlib nibabel pandas - scikitlearn + scikit-learn ]; preCheck = '' export HOME=$TMP diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 4cd1fec3d8b..c3acdbe71ec 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -13,14 +13,14 @@ , advancedProcessing ? false , opencv3 ? null , scikitimage ? null -, scikitlearn ? null +, scikit-learn ? null , scipy ? null , matplotlib ? null , youtube-dl ? null }: assert advancedProcessing -> ( - opencv3 != null && scikitimage != null && scikitlearn != null + opencv3 != null && scikitimage != null && scikit-learn != null && scipy != null && matplotlib != null && youtube-dl != null); buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy decorator imageio imageio-ffmpeg tqdm requests proglog ] ++ (lib.optionals advancedProcessing [ - opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl + opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl ]); meta = with lib; { diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index e3ce770398e..39edd7e34da 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib -, nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }: +, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }: buildPythonPackage rec { pname = "nilearn"; @@ -20,7 +20,7 @@ buildPythonPackage rec { numpy pandas requests - scikitlearn + scikit-learn scipy ]; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 3cd420c7491..a55d26d83c2 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}: +, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy}: buildPythonPackage rec { pname = "osmnx"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z"; }; - propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; + propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy ]; # requires network doCheck = false; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 65f3529e60c..2868cea4aea 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -6,7 +6,7 @@ , joblib , matplotlib , numpy -, scikitlearn +, scikit-learn , scipy , pytestCheckHook }: @@ -26,7 +26,7 @@ buildPythonPackage rec { joblib matplotlib numpy - scikitlearn + scikit-learn scipy ]; diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index ad3a393a00d..43dd1f249ed 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pandas -, scikitlearn +, scikit-learn , pytestCheckHook }: @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas - scikitlearn + scikit-learn ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix index 0d2747c1cb4..5367f622e9b 100644 --- a/pkgs/development/python-modules/pygbm/default.nix +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -4,7 +4,7 @@ , scipy , numpy , numba -, scikitlearn +, scikit-learn , pytest , pythonOlder }: @@ -25,7 +25,7 @@ buildPythonPackage rec { scipy numpy numba - scikitlearn + scikit-learn ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 8cddeb8873f..fa9db26b5e3 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, scikitlearn +, scikit-learn , scipy , numba , llvmlite @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - scikitlearn + scikit-learn scipy numba llvmlite diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index fd2c80af890..e340d5eefad 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , numpy -, scikitlearn +, scikit-learn , pytestCheckHook , pytorch , torchvision @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pytorch - scikitlearn + scikit-learn torchvision tqdm ]; diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index b1cdd7f523c..3233e435f07 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -14,7 +14,7 @@ , qiskit-ignis , qiskit-terra , quandl -, scikitlearn +, scikit-learn , yfinance # Optional inputs , withTorch ? false @@ -59,7 +59,7 @@ buildPythonPackage rec { qiskit-terra qiskit-ignis quandl - scikitlearn + scikit-learn yfinance ] ++ lib.optionals (withTorch) [ pytorch ] ++ lib.optionals (withPyscf) [ pyscf ] diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 403fa0f05a9..996259f683b 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -5,7 +5,7 @@ , python , numpy , qiskit-terra -, scikitlearn +, scikit-learn , scipy # Optional package inputs , withVisualization ? false @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy qiskit-terra - scikitlearn + scikit-learn scipy ] ++ lib.optionals (withCvx) [ cvxpy ] ++ lib.optionals (withVisualization) [ matplotlib ] diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index acd017a7a2e..7bc7df0b8fd 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -5,7 +5,7 @@ , cython , numpy , scipy -, scikitlearn +, scikit-learn , persim , pytest }: @@ -28,7 +28,7 @@ buildPythonPackage rec { cython numpy scipy - scikitlearn + scikit-learn persim ]; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index f13fecc0855..fe4cd4ea48d 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -12,7 +12,7 @@ , pandas , scipy , hdmedians -, scikitlearn +, scikit-learn , coverage , python , isPy3k @@ -30,7 +30,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; checkInputs = [ coverage ]; - propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; + propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikit-learn ]; # cython package not included for tests doCheck = false; diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikit-learn/0.20.nix similarity index 100% rename from pkgs/development/python-modules/scikitlearn/0.20.nix rename to pkgs/development/python-modules/scikit-learn/0.20.nix diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix similarity index 100% rename from pkgs/development/python-modules/scikitlearn/default.nix rename to pkgs/development/python-modules/scikit-learn/default.nix diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 0a5171f22fb..3b7106ac4f2 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -5,7 +5,7 @@ , matplotlib , numpy , scipy -, scikitlearn +, scikit-learn , pyaml , pytestCheckHook }: @@ -26,7 +26,7 @@ buildPythonPackage rec { matplotlib numpy scipy - scikitlearn + scikit-learn pyaml ]; diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index f6d573573b9..bf3e1d1ef46 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , numpy , scipy -, scikitlearn +, scikit-learn , matplotlib , numba , umap-learn @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy - scikitlearn + scikit-learn matplotlib numba umap-learn diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix index 15322632ad7..9ed516e4d5c 100644 --- a/pkgs/development/python-modules/seqeval/default.nix +++ b/pkgs/development/python-modules/seqeval/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , numpy -, scikitlearn +, scikit-learn , perl , pytestCheckHook }: @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitlearn + scikit-learn ]; checkInputs = [ diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 5600f4a6aa0..128dacfd55a 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , numpy , scipy -, scikitlearn +, scikit-learn , pandas , tqdm , slicer @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy - scikitlearn + scikit-learn pandas tqdm slicer diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index d973bc70bcd..2530b965203 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }: buildPythonPackage rec { pname = "sklearn-deap"; @@ -20,7 +20,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; + propagatedBuildInputs = [ numpy scipy deap scikit-learn ]; checkPhase = '' ${python.interpreter} test.py diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 3504557b502..db3b8ed4312 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -8,7 +8,7 @@ , numpy , pandas , pytorch -, scikitlearn +, scikit-learn , scipy , tabulate , tqdm @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "9910f97339e654c8d38e0075d87b735e69e5eb11db59c527fb36705b30c8d0a4"; }; - propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; + propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 31b02e3f264..9f9fe685c95 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -9,7 +9,7 @@ , pyphen , pytest , requests -, scikitlearn +, scikit-learn , scipy , spacy , srsly @@ -35,7 +35,7 @@ buildPythonPackage rec { pyemd pyphen requests - scikitlearn + scikit-learn scipy spacy srsly diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index f888704e6a8..fcf96a715f1 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nose , numpy -, scikitlearn +, scikit-learn , scipy , numba , pynndescent @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitlearn + scikit-learn scipy numba pynndescent diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index da13ad21026..c4822113204 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -11,7 +11,7 @@ , pygments , numpy , scipy -, scikitlearn }: +, scikit-learn }: buildPythonPackage rec { pname = "vowpalwabbit"; @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitlearn + scikit-learn scipy ]; diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 259566c8fc2..bda8f59d2ef 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -4,7 +4,7 @@ , fetchzip , cython , numpy -, scikitlearn +, scikit-learn , six , setuptools_scm , gcc @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm gcc ]; - propagatedBuildInputs = [ cython numpy scikitlearn six ]; + propagatedBuildInputs = [ cython numpy scikit-learn six ]; checkInputs = [ pytest pytestcov ]; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index b113e2c3709..4f02d72c9a1 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -2,7 +2,7 @@ , pytestCheckHook , cmake , scipy -, scikitlearn +, scikit-learn , stdenv , xgboost , substituteAll @@ -22,7 +22,7 @@ buildPythonPackage { propagatedBuildInputs = [ scipy ]; checkInputs = [ pytestCheckHook - scikitlearn + scikit-learn pandas matplotlib graphviz diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..89d3bfc87e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7350,10 +7350,12 @@ in { scikitimage = callPackage ../development/python-modules/scikit-image { }; - scikitlearn = callPackage ../development/python-modules/scikitlearn { + scikit-learn = callPackage ../development/python-modules/scikit-learn { inherit (pkgs) gfortran glibcLocales; }; + scikitlearn = self.scikit-learn; + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 9eae7555ea4..221da6daa9a 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -524,7 +524,7 @@ with self; with super; { scandir = callPackage ../development/python-modules/scandir { }; - scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { + scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix { inherit (pkgs) gfortran glibcLocales; }; From 0a1a14d13e7de8ef651575a8c7eb2099639e2ec7 Mon Sep 17 00:00:00 2001 From: DavHau Date: Sat, 15 May 2021 15:14:01 +0700 Subject: [PATCH 42/46] python3Packages.scikit-learn: enable parallel building and testing --- .../python-modules/scikit-learn/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 7e9e37831e0..dfce61df6c6 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -7,7 +7,8 @@ , glibcLocales , numpy , scipy -, pytest +, pytestCheckHook +, pytest-xdist , pillow , cython , joblib @@ -54,17 +55,30 @@ buildPythonPackage rec { joblib threadpoolctl ]; - checkInputs = [ pytest ]; + + checkInputs = [ pytestCheckHook pytest-xdist ]; LC_ALL="en_US.UTF-8"; - doCheck = !stdenv.isAarch64; - # Skip test_feature_importance_regression - does web fetch - checkPhase = '' - cd $TMPDIR - HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn + preBuild = '' + export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES ''; + doCheck = !stdenv.isAarch64; + + # Skip test_feature_importance_regression - does web fetch + disabledTests = [ "test_feature_importance_regression" ]; + + pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" "--pyargs" "sklearn" ]; + + preCheck = '' + cd $TMPDIR + export HOME=$TMPDIR + export OMP_NUM_THREADS=1 + ''; + + pythonImportsCheck = [ "sklearn" ]; + meta = with lib; { description = "A set of python modules for machine learning and data mining"; changelog = let From f1f0892955fb2cdded4133c47097da337a420f87 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 16 May 2021 18:29:06 -0700 Subject: [PATCH 43/46] terraform-providers.hydra: init at 0.1.0 https://determinate.systems/posts/terraform-provider-hydra/ --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f941b83eb70..2ff13a9a593 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -436,6 +436,15 @@ "sha256": "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg", "version": "1.2.0" }, + "hydra": { + "owner": "DeterminateSystems", + "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", + "repo": "terraform-provider-hydra", + "rev": "v0.1.0", + "sha256": "18c9j54fy1f2sfz317rlv8z7fb18bpc1a0baw1bgl72x5sgil5kv", + "vendorSha256": null, + "version": "0.1.0" + }, "ibm": { "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", From 8e7879302908efc80d437bdf5a9d0fd806fdb05a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 17 May 2021 14:47:57 +0200 Subject: [PATCH 44/46] nixos/tasks/filesystems: utillinux -> util-linux --- nixos/modules/tasks/filesystems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 2aeb8598ada..24f71d29427 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -309,7 +309,7 @@ in "mount-pstore" = { serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.utillinux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore"; + ExecStart = "${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore"; ExecStartPost = pkgs.writeShellScript "wait-for-pstore.sh" '' set -eu TRIES=0 From d26bd805a2d568362af4f2e7134cfd617f11d5c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 May 2021 21:42:27 +0200 Subject: [PATCH 45/46] python3Packages.apispec: 4.3.1 -> 4.4.1 --- pkgs/development/python-modules/apispec/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 13fb71d7f2f..1262bb3338a 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , pyyaml , prance , marshmallow @@ -11,16 +12,20 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.3.0"; + version = "4.4.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5ec0fe72f1422a1198973fcbb48d0eb5c7390f4b0fbe55474fce999ad6826a9b"; + sha256 = "sha256-qt7UrkUXUsWLcOV5kj2Nt9rwtx9i3vjI/noqUr18BqI="; }; - checkInputs = [ + propagatedBuildInputs = [ pyyaml prance + ]; + + checkInputs = [ openapi-spec-validator marshmallow mock From 631cbc3de7aaf244d322111ada656e0bedf55bff Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 17 May 2021 15:06:37 +0200 Subject: [PATCH 46/46] foot: fix evaluation with clang stdenvs To be able to do LTO with clang we need the LTO-capable llvm-ar from libllvm.out (== llvmPackages.llvm) which contains a superset of the llvm bintools. This used to be passed through from stdenv.cc.cc as llvm, but has been renamed to libllvm in 7869d1654517c028aa76fc1dedc9b5ac301a867a. llvm-ar would be in stdenv.cc.bintools.bintools provided that we are using a clang stdenv which uses lld as its linker. In the future we could thus make this inclusion conditional on stdenv.hostPlatform.linker. Note that the build of foot.tests still fails, pending resolution of #123361. --- pkgs/applications/terminal-emulators/foot/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 23531908a60..5062329834c 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -104,7 +104,9 @@ stdenv.mkDerivation rec { tllist wayland-protocols pkg-config - ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm; + ] ++ lib.optionals (compilerName == "clang") [ + stdenv.cc.cc.libllvm.out + ]; buildInputs = [ fontconfig