From df1243d8569ae15410e44e87505a03d98c0b1954 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 14 Aug 2022 16:03:51 +0900 Subject: [PATCH 01/73] nixos/epgstation: fix startup issue --- nixos/modules/services/video/epgstation/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 51f71389263c..ef502de8ea24 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -266,6 +266,9 @@ in description = "EPGStation user"; group = config.users.groups.epgstation.name; isSystemUser = true; + + # NPM insists on creating ~/.npm + home = "/var/cache/epgstation"; }; users.groups.epgstation = { }; @@ -325,6 +328,7 @@ in ExecStartPre = "+${preStartScript}"; User = username; Group = groupname; + CacheDirectory = "epgstation"; StateDirectory = "epgstation"; LogsDirectory = "epgstation"; ConfigurationDirectory = "epgstation"; From 00fe2c7e98b0cb71846566d6375f5baaefbaf80e Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 14 Aug 2022 16:25:21 +0900 Subject: [PATCH 02/73] nixos/epgstation: set NODE_ENV to "production" --- nixos/modules/services/video/epgstation/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index ef502de8ea24..d3b05e4554eb 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -323,6 +323,8 @@ in ++ lib.optional config.services.mirakurun.enable "mirakurun.service" ++ lib.optional config.services.mysql.enable "mysql.service"; + environment.NODE_ENV = "production"; + serviceConfig = { ExecStart = "${cfg.package}/bin/epgstation start"; ExecStartPre = "+${preStartScript}"; From ada7f14219b6cb50d766c28aa64164d17f8bc2d6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 10 May 2023 19:49:42 +0200 Subject: [PATCH 03/73] kubo: 0.19.2 -> 0.20.0 https://github.com/ipfs/kubo/releases/tag/v0.20.0 When creating a repository with `ipfs init`, `--empty-repo=true` is now the default according to the changelog. Modify the NixOS module to reflect this change and fix the `emptyRepo` setting to work with this change. --- nixos/modules/services/network-filesystems/kubo.nix | 6 +++--- pkgs/applications/networking/kubo/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 2537bb1b8d80..a5c370b5be89 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -172,8 +172,8 @@ in emptyRepo = mkOption { type = types.bool; - default = false; - description = lib.mdDoc "If set to true, the repo won't be initialized with help files"; + default = true; + description = lib.mdDoc "If set to false, the repo will be initialized with help files"; }; settings = mkOption { @@ -331,7 +331,7 @@ in preStart = '' if [[ ! -f "$IPFS_PATH/config" ]]; then - ipfs init ${optionalString cfg.emptyRepo "-e"} + ipfs init --empty-repo=${lib.boolToString cfg.emptyRepo} else # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index e4b86636322f..2c270199f127 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.19.2"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.20.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-HPhlKAavINaN0SJHWmeJRx43jfeHeYDZb3/dZ55kMLI="; + hash = "sha256-3Oj/x3EkceNO8/Ik7+U43wi1aL0lYJi1FA0AjtdJRDI="; }; # tarball contains multiple files/directories From 3f1ff3edafcb0a060f44caa19025a5fc1a7a3782 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 14 May 2023 00:53:28 +0800 Subject: [PATCH 04/73] mpvScripts.webtorrent-mpv-hook: fix build on aarch64-linux --- pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index 811b49e8714b..a1713e24375f 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -1,4 +1,4 @@ -{ lib , buildNpmPackage , fetchFromGitHub, nodejs }: +{ lib, buildNpmPackage, fetchFromGitHub, nodejs, python3 }: buildNpmPackage rec { pname = "webtorrent-mpv-hook"; @@ -21,6 +21,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE="; makeCacheWritable = true; + nativeBuildInputs = [ + python3 # Fixes node-gyp on aarch64-linux + ]; + postInstall = '' mkdir -p $out/share/mpv/scripts/ ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/ From d5b0f89a80ab48da9f1a749bc5fe2ce67a373f94 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 18:47:51 -0400 Subject: [PATCH 05/73] airfield: remove --- pkgs/tools/networking/airfield/default.nix | 71 -- pkgs/tools/networking/airfield/deps.json | 8 - pkgs/tools/networking/airfield/deps.sh | 6 - .../networking/airfield/node-packages.nix | 829 ------------------ pkgs/tools/networking/airfield/node.nix | 17 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 1 insertion(+), 933 deletions(-) delete mode 100644 pkgs/tools/networking/airfield/default.nix delete mode 100644 pkgs/tools/networking/airfield/deps.json delete mode 100755 pkgs/tools/networking/airfield/deps.sh delete mode 100644 pkgs/tools/networking/airfield/node-packages.nix delete mode 100644 pkgs/tools/networking/airfield/node.nix diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix deleted file mode 100644 index 374a76871cb0..000000000000 --- a/pkgs/tools/networking/airfield/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, pkgs, makeWrapper, buildEnv -, nodejs, runtimeShell -}: - -let - nodePackages = import ./node.nix { - inherit pkgs; - system = stdenv.hostPlatform.system; - }; - - runtimeEnv = buildEnv { - name = "airfield-runtime"; - paths = with nodePackages; [ - nodePackages."express-3.0.5" nodePackages."swig-0.14.0" - nodePackages."consolidate-0.10.0" redis connect-redis - async request - ]; - }; - - name = "airfield-${version}"; - version = "2015-01-04"; - - src = stdenv.mkDerivation { - name = "${name}-src"; - inherit version; - - src = fetchFromGitHub { - owner = "emblica"; - repo = "airfield"; - rev = "f021b19a35be3db9be7780318860f3b528c48641"; - sha256 = "1xk69x89kgg98hm7c2ysyfmg7pkvgkpg4wym6v5cmdkdid08fsgs"; - }; - - dontBuild = true; - - installPhase = '' - mkdir $out - cp -R . $out - ''; - }; -in stdenv.mkDerivation { - inherit name version src; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nodejs ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - cat >$out/bin/airfield < { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b4f2d7d2d21a..942a2e695aa2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -65,6 +65,7 @@ mapAliases ({ aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 + airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30 alsaLib = alsa-lib; # Added 2021-06-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42bfd2693429..de26fe35022c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1424,8 +1424,6 @@ with pkgs; aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; - airfield = callPackage ../tools/networking/airfield { }; - airgeddon = callPackage ../tools/networking/airgeddon { }; apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; From cf25685c7cf4dbf15fe5f29a9b4a525898812b82 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sat, 20 May 2023 12:34:43 +1000 Subject: [PATCH 06/73] minimal-bootstrap.gnused: init at 4.0.9 --- .../linux/minimal-bootstrap/default.nix | 10 ++- .../minimal-bootstrap/gnused/default.nix | 64 +++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index fb4a455a3e96..423f9e3f5651 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -15,9 +15,14 @@ lib.makeScope coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; + gnumake = callPackage ./gnumake { tinycc = tinycc-mes; }; + gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; - gnumake = callPackage ./gnumake { tinycc = tinycc-mes; }; + gnused = callPackage ./gnused { + bash = bash_2_05; + tinycc = tinycc-mes; + }; ln-boot = callPackage ./ln-boot { }; @@ -34,9 +39,10 @@ lib.makeScope inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText; test = kaem.runCommand "minimal-bootstrap-test" {} '' + echo ${bash_2_05.tests.get-version} + echo ${gnused.tests.get-version} echo ${mes.compiler.tests.get-version} echo ${tinycc-mes.compiler.tests.chain} - echo ${bash_2_05.tests.get-version} mkdir ''${out} ''; }) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix new file mode 100644 index 000000000000..b6b1f9f198c7 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchurl +, bash +, tinycc +, gnumake +}: +let + pname = "gnused"; + # last version that can be compiled with mes-libc + version = "4.0.9"; + + src = fetchurl { + url = "mirror://gnu/sed/sed-${version}.tar.gz"; + sha256 = "0006gk1dw2582xsvgx6y6rzs9zw8b36rhafjwm288zqqji3qfrf3"; + }; + + # Thanks to the live-bootstrap project! + # See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/sed-4.0.9.kaem + makefile = fetchurl { + url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/mk/main.mk"; + sha256 = "0w1f5ri0g5zla31m6l6xyzbqwdvandqfnzrsw90dd6ak126w3mya"; + }; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + tinycc.compiler + gnumake + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/sed --version + mkdir ''${out} + ''; + + meta = with lib; { + description = "GNU sed, a batch stream editor"; + homepage = "https://www.gnu.org/software/sed"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + mainProgram = "sed"; + platforms = platforms.unix; + }; +} '' + # Unpack + ungz --file ${src} --output sed.tar + untar --file sed.tar + rm sed.tar + cd sed-${version} + + # Configure + cp ${makefile} Makefile + catm config.h + + # Build + make \ + CC="tcc -B ${tinycc.libs}/lib" \ + LIBC=mes + + # Install + make install PREFIX=$out +'' From eeaac8aa2944d9fb49c3ecabc94a28b5944d3202 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 07/73] parson: 1.5.1 -> 1.5.2 --- pkgs/development/libraries/parson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index 6426beaeeae0..a61df952f893 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "parson"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kgabis"; repo = "parson"; - rev = "3c4ee26dbb3df177a2d7b9d80e154ec435ca8c01"; # upstream doesn't use tags - sha256 = "sha256-fz2yhxy6Q5uEPAbzMxMiaXqSYkQ9uB3A4sV2qYOekJ8="; + rev = "60c37844d7a1c97547812cac3423d458c73e60f9"; # upstream doesn't use tags + hash = "sha256-SbM0kqRtdcz1s+pUTW7VPMY1O6zdql3bao19Rk4t470="; }; nativeBuildInputs = [ meson ninja ]; From 85ceb3d6b1d4c3bab292f262f9eb772849ea838a Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 20 May 2023 15:47:48 +0200 Subject: [PATCH 08/73] pkgs/top-level/release: allow nodejs 16 and openssl 1.1 to be cached on Hydra temporarily Until the 11 September 2023, those two packages will be built and cached by Hydra so they can be used by users without recompilation penalties. This is an exception due to mismatched release windows and should not set any precedent without community discussion in coordination with release managers. --- pkgs/top-level/release.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8888371aa062..12a340446a5a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -16,7 +16,19 @@ # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } +, nixpkgsArgs ? { config = { + allowUnfree = false; + inHydra = true; + permittedInsecurePackages = [ + # *Exceptionally*, those packages will be cached with their *secure* dependents + # because they will reach EOL in the middle of the 23.05 release + # and it will be too much painful for our users to recompile them + # for no real reason. + # Remove them for 23.11. + "nodejs-16.20.0" + "openssl-1.1.1t" + ]; + }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; From 863128ebcbb939fb15c3d0d293c0f72af91140ff Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 20 May 2023 20:59:33 +0300 Subject: [PATCH 09/73] oauth2c: init at 1.7.0 oauth2c is a command-line tool for interacting with OAuth 2.0 authorization servers. Its goal is to make it easy to fetch access tokens using any grant type or client authentication method. It is compliant with almost all basic and advanced OAuth 2.0, OIDC, OIDF FAPI and JWT profiles. --- pkgs/tools/security/oauth2c/default.nix | 34 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/security/oauth2c/default.nix diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix new file mode 100644 index 000000000000..8d96cbd19fb9 --- /dev/null +++ b/pkgs/tools/security/oauth2c/default.nix @@ -0,0 +1,34 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "oauth2c"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "cloudentity"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IOfY0lKOeuArO3bI1JjTOXHhCqr3GTfsOHCOI0Qh4xk="; + }; + + vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE="; + + doCheck = false; # tests want to talk to oauth2c.us.authz.cloudentity.io + + meta = with lib; { + homepage = "https://github.com/cloudentity/oauth2c"; + description = "User-friendly OAuth2 CLI"; + longDescription = '' + oauth2c is a command-line tool for interacting with OAuth 2.0 + authorization servers. Its goal is to make it easy to fetch access tokens + using any grant type or client authentication method. It is compliant with + almost all basic and advanced OAuth 2.0, OIDC, OIDF FAPI and JWT profiles. + ''; + license = licenses.asl20; + maintainers = [ maintainers.flokli ]; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 820de9675083..2ea76bf482fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -667,6 +667,8 @@ with pkgs; erosmb = callPackage ../tools/security/erosmb { }; + oauth2c = callPackage ../tools/security/oauth2c { }; + octosuite = callPackage ../tools/security/octosuite { }; octosql = callPackage ../tools/misc/octosql { }; From bb22f9fe0a18e75d518b552c2fe7f652c73c836b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 May 2023 20:17:55 +0200 Subject: [PATCH 10/73] python310Packages.onnx: 0.13.1 -> 0.14.0 https://github.com/onnx/onnx/releases/tag/v1.14.0 Fixes the build on aarch64-linux as well as on both darwins. --- .../python-modules/onnx/default.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 2b9bce880153..52e0984f5aa0 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,55 +1,50 @@ { lib +, stdenv , buildPythonPackage -, python3 -, bash , cmake , fetchFromGitHub , gtest -, isPy27 , nbval , numpy +, parameterized , protobuf , pybind11 , pytestCheckHook -, six +, pythonOlder , tabulate , typing-extensions -, pythonRelaxDepsHook }: let gtestStatic = gtest.override { static = true; }; in buildPythonPackage rec { pname = "onnx"; - version = "1.13.1"; + version = "1.14.0"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-10MH23XpAv/uDW/2tRFGS2lKU8hnaNBwbIBIgVc7Jpk="; + hash = "sha256-f+s25Y/jGosaSdoZY6PE3j6pENkfDcD+IQndrbtuzWg="; }; nativeBuildInputs = [ cmake - pythonRelaxDepsHook pybind11 ]; - pythonRelaxDeps = [ "protobuf" ]; - propagatedBuildInputs = [ protobuf numpy - six typing-extensions ]; nativeCheckInputs = [ nbval + parameterized pytestCheckHook tabulate ]; @@ -72,7 +67,6 @@ in buildPythonPackage rec { # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set # to lib64 and cmake incorrectly looks for the protobuf library in lib64 export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" - '' + lib.optionalString doCheck '' export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" export ONNX_BUILD_TESTS=1 ''; @@ -89,14 +83,18 @@ in buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; - doCheck = true; preCheck = '' export HOME=$(mktemp -d) # detecting source dir as a python package confuses pytest mv onnx/__init__.py onnx/__init__.py.hidden ''; - pytestFlagsArray = [ "onnx/test" "onnx/examples" ]; + + pytestFlagsArray = [ + "onnx/test" + "onnx/examples" + ]; + disabledTests = [ # attempts to fetch data from web "test_bvlc_alexnet_cpu" @@ -108,11 +106,25 @@ in buildPythonPackage rec { "test_squeezenet_cpu" "test_vgg19_cpu" "test_zfnet512_cpu" + ] ++ lib.optionals stdenv.isAarch64 [ + # AssertionError: Output 0 of test 0 in folder + "test__pytorch_converted_Conv2d_depthwise_padded" + "test__pytorch_converted_Conv2d_dilated" + "test_dft" + "test_dft_axis" + # AssertionError: Mismatch in test 'test_Conv2d_depthwise_padded' + "test_xor_bcast4v4d" + # AssertionError: assert 1 == 0 + "test_ops_tested" ]; + disabledTestPaths = [ # Unexpected output fields from running code: {'stderr'} "onnx/examples/np_array_tensorproto.ipynb" ]; + + __darwinAllowLocalNetworking = true; + postCheck = '' # run "cpp" tests .setuptools-cmake-build/onnx_gtests From ca02a0e768ae88f0b6eb9f500263c751c090f371 Mon Sep 17 00:00:00 2001 From: whyvert <91154413+whyvert0@users.noreply.github.com> Date: Sat, 20 May 2023 03:32:22 -0400 Subject: [PATCH 11/73] source-code-pro: 2.038 -> 2.042 --- pkgs/data/fonts/source-code-pro/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index c94e9aaca480..4d3f5155929b 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -2,18 +2,18 @@ stdenvNoCC.mkDerivation rec { pname = "source-code-pro"; - version = "2.038"; + version = "2.042"; src = fetchzip { - url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; + url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-u%2F1.062R-i%2F1.026R-vf/OTF-source-code-pro-${version}R-u_1.062R-i.zip"; stripRoot = false; - hash = "sha256-ijeTLka131jf6B9xj/eNWK1T5r7r3aBXBgnVyRAxmuY="; + hash = "sha256-+BnfmD+AjObSoVxPvFAqbnMD2j5qf2YmbXGQtXoaiy0="; }; installPhase = '' runHook preInstall - install -Dm644 *.otf -t $out/share/fonts/opentype + install -Dm644 OTF/*.otf -t $out/share/fonts/opentype runHook postInstall ''; From 2af04a503f8c75cf30d60b1b3ce600db39a225f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 May 2023 22:50:43 +0200 Subject: [PATCH 12/73] python310Packages.json-stream-rs-tokenizer: fix darwin build --- .../python-modules/json-stream-rs-tokenizer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 513bf89cfc04..299a526dfdd7 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , rustPlatform , cargo +, darwin , rustc , setuptools-rust , json-stream-rs-tokenizer @@ -38,6 +40,10 @@ buildPythonPackage rec { rustc ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.libiconv + ]; + # Tests depend on json-stream, which depends on this package. # To avoid infinite recursion, we only enable tests when building passthru.tests. doCheck = false; From 47efc601572c339052b60f1583653eb79040cb11 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Wed, 17 May 2023 18:45:00 -0400 Subject: [PATCH 13/73] nodejs: add helper patch for buildNpmPackage --- .../web/nodejs/fix-npm-patch-paths.sh | 7 ++ .../node-npm-build-npm-package-logic.patch | 95 +++++++++++++++++++ pkgs/development/web/nodejs/v18.nix | 3 +- pkgs/development/web/nodejs/v20.nix | 3 +- 4 files changed, 106 insertions(+), 2 deletions(-) create mode 100755 pkgs/development/web/nodejs/fix-npm-patch-paths.sh create mode 100644 pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch diff --git a/pkgs/development/web/nodejs/fix-npm-patch-paths.sh b/pkgs/development/web/nodejs/fix-npm-patch-paths.sh new file mode 100755 index 000000000000..5f57032807c7 --- /dev/null +++ b/pkgs/development/web/nodejs/fix-npm-patch-paths.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p gnused + +sed -i "s| a/node_modules| a/deps/npm/node_modules|" node-npm-build-npm-package-logic.patch +sed -i "s| b/node_modules| b/deps/npm/node_modules|" node-npm-build-npm-package-logic.patch +sed -i "s| a/workspaces| a/deps/npm/node_modules/@npmcli|" node-npm-build-npm-package-logic.patch +sed -i "s| b/workspaces| b/deps/npm/node_modules/@npmcli|" node-npm-build-npm-package-logic.patch diff --git a/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch b/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch new file mode 100644 index 000000000000..a9ac6b0589ef --- /dev/null +++ b/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch @@ -0,0 +1,95 @@ +This patch is based off of npm tag v9.1.5. + +This introduces fixes for 4 issues: + +1. When node-gyp is included as a dependency in a project, any scripts that run it will not use the copy included in Node. This is problematic because we patch node-gyp to work without xcbuild on Darwin, leading to these packages failing to build with a sandbox on Darwin. +2. When a Git dependency contains install scripts, it has to be built just like any other package. Thus, we need to patch shebangs appropriately, just like in npmConfigHook. +3. We get useless warnings that clog up logs when using a v1 lockfile, so we silence them. +4. npm looks at a hidden lockfile to determine if files have binaries to link into `node_modules/.bin`. When using a v1 lockfile offline, this lockfile does not contain enough info, leading to binaries for packages such as Webpack not being available to scripts. We used to work around this by making npm ignore the hidden lockfile by creating a file, but now we just disable the code path entirely. + +To update: +1. Run `git diff` from an npm checkout +2. Run `fix-npm-patch-paths.sh` +3. Include/update this frontmatter, please! + +diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js +index c59c270d9..98785192f 100644 +--- a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js ++++ b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js +@@ -12,7 +12,10 @@ const setPATH = (projectPath, binPaths, env) => { + .reduce((set, p) => set.concat(p.filter(concatted => !set.includes(concatted))), []) + .join(delimiter) + +- const pathArr = [] ++ // Ensure when using buildNpmPackage hooks that Node.js' ++ // bundled copy of node-gyp is used, instead of any copy ++ // pulled in as a dependency. ++ const pathArr = process.env['NIX_NODEJS_BUILDNPMPACKAGE'] ? [nodeGypPath, PATH] : []; + if (binPaths) { + pathArr.push(...binPaths) + } +@@ -26,7 +29,8 @@ const setPATH = (projectPath, binPaths, env) => { + pp = p + p = dirname(p) + } while (p !== pp) +- pathArr.push(nodeGypPath, PATH) ++ if (!process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { pathArr.push(nodeGypPath, PATH) } ++ + + const pathVal = pathArr.join(delimiter) + +diff --git a/deps/npm/node_modules/pacote/lib/git.js b/deps/npm/node_modules/pacote/lib/git.js +index 1fa8b1f96..a026bb50d 100644 +--- a/deps/npm/node_modules/pacote/lib/git.js ++++ b/deps/npm/node_modules/pacote/lib/git.js +@@ -188,6 +188,24 @@ class GitFetcher extends Fetcher { + } + noPrepare.push(this.resolved) + ++ if (process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { ++ const spawn = require('@npmcli/promise-spawn') ++ ++ const npmWithNixFlags = (args, cmd) => spawn('bash', ['-c', 'npm ' + args + ` $npm${cmd}Flags "$\{npm${cmd}FlagsArray[@]}" $npmFlags "$\{npmFlagsArray[@]}"`], { cwd: dir, env: { ...process.env, _PACOTE_NO_PREPARE_: noPrepare.join('\n') } }, { message: `\`npm ${args}\` failed` }) ++ const patchShebangs = () => spawn('bash', ['-c', 'source $stdenv/setup; patchShebangs node_modules'], { cwd: dir }) ++ ++ // the DirFetcher will do its own preparation to run the prepare scripts ++ // All we have to do is put the deps in place so that it can succeed. ++ // ++ // We ignore this.npmConfig to maintain an environment that's as close ++ // to the rest of the build as possible. ++ return spawn('bash', ['-c', '$prefetchNpmDeps --fixup-lockfile package-lock.json'], { cwd: dir }) ++ .then(() => npmWithNixFlags('ci --ignore-scripts', 'Install')) ++ .then(patchShebangs) ++ .then(() => npmWithNixFlags('rebuild', 'Rebuild')) ++ .then(patchShebangs) ++ } ++ + // the DirFetcher will do its own preparation to run the prepare scripts + // All we have to do is put the deps in place so that it can succeed. + return npm( +diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js +index 2ea66ac33..25e671318 100644 +--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js ++++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js +@@ -740,7 +740,7 @@ This is a one-time fix-up, please be patient... + node.package = { ...mani, _id: `${mani.name}@${mani.version}` } + } catch (er) { + const warning = `Could not fetch metadata for ${name}@${id}` +- log.warn(heading, warning, er) ++ if (!process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { log.warn(heading, warning, er) } + } + this.finishTracker(t) + }) +diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js +index 6c3f917c6..ec21d2cc4 100644 +--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js ++++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js +@@ -147,7 +147,7 @@ module.exports = cls => class ActualLoader extends cls { + this[_actualTree].assertRootOverrides() + + // if forceActual is set, don't even try the hidden lockfile +- if (!forceActual) { ++ if (!forceActual && !process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { + // Note: hidden lockfile will be rejected if it's not the latest thing + // in the folder, or if any of the entries in the hidden lockfile are + // missing. diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index bb3a2545ea5f..44411ea731f4 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -15,5 +15,6 @@ buildNodejs { ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch ./revert-arm64-pointer-auth.patch + ./node-npm-build-npm-package-logic.patch ]; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 90bb75bb2a93..eca03e5d66e9 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -15,5 +15,6 @@ buildNodejs { ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch + ./node-npm-build-npm-package-logic.patch ]; } From dd23a1203c9c5de6e847b7616cd456f71d235f3b Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 4 May 2023 19:31:23 -0400 Subject: [PATCH 14/73] nodejs_16: add helper patch for buildNpmPackage --- ...e-npm-build-npm-package-logic-node16.patch | 95 +++++++++++++++++++ pkgs/development/web/nodejs/v16.nix | 1 + 2 files changed, 96 insertions(+) create mode 100644 pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch diff --git a/pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch b/pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch new file mode 100644 index 000000000000..f4d3b0e32b1c --- /dev/null +++ b/pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch @@ -0,0 +1,95 @@ +This patch is based off of npm tag v8.19.4. + +This introduces fixes for 4 issues: + +1. When node-gyp is included as a dependency in a project, any scripts that run it will not use the copy included in Node. This is problematic because we patch node-gyp to work without xcbuild on Darwin, leading to these packages failing to build with a sandbox on Darwin. +2. When a Git dependency contains install scripts, it has to be built just like any other package. Thus, we need to patch shebangs appropriately, just like in npmConfigHook. +3. We get useless warnings that clog up logs when using a v1 lockfile, so we silence them. +4. npm looks at a hidden lockfile to determine if files have binaries to link into `node_modules/.bin`. When using a v1 lockfile offline, this lockfile does not contain enough info, leading to binaries for packages such as Webpack not being available to scripts. We used to work around this by making npm ignore the hidden lockfile by creating a file, but now we just disable the code path entirely. + +To update: +1. Run `git diff` from an npm checkout +2. Run `fix-npm-patch-paths.sh` +3. Include/update this frontmatter, please! + +diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js +index c59c270d9..98785192f 100644 +--- a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js ++++ b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js +@@ -12,7 +12,10 @@ const setPATH = (projectPath, binPaths, env) => { + .reduce((set, p) => set.concat(p.filter(concatted => !set.includes(concatted))), []) + .join(delimiter) + +- const pathArr = [] ++ // Ensure when using buildNpmPackage hooks that Node.js' ++ // bundled copy of node-gyp is used, instead of any copy ++ // pulled in as a dependency. ++ const pathArr = process.env['NIX_NODEJS_BUILDNPMPACKAGE'] ? [nodeGypPath, PATH] : []; + if (binPaths) { + pathArr.push(...binPaths) + } +@@ -26,7 +29,8 @@ const setPATH = (projectPath, binPaths, env) => { + pp = p + p = dirname(p) + } while (p !== pp) +- pathArr.push(nodeGypPath, PATH) ++ if (!process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { pathArr.push(nodeGypPath, PATH) } ++ + + const pathVal = pathArr.join(delimiter) + +diff --git a/deps/npm/node_modules/pacote/lib/git.js b/deps/npm/node_modules/pacote/lib/git.js +index c4819b4fd..7efbeef05 100644 +--- a/deps/npm/node_modules/pacote/lib/git.js ++++ b/deps/npm/node_modules/pacote/lib/git.js +@@ -186,6 +186,24 @@ class GitFetcher extends Fetcher { + } + noPrepare.push(this.resolved) + ++ if (process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { ++ const spawn = require('@npmcli/promise-spawn') ++ ++ const npmWithNixFlags = (args, cmd) => spawn('bash', ['-c', 'npm ' + args + ` $npm${cmd}Flags "$\{npm${cmd}FlagsArray[@]}" $npmFlags "$\{npmFlagsArray[@]}"`], { cwd: dir, env: { ...process.env, _PACOTE_NO_PREPARE_: noPrepare.join('\n') } }, { message: `\`npm ${args}\` failed` }) ++ const patchShebangs = () => spawn('bash', ['-c', 'source $stdenv/setup; patchShebangs node_modules'], { cwd: dir }) ++ ++ // the DirFetcher will do its own preparation to run the prepare scripts ++ // All we have to do is put the deps in place so that it can succeed. ++ // ++ // We ignore this.npmConfig to maintain an environment that's as close ++ // to the rest of the build as possible. ++ return spawn('bash', ['-c', '$prefetchNpmDeps --fixup-lockfile package-lock.json'], { cwd: dir }) ++ .then(() => npmWithNixFlags('ci --ignore-scripts', 'Install')) ++ .then(patchShebangs) ++ .then(() => npmWithNixFlags('rebuild', 'Rebuild')) ++ .then(patchShebangs) ++ } ++ + // the DirFetcher will do its own preparation to run the prepare scripts + // All we have to do is put the deps in place so that it can succeed. + return npm( +diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js +index e9a8720d7..b29ad0185 100644 +--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js ++++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js +@@ -744,7 +744,7 @@ This is a one-time fix-up, please be patient... + node.package = { ...mani, _id: `${mani.name}@${mani.version}` } + } catch (er) { + const warning = `Could not fetch metadata for ${name}@${id}` +- log.warn(heading, warning, er) ++ if (!process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { log.warn(heading, warning, er) } + } + this.finishTracker(t) + }) +diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js +index 7ab65f5b0..12f563a50 100644 +--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js ++++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js +@@ -143,7 +143,7 @@ module.exports = cls => class ActualLoader extends cls { + this[_actualTree].assertRootOverrides() + + // if forceActual is set, don't even try the hidden lockfile +- if (!forceActual) { ++ if (!forceActual && !process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { + // Note: hidden lockfile will be rejected if it's not the latest thing + // in the folder, or if any of the entries in the hidden lockfile are + // missing. diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 2b8ee642f39f..8d5c5c1b11b6 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -15,5 +15,6 @@ in patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch + ./node-npm-build-npm-package-logic-node16.patch ] ++ npmPatches; } From 9f264f69f85e9af77f272394cd97ab5f13978315 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 4 May 2023 19:31:28 -0400 Subject: [PATCH 15/73] buildNpmPackage: use nodejs patch flag to work around roadblocks --- .../node/build-npm-package/hooks/default.nix | 1 + .../hooks/npm-config-hook.sh | 22 +++++-------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index e5c93f1f7784..c34709335ff7 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -6,6 +6,7 @@ name = "npm-config-hook"; substitutions = { nodeSrc = srcOnly nodejs; + nodeGyp = "${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"; # Specify `diff`, `jq`, and `prefetch-npm-deps` by abspath to ensure that the user's build # inputs do not cause us to find the wrong binaries. diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index c1acdc3ac3f0..0edc0e2b36a4 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -3,10 +3,15 @@ npmConfigHook() { echo "Executing npmConfigHook" + # Use npm patches in the nodejs package + export NIX_NODEJS_BUILDNPMPACKAGE=1 + export prefetchNpmDeps="@prefetchNpmDeps@" + echo "Configuring npm" export HOME="$TMPDIR" export npm_config_nodedir="@nodeSrc@" + export npm_config_node_gyp="@nodeGyp@" if [ -z "${npmDeps-}" ]; then echo @@ -93,22 +98,7 @@ npmConfigHook() { patchShebangs node_modules - local -r lockfileVersion="$(@jq@ .lockfileVersion package-lock.json)" - - if (( lockfileVersion < 2 )); then - # This is required because npm consults a hidden lockfile in node_modules to figure out - # what to create bin links for. When using an old lockfile offline, this hidden lockfile - # contains insufficent data, making npm silently fail to create links. The hidden lockfile - # is bypassed when any file in node_modules is newer than it. Thus, we create a file when - # using an old lockfile, so bin links work as expected without having to downgrade Node or npm. - touch node_modules/.meow - fi - - npm rebuild "${npmRebuildFlags[@]}" "${npmFlags[@]}" - - if (( lockfileVersion < 2 )); then - rm node_modules/.meow - fi + npm rebuild $npmRebuildFlags "${npmRebuildFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" patchShebangs node_modules From 51aeacfcd18672ca5a73d37fc7b15b68a34e19d0 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 20 May 2023 18:30:06 -0400 Subject: [PATCH 16/73] vsce: fix sandboxed builds on darwin --- pkgs/development/tools/vsce/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index 633eda1371c1..7fc1b297922e 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildNpmPackage , fetchFromGitHub , pkg-config , libsecret +, darwin , python3 , testers , vsce @@ -27,7 +29,8 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ libsecret ]; + buildInputs = [ libsecret ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Security ]); makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; @@ -43,4 +46,3 @@ buildNpmPackage rec { license = licenses.mit; }; } - From ccd5ddc5879ce65ddb4a682044c80a2c39f8ef88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 22:58:27 +0000 Subject: [PATCH 17/73] plantuml: 1.2023.6 -> 1.2023.7 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 680bd302bb5a..b8352b1bc467 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.6"; + version = "1.2023.7"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-Ce9e0B+Sb8o7a5rO5RC7f1TzeEjXSC25FdZ3aPLKlu4="; + sha256 = "sha256-EWM3wL2TTr1r8Gb9m4PK+KnRD6YtMDGHWrXAzSkGbd0="; }; nativeBuildInputs = [ makeWrapper ]; From 9a8475c634b669680dc1b9e62482c3bf97ff371b Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 May 2023 18:34:49 -0400 Subject: [PATCH 18/73] bitwarden: 2023.3.2 -> 2023.4.0 --- pkgs/tools/security/bitwarden/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f638c4bfca81..95351c1b0e13 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -24,19 +24,19 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; - version = "2023.3.2"; + version = "2023.4.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - sha256 = "sha256-KQDM7XDUA+yRv8y1K//rMCs4J36df42RVsiAXazJeYQ="; + sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE="; }; desktop-native = rustPlatform.buildRustPackage { pname = "bitwarden-desktop-native"; inherit src version; sourceRoot = "source/apps/desktop/desktop_native"; - cargoSha256 = "sha256-XsAmVYWPPnY0cgBzpO2aWx/fh85fKr8kMO98cDMzOKk="; + cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y="; patchFlags = [ "-p4" ]; @@ -91,7 +91,7 @@ buildNpmPackage' { npmBuildFlags = [ "--workspace apps/desktop" ]; - npmDepsHash = "sha256-RmkTWhakZstCCMLQ3iJ8KD5Yt5ZafXc8NDgncJMLaxs="; + npmDepsHash = "sha256-Y7yGM1poNMALipa0mr/iiTLP1zk3K1BqVBdopy6f6fE="; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From baecc1d300981a61242e656118cee33ca141fe24 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 May 2023 18:34:50 -0400 Subject: [PATCH 19/73] bitwarden: make applying patches easier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since `sourceRoot` occurs before patching, simply setting `patches` in the native drv to the same as the npm drv doesn’t work, as paths outside the `sourceRoot` referenced in the patches don’t exist and cause applying them to fail. Instead, use `applyPatches` to make `src` have the patches already applied before `sourceRoot` comes into play. It would be possible to not use `sourceRoot` and just `cd`, but then the `Cargo.lock` location needs to be manually specified and it just becomes more mess than it’s worth. `applyPatches` seems the cleanest way to achieve this. --- pkgs/tools/security/bitwarden/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 95351c1b0e13..f3a98cc6d55f 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -1,4 +1,5 @@ { lib +, applyPatches , buildNpmPackage , dbus , electron @@ -25,21 +26,23 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; version = "2023.4.0"; - src = fetchFromGitHub { - owner = "bitwarden"; - repo = "clients"; - rev = "desktop-v${version}"; - sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE="; + src = applyPatches { + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "clients"; + rev = "desktop-v${version}"; + sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE="; + }; + + patches = [ ]; }; desktop-native = rustPlatform.buildRustPackage { pname = "bitwarden-desktop-native"; inherit src version; - sourceRoot = "source/apps/desktop/desktop_native"; + sourceRoot = "source-patched/apps/desktop/desktop_native"; cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y="; - patchFlags = [ "-p4" ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook From b38795a22e1028127a9e2f2be1c8d9b11d31bd26 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 May 2023 18:34:50 -0400 Subject: [PATCH 20/73] bitwarden: update to use Node 18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Backport patch from Bitwarden master to achieve this as they have done (unreleased) upgrade 16→18, and have several other changes along with it. We want this now because Node 16 is being marked insecure soon for NixOS 23.05; see https://github.com/NixOS/nixpkgs/pull/229910. - These changes should be in the next release in a few weeks - `npm bin` no longer exists, use `npm exec` instead --- pkgs/tools/security/bitwarden/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f3a98cc6d55f..2785a4d928a5 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -4,6 +4,7 @@ , dbus , electron , fetchFromGitHub +, fetchpatch , glib , gnome , gtk3 @@ -12,7 +13,7 @@ , makeDesktopItem , makeWrapper , moreutils -, nodejs_16 +, nodejs_18 , pkg-config , python3 , rustPlatform @@ -23,7 +24,7 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; version = "2023.4.0"; src = applyPatches { @@ -34,7 +35,13 @@ let sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE="; }; - patches = [ ]; + patches = [ + # Bump electron to 24 and node to 18 + (fetchpatch { + url = "https://github.com/bitwarden/clients/pull/5205.patch"; + hash = "sha256-sKSrh8RHXtxGczyZScjTeiGZgTZCQ7f45ULj/j9cp6M="; + }) + ]; }; desktop-native = rustPlatform.buildRustPackage { @@ -94,7 +101,7 @@ buildNpmPackage' { npmBuildFlags = [ "--workspace apps/desktop" ]; - npmDepsHash = "sha256-Y7yGM1poNMALipa0mr/iiTLP1zk3K1BqVBdopy6f6fE="; + npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE="; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -114,7 +121,7 @@ buildNpmPackage' { postBuild = '' pushd apps/desktop - "$(npm bin)"/electron-builder \ + npm exec electron-builder -- \ --dir \ -c.electronDist=${electron}/lib/electron \ -c.electronVersion=${electron.version} From 7e50f350d3099403a3a3c00aa362125e1fad3bc6 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 May 2023 18:34:51 -0400 Subject: [PATCH 21/73] bitwarden: verify Electron version matches expected --- pkgs/tools/security/bitwarden/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 2785a4d928a5..9a78b698f7af 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -2,7 +2,7 @@ , applyPatches , buildNpmPackage , dbus -, electron +, electron_24 , fetchFromGitHub , fetchpatch , glib @@ -25,6 +25,7 @@ let icon = "bitwarden"; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; + electron = electron_24; version = "2023.4.0"; src = applyPatches { @@ -113,6 +114,11 @@ buildNpmPackage' { ]; preBuild = '' + if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then + echo 'ERROR: electron version mismatch' + exit 1 + fi + jq 'del(.scripts.postinstall)' apps/desktop/package.json | sponge apps/desktop/package.json jq '.scripts.build = ""' apps/desktop/desktop_native/package.json | sponge apps/desktop/desktop_native/package.json cp ${desktop-native}/lib/libdesktop_native.so apps/desktop/desktop_native/desktop_native.linux-x64-musl.node From f9a4dd6bd17e7daf9657de973a8cc19a101bc6a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 May 2023 03:34:28 +0200 Subject: [PATCH 22/73] pagmo2: 2.18.0 -> 2.19.0 https://github.com/esa/pagmo2/blob/master/doc/sphinx/changelog.rst#2190-2023-01-21 https://github.com/esa/pagmo2/compare/v2.18.0...v2.19.0 --- pkgs/development/libraries/pagmo2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 7e30b0593b21..4bbf6f77288f 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pagmo2"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; + sha256 = "sha256-z5kg2xKZ666EPK844yp+hi4iGisaIPme9xNdzsAEEjw="; }; nativeBuildInputs = [ cmake ]; From 56bc90a844fa5fd79012e0bb5b5393825d0cc333 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 04:39:53 +0000 Subject: [PATCH 23/73] victor-mono: 1.5.4 -> 1.5.5 --- pkgs/data/fonts/victor-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 1708a43b8056..5c17ad653ebc 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "victor-mono"; - version = "1.5.4"; + version = "1.5.5"; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; stripRoot = false; - hash = "sha256-E8j1bfYrM8yRtasiwgTvyE4EYx2LyAbmw3MXH1l+owk="; + hash = "sha256-l8XeKE9PtluiazZO0PXfkGCcnm5o+VZdL7NZ6w0tp80="; }; installPhase = '' From 614598f2fb5f231b7f834c2ec3e11cf19da411bf Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 21 May 2023 13:56:13 +0900 Subject: [PATCH 24/73] newman: repackage with buildNpmPackage --- pkgs/development/web/newman/default.nix | 27 +- .../web/newman/generate-dependencies.sh | 9 - .../web/newman/node-composition.nix | 17 - pkgs/development/web/newman/node-env.nix | 686 -- pkgs/development/web/newman/node-packages.nix | 5645 ----------------- pkgs/development/web/newman/package.json | 3 - 6 files changed, 18 insertions(+), 6369 deletions(-) delete mode 100755 pkgs/development/web/newman/generate-dependencies.sh delete mode 100644 pkgs/development/web/newman/node-composition.nix delete mode 100644 pkgs/development/web/newman/node-env.nix delete mode 100644 pkgs/development/web/newman/node-packages.nix delete mode 100644 pkgs/development/web/newman/package.json diff --git a/pkgs/development/web/newman/default.nix b/pkgs/development/web/newman/default.nix index 6aa2413677c5..b36b61d0e94d 100644 --- a/pkgs/development/web/newman/default.nix +++ b/pkgs/development/web/newman/default.nix @@ -1,18 +1,27 @@ -{ pkgs, nodejs, stdenv, lib, ... }: +{ lib +, buildNpmPackage +, fetchFromGitHub +}: -let +buildNpmPackage rec { + pname = "newman"; + version = "5.3.2"; - packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); - - nodePackages = import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; + src = fetchFromGitHub { + owner = "postmanlabs"; + repo = "newman"; + rev = "refs/tags/v${version}"; + hash = "sha256-j5YS9Zbk9b3K4+0sGzqtCgEsR+S5nGPf/rebeGzsscA="; }; -in -nodePackages.newman.override { + + npmDepsHash = "sha256-FwVmesHtzTZKsTCIfZiRPb1zf7q5LqABAZOh8gXB9qw="; + + dontNpmBuild = true; + meta = with lib; { homepage = "https://www.getpostman.com"; description = "A command-line collection runner for Postman"; + changelog = "https://github.com/postmanlabs/newman/releases/tag/v${version}"; maintainers = with maintainers; [ freezeboy ]; license = licenses.asl20; }; diff --git a/pkgs/development/web/newman/generate-dependencies.sh b/pkgs/development/web/newman/generate-dependencies.sh deleted file mode 100755 index 7111289d2909..000000000000 --- a/pkgs/development/web/newman/generate-dependencies.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -node2nix \ - --node-env node-env.nix \ - --development \ - --input package.json \ - --output node-packages.nix \ - --composition node-composition.nix diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix deleted file mode 100644 index b795f708f189..000000000000 --- a/pkgs/development/web/newman/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix deleted file mode 100644 index 5dad9ec63d47..000000000000 --- a/pkgs/development/web/newman/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Sun, 21 May 2023 15:50:45 +0900 Subject: [PATCH 25/73] python3Packages.hmmlearn: 0.2.8 -> 0.3.0 Diff: https://github.com/hmmlearn/hmmlearn/compare/0.2.8...13b56b2731716acf33fb13087fb0469c5558b320 --- pkgs/development/python-modules/hmmlearn/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 8097cc3b46b4..a7c673c38cad 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , numpy , scikit-learn @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.8"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchurl { - url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - hash = "sha256-aWkx49zmgBzJt4xin1QwYd1+tnpxFVsD0bOeoXKipfk="; + src = fetchPypi { + inherit pname version; + hash = "sha256-0TqR6jaV34gUZePTYTLX7vToTUg/S6U4pLRuJLXqEA8="; }; buildInputs = [ From 9a18b6c073d80d6a4ba3689201f89ad167e35e94 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 21 May 2023 10:58:16 +0400 Subject: [PATCH 26/73] stargazer: enable on darwin --- pkgs/servers/gemini/stargazer/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index fdcd31777cf0..4dc0ba5cc0f5 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , fetchFromSourcehut , rustPlatform , installShellFiles , scdoc +, Security }: rustPlatform.buildRustPackage rec { @@ -22,6 +24,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles scdoc ]; + buildInputs = lib.optional stdenv.isDarwin Security; + postInstall = '' scdoc < doc/stargazer.scd > stargazer.1 scdoc < doc/stargazer-ini.scd > stargazer.ini.5 @@ -36,6 +40,5 @@ rustPlatform.buildRustPackage rec { license = licenses.agpl3Plus; changelog = "https://git.sr.ht/~zethra/stargazer/refs/${version}"; maintainers = with maintainers; [ gaykitty ]; - platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ad14c09721..8b6ba4b1bd58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1697,7 +1697,9 @@ with pkgs; speedtest-rs = callPackage ../tools/networking/speedtest-rs { }; - stargazer = callPackage ../servers/gemini/stargazer { }; + stargazer = callPackage ../servers/gemini/stargazer { + inherit (darwin.apple_sdk.frameworks) Security; + }; steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch { }; From 73c9413daf08cc981141425b54632927c9bdef2d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 21 May 2023 16:21:57 +0900 Subject: [PATCH 27/73] python3Packages.jaraco-net: fix test on darwin --- pkgs/development/python-modules/jaraco-net/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index 164b46dd4f7f..86a8c63e19ad 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -26,6 +26,7 @@ , importlib-resources , pyparsing , requests-mock +, nettools }: buildPythonPackage rec { @@ -78,6 +79,8 @@ buildPythonPackage rec { importlib-resources pyparsing requests-mock + ] ++ lib.optionals stdenv.isDarwin [ + nettools ]; disabledTestPaths = [ From 1dfdfcd0ac11863540d7fbaf3c3a5f41614706e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 09:43:54 +0200 Subject: [PATCH 28/73] theharvester: 4.2.0 -> 4.3.0 Diff: https://github.com/laramies/theharvester/compare/4.2.0...4.3.0 --- pkgs/tools/security/theharvester/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index b267cab354a0..751ba037ed2a 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "theharvester"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "laramies"; repo = pname; rev = version; - sha256 = "sha256-P3yp6COwyQnVDfZM198ygu+HLdisRw068aZOVSLl7r4="; + sha256 = "sha256-9W4xN+ZSNdR5NOnwohNrQVW8JSEKFyKxWTz012uiUm8="; }; propagatedBuildInputs = with python3.pkgs; [ From d51c14d0ddbe7b644f184da21253103fe6124881 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 07:47:43 +0000 Subject: [PATCH 29/73] pet: 0.4.0 -> 0.5.0 --- pkgs/development/tools/pet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 5b34d2506524..9437db2ffc37 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; + sha256 = "sha256-+ng4+wrJW/fl1DJMbycLymFgiviTwjlxNApE2Q8PesQ="; }; - vendorSha256 = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; + vendorHash = "sha256-JOP7hcCOwVZ0hb2UXHHdxpKxpZqs6a8AjOFbrs711ps="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" From c6a146abe71ca12703235861bc8bbb42338b474d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 09:48:19 +0200 Subject: [PATCH 30/73] theharvester: add changelog to meta --- pkgs/tools/security/theharvester/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 751ba037ed2a..a683b048935e 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -10,8 +10,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "laramies"; repo = pname; - rev = version; - sha256 = "sha256-9W4xN+ZSNdR5NOnwohNrQVW8JSEKFyKxWTz012uiUm8="; + rev = "refs/tags/${version}"; + hash = "sha256-9W4xN+ZSNdR5NOnwohNrQVW8JSEKFyKxWTz012uiUm8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { orjson plotly pyppeteer + python-dateutil pyyaml requests retrying @@ -61,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { gathers emails, names, subdomains, IPs, and URLs using multiple public data sources. ''; homepage = "https://github.com/laramies/theHarvester"; + changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}"; maintainers = with maintainers; [ c0bw3b treemo ]; license = licenses.gpl2Only; }; From c92ecfdbd8afe9e406a69a1a18149f3281b4ded8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 08:19:16 +0000 Subject: [PATCH 31/73] ton: 2023.04 -> 2023.05 --- pkgs/applications/blockchains/ton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index d181493f7b32..8978eb860417 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2023.04"; + version = "2023.05"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - sha256 = "sha256-3HQF0wKk0iRV5fKzuCTv7X7MC+snMDrodgqScCZQVY4="; + sha256 = "sha256-EuFKoqOzKoaBCiVAsb8K053kAL4bw1WqmmybVJX2Fmo="; fetchSubmodules = true; }; From 6c05ba460d7016f93f012a10cefa10cc86552a14 Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Sun, 21 May 2023 10:19:58 +0200 Subject: [PATCH 32/73] composable_kernel: build on big parallel --- pkgs/development/libraries/composable_kernel/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 8b0ac955810e..e00af9a9755e 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -76,6 +76,9 @@ let passthru.updateScript = unstableGitUpdater { }; + # Times out otherwise + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "Performance portable programming model for machine learning tensor operators"; homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; @@ -89,7 +92,7 @@ let cp -a ${ck}/bin/ckProfiler $out ''; in stdenv.mkDerivation { - inherit (ck) pname version outputs src passthru meta; + inherit (ck) pname version outputs src passthru requiredSystemFeatures meta; dontUnpack = true; dontPatch = true; From 0756bbd35528d8e405b70668696b01c8454b19c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 08:33:51 +0000 Subject: [PATCH 33/73] clickhouse-backup: 2.2.5 -> 2.2.6 --- pkgs/development/tools/database/clickhouse-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 7f28528cd484..d50a37b9eeff 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sy5R2QSVkxFmfRMiD5KDzkFCol7MpOnfz0/JR++zIX4="; + sha256 = "sha256-oFGaNxK8cVrs+rkmJR9wSYB4+i3B8BGYhsuHbUTK3es="; }; vendorHash = "sha256-UY/8fWPoO3d0g1/CN215Q4z744S2cCT7fB4ctpridAI="; From 699492aa7e809533d2d435adf0d59bd18e40f1ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 10:43:29 +0200 Subject: [PATCH 34/73] elasticsearch-curator: add changelog to meta --- pkgs/tools/admin/elasticsearch-curator/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index b33aa22dd304..5df08e4f6b4d 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: let python = python3.override { @@ -16,7 +19,7 @@ let }; }; in python.pkgs.buildPythonApplication rec { - pname = "elasticsearch-curator"; + pname = "elasticsearch-curator"; version = "5.8.4"; format = "setuptools"; @@ -24,7 +27,7 @@ in python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "elastic"; repo = "curator"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-wSfd52jebUkgF5xhjcoUjI7j46eJF33pVb4Wrybq44g="; }; @@ -80,6 +83,7 @@ in python.pkgs.buildPythonApplication rec { * Perform various actions on the items which remain in the actionable list. ''; + changelog = "https://github.com/elastic/curator/releases/tag/v${version}"; maintainers = with maintainers; [ basvandijk ]; }; } From b688ff79ef47a4148b5f512d9df4de567be1945e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 11:00:26 +0200 Subject: [PATCH 35/73] elasticsearch-curator: 5.8.4 -> 8.0.4 Diff: https://github.com/elastic/curator/compare/refs/tags/v5.8.4...v8.0.4 Changelog: https://github.com/elastic/curator/releases/tag/v8.0.4 --- .../admin/elasticsearch-curator/default.nix | 93 ++++++++++--------- 1 file changed, 51 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 5df08e4f6b4d..77acc590e1d4 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -3,66 +3,75 @@ , python3 }: -let - python = python3.override { - packageOverrides = self: super: { - click = super.click.overridePythonAttrs (old: rec { - version = "7.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - }); - requests-aws4auth = super.requests-aws4auth.overridePythonAttrs (old: { - doCheck = false; # requires click>=8.0 - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "5.8.4"; - - format = "setuptools"; + version = "8.0.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "refs/tags/v${version}"; - hash = "sha256-wSfd52jebUkgF5xhjcoUjI7j46eJF33pVb4Wrybq44g="; + hash = "sha256-FPp2BpfYsmNwwevYQ6EH3N1q0TjyeEsBeDM9EUbLl+Q="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "urllib3==1.26.4" "urllib3" - substituteInPlace setup.py \ - --replace "urllib3==1.26.4" "urllib3" \ - --replace "pyyaml==5.4.1" "pyyaml" - ''; - - propagatedBuildInputs = with python.pkgs; [ - elasticsearch - urllib3 - requests - boto3 - requests-aws4auth - click - pyyaml - voluptuous - certifi - six + pythonRelaxDeps = [ + "click" + "ecs-logging" + "elasticsearch8" + "es_client" + "pyyaml" ]; - nativeCheckInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ + hatchling + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + certifi + click + ecs-logging + elasticsearch8 + es-client + pyyaml + six + voluptuous + ]; + + nativeCheckInputs = with python3.pkgs; [ mock + requests pytestCheckHook ]; disabledTestPaths = [ - "test/integration" # requires running elasticsearch + # Test requires running elasticsearch + "tests/integration/test_alias.py" + "tests/integration/test_allocation.py" + "tests/integration/test_cli.py" + "tests/integration/test_close.py" + "tests/integration/test_clusterrouting.py" + "tests/integration/test_count_pattern.py" + "tests/integration/test_create_index.py" + "tests/integration/test_datemath.py" + "tests/integration/test_delete_indices.py" + "tests/integration/test_delete_snapshots.py" + "tests/integration/test_delete_snapshots.py" + "tests/integration/test_es_repo_mgr.py" + "tests/integration/test_forcemerge.py" + "tests/integration/test_integrations.py" + "tests/integration/test_open.py" + "tests/integration/test_reindex.py" + "tests/integration/test_replicas.py" + "tests/integration/test_restore.py" + "tests/integration/test_rollover.py" + "tests/integration/test_shrink.py" + "tests/integration/test_snapshot.py" ]; disabledTests = [ - # access network + # Test require access network "test_api_key_not_set" "test_api_key_set" ]; From 54be8a5a7855e3cb4cbb3076490cf0975ab8abbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 06:05:09 +0200 Subject: [PATCH 36/73] python310Packages.markerlib: remove Module has been abandoned since 2013 and upstream repo is no longer available --- .../python-modules/markerlib/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/markerlib/default.nix diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix deleted file mode 100644 index 99358e4f95d3..000000000000 --- a/pkgs/development/python-modules/markerlib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, nose -}: - -buildPythonPackage rec { - version = "0.6.0"; - pname = "markerlib"; - - src = fetchPypi { - inherit pname version; - sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae"; - }; - - buildInputs = [ setuptools ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://bitbucket.org/dholth/markerlib/"; - description = "A compiler for PEP 345 environment markers"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c09963627d50..fb1883efa63b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -164,6 +164,7 @@ mapAliases ({ mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 + markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebccdd17911c..29b076bc20e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5997,8 +5997,6 @@ self: super: with self; { markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; - markerlib = callPackage ../development/python-modules/markerlib { }; - markupsafe = callPackage ../development/python-modules/markupsafe { }; markuppy = callPackage ../development/python-modules/markuppy { }; From 67956ec5c3ca95f555b3144c721223d7af503aad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 21 May 2023 17:49:26 +0800 Subject: [PATCH 37/73] volctl: 0.9.2 -> 0.9.4 https://github.com/buzz/volctl/compare/v0.9.2...v0.9.4 --- pkgs/tools/audio/volctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index ed29448d06c9..e0a80f90a719 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "volctl"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "buzz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ill0rwqrgAH7lbzh86DQc1Q71lkYh8PCKZvi4XadsW8="; + sha256 = "sha256-jzS97KV17wKeBI6deKE4rEj5lvqC38fq1JGundHn2So="; }; postPatch = '' From 6ccd904251b8baa782896f36dce6114c72bc37c2 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 21 May 2023 11:52:06 +0200 Subject: [PATCH 38/73] rtl8814au: unstable-2022-11-09 -> unstable-2023-03-21 --- pkgs/os-specific/linux/rtl8814au/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index c11493237cdc..0b1522c96972 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8814au"; - version = "${kernel.version}-unstable-2022-11-09"; + version = "${kernel.version}-unstable-2023-03-21"; src = fetchFromGitHub { owner = "morrownr"; repo = "8814au"; - rev = "932df6f7da6c3a384cf91f33eb195097eb0cb6c5"; - hash = "sha256-nMQiT59IIhzpePWWDiyCQFmYLWM42L/mG0BKsbEwreo="; + rev = "6f80699e68fd2a9f2bba3f1a56ca06d1b7992bd8"; + hash = "sha256-7dv+8vNI1OLLA4SdZQPL87pTS9HR6mGijzWo9WL7vc0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From d6ac86661384a885b4cc749e61f94121b3e728ff Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 21 May 2023 12:00:49 +0200 Subject: [PATCH 39/73] rtl8821au: unstable-2022-12-22 -> unstable-2023-03-22 --- pkgs/os-specific/linux/rtl8821au/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index aa4a7f661e7b..37494d9c37ec 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821au"; - version = "${kernel.version}-unstable-2022-12-22"; + version = "${kernel.version}-unstable-2023-03-22"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "73f2036bc6c8666555fa453d267d3732392c1e00"; - sha256 = "sha256-wx7xQBCfLu3UWB7ghp8dZ7OB2MFd5i8X0/ygyvW2K50="; + rev = "a133274b0532c17318e8790b771566f4a6b12b7c"; + hash = "sha256-xn2cmbtqQhLM9qLCEvVhCuoCa7y8LM4sevPqv3a6pBw="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; From 18dbed1bfc3015217c0e7a359be084d4c4001f75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 10:35:33 +0000 Subject: [PATCH 40/73] pgmetrics: 1.14.1 -> 1.15.0 --- pkgs/tools/misc/pgmetrics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 05367d2e52ba..d5fd68c59a8a 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Uwi21dNhpDhrcLS2Ra0vaRsvdqEz7FX7SPILeq12ZnE="; + sha256 = "sha256-tEPn+/xTDBFWf3SH/+5R38zWGAmMCHcFw/JvuvG2Jvs="; }; - vendorHash = "sha256-BGm3LvKOtlba/BtZ4Ue3Tzphlj5ZSqSzXTF8gSgRYEU="; + vendorHash = "sha256-jRgOIhRB5F/rbfNniXoOllvDqoHP8nkVwmEPSreHYXg="; doCheck = false; From 29a68a4b90dcf35e2c9a8c3d35b6b160a80343ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 10:47:27 +0000 Subject: [PATCH 41/73] kustomize-sops: 4.1.1 -> 4.1.3 --- pkgs/development/tools/kustomize/kustomize-sops.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 8d7201e5b723..32f23fa4a7e8 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jwOyOGSnUgk9+cD+cGj1/ZzQ84HAdAn0HMy3CLPs1U0="; + sha256 = "sha256-ZIYg6ITGHXJZ0YySwSN8mlSmiFiWsWUeGwIo8vRLw3Y="; }; vendorHash = "sha256-tNYPgXFDJuNRlrVE0ywg77goNzfoWHFVzOG9mHqK3q8="; From e5cdd63f009f500f3b18845c1d247f8b3131f73c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 10:50:10 +0000 Subject: [PATCH 42/73] go-containerregistry: 0.15.1 -> 0.15.2 --- pkgs/development/tools/go-containerregistry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index 2cfe32cd4348..55a331b38e48 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yXIFPLuqyWaWgbGbGOuBwWg/KWM9vuMnXnTBcgluzhI="; + sha256 = "sha256-Bva962laaHJAHwiQAMPtOBkwqce1ww+sBGkjV1TjrwQ="; }; vendorHash = null; From d8fc0ee270ceb7b22ec98e3c6277d9b57c0575b7 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 21 May 2023 13:09:35 +0200 Subject: [PATCH 43/73] rtl88xxau-aircrack: 35308f -> unstable-02-05-2023 --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index a2f7ca0e815d..78409b7bd14a 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: -let - rev = "ee299797bcd54d5b8c58d2da8576c54cea1a03a2"; -in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; - version = "${kernel.version}-${builtins.substring 0 6 rev}"; + version = "${kernel.version}-unstable-02-05-2023"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8812au"; - inherit rev; - sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; + rev = "35308f4dd73e77fa572c48867cce737449dd8548"; + hash = "sha256-0kHrNsTKRl/xTQpDkIOYqTtcHlytXhXX8h+6guvLmLI="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 67e5dd23fff64b729585b850bff7e68b94d54515 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 11:13:59 +0000 Subject: [PATCH 44/73] fq: 0.5.0 -> 0.6.0 --- pkgs/development/tools/fq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index fc4b42910458..8e153cd1d409 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-Fg5J/iLxGUwb2QRZJMHLqK9dBECW9VsiZGX+LyUtyhw="; + hash = "sha256-j7s9oluNtYi6MmTKCendTIjc/zvynY6fWvXH47XkwOI="; }; - vendorHash = "sha256-sjzGtSBgRybcJvOXM4wKN5pTgihNrjUCMPsc62n3tLk="; + vendorHash = "sha256-XobOcG5s2ggTk3RmJPM14OWv45PMyKs0w0BOvozUobw="; ldflags = [ "-s" From 49dd2a3b304eeec7988200840dcab31f48abfb8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 May 2023 11:14:10 +0000 Subject: [PATCH 45/73] chezmoi: 2.33.5 -> 2.33.6 --- 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 6e28c1f9dcf2..50e25b421258 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.33.5"; + version = "2.33.6"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-/Dh410wloqwo6dC9YP4Ufr6E56dnHoi48QSiYMSqml0="; + hash = "sha256-tBEhhYfwbipOmGl9lkzhOdXRf3CPNhaIYi4wppAW4Ps="; }; - vendorHash = "sha256-P6PbriempswIH2h1RBTuhtxcmPI5T5lKS9nXRotARa8="; + vendorHash = "sha256-NDqwA6JHpq8ItT7ctv3KKkUwDZNgAjfgigqX9mGEYVY="; doCheck = false; From 754ac1c789aa7a7a4b70c35aa38a2103f78e464b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 13:15:38 +0200 Subject: [PATCH 46/73] python310Packages.glances-api: 0.4.1 -> 0.4.2 Diff: https://github.com/home-assistant-ecosystem/python-glances-api/compare/0.4.1...0.4.2 --- pkgs/development/python-modules/glances-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bc9b3895c1c4..ee2b620d0605 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - hash = "sha256-IBEy19iouYAHIZwc/bnMgmHLrbfZjLni0Ne4o0I6FNg="; + hash = "sha256-fcQgwOYGhpwxSXfa1PYFOe2UDTEu+2YGIQmuSa5J0g4="; }; nativeBuildInputs = [ From 7045ef9fd859d77c6e27cce9f61f896c061e8bb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 13:18:06 +0200 Subject: [PATCH 47/73] python310Packages.glances-api: add changelog to meta --- pkgs/development/python-modules/glances-api/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index ee2b620d0605..c57cee073f7d 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-fcQgwOYGhpwxSXfa1PYFOe2UDTEu+2YGIQmuSa5J0g4="; }; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with Glances"; homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"; + changelog = "https://github.com/home-assistant-ecosystem/python-glances-api/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 3b02b2c851815ed5545ba020b88f1570074c548a Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 21 May 2023 14:02:51 +0200 Subject: [PATCH 48/73] ddcci-driver: fix kernel 6.2 and 6.3 compatibility --- pkgs/os-specific/linux/ddcci/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 91e5dfcd4744..f9a71fece748 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { hash = "sha256-1Z6V/AorD4aslLKaaCZpmkD2OiQnmpu3iroOPlNPtLE="; }; + patches = [ + # https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/merge_requests/12 + (fetchpatch { + name = "kernel-6.2-6.3.patch"; + url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/1ef6079679acc455f75057dd7097b5b494a241dc.patch"; + hash = "sha256-2C2leS20egGY3J2tq96gsUQXYw13wBJ3ZWrdIXxmEYs="; + }) + ]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; From 61f9de8a8be755a6afd9efd75d8c299d14bbfeb4 Mon Sep 17 00:00:00 2001 From: Julius Rickert Date: Sun, 21 May 2023 14:06:57 +0200 Subject: [PATCH 49/73] maintainers: add juliusrickert --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ffaa68bd7bfe..0aa8828c1bd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7881,6 +7881,12 @@ githubId = 1792886; name = "Julien Malka"; }; + juliusrickert = { + email = "nixpkgs@juliusrickert.de"; + github = "juliusrickert"; + githubId = 5007494; + name = "Julius Rickert"; + }; julm = { email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; From f20337110480c6a4e8a9a1a24205237fcbe7431d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 May 2023 23:13:56 +0000 Subject: [PATCH 50/73] system76-keyboard-configurator: 1.3.1 -> 1.3.2 --- .../misc/system76-keyboard-configurator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 8662032fbe7a..1cec644ba92b 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-k9VmEg/HZECUwHaD491ZmfGUxZ14hLOaJD5x3zMK2jI="; + sha256 = "sha256-21cn43qyKg8jL6FF8D9H7dgcgSKggqaxb4cJVc0ljl0="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-0SFph9quh4QWR3nU5IJr4FyLGqrYvmHcZHDRli6phsc="; + cargoHash = "sha256-9VjrDE/1VAgNrRmSYxCYKPrnilPQF+OXAYpFkF2lpAE="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; From d56b8d990dbf84e67b30eb4f576051580b6b3efa Mon Sep 17 00:00:00 2001 From: Julius Rickert Date: Sun, 21 May 2023 14:13:25 +0200 Subject: [PATCH 51/73] python3Packages.dashing: init at 0.1.0 --- .../python-modules/dashing/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/dashing/default.nix diff --git a/pkgs/development/python-modules/dashing/default.nix b/pkgs/development/python-modules/dashing/default.nix new file mode 100644 index 000000000000..e4c57679966a --- /dev/null +++ b/pkgs/development/python-modules/dashing/default.nix @@ -0,0 +1,27 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonPackage rec { + pname = "dashing"; + version = "0.1.0"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.7"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + blessed + ]; + + meta = with lib; { + homepage = "https://github.com/FedericoCeratto/dashing"; + description = "Terminal dashboards for Python"; + license = licenses.gpl3; + maintainers = with maintainers; [ juliusrickert ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06e00fe5b650..49e32557fe6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2254,6 +2254,8 @@ self: super: with self; { dash-table = callPackage ../development/python-modules/dash-table { }; + dashing = callPackage ../development/python-modules/dashing { }; + dask = callPackage ../development/python-modules/dask { }; dask-awkward = callPackage ../development/python-modules/dask-awkward { }; From e413b929e7e0f886a6c8659b8ec127aeed086134 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 21 May 2023 14:15:46 +0200 Subject: [PATCH 52/73] xone: fix kernel 6.3 compatibility --- pkgs/os-specific/linux/xone/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index 71bafb7abd9b..da0ae54e560f 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, fetchurl }: +{ stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "xone"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE="; }; + patches = [ + # Fix build on kernel 6.3 + (fetchpatch { + name = "kernel-6.3.patch"; + url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch"; + hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU="; + }) + ]; + setSourceRoot = '' export sourceRoot=$(pwd)/source ''; From 456ca207811d1ce01534f158e37f8c327d7c8e53 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 20 May 2023 11:45:00 +0200 Subject: [PATCH 53/73] searxng: unstable-2023-03-13 -> unstable-2023-05-19 Diff: https://github.com/searxng/searxng/compare/295c87a926c3deb1e438234550a9d8fbbaad17fa..d867bf17e6d2f9a7c83c9a1ffafda5184a24c0e3 --- pkgs/servers/web-apps/searxng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 9ea17db9ee13..86ea435d94ae 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-03-13"; + version = "unstable-2023-05-19"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "295c87a926c3deb1e438234550a9d8fbbaad17fa"; - sha256 = "sha256-ItPFUyyuctx/yyMVUn5Ez9f+taNiV6FR0q9wz1jwk8M="; + rev = "d867bf17e6d2f9a7c83c9a1ffafda5184a24c0e3"; + sha256 = "sha256-W7/8/3FzwErPkRlfuyqajova6LRKarANPtc6L/z20CI="; }; postPatch = '' From 8607b80c85600c2ad439a8a198ff812b15d01c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 20 May 2023 21:08:10 +1000 Subject: [PATCH 54/73] haskellPackages.memfd: mark supported on linux only memfd interface is linux-specific. Closes #233003. --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7b242e42c69e..111c46d62161 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -708,6 +708,7 @@ supported-platforms: linux-mount: [ platforms.linux ] linux-namespaces: [ platforms.linux ] lxc: [ platforms.linux ] + memfd: [ platforms.linux ] midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ce6c1069244c..ede7c9cdf947 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -192598,6 +192598,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Open temporary anonymous Linux file handles"; license = lib.licenses.asl20; + platforms = lib.platforms.linux; }) {}; "meminfo" = callPackage From 85c2492655b0341196cdbe993e06779f74e6f761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 20 May 2023 15:32:18 +1000 Subject: [PATCH 55/73] haskellPackages.gauge: fix darwin build Include unreleased patch which is already merged upstream to fix the aarch64 darwin build. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6732980273e5..dff357eb4e95 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2663,4 +2663,12 @@ self: super: { parsec = lself.parsec_3_1_16_1; text = lself.text_2_0_2; })); + + # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. + # https://github.com/vincenthz/hs-gauge/pull/106 + gauge = appendPatch (pkgs.fetchpatch { + name = "darwin-aarch64-fix.patch"; + url = "https://github.com/vincenthz/hs-gauge/commit/3d7776f41187c70c4f0b4517e6a7dde10dc02309.patch"; + hash = "sha256-4osUMo0cvTvyDTXF8lY9tQbFqLywRwsc3RkHIhqSriQ="; + }) super.gauge; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 27c87a1069eaf8b0ec2d57a4efbde66bb97b8376 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 15:03:57 +0200 Subject: [PATCH 56/73] clash: 1.15.1 -> 1.16.0 Diff: https://github.com/Dreamacro/clash/compare/refs/tags/v1.15.1...v1.16.0 Changelog: https://github.com/Dreamacro/clash/releases/tag/v1.16.0 --- pkgs/tools/networking/clash/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index fdeb770e0546..589a50985de9 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule, testers, clash }: +{ lib +, fetchFromGitHub +, buildGoModule +, testers +, clash +}: buildGoModule rec { pname = "clash"; @@ -7,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-y2Z4YaVKKFxZzLUOUs1PeMkWhFimAhu9nAahhX/4Xn8="; }; @@ -31,7 +36,8 @@ buildGoModule rec { meta = with lib; { description = "A rule-based tunnel in Go"; - homepage = "https://github.com/Dreamacro/clash"; + homepage = "https://dreamacro.github.io/clash/"; + changelog = "https://github.com/Dreamacro/clash/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ contrun Br1ght0ne ]; }; From 75a74cb870b37d7351e2873b0c7272de53cb2426 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 15:27:06 +0200 Subject: [PATCH 57/73] kubestroyer: init at 0.2 --- pkgs/tools/security/kubestroyer/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/kubestroyer/default.nix diff --git a/pkgs/tools/security/kubestroyer/default.nix b/pkgs/tools/security/kubestroyer/default.nix new file mode 100644 index 000000000000..bbe0d9cad7a3 --- /dev/null +++ b/pkgs/tools/security/kubestroyer/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "kubestroyer"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "Rolix44"; + repo = "Kubestroyer"; + rev = "refs/tags/v${version}"; + hash = "sha256-M/abb2IT0mXwj8lAitr18VtIgC4NvapPywBwcUWr9i8="; + }; + + vendorHash = "sha256-x0lIi4QUuYn0kv0HV4h8k61kRu10LCyELudisqUdTAg="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Kubernetes exploitation tool"; + homepage = "https://github.com/Rolix44/Kubestroyer"; + changelog = "https://github.com/Rolix44/Kubestroyer/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b03392cf33e..c0601c555e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31817,6 +31817,8 @@ with pkgs; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubestroyer = callPackage ../tools/security/kubestroyer { }; + kubernix = callPackage ../applications/networking/cluster/kubernix { }; kubeconform = callPackage ../applications/networking/cluster/kubeconform { }; From cb81bd9340b4d0545fab99a62670cd9851406586 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 18 May 2023 03:29:07 +0200 Subject: [PATCH 58/73] jitsi-videobridge: refactor broken apis option to colibriRestApi Refactor option to use jvb.conf and convert to boolean. Using the CLI argument broke a while ago and is deprecated by upstream since 2021: https://github.com/jitsi/jitsi-videobridge/pull/1738/files#diff-d9f589d2aae1673693461d7c3b9214324201ca1f43db63a3c773d4acfc52bc81 This fixes the currently broken test: nixosTests.prometheus-exporters.jitsi --- .../manual/release-notes/rl-2305.section.md | 2 ++ .../services/networking/jitsi-videobridge.nix | 19 ++++++++++++------- nixos/tests/prometheus-exporters.nix | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index c5a29ed9f202..bfa1c49206ad 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -557,6 +557,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `make-disk-image` handles `contents` arguments that are directories better, fixing a bug where it used to put them in a subdirectory of the intended `target`. +- The option `services.jitsi-videobridge.apis` has been renamed to `colibriRestApi` and turned into a boolean. Setting it to `true` will enable the private rest API, useful for monitoring using `services.prometheus.exporters.jitsi.enable`. Learn more about the API: "[The COLIBRI control interface (/colibri/)](https://github.com/jitsi/jitsi-videobridge/blob/v2.3/doc/rest.md)". + ## Detailed migration information {#sec-release-23.05-migration} ### Pipewire configuration overrides {#sec-release-23.05-migration-pipewire} diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix index 09f2ddf92c5c..37b0b1e5bf50 100644 --- a/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixos/modules/services/networking/jitsi-videobridge.nix @@ -43,6 +43,7 @@ let muc_nickname = xmppConfig.mucNickname; disable_certificate_verification = xmppConfig.disableCertificateVerification; }); + apis.rest.enabled = cfg.colibriRestApi; }; }; @@ -50,6 +51,11 @@ let jvbConfig = recursiveUpdate defaultJvbConfig cfg.config; in { + imports = [ + (mkRemovedOptionModule [ "services" "jitsi-videobridge" "apis" ] + "services.jitsi-videobridge.apis was broken and has been migrated into the boolean option services.jitsi-videobridge.colibriRestApi. It is set to false by default, setting it to true will correctly enable the private /colibri rest API." + ) + ]; options.services.jitsi-videobridge = with types; { enable = mkEnableOption (lib.mdDoc "Jitsi Videobridge, a WebRTC compatible video router"); @@ -192,14 +198,13 @@ in ''; }; - apis = mkOption { - type = with types; listOf str; + colibriRestApi = mkOption { + type = bool; description = lib.mdDoc '' - What is passed as --apis= parameter. If this is empty, "none" is passed. - Needed for monitoring jitsi. + Whether to enable the private rest API for the COLIBRI control interface. + Needed for monitoring jitsi, enabling scraping of the /colibri/stats endpoint. ''; - default = []; - example = literalExpression "[ \"colibri\" \"rest\" ]"; + default = false; }; }; @@ -233,7 +238,7 @@ in "export ${toVarName name}=$(cat ${xmppConfig.passwordFile})\n" ) cfg.xmppConfigs)) + '' - ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=${if (cfg.apis == []) then "none" else concatStringsSep "," cfg.apis} + ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge ''; serviceConfig = { diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index adc2b467be51..356bda17400b 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -328,7 +328,7 @@ let systemd.services.prometheus-jitsi-exporter.after = [ "jitsi-videobridge2.service" ]; services.jitsi-videobridge = { enable = true; - apis = [ "colibri" "rest" ]; + colibriRestApi = true; }; }; exporterTest = '' From 53c7e7e0288337bd0d4b53c8902ca903750734b3 Mon Sep 17 00:00:00 2001 From: Julius Rickert Date: Sun, 21 May 2023 14:13:45 +0200 Subject: [PATCH 59/73] asitop: init at 0.0.23 --- pkgs/os-specific/darwin/asitop/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/darwin/asitop/default.nix diff --git a/pkgs/os-specific/darwin/asitop/default.nix b/pkgs/os-specific/darwin/asitop/default.nix new file mode 100644 index 000000000000..0ec101901b19 --- /dev/null +++ b/pkgs/os-specific/darwin/asitop/default.nix @@ -0,0 +1,32 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "asitop"; + version = "0.0.23"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.7"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-BNncgQRNAd6Pgur5D1xVQi3LSsijSAYIYvhsuiVyi9Q="; + }; + + # has no tests + doCheck = false; + + propagatedBuildInputs = with python3.pkgs; [ + dashing + psutil + ]; + + meta = with lib; { + homepage = "https://github.com/tlkh/asitop"; + description = "Perf monitoring CLI tool for Apple Silicon"; + platforms = platforms.darwin; + license = licenses.mit; + maintainers = with maintainers; [ juliusrickert ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 779feec8df69..8c1fcf73d200 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -260,6 +260,8 @@ with pkgs; alterx = callPackage ../tools/security/alterx { }; + asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { }; + asn = callPackage ../applications/networking/asn { }; asnmap = callPackage ../tools/security/asnmap { }; From bf17936bdf8e11420f92402bc24eab171a2131ac Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 18 May 2023 12:30:00 +0200 Subject: [PATCH 60/73] emacsPackages.color-theme-solarized: use packageRequires --- .../color-theme-solarized/default.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix index 1ac8b2f70768..07322879b5be 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix @@ -1,7 +1,6 @@ { lib , trivialBuild , fetchFromGitHub -, emacs , color-theme }: @@ -16,23 +15,12 @@ trivialBuild { hash = "sha256-oxX0lo6sxotEiR3nPrKPE9H01HKB3ohB/p8eEHFTp5k="; }; - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ color-theme ]; - - buildPhase = '' - runHook preBuild - - emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* \ - --batch -f batch-byte-compile *.el - - runHook postBuild - ''; + packageRequires = [ color-theme ]; meta = with lib; { homepage = "http://ethanschoonover.com/solarized"; description = "Precision colors for machines and people; Emacs implementation"; license = licenses.mit; maintainers = with maintainers; [ samuelrivas AndersonTorres ]; - inherit (emacs.meta) platforms; }; } From a81af31b38fcc4b6070356990483c9b1b966285d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 16 May 2023 09:02:35 +0300 Subject: [PATCH 61/73] cbqn: run test suite in installCheckPhase --- .../interpreters/bqn/cbqn/default.nix | 24 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 6 ++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index a6e8f4c9feb9..f455be743127 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -6,7 +6,7 @@ , fixDarwinDylibNames , genBytecode ? false , bqn-path ? null -, mbqn-source ? null +, mbqn-source , enableReplxx ? false , enableSingeli ? stdenv.hostPlatform.avx2Support , enableLibcbqn ? ((stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) && !enableReplxx) @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ]; dontConfigure = true; + doInstallCheck = true; postPatch = '' sed -i '/SHELL =.*/ d' makefile @@ -100,6 +101,26 @@ stdenv.mkDerivation rec { runHook postInstall ''; + installCheckPhase = '' + runHook preInstallCheck + + # main test suite from mlochbaum/BQN + $out/bin/BQN ${mbqn-source}/test/this.bqn + + # CBQN tests that do not require compiling with test-only flags + $out/bin/BQN test/cmp.bqn + $out/bin/BQN test/equal.bqn + $out/bin/BQN test/copy.bqn + $out/bin/BQN test/bit.bqn + $out/bin/BQN test/hash.bqn + $out/bin/BQN test/squeezeValid.bqn + $out/bin/BQN test/squeezeExact.bqn + $out/bin/BQN test/various.bqn + $out/bin/BQN test/random.bqn + + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/dzaima/CBQN/"; description = "BQN implementation in C"; @@ -108,4 +129,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } -# TODO: test suite diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6bf4993f8a4..4ae59f66e73d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16761,17 +16761,15 @@ with pkgs; mbqn-source = buildPackages.mbqn.src; phase0 = callPackage ../development/interpreters/bqn/cbqn { - inherit (cbqn-bootstrap) stdenv; + inherit (cbqn-bootstrap) mbqn-source stdenv; genBytecode = false; bqn-path = null; - mbqn-source = null; }; phase0-replxx = callPackage ../development/interpreters/bqn/cbqn { - inherit (cbqn-bootstrap) stdenv; + inherit (cbqn-bootstrap) mbqn-source stdenv; genBytecode = false; bqn-path = null; - mbqn-source = null; enableReplxx = true; }; From 47f1060a51eef7545a751f6913874febdbffdc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 19 May 2023 14:38:40 +0300 Subject: [PATCH 62/73] mbqn: 0.pre+date=2023-05-09 -> unstable-2023-05-17 --- pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix index 85a3be161caa..d217ec99ebe5 100644 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "bqn"; - version = "0.pre+date=2023-05-09"; + version = "unstable-2023-05-17"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "656b176c5dc783b038b018f0ed17a5414ea62b4d"; - hash = "sha256-6r+N0eCvwvaoB84cw+Vtoqa6MXuI0NXLbOPblemY4M8="; + rev = "070bd07dc10c291695215265218ec0ff856ce457"; + hash = "sha256-GRIIzJwlJ+JTBHXZjoX/9vLFbAC7zyeuqVcrA/Jm/NA="; }; nativeBuildInputs = [ makeWrapper ]; From 38d1a10e872500c160b835caecb7dfd0ab0790f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 19 May 2023 14:39:17 +0300 Subject: [PATCH 63/73] cbqn-bytecode: unstable-2023-04-19 -> unstable-2023-05-17 --- pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix index 34768c1955ec..d311f3d61ebd 100644 --- a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix +++ b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "cbqn-bytecode"; - version = "unstable-2023-04-19"; + version = "unstable-2023-05-17"; src = fetchFromGitHub { owner = "dzaima"; repo = "cbqnBytecode"; - rev = "78ed4102f914eb5fa490d76d4dcd4f8be6e53417"; - hash = "sha256-IOhxcfGmpARiTdFMSpc+Rh8VXtasZdfP6vKJzULNxAg="; + rev = "32db4dfbfc753835bf112f3d8ae2991d8aebbe3d"; + hash = "sha256-9uBPrEESn/rB9u0xXwKaQ7ABveQWPc8LRMPlnI/79kg="; }; dontConfigure = true; @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,src} -t $out/dev + install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,runtime1x,src} -t $out/dev runHook postInstall ''; From 83174fd5d41a2699d7d2b242c2e8f5a20a6b437d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 19 May 2023 14:39:40 +0300 Subject: [PATCH 64/73] singeli: unstable-2023-04-12 -> unstable-2023-04-27 --- pkgs/development/interpreters/bqn/cbqn/singeli.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix index 253f7549a6c0..fafbc875a795 100644 --- a/pkgs/development/interpreters/bqn/cbqn/singeli.nix +++ b/pkgs/development/interpreters/bqn/cbqn/singeli.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "singeli"; - version = "unstable-2023-04-12"; + version = "unstable-2023-04-27"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "Singeli"; - rev = "3327956fedfdc6aef12954bc12120f20de2226d0"; - hash = "sha256-k25hk5zTn0m+2Nh9buTJYhtM98/VRlQ0guoRw9el3VE="; + rev = "853ab1a06ae8d8603f228d8e784fa319cc401459"; + hash = "sha256-X/NnufvakihJAE9H7geuuDS7Tv9l7tgLKdRgXC4ZX4A="; }; dontConfigure = true; From fef3d83a2b6ceee6904bab91c412b8146fed4b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 19 May 2023 14:40:21 +0300 Subject: [PATCH 65/73] cbqn: 0.2.0 -> 0.3.0 --- .../interpreters/bqn/cbqn/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index f455be743127..bcc58315ebb6 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -8,7 +8,6 @@ , bqn-path ? null , mbqn-source , enableReplxx ? false -, enableSingeli ? stdenv.hostPlatform.avx2Support , enableLibcbqn ? ((stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) && !enableReplxx) , libffi , pkg-config @@ -24,13 +23,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; rev = "v${version}"; - hash = "sha256-M9GTsm65DySLcMk9QDEhImHnUvWtYGPwiG657wHg3KA="; + hash = "sha256-LoxwNxuadbYJgIkr1+bZoErTc9WllN2siAsKnxoom3Y="; }; nativeBuildInputs = [ @@ -55,8 +54,11 @@ stdenv.mkDerivation rec { buildFlags = [ # interpreter binary - (lib.flatten (if enableSingeli then ["o3n-singeli" "f='-mavx2'"] else ["o3"])) + "o3" + "notui=1" # display build progress in a plain-text format "REPLXX=${if enableReplxx then "1" else "0"}" + ] ++ lib.optionals stdenv.hostPlatform.avx2Support [ + "has=avx2" ] ++ lib.optionals enableLibcbqn [ # embeddable interpreter as a shared lib "shared-o3" @@ -65,6 +67,7 @@ stdenv.mkDerivation rec { preBuild = '' # Purity: avoids git downloading bytecode files mkdir -p build/bytecodeLocal/gen + cp -r ${singeli-submodule}/dev/* build/singeliLocal/ '' + (if genBytecode then '' ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' @@ -72,10 +75,7 @@ stdenv.mkDerivation rec { '') + lib.optionalString enableReplxx '' cp -r ${replxx-submodule}/dev/* build/replxxLocal/ - '' - + lib.optionalString enableSingeli '' - cp -r ${singeli-submodule}/dev/* build/singeliLocal/ - ''; + ''; outputs = [ "out" From 8229ab2435dd53eef8c5eb076c15ccdafd25fec7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 May 2023 15:40:53 +0200 Subject: [PATCH 66/73] rubyPackages.openssl: build against OpenSSL 3 if supported (#232906) --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 105b463f8272..4e9f663d9ac5 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -516,7 +516,7 @@ in openssl = attrs: { # https://github.com/ruby/openssl/issues/369 - buildInputs = [ openssl_1_1 ]; + buildInputs = [ (if (lib.versionAtLeast attrs.version "3.0.0") then openssl else openssl_1_1) ]; }; opus-ruby = attrs: { From b0e7f7f5dbbe75c27b46b2c3c039964ba99b3295 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 21 May 2023 16:00:44 +0200 Subject: [PATCH 67/73] maintainers: rename indeednotjames to emilylange --- maintainers/maintainer-list.nix | 12 ++++++------ nixos/modules/services/security/vault-agent.nix | 2 +- nixos/tests/gitea.nix | 2 +- .../version-management/forgejo/default.nix | 2 +- .../drone-runner-docker/default.nix | 2 +- pkgs/servers/caddy/default.nix | 2 +- pkgs/servers/caddy/xcaddy/default.nix | 2 +- pkgs/servers/ldap/lldap/default.nix | 2 +- pkgs/servers/monitoring/grafana-agent/default.nix | 2 +- pkgs/servers/monitoring/laurel/default.nix | 2 +- pkgs/servers/monitoring/loki/default.nix | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d3d76374d13..4e7c502d215d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4609,6 +4609,12 @@ githubId = 18535642; name = "Emily"; }; + emilylange = { + email = "nix@emilylange.de"; + github = "emilylange"; + githubId = 55066419; + name = "Emily Lange"; + }; emilytrau = { name = "Emily Trau"; email = "nix@angus.ws"; @@ -6775,12 +6781,6 @@ githubId = 36667224; name = "Yingchi Long"; }; - indeednotjames = { - email = "nix@indeednotjames.com"; - github = "IndeedNotJames"; - githubId = 55066419; - name = "Emily Lange"; - }; indexyz = { email = "indexyz@pm.me"; github = "5aaee9"; diff --git a/nixos/modules/services/security/vault-agent.nix b/nixos/modules/services/security/vault-agent.nix index 244004f7c913..17b8ff83592e 100644 --- a/nixos/modules/services/security/vault-agent.nix +++ b/nixos/modules/services/security/vault-agent.nix @@ -123,6 +123,6 @@ in }) [ "consul-template" "vault-agent" ]); - meta.maintainers = with maintainers; [ indeednotjames tcheronneau ]; + meta.maintainers = with maintainers; [ emilylange tcheronneau ]; } diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 4e6f9c79a6f9..2285bb5a4252 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -26,7 +26,7 @@ let supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { name = "${giteaPackage.pname}-${type}"; - meta.maintainers = with maintainers; [ aanderse indeednotjames kolaente ma27 ]; + meta.maintainers = with maintainers; [ aanderse emilylange kolaente ma27 ]; nodes = { server = { config, pkgs, ... }: { diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index e88f04dc2083..d21097df07b1 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -116,7 +116,7 @@ buildGoModule rec { homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ indeednotjames urandom ]; + maintainers = with maintainers; [ emilylange urandom ]; broken = stdenv.isDarwin; mainProgram = "gitea"; }; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index 784486f49ce4..f71068188049 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ endocrimes indeednotjames ]; + maintainers = with maintainers; [ endocrimes emilylange ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 9ada37768ad1..c4d15b8214c3 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -64,6 +64,6 @@ buildGoModule { homepage = "https://caddyserver.com"; description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne indeednotjames techknowlogick ]; + maintainers = with maintainers; [ Br1ght0ne emilylange techknowlogick ]; }; } diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index ddcc3f17994f..f22967d4fb37 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/caddyserver/xcaddy"; description = "Build Caddy with plugins"; license = licenses.asl20; - maintainers = with maintainers; [ tjni indeednotjames ]; + maintainers = with maintainers; [ tjni emilylange ]; }; } diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 4f462e7fd6a0..1948ca015dda 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -109,6 +109,6 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // { changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ indeednotjames bendlas ]; + maintainers = with maintainers; [ emilylange bendlas ]; }; }) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index dad3e97f43a1..342969746a6c 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -71,6 +71,6 @@ buildGoModule rec { description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; license = licenses.asl20; homepage = "https://grafana.com/products/cloud"; - maintainers = with maintainers; [ flokli indeednotjames ]; + maintainers = with maintainers; [ flokli emilylange ]; }; } diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 8342915dffb1..0d1422cb744d 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/threathunters-io/laurel"; changelog = "https://github.com/threathunters-io/laurel/releases/tag/v${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ indeednotjames ]; + maintainers = with maintainers; [ emilylange ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index e1cb9e826772..3dbd03e2f9fa 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -55,6 +55,6 @@ buildGoModule rec { license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; changelog = "https://github.com/grafana/loki/releases/tag/v${version}"; - maintainers = with maintainers; [ willibutz globin mmahut indeednotjames ]; + maintainers = with maintainers; [ willibutz globin mmahut emilylange ]; }; } From 6a18e4b8a4ecaeea106e4b50e76f767dfab94998 Mon Sep 17 00:00:00 2001 From: Nikolay Mokrinsky Date: Sun, 21 May 2023 06:26:30 +0400 Subject: [PATCH 68/73] wezterm: fix darwin build --- pkgs/applications/terminal-emulators/wezterm/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 26c35d50d214..9743197d8323 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,6 +22,7 @@ , CoreGraphics , Cocoa , Foundation +, System , libiconv , UserNotifications , nixosTests @@ -81,11 +82,14 @@ rustPlatform.buildRustPackage rec { CoreGraphics Foundation libiconv + System UserNotifications ]; buildFeatures = [ "distro-defaults" ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System"; + postInstall = '' mkdir -p $out/nix-support echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d6033cb97e7..f703f1f49f7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2708,7 +2708,7 @@ with pkgs; wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System; }; x3270 = callPackage ../applications/terminal-emulators/x3270 { }; From 4d26725ab9c7b21bb12b446d7fb3e78205257c01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 16:50:11 +0200 Subject: [PATCH 69/73] girsh: init at 0.41 --- pkgs/tools/networking/girsh/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/girsh/default.nix diff --git a/pkgs/tools/networking/girsh/default.nix b/pkgs/tools/networking/girsh/default.nix new file mode 100644 index 000000000000..ebec6f968df8 --- /dev/null +++ b/pkgs/tools/networking/girsh/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "girsh"; + version = "0.41"; + + src = fetchFromGitHub { + owner = "nodauf"; + repo = "Girsh"; + rev = "refs/tags/v${version}"; + hash = "sha256-MgzIBag0Exoh0TXW/AD0lbSOj7PVkMeVYQ8v5jdCgAs="; + }; + + vendorHash = "sha256-8NPFohguMX/X1khEPF+noLBNe/MUoPpXS2PN6SiotL8="; + + ldflags = [ + "-s" + "-w" + ]; + + postInstall = '' + mv $out/bin/src $out/bin/$pname + ''; + + meta = with lib; { + description = "Automatically spawn a reverse shell fully interactive for Linux or Windows victim"; + homepage = "https://github.com/nodauf/Girsh"; + changelog = "https://github.com/nodauf/Girsh/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b03392cf33e..3141b036ca3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5015,6 +5015,8 @@ with pkgs; gir-rs = callPackage ../development/tools/gir { }; + girsh = callPackage ../tools/networking/girsh { }; + gist = callPackage ../tools/text/gist { }; gitjacker = callPackage ../tools/security/gitjacker { }; From 810268b85317d5ce6b79309ca27f3f561c2186a5 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 21 May 2023 17:10:44 +0200 Subject: [PATCH 70/73] nixosTests.prometheus-exporters.statsd fix test --- nixos/tests/prometheus-exporters.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index adc2b467be51..4e2e0401ddf0 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1194,13 +1194,15 @@ let wait_for_unit("prometheus-statsd-exporter.service") wait_for_open_port(9102) succeed("curl http://localhost:9102/metrics | grep 'statsd_exporter_build_info{'") - succeed( - "echo 'test.udp:1|c' > /dev/udp/localhost/9125", - "curl http://localhost:9102/metrics | grep 'test_udp 1'", + wait_until_succeeds( + "echo 'test.udp:1|c' > /dev/udp/localhost/9125 && \ + curl http://localhost:9102/metrics | grep 'test_udp 1'", + timeout=10 ) - succeed( - "echo 'test.tcp:1|c' > /dev/tcp/localhost/9125", - "curl http://localhost:9102/metrics | grep 'test_tcp 1'", + wait_until_succeeds( + "echo 'test.tcp:1|c' > /dev/tcp/localhost/9125 && \ + curl http://localhost:9102/metrics | grep 'test_tcp 1'", + timeout=10 ) ''; }; From cb1bce2e1c2eb52708ad815a02e42802dd38ace9 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 21 May 2023 17:18:27 +0200 Subject: [PATCH 71/73] gitlab: patch for openssl 3.x support (#233235) --- .../applications/version-management/gitlab/rubyEnv/Gemfile | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 7 +++---- .../version-management/gitlab/rubyEnv/gemset.nix | 5 ++--- pkgs/applications/version-management/gitlab/update.py | 3 +++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 25fbc65d271c..b0826a2482e5 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false # Pin openssl to match the version bundled with our supported Rubies. # See https://stdgems.org/openssl/#gem-version. -gem 'openssl', '2.2.2' +gem 'openssl', '3.0.2' gem 'ipaddr', '~> 1.2.5' # Responders respond_to and respond_with diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index cbc11b360a2d..0b14f9032d1f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1093,8 +1093,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.2) - ipaddr + openssl (3.0.2) openssl-signature_algorithm (1.3.0) openssl (> 2.0) opentracing (0.5.0) @@ -1855,7 +1854,7 @@ DEPENDENCIES omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) - openssl (= 2.2.2) + openssl (= 3.0.2) org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) @@ -1967,4 +1966,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.12 + 2.4.13 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 579dcd4242c2..237c9ab5a53d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -4218,15 +4218,14 @@ src: version = "1.3.0"; }; openssl = { - dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; + sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.2"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 1965ce78b7a0..bfdf51d49b41 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -144,6 +144,9 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + # patch for openssl 3.x support + subprocess.check_output(['sed', '-i', "s:'openssl', '2.*':'openssl', '3.0.2':g", 'Gemfile'], cwd=rubyenv_dir) + # Fetch vendored dependencies temporarily in order to build the gemset.nix subprocess.check_output(['mkdir', '-p', 'vendor/gems'], cwd=rubyenv_dir) subprocess.check_output(['sh', '-c', f'curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=vendor/gems | tar -xj --strip-components=3'], cwd=f'{rubyenv_dir}/vendor/gems') From 999652eb33fc84ac62fe85745ca240a84677b785 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 21 May 2023 11:28:13 -0400 Subject: [PATCH 72/73] doc/python: remove usages of `fetchPypi` aliases --- doc/languages-frameworks/python.section.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5c281d6d8600..9cd80b938542 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -411,7 +411,7 @@ with import {}; version = "0.10.0"; format = "setuptools"; - src = python311.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; @@ -1229,7 +1229,7 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: rec { version = "0.19.1"; - src = super.fetchPypi { + src = fetchPypi { pname = "pandas"; inherit version; hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; @@ -1286,6 +1286,7 @@ specifying an interpreter version), like this: ```nix { lib , python3 +, fetchPypi }: python3.pkgs.buildPythonApplication rec { @@ -1293,7 +1294,7 @@ python3.pkgs.buildPythonApplication rec { version = "2.7.9"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; From 601b8658d53c5e25ac3b5203e4a163122a77a84b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 21 May 2023 08:56:46 -0400 Subject: [PATCH 73/73] souffle: 2.3 -> 2.4 --- pkgs/development/compilers/souffle/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 96d3b5f6fc42..6a06213e9599 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,22 +10,17 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "sha256-wdTBSmyA2I+gaSV577NNKA2oY2fdVTGmvV7h15NY1tU="; + sha256 = "sha256-5g2Ikbfm5nQrsgGntZZ/VbjqSDOj0AP/mnH1nW2b4co="; }; patches = [ ./threads.patch - (fetchpatch { - name = "missing-override.patch"; - url = "https://github.com/souffle-lang/souffle/commit/da2d778f0cca94f206686546fa56b9ffc738ad75.patch"; - sha256 = "Oefm3vRRwOyom94oGSOK2w9m23gkbJ++9gcWrdLlkyk="; - }) ]; hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ];