From 51ba23371779e1018fc89573f94ca414c09c4e61 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 17 Aug 2022 13:40:33 -0700 Subject: [PATCH 01/66] pkgs/stdenv/linux: bootstrap-files for third (and final) mips ABI: n32 This PR provides the Hydra-generated bootstrap tarballs for mips64el-linux-gnuabin32. With this PR we now have the bootstrap-file for all three little-endian ABIs on mips: n64, n32, and o32. I do not currently plan to do big-endian mips unless some motivation arises; all mips chips are bi-endian and Debian has dropped big-endian support due to lack of interest. I'll be following the script used in #151399, #168199, and #183487. Files came from [this](https://hydra.nixos.org/build/188389586#tabs-summary) Hydra build, which used nixpkgs revision 97d9c84e1df4397b43ecb39359f1bd003cd44585 to instantiate: ``` /nix/store/hakn8s85s9011v61r6svp5qy8x1y64fv-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32.drv ``` and then built: ``` /nix/store/rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32 ``` I downloaded these files from Hydra and prefetched them into the nix store with the following commands: ``` STOREPATH=rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32 OPTIONS="--option binary-caches https://cache.nixos.org --option trusted-public-keys cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" nix store prefetch-file \ file://$(nix store add-file --name bootstrap-tools.tar.xz $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/bootstrap-tools.tar.xz) nix store prefetch-file --executable \ file://$(nix store add-path --name busybox $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/busybox) ``` These commands produced the following output: ``` Downloaded 'file:///nix/store/w6zzd2fx2vhmjfcf5h5zc01m0swldpbw-bootstrap-tools.tar.xz' to '/nix/store/6w0f0mqblrghvh6yjwcb4xdqq9x50lbl-w6zzd2fx2vhmjfcf5h5zc01m0swldpbw-bootstrap-tools.tar.xz' (hash 'sha256-LWrpN6su2yNVurUyhZP34OiZyzgh7MfN13fIIbou8KI='). Downloaded 'file:///nix/store/nqagw1kgdz1zlmqi00qfjrmwqk3g3bgd-busybox' to '/nix/store/i361xhbdhhnvg7zd637xpm63vbl80s0s-nqagw1kgdz1zlmqi00qfjrmwqk3g3bgd-busybox' (hash 'sha256-4N3G1qYA7vitjhsIW17pR6UixIuzrq4vZXa8F0/X4iI='). ``` I used the hashes from the output above to create the `fetchurl` invocation which is part of this commit. I then started the bootstrap with the following command: ``` nix build -L -f . --arg localSystem '(import ./lib).systems.examples.mips64el-linux-gnuabin32' hello ``` As @lovesegfault requested, here are the the `sha256sum`s of all the `on-server` components for extra verification: ``` sha256sum /nix/store/${STOREPATH}/on-server/* ``` which produced the following output: ``` 2d6ae937ab2edb2355bab5328593f7e0e899cb3821ecc7cdd777c821ba2ef0a2 /nix/store/rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32/on-server/bootstrap-tools.tar.xz 01633f71135cb9ab1b5ce3ebb67e80cbf288739729bffc1350c1552f6f8df34b /nix/store/rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32/on-server/busybox ``` --- .../linux/bootstrap-files/mips64el-n32.nix | 25 +++++++++++++++++++ pkgs/stdenv/linux/default.nix | 5 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix new file mode 100644 index 000000000000..9a28f8117bbc --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/188389586 +# +# Which used nixpkgs revision 97d9c84e1df4397b43ecb39359f1bd003cd44585 +# to instantiate: +# +# /nix/store/hakn8s85s9011v61r6svp5qy8x1y64fv-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32.drv +# +# and then built: +# +# /nix/store/rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32 +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el/97d9c84e1df4397b43ecb39359f1bd003cd44585/busybox"; + sha256 = "sha256-4N3G1qYA7vitjhsIW17pR6UixIuzrq4vZXa8F0/X4iI="; + executable = true; + }; + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el/97d9c84e1df4397b43ecb39359f1bd003cd44585/bootstrap-tools.tar.xz"; + sha256 = "sha256-LWrpN6su2yNVurUyhZP34OiZyzgh7MfN13fIIbou8KI="; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6e61b6f12be1..856280864f4b 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,7 +16,10 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; - mips64el-linux = import ./bootstrap-files/mips64el.nix; + mips64el-linux = import + (if localSystem.isMips64n32 + then ./bootstrap-files/mips64el-n32.nix + else ./bootstrap-files/mips64el.nix); powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; riscv64-linux = import ./bootstrap-files/riscv64.nix; }; From efbeb1bb5e90ab3ca2d5184e446cea4fa97c29cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Nov 2022 18:58:28 +0000 Subject: [PATCH 02/66] prometheus-cpp: 1.0.1 -> 1.1.0 --- pkgs/development/libraries/prometheus-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 521626f24646..dda515932f2c 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "prometheus-cpp"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jupp0r"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F8paJhptEcOMtP0FCJ3ragC4kv7XSVPiZheM5UZChno="; + sha256 = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; }; nativeBuildInputs = [ cmake ]; From 61840f7181bc17f3c808fcae5acc656a2408ab7b Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Wed, 7 Dec 2022 15:22:04 -0800 Subject: [PATCH 03/66] nixos/prometheus: Add new relabel_configs actions The relabel_configs option for scrape_configs is missing two options: lowercase and uppercase https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config --- nixos/modules/services/monitoring/prometheus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index f6bae8f9e965..b295f0d5cc74 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -1409,7 +1409,7 @@ let ''; action = - mkDefOpt (types.enum [ "replace" "keep" "drop" "hashmod" "labelmap" "labeldrop" "labelkeep" ]) "replace" '' + mkDefOpt (types.enum [ "replace" "lowercase" "uppercase" "keep" "drop" "hashmod" "labelmap" "labeldrop" "labelkeep" ]) "replace" '' Action to perform based on regex matching. ''; }; From 4d547243a283353e7cb1c39fe76efa66f18ecf3c Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 20 Feb 2023 03:30:59 -0600 Subject: [PATCH 04/66] signal-desktop: 6.5.1 -> 6.7.0, signal-desktop-beta: 6.6.0-beta.1 -> 6.8.0-beta.1 --- .../instant-messengers/signal-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d8f3fcb17939..22d071838869 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.5.1"; - hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; + version = "6.7.0"; + hash = "sha256-njiVPTkzYdt7QZcpohXUI3hj/o+fO4/O0ZlQrq2oP6Y="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.6.0-beta.1"; - hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; + version = "6.8.0-beta.1"; + hash = "sha256-akQmGxDW6SBQCRLU6TgfODP8ZjEPsvaBvrkdd+6DqKs="; }; } From ca44f0485c6135d1a1be5f9a3ac7ab1b18c24752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Thu, 2 Mar 2023 23:32:44 +1100 Subject: [PATCH 05/66] python310Packages.questionary: increase open files for testing The tests open a lot of sockets. This runs into darwin's default limits. --- pkgs/development/python-modules/questionary/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index b7b03c3b441a..7d3009c1712c 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = lib.optionalString stdenv.isDarwin '' + ulimit -n 1024 + ''; + disabledTests = [ # TypeError: () missing 1 required... "test_print_with_style" From 7e29e1b2c2cb2adb79783f2393553fbfd52175c5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 06/66] postgresqlPackages.timescaledb: 2.10.0 -> 2.10.1 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 045e381edd73..a476d3e21d3a 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.10.0"; + version = "2.10.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-3Pne4L9P8mJv2ja6EpxtpCBCYvlCP6D5CzDtkkvE23c="; + sha256 = "sha256-D0jo1Z9hpaJBFJQhypo76cKaahNF498OLDco2YNktA8="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] From ea593627b9df5925f6a9c78698daedbaf2536753 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 07/66] python310Packages.pydata-sphinx-theme: 0.13.0 -> 0.13.1 https://github.com/pydata/pydata-sphinx-theme/releases/tag/v0.13.1 --- .../python-modules/pydata-sphinx-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 93869a393076..d9cb175946ca 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.13.0"; + version = "0.13.1"; format = "wheel"; @@ -22,7 +22,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "sha256-+ITUC7adMdlk/xnWBk97zqqmNBk1/bwJLVwknR/wC1I="; + sha256 = "sha256-zinB3nlh1hbfol9MOpYZgY1LstSpmF7QeDZ68pT7zMI="; }; propagatedBuildInputs = [ From f6546a76559371bd690c30e4c4db8f898704ac31 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 08/66] python310Packages.jupyter-book: 0.14.0 -> 0.15.0 https://github.com/executablebooks/jupyter-book/releases/tag/v0.15.0 --- pkgs/development/python-modules/jupyter-book/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 12c4e08c9ae1..6cee08d86713 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.14.0"; + version = "0.15.0"; format = "flit"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BxrVrOsCqFRmx16l6YdkJplwdnU2XhRFMHd5DGy+dqE="; + sha256 = "sha256-eUw3zC+6kx/OQvMhzkG6R3b2ricX0kvC+fCBD4mkEuo="; }; nativeBuildInputs = [ @@ -65,7 +65,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "docutils" - "sphinx-book-theme" ]; pythonImportsCheck = [ @@ -75,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build a book with Jupyter Notebooks and Sphinx"; homepage = "https://jupyterbook.org/"; + changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; From fc9ceeba82d0f5c0b4be97ee333e58c41b7ab67d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 09/66] brakeman: 5.4.0 -> 5.4.1 https://github.com/presidentbeef/brakeman/releases/tag/v5.4.1 --- pkgs/development/tools/analysis/brakeman/Gemfile.lock | 4 ++-- pkgs/development/tools/analysis/brakeman/gemset.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index a2f6e818f0f2..cd37f4321390 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (5.4.0) + brakeman (5.4.1) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.3.25 + 2.4.6 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index 5798e37538a5..d3d827e507c1 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; + sha256 = "0wzvxpabnjwwjgr9s13965dbdgl3qfvwjbmhimh83p81bm5lsrnw"; type = "gem"; }; - version = "5.4.0"; + version = "5.4.1"; }; } From 70073985ae856f777639a4742943f48b317d7799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Thu, 11 Aug 2022 20:10:58 +1000 Subject: [PATCH 10/66] nixos/gemstash: init module --- .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/development/gemstash.nix | 103 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/gemstash.nix | 51 +++++++++ pkgs/development/tools/gemstash/default.nix | 7 +- 6 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/services/development/gemstash.nix create mode 100644 nixos/tests/gemstash.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 3e63ddced611..30c14de9539d 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -34,6 +34,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). +- [gemstash](https://github.com/rubygems/gemstash), a RubyGems.org cache and private gem server. Available as [services.gemstash](#opt-services.gemstash.enable). + - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de390d801478..dc38c07b03f4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -439,6 +439,7 @@ ./services/development/blackfire.nix ./services/development/bloop.nix ./services/development/distccd.nix + ./services/development/gemstash.nix ./services/development/hoogle.nix ./services/development/jupyter/default.nix ./services/development/jupyterhub/default.nix diff --git a/nixos/modules/services/development/gemstash.nix b/nixos/modules/services/development/gemstash.nix new file mode 100644 index 000000000000..eb7ccb98bde8 --- /dev/null +++ b/nixos/modules/services/development/gemstash.nix @@ -0,0 +1,103 @@ +{ lib, pkgs, config, ... }: +with lib; + +let + settingsFormat = pkgs.formats.yaml { }; + + # gemstash uses a yaml config where the keys are ruby symbols, + # which means they start with ':'. This would be annoying to use + # on the nix side, so we rewrite plain names instead. + prefixColon = s: listToAttrs (map + (attrName: { + name = ":${attrName}"; + value = + if isAttrs s.${attrName} + then prefixColon s."${attrName}" + else s."${attrName}"; + }) + (attrNames s)); + + # parse the port number out of the tcp://ip:port bind setting string + parseBindPort = bind: strings.toInt (last (strings.splitString ":" bind)); + + cfg = config.services.gemstash; +in +{ + options.services.gemstash = { + enable = mkEnableOption (lib.mdDoc "gemstash service"); + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to open the firewall for the port in {option}`services.gemstash.bind`. + ''; + }; + + settings = mkOption { + default = {}; + description = lib.mdDoc '' + Configuration for Gemstash. The details can be found at in + [gemstash documentation](https://github.com/rubygems/gemstash/blob/master/man/gemstash-configuration.5.md). + Each key set here is automatically prefixed with ":" to match the gemstash expectations. + ''; + type = types.submodule { + freeformType = settingsFormat.type; + options = { + base_path = mkOption { + type = types.path; + default = "/var/lib/gemstash"; + description = lib.mdDoc "Path to store the gem files and the sqlite database. If left unchanged, the directory will be created."; + }; + bind = mkOption { + type = types.str; + default = "tcp://0.0.0.0:9292"; + description = lib.mdDoc "Host and port combination for the server to listen on."; + }; + db_adapter = mkOption { + type = types.nullOr (types.enum [ "sqlite3" "postgres" "mysql" "mysql2" ]); + default = null; + description = lib.mdDoc "Which database type to use. For choices other than sqlite3, the dbUrl has to be specified as well."; + }; + db_url = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "The database to connect to when using postgres, mysql, or mysql2."; + }; + }; + }; + }; + }; + + config = + mkIf cfg.enable { + users = { + users.gemstash = { + group = "gemstash"; + isSystemUser = true; + }; + groups.gemstash = { }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ (parseBindPort cfg.settings.bind) ]; + + systemd.services.gemstash = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = mkMerge [ + { + ExecStart = "${pkgs.gemstash}/bin/gemstash start --no-daemonize --config-file ${settingsFormat.generate "gemstash.yaml" (prefixColon cfg.settings)}"; + NoNewPrivileges = true; + User = "gemstash"; + Group = "gemstash"; + PrivateTmp = true; + RestrictSUIDSGID = true; + LockPersonality = true; + } + (mkIf (cfg.settings.base_path == "/var/lib/gemstash") { + StateDirectory = "gemstash"; + }) + ]; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 28ea9272ffb7..91c7f27407c2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -238,6 +238,7 @@ in { ft2-clone = handleTest ./ft2-clone.nix {}; mimir = handleTest ./mimir.nix {}; garage = handleTest ./garage {}; + gemstash = handleTest ./gemstash.nix {}; gerrit = handleTest ./gerrit.nix {}; geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; diff --git a/nixos/tests/gemstash.nix b/nixos/tests/gemstash.nix new file mode 100644 index 000000000000..bc152e42e92e --- /dev/null +++ b/nixos/tests/gemstash.nix @@ -0,0 +1,51 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let common_meta = { maintainers = [ maintainers.viraptor ]; }; +in +{ + gemstash_works = makeTest { + name = "gemstash-works"; + meta = common_meta; + + nodes.machine = { config, pkgs, ... }: { + services.gemstash = { + enable = true; + }; + }; + + # gemstash responds to http requests + testScript = '' + machine.wait_for_unit("gemstash.service") + machine.wait_for_file("/var/lib/gemstash") + machine.wait_for_open_port(9292) + machine.succeed("curl http://localhost:9292") + ''; + }; + + gemstash_custom_port = makeTest { + name = "gemstash-custom-port"; + meta = common_meta; + + nodes.machine = { config, pkgs, ... }: { + services.gemstash = { + enable = true; + openFirewall = true; + settings = { + bind = "tcp://0.0.0.0:12345"; + }; + }; + }; + + # gemstash responds to http requests + testScript = '' + machine.wait_for_unit("gemstash.service") + machine.wait_for_file("/var/lib/gemstash") + machine.wait_for_open_port(12345) + machine.succeed("curl http://localhost:12345") + ''; + }; +} diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/development/tools/gemstash/default.nix index 13ab213c15e0..ce8fde604ab5 100644 --- a/pkgs/development/tools/gemstash/default.nix +++ b/pkgs/development/tools/gemstash/default.nix @@ -1,11 +1,14 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ lib, bundlerApp, bundlerUpdateScript, nixosTests }: bundlerApp rec { pname = "gemstash"; gemdir = ./.; exes = [ pname ]; - passthru.updateScript = bundlerUpdateScript pname; + passthru = { + updateScript = bundlerUpdateScript pname; + tests = { inherit (nixosTests) gemstash; }; + }; meta = with lib; { description = "A cache for RubyGems.org and a private gem server"; From 49878856e6cde3ae674f470da407e3bde2f55c9d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 7 Mar 2023 02:11:30 -0800 Subject: [PATCH 11/66] https://github.com/NixOS/nixpkgs/pull/188334#issuecomment-1445425412 --- pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix index 9a28f8117bbc..cf26c2113ec8 100644 --- a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix +++ b/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix @@ -14,12 +14,12 @@ # { busybox = import { - url = "http://tarballs.nixos.org/stdenv-linux/mips64el/97d9c84e1df4397b43ecb39359f1bd003cd44585/busybox"; + url = "http://tarballs.nixos.org/stdenv-linux/mips64el-n32/97d9c84e1df4397b43ecb39359f1bd003cd44585/busybox"; sha256 = "sha256-4N3G1qYA7vitjhsIW17pR6UixIuzrq4vZXa8F0/X4iI="; executable = true; }; bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv-linux/mips64el/97d9c84e1df4397b43ecb39359f1bd003cd44585/bootstrap-tools.tar.xz"; + url = "http://tarballs.nixos.org/stdenv-linux/mips64el-n32/97d9c84e1df4397b43ecb39359f1bd003cd44585/bootstrap-tools.tar.xz"; sha256 = "sha256-LWrpN6su2yNVurUyhZP34OiZyzgh7MfN13fIIbou8KI="; }; } From 3374f379ce3021e2add5ead7fed27a3a55f1e09c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 10:22:38 +0000 Subject: [PATCH 12/66] media-downloader: 2.8.0 -> 2.9.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 1b62c89c6ae8..ab7f9030faa8 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-RMZG+rPbwJFL2AzEZlTrc8/bQCx8CWCWppEBjCj5hnU="; + sha256 = "sha256-3tVOyIwdGcSVnEJWQWh6HIsjY6uEzWkTs45qf81r/+0="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; From 64eb9216d9be5c4239121619d8828b5249b7947f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 16:32:13 +0000 Subject: [PATCH 13/66] sarasa-gothic: 0.40.1 -> 0.40.2 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index b0e341cf88f1..f87738a419d9 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.40.1"; + version = "0.40.2"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-cpgFOhmFSyJA2yhGCCud9jF3LEboiRKyfb3NPiRzJdQ="; + hash = "sha256-ZarDttwwZzBb0+iBipVHZGLf1K3lQ7xvjMR6jE3hmh8="; }; sourceRoot = "."; From 2a7bd670fca94169b09c3b966f05ab497e4accfe Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Mar 2023 13:42:04 -0500 Subject: [PATCH 14/66] cargo-all-features: 1.6.0 -> 1.7.0 Diff: https://github.com/frewsxcv/cargo-all-features/compare/1.6.0...1.7.0 --- pkgs/development/tools/rust/cargo-all-features/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/development/tools/rust/cargo-all-features/default.nix index 3d36b42ebe7c..6b3965afc263 100644 --- a/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-all-features"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "frewsxcv"; repo = pname; rev = version; - sha256 = "1pdr34ygc0qmh0dyrw1qcrh1vgg9jv9lm6ypl3fgjzz7npdj1dw4"; + sha256 = "sha256-p9UQaqytqpD2u9X9zaTPIgVEloU2UbD/AxVERNs1Lt8="; }; - cargoSha256 = "sha256-BsRJo55gYT8OkDUBepWq48sW7QPt5OZkm8RR9f7HqZY="; + cargoSha256 = "sha256-krtuLFQlInqdv7j8v13/X3lL0JdaMsApb9Ga5muThgw="; meta = with lib; { description = "A Cargo subcommand to build and test all feature flag combinations"; From 96e0812048ea638686a700dbfd92989456160c27 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 8 Mar 2023 14:33:26 -0500 Subject: [PATCH 15/66] scaleway-cli: 2.11.1 -> 2.12.0 Diff: https://github.com/scaleway/scaleway-cli/compare/v2.11.1...v2.12.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 918cd6bdf618..273d22a1980c 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-tE2r2d3dagMvfPq/2G61KMPZyz6YQG3jAD+MjQ3uYbg="; + sha256 = "sha256-4BIw+vk0LJL6/AWtZDtOP88UqUg1EiDASMaEP3/7Bx0="; }; - vendorHash = "sha256-eqVAX6l7wsHqFjzwLiTSwryLHxl0aJqQOmjyGeM+1co="; + vendorHash = "sha256-Wdbh7rFKvWdDULMwYxvTrWim6iO6kQaYseSkq2PBfUM="; ldflags = [ "-w" From 6e825d6f548078e07f585d0002559361b2ebc969 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 06:07:03 +0000 Subject: [PATCH 16/66] sentry-cli: 2.14.3 -> 2.14.4 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 7a9f76d19c48..222aa13698f4 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.14.3"; + version = "2.14.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-l2/gwguNQAcnBGQxVGBUecIFbp8CHrrqDrjRFxaeVe4="; + sha256 = "sha256-7uZPtMu6U6T5TwwnMy/xy7dKVl77Exmj1U3ue6S/rrI="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-h9rkTnGFMclTTyUy39rpKiorcy3953u2nbHiydOAmqI="; + cargoHash = "sha256-tezeakmPtujtdr1nc2anaJAWCJ3lS2L/LsH8qa1O3tI="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; From e7fe48e8020eab609f59da6b94b26e3a8205a154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 07:17:08 +0000 Subject: [PATCH 17/66] airgeddon: 11.10 -> 11.11 --- pkgs/tools/networking/airgeddon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/tools/networking/airgeddon/default.nix index 2b72e3fee05f..a0fbda90c3db 100644 --- a/pkgs/tools/networking/airgeddon/default.nix +++ b/pkgs/tools/networking/airgeddon/default.nix @@ -111,13 +111,13 @@ let in stdenv.mkDerivation rec { pname = "airgeddon"; - version = "11.10"; + version = "11.11"; src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; rev = "v${version}"; - hash = "sha256-0x13QmT61lcPc7b3OYs13g6AISWRipvxbSFb7XyQA5U="; + hash = "sha256-3Rx1tMRIpSk+IEJGOs+t+kDlvGHYOx1IOSi+663uzrw="; }; strictDeps = true; From bcddd70e030d36663ab45a332869f93bc7a1ab17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 07:47:36 +0000 Subject: [PATCH 18/66] metal-cli: 0.13.0 -> 0.14.1 --- pkgs/development/tools/metal-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index f6d5103745b7..002caa296f90 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-v+8zfNV93nrRSwfn1u7SNYv7WYY74R8nPJFmreDb7i4="; + hash = "sha256-CibqkT4YHxQ7geUKROp7SMvamN0ba/FqTXFHO1TUP/k="; }; - vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; + vendorHash = "sha256-4hjrKlpd+gr/yLRuSq8XrOVl76uYVIMfYjTAgqkbOSw="; ldflags = [ "-s" From ae09bc0fd305623089d9086ff7802b9a8f4b3d7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Mar 2023 08:53:27 +0100 Subject: [PATCH 19/66] airgeddon: add changelog to meta --- pkgs/tools/networking/airgeddon/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/tools/networking/airgeddon/default.nix index a0fbda90c3db..6ef64222fba8 100644 --- a/pkgs/tools/networking/airgeddon/default.nix +++ b/pkgs/tools/networking/airgeddon/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-3Rx1tMRIpSk+IEJGOs+t+kDlvGHYOx1IOSi+663uzrw="; }; @@ -159,8 +159,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Multi-use TUI to audit wireless networks. "; + description = "Multi-use TUI to audit wireless networks"; homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon"; + changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pedrohlc ]; platforms = platforms.linux; From 7c88c18a082c20a2ab556488615626c01fac534f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 08:32:03 +0000 Subject: [PATCH 20/66] qdrant: 1.0.2 -> 1.0.3 --- pkgs/servers/search/qdrant/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 47e4f04bac89..87a73a7e850b 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-AVglZr3J9fEWgE2g5UHt1j6YQud/viGp0IvuR9XRntE="; + sha256 = "sha256-r47mfyuM3z3SKbUi1bz8cz7BS/X8/tsIOAMKavNTgN4="; }; - cargoSha256 = "sha256-4hzixh1/nVIMRsBSoldmbtpcpBMmvxik3lV/h4FPOrk="; + cargoHash = "sha256-EwB0Vz0NyKCek2rn1QHqk5zpReMjP0o46ajete9KmWk="; prePatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace .cargo/config.toml \ From 9202661d5b0dc3f8c42080b12f046314e1af808f Mon Sep 17 00:00:00 2001 From: "John D. Boy" <2187261+jboynyc@users.noreply.github.com> Date: Thu, 9 Mar 2023 12:59:59 +0100 Subject: [PATCH 21/66] minimacy: 0.6.2 -> 0.6.4 --- pkgs/development/compilers/minimacy/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix index e58b8ad498d6..557be6880e78 100644 --- a/pkgs/development/compilers/minimacy/default.nix +++ b/pkgs/development/compilers/minimacy/default.nix @@ -1,21 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper -, alsaLib, libX11, libXext, libGL, libGLU +{ lib +, stdenv +, alsa-lib +, fetchFromGitHub +, libGL +, libGLU +, libX11 +, libXext +, makeBinaryWrapper }: stdenv.mkDerivation rec { pname = "minimacy"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "ambermind"; repo = pname; rev = version; - sha256 = "i0Z1UKApX+elHmFgujwjiF7k6OmtFF37HJim464OMfU="; + hash = "sha256-qIK7QnXZ9FmfarMZaHktZCHhvR8cctyKVpFS8PeOpLs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsaLib libX11 libXext ]; + buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 libXext ]; enableParallelBuilding = true; From 4a3ca0b41bffdcf413e8d2b12037fdf7fcb1d098 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 15:10:20 +0000 Subject: [PATCH 22/66] python310Packages.pybalboa: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/pybalboa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index 7c6a477c7c3d..8b4d0b719565 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pybalboa"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "garbled1"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-08FMNRArzmfmLH6y5Z8QPcRVZJIvU3VIOvdTry3iBGI="; + hash = "sha256-7vjdRGnEnMf32pZwoKRxX16hxkyf0CXlncpbBJMQtfI="; }; nativeBuildInputs = [ From adfc3fec360260358a48e1bad5f7ab507407230b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 9 Mar 2023 23:40:36 +0800 Subject: [PATCH 23/66] julia_19: 1.9.0-beta4 -> 1.9.0-rc1 --- pkgs/development/compilers/julia/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index d13b078494ad..225c71242272 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.0-beta4"; + version = "1.9.0-rc1"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM="; + hash = "sha256-BjHuS1pP8S+iZndyGS8HiNzApr7xUYPRPRkX55DEy4Y="; }; patches = [ From 28408bf0764b3e49797c4169cc9d708d212be120 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 9 Mar 2023 14:04:58 -0300 Subject: [PATCH 24/66] fluxcd: 0.40.2 -> 0.41.0 Release: https://github.com/fluxcd/flux2/releases/tag/v0.41.0 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a10761578c48..c6d79bb43188 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.40.2"; - sha256 = "00rzd9i9dd13wsr2f8y6b7q5zphrfx3bgigfinmzcfdinydv3bm4"; - manifestsSha256 = "05bkqkhyb3mgd68w2zr9bav6dfibfzfw65anzkz269wqrkf0d86k"; + version = "0.41.0"; + sha256 = "1xqgscmzq96jdlvwmckpz2zh7gsdla77xir6a6nylz509wkv3gid"; + manifestsSha256 = "03azig0axa6d5yapzr36ziza1jsy549sqnna6ja6xa2zl0ljx33n"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-crFBOWRjgFIm4mrX3Sf9ovodG5t8hhJUbMr2qpIt7LQ="; + vendorSha256 = "sha256-nQzpJX1B1zXpW27YtzkAYK2vL7rnWPgAtlZlZqdV5QI="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 571144ff898f49451dbe6334876f7d5bca069dff Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 9 Mar 2023 19:05:40 +0100 Subject: [PATCH 25/66] AusweisApp2: 1.26.2 -> 1.26.3 https://github.com/Governikus/AusweisApp2/releases/tag/1.26.3 --- pkgs/applications/misc/ausweisapp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 8758e5fe92f6..c7ee1885686b 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.2"; + version = "1.26.3"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE="; + hash = "sha256-YI9/rMoe5Waw2e/tObvu+wi9dkmhEoG9v3ZQzkn4QH4="; }; nativeBuildInputs = [ cmake pkg-config ]; From b5eda8810115633af15ad39228384e25c123bf51 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 9 Mar 2023 19:14:14 +0100 Subject: [PATCH 26/66] syncthing: 1.23.1 -> 1.23.2 https://github.com/syncthing/syncthing/releases/tag/v1.23.2 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index d221324b205b..952851b08dba 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Jbg56Nn+5ZjIv1KZrThkqWY+P13MglLE78E6jc0rbY0="; + hash = "sha256-EowUQYfSznTuAHV7OIesFPM99zRmeKkzYNp7VANtR2U="; }; - vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; + vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic="; doCheck = false; From a16f7f0b658f8182ac29ebdd2f7c8a39d8a8eaeb Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 9 Mar 2023 15:56:49 -0500 Subject: [PATCH 27/66] brave: 1.48.171 -> 1.49.120 https://community.brave.com/t/release-channel-1-49-120/475663/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index b5528c31b430..d7a0e1c5e6a3 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.48.171"; + version = "1.49.120"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps="; + sha256 = "sha256-KSu6HaNKc7uVY1rSyzU+VZSE2dbIOOrsUx1RYKnz8yU="; }; dontConfigure = true; From 56ddb0373d74e6fa05f72d2a261c98fd04624517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 22:06:57 +0000 Subject: [PATCH 28/66] stduuid: 1.2.2 -> 1.2.3 --- pkgs/development/libraries/stduuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/development/libraries/stduuid/default.nix index 07e43bb952c4..c7e31c990087 100644 --- a/pkgs/development/libraries/stduuid/default.nix +++ b/pkgs/development/libraries/stduuid/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub, lib }: let - version = "1.2.2"; + version = "1.2.3"; in stdenv.mkDerivation { name = "stduuid-${version}"; @@ -7,7 +7,7 @@ in stdenv.mkDerivation { owner = "mariusbancila"; repo = "stduuid"; rev = "v${version}"; - hash = "sha256-itx1OF1gmEEMy2tJlkN5dpF6o0dlesecuHYfpJdhf7c="; + hash = "sha256-MhpKv+gH3QxiaQMx5ImiQjDGrbKUFaaoBLj5Voh78vg="; }; nativeBuildInputs = [ cmake ]; From dbcfd1f947999ebefbe02e12a6a12f25aace9ba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 22:56:49 +0000 Subject: [PATCH 29/66] skim: 0.10.3 -> 0.10.4 --- pkgs/tools/misc/skim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 331d307c133f..b6a77485d1ce 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.10.3"; + version = "0.10.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-d0gzeyOc9UudgTrTFt5OhUAsTy/SYMvRMyph2yAD9H8="; + sha256 = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0="; }; nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" "vim" ]; - cargoHash = "sha256-ZLA1ZE/VLZyzQzIECcabxKup409YBZRpHdhR2k/+4lY="; + cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos="; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim From 79aebb620410688000749775c4c52171fdb8c748 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 17 Feb 2023 14:14:13 +0100 Subject: [PATCH 30/66] alembic: Fix install destinations The generated CMake targets file was referring to an incorrect destination as the derivation manually moved the libraries during installPhase, while CMake uses the path it thinks is going to be used (the DESTINATION in the install rule) in the IMPORTED_LOCATION property. By setting the install destinations via CMake flags (and patching the DESTINATION for the binary install rules), CMake will pick up the correct locations in the generated AlembicTargets-release.cmake file. Along with fixing that issue, this commit also includes the following changes: * Remove unused unzip nativeBuildInput * Enable unit tests * Add missing direct dependency ilmbase: Previously it was only picked up indirectly, resulting in CMake configuration warnings * Add ilmbase as propagatedBuildInput: Downstream users of Alembic (via CMake) need to add ilmbase as a dependency as well For some reason this is not discovered correctly otherwise * Use CMake setup hooks instead of setting buildPhase/installPhase --- .../development/libraries/alembic/default.nix | 54 +++++++++++++------ 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index c7bc4894e15b..0811a5ce09e0 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }: stdenv.mkDerivation rec { @@ -12,26 +12,50 @@ stdenv.mkDerivation rec sha256 = "sha256-8dQhOQN0t2Y2kC2wOpQUqbu6Woy4DUmiLqXjf1D+mxE="; }; + # note: out is unused (but required for outputDoc anyway) outputs = [ "bin" "dev" "out" "lib" ]; - nativeBuildInputs = [ unzip cmake ]; - buildInputs = [ openexr hdf5-threadsafe ]; + # Prevent cycle between bin and dev (only occurs on Darwin for some reason) + propagatedBuildOutputs = [ "lib" ]; - buildPhase = '' - cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . + nativeBuildInputs = [ cmake ]; - mkdir $out - mkdir -p $bin/bin - mkdir -p $dev/include - mkdir -p $lib/lib + # NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender) + # are incompatible with the imath version of Alembic + buildInputs = [ openexr hdf5-threadsafe ilmbase ]; + + # Downstream packages trying to use Alembic via CMake need ilmbase as well + # For some reason this won't be picked up correctly otherwise + propagatedBuildInputs = [ ilmbase ]; + + # These flags along with the postPatch step ensure that all artifacts end up + # in the correct output without needing to move anything + # + # - bin: Uses CMAKE_INSTALL_BINDIR (set via CMake setup hooK) + # - lib (contains shared libraries): Uses ALEMBIC_LIB_INSTALL_DIR + # - dev (headers): Uses CMAKE_INSTALL_PREFIX + # (this works because every other install rule uses an absolute DESTINATION) + # - dev (CMake files): Uses ConfigPackageLocation + + cmakeFlags = [ + "-DUSE_HDF5=ON" + "-DUSE_TESTS=ON" + "-DALEMBIC_LIB_INSTALL_DIR=${placeholder "lib"}/lib" + "-DConfigPackageLocation=${placeholder "dev"}/lib/cmake/Alembic" + "-DCMAKE_INSTALL_PREFIX=${placeholder "dev"}" + "-DQUIET=ON" + ]; + + postPatch = '' + find bin/ -type f -name CMakeLists.txt -print -exec \ + sed -i 's/INSTALL(TARGETS \([a-zA-Z ]*\) DESTINATION bin)/INSTALL(TARGETS \1)/' {} \; ''; - installPhase = '' - make install - - mv $out/bin $bin/ - mv $out/lib $lib/ - mv $out/include $dev/ + doCheck = true; + checkPhase = '' + runHook preCheck + ctest -j 1 + runHook postCheck ''; meta = with lib; { From 54e1189fbc2d0b89c16abb1ddf42ec8ad2cb55e0 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 17 Feb 2023 14:16:00 +0100 Subject: [PATCH 31/66] alembic: Add maintainer tmarkus --- pkgs/development/libraries/alembic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 0811a5ce09e0..bff46622d45e 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec homepage = "http://alembic.io/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ maintainers.guibou ]; + maintainers = with maintainers; [ guibou tmarkus ]; }; } From edcd3849a6f4c11ac7c5fc8092a6deb0c2f7bf8f Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 10 Feb 2023 23:18:08 +0100 Subject: [PATCH 32/66] blender: Fix build after changes in Alembic package --- pkgs/applications/misc/blender/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01374737f585..59fd3f915656 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -95,6 +95,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_ALEMBIC=ON" + # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) + "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" + "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic.so" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" From 5b4645a2ea79b26b770e0fd86853f6a8e66a1e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Mar 2023 15:53:22 -0800 Subject: [PATCH 33/66] python310Packages.trove-classifiers: 2023.2.20 -> 2023.3.9 Changelog: https://github.com/pypa/trove-classifiers/releases/tag/2023.3.9 --- pkgs/development/python-modules/trove-classifiers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index a662d1a1a504..c8a33e9a545f 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.2.20"; + version = "2023.3.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hgsMDYyeDTJinKXvE36h5jdYC2NLdLpA4VOf00RkwPU="; + hash = "sha256-7kLy+MHUvP4190bkcvB2M1cNSF+rRUB+/8A3knCjuwM="; }; nativeBuildInputs = [ From c42b85cfd2633d6f07de5542f6f9dd8897fd61d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 00:41:05 +0000 Subject: [PATCH 34/66] ventoy-bin-full: 1.0.88 -> 1.0.89 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 5bf4ef2df56a..0bfb1456fc51 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.88"; + version = "1.0.89"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-mg1dzXREIhO9LsoCEauuBR9ESGHM3RvoFN+5vHU0HDA="; + hash = "sha256-dPBMABzmITUenOe57BD5EmofZeXC9v6IpW7m+OhhYdA="; }; patches = [ From 20089adad9a06c81aa204b1ee14cd103117297de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 01:11:52 +0000 Subject: [PATCH 35/66] moq: 0.3.0 -> 0.3.1 --- pkgs/development/tools/moq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix index b7b7ffcfd840..f62aba7b6c25 100644 --- a/pkgs/development/tools/moq/default.nix +++ b/pkgs/development/tools/moq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moq"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-RdFffcj17CZdI6kL+d5fp8B8gX493k8h0EzDq8BN+SY="; + sha256 = "sha256-nareKBRPL7DVmclTqZCvImxXmHxXxbus1+U1QWCeSy0="; }; - vendorSha256 = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0="; + vendorHash = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0="; subPackages = [ "." ]; From f71a3fa40adfff2858dccff14751c9ca1e8d2f5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 01:34:07 +0000 Subject: [PATCH 36/66] infracost: 0.10.17 -> 0.10.18 --- pkgs/tools/misc/infracost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 5bb1559af2d2..c79a9f33afe5 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.17"; + version = "0.10.18"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-lAHZ6G7DnK2Pu3If5qZ12UF/NYNgd9utiz/dgkgJcjk="; + sha256 = "sha256-mvy/GFEzldRpzChF79wyfGd00K0tA6BAlRrAAAbt7Pc="; }; - vendorHash = "sha256-hfJY0yKr0OsgMKtVkfkbQ6nLGPnyS+PT23qQwuXiuqs="; + vendorHash = "sha256-BplhgUIRZbMxYh2DWuGLpuNFmQuwen/u5oOs08fdXXY="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; From 2cae38a78fa89908c3f2fe34570d0470369f6eda Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Fri, 10 Mar 2023 02:48:59 +0100 Subject: [PATCH 37/66] secp256k1: 0.2.0 -> 0.3.0 --- pkgs/tools/security/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index fa07080d2dfa..cb9cf172daa1 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wYJIMCoo6ryeQN4ZnvEkJ5/332+AkaOwgplDuQQC5MU="; + sha256 = "sha256-ii4JuYd65L0FBWY+cqcFuUEjExZOj6Pt5T0OyaVhIEI="; }; nativeBuildInputs = [ autoreconfHook ]; From 631183807e8998d430c331ccd70e98b91d018c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 02:14:35 +0000 Subject: [PATCH 38/66] comma: 1.4.1 -> 1.5.0 --- pkgs/tools/package-management/comma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index d980143281f4..3007a02c3d19 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-5M2VVrYH+IAa1P7Qz9gUPS3YNdqeVOoa1riV8eTtoYE="; + hash = "sha256-OonKO7D6xuNf9S6SvxWYzZXNOfoUw5ZEymfC5UmZT7Y="; }; - cargoHash = "sha256-kdhzoExiUAevid5NCCDTkK5CO+esa/SRGOcrITlr2fo="; + cargoHash = "sha256-q6MbaKrGkwvKWSfL7bQjf9+RdcgKpKj3iXJtSz3FnMc="; nativeBuildInputs = [ makeBinaryWrapper ]; From 432d2776b9dc296cf6f39d37f3a3bc85a4ded93e Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Mar 2023 22:10:36 -0500 Subject: [PATCH 39/66] keyscope: 1.2.3 -> 1.3.0 Diff: https://github.com/spectralops/keyscope/compare/v1.2.3...v1.3.0 Changelog: https://github.com/spectralops/keyscope/blob/v1.3.0/CHANGELOG.md --- pkgs/tools/security/keyscope/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keyscope/default.nix b/pkgs/tools/security/keyscope/default.nix index 08c2ded80ad8..31d97256f0e7 100644 --- a/pkgs/tools/security/keyscope/default.nix +++ b/pkgs/tools/security/keyscope/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "keyscope"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "spectralops"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RKeEumj9HuifEXE8g5G7EsIalGD1vLRawh59s/ykUmg="; + sha256 = "sha256-SrBtgirg52q7gM3GZsJsV8ASACvb4sYv5HDbyItpjbk="; }; - cargoSha256 = "sha256-8lTwczuOgPhzwGcQ2KoqK5Zf3HS3uwsok036l+12Xb0="; + cargoSha256 = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo="; nativeBuildInputs = [ pkg-config ]; From b7a9c67760faadccb19020aa19509af89cc4714a Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Mar 2023 22:13:16 -0500 Subject: [PATCH 40/66] lua-language-server: 3.6.13 -> 3.6.17 Diff: https://github.com/luals/lua-language-server/compare/3.6.13...3.6.17 Changelog: https://github.com/LuaLS/lua-language-server/blob/3.6.17/changelog.md --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 23946af16f6b..969fda1d153d 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.13"; + version = "3.6.17"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-9TFTmTjj6FfPTfcgnQaHFYUtoM1VUMSpD7Yxk/Oeul0="; + sha256 = "sha256-/AvyiE9r7aEPRDc486CER4B5/9NWh7BhI3y3ieDMxQU="; fetchSubmodules = true; }; From dc23d0abfef0527b71a89ceeb51bce4362ce98db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 03:47:00 +0000 Subject: [PATCH 41/66] httm: 0.23.2 -> 0.23.3 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 81aa2630506c..9d74dbf38c78 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-lNB7fZwIOXA4bryftHFZlAa6kJldouxCf00h7J7qQM0="; + hash = "sha256-yia7GEPemFVHzTkhrL7HejQsFO1zwpdUtq4DLdm4s2g="; }; - cargoHash = "sha256-NQqipHJXvbDMO8kUMKnzEdz7atPYcjj7/uf3PSXZy0A="; + cargoHash = "sha256-NfuLLKt4dObggqFw8bjHMYdJPz2Rx8eXBrz5/BB7UxM="; nativeBuildInputs = [ installShellFiles ]; From 9ebf26234783dbdac54c470b466e02c99f39bdc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 10 Mar 2023 14:52:20 +1100 Subject: [PATCH 42/66] cryptomator: mark as working on intel only During aarch64 build it fails with: ``` Failed to execute goal on project cryptomator: Could not resolve dependencies for project org.cryptomator:cryptomator:jar:1.6.14: The following artifacts could not be resolved: org.openjfx:javafx-base:jar:linux-aarch64:18.0.1, org.openjfx:javafx-graphics:jar:linux-aarch64:18.0.1, org.openjfx:javafx-controls:jar:linux-aarch64:18.0.1, org.openjfx:javafx-fxml:jar:linux-aarch64:18.0.1, org.openjfx:javafx-swing:jar:linux-aarch64:18.0.1: Cannot access central (https://repo.maven.apache.org/maven2) in offline mode and the artifact org.openjfx:javafx-base:jar:linux-aarch64:18.0.1 has not been downloaded from it before. -> [Help 1] ``` --- pkgs/tools/security/cryptomator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 1e6833f3a8b3..b6a1726dd6a3 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ bachp ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From 31d5f226eed13018196f94e63fa0b57ffd09b5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 10 Mar 2023 15:13:38 +1100 Subject: [PATCH 43/66] embree,embree2: disable aarch64-linux Versions 2 and 3 of the library do not support linux ARM. --- pkgs/development/libraries/embree/2.x.nix | 2 +- pkgs/development/libraries/embree/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 12d4e2a87ccd..45f423659195 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 5cab69db676f..552859cd4a5d 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ hodapp gebner ]; license = licenses.asl20; platforms = platforms.unix; + badPlatforms = [ "aarch64-linux" ]; }; } From e99d07ebddc6422f688a9d8a3acc3c88913e65cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 05:19:35 +0000 Subject: [PATCH 44/66] python310Packages.pymumble: 1.6.1 -> 1.7 --- pkgs/development/python-modules/pymumble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index 558d5c6bd9e5..cea692d852a0 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pymumble"; - version = "1.6.1"; + version = "1.7"; disabled = isPy27; src = fetchFromGitHub { owner = "azlux"; repo = "pymumble"; - rev = version; - sha256 = "1qbsd2zvwd9ksclgiyrl1z79ms0zximm4527mnmhvq36lykgki7s"; + rev = "refs/tags/${version}"; + sha256 = "sha256-NMp1yZ+R9vmne7old7z9UvcxSi6C044g68ZQsofT0gA="; }; postPatch = '' From 564e20e62dc9fcf1af8a8eb7ddbcb62592e5a4f4 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:48:11 +0800 Subject: [PATCH 45/66] Revert "root: remove the already-default CMAKE_INSTALL_*DIR flags" (#220437) For some reason, this makes $out/bin/rootcint disappear $out/bin/rootcint is a duplication of $out/bin/rootcling for compatibility reason This reverts commit c09e03c1a69306c58d2f97453fe9f071171ec48a. --- pkgs/applications/science/misc/root/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index a33af5795108..9d107365a4b1 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -157,6 +157,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" From 1c4e1ea502d792f47b0b3995b9bf3e57dfb821db Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 10 Mar 2023 15:03:50 +0800 Subject: [PATCH 46/66] boomerang: remove obsolete comment --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090f5a4123cb..5f48f8fe7762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3842,7 +3842,6 @@ with pkgs; bookstack = callPackage ../servers/web-apps/bookstack { }; - # Upstream recommends qt5.12 and it doesn't build with qt5.15 boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; From 202eb1afb5b6654b19c3967aae391af0965739f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:16:02 +0000 Subject: [PATCH 47/66] =?UTF-8?q?terraform-providers.fastly:=203.2.0=20?= =?UTF-8?q?=E2=86=92=204.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1e581113fe29..e8d39a90d3b4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-OODPVNHFW8hnpofWLvzn7qukngB8okZADYI5t9muHpQ=", + "hash": "sha256-XvDsL2N/S7DE+9ks8Y6ZY3hcogzUsiF7VymNK7NnmaI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.2.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", "vendorHash": null }, From a7fff5473b83eb6d2419386d37e8a75d9106d145 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:18:13 +0000 Subject: [PATCH 48/66] =?UTF-8?q?terraform-providers.grafana:=201.35.0=20?= =?UTF-8?q?=E2=86=92=201.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e8d39a90d3b4..0be09392538f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -467,13 +467,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=", + "hash": "sha256-b6vmtr2eHm7YNhRHS96+l6BLHYHgixR8Pw7/jK0tRPI=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.35.0", + "rev": "v1.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc=" + "vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", From d970c3c412c97770ff720c168a84d0b3423f1288 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:21:37 +0000 Subject: [PATCH 49/66] =?UTF-8?q?terraform-providers.newrelic:=203.15.0=20?= =?UTF-8?q?=E2=86=92=203.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0be09392538f..20afef26adcc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -765,13 +765,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-ReVP0droWSP+NWV0kQznfCllL/jx0uQKmaGr+CyR8iQ=", + "hash": "sha256-bf4t4xcA/K4atLyDVzkeLw5zm9sBz/dUBiivVaz4hNU=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.15.0", + "rev": "v3.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aFjsUhdGboN8Hfu2ky6djG0hC/Z9MU2tOWDFXekOGNQ=" + "vendorHash": "sha256-yF2yk85RLbvmULakODOV2V0Z9dzKfLClUSZTnECdO3o=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", From f3cebecb6e6c5da48aed554722c3bb1c9e3e5eb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:24:32 +0000 Subject: [PATCH 50/66] =?UTF-8?q?terraform-providers.opentelekomcloud:=201?= =?UTF-8?q?.33.1=20=E2=86=92=201.33.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 20afef26adcc..26f43aa60dbe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -856,11 +856,11 @@ "vendorHash": "sha256-aoJDRzackPjWxkrsQclweUFH3Bqdcj1aTJuTHZ7Dh7g=" }, "opentelekomcloud": { - "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", + "hash": "sha256-fkEQ4VWGJiPFTA6Wz8AxAiL4DOW+Kewl8T9ywy/yPME=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.33.1", + "rev": "v1.33.2", "spdx": "MPL-2.0", "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64=" }, From 5842c95c5a2d30c07876116d7d0a816386eb335f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:26:10 +0000 Subject: [PATCH 51/66] =?UTF-8?q?terraform-providers.pagerduty:=202.11.0?= =?UTF-8?q?=20=E2=86=92=202.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 26f43aa60dbe..ff110572a41a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -883,11 +883,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=", + "hash": "sha256-9aIYGmcbDgSZqtldLBMRjD0qKJZ3USuwNBpK3bvGrFY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.11.0", + "rev": "v2.11.1", "spdx": "MPL-2.0", "vendorHash": null }, From 822303df353a3e56d12b62fde718ed8433943d40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:29:10 +0000 Subject: [PATCH 52/66] =?UTF-8?q?terraform-providers.spotinst:=201.104.0?= =?UTF-8?q?=20=E2=86=92=201.105.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ff110572a41a..409a823f676d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1045,11 +1045,11 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-OroABl6G5nCatoyPxHZkM9I7qidxwMlgFjWC9Ljshik=", + "hash": "sha256-a/WXuEIvFsbYGoIDT0vHNM1LoFs7VlqmGXHDszON/rU=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.104.0", + "rev": "v1.105.0", "spdx": "MPL-2.0", "vendorHash": "sha256-juso8uzTjqf/vxUmpiv/07WkqMJRS1CqHQhu6pHf7QY=" }, From 88bdb6d79b0bdf03d3338f6f3d1416a55ec199ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 03:37:07 +0000 Subject: [PATCH 53/66] =?UTF-8?q?terraform-providers.aws:=204.57.1=20?= =?UTF-8?q?=E2=86=92=204.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 409a823f676d..96f5cb2a168c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-ouS+0fLs4Zo17ZIqsd7CiYUKQMSNtuwVs3qdZ52qbns=", + "hash": "sha256-dOcsD5yJrn+zpX5F0ImIqD9d+iC228Wem/668RtsQNY=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.57.1", + "rev": "v4.58.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-X4fgw0AJMDDsRuS9MlMu+pnnjxJ33P9QXnpqDXfvfuA=" + "vendorHash": "sha256-nNQmiPBkIuQSBGDujMZI+dZMwv6xQcd8+nc1cMKrJws=" }, "azuread": { "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=", From 99644ea939a3c621eb5da32ca3edc0e0ac11b648 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 10 Mar 2023 08:32:28 +0100 Subject: [PATCH 54/66] cargo-public-api: 0.27.2 -> 0.27.3 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index ba5dc4e1fc0e..2408be1c73dd 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.27.2"; + version = "0.27.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6LXFrLSApEQXa34zTVgqUVYMiFnGi6i7gyXnMglHtFE="; + sha256 = "sha256-s5aPzaH08XvGm+hZy+dQkvp8rVFcGWoTgniIfOzQk4E="; }; - cargoHash = "sha256-3lMUKtHpCXN+fKDbU4QwVUol6aL6dxP5Bbf59xEkcjY="; + cargoHash = "sha256-q5Oq9Lg7cNteHvzaAWwzoHThYiXac/x1Y5LyFZjfSCo="; nativeBuildInputs = [ pkg-config ]; From e26618d5f160a4e768126ab9ebbe5518a077c2fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Mar 2023 09:28:21 +0100 Subject: [PATCH 55/66] python310Packages.pymumble: fix description and add changelog --- pkgs/development/python-modules/pymumble/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index cea692d852a0..1600924f1090 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "azlux"; repo = "pymumble"; rev = "refs/tags/${version}"; - sha256 = "sha256-NMp1yZ+R9vmne7old7z9UvcxSi6C044g68ZQsofT0gA="; + hash = "sha256-NMp1yZ+R9vmne7old7z9UvcxSi6C044g68ZQsofT0gA="; }; postPatch = '' @@ -42,8 +42,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot."; + description = "Library to create mumble bots"; homepage = "https://github.com/azlux/pymumble"; + changelog = "https://github.com/azlux/pymumble/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ thelegy infinisil ]; }; From 2dac2163199113a5e7aed7201faaab4240fd1450 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Mar 2023 09:30:31 +0100 Subject: [PATCH 56/66] python310Packages.pymumble: disable on unsupported Python releases --- pkgs/development/python-modules/pymumble/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index 1600924f1090..ffb2f33b1b21 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -1,17 +1,20 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , isPy27 -, lib , opuslib , protobuf , pytestCheckHook , pycrypto +, pythonOlder }: buildPythonPackage rec { pname = "pymumble"; version = "1.7"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "azlux"; From 621e03261bee46cc5cfe0de8ad8523c088fa4eb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Mar 2023 09:51:19 +0100 Subject: [PATCH 57/66] cargo-public-api: add changelog to meta --- pkgs/development/tools/rust/cargo-public-api/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 2408be1c73dd..2d178bda16da 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-s5aPzaH08XvGm+hZy+dQkvp8rVFcGWoTgniIfOzQk4E="; + hash = "sha256-s5aPzaH08XvGm+hZy+dQkvp8rVFcGWoTgniIfOzQk4E="; }; cargoHash = "sha256-q5Oq9Lg7cNteHvzaAWwzoHThYiXac/x1Y5LyFZjfSCo="; @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations"; homepage = "https://github.com/Enselic/cargo-public-api"; + changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; }; From 6cf53666ccf8dbd2df3b4ddafd7abfde4a3d3e13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 09:10:29 +0000 Subject: [PATCH 58/66] blackfire: 2.13.2 -> 2.14.0 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 6bd622a6e749..8d5a5efb20d7 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.13.2"; + version = "2.14.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "1/O1n0nO+adY7KNVnz6xkESyODiLw61x68xE84EKW+I="; + sha256 = "PrKJlxJhMX9ZgUGPIQFmAi7PMdcZKTuIuCUEunlYq+I="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "fy3i++HpGuKH9ijPY61O66PhFyORIpjkZV++75H5738="; + sha256 = "F1ners+2TVfhiIlmUSMRX7/nLVg5fEw5z6mW3kyHDnE="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "zO3KWbrudhCGpbdCUBRWQkK/snvDdUOxKF9ukZC+vno="; + sha256 = "ux/Yc03XCZkEfnsBuY9SqhnDIESbVzuyo0OF0Mbhc44="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "Sqn5tFpvlF9LbUyC1i38BsyM9B+MOmykt+5COMhuO1A="; + sha256 = "JXQpLnRFZNxfwE+kpzYGTiB1/gsS/lzDEIwMT88oj5U="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "9vrrBiz744s1W5FV7QO8QKL7pfK6OGPinnSOJSvMIOk="; + sha256 = "TdYMAy2lkwA+IYKriw9d+qXSv7+Pbi9ap/M5/3DnhPw="; }; }; From fd613a859742173af8a524e9203e55a8a349bde2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 10 Mar 2023 10:08:37 +0100 Subject: [PATCH 59/66] python3.pkgs.ray: fix evaluation when generating nix dependency graph Due to some oddities in the language `builtins.tryEval` fails to catch some instances in certain edge cases. While it would be nice to have them fixed in nix itself for now it seems way easier to just remove these two instances. This fixes evaluating nativeBuildInputs in https://github.com/tweag/nixpkgs-graph/ Retrieve this information from nixpkgs is quite complex but having it would enable a lot of interesting use cases. --- pkgs/development/python-modules/ray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index c6b764181875..99a62a64025d 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { src = let pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; - binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}"; + binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}" or {}; in fetchPypi ({ inherit pname version format; From b6d9b11bf0ca422eb699ed85a74936f0654eae25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 10 Mar 2023 10:08:40 +0100 Subject: [PATCH 60/66] python3.pkgs.tensorflow: fix evaluation when generating nix dependency graph --- pkgs/development/python-modules/tensorflow/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index dcfa8e0e964c..c9ed92712166 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -57,7 +57,7 @@ in buildPythonPackage { platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyVerNoDot}_${unit}"; - in fetchurl packages.${key}; + in fetchurl (packages.${key} or {}); propagatedBuildInputs = [ astunparse From 15d172707718193781fa7301b813a088c80c19a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 10 Mar 2023 15:26:21 +1100 Subject: [PATCH 61/66] fac-build: fix tests calling out to git --- pkgs/development/tools/build-managers/fac/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index bb9be13ef0f2..c5253edb53e9 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/git.rs \ --replace 'std::process::Command::new("git")' \ 'std::process::Command::new("${git}/bin/git")' + substituteInPlace tests/lib.rs \ + --replace 'std::process::Command::new("git")' \ + 'std::process::Command::new("${git}/bin/git")' ''; meta = with lib; { From 52f23c96b3941bf189e97c3676504772b371e08e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 17:29:49 +0000 Subject: [PATCH 62/66] libtiger: fix cross --- .../libraries/libtiger/default.nix | 14 ++++++- .../libraries/libtiger/pkg-config.patch | 37 +++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libtiger/pkg-config.patch diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 60dee56e6a2a..7876c23bcc1d 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }: +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config +, libkate, pango, cairo, darwin +}: stdenv.mkDerivation rec { pname = "libtiger"; @@ -9,7 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - nativeBuildInputs = [ pkg-config ]; + patches = [ + ./pkg-config.patch + ]; + + postPatch = '' + substituteInPlace configure.ac --replace "-Werror" "-Wno-error" + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libkate pango cairo ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; diff --git a/pkgs/development/libraries/libtiger/pkg-config.patch b/pkgs/development/libraries/libtiger/pkg-config.patch new file mode 100644 index 000000000000..68c892544615 --- /dev/null +++ b/pkgs/development/libraries/libtiger/pkg-config.patch @@ -0,0 +1,37 @@ +From 3ebeb0932edc01b7768216dc7d3b3c5aac21fba0 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 26 Feb 2023 17:21:48 +0000 +Subject: [PATCH] configure.ac: detect pkg-config properly + +When cross compiling, the relevant pkg-config program might be prefixed +with the name of the host platform, so the previous check was not +correct. Detect pkg-config properly, using the appropriate macro. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f63684..bf2faf7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,7 @@ AC_CHECK_FUNCS([select nanosleep usleep]) + + AC_TYPE_SIZE_T + +-AC_CHECK_PROG(HAVE_PKG_CONFIG,pkg-config,yes) ++PKG_PROG_PKG_CONFIG + + AC_ARG_ENABLE(doc, [ --disable-doc Disable building documentation (default enabled)]) + if test "x$enable_doc" != "xno" +@@ -57,7 +57,7 @@ else + fi + AM_CONDITIONAL(HAVE_DOXYGEN,test "${HAVE_DOXYGEN}" = "yes") + +-if test "x$HAVE_PKG_CONFIG" = "xyes" ++if test "x$PKG_CONFIG" != "x" + then + PKG_CHECK_MODULES(KATE,kate >= 0.2.0) + PKG_CHECK_MODULES(PANGOCAIRO,pangocairo >= 1.16) +-- +2.37.1 + From 48532d5957853537a7805fcd99602b91059e9e8f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 23:04:39 +0000 Subject: [PATCH 63/66] glmark2: switch to meson The bundled waf is so old it doesn't support cross-compilation. --- pkgs/tools/graphics/glmark2/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 5503e9eb38e0..20447a77eed3 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pkg-config , makeWrapper +, meson +, ninja , libjpeg , libpng , xorg @@ -10,11 +12,9 @@ , libGL , libdrm , udev -, python3 , wayland , wayland-protocols , mesa -, wafHook }: stdenv.mkDerivation rec { @@ -28,21 +28,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; - nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; buildInputs = [ libjpeg libpng xorg.libxcb libX11 libdrm - python3 udev wayland wayland-protocols mesa ]; - wafConfigureFlags = [ "--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; + mesonFlags = [ "-Dflavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; postInstall = '' for binary in $out/bin/glmark2*; do From b80dd48f26ac240a60c3151f6bbc452a099833a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 23:07:22 +0000 Subject: [PATCH 64/66] glmark2: fix cross --- pkgs/tools/graphics/glmark2/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 20447a77eed3..32ed2eb8c561 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -5,6 +5,7 @@ , makeWrapper , meson , ninja +, wayland-scanner , libjpeg , libpng , xorg @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; - nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja wayland-scanner ]; buildInputs = [ libjpeg libpng From 44e32d9dc01168a9fc00d7504a27499c4de9b26b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 23:09:59 +0000 Subject: [PATCH 65/66] glmark2: remove unused xorg.libxcb input X11 flavors work fine without it. --- pkgs/tools/graphics/glmark2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 32ed2eb8c561..636b91bf9076 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libpng - xorg.libxcb libX11 libdrm udev From d60c3be234c940986f85d86e7c78900c4c4f8986 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 23:11:16 +0000 Subject: [PATCH 66/66] glmark2: enable more flavors --- pkgs/tools/graphics/glmark2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 636b91bf9076..bfcaa7154c0b 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mesa ]; - mesonFlags = [ "-Dflavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; + mesonFlags = [ "-Dflavors=drm-gl,drm-glesv2,gbm-gl,gbm-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-gl-egl,x11-glesv2" ]; postInstall = '' for binary in $out/bin/glmark2*; do