From ad91ae845356839c7e8d9bff207bf2c97ff2600d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 3 Aug 2023 09:06:16 -0300 Subject: [PATCH 01/61] graphite-gtk-theme: fix tweak names --- pkgs/data/themes/graphite-gtk-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index ea5cf7a7d92d..31422625a48d 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -22,7 +22,7 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "darker" "rimless" "normal" "float" "colorful" ] tweaks lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { From 04890bc14e9b66cefbf43f7adedc818cced93468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:54:20 -0700 Subject: [PATCH 02/61] freexl: 1.0.6 -> 2.0.0 --- pkgs/development/libraries/freexl/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/development/libraries/freexl/default.nix index 7bc1322ccc8c..ac5609425b56 100644 --- a/pkgs/development/libraries/freexl/default.nix +++ b/pkgs/development/libraries/freexl/default.nix @@ -1,17 +1,29 @@ -{ lib, stdenv, fetchurl, validatePkgConfig, libiconv }: +{ lib +, stdenv +, fetchurl +, validatePkgConfig +, expat +, minizip +, zlib +, libiconv +}: stdenv.mkDerivation rec { pname = "freexl"; - version = "1.0.6"; + version = "2.0.0"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz"; - hash = "sha256-Pei1ej0TDLKIHqUtOqnOH+7bG1e32qTrN/dRQE+Q/CI="; + hash = "sha256-F2cF8d5Yq3we679cbeRqt2/Ni4VlCNvSj1ZI98bhp/A="; }; nativeBuildInputs = [ validatePkgConfig ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ + expat + minizip + zlib + ] ++ lib.optional stdenv.isDarwin libiconv; enableParallelBuilding = true; From f7bc25396d91ed6e1a63bfb91f381e8c0c45c710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:49:22 -0700 Subject: [PATCH 03/61] libspatialite: 5.0.1 -> 5.1.0 --- pkgs/development/libraries/libspatialite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index cc7da2b5f183..372f0c479c81 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libspatialite"; - version = "5.0.1"; + version = "5.1.0"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/libspatialite-${version}.tar.gz"; - hash = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg="; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${version}.tar.gz"; + hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA="; }; nativeBuildInputs = [ From 619248ce8d4d45bc21df7268e452f3db349af765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:53:29 -0700 Subject: [PATCH 04/61] spatialite_tools: 5.0.1 -> 5.1.0 --- pkgs/applications/gis/spatialite-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/applications/gis/spatialite-tools/default.nix index 875c33e60f3c..b336c41862e7 100644 --- a/pkgs/applications/gis/spatialite-tools/default.nix +++ b/pkgs/applications/gis/spatialite-tools/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "spatialite-tools"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-${version}.tar.gz"; - hash = "sha256-lgTCBeh/A3eJvFIwLGbM0TccPpjHTo7E4psHUt41Fxw="; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${version}.tar.gz"; + hash = "sha256-3zAwNnwInKkPpmMIl/PxooB4TaKeG6Y080DbpLCFg7U="; }; nativeBuildInputs = [ pkg-config ]; From e15380be99e317ed513db3b2a81f715d544d4eb8 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sun, 6 Aug 2023 18:23:32 -0400 Subject: [PATCH 05/61] gambit: add tco support --- pkgs/development/compilers/gambit/build.nix | 13 ++++++++++--- .../development/compilers/gambit/gambit-support.nix | 5 +++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 9481078fd941..33391c156969 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,6 +1,11 @@ -{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, - src, version, git-version, stampYmd ? 0, stampHms ? 0, - gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: +{ gccStdenv, lib, pkgs, + git, openssl, autoconf, gcc, coreutils, gnused, gnugrep, + makeStaticLibraries, + src, version, git-version, + stampYmd ? 0, stampHms ? 0, + gambit-support, + optimizationSetting ? "-O1", + gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling @@ -45,6 +50,7 @@ gccStdenv.mkDerivation rec { "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-openssl" + "--enable-dynamic-clib" #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime @@ -62,6 +68,7 @@ gccStdenv.mkDerivation rec { # "--enable-coverage" # "--enable-inline-jumps" # "--enable-char-size=1" # default is 4 + # "--enable-march=native" # Nope, makes it not work on machines older than the builder ] ++ gambit-params.extraOptions # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix index f78c99a50700..6e42b9252f24 100644 --- a/pkgs/development/compilers/gambit/gambit-support.nix +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -16,12 +16,13 @@ rec { --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; ''; modules = true; - extraOptions = []; + #extraOptions = []; + extraOptions = ["--enable-trust-c-tco" "CFLAGS=-foptimize-sibling-calls"]; }; unstable-params = stable-params // { stable = false; - extraOptions = ["--enable-trust-c-tco"]; + extraOptions = ["--enable-trust-c-tco"]; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; From 76e655c9b287206783adfc93e8d09a14b3763c26 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 28 Jul 2023 14:47:56 +0800 Subject: [PATCH 06/61] bpftune: unstable-2023-07-14 -> unstable-2023-08-02 Diff: https://github.com/oracle-samples/bpftune/compare/66620152bf8c37ab592e9273fe87e567126801c2...f7e051a011d581a3c667b7f7b769862407d85f04 --- pkgs/os-specific/linux/bpftune/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index da1bd1b384bb..7ad8496647fb 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "unstable-2023-07-14"; + version = "unstable-2023-08-02"; src = fetchFromGitHub { owner = "oracle-samples"; repo = "bpftune"; - rev = "66620152bf8c37ab592e9273fe87e567126801c2"; - hash = "sha256-U0O+F1DBF1xiaUKklwpZORBwF1T9wHM0SPQKUNaxKZk="; + rev = "f7e051a011d581a3c667b7f7b769862407d85f04"; + hash = "sha256-1tfr2vB/XRnpGJVwo2NQkXomz+J6AzvpS1P3rcAyAyI="; }; postPatch = '' @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { substituteInPlace include/bpftune/libbpftune.h \ --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/" + + substituteInPlace src/Makefile sample_tuner/Makefile \ + --replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \ ''; nativeBuildInputs = [ @@ -50,7 +53,6 @@ stdenv.mkDerivation rec { "prefix=${placeholder "out"}" "confprefix=${placeholder "out"}/etc" "BPFTUNE_VERSION=${version}" - "BPF_INCLUDE=${lib.getDev libbpf}/include" "NL_INCLUDE=${lib.getDev libnl}/include/libnl3" ]; From 8cf38683bd6a5f1183fefd6f00f413e1af30f827 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 7 Aug 2023 19:50:43 +0200 Subject: [PATCH 07/61] aaaaxy: 1.4.39 -> 1.4.42 https://github.com/divVerent/aaaaxy/releases/tag/v1.4.42 --- pkgs/games/aaaaxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 1db4f31e79a7..64f9de8c92b8 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.39"; + version = "1.4.42"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-eawsTvPJwWKDSZd/2XBneitoydSRxEAU5RAPZgE6NSo="; + hash = "sha256-GD7SgxGZRivVbgrzAe7U0EgkTmrXFvSGzzZUOE7CwbY="; fetchSubmodules = true; }; - vendorHash = "sha256-uHTYp8PBXdQ2w+kjxLVvUOzOvDfXF53lcBriK8sif7A="; + vendorHash = "sha256-1w+/tmF73hN5y5vj++JCX+T5RQ/PF747wmAbN9i7Bgs="; buildInputs = [ alsa-lib From 91ef16c9102c73e855a6d9661a1957c6cfcd1ace Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 7 Aug 2023 19:51:34 -0400 Subject: [PATCH 08/61] python310Packages.universal-pathlib: 0.1.0 -> 0.1.1 Changelog: https://github.com/fsspec/universal_pathlib/releases/tag/v0.1.1 --- pkgs/development/python-modules/universal-pathlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index 0d60a6b50c07..802844afb65d 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.0"; + version = "0.1.1"; format = "pyproject"; src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-LqzljIZUZh8zHvcyBqFHBbunpJVYFpk6mfuesVGyojg="; + hash = "sha256-UhTIbyEP6rm+W8wALwQtZeruw8CTP9ZlpDNstw6GxZ0="; }; nativeBuildInputs = [ From e828eac45e073469c9130376b3f24cceb74f03af Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 7 Aug 2023 20:04:18 -0400 Subject: [PATCH 09/61] risor: 0.11.0 -> 0.12.0 Diff: https://github.com/risor-io/risor/compare/v0.11.0...v0.12.0 Changelog: https://github.com/risor-io/risor/releases/tag/v0.12.0 --- pkgs/development/interpreters/risor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix index 59d79bb495a4..d5c9c38cad2d 100644 --- a/pkgs/development/interpreters/risor/default.nix +++ b/pkgs/development/interpreters/risor/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "risor"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-YBiBadyI8TRa7CpiTkMOL0biuVMAk23sqEOzJ0ipfA8="; + hash = "sha256-4Tw8QJj14MYfuQ4mNkSO1z4F8/3/6HjORKgARljlfs8="; }; vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4="; From 73ad532762b2cc78acbbbcbf710168a409fda22f Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 7 Aug 2023 20:21:14 -0400 Subject: [PATCH 10/61] gambit-unstable: 2023-07-30 -> 2023-08-06 --- pkgs/development/compilers/gambit/unstable.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 26761d67d35d..092cbdb72483 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,15 +1,15 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2023-07-30"; - git-version = "4.9.5-3-ge059fffd"; - stampYmd = 20230730; - stampHms = 151945; + version = "unstable-2023-08-06"; + git-version = "4.9.5-5-gf1fbe9aa"; + stampYmd = 20230806; + stampHms = 195822; src = fetchFromGitHub { owner = "gambit"; repo = "gambit"; - rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212"; - sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs"; + rev = "f1fbe9aa0f461e89f2a91bc050c1373ee6d66482"; + sha256 = "0b0gd6cwj8zxwcqglpsnmanysiq4mvma2mrgdfr6qy99avhbhzxm"; }; gambit-params = gambit-support.unstable-params; } From d387b0ef452e7b49eaadd80b776b22986a3fcb88 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sun, 29 Nov 2020 00:20:49 -0500 Subject: [PATCH 11/61] gerbil-support: various improvements Add an indirection between gerbil package parameters and nix packages computed from those parameters, so overlays can easily override the former. Run unit-tests of gerbil packages (not integration tests). Fix binaries for gerbil packages. Fix support for gerbil packages including binaries. --- pkgs/development/compilers/gerbil/build.nix | 6 +- .../compilers/gerbil/gerbil-crypto.nix | 6 +- .../compilers/gerbil/gerbil-ethereum.nix | 6 +- .../compilers/gerbil/gerbil-libp2p.nix | 6 +- .../compilers/gerbil/gerbil-persist.nix | 6 +- .../compilers/gerbil/gerbil-poo.nix | 10 +- .../compilers/gerbil/gerbil-support.nix | 160 +++++++++++++----- .../compilers/gerbil/gerbil-utils.nix | 6 +- .../compilers/gerbil/smug-gerbil.nix | 6 +- 9 files changed, 144 insertions(+), 68 deletions(-) diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 110378244fd0..227f11b7c584 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; done ; -''; + ''; ## TODO: make static compilation work. ## For that, get all the packages below to somehow expose static libraries, @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { meta = { description = "Gerbil Scheme"; homepage = "https://github.com/vyzo/gerbil"; - license = lib.licenses.lgpl21; # also asl20, like Gambit - # NB regarding platforms: regularly tested on Linux, only occasionally on macOS. + license = lib.licenses.lgpl21Only; # dual, also asl20, like Gambit + # NB regarding platforms: regularly tested on Linux and on macOS. # Please report success and/or failure to fare. platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fare ]; diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index 38943471a376..ff211cc610dc 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -1,6 +1,5 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { +{ pname = "gerbil-crypto"; version = "unstable-2020-08-01"; git-version = "0.0-6-ga228862"; @@ -12,7 +11,8 @@ gerbil-support.gerbilPackage { gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-crypto"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-crypto"; rev = "a22886260849ec92c3a34bfeedc1574e41e49e33"; diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index e498818d2e61..231162ede913 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -1,6 +1,5 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { +{ pname = "gerbil-ethereum"; version = "unstable-2020-10-18"; git-version = "0.0-26-gf27ada8"; @@ -12,7 +11,8 @@ gerbil-support.gerbilPackage { gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-ethereum"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-ethereum"; rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix index 336f5af89c3b..78ca2a113a81 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -1,6 +1,5 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { +{ pname = "gerbil-libp2p"; version = "unstable-2018-12-27"; git-version = "2376b3f"; @@ -11,7 +10,8 @@ gerbil-support.gerbilPackage { gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-libp2p"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "vyzo"; repo = "gerbil-libp2p"; rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88"; diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix index 74485c19c2d0..b9d19dc3711d 100644 --- a/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -1,6 +1,5 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { +{ pname = "gerbil-persist"; version = "unstable-2020-08-31"; git-version = "0.0-8-gd211390"; @@ -11,7 +10,8 @@ gerbil-support.gerbilPackage { gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-persist"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-persist"; rev = "d211390c8a199cf2b8c7400cd98977524e960015"; diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix index c6580ea0c77a..fd9878015509 100644 --- a/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -1,17 +1,17 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { - pname = "gerbil-ethereum"; +{ + pname = "gerbil-poo"; + gerbil-package = "clan/poo"; version = "unstable-2020-10-17"; git-version = "0.0-35-g44d490d"; - gerbil-package = "clan/poo"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; buildInputs = []; gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-POO"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-poo"; rev = "44d490d95b9d1b5d54eaedf2602419af8e086837"; diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index f51076fd5d4d..b628c6a48f34 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -1,54 +1,112 @@ -{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }: -# See ../gambit/build.nix regarding gccStdenv +{ pkgs, lib, callPackage, ... }: -rec { - # Gerbil libraries - gerbilPackages-unstable = { - gerbil-libp2p = callPackage ./gerbil-libp2p.nix { }; - gerbil-utils = callPackage ./gerbil-utils.nix { }; - gerbil-crypto = callPackage ./gerbil-crypto.nix { }; - gerbil-poo = callPackage ./gerbil-poo.nix { }; - gerbil-persist = callPackage ./gerbil-persist.nix { }; - gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; - smug-gerbil = callPackage ./smug-gerbil.nix { }; + with pkgs.gerbil-support; { + + prePackages-unstable = + let pks = [ ./gerbil-libp2p.nix ./smug-gerbil.nix + ./gerbil-utils.nix ./gerbil-crypto.nix ./gerbil-poo.nix + ./gerbil-persist.nix ./gerbil-ethereum.nix ]; + call = pkg: callPackage pkg prePackage-defaults; + pkgName = pkg: lib.removeSuffix ".nix" (baseNameOf pkg); + f = pkg: { name = pkgName pkg; value = call pkg; }; in + builtins.listToAttrs (map f pks); + + prePackage-defaults = { + gerbil = pkgs.gerbil-unstable; + gambit-params = pkgs.gambit-support.unstable-params; + gerbilPackages = gerbilPackages-unstable; + git-version = ""; + version-path = ""; + gerbilInputs = []; + nativeBuildInputs = []; + buildInputs = []; + buildScript = "./build.ss"; + postInstall = ""; + softwareName = ""; }; + gerbilPackages-unstable = + builtins.mapAttrs (_: gerbilPackage) prePackages-unstable; + + resolve-pre-src = pre-src: pre-src.fun (removeAttrs pre-src ["fun"]); + + gerbilVersionFromGit = pkg: + let version-path = "${pkg.passthru.pre-pkg.version-path}.ss"; in + if builtins.pathExists version-path then + let m = + builtins.match "\\(import :clan/versioning.*\\)\n\\(register-software \"([-_.A-Za-z0-9]+)\" \"([-_.A-Za-z0-9]+)\"\\) ;; ([-0-9]+)\n" + (builtins.readFile version-path); in + { version = builtins.elemAt m 2; git-version = builtins.elemAt m 1; } + else { version = "0.0"; + git-version = let gitpath = "${toString pkg.src}/.git"; in + if builtins.pathExists gitpath then lib.commitIdFromGitRepo gitpath else "0"; }; + + gerbilSkippableFiles = [".git" ".build" ".build_outputs" "run" "result" "dep" "BLAH" + "version.ss" "tmp.nix"]; + + gerbilSourceFilter = path: type: + let baseName = baseNameOf path; in + ! (builtins.elem baseName gerbilSkippableFiles || lib.hasSuffix "~" baseName); + + gerbilFilterSource = builtins.filterSource gerbilSourceFilter; + # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. gerbilLoadPath = - gerbilInputs : builtins.concatStringsSep ":" (map (x : x + "/gerbil/lib") gerbilInputs); + gerbilInputs: builtins.concatStringsSep ":" (map (x: x + "/gerbil/lib") gerbilInputs); + + path-src = path: { fun = _: path; }; + + view = lib.debug.traceSeqN 4; + + sha256-of-pre-src = pre-src: if pre-src ? sha256 then pre-src.sha256 else "none"; + + overrideSrcIfShaDiff = name: new-pre-src: super: + let old-sha256 = sha256-of-pre-src super.${name}.pre-src; + new-sha256 = sha256-of-pre-src new-pre-src; in + if old-sha256 == new-sha256 then {} else + view "Overriding ${name} old-sha256: ${old-sha256} new-sha256: ${new-sha256}" + { ${name} = super.${name} // { + pre-src = new-pre-src; + version = "override"; + git-version = if new-pre-src ? rev then lib.substring 0 7 new-pre-src.rev else "unknown";};}; + + pkgsOverrideGerbilPackageSrc = name: pre-src: pkgs: super: { + gerbil-support = (super-support: + { prePackages-unstable = + (super-ppu: super-ppu // (overrideSrcIfShaDiff name pre-src super-ppu)) + super-support.prePackages-unstable;}) super.gerbil-support;}; # Use this function to create a Gerbil library. See gerbil-utils as an example. - gerbilPackage = { - pname, version, src, meta, gerbil-package, - git-version ? "", version-path ? "", - gerbil ? pkgs.gerbil-unstable, - gambit-params ? pkgs.gambit-support.stable-params, - gerbilInputs ? [], - nativeBuildInputs ? [], - buildInputs ? [], - buildScript ? "./build.ss", - softwareName ? ""} : - let buildInputs_ = buildInputs; in - gccStdenv.mkDerivation rec { - inherit src meta pname version nativeBuildInputs; - passthru = { inherit gerbil-package version-path ;}; + gerbilPackage = prePackage: + let pre-pkg = prePackage-defaults // prePackage; + inherit (pre-pkg) pname version pre-src git-version meta + softwareName gerbil-package version-path gerbil gambit-params + gerbilInputs nativeBuildInputs buildInputs buildScript postInstall; + buildInputs_ = buildInputs; in + pkgs.gccStdenv.mkDerivation rec { # See ../gambit/build.nix regarding why we use gccStdenv + inherit meta pname version nativeBuildInputs postInstall; + passthru = { + inherit pre-pkg; + }; + src = resolve-pre-src pre-src; buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; + postPatch = '' set -e ; - if [ -n "${version-path}.ss" ] ; then - echo -e '(import :clan/versioning${builtins.concatStringsSep "" - (map (x : lib.optionalString (x.passthru.version-path != "") - " :${x.passthru.gerbil-package}/${x.passthru.version-path}") + ${lib.optionalString (version-path != "") + ''echo -e '(import :clan/versioning${builtins.concatStringsSep "" + (map (x: let px = x.passthru.pre-pkg; in + lib.optionalString (px.version-path != "") + " :${px.gerbil-package}/${px.version-path}") gerbilInputs) - })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" - fi + })\n(register-software "${softwareName}" "v${git-version}")\n' > "${version-path}.ss"''} patchShebangs . ; ''; postConfigure = '' export GERBIL_BUILD_CORES=$NIX_BUILD_CORES export GERBIL_PATH=$PWD/.build - export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs} + export GERBIL_LOADPATH=${gerbilLoadPath (["$out"] ++ gerbilInputs)} ${pkgs.gambit-support.export-gambopt gambit-params} ''; @@ -60,18 +118,36 @@ rec { installPhase = '' runHook preInstall - mkdir -p $out/gerbil/lib - cp -fa .build/lib $out/gerbil/ - bins=(.build/bin/*) - if [ 0 -lt ''${#bins} ] ; then - cp -fa .build/bin $out/gerbil/ - mkdir $out/bin - cd $out/bin - ln -s ../gerbil/bin/* . + mkdir -p $out/gerbil + cp -fa .build/* $out/gerbil/ + if [[ -d $out/gerbil/bin ]] ; then + ( cd $out/gerbil + bins=$(find ../gerbil/bin -type f) + if [[ -n $bins ]] ; then + ( mkdir -p ../bin + cd .. + ln -s $bins bin + ) + fi + ) fi runHook postInstall ''; dontFixup = true; + + checkPhase = '' + runHook preCheck + if [[ -f unit-tests.ss ]] ; then + export GERBIL_APPLICATION_HOME=$PWD + ./unit-tests.ss version + ./unit-tests.ss + else + echo "No gerbil-utils style unit-tests.ss detected for ${pname} ${version}."; + fi + runHook postCheck + ''; + + doCheck = true; }; } diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 6d89e1181f2d..9a31b6a96c74 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { +{ pname = "gerbil-utils"; version = "unstable-2020-10-18"; git-version = "0.2-36-g8b481b7"; @@ -9,7 +8,8 @@ gerbil-support.gerbilPackage { gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-utils"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-utils"; rev = "8b481b787e13e07e14d0718d670aab016131a090"; diff --git a/pkgs/development/compilers/gerbil/smug-gerbil.nix b/pkgs/development/compilers/gerbil/smug-gerbil.nix index 732cdb500b9b..1b6923451e68 100644 --- a/pkgs/development/compilers/gerbil/smug-gerbil.nix +++ b/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -1,6 +1,5 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: - -gerbil-support.gerbilPackage { +{ pname = "smug-gerbil"; version = "unstable-2019-12-24"; git-version = "95d60d4"; @@ -11,7 +10,8 @@ gerbil-support.gerbilPackage { gambit-params = gambit-support.unstable-params; version-path = ""; #"version"; softwareName = "Smug-Gerbil"; - src = fetchFromGitHub { + pre-src = { + fun = fetchFromGitHub; owner = "drewc"; repo = "smug-gerbil"; rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5"; From 8f7ef197798ca7cb1758fd153dfd49c2c321cb20 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 25 Jan 2022 11:14:37 -0500 Subject: [PATCH 12/61] gerbil: 0.16 -> 0.17 --- pkgs/development/compilers/gerbil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 3367ae581b2e..eeafde520de9 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub }: callPackage ./build.nix rec { - version = "0.16"; + version = "0.17"; git-version = version; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "v${version}"; - sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f"; + sha256 = "0xzi9mhrmzcajhlz5qcnz4yjlljvbkbm9426iifgjn47ac0965zw"; }; } From a59d0f777d271be0db00a30eed52dc5cd5b075df Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 14 Jan 2021 12:17:36 -0500 Subject: [PATCH 13/61] gerbil-unstable: 2020-11-05 -> 2023-08-07 --- pkgs/development/compilers/gerbil/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index d4ff3ca7a98a..4da9fcd16aaf 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-11-05"; - git-version = "0.16-152-g808929ae"; + version = "unstable-2023-08-07"; + git-version = "0.17.0-187-gba545b77"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "808929aeb8823959191f35df53bc0c0150911b4b"; - sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw"; + rev = "ba545b77e8e85118089232e3cd263856e414b24b"; + sha256 = "1f4v1qawx2i8333kshj4pbj5r21z0868pwrr3r710n6ng3pd9gqn"; }; inherit gambit-support; gambit = gambit-unstable; From 94518a101f080c851c20ba0f0b757484e36e572d Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 24 Nov 2020 09:15:16 -0500 Subject: [PATCH 14/61] gerbilPackages-unstable.gerbil-utils: 2020-10-18 -> 2023-07-22 --- .../compilers/gerbil/gerbil-utils.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 9a31b6a96c74..4e7042fe4f3c 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -1,25 +1,26 @@ -{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: +{ lib, fetchFromGitHub, ... }: + { pname = "gerbil-utils"; - version = "unstable-2020-10-18"; - git-version = "0.2-36-g8b481b7"; - gerbil-package = "clan"; - gerbil = gerbil-unstable; - gambit-params = gambit-support.unstable-params; - version-path = "version"; + version = "unstable-2023-07-22"; + git-version = "0.2-198-g2fb01ce"; softwareName = "Gerbil-utils"; + gerbil-package = "clan"; + version-path = "version"; + pre-src = { fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-utils"; - rev = "8b481b787e13e07e14d0718d670aab016131a090"; - sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m"; + rev = "2fb01ce0b302f232f5c4daf4987457b6357d609d"; + sha256 = "127q98gk1x6y1nlkkpnbnkz989ybpszy7aiy43hzai2q6xn4nv72"; }; - meta = { + + meta = with lib; { description = "Gerbil Clan: Community curated Collection of Common Utilities"; homepage = "https://github.com/fare/gerbil-utils"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fare ]; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; }; } From 9dac3760b151d09e5f18e3727b3812048e29d854 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 24 Nov 2020 09:17:04 -0500 Subject: [PATCH 15/61] gerbilPackages-unstable.gerbil-poo: 2020-10-17 -> 2023-04-28 --- .../compilers/gerbil/gerbil-poo.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix index fd9878015509..20c790c7ba87 100644 --- a/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -1,27 +1,28 @@ -{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: +{ lib, fetchFromGitHub, gerbilPackages, ... }: + { pname = "gerbil-poo"; - gerbil-package = "clan/poo"; - version = "unstable-2020-10-17"; - git-version = "0.0-35-g44d490d"; - gerbil = gerbil-unstable; - gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; - buildInputs = []; - gambit-params = gambit-support.unstable-params; - version-path = "version"; + version = "unstable-2023-04-28"; + git-version = "0.0-106-g418b582"; softwareName = "Gerbil-POO"; + gerbil-package = "clan/poo"; + version-path = "version"; + + gerbilInputs = with gerbilPackages; [ gerbil-utils ]; + pre-src = { fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-poo"; - rev = "44d490d95b9d1b5d54eaedf2602419af8e086837"; - sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k"; + rev = "418b582ae72e1494cf3a5f334d31d4f6503578f5"; + sha256 = "0qdzs7l6hp45dji5bc3879k4c8k9x6cj4qxz68cskjhn8wrc5lr8"; }; - meta = { + + meta = with lib; { description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; homepage = "https://github.com/fare/gerbil-poo"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fare ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; }; } From 2f8b602ea5101082bb1710e6b5262a740c278219 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 24 Nov 2020 09:18:20 -0500 Subject: [PATCH 16/61] gerbilPackages-unstable.gerbil-crypto: 2020-08-01 -> 2023-03-27 --- .../compilers/gerbil/gerbil-crypto.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index ff211cc610dc..3d53c4da879e 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -1,28 +1,29 @@ -{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: +{ pkgs, lib, fetchFromGitHub, gerbilPackages, ... }: + { pname = "gerbil-crypto"; - version = "unstable-2020-08-01"; - git-version = "0.0-6-ga228862"; + version = "unstable-2023-03-27"; + git-version = "0.0-18-ge57f887"; gerbil-package = "clan/crypto"; - gerbil = gerbil-unstable; - gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils]; + gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ]; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [pkgs.secp256k1 ]; - gambit-params = gambit-support.unstable-params; + buildInputs = [ pkgs.secp256k1 ]; version-path = "version"; softwareName = "Gerbil-crypto"; + pre-src = { fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-crypto"; - rev = "a22886260849ec92c3a34bfeedc1574e41e49e33"; - sha256 = "0qbanw2vnw2ymmr4pr1jap29cyc3icbhyq0apibpfnj2znns7w47"; + rev = "e57f88742d9b41640b4a7d9bd3e86c688d4a83f9"; + sha256 = "08hrk3s82hbigvza75vgx9kc7qf64yhhn3xm5calc859sy6ai4ka"; }; - meta = { + + meta = with lib; { description = "Gerbil Crypto: Extra Cryptographic Primitives for Gerbil"; homepage = "https://github.com/fare/gerbil-crypto"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fare ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; }; } From c83f11c3fa79b677c5cbd3fe1d435234c533c882 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 24 Nov 2020 09:17:33 -0500 Subject: [PATCH 17/61] gerbilPackages-unstable.gerbil-persist: 2020-08-31 -> 2023-03-02 --- .../compilers/gerbil/gerbil-persist.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix index b9d19dc3711d..3912d2e8f7f5 100644 --- a/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -1,27 +1,27 @@ -{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: +{ lib, fetchFromGitHub, gerbilPackages, ... }: { pname = "gerbil-persist"; - version = "unstable-2020-08-31"; - git-version = "0.0-8-gd211390"; - gerbil-package = "clan/persist"; - gerbil = gerbil-unstable; - gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; - buildInputs = []; - gambit-params = gambit-support.unstable-params; - version-path = "version"; + version = "unstable-2023-03-02"; + git-version = "0.1.0-24-ge2305f5"; softwareName = "Gerbil-persist"; + gerbil-package = "clan/persist"; + version-path = "version"; + + gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-crypto gerbil-poo ]; + pre-src = { fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-persist"; - rev = "d211390c8a199cf2b8c7400cd98977524e960015"; - sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7"; + rev = "e2305f53571e55292179286ca2d88e046ec6638b"; + sha256 = "1vsi4rfzpqg4hhn53d2r26iw715vzwz0hiai9r34z4diwzqixfgn"; }; - meta = { + + meta = with lib; { description = "Gerbil Persist: Persistent data and activities"; homepage = "https://github.com/fare/gerbil-persist"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fare ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; }; } From c3c550ddaf29b87815314ba9e1ef51bb37b128f1 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 24 Nov 2020 09:18:56 -0500 Subject: [PATCH 18/61] gerbilPackages-unstable.gerbil-ethereum: 2020-10-18 -> 2023-05-30 --- .../compilers/gerbil/gerbil-ethereum.nix | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 231162ede913..d2d95284f09d 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -1,28 +1,49 @@ -{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: -{ +{ lib, fetchFromGitHub, gerbilPackages, gerbil-support, gerbil, ... }: + +rec { pname = "gerbil-ethereum"; - version = "unstable-2020-10-18"; - git-version = "0.0-26-gf27ada8"; - gerbil-package = "mukn/ethereum"; - gerbil = gerbil-unstable; - gerbilInputs = with gerbil-support.gerbilPackages-unstable; - [gerbil-utils gerbil-crypto gerbil-poo gerbil-persist]; - buildInputs = []; - gambit-params = gambit-support.unstable-params; - version-path = "version"; + version = "unstable-2023-05-30"; + git-version = "0.0-375-g989a5ca"; softwareName = "Gerbil-ethereum"; + gerbil-package = "mukn/ethereum"; + version-path = "version"; + + gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-crypto gerbil-poo gerbil-persist ]; + pre-src = { fun = fetchFromGitHub; owner = "fare"; repo = "gerbil-ethereum"; - rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7"; - sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd"; + rev = "989a5ca78958e42c4a1ec242786ade89f1887e48"; + sha256 = "0bs2knhx3hy3k72yidgaplwjd48y86arqscdik8hgxwmhm9z8kwp"; }; - meta = { + + postInstall = '' + cp scripts/{croesus.prv,genesis.json,logback.xml,yolo-evm.conf,yolo-kevm.conf,run-ethereum-test-net.ss} $out/gerbil/lib/mukn/ethereum/scripts/ + mkdir -p $out/bin + cat > $out/bin/run-ethereum-test-net < Date: Wed, 25 Nov 2020 11:53:39 -0500 Subject: [PATCH 19/61] gerbilPackages-unstable.gerbil-libp2p: 2018-12-27 -> 2022-02-03 --- .../compilers/gerbil/gerbil-libp2p.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix index 78ca2a113a81..17fab159c6d5 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -1,27 +1,27 @@ -{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: +{ lib, fetchFromGitHub, ... }: + { pname = "gerbil-libp2p"; - version = "unstable-2018-12-27"; - git-version = "2376b3f"; - gerbil-package = "vyzo"; - gerbil = gerbil-unstable; - gerbilInputs = []; - buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon - gambit-params = gambit-support.unstable-params; - version-path = "version"; + version = "unstable-2022-02-03"; + git-version = "15b3246"; softwareName = "Gerbil-libp2p"; + gerbil-package = "vyzo"; + + buildInputs = []; # Note: at *runtime*, this depends on go-libp2p-daemon running + pre-src = { fun = fetchFromGitHub; owner = "vyzo"; repo = "gerbil-libp2p"; - rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88"; - sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw"; + rev = "15b32462e683d89ffce0ff15ad373d293ea0ee5d"; + sha256 = "059lydp7d6pjgrd4pdnqq2zffzlba62ch102f01rgzf9aps3c8lz"; }; - meta = { + + meta = with lib; { description = "Gerbil libp2p: use libp2p from Gerbil"; homepage = "https://github.com/vyzo/gerbil-libp2p"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fare ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; }; } From f4320c3dbb5fafa46bb1c28a916e44dae91ab6f9 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 15 Dec 2020 12:31:47 -0500 Subject: [PATCH 20/61] gerbilPackages-unstable.smug-gerbil: 2019-12-24 -> 2020-12-12 --- .../compilers/gerbil/smug-gerbil.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/gerbil/smug-gerbil.nix b/pkgs/development/compilers/gerbil/smug-gerbil.nix index 1b6923451e68..518ec0238f6b 100644 --- a/pkgs/development/compilers/gerbil/smug-gerbil.nix +++ b/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -1,30 +1,25 @@ -{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: +{ lib, fetchFromGitHub, ... }: + { pname = "smug-gerbil"; - version = "unstable-2019-12-24"; - git-version = "95d60d4"; - gerbil-package = "drewc/smug"; - gerbil = gerbil-unstable; - gerbilInputs = []; - buildInputs = []; - gambit-params = gambit-support.unstable-params; - version-path = ""; #"version"; + version = "unstable-2020-12-12"; + git-version = "0.4.20"; softwareName = "Smug-Gerbil"; + gerbil-package = "drewc/smug"; + pre-src = { fun = fetchFromGitHub; owner = "drewc"; repo = "smug-gerbil"; - rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5"; - sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j"; + rev = "cf23a47d0891aa9e697719309d04dd25dd1d840b"; + sha256 = "13fdijd71m3fzp9fw9xp6ddgr38q1ly6wnr53salp725w6i4wqid"; }; - meta = { + + meta = with lib; { description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme"; homepage = "https://github.com/drewc/smug-gerbil"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fare ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; }; - buildScript = '' - for i in primitive simple tokens smug ; do gxc -O $i.ss ; done - ''; } From b48d46d67a3cad5193a5e192a6167570a584ba68 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 19 Jun 2023 18:29:35 +0800 Subject: [PATCH 21/61] ima-evm-utils: fix cross compilation, set strictDeps --- .../linux/ima-evm-utils/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 23a58ae65e0c..14e2e71b8338 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: +{ lib +, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, openssl +, keyutils +, asciidoc +, libxslt +, docbook_xsl +}: stdenv.mkDerivation rec { pname = "ima-evm-utils"; @@ -10,10 +20,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-WPBG7v29JHZ+ZGeLgA2gtLzZmaG0Xdvpq+BZ6NriY+A="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ openssl attr keyutils asciidoc libxslt ]; + strictDeps = true; - MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; + nativeBuildInputs = [ + autoreconfHook + pkg-config + asciidoc + libxslt + ]; + + buildInputs = [ + openssl + keyutils + ]; + + env.MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; From a869e5027ec9dd86c22874944da1153542cef2b2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 8 Aug 2023 09:49:26 +0800 Subject: [PATCH 22/61] ima-evm-utils: add nickcao to maintainers --- pkgs/os-specific/linux/ima-evm-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 14e2e71b8338..34889783034c 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/linux-ima/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 100fc2ccb207cef41e8c7a53a406e76f90f65af5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Aug 2023 02:48:16 +0000 Subject: [PATCH 23/61] rust-analyzer-unwrapped: 2023-07-17 -> 2023-08-07 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 970835479473..4ff4b7dbd65e 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-07-17"; - cargoSha256 = "sha256-Xi2SG+mMwFvgO0tRdC5RPYhAxN7+Aw9woRVqDA+S4Ts="; + version = "2023-08-07"; + cargoSha256 = "sha256-lvKfGy6tdrQRSaTLux7ynQMfCuiwHjJzJQ5EfppqaF4="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-TcSjq91OCaJ7L3paN9XYsgOw990ZtDveI3fT/YW9nD8="; + sha256 = "sha256-npJ8zOZ/CQoZu+0kN5NU9iC5JbmbsucyK1DayPmHWPs="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From 378b64a949473edea6a64c7601ff43d2890e69c9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 8 Aug 2023 10:37:31 +0800 Subject: [PATCH 24/61] tempo: 2.1.1 -> 2.2.0 --- pkgs/servers/tracing/tempo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 95ed1bf753ad..eb35a2ccb2dd 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "tempo"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gnQAldqfxJk8kbXAyX1VQXddCnSBWnvc3wesYoYI7wI="; + hash = "sha256-+qBfscfAtVr8SEqAkpjkJfWfGfEImvO7BQfKvpVvf/0="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/tempo-cli" From 9af90ea26f9313ed820f79f89d09590fa82b1a0e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Aug 2023 04:20:00 +0000 Subject: [PATCH 25/61] flexget: 3.8.0 -> 3.8.2 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.8.0...v3.8.2 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.8.2 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index dabb9743794f..8a5843d2bbec 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.8.0"; + version = "3.8.2"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-sAA01/Hs8yGFJM+ttwhonrBqTpGsEoWrYDU8w/YmE6A="; + hash = "sha256-IdjNk1GyJcNwHqm/ZYdHRh6a/XAD5p41Vu8JdPuCglE="; }; postPatch = '' From ed85ad70c8f0d87de1e19ecdb6924784ca363ef0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Aug 2023 04:20:00 +0000 Subject: [PATCH 26/61] esbuild: 0.18.20 -> 0.19.0 Diff: https://github.com/evanw/esbuild/compare/v0.18.20...v0.19.0 Changelog: https://github.com/evanw/esbuild/blob/v0.19.0/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 8912bb985436..d5e633bfd16d 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.20"; + version = "0.19.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; + hash = "sha256-DSuBON5EXQlAEqiCitAtDxOcdGNu0ubisIbuWmAfElw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 1c3d9b093bde93d81c4f713519f3bda29bcef6f6 Mon Sep 17 00:00:00 2001 From: Anatolii Popov Date: Tue, 8 Aug 2023 11:55:11 +0300 Subject: [PATCH 27/61] jetbrains-toolbox: 1.28.1.15219 -> 2.0.0.16559 --- pkgs/applications/misc/jetbrains-toolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index 3358b765208f..24e943268a72 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "1.28.1.15219"; + version = "2.0.0.16559"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-4P73MC5Go8wLACBtjh1y3Ao0czE/3hsSI4728mNjKxA="; + sha256 = "sha256-z+udyilfVwcVnaFhp6GYHCXqh1d7T5fj/TbbjMoen2I="; stripRoot = false; }; From d20c120b7aaed8ae112ef869ee5de7e47ae57e71 Mon Sep 17 00:00:00 2001 From: Jeroen Jetten Date: Tue, 8 Aug 2023 14:29:28 +0200 Subject: [PATCH 28/61] zbctl: 8.0.6 -> 8.2.11 --- pkgs/tools/admin/zbctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/zbctl/default.nix b/pkgs/tools/admin/zbctl/default.nix index fb4c76f6a47c..bfdd5fedc8be 100644 --- a/pkgs/tools/admin/zbctl/default.nix +++ b/pkgs/tools/admin/zbctl/default.nix @@ -5,14 +5,14 @@ stdenvNoCC.mkDerivation rec { pname = "zbctl"; - version = "8.0.6"; + version = "8.2.11"; src = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl.darwin"; - sha256 = "17hfjrcr6lmw91jq24nbw5yz61x6larmx39lyfj6pwlz0710y13p"; + sha256 = "0390n6wmlmfwqf6fvw6wqg6hbrs7bm9x2cdaajlw87377lklypkf"; } else if stdenvNoCC.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl"; - sha256 = "1xng11x7wcjvc0vipdrqyn97aa4jlgcp7g9aw4d36fw0xp9p47kp"; + sha256 = "081hc0nynwg014lhsxxyin4rc2i9z6wh8q9i98cjjd8kgr41h096"; } else throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}"; dontUnpack = true; From 7ead5ac4765fca3086d5ce2a3235290b6b4de734 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Tue, 8 Aug 2023 13:55:01 +0100 Subject: [PATCH 29/61] pgcat: 1.1.0 -> 1.1.1 --- pkgs/servers/sql/pgcat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/pgcat/default.nix b/pkgs/servers/sql/pgcat/default.nix index 72c3155861bb..0cf05d290252 100644 --- a/pkgs/servers/sql/pgcat/default.nix +++ b/pkgs/servers/sql/pgcat/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "pgcat"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "postgresml"; repo = "pgcat"; rev = "v${version}"; - hash = "sha256-ESHBOh9JSzu6Zxh0z/+nebumi/zyFVdTK0DIwR/46Xo="; + hash = "sha256-BERxdGgPk8POnhLsyy4lKV4LCoHsJTmv2OhAOz6CKKc="; }; - cargoHash = "sha256-2wZADXEi8bfNgSQuL7yAmDYd/a0LOssdPFa/kvSSLFU="; + cargoHash = "sha256-GwcqR8pEvz42NEmcuXpcoPdChzRBYsDEnllX62T8ulQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [mit]; platforms = platforms.unix; maintainers = with maintainers; [cathalmullan]; + mainProgram = "pgcat"; }; } From 92e9243c9ccffc3babeec3f5e18a23e59786bad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Aug 2023 14:03:41 +0000 Subject: [PATCH 30/61] riffdiff: 2.23.3 -> 2.23.4 --- pkgs/tools/text/riffdiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index 7511f69c70c8..d61f2a994243 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "2.23.3"; + version = "2.23.4"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-5C2Q9moFo39zeLK0PkY6S74I/MI8TVpD3tRAaX4TMT4="; + hash = "sha256-NyVtGj4ZE/DdGWKt+v4LXAhf7ZK+JHjmLnViPypgmA4="; }; - cargoHash = "sha256-xHdlU9YXvEvfspDntLLgWr/knAfjMmiWK9JCV9wtIIE="; + cargoHash = "sha256-qsUFt+w9CEZdqzjf0EiB/Kkx2evHwOycrE8MYdrCHuo="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; From ca7dc7deaa053d097afbf5527704dd5160e6c778 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 8 Aug 2023 11:44:28 -0400 Subject: [PATCH 31/61] kbt: 1.2.1 -> 1.2.2 Diff: https://github.com/bloznelis/kbt/compare/1.2.1...1.2.2 --- pkgs/applications/misc/kbt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index 62c70b5630bd..80070e9c8d8e 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kbt"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "bloznelis"; repo = "kbt"; rev = version; - hash = "sha256-IVKGpifLcpqPD4ZYP+1mY0EokNoQW6qSbxt66w6b81w="; + hash = "sha256-v0xbW1xlOhaLf19a6gFpd16RjYfXIK6FDBSWVWPlK3c="; }; - cargoHash = "sha256-iPsBYccLQdPvzaV7pRa3ZLFFwJ1lIJoFMWChLkQpyyk="; + cargoHash = "sha256-rBThJqaemtPAHqiWDILJZ7j+NL5+6+4tsXrFPcEiFL0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config From f2325ea37f2e302a821177685ed4d1765e63762b Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 24 Jul 2023 00:03:38 -0700 Subject: [PATCH 32/61] python311Packages.hologram: pull patch to fix tests The tests were failing due to dataclass changes in Python 3.11. --- .../python-modules/hologram/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index aeec391e1cb3..005834fc99b8 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast +, fetchpatch , jsonschema , pytestCheckHook , python-dateutil , setuptools +, wheel }: buildPythonPackage rec { @@ -13,9 +14,6 @@ buildPythonPackage rec { version = "0.0.16"; format = "pyproject"; - # ValueError: mutable default for field a is not allowed: use default_factory - disabled = pythonAtLeast "3.11"; - src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; @@ -23,8 +21,18 @@ buildPythonPackage rec { hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc="; }; + patches = [ + # https://github.com/dbt-labs/hologram/pull/58 + (fetchpatch { + name = "python3.11-test-compatibility.patch"; + url = "https://github.com/dbt-labs/hologram/commit/84bbe862ef6a2fcc8b8ce85b5c9a006cc7dc1f66.patch"; + hash = "sha256-t096jJDoKUPED4QHSfVjUMLtUJjWcqjblCtGR8moEJc="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ From 80c9988db800e723c63aba7b73e316f3c89fb96a Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 8 Aug 2023 11:47:16 -0400 Subject: [PATCH 33/61] gtree: 1.9.4 -> 1.9.5 Diff: https://github.com/ddddddO/gtree/compare/v1.9.4...v1.9.5 Changelog: https://github.com/ddddddO/gtree/releases/tag/v1.9.5 --- pkgs/tools/text/gtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 11571a8e8c8c..db51febfdc4d 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-uTU8HKDNvoLGan5OtZxujtEJvAzEhi0L/Z2AgdrDAfU="; + hash = "sha256-qbAus0RgocbkC9eOmoiAOoyZw58LPDZlJgoRA/SzhQI="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; From 7bd783b71619afc981a393d3e4152da1abc7a760 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 8 Aug 2023 12:01:36 -0400 Subject: [PATCH 34/61] codemov: unstable-2023-05-28 -> unstable-2023-08-08 Diff: https://github.com/sloganking/codemov/compare/ab4b287c5cdb64f8a1f378c54070fde5a1f3be5b...8a4d6e50c21010866ca06f845f30c2aa54c09854 --- pkgs/tools/misc/codemov/Cargo.lock | 1641 --------------------------- pkgs/tools/misc/codemov/default.nix | 14 +- 2 files changed, 4 insertions(+), 1651 deletions(-) delete mode 100644 pkgs/tools/misc/codemov/Cargo.lock diff --git a/pkgs/tools/misc/codemov/Cargo.lock b/pkgs/tools/misc/codemov/Cargo.lock deleted file mode 100644 index a78c7abb7bdf..000000000000 --- a/pkgs/tools/misc/codemov/Cargo.lock +++ /dev/null @@ -1,1641 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bstr" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" -dependencies = [ - "memchr", - "once_cell", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytesize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "codemov" -version = "0.1.0" -dependencies = [ - "clap", - "codevis", - "glob", - "image", - "open 4.1.0", - "prodash", - "syntect", -] - -[[package]] -name = "codevis" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daaaadded55f3c0171c36b0bbfec52dc012afc18018d9515ad836ef5f8b14d99" -dependencies = [ - "anyhow", - "bstr", - "bytesize", - "clap", - "flume", - "ignore", - "image", - "memmap2", - "num_cpus", - "open 3.2.0", - "prodash", - "signal-hook", - "syntect", - "unifont-bitmap", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - -[[package]] -name = "crosstermion" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99aabd9b02c2d5f72697f30ffb46f5a9ff4bd240d826049892cf62c31daeed04" -dependencies = [ - "ansi_term", - "crossterm", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "dashmap" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "exr" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.6.2", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" - -[[package]] -name = "onig" -version = "6.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" -dependencies = [ - "bitflags", - "libc", - "once_cell", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "open" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] - -[[package]] -name = "open" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16814a067484415fda653868c9be0ac5f2abd2ef5d951082a5f2fe1b3662944" -dependencies = [ - "is-wsl", - "pathdiff", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plist" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" -dependencies = [ - "base64", - "indexmap", - "line-wrap", - "quick-xml", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ - "bitflags", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "proc-macro2" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prodash" -version = "20.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd4e8b029f29b4eb8f95315957fb7ac8a8fd1924405fadf885b0e208fe34ba39" -dependencies = [ - "atty", - "bytesize", - "crosstermion", - "dashmap", - "humantime", - "log", - "parking_lot 0.11.2", - "signal-hook", - "unicode-width", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" -dependencies = [ - "aho-corasick 1.0.1", - "memchr", - "regex-syntax 0.7.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syntect" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8" -dependencies = [ - "bincode", - "bitflags", - "flate2", - "fnv", - "lazy_static", - "once_cell", - "onig", - "plist", - "regex-syntax 0.6.29", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -dependencies = [ - "time-core", -] - -[[package]] -name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unifont-bitmap" -version = "1.0.0+unifont-14.0.01" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836143529d8e332f71df6f8f42e311af5453d368828336c4711f798d4cd9469d" -dependencies = [ - "byteorder", - "flate2", - "once_cell", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/pkgs/tools/misc/codemov/default.nix b/pkgs/tools/misc/codemov/default.nix index dc3d708e30db..fe248c24edcd 100644 --- a/pkgs/tools/misc/codemov/default.nix +++ b/pkgs/tools/misc/codemov/default.nix @@ -10,22 +10,16 @@ rustPlatform.buildRustPackage { pname = "codemov"; - version = "unstable-2023-05-28"; + version = "unstable-2023-08-08"; src = fetchFromGitHub { owner = "sloganking"; repo = "codemov"; - rev = "ab4b287c5cdb64f8a1f378c54070fde5a1f3be5b"; - hash = "sha256-miW/s3Ox2Z5qyFZqAp/FqHhc5jC6s+4DzxlHQhzCc2w="; + rev = "8a4d6e50c21010866ca06f845f30c2aa54c09854"; + hash = "sha256-nOqh8kXS5mx0AM4NvIcwvC0lAZRHsQwrxI0c+9PeroU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-cyzoMD97ofrbm3BDAtl8pSezcM4B2TVbW9V5J6xRVLc="; nativeBuildInputs = [ makeBinaryWrapper From 18e60b8a14b2689c346ecbed39c85075f390783c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:39:10 -0700 Subject: [PATCH 35/61] python3.pkgs.watchfiles: fix sandbox darwin build --- pkgs/development/python-modules/watchfiles/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index b644571b9e3f..3f75354376dd 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { anyio ]; + # Tests need these permissions in order to use the FSEvents API on macOS. + sandboxProfile = '' + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + nativeCheckInputs = [ dirty-equals pytest-mock From 5e0bc2408d53b178ea12f0234eb29c6de88a025b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Aug 2023 17:14:12 +0000 Subject: [PATCH 36/61] python310Packages.vertica-python: 1.3.2 -> 1.3.4 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 047b37a53386..1787063f2aea 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.2"; + version = "1.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NmTwYQwWzV1ga4u+XApQNZsel52Tg8B5Z7vUnUmQoC8="; + hash = "sha256-2TyJs0GdYTZWJR66IV6XuBR4b3aRi9KhFy/4ji1c6NU="; }; propagatedBuildInputs = [ From 9d9d06dd7b4b741a4e29a8f9b1cc4bf669a548e8 Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 8 Aug 2023 19:15:12 +0200 Subject: [PATCH 37/61] xcaddy: 0.3.4 -> 0.3.5 https://github.com/caddyserver/xcaddy/releases/tag/v0.3.5 https://github.com/caddyserver/xcaddy/compare/v0.3.4...v0.3.5 --- pkgs/servers/caddy/xcaddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index f22967d4fb37..35d95269db57 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.3.4"; + version = "0.3.5"; subPackages = [ "cmd/xcaddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-CJzh1/rX9JjIiSyBReCt/lxUBQnXxY8NjRnSSqna9p4="; + hash = "sha256-XxklyOaKFPyWFabodNCcV1NnaPWS0AQ2Sj89ZZ5hJbk="; }; patches = [ From 38d6a159d13f97199f1c961c123e8a703f95379c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 8 Aug 2023 14:13:08 -0400 Subject: [PATCH 38/61] python310Packages.ipycanvas: init at 0.13.1 --- .../python-modules/ipycanvas/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/ipycanvas/default.nix diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix new file mode 100644 index 000000000000..05fdb6e85882 --- /dev/null +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, jupyter-packaging +, ipywidgets +, numpy +, pillow +}: + +buildPythonPackage rec { + pname = "ipycanvas"; + version = "0.13.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+cOUBoG8ODgzkPjEbqXYRF1uEcbaZITDfYnfWuHawTE="; + }; + + nativeBuildInputs = [ jupyter-packaging ]; + + propagatedBuildInputs = [ ipywidgets numpy pillow ]; + + doCheck = false; # tests are in Typescript and require `npx` and `chromium` + pythonImportsCheck = [ "ipycanvas" ]; + + meta = with lib; { + description = "Expose the browser's Canvas API to IPython"; + homepage = "https://ipycanvas.readthedocs.io"; + changelog = "https://github.com/jupyter-widgets-contrib/ipycanvas/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50a9e9344fb7..5284b352ddee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5189,6 +5189,8 @@ self: super: with self; { ipy = callPackage ../development/python-modules/IPy { }; + ipycanvas = callPackage ../development/python-modules/ipycanvas { }; + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; ipynbname = callPackage ../development/python-modules/ipynbname { }; From 286fc6c5c1efc011015c4d440784277f85dbf092 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Wed, 9 Aug 2023 03:48:17 +0900 Subject: [PATCH 39/61] circt: 1.49.0 -> 1.50.0 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index e53de0e4ee12..87786a54fb84 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.49.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-pHMysxnczKilfjJafobU18/gaWnfrHMpPUd6RQ+CXSg="; + sha256 = "sha256-fZlJw+2kj8ZTt2Yb15yKD9koZPUfnalDchG29PgJTVs="; fetchSubmodules = true; }; From d676fab367b1653898d71aaa3573de14fbcd8e44 Mon Sep 17 00:00:00 2001 From: Alex Plotnick Date: Thu, 29 Jul 2021 14:55:27 -0600 Subject: [PATCH 40/61] gerbilPackages-unstable.ftw: init at 2022-01-14 --- pkgs/development/compilers/gerbil/ftw.nix | 27 +++++++++++++++++++ .../compilers/gerbil/gerbil-support.nix | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gerbil/ftw.nix diff --git a/pkgs/development/compilers/gerbil/ftw.nix b/pkgs/development/compilers/gerbil/ftw.nix new file mode 100644 index 000000000000..2f2c9956826d --- /dev/null +++ b/pkgs/development/compilers/gerbil/ftw.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, gerbilPackages, ... }: + +{ + pname = "ftw"; + version = "unstable-2022-01-14"; + git-version = "8ba16b3"; + softwareName = "FTW: For The Web!"; + gerbil-package = "drewc/ftw"; + + gerbilInputs = with gerbilPackages; [ gerbil-utils ]; + + pre-src = { + fun = fetchFromGitHub; + owner = "drewc"; + repo = "ftw"; + rev = "8ba16b3c1cdc2150df5af8ef3c92040ef8b563b9"; + sha256 = "153i6whm5jfcj9s1qpxz03sq67969lq11brssyjc3yv3wyb1b07h"; + }; + + meta = with lib; { + description = "Simple web handlers for Gerbil Scheme"; + homepage = "https://github.com/drewc/ftw"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index b628c6a48f34..e4b85fe5b54e 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -3,7 +3,7 @@ with pkgs.gerbil-support; { prePackages-unstable = - let pks = [ ./gerbil-libp2p.nix ./smug-gerbil.nix + let pks = [ ./gerbil-libp2p.nix ./smug-gerbil.nix ./ftw.nix ./gerbil-utils.nix ./gerbil-crypto.nix ./gerbil-poo.nix ./gerbil-persist.nix ./gerbil-ethereum.nix ]; call = pkg: callPackage pkg prePackage-defaults; From 0afac45561abdf6f4d3cd932f9016112a5af48c5 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Wed, 25 Nov 2020 02:30:06 -0500 Subject: [PATCH 41/61] glow-lang: init at 2023-04-26 Post Release v0.3.2 --- .../compilers/gerbil/gerbil-support.nix | 2 +- .../compilers/gerbil/glow-lang.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/gerbil/glow-lang.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index e4b85fe5b54e..3d57e2a73c52 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -5,7 +5,7 @@ prePackages-unstable = let pks = [ ./gerbil-libp2p.nix ./smug-gerbil.nix ./ftw.nix ./gerbil-utils.nix ./gerbil-crypto.nix ./gerbil-poo.nix - ./gerbil-persist.nix ./gerbil-ethereum.nix ]; + ./gerbil-persist.nix ./gerbil-ethereum.nix ./glow-lang.nix ]; call = pkg: callPackage pkg prePackage-defaults; pkgName = pkg: lib.removeSuffix ".nix" (baseNameOf pkg); f = pkg: { name = pkgName pkg; value = call pkg; }; in diff --git a/pkgs/development/compilers/gerbil/glow-lang.nix b/pkgs/development/compilers/gerbil/glow-lang.nix new file mode 100644 index 000000000000..c6e5aa10fa3a --- /dev/null +++ b/pkgs/development/compilers/gerbil/glow-lang.nix @@ -0,0 +1,55 @@ +{ lib, fetchFromGitHub, gerbil-support, gerbilPackages, gerbil, ... }: + +rec { + pname = "glow-lang"; + version = "unstable-2023-04-26"; + git-version = "0.3.2-222-gb19cd980"; + softwareName = "Glow"; + gerbil-package = "mukn/glow"; + version-path = "version"; + + gerbilInputs = with gerbilPackages; + [ gerbil-utils gerbil-crypto gerbil-poo gerbil-persist gerbil-ethereum + gerbil-libp2p smug-gerbil ftw ]; + + pre-src = { + fun = fetchFromGitHub; + owner = "Glow-Lang"; + repo = "glow"; + rev = "b19cd98082dfc5156d1b4fc83cde161572d6a211"; + sha256 = "0k3qy5826pxqr9ylnnpq4iikxf4j50987vhpa5qiv99j0p643xr3"; + }; + + postPatch = '' + substituteInPlace "runtime/glow-path.ss" --replace \ + '(def glow-install-path (source-path "dapps"))' \ + '(def glow-install-path "$out")' + ''; + + postInstall = '' + mkdir -p $out/bin $out/gerbil/lib/mukn/glow $out/share/glow/dapps + cp main.ss $out/gerbil/lib/mukn/glow/ + cp dapps/{buy_sig,coin_flip,rps_simple}.glow $out/share/glow/dapps/ + cat > $out/bin/glow < Date: Tue, 8 Aug 2023 15:28:06 -0400 Subject: [PATCH 42/61] ruff: 0.0.282 -> 0.0.283 Diff: https://github.com/astral-sh/ruff/compare/v0.0.282...v0.0.283 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.0.283 --- pkgs/development/tools/ruff/Cargo.lock | 6 +++--- pkgs/development/tools/ruff/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 622032c09a22..8707b07130d4 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -800,7 +800,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.282" +version = "0.0.283" dependencies = [ "anyhow", "clap", @@ -2042,7 +2042,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.282" +version = "0.0.283" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2141,7 +2141,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.282" +version = "0.0.283" dependencies = [ "annotate-snippets 0.9.1", "anyhow", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index b6f7f6243104..534fd89be252 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.282"; + version = "0.0.283"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-CQsgRTpZTBj07/9SYkrQXtb5FOguCtf5LCli65v20YA="; + hash = "sha256-WqvTn/NGyZq9cJ417KPOVEEshDITxs6XdhwZbCXPk2o="; }; cargoLock = { From c30d2cf3eeca2e0d11bee35313065843506728d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Aug 2023 23:20:01 +0000 Subject: [PATCH 43/61] python310Packages.meshtastic: 2.1.13 -> 2.2.0 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index e878d2f3ff59..9411838540b3 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.1.13"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-PUZedfKA+t8VdyvuJEuob6Dl7u4NagDRoLSHmsJ+1IE="; + hash = "sha256-6oxKaMFXZTrz7gZpSAtXI5Jit7z5NWQgUkd1yB3EtA8="; }; propagatedBuildInputs = [ From 8ed4a02a95469a8c5c5a57988a6e866098a12fe1 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Tue, 8 Aug 2023 17:30:10 -0700 Subject: [PATCH 44/61] saleae-logic-2: 2.4.7 -> 2.4.9 --- pkgs/development/tools/misc/saleae-logic-2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 565027f718cd..bd12125d83bd 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { - url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - hash = "sha256-dMt8XWLatLNothU9oTJqYrBGNZZs0L5dXRMKP9ZeM6E="; + url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; + hash = "sha256-zM5XztFv+A7cNMqNPGAO5i0B45w6AMyRL4OR+tG03JY="; }; desktopItem = makeDesktopItem { inherit name; @@ -25,7 +25,7 @@ appimageTools.wrapType2 { in '' mkdir -p $out/etc/udev/rules.d - cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + cp ${appimageContents}/resources/linux-x64/99-SaleaeLogic.rules $out/etc/udev/rules.d/ mkdir -p $out/share/pixmaps ln -s ${desktopItem}/share/applications $out/share/ cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png From 555eee0a00af96fc3d9fc2355f378942b462a407 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 8 Aug 2023 20:33:51 -0400 Subject: [PATCH 45/61] repgrep: 0.14.2 -> 0.14.3 Diff: https://github.com/acheronfail/repgrep/compare/0.14.2...0.14.3 Changelog: https://github.com/acheronfail/repgrep/blob/0.14.3/CHANGELOG.md --- pkgs/tools/text/repgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/repgrep/default.nix b/pkgs/tools/text/repgrep/default.nix index 5bce7d2f2b92..cefc0fba0349 100644 --- a/pkgs/tools/text/repgrep/default.nix +++ b/pkgs/tools/text/repgrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "repgrep"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "acheronfail"; repo = "repgrep"; rev = version; - hash = "sha256-sclBzv3F3M3oARRm0cNg/ABomzfgbDp0cFOXkRYjGEY="; + hash = "sha256-33b0dZJY/lnVJGMfAg/faD6PPJIFZsvMZOmKAqCZw8k="; }; - cargoHash = "sha256-o6pF32sNiDuCjsBaa5beZyFCv1PoqALZOhAb0GF0XyQ="; + cargoHash = "sha256-UMMTdWJ0/M8lN4abTJEVUGtoNp/g49DyW+OASg3TKfg="; nativeBuildInputs = [ asciidoctor From 2e62c223f0f29e33f04101698346a57076fd0f50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 00:37:27 +0000 Subject: [PATCH 46/61] python311Packages.empty-files: 0.0.4 -> 0.0.9 --- pkgs/development/python-modules/empty-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix index 3c875da847a4..1028b3f567c5 100644 --- a/pkgs/development/python-modules/empty-files/default.nix +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "empty-files"; - version = "0.0.4"; + version = "0.0.9"; src = fetchFromGitHub { owner = "approvals"; repo = "EmptyFiles.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-sXatMH2QEGxzDGszAoFXUoPzB00rYaQIasz93vsfyz8="; + hash = "sha256-P/woyAN9cYdxryX1iM36C53c9dL6lo4eoTzBWT2cd3A="; }; propagatedBuildInputs = [ From ad5631902f0428438cf96b53700831528dfb71f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 01:29:39 +0000 Subject: [PATCH 47/61] granted: 0.14.0 -> 0.14.2 --- pkgs/tools/admin/granted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 959f55ecc330..cfea2994df6b 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "granted"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/mSefgkRNhKahToUOZQ73TYERq2mV23u+M8DSJL8E4Y="; + sha256 = "sha256-BxtEMIWJaZaCtd5auGRq+F3VkRTZXGBa6GdLWgvC+ZE="; }; - vendorHash = "sha256-SGm5jJ8savjUqgeK5wQ9dxz9BgROkKrnrSwNcojC9gE="; + vendorHash = "sha256-tPWdzPJyjxcjDM5UgIeQek60Df/7dSaKedZF04tfu6Q="; nativeBuildInputs = [ makeWrapper ]; From bee279a0ba2b7247bdf63086621ad2c944af9ccb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 8 Aug 2023 13:05:41 +0800 Subject: [PATCH 48/61] img-cat: use sri hash --- pkgs/applications/graphics/img-cat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/img-cat/default.nix b/pkgs/applications/graphics/img-cat/default.nix index a4985c4e2c70..825955c10b9e 100644 --- a/pkgs/applications/graphics/img-cat/default.nix +++ b/pkgs/applications/graphics/img-cat/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "trashhalo"; repo = "imgcat"; rev = "v${version}"; - sha256 = "0x7a1izsbrbfph7wa9ny9r4a8lp6z15qpb6jf8wsxshiwnkjyrig"; + hash = "sha256-L2Yvp+UR6q45ctKsi0v45lKkSE7eJsUPvG7lpX8M6nQ="; }; - vendorSha256 = "191gi4c5jk8p9xvbm1cdhk5yi8q2cp2jvjq1sgxqw1ad0lppwhg2"; + vendorHash = "sha256-4kF+LwVNBY770wHLLcVlAqPoy4SNhbp2TxdNWRiJL6Q="; meta = with lib; { description = "A tool to output images as RGB ANSI graphics on the terminal"; From f540d1de076e880b9d0eee980f861f356ba276a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 02:06:40 +0000 Subject: [PATCH 49/61] lxi-tools-gui: 2.5 -> 2.6 --- pkgs/tools/networking/lxi-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index dc0b5f16ac6b..ddf2147cea9f 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lxi-tools"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "lxi-tools"; rev = "v${version}"; - sha256 = "sha256-F9svLaQnQyVyC5KzDnaGwB8J/nBZ3zzOVwYNxWBPifU="; + sha256 = "sha256-THtMSiGlBes9OujFEZL88Twx+etYiQRJSk9DFYeGFhY="; }; nativeBuildInputs = [ From 9cff2be06c0d0f53e11435c7e7666cbd34e1c2a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 02:41:51 +0000 Subject: [PATCH 50/61] simdjson: 3.2.1 -> 3.2.2 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 65028888902a..1dc1a0214627 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-JJFHRoG/w5PLSrn99i4EUjRtbNUYDF19/xlsYOwwFZA="; + sha256 = "sha256-+BCXkOaWYZSFWGZmeZ2ZJwVxFwmHgRbb7GSj/lRxmfw="; }; nativeBuildInputs = [ cmake ]; From 5e9126cb21ef4fbcaba7271c6d80b95ae91b642f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 02:56:25 +0000 Subject: [PATCH 51/61] katana: 1.0.2 -> 1.0.3 --- pkgs/tools/security/katana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/tools/security/katana/default.nix index 6cf5d1cb7ab7..a8f065e4d65b 100644 --- a/pkgs/tools/security/katana/default.nix +++ b/pkgs/tools/security/katana/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "katana"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MhvagLlJ3WuZ3eEA0KI0sJ1ioFyqCcC9lejvewIFg5M="; + hash = "sha256-0OXpA+sa97YjbHhIq3Uj65OWg53PH9y2cY8bjCqC3tQ="; }; - vendorHash = "sha256-1XT8VOBztC/V5Yguzq91ZoOWlkdT6fJrvcxp7KvtNqw="; + vendorHash = "sha256-rb0fNAOP4y2yvJb7FIlAIfXF0uw0eLKgup75f9cwT6U="; CGO_ENABLED = 0; From 54f3d132a7616e1823c1b74f16d6f2538aa38823 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 2 Aug 2023 01:18:51 -0700 Subject: [PATCH 52/61] python3Packages.pytest-ansible: 3.1.5 -> 3.2.1 In addition, add missing nativeBuildInputs that are implicitly added right now, and configure setuptools-scm so that a _version.py file is created like in the PyPI archive. --- .../python-modules/pytest-ansible/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index a9934fbdcc1a..f8c165e60ed0 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -8,11 +8,14 @@ , pytest , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { pname = "pytest-ansible"; - version = "3.1.5"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +24,7 @@ buildPythonPackage rec { owner = "ansible"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-stsgVJseZ02C7nG0Hm0wfAnhoLpM3qRZ2Lkr1N5hODw="; + hash = "sha256-fSerRbd7QeEdTfyy2lVLq7FKHWWT0MlutonunHhM5M4="; }; postPatch = '' @@ -29,6 +32,14 @@ buildPythonPackage rec { --replace '/usr/bin/env' '${coreutils}/bin/env' ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + buildInputs = [ pytest ]; From 00b38812582d54942c553172cfc603f5a10ebf1a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 20:46:02 -0700 Subject: [PATCH 53/61] python3Packages.pytest-ansible: add tjni as maintainer --- pkgs/development/python-modules/pytest-ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index f8c165e60ed0..0b941d9be607 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -89,6 +89,6 @@ buildPythonPackage rec { homepage = "https://github.com/jlaska/pytest-ansible"; changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ tjni ]; }; } From c90ab68d1efcb61f431f7b02a2d96aaa54193e2e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:16:55 +0000 Subject: [PATCH 54/61] terraform-providers.alicloud: 1.208.1 -> 1.209.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3c3958f66613..b0aa4d3ac5a0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -46,11 +46,11 @@ "vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM=" }, "alicloud": { - "hash": "sha256-0qPmUmQ+CGRyah2GXUADAt3HPietpAahQ9ze6Ip6yvE=", + "hash": "sha256-hE93VV29Whh2POUz15Hcx8aq/78cw7NXDn+xUhrEA+E=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.208.1", + "rev": "v1.209.0", "spdx": "MPL-2.0", "vendorHash": null }, From ed07c42d3d489e86deac3ddcaf995b3612da0548 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:17:10 +0000 Subject: [PATCH 55/61] terraform-providers.ibm: 1.55.0 -> 1.56.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b0aa4d3ac5a0..96d4384aafaa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -583,13 +583,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-XSB0bwkFiNdeVje/pCnNDDjbiroJBckSNqEFlDuctdM=", + "hash": "sha256-FxMBZQYYSOq1Y5jm+HPIsVA1RMv8jhPWIKHd9HV/f3g=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.55.0", + "rev": "v1.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+HYfQoJWyZizoe/g5cycmSjaStRwbRuYfXRYVOgRqCM=" + "vendorHash": "sha256-djpo+9BxWUptKRephw0by4xtPABEjsnCqwcbZoRNIug=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From f06d43873b4320557f41e8e8cb81c2b2da4d0bc2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:20:38 +0000 Subject: [PATCH 56/61] terraform-providers.sumologic: 2.24.0 -> 2.25.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 96d4384aafaa..10c699353a85 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1088,11 +1088,11 @@ "vendorHash": "sha256-fgvNdBwkz+YHOrLRQSe1D+3/VUhttKkJGzV6cg57g8s=" }, "sumologic": { - "hash": "sha256-v4CnT51YUN7p0PdfiUJf7YAlI2pz/zkzTiNFsIWhwUU=", + "hash": "sha256-R2t754J438nDkifE0zEtYO5q6g6N4CVQdZn9DoBiuVQ=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.24.0", + "rev": "v2.25.0", "spdx": "MPL-2.0", "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI=" }, From ccfde445c448c3b32d109b46d1f4419f576b5428 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:22:55 +0000 Subject: [PATCH 57/61] terraform-providers.wavefront: 5.0.0 -> 5.0.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 10c699353a85..c97ae7a0ff47 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1261,11 +1261,11 @@ "vendorHash": null }, "wavefront": { - "hash": "sha256-ag4mu9CyG78X47QGMTQTK7+VsdCv0TBOCovVnM4OMsw=", + "hash": "sha256-bBJZT5h/2ZFTKhFXMWj/xf+DAMGdUZw8E07PuIsMVpU=", "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", "repo": "terraform-provider-wavefront", - "rev": "v5.0.0", + "rev": "v5.0.1", "spdx": "MPL-2.0", "vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q=" }, From 2507256f0e206c87a0b593e1770f896b70add794 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:23:06 +0000 Subject: [PATCH 58/61] terraform-providers.utils: 1.9.0 -> 1.10.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c97ae7a0ff47..8206a28faf0c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1188,13 +1188,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-3eEC0UN/VVockLstHhSNY9EH0bRv/LK3SkpSfMrMwSI=", + "hash": "sha256-UqAWByIArvTz2ArR/dgIDw98grqj9BEyRJzNODteKao=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.9.0", + "rev": "1.10.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-ZOJ4J+t8YIWAFZe9dnVHezdXdjz5y2ho53wmyS4dJEo=" + "vendorHash": "sha256-n70qtdz4x8bdzCmVYyVTvvndx0w0AV/Yv8thGvitT6U=" }, "vault": { "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=", From b36f430d02a907b1ff1fc45f78be114a9285c609 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 21:57:13 -0700 Subject: [PATCH 59/61] python3.pkgs.flask-admin: pillow 10 compatibility --- .../development/python-modules/flask-admin/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index c77fc912cd77..685c4e809459 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -6,6 +6,7 @@ , colour , email-validator , enum34 +, fetchpatch , fetchPypi , flask , flask-babelex @@ -39,6 +40,15 @@ buildPythonPackage rec { hash = "sha256-JMrir4MramEaAdfcNfQtJmwdbHWkJrhp2MskG3gjM2k="; }; + patches = [ + # https://github.com/flask-admin/flask-admin/pull/2374 + (fetchpatch { + name = "pillow-10-compatibility.patch"; + url = "https://github.com/flask-admin/flask-admin/commit/96b92deef8b087e86a9dc3e84381d254ea5c0342.patch"; + hash = "sha256-iR5kxyeZaEyved5InZuPmcglTD77zW18/eSHGwOuW40="; + }) + ]; + propagatedBuildInputs = [ flask wtforms From 81fcc4cd83cc503e21f275f39780af27254b9979 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:52:36 -0700 Subject: [PATCH 60/61] python310Packages.polygon3: rename from Polygon3 --- .../python-modules/{Polygon3 => polygon3}/default.nix | 10 ++++------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{Polygon3 => polygon3}/default.nix (93%) diff --git a/pkgs/development/python-modules/Polygon3/default.nix b/pkgs/development/python-modules/polygon3/default.nix similarity index 93% rename from pkgs/development/python-modules/Polygon3/default.nix rename to pkgs/development/python-modules/polygon3/default.nix index e85eb209343d..e8bb253202bc 100644 --- a/pkgs/development/python-modules/Polygon3/default.nix +++ b/pkgs/development/python-modules/polygon3/default.nix @@ -3,19 +3,17 @@ , fetchFromGitHub , pythonOlder }: -let - pname = "Polygon3"; - version = "3.0.9"; -in + buildPythonPackage { - inherit pname version; + pname = "polygon3"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jraedler"; - repo = pname; + repo = "Polygon3"; rev = "7b2091f77741fa1d94251979bc4a4f2676b4d2d1"; hash = "sha256-jXtjEzjWwMoVgrHWsK8brSN6TQRxIPRjUaRiLBXYLcI="; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 19e06c64e8f5..e0ca5b0e4d58 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -226,6 +226,7 @@ mapAliases ({ pep257 = pydocstyle; # added 2022-04-12 poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02 + Polygon3 = polygon3; # Added 2023-08-08 poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 567dd4d08124..8d7800798c6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8312,7 +8312,7 @@ self: super: with self; { polyline = callPackage ../development/python-modules/polyline { }; - Polygon3 = callPackage ../development/python-modules/Polygon3 { }; + polygon3 = callPackage ../development/python-modules/polygon3 { }; pomegranate = callPackage ../development/python-modules/pomegranate { }; From 02719f21e6b1e9116739299045532ecf023ead5e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 9 Aug 2023 01:16:58 -0400 Subject: [PATCH 61/61] cpython: fix _PYTHON_SYSCONFIGDATA_NAME on armv7l with musl (#240770) Python always uses "gnu" prefixed ABI names, and this patch handles this by doing a musl->gnu string replacement. With pkgsCross.armv7l-hf-multiplatform.pkgsStatic, the previous name was: _sysconfigdata__linux_arm-linux-gnu Now, the corrected name is: _sysconfigdata__linux_arm-linux-gnueabihf --- pkgs/development/interpreters/python/cpython/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index dc9b57304d6b..a491c6c1d619 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -184,6 +184,8 @@ let if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb" else if isx86_32 then "i386" else parsed.cpu.name; + # Python doesn't distinguish musl and glibc and always prefixes with "gnu" + gnuAbiName = replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name; pythonAbiName = # python's build doesn't support every gnu, and doesn't # differentiate between musl and glibc, so we list those supported in @@ -191,7 +193,7 @@ let # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 # Note: this is an approximation, as it doesn't take into account the CPU # family, or the nixpkgs abi naming conventions. - if elem parsed.abi.name [ + if elem gnuAbiName [ "gnux32" "gnueabihf" "gnueabi" @@ -199,7 +201,7 @@ let "gnuabi64" "gnuspe" ] - then parsed.abi.name + then gnuAbiName else "gnu"; multiarch = if isDarwin then "darwin"