From 08bdd67bed3d675f39171c1d8f8bd0bb9598db96 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:04:11 -0800 Subject: figlet: link to unistd on all platforms; restore warnings --- pkgs/tools/misc/figlet/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index f959440fc2ea..746def80c6d9 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) + (fetchpatch { + url = "https://github.com/cmatsuoka/figlet/commit/9a50c1795bc32e5a698b855131ee87c8d7762c9e.patch"; + name = "unistd-on-darwin.patch"; + sha256 = "hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI="; + }) ]; - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ]; postInstall = "cp -ar ${contributed}/* $out/share/figlet/"; -- cgit 1.4.1 From 0847a05a3fe0f08e957dfd006521425402ec7e1f Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 24 Nov 2023 21:49:58 +0000 Subject: tuba: 0.4.1 -> 0.5.0 release notes: --- pkgs/applications/misc/tuba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index 6af6ef09dfcf..03d7c4303d61 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-1XbgsdIcnlXJtNEzDgEfHVJHF9naz3HplCPc2cKFUWw="; + hash = "sha256-m38ur7IxQsI46iMpveEXW3OZONbTI7xNq96XSocxxbs="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 6bcb7fade49e4ab3de4b538853810020abe4decb Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Sat, 25 Nov 2023 14:02:23 +0100 Subject: kakoune: fix compiling with clang for macOS --- pkgs/applications/editors/kakoune/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 5ca75e76cdf4..fa0e485d7128 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; @@ -9,6 +9,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; }; + patches = [ + # Use explicit target types for gather calls to bypass clang regression + # + # Since clang-16 there has been a regression in the P0522R0 support. + # (Bug report at https://github.com/llvm/llvm-project/issue/63281) + # + # Closes mawww/kakoune#4892 + (fetchpatch { + url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch"; + hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss="; + }) + ]; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; preConfigure = '' -- cgit 1.4.1 From 4df8dcc5813d35315286bbe78826d552506b84a0 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 23 Nov 2023 13:56:45 +0000 Subject: python3Packages.importlab: 0.7 → 0.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switched from `fetchFromGitHub` to `fetchPypi`, as upstream does not tag their releases. --- pkgs/development/python-modules/importlab/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 5b572e50f1cb..9937ff89d334 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -1,20 +1,18 @@ { stdenv , lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , networkx , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "importlab"; - version = "0.7"; + version = "0.8.1"; - src = fetchFromGitHub { - owner = "google"; - repo = "importlab"; - rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3"; - hash = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; + src = fetchPypi { + inherit pname version; + hash = "sha256-s4k4U7H26wJ9pQnDtA5nh+ld1mtLZvGzYTqtd1VuFGU="; }; propagatedBuildInputs = [ networkx ]; -- cgit 1.4.1 From 3d9a0c1e432985b52dea3c612c86b9c9fa0bec5a Mon Sep 17 00:00:00 2001 From: Goldstein Date: Sat, 25 Nov 2023 18:35:35 +0300 Subject: betula: init at 1.1.0 --- pkgs/by-name/be/betula/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/be/betula/package.nix (limited to 'pkgs') diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix new file mode 100644 index 000000000000..b6ed66a4e690 --- /dev/null +++ b/pkgs/by-name/be/betula/package.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromSourcehut +, buildGoModule +}: buildGoModule rec { + pname = "betula"; + version = "1.1.0"; + + src = fetchFromSourcehut { + owner = "~bouncepaw"; + repo = "betula"; + rev = "v${version}"; + hash = "sha256-MH6YeWG94YVBgx5Es3oMJ9A/hAPPBXpAcIdCJV3HX78="; + }; + vendorHash = "sha256-wiMIhoSO7nignNWY16OpDYZCguRbcEwwO/HggKSC5jM="; + + CGO_ENABLED = 1; + # These tests use internet, so are failing in Nix build. + # See also: https://todo.sr.ht/~bouncepaw/betula/91 + checkFlags = "-skip=TestTitles|TestHEntries"; + + meta = with lib; { + description = "Single-user self-hosted bookmarking software"; + homepage = "https://betula.mycorrhiza.wiki/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ GoldsteinE ]; + }; +} -- cgit 1.4.1 From b9d8cfbff0d990972dd625231fbbd683b63808f8 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 25 Nov 2023 16:55:58 +0100 Subject: alsa-scarlett-gui: unstable-2022-08-11 -> 0.3.2 Diff: https://github.com/geoffreybennett/alsa-scarlett-gui/compare/65c0f6aa432501355803a823be1d3f8aafe907a8...0.3.2 --- pkgs/applications/audio/alsa-scarlett-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix index 4b40069eaef5..e74b660b1c54 100644 --- a/pkgs/applications/audio/alsa-scarlett-gui/default.nix +++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "alsa-scarlett-gui"; - version = "unstable-2022-08-11"; + version = "0.3.2"; src = fetchFromGitHub { owner = "geoffreybennett"; repo = pname; - rev = "65c0f6aa432501355803a823be1d3f8aafe907a8"; + rev = version; sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I="; }; -- cgit 1.4.1 From 40fb3ac069f0d865e411c3650a3cb52f45cf5676 Mon Sep 17 00:00:00 2001 From: Johannes Maier Date: Fri, 24 Nov 2023 16:34:29 +0100 Subject: gcli: init at 2.0.0 --- pkgs/by-name/gc/gcli/package.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/gc/gcli/package.nix (limited to 'pkgs') diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix new file mode 100644 index 000000000000..081f96f0804e --- /dev/null +++ b/pkgs/by-name/gc/gcli/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, stdenv +, curl +, autoreconfHook +, pkg-config +, byacc +, flex +}: + +stdenv.mkDerivation rec { + pname = "gcli"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "herrhotzenplotz"; + repo = "gcli"; + rev = version; + hash = "sha256-ry+T39gFVPfHazAbv97UFpMIH1Dbbw6tZwsn9V4uRec="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config byacc flex ]; + buildInputs = [ curl ]; + + meta = with lib; { + description = "Portable Git(Hub|Lab|ea) CLI tool"; + homepage = "https://herrhotzenplotz.de/gcli/"; + changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/${version}"; + license = licenses.bsd2; + mainProgram = "gcli"; + maintainers = with maintainers; [ kenran ]; + }; +} -- cgit 1.4.1 From c4e5aac4e5aa6b89931f0f957a165ae0a314d641 Mon Sep 17 00:00:00 2001 From: Jason Odoom Date: Sat, 25 Nov 2023 19:29:54 -0500 Subject: shavee: 0.5.1 -> 0.7.3 --- pkgs/applications/misc/shavee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/applications/misc/shavee/default.nix index 10dc7507a00d..e419ccafeb0e 100644 --- a/pkgs/applications/misc/shavee/default.nix +++ b/pkgs/applications/misc/shavee/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "shavee"; - version = "0.5.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ashuio"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8="; }; - cargoHash = "sha256-iNGn5KknSNgazFSu6Nur7AkKVb6qKMxuFwTdCz5djWU="; + cargoHash = "sha256-tnIqhZpqdy8pV4L6KF5v19ufpWRpMX5gTPlWWbwB3RU="; nativeBuildInputs = [ pkg-config -- cgit 1.4.1 From 522a4348d89f08c20696f2137521a5b049604026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Nov 2023 13:58:34 +0000 Subject: python311Packages.rapidgzip: 0.10.3 -> 0.10.4 --- pkgs/development/python-modules/rapidgzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index ace2bad62016..37d2e3d7ad07 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.10.3"; + version = "0.10.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gtxF9V7OQb34Z0cCuTh/Lbe1ttCbdaY0zpM3KHHGGuw="; + hash = "sha256-dTVQTxzgjHAUuoWA2+asMI5g2fIWvHEl46bdTIAxAvg="; }; nativeBuildInputs = [ nasm ]; -- cgit 1.4.1 From b4ebded26a536cc6a9bee54f31c989646d9d826f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Nov 2023 16:44:11 +0100 Subject: python311Packages.rapidgzip: add changelog to meta --- pkgs/development/python-modules/rapidgzip/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index 37d2e3d7ad07..450746876669 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for parallel decompression and seeking within compressed gzip files"; homepage = "https://github.com/mxmlnkn/rapidgzip"; + changelog = "https://github.com/mxmlnkn/rapidgzip/blob/rapidgzip-v${version}/python/rapidgzip/CHANGELOG.md"; license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 maintainers = with lib.maintainers; [ mxmlnkn ]; platforms = platforms.all; -- cgit 1.4.1 From 6df9920261314153f159c965780a497f925e622e Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sun, 26 Nov 2023 11:29:02 -0500 Subject: gdlauncher: 3.1.44 -> 3.1.45 --- pkgs/games/r2modman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 039a9a6cb24e..72e3027be6b3 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "r2modman"; - version = "3.1.44"; + version = "3.1.45"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${version}"; - hash = "sha256-jiYrJtdM2LPwYDAgoGa0hGJcYNRiAKIuDuKZmSZ7OR4="; + hash = "sha256-6o6iPDKKqCzt7H0a64HGTvEvwO6hjRh1Drl8o4x+4ew="; }; offlineCache = fetchYarnDeps { -- cgit 1.4.1 From 0d220827ac37547654418b9e1880e225521ee562 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 26 Nov 2023 13:17:00 +0000 Subject: liberasurecode: ignore strict prototypes on clang; fix darwin --- pkgs/applications/misc/liberasurecode/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/applications/misc/liberasurecode/default.nix index 289423c61220..5910bc3eb532 100644 --- a/pkgs/applications/misc/liberasurecode/default.nix +++ b/pkgs/applications/misc/liberasurecode/default.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - configureFlags = [ "--enable-doxygen" ]; + configureFlags = [ + "--enable-doxygen" + ] ++ lib.optionals stdenv.cc.isClang [ + "CFLAGS=-Wno-error=strict-prototypes" + ]; postInstall = '' # remove useless man pages about directories -- cgit 1.4.1 From 62ca5836361ae73f07bae70d2d5591f9d485c864 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sun, 26 Nov 2023 18:07:14 -0800 Subject: python311Packages.dateparser: 1.1.8 -> 1.2.0 Diff: https://github.com/scrapinghub/dateparser/compare/refs/tags/v1.1.8...v1.2.0 Changelog: https://github.com/scrapinghub/dateparser/blob/refs/tags/v1.2.0/HISTORY.rst --- pkgs/development/python-modules/dateparser/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 3f6bfdf86d6a..46587e4e823b 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch +, setuptools , python-dateutil , pytz , regex @@ -21,19 +21,23 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.8"; + version = "1.2.0"; disabled = pythonOlder "3.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "scrapinghub"; repo = "dateparser"; rev = "refs/tags/v${version}"; - hash = "sha256-52g8defF5bsisBv2QoyUymXcf0sljOI9PjeR4l0Pw6k="; + hash = "sha256-mnL44hojebOwP6qtEBHs5QM4uRmLuGlVNr+sM3jZEKE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-dateutil pytz -- cgit 1.4.1 From 27386a6fb4663dc35d855c283dab254718624a41 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sun, 26 Nov 2023 18:11:10 -0800 Subject: python311Packages.dateparser: add meta.mainProgram --- pkgs/development/python-modules/dateparser/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 46587e4e823b..b97dabbc2d91 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -80,6 +80,7 @@ buildPythonPackage rec { description = "Date parsing library designed to parse dates from HTML pages"; homepage = "https://github.com/scrapinghub/dateparser"; license = licenses.bsd3; + mainProgram = "dateparser-download"; maintainers = with maintainers; [ dotlambda ]; }; } -- cgit 1.4.1 From 485684d5d81b571b227551f54faa419995346a7f Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Mon, 27 Nov 2023 10:26:27 +0100 Subject: kgeotag: init at 1.4.0 --- pkgs/by-name/kg/kgeotag/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/kg/kgeotag/package.nix (limited to 'pkgs') diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix new file mode 100644 index 000000000000..caaf88f1953b --- /dev/null +++ b/pkgs/by-name/kg/kgeotag/package.nix @@ -0,0 +1,27 @@ +{ cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }: + +libsForQt5.mkDerivation rec { + pname = "kgeotag"; + version = "1.4.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + repo = "kgeotag"; + owner = "graphics"; + rev = "v${version}"; + hash = "sha256-az/kXEhD/RGfxOMiLEcb651WVPcyBSa8B2sWOF7bz8E="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ]; + + meta = with lib; { + homepage = "https://kgeotag.kde.org/"; + description = "A stand-alone photo geotagging program"; + changelog = "https://invent.kde.org/graphics/kgeotag/-/blob/master/CHANGELOG.rst"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cimm ]; + mainProgram = "kgeotag"; + }; +} -- cgit 1.4.1 From a4ce630f3e7e9c096ca97d12f9af60434fcaa512 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 27 Nov 2023 10:28:08 +0100 Subject: redis-plus-plus: 1.3.7 -> 1.3.10 https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.8 https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.9 https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.10 --- .../redis-plus-plus/0001-Fix-pkg-config-paths.patch | 14 ++++++++++++++ pkgs/development/libraries/redis-plus-plus/default.nix | 8 ++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch new file mode 100644 index 000000000000..ac6490c51873 --- /dev/null +++ b/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/redis++.pc.in b/cmake/redis++.pc.in +index c98b990..46849b6 100644 +--- a/cmake/redis++.pc.in ++++ b/cmake/redis++.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/include ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: redis++ + Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety. diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix index b064297afdd1..529bf73351ec 100644 --- a/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,15 +8,19 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.7"; + version = "1.3.10"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY="; + sha256 = "sha256-lupS4WoJ4r0Vsh3sEGSuka0TtEBo2FPX2eks2blqRGk="; }; + patches = [ + ./0001-Fix-pkg-config-paths.patch + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ hiredis ]; -- cgit 1.4.1 From f937c5e7572f70a798cc96f20dc8496e44c426e9 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Mon, 27 Nov 2023 13:17:58 +0100 Subject: pdfsam-basic: 5.0.3 -> 5.2.0 --- pkgs/applications/misc/pdfsam-basic/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 917476023cf7..e5d831513f06 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.0.3"; + version = "5.2.0"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k="; + hash = "sha256-Q1387Su6bmBkXvcrTgWtYZb9z/pKHiOTfUkUNHN8ItY="; }; unpackPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; preFixup = '' - gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}") + gappsWrapperArgs+=(--set JAVA_HOME "${jdk21}" --set PDFSAM_JAVA_PATH "${jdk21}") ''; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaa387ad7ea6..d0bf8b28cf15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34309,7 +34309,7 @@ with pkgs; pdfdiff = callPackage ../applications/misc/pdfdiff { }; pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { - jdk19 = openjdk19.override { enableJavaFX = true; }; + jdk21 = openjdk21.override { enableJavaFX = true; }; }; mupdf = callPackage ../applications/misc/mupdf { }; -- cgit 1.4.1 From 2eecd0cf688e723f0c3e96b5a9f9ccdaec73006f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:11:28 +0100 Subject: xcwd: cleanup --- pkgs/tools/X11/xcwd/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index d60390952dd7..897c4af95edc 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -1,32 +1,32 @@ { lib, stdenv, fetchFromGitHub, libX11 }: -stdenv.mkDerivation rec { - version = "1.0"; +stdenv.mkDerivation (finalAttrs: { pname = "xcwd"; + version = "1.0"; src = fetchFromGitHub { owner = "schischi"; repo = "xcwd"; - rev = "v${version}"; - sha256 = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo="; }; buildInputs = [ libX11 ]; makeFlags = [ "prefix=$(out)" ]; - installPhase = '' - install -D xcwd "$out/bin/xcwd" + preInstall = '' + mkdir -p $out/bin ''; - meta = with lib; { + meta = { description = '' - A simple tool which print the current working directory of the currently focused window + A simple tool which prints the current working directory of the currently focused window ''; homepage = "https://github.com/schischi/xcwd"; - maintainers = [ maintainers.grburst ]; - license = licenses.bsd3; - platforms = platforms.linux; + license = lib.licenses.bsd3; mainProgram = "xcwd"; + maintainers = [ lib.maintainers.grburst ]; + platforms = lib.platforms.linux; }; -} +}) -- cgit 1.4.1 From 2fb50aab69a8729d827b5f5870ab0affdd78bc04 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 27 Nov 2023 08:26:13 -0500 Subject: incus-unwrapped: 0.2 -> 0.3 --- pkgs/by-name/in/incus-unwrapped/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 4c256481bfc3..3beeff04f4fd 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "incus-unwrapped"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; - rev = "refs/tags/incus-${version}"; - hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk="; }; - vendorHash = "sha256-4fxQHtvRULTyKJTGdo42qwWQUSIWqbqOO1Wf8daBP/s="; + vendorHash = "sha256-TwrHWjBd6Hn7CQMxFhHobopeefCvYeDz8fAPYmTKV9M="; postPatch = '' substituteInPlace internal/usbid/load.go \ @@ -36,6 +36,7 @@ buildGoModule rec { "cmd/incus-agent" "cmd/incus-migrate" "cmd/lxd-to-incus" + "test/mini-oidc" ]; nativeBuildInputs = [ @@ -84,7 +85,7 @@ buildGoModule rec { updateScript = nix-update-script { extraArgs = [ - "-vr" "incus-\(.*\)" + "-vr" "v\(.*\)" ]; }; }; -- cgit 1.4.1 From 0d0cc171b1721422dfa0379cf7dee96e6f851304 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 27 Nov 2023 08:26:29 -0500 Subject: lxd-to-incus: 0.2 -> 0.3 --- .../d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch | 25 ---------------------- pkgs/by-name/lx/lxd-to-incus/package.nix | 14 +++++------- 2 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch (limited to 'pkgs') diff --git a/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch b/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch deleted file mode 100644 index ea3d240da879..000000000000 --- a/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d7f7ae55a54437616174f80fb8faa80ae4ffcda4 Mon Sep 17 00:00:00 2001 -From: Adam Stephens -Date: Fri, 27 Oct 2023 13:26:11 -0400 -Subject: [PATCH] lxd-to-incus: query systemd instead of assuming service file - path - -Signed-off-by: Adam Stephens ---- - cmd/lxd-to-incus/targets.go | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go -index f2b405e0e4..ed84d3ebce 100644 ---- a/cmd/lxd-to-incus/targets.go -+++ b/cmd/lxd-to-incus/targets.go -@@ -25,7 +25,8 @@ func (s *targetSystemd) Present() bool { - return false - } - -- if !util.PathExists("/lib/systemd/system/incus.service") { -+ _, err := subprocess.RunCommand("systemctl", "list-unit-files", "incus.service") -+ if err != nil { - return false - } - diff --git a/pkgs/by-name/lx/lxd-to-incus/package.nix b/pkgs/by-name/lx/lxd-to-incus/package.nix index 8e58ede27c00..1f416df6b2a4 100644 --- a/pkgs/by-name/lx/lxd-to-incus/package.nix +++ b/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -6,29 +6,25 @@ buildGoModule rec { pname = "lxd-to-incus"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; - rev = "refs/tags/incus-${version}"; - hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk="; }; - patches = [ - ./d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch - ]; - modRoot = "cmd/lxd-to-incus"; - vendorHash = "sha256-J95b4fm+VwndoxS8RQF8V8ufI3RjclqzAskEd3ut4bU="; + vendorHash = "sha256-/ONflpW1HGvXooPF+Xui8q4xFu/Zq5br+Vjm9d2gm5U="; CGO_ENABLED = 0; passthru = { updateScript = nix-update-script { extraArgs = [ - "-vr" "incus-\(.*\)" + "-vr" "v\(.*\)" ]; }; }; -- cgit 1.4.1 From d91e9ecd5bd36982553cb38d3889c7890b65653a Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 24 Nov 2023 13:32:09 +0000 Subject: maintainers: rename jgarcia to chewblacka --- maintainers/maintainer-list.nix | 10 +++++----- pkgs/applications/misc/get_iplayer/default.nix | 2 +- pkgs/applications/misc/remnote/default.nix | 2 +- pkgs/by-name/cl/clamtk/package.nix | 2 +- pkgs/by-name/on/onedrivegui/package.nix | 2 +- pkgs/tools/package-management/apx/default.nix | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 141a79b38442..7206d92d40f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3172,6 +3172,11 @@ githubId = 18648043; name = "Daniel Cartwright"; }; + chewblacka = { + github = "chewblacka"; + githubId = 18430320; + name = "John Garcia"; + }; Chili-Man = { email = "dr.elhombrechile@gmail.com"; name = "Diego Rodriguez"; @@ -8414,11 +8419,6 @@ githubId = 31008330; name = "Jann Marc Villablanca"; }; - jgarcia = { - github = "chewblacka"; - githubId = 18430320; - name = "John Garcia"; - }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 240370297d10..35a39918b165 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -49,7 +49,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl3Plus; homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; - maintainers = with maintainers; [ rika jgarcia ]; + maintainers = with maintainers; [ rika chewblacka ]; }; } diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 5ffc383f14f8..abe917a82dbb 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -44,7 +44,7 @@ in meta = with lib; { description = "A note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman jgarcia ]; + maintainers = with maintainers; [ max-niederman chewblacka ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; mainProgram = "remnote"; diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix index c0a62923d224..a3304ffcd0b0 100644 --- a/pkgs/by-name/cl/clamtk/package.nix +++ b/pkgs/by-name/cl/clamtk/package.nix @@ -69,7 +69,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl1Plus; homepage = "https://github.com/dave-theunsub/clamtk"; platforms = platforms.linux; - maintainers = with maintainers; [ jgarcia ShamrockLee ]; + maintainers = with maintainers; [ chewblacka ShamrockLee ]; }; } diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 6ffd81584f3e..f2db95e7dbc2 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -81,7 +81,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/bpozdena/OneDriveGUI"; description = "A simple GUI for Linux OneDrive Client, with multi-account support"; license = licenses.gpl3Only; - maintainers = with maintainers; [ jgarcia ]; + maintainers = with maintainers; [ chewblacka ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index aa46c772c2b3..20f77dbfe442 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { homepage = "https://github.com/Vanilla-OS/apx"; changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dit7ya jgarcia ]; + maintainers = with maintainers; [ dit7ya chewblacka ]; mainProgram = "apx"; }; } -- cgit 1.4.1 From 1debdc9730ff3b9bc5942c2bf206600005d03036 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 24 Nov 2023 13:35:55 +0000 Subject: remnote: 1.12.64 -> 1.13.0 --- pkgs/applications/misc/remnote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index abe917a82dbb..c564e42ec425 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.64"; + version = "1.13.0"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw="; + hash = "sha256-ovM7MnRqzy/mgz+h87hqIuvquODIfmxjdJG1NZYobbk="; }; appexec = appimageTools.wrapType2 { inherit pname version src; -- cgit 1.4.1 From 353ec7d15489e325d442d25b9d811f5b3b886349 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Mon, 27 Nov 2023 14:48:22 +1300 Subject: microsoft-edge: 119.0.2151.44 -> 119.0.2151.72 --- .../networking/browsers/microsoft-edge/browser.nix | 12 ++++++------ .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ .../networking/browsers/microsoft-edge/update.py | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 3577c2a12b25..12ef901bbcb3 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -1,4 +1,4 @@ -{ channel, version, revision, sha256 }: +{ channel, version, revision, hash }: { stdenv , fetchurl @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ @@ -128,13 +128,13 @@ stdenv.mkDerivation rec { --set-rpath "${libPath.libGLESv2}" \ opt/microsoft/${shortName}/libGLESv2.so - patchelf \ - --set-rpath "${libPath.libsmartscreenn}" \ - opt/microsoft/${shortName}/libsmartscreenn.so - patchelf \ --set-rpath "${libPath.liboneauth}" \ opt/microsoft/${shortName}/liboneauth.so + '' + lib.optionalString (lib.versionOlder version "120") '' + patchelf \ + --set-rpath "${libPath.libsmartscreenn}" \ + opt/microsoft/${shortName}/libsmartscreenn.so ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index d034c68d85fa..51b3d6730862 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "119.0.2151.44"; + version = "119.0.2151.72"; revision = "1"; - sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; + hash = "sha256-thBx/+6thNXXKppA11IOG5EiMx7pA9FA3vSkwa9+F0o="; }; beta = import ./browser.nix { channel = "beta"; - version = "119.0.2151.44"; + version = "120.0.2210.22"; revision = "1"; - sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; + hash = "sha256-GayVVZbtGLQmmXu+k4wdsD+rPwGiSPHnQwzVYyKWhHM="; }; dev = import ./browser.nix { channel = "dev"; - version = "120.0.2186.2"; + version = "121.0.2220.3"; revision = "1"; - sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; + hash = "sha256-M3r+SLp3lQ7oWDYoM7aNZDC5wbMxFZggsu0Iuyyw/cw="; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index f32b669f0360..616dc0999505 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -52,7 +52,7 @@ def nix_expressions(latest: dict[str, Packages]): channel = "{channel}"; version = "{version}"; revision = "{revision}"; - sha256 = "{sri}"; + hash = "{sri}"; }};''' ) channel_strs.append(channel_str) -- cgit 1.4.1 From 8cf9ec9b02dfd0949d3a7fd30fd0a84f40944e4c Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 27 Nov 2023 12:31:48 -0800 Subject: runelite: fix desktop entry --- pkgs/games/runelite/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs') diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index a4963eb2a9d1..88c27d864cf1 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -37,10 +37,13 @@ maven.buildMavenPackage rec { installPhase = '' mkdir -p $out/share/icons + mkdir -p $out/share/applications cp target/RuneLite.jar $out/share cp appimage/runelite.png $out/share/icons + ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop + makeWrapper ${jre}/bin/java $out/bin/runelite \ --prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \ --add-flags "-jar $out/share/RuneLite.jar" -- cgit 1.4.1 From e1f3eed3fdb2c13bf100fff42d680c1f4d4c8054 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 28 Nov 2023 12:20:08 +0100 Subject: t-rex: add geospatial team to maintainers --- pkgs/servers/geospatial/t-rex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/servers/geospatial/t-rex/default.nix b/pkgs/servers/geospatial/t-rex/default.nix index 755bfb06c0d6..c96d8a8247f5 100644 --- a/pkgs/servers/geospatial/t-rex/default.nix +++ b/pkgs/servers/geospatial/t-rex/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://t-rex.tileserver.ch/"; changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; mainProgram = "t_rex"; platforms = platforms.unix; broken = true; # https://github.com/t-rex-tileserver/t-rex/issues/302 -- cgit 1.4.1 From 1b87c9dcd640d19dd0bdc2c16e6e4c7b199c2db6 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:37:45 +0000 Subject: httptunnel: update to latest rev; fix darwin version in nixpkgs is at least older than 2012 https://github.com/larsbrinkhoff/httptunnel/compare/3b2a6f15b252a5dfccc067ebae47b93a9b9f2d14...d8f91af976c97a6006a5bd1ad7149380c39ba454 --- pkgs/tools/networking/httptunnel/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index 13ef64175358..c8ff4fa7719d 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.3-unstable-2023-05-08"; pname = "httptunnel"; - src = fetchurl { - url = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz"; - sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"; + src = fetchFromGitHub { + owner = "larsbrinkhoff"; + repo = "httptunnel"; + rev = "d8f91af976c97a6006a5bd1ad7149380c39ba454"; + hash = "sha256-fUaVHE3nxq3fU7DYCvaQTOoMzax/qFH8cMegFLLybNk="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + meta = with lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; - homepage = "http://www.nocrew.org/software/httptunnel"; + homepage = "http://www.gnu.org/software/httptunnel/httptunnel.html"; license = licenses.gpl2; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; -- cgit 1.4.1 From 3b1db4070e930ae4e8110a39dfb5961a7e5c9616 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Nov 2023 13:59:03 +0000 Subject: python311Packages.aiolifx-themes: 0.4.10 -> 0.4.11 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index aeac811c8f5a..593d1e77b460 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.10"; + version = "0.4.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-zpUvbG/89MeZ50565MVjehSTnLmOKScBA07yBjZ521I="; + hash = "sha256-pldmkdkDI6RFMcBOF1MtQBddOo+uF23CMHPztEV+kf0="; }; prePatch = '' -- cgit 1.4.1 From 1e1bd362e50cd3d8729a170b084340701bcdd550 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 28 Nov 2023 07:14:08 -0800 Subject: timg: 1.5.2 -> 1.5.3 Release notes: https://github.com/hzeller/timg/releases/tag/v1.5.3 --- pkgs/tools/graphics/timg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 43a2ae16ed34..2379e3c8188e 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "timg"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${finalAttrs.version}"; - hash = "sha256-e2Uy1jvS0+gdhto4Sgz6YlqEqXJ7KGUAA6iuixfvvJg="; + hash = "sha256-u52ipc3I57ldKXjmXqFuIXIYIrs5c9TSvgs1HfIu44U="; }; buildInputs = [ -- cgit 1.4.1 From 9e4458763fb51df6040a02c515a43a4e3cc3bf77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Nov 2023 15:23:03 +0000 Subject: python311Packages.altair: 5.1.2 -> 5.2.0 --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index b7fbcb552746..3b9b53b9a6c3 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "altair"; - version = "5.1.2"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "altair-viz"; repo = "altair"; rev = "refs/tags/v${version}"; - hash = "sha256-30M+rt5IfD4hvK5CwaW8HfQacDBPjowff/f9o7iido0="; + hash = "sha256-uTG+V0SQgAQtMjvrVvKVKgIBT9qO+26EPRxQCEXj/gc="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 29175e613e20bea94ffba87a310fd5ecfa492980 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Nov 2023 10:40:24 -0500 Subject: cargo-tarpaulin: 0.27.1 -> 0.27.2 Diff: https://github.com/xd009642/tarpaulin/compare/0.27.1...0.27.2 Changelog: https://github.com/xd009642/tarpaulin/blob/0.27.2/CHANGELOG.md --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 8b74bb1d3994..0a36253630a3 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-Mr1thOGqpLcMUBbmD6YzU9WlyOvlPHSqyiU/wtb4edo="; + hash = "sha256-NvpWWk/Rr1Hnekc8vrjmOXknRe9sUFQFwPi0obGfXEA="; }; - cargoHash = "sha256-UrDyAS/SIrXWsYucmjj6URjqjjWB40wxLF0rXHmB2Tw="; + cargoHash = "sha256-KuYh1td9O9rSnxtPSYX5zp4A71IQkUJDVR0VaIZOh7g="; nativeBuildInputs = [ pkg-config -- cgit 1.4.1 From 7ff193305b852074d1ce1278e3bc008419c491be Mon Sep 17 00:00:00 2001 From: Henry Till Date: Tue, 28 Nov 2023 10:52:47 -0800 Subject: treewide: remove henrytill as maintainer from various pkgs --- pkgs/applications/version-management/mr/default.nix | 2 +- pkgs/data/fonts/mplus-outline-fonts/default.nix | 4 ++-- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/interpreters/racket/racket_7_9.nix | 2 +- pkgs/development/tools/ocaml/opam/default.nix | 2 +- pkgs/development/tools/ocaml/opam/opam.nix.pl | 2 +- pkgs/tools/X11/hsetroot/default.nix | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index da882f1e359f..4ff6c6733e6f 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { homepage = "http://myrepos.branchable.com/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ antono henrytill ]; + maintainers = with lib.maintainers; [ antono ]; }; } diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 93e508ecd43c..06d4f018e644 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -23,7 +23,7 @@ in meta = with lib; { description = "M+ Outline Fonts (legacy OSDN release)"; homepage = "https://mplus-fonts.osdn.jp"; - maintainers = with maintainers; [ henrytill uakci ]; + maintainers = with maintainers; [ uakci ]; platforms = platforms.all; license = licenses.mit; }; @@ -53,7 +53,7 @@ in meta = with lib; { description = "M+ Outline Fonts (GitHub release)"; homepage = "https://mplusfonts.github.io"; - maintainers = with maintainers; [ henrytill uakci ]; + maintainers = with maintainers; [ uakci ]; platforms = platforms.all; license = licenses.ofl; }; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 77231163f803..1bec0a03c72e 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { homepage = "https://racket-lang.org/"; changelog = "https://github.com/racket/racket/releases/tag/v${version}"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ henrytill vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index ac4b6b5ba180..836bc879dbbc 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ henrytill vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 0463db7482b8..a60b12667fa7 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -139,7 +139,7 @@ in stdenv.mkDerivation { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; - maintainers = [ maintainers.henrytill maintainers.marsam ]; + maintainers = [ maintainers.marsam ]; license = licenses.lgpl21Only; platforms = platforms.all; }; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 8b573039d7d8..412a1a30e70d 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -129,7 +129,7 @@ print <<'EOF'; description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; - maintainers = [ maintainers.henrytill maintainers.marsam ]; + maintainers = [ maintainers.marsam ]; license = licenses.lgpl21Only; platforms = platforms.all; }; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 95ccd9586d9c..a3ebc33f56ba 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Allows you to compose wallpapers ('root pixmaps') for X"; homepage = "https://github.com/himdel/hsetroot"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ henrytill shamilton ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; }; } -- cgit 1.4.1 From e03110096545ccd2504654d6d93242bb50893b25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Nov 2023 20:33:29 +0000 Subject: python311Packages.pubnub: 7.3.1 -> 7.3.2 --- pkgs/development/python-modules/pubnub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 626f0913dfef..4a6ae8af2322 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.3.1"; + version = "7.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-V6yw/OscTGwrFcjHEhwtaT7txWLqbVj0uYjuoSAtP2E="; + hash = "sha256-J6vwdOI/GM/K0TxRwIgkXibNAc+n9wVCpmMkzMhBepw="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From ce95d5928143ac7b957ea1dd8b43fb31aae109fe Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Tue, 28 Nov 2023 20:55:28 +0000 Subject: cloudlog: 2.5.1 -> 2.5.2 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index b11c762a9241..faedafbe7af2 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-wFtMMphHz8JBX4hpgD85wn4G7Qs4/nwRcrW12A1tQm4="; + hash = "sha256-0l4/isk2DKZ0HBxeuUN+RqB3o/3fWdhFSFCnQ2OiO6Y="; }; postPatch = '' -- cgit 1.4.1 From 2a3d97bcb08324c14a06c0861e05673a16690015 Mon Sep 17 00:00:00 2001 From: aoife cassidy Date: Tue, 28 Nov 2023 23:13:38 +0200 Subject: maintainers: sfr -> nbsp --- maintainers/maintainer-list.nix | 14 +++++++------- pkgs/applications/audio/mus/default.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 141a79b38442..56685b5e3ba5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12740,6 +12740,13 @@ githubId = 1386642; name = "Noah Brenowitz"; }; + nbsp = { + email = "aoife@enby.space"; + matrix = "@nbsp:enby.space"; + github = "enbyspace"; + githubId = 57151943; + name = "aoife cassidy"; + }; ncfavier = { email = "n@monade.li"; matrix = "@ncfavier:matrix.org"; @@ -16354,13 +16361,6 @@ fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; }]; }; - sfr = { - email = "sol@solfisher.com"; - matrix = "@sfr:enby.space"; - github = "solfisher"; - githubId = 57151943; - name = "Sol Fisher Romanoff"; - }; sfrijters = { email = "sfrijters@gmail.com"; github = "SFrijters"; diff --git a/pkgs/applications/audio/mus/default.nix b/pkgs/applications/audio/mus/default.nix index 1235486ab554..bfd92760a1c3 100644 --- a/pkgs/applications/audio/mus/default.nix +++ b/pkgs/applications/audio/mus/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { description = "a pretty good mpd client"; homepage = "https://sr.ht/~sfr/mus"; license = licenses.mit; - maintainers = with maintainers; [ sfr ]; + maintainers = with maintainers; [ nbsp ]; mainProgram = "mus"; }; } -- cgit 1.4.1 From 7071bf24d415cf025c42eb6b60ff04d880905001 Mon Sep 17 00:00:00 2001 From: aoife cassidy Date: Tue, 28 Nov 2023 23:18:39 +0200 Subject: mus: change upstream src; migrate to by-name ~sfr -> ~nbsp; author (me) changed usernames --- pkgs/applications/audio/mus/default.nix | 23 ----------------------- pkgs/by-name/mu/mus/package.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 pkgs/applications/audio/mus/default.nix create mode 100644 pkgs/by-name/mu/mus/package.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/mus/default.nix b/pkgs/applications/audio/mus/default.nix deleted file mode 100644 index bfd92760a1c3..000000000000 --- a/pkgs/applications/audio/mus/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromSourcehut, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "mus"; - version = "0.2.0"; - - src = fetchFromSourcehut { - owner = "~sfr"; - repo = pname; - rev = version; - hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; - }; - - cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; - - meta = with lib; { - description = "a pretty good mpd client"; - homepage = "https://sr.ht/~sfr/mus"; - license = licenses.mit; - maintainers = with maintainers; [ nbsp ]; - mainProgram = "mus"; - }; -} diff --git a/pkgs/by-name/mu/mus/package.nix b/pkgs/by-name/mu/mus/package.nix new file mode 100644 index 000000000000..c1abc1666ab2 --- /dev/null +++ b/pkgs/by-name/mu/mus/package.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mus"; + version = "0.2.0"; + + src = fetchFromSourcehut { + owner = "~nbsp"; + repo = pname; + rev = version; + hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; + }; + + cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; + + meta = with lib; { + description = "a pretty good mpd client"; + homepage = "https://sr.ht/~nbsp/mus"; + license = licenses.mit; + maintainers = with maintainers; [ nbsp ]; + mainProgram = "mus"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3193ba6e52b8..5da23acd9534 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40568,8 +40568,6 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mus = callPackage ../applications/audio/mus { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; museeks = callPackage ../applications/audio/museeks { }; -- cgit 1.4.1 From b5514083094a1f532fc654edb1190ad6cf81f587 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Nov 2023 23:47:15 +0100 Subject: qovery-cli: 0.74.3 -> 0.74.4 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.74.3...v0.74.4 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.74.4 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 0c87e74dbafe..67f863198d09 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.74.3"; + version = "0.74.4"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-2FgNH8EVIi4ifkURp2Znh8cPpgsW3m9rJGa7bJr86ZI="; + hash = "sha256-QWXb4JBT/MgAsUyn4zaeSaauUDjV1b9mb7JYaoS2oqg="; }; vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM="; -- cgit 1.4.1 From 10ee18ca9265cada45acfc7a6d7644cd22b82465 Mon Sep 17 00:00:00 2001 From: Cui Chen Date: Wed, 29 Nov 2023 08:12:07 +0800 Subject: certbot: 2.6.0 -> 2.7.4 (#267710) --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index dd4e5f503335..6da3be8329b2 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "2.6.0"; + version = "2.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CbYamk1+NvcyS6w7pOjpD5lqWHCk+VJqF9R3xYxzpQk="; + hash = "sha256-BZ7JqAciwbmkpbzR/qZHAraLJWWXNRN3Er4XvfU5kYs="; }; sourceRoot = "${src.name}/${pname}"; -- cgit 1.4.1 From 53850d6d440df52d16f6bc13ba8e9c487f910ba8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Nov 2023 19:39:46 -0500 Subject: cargo-shuttle: 0.33.0 -> 0.34.1 Diff: https://github.com/shuttle-hq/shuttle/compare/v0.33.0...v0.34.1 Changelog: https://github.com/shuttle-hq/shuttle/releases/tag/v0.34.1 --- .../tools/rust/cargo-shuttle/Cargo.lock | 367 +++++++++++---------- .../tools/rust/cargo-shuttle/default.nix | 4 +- 2 files changed, 197 insertions(+), 174 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 27ea2aefbec7..79e9d4526ce7 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", "zerocopy", @@ -264,7 +264,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -295,7 +295,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -968,9 +968,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "regex-automata 0.4.3", @@ -1006,9 +1006,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytes-utils" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ "bytes", "either", @@ -1112,16 +1112,16 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] [[package]] name = "cargo-shuttle" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "assert_cmd", @@ -1166,7 +1166,7 @@ dependencies = [ "tokio", "tokio-tungstenite", "tokiotest-httpserver", - "toml 0.8.6", + "toml 0.8.8", "toml_edit 0.20.7", "tonic 0.10.2", "tracing", @@ -1258,9 +1258,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -1268,9 +1268,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -1296,7 +1296,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1566,9 +1566,9 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4939f9ed1444bd8c896d37f3090012fa6e7834fe84ef8c9daa166109515732f9" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" @@ -1710,7 +1710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1939,7 +1939,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2005,7 +2005,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2016,9 +2016,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2241,7 +2241,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2328,9 +2328,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2713,7 +2713,7 @@ checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3127,9 +3127,9 @@ checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -3137,7 +3137,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -3273,9 +3273,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -3744,9 +3744,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3766,6 +3766,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "libsqlite3-sys" version = "0.26.0" @@ -3797,9 +3808,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -4420,6 +4431,16 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" +dependencies = [ + "base64 0.21.5", + "serde", +] + [[package]] name = "pem" version = "3.0.2" @@ -4462,7 +4483,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4610,9 +4631,9 @@ checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", @@ -4622,7 +4643,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rusty-fork", "tempfile", "unarray", @@ -4640,12 +4661,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "5a5a410fc7882af66deb8d01d01737353cf3ad6204c408177ba494291a626312" dependencies = [ "bytes", - "prost-derive 0.12.1", + "prost-derive 0.12.2", ] [[package]] @@ -4663,24 +4684,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc" dependencies = [ "anyhow", "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "prost-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +checksum = "8339f32236f590281e2f6368276441394fcd1b2133b549cc895d0ae80f2f9a52" dependencies = [ - "prost 0.12.1", + "prost 0.12.2", ] [[package]] @@ -4789,7 +4810,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -4877,12 +4898,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] @@ -4937,12 +4958,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -5016,7 +5031,7 @@ dependencies = [ "async-trait", "chrono", "futures", - "getrandom 0.2.10", + "getrandom 0.2.11", "http", "hyper", "parking_lot 0.11.2", @@ -5085,7 +5100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -5155,7 +5170,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.38", + "syn 2.0.39", "walkdir", ] @@ -5220,9 +5235,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -5235,9 +5250,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", "ring 0.17.5", @@ -5259,9 +5274,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -5400,9 +5415,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5418,13 +5433,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5479,7 +5494,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5619,7 +5634,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "clap", @@ -5629,14 +5644,14 @@ dependencies = [ "serde_json", "shuttle-common", "tokio", - "toml 0.8.6", + "toml 0.8.8", "tracing", "tracing-subscriber", ] [[package]] name = "shuttle-auth" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "async-stripe", @@ -5644,11 +5659,13 @@ dependencies = [ "axum", "axum-extra", "axum-sessions", + "base64 0.21.5", "clap", "http", "hyper", "jsonwebtoken", "opentelemetry", + "pem 2.0.1", "portpicker", "rand 0.8.5", "ring 0.17.5", @@ -5667,7 +5684,7 @@ dependencies = [ [[package]] name = "shuttle-builder" -version = "0.33.0" +version = "0.34.1" dependencies = [ "async-trait", "clap", @@ -5684,7 +5701,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.8.6", + "toml 0.8.8", "tonic 0.10.2", "tracing", "tracing-subscriber", @@ -5693,7 +5710,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.33.0" +version = "0.34.1" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5703,19 +5720,19 @@ dependencies = [ "serde", "serde_json", "shuttle-common-tests", - "syn 2.0.38", + "syn 2.0.39", "tokio", "trybuild", ] [[package]] name = "shuttle-common" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.5", "bytes", "chrono", "comfy-table", @@ -5761,7 +5778,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.33.0" +version = "0.34.1" dependencies = [ "cargo-shuttle", "hyper", @@ -5777,7 +5794,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "async-trait", @@ -5814,7 +5831,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "toml 0.8.6", + "toml 0.8.8", "tonic 0.10.2", "tower", "tower-http 0.4.4", @@ -5829,7 +5846,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "async-trait", @@ -5839,6 +5856,7 @@ dependencies = [ "chrono", "clap", "colored", + "flate2", "fqdn", "futures", "http", @@ -5858,17 +5876,21 @@ dependencies = [ "rcgen", "reqwest", "ring 0.17.5", + "rmp-serde", "rustls", "rustls-pemfile", "serde", "serde_json", "shuttle-common", + "shuttle-common-tests", "shuttle-orchestrator", "shuttle-proto", "snailquote", "sqlx", "strum 0.25.0", + "tar", "tempfile", + "test-context", "tokio", "tonic 0.10.2", "tower", @@ -5887,7 +5909,7 @@ dependencies = [ [[package]] name = "shuttle-logger" -version = "0.33.0" +version = "0.34.1" dependencies = [ "async-trait", "chrono", @@ -5913,30 +5935,27 @@ dependencies = [ [[package]] name = "shuttle-orchestrator" -version = "0.33.0" +version = "0.34.1" [[package]] name = "shuttle-proto" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "chrono", - "dunce", "futures-core", - "home", - "prost 0.12.1", + "prost 0.12.2", "prost-types", "serde_json", "shuttle-common", "tokio", "tonic 0.10.2", - "tower", "tracing", ] [[package]] name = "shuttle-provisioner" -version = "0.33.0" +version = "0.34.1" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5946,7 +5965,7 @@ dependencies = [ "mongodb", "once_cell", "portpicker", - "prost 0.12.1", + "prost 0.12.2", "rand 0.8.5", "serde_json", "shuttle-common", @@ -5961,7 +5980,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.33.0" +version = "0.34.1" dependencies = [ "async-trait", "chrono", @@ -5985,7 +6004,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "async-trait", @@ -6018,17 +6037,20 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.33.0" +version = "0.34.1" dependencies = [ "anyhow", "async-trait", "cargo_metadata 0.18.1", + "dunce", "serde", "shuttle-common", + "shuttle-proto", "strfmt", "thiserror", "tokio", - "toml 0.8.6", + "toml 0.8.8", + "tower", "tracing", ] @@ -6064,9 +6086,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -6101,9 +6123,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smart-default" @@ -6476,7 +6498,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6498,9 +6520,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -6626,9 +6648,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -6677,7 +6699,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6738,9 +6760,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -6767,13 +6789,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6880,14 +6902,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.7", + "toml_edit 0.21.0", ] [[package]] @@ -6917,6 +6939,17 @@ name = "toml_edit" version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.1.0", "serde", @@ -6971,7 +7004,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.1", + "prost 0.12.2", "tokio", "tokio-stream", "tower", @@ -7083,7 +7116,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -7107,17 +7140,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -7142,16 +7164,16 @@ dependencies = [ "smallvec", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", "tracing-subscriber", "web-time", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -7162,7 +7184,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", ] [[package]] @@ -7356,9 +7378,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-bom" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" @@ -7452,9 +7474,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b208a50ff438dcdc887ea3f2db59530bd2f4bc3d2c70630e4d7ee7a281a1d1b" +checksum = "0ff05e3bac2c9428f57ade702667753ca3f5cf085e2011fe697de5bfd49aa72d" dependencies = [ "indexmap 2.1.0", "serde", @@ -7464,14 +7486,14 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd516d8879043e081537690bc96c8f17b5a4602c336aecb8f1de89d9d9c7e72" +checksum = "5f0b6f4667edd64be0e820d6631a60433a269710b6ee89ac39525b872b76d61d" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "uuid", ] @@ -7497,7 +7519,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -7636,7 +7658,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -7670,7 +7692,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7692,9 +7714,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ae0be20bf87918df4fa831bfbbd0b491d24aee407ed86360eae4c2c5608d38" +checksum = "7d135e8940b69dbee0f5b0a0be9c1cd6fa8b71d774904c13a3fcfc5dc265e43d" dependencies = [ "leb128", ] @@ -7726,22 +7748,23 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.116.0" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53290b1276c5c2d47d694fb1a920538c01f51690e7e261acbe1d10c5fc306ea1" +checksum = "9b206de0c992af9f0b51ef2fb9455623e0a19eb68f172cd8ba9cd0e46637f5ab" dependencies = [ + "hashbrown 0.14.2", "indexmap 2.1.0", "semver 1.0.20", ] [[package]] name = "wasmprinter" -version = "0.2.71" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f98260aa20f939518bcec1fac32c78898d5c68872e7363a4651f21f791b6c7e" +checksum = "7a4fdb34710b461c868c3f79a10a48b404f23b46fd471ab02bcaa60fd96c5c4b" dependencies = [ "anyhow", - "wasmparser 0.116.0", + "wasmparser 0.117.0", ] [[package]] @@ -7822,7 +7845,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -8013,7 +8036,7 @@ checksum = "6362c557c36d8ad4aaab735f14ed9e4f78d6b40ec85a02a88fd859af87682e52" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8096,23 +8119,23 @@ dependencies = [ [[package]] name = "wast" -version = "67.0.0" +version = "68.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c2933efd77ff2398b83817a98984ffe4b67aefd9aa1d2c8e68e19b553f1c38" +checksum = "7bf3081ac6bcb3a5b72a401693b3566feb529dc2b7e7b62ea544c8a30d0f4d05" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.36.1", + "wasm-encoder 0.37.0", ] [[package]] name = "wat" -version = "1.0.78" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02905d13751dcb18f4e19f489d37a1bf139f519feaeef28d072a41a78e69a74" +checksum = "6fabe07d22a837b3bd5662ba9e980d73de115c040923659a1801934c7ccebe49" dependencies = [ - "wast 67.0.0", + "wast 68.0.0", ] [[package]] @@ -8205,7 +8228,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.38", + "syn 2.0.39", "witx", ] @@ -8217,7 +8240,7 @@ checksum = "476e3e09bc68e82624b70a322265515523754cb9e05fcacceabd216e276bc2ed" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wiggle-generate", ] @@ -8420,9 +8443,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -8535,29 +8558,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.24" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.24" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index 11203c701898..9d0a0fc0ca08 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.33.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-9MdEB7T+ZJuI5sGbHkhibhqKiGZYmURbaarBsU4gQMk="; + hash = "sha256-SAad1GS092a9LBzlnf1UMLGwKsNBOgWP0gjoW2M0SH4="; }; cargoLock = { -- cgit 1.4.1 From fa3cd52b3e4ef8ae07e4a01f1c2f2acb5fa32756 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Nov 2023 00:54:48 +0000 Subject: drogon: 1.9.0 -> 1.9.1 --- pkgs/development/libraries/drogon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 5d2e3b3245c3..b5aee15a3045 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M="; + sha256 = "sha256-6F+LRcoBqHEbweqbVFHlR3I9nj1NaYty8zKcR4ZHKxg="; fetchSubmodules = true; }; -- cgit 1.4.1 From 9c933f9d855e443a7f46fcc09bbf777ebcb11579 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Nov 2023 19:55:45 -0500 Subject: cargo-zigbuild: 0.17.5 -> 0.18.0 Diff: https://github.com/messense/cargo-zigbuild/compare/v0.17.5...v0.18.0 Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.18.0 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 3741be37772d..1ea339a44dfe 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.17.5"; + version = "0.18.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-x0TPbqwoCaXUlrjYQ47+x5KohsiK5yCrI2Q8yA2K8Zs="; + hash = "sha256-JZZJQGWPqb+jAqofEij/43ZZMOyT/2aU8rxmq72r0E4="; }; - cargoHash = "sha256-FK6tTAbhP1f4VasG9HCahbMTDrJ9A6zXt/T6cs3HOZE="; + cargoHash = "sha256-PKfIQkLXq7gdg3wCqlue2UsaUP/jAz85JyoFjGwqwQY="; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 67456fd6ca7b7511e2ce07e820df89d3a7d054c4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Nov 2023 20:08:11 -0500 Subject: oxlint: 0.0.17 -> 0.0.18 Diff: https://github.com/web-infra-dev/oxc/compare/oxlint_v0.0.17...oxlint_v0.0.18 Changelog: https://github.com/web-infra-dev/oxc/releases/tag/oxlint_v0.0.18 --- pkgs/development/tools/oxlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 649b49a09850..ecc1ab9cc7c6 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-s+D9+gHJLldTaMHr+XahppNHYL62V1J9iOgRZkr/p9Q="; + hash = "sha256-WvNPfEgeBBbzhyJsMPpqhhkZ8GRn3mCq7HVaoVrCm2U="; }; - cargoHash = "sha256-NQ/s39x/LLQoiW7p2x65l1oBkDal46g5/G6r4Ttpgsw="; + cargoHash = "sha256-nWaa3JzACy6ftfm/qEfdBOxK3j4QJof7MtFI8GIpUxY="; buildInputs = [ rust-jemalloc-sys -- cgit 1.4.1 From d341b7d95cc9d571e2547850689682373b68603d Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Nov 2023 20:35:03 -0500 Subject: gifski: 1.13.0 -> 1.31.1 Diff: https://github.com/ImageOptim/gifski/compare/1.13.0...1.31.1 Changelog: https://github.com/ImageOptim/gifski/releases/tag/1.31.1 --- pkgs/tools/graphics/gifski/Cargo.lock | 2 +- pkgs/tools/graphics/gifski/default.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock index ee579a5e9799..bc840dec7f1f 100644 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ b/pkgs/tools/graphics/gifski/Cargo.lock @@ -318,7 +318,7 @@ dependencies = [ [[package]] name = "gifski" -version = "1.13.0" +version = "1.13.1" dependencies = [ "clap", "crossbeam-channel", diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 53180d0094a8..295760905442 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.13.0"; + version = "1.31.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - hash = "sha256-Ij+bgL935uLCZeh8GQnTFlPIuUloNCn8LUdvMd+6okM="; + hash = "sha256-JzQReCX1AfFhbVbSPOIAKAVvNoddrWFHaJ1AxlsIPA0="; }; cargoLock = { @@ -44,6 +44,11 @@ rustPlatform.buildRustPackage rec { # checkType = "debug"; + # Cargo.lock is outdated + postPatch = '' + cargo metadata --offline + ''; + meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; -- cgit 1.4.1 From 369650ef388e4a6488b1783dc747cab7559a90d4 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 29 Nov 2023 12:41:25 +1100 Subject: poco: fix static build --- pkgs/development/libraries/poco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index b3037c463e52..b4ba1790d58d 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { MYSQL_DIR = libmysqlclient; MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; - cmakeFlags = [ - "-DPOCO_UNBUNDLED=ON" + configureFlags = [ + "--unbundled" ]; postFixup = '' -- cgit 1.4.1 From c4ffc83975e38459202145f18528aa602744775f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Nov 2023 07:31:09 +0100 Subject: ocamlPackages.bap: use LLVM 14 This fixes build after https://github.com/NixOS/nixpkgs/pull/241692 --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e8c05d43c7c7..adbec01c46ef 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -806,7 +806,7 @@ let lwt_ppx = self.lwt_ppx.override { inherit ppxlib; }; sedlex = self.sedlex.override { inherit ppxlib ppx_expect; }; in callPackage ../development/ocaml-modules/bap { - inherit (pkgs.llvmPackages) llvm; + inherit (pkgs.llvmPackages_14) llvm; ezjsonm = self.ezjsonm.override { inherit sexplib0; }; ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; }; ocurl = self.ocurl.override { inherit lwt_ppx; }; -- cgit 1.4.1 From 76c5738ef231b19072cd7b1c0fa6d65cb61b1208 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Nov 2023 10:21:38 +0100 Subject: coqPackages.mathcomp-word: 2.1 → {2.2, 3.0} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coq-modules/mathcomp-word/default.nix | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index c829870e457b..db8a23ea658a 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -1,22 +1,32 @@ -{ coq, mkCoqDerivation, mathcomp, lib, version ? null }: +{ fetchurl, coq, mkCoqDerivation, mathcomp, lib, version ? null }: -mkCoqDerivation { +let namePrefix = [ "coq" "mathcomp" ]; pname = "word"; + fetcher = { domain, owner, repo, rev, sha256, ...}: + fetchurl { + url = "https://${domain}/${owner}/${repo}/releases/download/${rev}/${lib.concatStringsSep "-" (namePrefix ++ [ pname ])}-${rev}.tbz"; + inherit sha256; + }; +in + +mkCoqDerivation { + inherit namePrefix pname fetcher; owner = "jasmin-lang"; repo = "coqword"; useDune = true; releaseRev = v: "v${v}"; - release."2.1".sha256 = "sha256-oN/zvnePq64Nt7l/zIDLdhb4t9ayKxnZCsn+pzqS030="; - release."2.0".sha256 = "sha256-x9AEFadlYiIIOxAhjv4Vc/dxdRZC7AdWQ6AByvLOFDk="; - release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z"; - release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; + release."3.0".sha256 = "sha256-xEgx5HHDOimOJbNMtIVf/KG3XBemOS9XwoCoW6btyJ4="; + release."2.2".sha256 = "sha256-8BB6SToCrMZTtU78t2K+aExuxk9O1lCqVQaa8wabSm8="; + release."2.1".sha256 = "sha256-895gZzwwX8hN9UUQRhcgRlphHANka9R0PRotfmSEelA="; + release."2.0".sha256 = "sha256-ySg3AviGGY5jXqqn1cP6lTw3aS5DhawXEwNUgj7pIjA="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.12" "8.18") (isGe "1.12") ]; out = "2.1"; } + { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "3.0"; } + { cases = [ (range "8.12" "8.18") (range "1.12" "1.18") ]; out = "2.2"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; -- cgit 1.4.1