From 312b3856e8dda36ddbea7d8465f89d01bfaee530 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Sat, 15 Apr 2023 19:36:18 +0200 Subject: [PATCH 01/73] mpvScripts.uosc: 4.6.0 -> 4.7.0 --- pkgs/applications/video/mpv/scripts/uosc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 1a486dbf556d..b88cd2c5b968 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "uosc"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-AxApKlSaRLPl6VsXsARfaT3kWDK6AB2AAEmIHYiuFaM="; + hash = "sha256-JqlBjhwRgmXl6XfHYTwtNWZj656EDHjcdWOlCgihF5I="; }; postPatch = '' From 063d0aea24cd9bbaa3c8a283cdacf7371b274b4e Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sun, 16 Apr 2023 13:55:22 +0100 Subject: [PATCH 02/73] =?UTF-8?q?iosevka:=2022.0.0=20=E2=86=92=2022.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/be5invis/iosevka/compare/v22.0.0...v22.0.2 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c16d69f1affb..6f974d078b02 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "22.0.0"; + version = "22.0.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-TvzUUuwmDP2K1deUsODV/FDjPTgZjVvilUdfrkeaO88="; + hash = "sha256-cBIcf6GEJnkOvKPMWTb9dWqN9uPs4ynr6tLc7+B6f3k="; }; - npmDepsHash = "sha256-G+iAGKweh5MOFTaNHLnSUwVMTSlgL/w0zrS2SrJrsJE="; + npmDepsHash = "sha256-tLdJuDFVPdnEtHdGdU7G6N+LIiINVVB5/NNFaeveK/U="; nativeBuildInputs = [ remarshal From d3c6336d0bc8e4f7ddb175697f74497191572193 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sun, 16 Apr 2023 23:13:18 +0200 Subject: [PATCH 03/73] scriv: 1.2.1 -> 1.3.1 --- pkgs/applications/version-management/scriv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix index a1238ed01df4..79e1cb1a2923 100644 --- a/pkgs/applications/version-management/scriv/default.nix +++ b/pkgs/applications/version-management/scriv/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "scriv"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - hash = "sha256-le39dmQs965rXNQJdVRdivWPY5jKv+g/91Xo7tuN3U4="; + hash = "sha256-TfWX7gp7PcwNUxXXZJ3wke/LGz/wjwtRppg0ByfRcRg="; }; propagatedBuildInputs = with python3.pkgs; [ From a63235871017932b07714e807166726e6084aaa3 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 17 Apr 2023 01:46:07 +0200 Subject: [PATCH 04/73] libxisf: init at 0.2.3 --- .../science/astronomy/libxisf/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/science/astronomy/libxisf/default.nix diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/development/libraries/science/astronomy/libxisf/default.nix new file mode 100644 index 000000000000..e7e4bc98b0d8 --- /dev/null +++ b/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, pkg-config +, lz4 +, pugixml +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libxisf"; + version = "0.2.3"; + + src = fetchFromGitea { + domain = "gitea.nouspiro.space"; + owner = "nou"; + repo = "libXISF"; + rev = "v${finalAttrs.version}"; + hash = "sha256-u5EYnRO2rUV8ofLL9qfACeVvVbWXEXpkqh2Q4OOxpaQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DUSE_BUNDLED_LIBS=OFF" + ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; + + buildInputs = [ + lz4 + pugixml + zlib + ]; + + doCheck = true; + + meta = with lib; { + description = "Library to load and write XISF format from PixInsight"; + homepage = "https://gitea.nouspiro.space/nou/libXISF"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ panicgh ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 337b9e9185c8..ff01c40ca9af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22342,6 +22342,8 @@ with pkgs; libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; + libxisf = callPackage ../development/libraries/science/astronomy/libxisf { }; + libxkbcommon = libxkbcommon_8; libxkbcommon_8 = callPackage ../development/libraries/libxkbcommon { }; libxkbcommon_7 = callPackage ../development/libraries/libxkbcommon/libxkbcommon_7.nix { }; From 96a2c646ec40121679942bf58c44858e2669abff Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 17 Apr 2023 12:55:14 +0000 Subject: [PATCH 05/73] secp256k1: 0.3.0 -> 0.3.1 --- pkgs/tools/security/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index cb9cf172daa1..fd8d0cd9eefa 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ii4JuYd65L0FBWY+cqcFuUEjExZOj6Pt5T0OyaVhIEI="; + sha256 = "sha256-0Xb/hot88HRDzwP1hJq47nrUbKVJFzsIKCQxLznQkrM="; }; nativeBuildInputs = [ autoreconfHook ]; From 24a451a1db9ebb3f63365346f66d10863b7c88f9 Mon Sep 17 00:00:00 2001 From: Marcelo Amancio de Lima Santos Date: Mon, 17 Apr 2023 15:06:26 -0300 Subject: [PATCH 06/73] cypress: 10.10.0 -> 12.9.0 --- pkgs/development/web/cypress/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index bc6bf6b7adc8..ebe6d9d496ec 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -18,11 +18,11 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-26mkizwkF0qPX2+0rkjep28ZuNlLGPljCvVO73t34Lk="; + checksum = "sha256-ozyQya2WxnDK6of1VfxlDlXo6IDGxAXkCjFt3DqRM4k="; }; aarch64-linux = { platform = "linux-arm64"; - checksum = "sha256-gcf/MJ5aNUPoH6qz0n9vjviTec1rcxB0UzF+++6bUTs="; + checksum = "sha256-UxceWQ/eIGPFXNFIPSzBe431qqp54GwDbs9p7cqLosA="; }; }; inherit (stdenv.hostPlatform) system; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "10.10.0"; + version = "12.9.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; From 69d506aad2ef61dbdba24719126544fc1f0b40ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 03:42:09 +0000 Subject: [PATCH 07/73] capnproto: 0.10.3 -> 0.10.4 --- pkgs/development/libraries/capnproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index fda33fa16460..f21c3955836d 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.10.3"; + version = "0.10.4"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-QrBSIKDwVlG8AIE/F4tnRq14xdhT05NKsBMldWzQQFo="; + sha256 = "sha256-45sxnVyyYIw9i3sbFZ1naBMoUzkpP21WarzR5crg4X8="; }; nativeBuildInputs = [ cmake ]; From 639e754db540e9f1c1a7706b25ed16f2b2742449 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Tue, 18 Apr 2023 14:41:55 +0200 Subject: [PATCH 08/73] cldr-annotations: 42.0 -> 43.0 https://cldr.unicode.org/index/downloads/cldr-43 --- pkgs/data/misc/cldr-annotations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index 729d3cdbb7b8..6d06d49eb711 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; - version = "42.0"; + version = "43.0"; src = fetchzip { url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-paRon3ecGXNp3ZDnN1DU9RVU2NDWTBiKjy0OP3vcPLE="; + hash = "sha256-L8ikzRpSw4mDCV79TiUqhPHWC0PmGi4i4He0OAB54R0="; }; installPhase = '' From b70298fe11c0aa64d8f8171ed0df687cddfe1ea1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Apr 2023 16:22:23 +0200 Subject: [PATCH 09/73] python310Packages.meshtastic: 2.0.12 -> 2.1.6 Changelog: https://github.com/meshtastic/python/releases/tag/2.1.6 --- .../development/python-modules/meshtastic/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index ec1f34fcf3d2..3e4842d53771 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -12,6 +12,7 @@ , pytestCheckHook , pythonOlder , pyyaml +, requests , setuptools , tabulate , timeago @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.12"; + version = "2.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-Y3X5LW85e+OQ548H13fQ0s+R870Hzp0kVd+v+lbdqtg="; + hash = "sha256-xfE4hfnf9NFA9iwce1onclLJOYgMWxuionmVUPDVEuw="; }; propagatedBuildInputs = [ @@ -41,6 +42,7 @@ buildPythonPackage rec { pyserial pyyaml setuptools + requests tabulate timeago ]; @@ -103,6 +105,11 @@ buildPythonPackage rec { "test_writeGPIOs" "test_reboot" "test_shutdown" + "test_main_sendtext" + "test_main_sendtext_with_channel" + "test_MeshInterface" + "test_getNode_not_local" + "test_getNode_not_local_timeout" ]; meta = with lib; { From a5c5ba536f7dfcef41ee9d986f31e8e7c50312f1 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 18 Apr 2023 16:42:20 +0200 Subject: [PATCH 10/73] prisma-engines: 4.12.0 -> 4.13.0 --- .../tools/database/prisma-engines/Cargo.lock | 738 ++++++++++-------- .../tools/database/prisma-engines/default.nix | 10 +- 2 files changed, 423 insertions(+), 325 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index 4e62430f3c50..5d7b32a4f6cc 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -106,7 +106,7 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -117,7 +117,7 @@ checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -191,6 +191,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "bigdecimal" version = "0.3.0" @@ -208,7 +214,7 @@ version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -233,6 +239,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" + [[package]] name = "bitvec" version = "1.0.1" @@ -245,6 +257,21 @@ dependencies = [ "wyz", ] +[[package]] +name = "black-box-tests" +version = "0.1.0" +dependencies = [ + "anyhow", + "indoc", + "insta", + "query-engine-tests", + "query-tests-setup", + "reqwest", + "serde_json", + "tokio", + "user-facing-errors", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -283,6 +310,15 @@ dependencies = [ "uuid 1.1.2", ] +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "memchr", +] + [[package]] name = "builtin-psl-connectors" version = "0.1.0" @@ -403,7 +439,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -416,7 +452,7 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_lex", "indexmap", "textwrap 0.16.0", @@ -507,12 +543,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - [[package]] name = "convert_case" version = "0.6.0" @@ -693,7 +723,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" dependencies = [ "quote", - "syn", + "syn 1.0.99", +] + +[[package]] +name = "ctor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" +dependencies = [ + "quote", + "syn 2.0.14", ] [[package]] @@ -728,7 +768,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.99", ] [[package]] @@ -739,7 +779,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -781,7 +821,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -842,9 +882,12 @@ name = "dmmf" version = "0.1.0" dependencies = [ "bigdecimal", + "colored", "expect-test", + "flate2", "indexmap", "indoc", + "itertools", "pretty_assertions", "prisma-models", "psl", @@ -852,6 +895,7 @@ dependencies = [ "schema-builder", "serde", "serde_json", + "similar", ] [[package]] @@ -930,6 +974,15 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + [[package]] name = "endian-type" version = "0.1.2" @@ -945,7 +998,7 @@ dependencies = [ "heck 0.4.0", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -957,7 +1010,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -978,7 +1031,7 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1112,7 +1165,7 @@ checksum = "3dbc4f084ec5a3f031d24ccedeb87ab2c3189a2f33b8d070889073837d5ea09e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1124,7 +1177,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1148,7 +1201,7 @@ dependencies = [ "frunk_proc_macro_helpers", "proc-macro-hack", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1213,7 +1266,7 @@ checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1487,6 +1540,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1517,9 +1583,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.7" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" +checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" [[package]] name = "insta" @@ -1543,47 +1609,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "introspection-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "enumflags2", - "psl", - "serde", - "serde_json", - "thiserror", - "user-facing-errors", -] - -[[package]] -name = "introspection-engine-tests" -version = "0.1.0" -dependencies = [ - "barrel", - "connection-string", - "enumflags2", - "expect-test", - "indoc", - "introspection-connector", - "migration-connector", - "pretty_assertions", - "psl", - "quaint", - "serde_json", - "sql-introspection-connector", - "sql-migration-connector", - "sql-schema-describer", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] - [[package]] name = "io-lifetimes" version = "1.0.6" @@ -1603,7 +1628,7 @@ dependencies = [ "socket2", "widestring", "winapi", - "winreg", + "winreg 0.7.0", ] [[package]] @@ -1614,9 +1639,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1859,7 +1884,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -1972,7 +1997,7 @@ checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2014,99 +2039,10 @@ dependencies = [ ] [[package]] -name = "migration-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "enumflags2", - "introspection-connector", - "psl", - "sha2 0.9.9", - "tracing", - "tracing-error", - "user-facing-errors", -] - -[[package]] -name = "migration-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "chrono", - "enumflags2", - "json-rpc-api-build", - "jsonrpc-core", - "migration-connector", - "mongodb-migration-connector", - "psl", - "serde", - "serde_json", - "sql-migration-connector", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "migration-engine-cli" -version = "0.1.0" -dependencies = [ - "backtrace", - "base64 0.13.1", - "connection-string", - "expect-test", - "indoc", - "json-rpc-stdio", - "migration-connector", - "migration-core", - "quaint", - "serde_json", - "structopt", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "migration-engine-tests" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "chrono", - "colored", - "connection-string", - "enumflags2", - "expect-test", - "indoc", - "jsonrpc-core", - "migration-core", - "once_cell", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "serde", - "serde_json", - "sql-migration-connector", - "sql-schema-describer", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2161,7 +2097,7 @@ checksum = "b95afe97b0c799fdf69cd960272a2cb9662d077bd6efd84eb722bb9805d47554" dependencies = [ "async-trait", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bson", "chrono", "derivative", @@ -2209,53 +2145,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "mongodb-introspection-connector" -version = "0.1.0" -dependencies = [ - "async-trait", - "convert_case 0.5.0", - "datamodel-renderer", - "enumflags2", - "expect-test", - "futures", - "indoc", - "introspection-connector", - "mongodb", - "mongodb-client", - "mongodb-schema-describer", - "names", - "once_cell", - "psl", - "regex", - "serde_json", - "thiserror", - "tokio", - "url", - "user-facing-errors", -] - -[[package]] -name = "mongodb-migration-connector" -version = "0.1.0" -dependencies = [ - "dissimilar", - "enumflags2", - "futures", - "migration-connector", - "mongodb", - "mongodb-client", - "mongodb-introspection-connector", - "mongodb-schema-describer", - "once_cell", - "psl", - "serde", - "serde_json", - "tokio", - "tracing", - "url", -] - [[package]] name = "mongodb-query-connector" version = "0.1.0" @@ -2288,6 +2177,33 @@ dependencies = [ "uuid 1.1.2", ] +[[package]] +name = "mongodb-schema-connector" +version = "0.1.0" +dependencies = [ + "convert_case", + "datamodel-renderer", + "dissimilar", + "enumflags2", + "expect-test", + "futures", + "indoc", + "mongodb", + "mongodb-client", + "mongodb-schema-describer", + "names", + "once_cell", + "psl", + "regex", + "schema-connector", + "serde", + "serde_json", + "tokio", + "tracing", + "url", + "user-facing-errors", +] + [[package]] name = "mongodb-schema-describer" version = "0.1.0" @@ -2344,7 +2260,7 @@ dependencies = [ "base64 0.13.1", "bigdecimal", "bindgen", - "bitflags", + "bitflags 1.3.2", "bitvec", "byteorder", "bytes", @@ -2392,17 +2308,17 @@ dependencies = [ [[package]] name = "napi" -version = "2.10.4" +version = "2.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "838b5b414a008e75b97edb3c3e6f189034af789a0608686299b149d3b0e66c39" +checksum = "556470a21074b55be8adee5f27ca04389cfdaca323a28b4b0e9c15466de94731" dependencies = [ - "bitflags", - "ctor", + "bitflags 2.1.0", + "ctor 0.2.0", + "napi-derive", "napi-sys", "once_cell", "serde", "serde_json", - "thread_local", "tokio", ] @@ -2414,36 +2330,37 @@ checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" [[package]] name = "napi-derive" -version = "2.9.3" +version = "2.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e44e34e70aa61be9036ae652e27c20db5bca80e006be0f482419f6601352a" +checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787" dependencies = [ - "convert_case 0.6.0", + "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] name = "napi-derive-backend" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17925fff04b6fa636f8e4b4608cc1a4f1360b64ac8ecbfdb7da1be1dc74f6843" +checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925" dependencies = [ - "convert_case 0.6.0", + "convert_case", "once_cell", "proc-macro2", "quote", "regex", - "syn", + "semver 1.0.17", + "syn 1.0.99", ] [[package]] name = "napi-sys" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529671ebfae679f2ce9630b62dd53c72c56b3eb8b2c852e7e2fa91704ff93d67" +checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" dependencies = [ "libloading", ] @@ -2567,7 +2484,7 @@ version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -2584,7 +2501,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2841,7 +2758,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2910,7 +2827,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2962,7 +2879,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "native-tls", "tokio", @@ -2973,7 +2890,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "base64 0.13.1", "byteorder", @@ -2990,7 +2907,7 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "bit-vec", "bytes", @@ -3020,7 +2937,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ctor", + "ctor 0.1.23", "diff", "output_vt100", "yansi", @@ -3099,7 +3016,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "version_check", ] @@ -3122,9 +3039,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -3169,7 +3086,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -3222,13 +3139,13 @@ version = "0.1.0" dependencies = [ "connection-string", "enumflags2", - "migration-core", "mongodb", "mongodb-client", "once_cell", "parking_lot 0.12.1", "psl", "quaint", + "schema-core", "tempfile", "test-setup", "url", @@ -3237,7 +3154,7 @@ dependencies = [ [[package]] name = "quaint" version = "0.2.0-alpha.13" -source = "git+https://github.com/prisma/quaint#53c756a67a0ff3f1b6023c64bec9dc9280bdc1cd" +source = "git+https://github.com/prisma/quaint#5a708313ed488da9016e37edbb2f774fd7893250" dependencies = [ "async-trait", "base64 0.12.3", @@ -3317,22 +3234,16 @@ dependencies = [ "base64 0.12.3", "bigdecimal", "chrono", - "connection-string", "crossbeam-channel", - "crossbeam-queue", "cuid", "enumflags2", "futures", "indexmap", "itertools", "lru 0.7.8", - "mongodb-client", - "mongodb-query-connector", "once_cell", "opentelemetry", - "parking_lot 0.12.1", "petgraph 0.4.13", - "pin-utils", "prisma-models", "prisma-value", "psl", @@ -3342,14 +3253,12 @@ dependencies = [ "schema-builder", "serde", "serde_json", - "sql-query-connector", "thiserror", "tokio", "tracing", "tracing-futures", "tracing-opentelemetry", "tracing-subscriber", - "url", "user-facing-errors", "uuid 1.1.2", ] @@ -3474,7 +3383,7 @@ dependencies = [ "proc-macro2", "query-tests-setup", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -3521,9 +3430,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -3621,7 +3530,7 @@ version = "10.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3652,14 +3561,14 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -3677,9 +3586,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "request-handlers" @@ -3693,18 +3602,57 @@ dependencies = [ "indexmap", "insta", "itertools", + "mongodb-query-connector", "prisma-models", "psl", "query-core", "schema-builder", "serde", "serde_json", + "sql-query-connector", "thiserror", "tracing", "url", "user-facing-errors", ] +[[package]] +name = "reqwest" +version = "0.11.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +dependencies = [ + "base64 0.21.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.10.1", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -3736,7 +3684,7 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152" dependencies = [ - "bitflags", + "bitflags 1.3.2", "chrono", "fallible-iterator", "fallible-streaming-iterator", @@ -3775,7 +3723,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver", + "semver 0.9.0", ] [[package]] @@ -3785,7 +3733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" dependencies = [ "rustc_version", - "semver", + "semver 0.9.0", ] [[package]] @@ -3794,7 +3742,7 @@ version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -3904,9 +3852,75 @@ dependencies = [ "once_cell", "prisma-models", "psl", + "rustc-hash", "schema", ] +[[package]] +name = "schema-connector" +version = "0.1.0" +dependencies = [ + "chrono", + "enumflags2", + "psl", + "quaint", + "serde", + "serde_json", + "sha2 0.9.9", + "tracing", + "tracing-error", + "user-facing-errors", +] + +[[package]] +name = "schema-core" +version = "0.1.0" +dependencies = [ + "async-trait", + "chrono", + "enumflags2", + "json-rpc-api-build", + "jsonrpc-core", + "mongodb-schema-connector", + "psl", + "schema-connector", + "serde", + "serde_json", + "sql-schema-connector", + "tokio", + "tracing", + "tracing-futures", + "tracing-subscriber", + "url", + "user-facing-errors", +] + +[[package]] +name = "schema-engine-cli" +version = "0.1.0" +dependencies = [ + "backtrace", + "base64 0.13.1", + "connection-string", + "expect-test", + "indoc", + "json-rpc-stdio", + "quaint", + "schema-connector", + "schema-core", + "serde_json", + "structopt", + "tempfile", + "test-macros", + "test-setup", + "tokio", + "tracing", + "tracing-error", + "tracing-subscriber", + "url", + "user-facing-errors", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -3939,7 +3953,7 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3965,6 +3979,12 @@ dependencies = [ "semver-parser", ] +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + [[package]] name = "semver-parser" version = "0.7.0" @@ -3997,7 +4017,7 @@ checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4020,7 +4040,19 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", ] [[package]] @@ -4042,7 +4074,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4068,7 +4100,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4146,6 +4178,9 @@ name = "similar" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +dependencies = [ + "bstr", +] [[package]] name = "siphasher" @@ -4198,58 +4233,60 @@ dependencies = [ ] [[package]] -name = "sql-introspection-connector" +name = "sql-introspection-tests" version = "0.1.0" dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "datamodel-renderer", - "either", + "barrel", + "connection-string", "enumflags2", "expect-test", - "introspection-connector", - "once_cell", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "regex", - "serde", - "serde_json", - "sql-schema-describer", - "sqlformat", - "sqlparser", - "thiserror", - "tracing", - "tracing-futures", - "user-facing-errors", -] - -[[package]] -name = "sql-migration-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "connection-string", - "either", - "enumflags2", "indoc", - "migration-connector", - "once_cell", + "pretty_assertions", "psl", "quaint", - "regex", + "schema-connector", "serde_json", - "sql-ddl", - "sql-introspection-connector", + "sql-schema-connector", "sql-schema-describer", + "test-macros", + "test-setup", + "tokio", + "tracing", + "tracing-futures", + "url", + "user-facing-errors", +] + +[[package]] +name = "sql-migration-tests" +version = "0.1.0" +dependencies = [ + "bigdecimal", + "chrono", + "colored", + "connection-string", + "enumflags2", + "expect-test", + "indoc", + "jsonrpc-core", + "once_cell", + "pretty_assertions", + "prisma-value", + "psl", + "quaint", + "schema-core", + "serde", + "serde_json", + "sql-schema-connector", + "sql-schema-describer", + "tempfile", + "test-macros", + "test-setup", "tokio", "tracing", "tracing-futures", "url", "user-facing-errors", - "uuid 1.1.2", ] [[package]] @@ -4282,6 +4319,36 @@ dependencies = [ "uuid 1.1.2", ] +[[package]] +name = "sql-schema-connector" +version = "0.1.0" +dependencies = [ + "chrono", + "connection-string", + "datamodel-renderer", + "either", + "enumflags2", + "indoc", + "once_cell", + "prisma-value", + "psl", + "quaint", + "regex", + "schema-connector", + "serde", + "serde_json", + "sql-ddl", + "sql-schema-describer", + "sqlformat", + "sqlparser", + "tokio", + "tracing", + "tracing-futures", + "url", + "user-facing-errors", + "uuid 1.1.2", +] + [[package]] name = "sql-schema-describer" version = "0.1.0" @@ -4386,7 +4453,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4416,6 +4483,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "take_mut" version = "0.2.2" @@ -4460,10 +4538,9 @@ dependencies = [ "colored", "dmmf", "enumflags2", - "introspection-connector", - "migration-connector", - "migration-core", "psl", + "schema-connector", + "schema-core", "serde_json", "structopt", "tokio", @@ -4478,7 +4555,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4529,7 +4606,7 @@ checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4664,7 +4741,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4680,7 +4757,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "async-trait", "byteorder", @@ -4814,7 +4891,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4870,7 +4947,7 @@ checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -5030,7 +5107,7 @@ checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -5117,7 +5194,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -5276,10 +5353,22 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.84" @@ -5298,7 +5387,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5413,7 +5502,7 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f820cd208ce9c6b050812dc2d724ba98c6c1e9db5ce9b3f58d925ae5723a5e6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "md5", "rand 0.7.3", @@ -5510,6 +5599,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "wyz" version = "0.5.0" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 07934dde7654..6f1a8e91a956 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.12.0"; + version = "4.13.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-bSyAWJ4ukiXVyKI1iGvCs2cMgW1jdYRs5cgTdOCXvrQ="; + sha256 = "sha256-NJQvu+EREF40u5P3i8h2yGYC1vM6Q8xEXX9WyOnJkBM="; }; # Use system openssl. @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec { "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mobc-0.7.3" = "sha256-Ts2VVAuZakS+Sy/rEUrCe7RJX5MWs/TTO60c7mH+5sU="; "mysql_async-0.31.3" = "sha256-hvuZTJ8W6L2s2gYAGJXBezkeAHTu06zIvJGQjoYX+7Q="; - "postgres-native-tls-0.5.0" = "sha256-6aDlwv9+Tt9ncOPRnhKNAgafcPhqM1V31Ix+fplwdUc="; - "quaint-0.2.0-alpha.13" = "sha256-UI1B/BylEQQko48D+sQzUhD7qIK2Z84115bu7NkDSFw="; + "postgres-native-tls-0.5.0" = "sha256-OYbtGYAvDDCTeYfhav/BI2LJSyMyUERD7xa8GA/57rI="; + "quaint-0.2.0-alpha.13" = "sha256-Z7Zl1ZXzP3YE1Z1iuuj9V6dYBD2DpJngVbDLb4l/gjc="; }; }; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "query-engine" "-p" "query-engine-node-api" - "-p" "migration-engine-cli" + "-p" "schema-engine-cli" "-p" "prisma-fmt" ]; From 9a03bb2c0760db455f4d672c206e69a7201b8c99 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 18 Apr 2023 16:44:22 +0200 Subject: [PATCH 11/73] nodePackages.prisma: 4.12.0 -> 4.13.0 --- pkgs/development/node-packages/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index afc9c3a0e381..b468ec4fe4dc 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -412,7 +412,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha512-xqVper4mbwl32BWzLpdznHAYvYDWQQWK2tBfXjdUD397XaveRyAP7SkBZ6kFlIg8kKayF4hvuaVtYwXd9BodAg=="; + hash = "sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From b7df45f169d4552bfbe2c8d307f76ea97ef59c73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Apr 2023 17:09:14 +0200 Subject: [PATCH 12/73] kube-hunter: fix version handling --- pkgs/tools/security/kube-hunter/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index 823f3db9b432..05ee083f4d77 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -14,6 +14,8 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-+M8P/VSF9SKPvq+yNPjokyhggY7hzQ9qLLhkiTNbJls="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -47,6 +49,11 @@ python3.pkgs.buildPythonApplication rec { "kube_hunter" ]; + disabledTests = [ + # Test is out-dated + "test_K8sCveHunter" + ]; + meta = with lib; { description = "Tool to search issues in Kubernetes clusters"; homepage = "https://github.com/aquasecurity/kube-hunter"; From c24b4a4839b7ad7e5ae6d6217c446a204dc94589 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:30:44 +0200 Subject: [PATCH 13/73] google-cloud-sdk: 424.0.0 -> 426.0.0 --- .../admin/google-cloud-sdk/components.json | 312 +++++++++--------- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 +- pkgs/tools/admin/google-cloud-sdk/update.sh | 2 +- 3 files changed, 168 insertions(+), 168 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index b05c0f74011f..709fdf117b36 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20230324213959.tar.gz", + "source": "components/google-cloud-sdk-alpha-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230324213959, - "version_string": "2023.03.24" + "build_number": 20230410222307, + "version_string": "2023.04.10" } }, { @@ -560,15 +560,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.9.73" + "version_string": "1.9.74" } }, { "data": { - "checksum": "9ee98c4e0d8b8ab0b611f009dabb7ff970ab3aae3d9b3670137f06e22c24f23d", - "contents_checksum": "9ce47001c34dd733d7b9af5cef0c9143c5e332cd53c42581fd3413bcfb986687", - "size": 4456298, - "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20230317195124.tar.gz", + "checksum": "9ccbf2d3f1b16c6e135c0f212ffc23a57014bfe630760e053c5fd598c3d7c81e", + "contents_checksum": "6ed06edd2ff2d1a53c731cf5fefa978b8821111df2fd4c5c053539bf5e8e68d1", + "size": 4463608, + "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -594,16 +594,16 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { "data": { - "checksum": "eab5919985bc653e824aacf3f7cb512c5c6dc704c7126c5324f918321f51fb6e", - "contents_checksum": "3bf2f6a279d32628645bc05f6aa442557b502c12b639541aa72c11b597b6f9e4", - "size": 4654616, - "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20230317195124.tar.gz", + "checksum": "541aadb1f47c1746f88bbb544c075dfe69d721d5f1c0febc1791d896001e1bf7", + "contents_checksum": "76b0489355b7682fc72f0433f7f5b2d5f486f6cc9f7afe414771fb874509bf49", + "size": 4658275, + "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -629,16 +629,16 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { "data": { - "checksum": "02ce33c22af742bc894e89c58b6da16eb2a5e9bb27b47ed7c7efc4e5d601027e", - "contents_checksum": "c34d60f0ad1db0ffaab6d7f185ace22f9b684ce0c45364027b711aa2f5e1ec2e", - "size": 4409259, - "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20230317195124.tar.gz", + "checksum": "0285d1f1181f05dff4fd971095760c2cc31c93db77393a73584a8b96f2ee28e9", + "contents_checksum": "b51ee28c36a553f2d9c3e2bbdd38969861d49da7501fa8377faa53b91f3f9aee", + "size": 4418740, + "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -664,16 +664,16 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { "data": { - "checksum": "69b03dbfe6a5a15f5923602fe3b0b47f20b7be0e2bd460d40bbf061f663985b4", - "contents_checksum": "ccb2ea5318acbaaba5fc1fb8ab0884be0af7eb85b1029f837db2423adac7603a", - "size": 4808474, - "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20230317195124.tar.gz", + "checksum": "9ace85dd79d0cbe1239829215fe7bbbec1402cd76b1d6a04672909f818d78ba5", + "contents_checksum": "1262e24409d76def1483927ef95203635637f28c56fa5fd3fd643a47ba4ad38d", + "size": 4813823, + "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -699,16 +699,16 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { "data": { - "checksum": "a87fbb39717e40303347c0c67e0984f918a5623895c25eddb8fc1a9458482cd5", - "contents_checksum": "4460f4ae203876f88313526f9916132f9d8aa25297cdf90939b01361e3c89a71", - "size": 4720972, - "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20230317195124.tar.gz", + "checksum": "d27520cde52bece0702e1b5883a62bf1ed86c4dd07ff2325babe5eb428dfb1f9", + "contents_checksum": "09fcb20e1a31f23528b7177343e5c462a542d3a279b29eb796e8435a50bc20e2", + "size": 4727758, + "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -734,16 +734,16 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { "data": { - "checksum": "1d8f7cf92fc9420902fc2ab6db77b1b02ffd396b6afef62c229494066299dd09", - "contents_checksum": "d37b785758e21ffdf03a30ef3eebc8cf1d1a77918c04a8be2295a9c77608142a", - "size": 4916192, - "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20230317195124.tar.gz", + "checksum": "99a6f51c86bc35826bbb6238f5c019a1db67a3a6a725cb5af0a3a8b08665b27f", + "contents_checksum": "311aebedf540d23402665c67a125ba7342bc01524cf3b86f361c991052db0485", + "size": 4916010, + "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -769,16 +769,16 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { "data": { - "checksum": "79242a945bf952a935039590440dbb6cef9323285378255ae25d0719e18590b6", - "contents_checksum": "546d214135b59654bdac7837244ed0b054257202f64561d0aa66707df13f25d5", - "size": 4784421, - "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20230317195124.tar.gz", + "checksum": "e34f285a94e28318a0d7cfccf53388a47250c2ee164f33634d9ef9dfe62409e5", + "contents_checksum": "535438cf6e6ac0a8317cb784a875f932a68c32b2cb0cdcd4387b50573b7c8a6b", + "size": 4786620, + "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -804,8 +804,8 @@ }, "platform_required": false, "version": { - "build_number": 20230317195124, - "version_string": "1.9.73" + "build_number": 20230410222307, + "version_string": "1.9.74" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20230324213959.tar.gz", + "source": "components/google-cloud-sdk-beta-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230324213959, - "version_string": "2023.03.24" + "build_number": 20230410222307, + "version_string": "2023.04.10" } }, { @@ -1765,10 +1765,10 @@ }, { "data": { - "checksum": "3b47dbf200e0e1bca926b81c1afd298e934a01fdbd32aea7693cf73561863dab", - "contents_checksum": "d48d61610fb430f82fea456da8c96d1729e8c5923a6a497f8ac98f50b07cf12d", - "size": 1661040, - "source": "components/google-cloud-sdk-bq-20230324213959.tar.gz", + "checksum": "4a06cd26e6c56d79e5af12c8333f003e92f09af3a0018e58f315a62ca016dc8b", + "contents_checksum": "1ed865efe8040709ef0236d2506997639c06f83ef7dc32fef5dfe1c125b9e6fb", + "size": 1661255, + "source": "components/google-cloud-sdk-bq-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -1787,8 +1787,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230324213959, - "version_string": "2.0.89" + "build_number": 20230410222307, + "version_string": "2.0.90" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.4.9" + "version_string": "1.5.2" } }, { "data": { - "checksum": "ea602c838b974d60bfaf51b16130f4c5a59463cc76a1c62f2df2eb374e3fbc4d", - "contents_checksum": "e3e477fda5304af371044feb9e49badd4f140e00868de5fb447af7cb07e351d8", - "size": 30082563, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20230120151534.tar.gz", + "checksum": "7f2760004610137539f4acd364803170377bdd46610009fa87516d78d8ea6f00", + "contents_checksum": "5c69f77ead6547b8731e318fc4d7a292c5d4f36976505cf4bd67c8900d946685", + "size": 30132273, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20230331214548.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,8 @@ }, "platform_required": false, "version": { - "build_number": 20230120151534, - "version_string": "1.4.9" + "build_number": 20230331214548, + "version_string": "1.5.2" } }, { @@ -3322,10 +3322,10 @@ }, { "data": { - "checksum": "4a4a8f391b47659020d4721ccabe62bdb9084f25e6273dcd8f9828ba50b7384d", - "contents_checksum": "b59d6252aed8d184e07cfc238a39807f364bb2125941127c417234200368a143", - "size": 21033675, - "source": "components/google-cloud-sdk-core-20230324213959.tar.gz", + "checksum": "53a5066680e61999e1418ec7ebbb9efe5d087b4bf52b298f75071acbeadd666a", + "contents_checksum": "0b0ffc99b9c7f62dc21f83ee9ba3a0df6500a189506a1cb7d69998840abbb931", + "size": 21202857, + "source": "components/google-cloud-sdk-core-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -3346,8 +3346,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230324213959, - "version_string": "2023.03.24" + "build_number": 20230410222307, + "version_string": "2023.04.10" } }, { @@ -4138,10 +4138,10 @@ }, { "data": { - "checksum": "0ca9f8770b5e9f47e1087632b887804b2300c7251f9758a3d3dfce8517c3a983", - "contents_checksum": "7daf6ace54f867880a3559f866438575bfb4d5cc0c7f10ec2853b0a140ad9506", - "size": 11784358, - "source": "components/google-cloud-sdk-gcloud-deps-20230224152814.tar.gz", + "checksum": "af7ff3a8ec7d8a733a0b88910d569c9d3f7171e3fdbce88e45872fe05991da03", + "contents_checksum": "e222736b661e5d516690cdc360cedb56a7440209caef906afcc3b23f754a086a", + "size": 11797805, + "source": "components/google-cloud-sdk-gcloud-deps-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -4164,8 +4164,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230224152814, - "version_string": "2023.02.24" + "build_number": 20230410222307, + "version_string": "2023.04.10" } }, { @@ -4401,10 +4401,10 @@ }, { "data": { - "checksum": "4c7ad4739caa2b6e82874fcb8852bce5b59ec5b7afe0626ec1eb735969f359c4", - "contents_checksum": "9ef5c8334b61e432e6471551f8de1dc66dcd09883d302dd559c315340ea7c958", - "size": 5797405, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20230324213959.tar.gz", + "checksum": "026737be09469f6f33f0a93f2aa77db18f4b8e95c3a1fbb99e6e4149338e0abd", + "contents_checksum": "61b69e3108f54924f32b786e45010f4e32f9daf0398d89076b3cc7487bc0dcb6", + "size": 5846262, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -4429,7 +4429,7 @@ }, "platform_required": false, "version": { - "build_number": 20230324213959, + "build_number": 20230410222307, "version_string": "" } }, @@ -4816,15 +4816,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "2.0.2" + "version_string": "2.0.3" } }, { "data": { - "checksum": "314cd1c85749247e679f0554bc216a6631b7ae18a02d970025d1e3b802508dd1", - "contents_checksum": "83745593b4e201ea34f8578a971dcedd716d7c27e30f645a5a04304449d3c994", - "size": 23351443, - "source": "components/google-cloud-sdk-harbourbridge-linux-x86_64-20230217153950.tar.gz", + "checksum": "bba42d44c83d7ab0a2437ae561ee718d215dd55b6525aa8635d7726ab4638a80", + "contents_checksum": "da61f9f44c74667079644f3cce92f9054195920ef9adfecea7b7761e75795f2a", + "size": 23362209, + "source": "components/google-cloud-sdk-harbourbridge-linux-x86_64-20230331214548.tar.gz", "type": "tar" }, "dependencies": [ @@ -4848,8 +4848,8 @@ }, "platform_required": false, "version": { - "build_number": 20230217153950, - "version_string": "2.0.2" + "build_number": 20230331214548, + "version_string": "2.0.3" } }, { @@ -6042,15 +6042,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.29.0" + "version_string": "1.30.1" } }, { "data": { - "checksum": "4ea0b739eb65fcf33b30d91dbc9faf00b4a32d57e50a20d210ec3c643fd0030c", - "contents_checksum": "8a085a785886f0674b1b16cf3498918433cf45b4a40ccca6bdf94dfa423bf582", - "size": 32825665, - "source": "components/google-cloud-sdk-minikube-darwin-arm-20230130152419.tar.gz", + "checksum": "fcd7eb541df45b734090b1984028a854f1539d8ba71ef98de639776f2e68b893", + "contents_checksum": "d9d5530acc0876431aaa532d12fac62b35451ca1b59873f51d2856c78cfbafc2", + "size": 33392192, + "source": "components/google-cloud-sdk-minikube-darwin-arm-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6074,16 +6074,16 @@ }, "platform_required": false, "version": { - "build_number": 20230130152419, - "version_string": "1.29.0" + "build_number": 20230410222307, + "version_string": "1.30.1" } }, { "data": { - "checksum": "27237e4e99ad9ac791e87fbee351ef9508646877666eac8e8a7faa243f914748", - "contents_checksum": "213568c7c35f279849046e215835f0df4822a21a81ac2d213d7097b96dfe4e7b", - "size": 34129820, - "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20230130152419.tar.gz", + "checksum": "ed6c4dc9b46d225373171ebc9d62d96a932b629b4acf9697d6a82c5b5990ea7c", + "contents_checksum": "618beafd3210c57672a9a2ba1059b58c31b0cec781e5012f750e9a6e4fa822fc", + "size": 34851037, + "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6107,16 +6107,16 @@ }, "platform_required": false, "version": { - "build_number": 20230130152419, - "version_string": "1.29.0" + "build_number": 20230410222307, + "version_string": "1.30.1" } }, { "data": { - "checksum": "db8df83660a68a2aa7e5367382ac7e32e66bfee34cc00a9d92ce9ed11a5180cb", - "contents_checksum": "90c2a28e55e7481ac9d0c22cb413c8a867130a23710d45d8d78236e5c15a3f0b", - "size": 32276350, - "source": "components/google-cloud-sdk-minikube-linux-arm-20230130152419.tar.gz", + "checksum": "4c8106ae353c735dc2bcd78f3e20f71da145d742f1cfadd578d20b915a702443", + "contents_checksum": "f936ecc7e890dd76279e6d9ad3aa611044300e0e1bcce25d410daaeca7a9c31d", + "size": 32850885, + "source": "components/google-cloud-sdk-minikube-linux-arm-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6140,16 +6140,16 @@ }, "platform_required": false, "version": { - "build_number": 20230130152419, - "version_string": "1.29.0" + "build_number": 20230410222307, + "version_string": "1.30.1" } }, { "data": { - "checksum": "29c988a8465d62ecc9fc349ccc08434d2dbe2371c135efc073bfd47478d5df04", - "contents_checksum": "a02dd25832f1694763d660d4174fe3acb81c0fbf3b6e33887107e273103ce3f0", - "size": 34747405, - "source": "components/google-cloud-sdk-minikube-linux-x86_64-20230130152419.tar.gz", + "checksum": "76dd82f9f3b33058dd0000e5746ef00002d920c8f783aaec219496d1612e89f6", + "contents_checksum": "51b92727f6f319db2b7b611e311867b20e95a164ff1703f7f40dc83aa620f29e", + "size": 35423805, + "source": "components/google-cloud-sdk-minikube-linux-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6173,16 +6173,16 @@ }, "platform_required": false, "version": { - "build_number": 20230130152419, - "version_string": "1.29.0" + "build_number": 20230410222307, + "version_string": "1.30.1" } }, { "data": { - "checksum": "3e52bad758b1183061f44b25d5f888b49ff28760a72e153097d88e8939dbe2eb", - "contents_checksum": "4a8e3af29021959409e6dcdab134856d19870413d5ab45fa6b4d39d86ac93e05", - "size": 34656565, - "source": "components/google-cloud-sdk-minikube-windows-x86_64-20230130152419.tar.gz", + "checksum": "c6a9264d1e47c1f2968d5688e4a1c04db1ef03e4d0814adb838d9cc41ee9d1fc", + "contents_checksum": "8cc516c4cfa46110a53031c7a9308babb52f8a844f69b1fb0f821fe4a6e6625a", + "size": 35332823, + "source": "components/google-cloud-sdk-minikube-windows-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6206,8 +6206,8 @@ }, "platform_required": false, "version": { - "build_number": 20230130152419, - "version_string": "1.29.0" + "build_number": 20230410222307, + "version_string": "1.30.1" } }, { @@ -6567,15 +6567,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "2.2.0" + "version_string": "2.3.0" } }, { "data": { - "checksum": "b9b59001689844455aa32ec96c640dba5735173af66b97ea402bae8ae027f8de", - "contents_checksum": "1791d865c984e03c4191059b725250e30d43b4e7f1c5f09770ce978f3bbde75a", - "size": 22766948, - "source": "components/google-cloud-sdk-skaffold-darwin-arm-20230310163703.tar.gz", + "checksum": "37a66708e57ae8b4eb7609896cc56c15c128b66af9f7fee44d9b9d92aaa54088", + "contents_checksum": "5df531a5b9e6fac2bec4fd7541836cbb4ff49b5937b55e5d6ca4d8e05f1770d0", + "size": 22835187, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6600,16 +6600,16 @@ }, "platform_required": false, "version": { - "build_number": 20230310163703, - "version_string": "2.2.0" + "build_number": 20230410222307, + "version_string": "2.3.0" } }, { "data": { - "checksum": "aafd765077e12d0cf0538e59aeaa085484cdbff9fec07141463947713448a174", - "contents_checksum": "5adffa90737720264f1c24349d96f39e2cbf2038f7d53f82365aa690360047ac", - "size": 24854301, - "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20230310163703.tar.gz", + "checksum": "37d557756347bccd89d74d44e8f6474d43d856f03e105d82ba40653dc84c41ad", + "contents_checksum": "75a9ec0576d9ed37961ed276eaf6037c8b59747f18beb2a4b6b6c022e4e79d7e", + "size": 24930459, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6634,16 +6634,16 @@ }, "platform_required": false, "version": { - "build_number": 20230310163703, - "version_string": "2.2.0" + "build_number": 20230410222307, + "version_string": "2.3.0" } }, { "data": { - "checksum": "9c99d844f0fe12b8f978cd0a3e3e559d2683204816f3c697bb5fcd98119db27a", - "contents_checksum": "60e8f9ea27e7b6069aec9c27225d78acdd18006be5f2f2375d878dd27287acfe", - "size": 20894227, - "source": "components/google-cloud-sdk-skaffold-linux-arm-20230310163703.tar.gz", + "checksum": "73b00f22c3a09f37722360e61c5e74467bce8a9a7d8317b8bde215090c164a47", + "contents_checksum": "ca80ad12d1ae70fefb70c8e6200523e7627c5746a9333841d865c8ebabafaf3c", + "size": 20964851, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6668,16 +6668,16 @@ }, "platform_required": false, "version": { - "build_number": 20230310163703, - "version_string": "2.2.0" + "build_number": 20230410222307, + "version_string": "2.3.0" } }, { "data": { - "checksum": "bc105b801f07b7ec40fdf21a6cbda74b0296ef393499591945d52a30b7048a1b", - "contents_checksum": "4d806d68d659adca5afeda4f874ac7570b4689552da06818f70d0d4585243334", - "size": 23019290, - "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20230310163703.tar.gz", + "checksum": "5cb36aa3040f04d48048eda22f9833fbfb0659623f7c255afb3e23865f875d63", + "contents_checksum": "8157e8582ca8e284605cb2ca0f33c53ebd0514332e8b8b427990b2190e21e9b6", + "size": 23084056, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6702,16 +6702,16 @@ }, "platform_required": false, "version": { - "build_number": 20230310163703, - "version_string": "2.2.0" + "build_number": 20230410222307, + "version_string": "2.3.0" } }, { "data": { - "checksum": "a43c732a5a7187e5220158a5e6eab72ef5f26dffc1084a6c1ff8076c012071c3", - "contents_checksum": "27d3c2fde09d868bcceac3019b23f0b1ba149881ba34efc230280db4bacba690", - "size": 23127429, - "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20230310163703.tar.gz", + "checksum": "64ca050875949ae4d11aec1d976d847497c94f48d44e4893b28645fa4d2d8552", + "contents_checksum": "8fcd773de270da033fee3be73138eeb1b4e956178536ad2c1e85141d3438b1a2", + "size": 23197474, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -6736,8 +6736,8 @@ }, "platform_required": false, "version": { - "build_number": 20230310163703, - "version_string": "2.2.0" + "build_number": 20230410222307, + "version_string": "2.3.0" } }, { @@ -6993,10 +6993,10 @@ }, { "data": { - "checksum": "baef1cb23fbbcb6ea59128acf39fa82d40b920b6e9e445a131026baff61b7e62", - "contents_checksum": "e45b545e37843251cc469789ade92922e370e30dcb7d558ed23218ea68bbb92f", - "size": 37458368, - "source": "components/google-cloud-sdk-tests-20230324213959.tar.gz", + "checksum": "c33a7e819bac731e0ed03586bb44f7860593685f21fc078eb24d5892415cb335", + "contents_checksum": "3c525f6eb474de59010c4abb3b932449712a6aaedda8e7b0384e3056f28a97d4", + "size": 37555440, + "source": "components/google-cloud-sdk-tests-20230410222307.tar.gz", "type": "tar" }, "dependencies": [ @@ -7013,8 +7013,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230324213959, - "version_string": "2023.03.24" + "build_number": 20230410222307, + "version_string": "2023.04.10" } } ], @@ -7033,11 +7033,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20230324213959, + "revision": 20230410222307, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "424.0.0" + "version": "426.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index e7d0e2782d1b..9d5eab65ddf8 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "424.0.0"; + version = "426.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-424.0.0-linux-x86_64.tar.gz"; - sha256 = "063bd6994c2z43s8ap47sgzw9dhvzw4m0gb2jw7jwd93dxi3kv8z"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-linux-x86_64.tar.gz"; + sha256 = "04rfabif4d6760dfsbhs3qfzinzspb5hvnp17h7f0jvl5vciz5jg"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-424.0.0-darwin-x86_64.tar.gz"; - sha256 = "01a870vi591llsvn2a9bgcpikyylgh0arpx5s8dhvxafdlpf67mw"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-darwin-x86_64.tar.gz"; + sha256 = "02w6mls2k8kw4qyn79zzbkwp1x4lpwdaxnhv3pgb5c8cdfhmi7hw"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-424.0.0-linux-arm.tar.gz"; - sha256 = "021w871qdd2iiqmzpdmmfcybbq0hs5q1nismyp71bbrqgxfp0jk7"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-linux-arm.tar.gz"; + sha256 = "1mak6vd0asdyl7qjr59qc6m82i0bacbmvi187xgm8fmzm49nqnn2"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-424.0.0-darwin-arm.tar.gz"; - sha256 = "0l6ig8pa19sn5jsm4p76g410704qq9ac7gclqysa3ksm5dk9p3fg"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-darwin-arm.tar.gz"; + sha256 = "16rizpxd9i8wmh120pnd7jks2c2ff4anhgpdglmfklfdd5n7bjig"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-424.0.0-linux-x86.tar.gz"; - sha256 = "1bvc28zmd0r942b3vk903x42d156rf26mhaml93prn2plvs3xxkg"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-linux-x86.tar.gz"; + sha256 = "19n8xc2bap473q4qp1m01irpmksgdbhx6f9jiwmsxfa0077sj2qy"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index 1309ff63fc35..4a401547eb48 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk" # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="424.0.0" +VERSION="426.0.0" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" From 0628c3de9955d43684face33cbc37392d60a9a4e Mon Sep 17 00:00:00 2001 From: Mykhailo Nikiforov Date: Tue, 18 Apr 2023 22:12:05 +0300 Subject: [PATCH 14/73] tmuxPlugins.dracula: v2.0.0 -> v2.1.0 --- pkgs/misc/tmux-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 374d299be48a..73e994458ee4 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -198,12 +198,12 @@ in rec { dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; rev = "v${version}"; - sha256 = "ILs+GMltb2AYNUecFMyQZ/AuETB0PCFF2InSnptVBos="; + sha256 = "89S8LHTx2gYWj+Ejws5f6YRQgoj0rYE7ITtGtZibl30="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; From 6f6df175b00805eed4385393f7f18ad7f07f41ce Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 18 Apr 2023 01:00:49 -0500 Subject: [PATCH 15/73] twm: 0.1.1 -> 0.4.0 --- pkgs/tools/misc/twm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 9109547a1d33..524f74f33182 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.1.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YURzNHbmGLEqNEcc4FImIqn/KcRwGdxYXM5QzM3dxbo="; + sha256 = "sha256-CC3FlEX86mrRi+TFOoswHEaxKbvFm5fHSqbikgZdPA8="; }; - cargoHash = "sha256-sc2/eQZjY1x5KIzQ+yr8NgAMKJ6iHWwCy6fRSBp7Fw4="; + cargoHash = "sha256-TCqXoFkxwqYuztaPdtfcSVL6psYkVaafOrUT6bUd8ig="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -26,6 +26,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A customizable workspace manager for tmux"; homepage = "https://github.com/vinnymeller/twm"; + changelog = "https://github.com/vinnymeller/twm/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ vinnymeller ]; }; From 4cbbdaa8a28a4f0eabc9a495d152b214fe999b9f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Apr 2023 04:20:00 +0000 Subject: [PATCH 16/73] twilio-cli: 5.6.0 -> 5.7.0 https://github.com/twilio/twilio-cli/releases/tag/5.7.0 --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index d670d2502d9b..b4ef90bae6eb 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.6.0"; + version = "5.7.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-M6UQ6P021FYQOSZ3AXfXHDgD8NLkcdhzfDin9ElXyNU="; + sha256 = "sha256-qlStCQKm+L50n3oFCuP+M4zzonmlx9gpDrGeNZ2Ex8A="; }; buildInputs = [ nodejs ]; From 75eb0a3f6f7a1cc89aad5ee0a6616cbb912b770c Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Thu, 20 Apr 2023 18:27:52 +0800 Subject: [PATCH 17/73] qq: add missing dependencies --- .../instant-messengers/qq/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 32d34787d657..9f037845def6 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -6,6 +6,7 @@ , glib , gtk3 , lib +, libappindicator , libdrm , libgcrypt , libkrb5 @@ -14,6 +15,7 @@ , xorg , systemd , stdenv +, vips , at-spi2-core , autoPatchelfHook , wrapGAppsHook @@ -49,18 +51,20 @@ stdenv.mkDerivation { alsa-lib at-spi2-core cups - gtk3 glib + gtk3 libdrm libgcrypt libkrb5 mesa nss + vips xorg.libXdamage ]; - runtimeDependencies = [ - (lib.getLib systemd) + runtimeDependencies = map lib.getLib [ + libappindicator + systemd ]; installPhase = '' @@ -74,9 +78,16 @@ stdenv.mkDerivation { --replace "/usr/share" "$out/share" ln -s $out/opt/QQ/qq $out/bin/qq + # Remove bundled libraries + rm -r $out/opt/QQ/resources/app/sharp-lib + runHook postInstall ''; + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ gjs ]}") + ''; + meta = with lib; { homepage = "https://im.qq.com/linuxqq/"; description = "Messaging app"; From 9df4441b52279528fe73c7e73a7e8ca45fe65a9d Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 20 Apr 2023 13:33:04 +0300 Subject: [PATCH 18/73] netbird: format using nixpkgs-fmt --- pkgs/tools/networking/netbird/default.nix | 72 ++++++++++++++--------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 0323c8e6f855..eaa905939c06 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -1,16 +1,31 @@ -{ stdenv, lib, nixosTests, buildGoModule, fetchFromGitHub, installShellFiles +{ stdenv +, lib +, nixosTests +, buildGoModule +, fetchFromGitHub +, installShellFiles , pkg-config -, gtk3, libayatana-appindicator, libX11, libXcursor, libXxf86vm -, Cocoa, IOKit, Kernel, UserNotifications, WebKit -, ui ? false }: +, gtk3 +, libayatana-appindicator +, libX11 +, libXcursor +, libXxf86vm +, Cocoa +, IOKit +, Kernel +, UserNotifications +, WebKit +, ui ? false +}: let - modules = if ui then { - "client/ui" = "netbird-ui"; - } else { - client = "netbird"; - management = "netbird-mgmt"; - signal = "netbird-signal"; - }; + modules = + if ui then { + "client/ui" = "netbird-ui"; + } else { + client = "netbird"; + management = "netbird-mgmt"; + signal = "netbird-signal"; + }; in buildGoModule rec { pname = "netbird"; @@ -61,25 +76,26 @@ buildGoModule rec { --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' ''; - postInstall = lib.concatStringsSep "\n" (lib.mapAttrsToList - (module: binary: '' - mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} - '' + lib.optionalString (!ui) '' - installShellCompletion --cmd ${binary} \ - --bash <($out/bin/${binary} completion bash) \ - --fish <($out/bin/${binary} completion fish) \ - --zsh <($out/bin/${binary} completion zsh) - '') - modules) + lib.optionalString (stdenv.isLinux && ui) '' - mkdir -p $out/share/pixmaps - cp $src/client/ui/disconnected.png $out/share/pixmaps/netbird.png + postInstall = lib.concatStringsSep "\n" + (lib.mapAttrsToList + (module: binary: '' + mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} + '' + lib.optionalString (!ui) '' + installShellCompletion --cmd ${binary} \ + --bash <($out/bin/${binary} completion bash) \ + --fish <($out/bin/${binary} completion fish) \ + --zsh <($out/bin/${binary} completion zsh) + '') + modules) + lib.optionalString (stdenv.isLinux && ui) '' + mkdir -p $out/share/pixmaps + cp $src/client/ui/disconnected.png $out/share/pixmaps/netbird.png - mkdir -p $out/share/applications - cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop + mkdir -p $out/share/applications + cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop - substituteInPlace $out/share/applications/netbird.desktop \ - --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" - ''; + substituteInPlace $out/share/applications/netbird.desktop \ + --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" + ''; passthru.tests.netbird = nixosTests.netbird; From 8374a081bf4382c80dfd92a179031f06c7561543 Mon Sep 17 00:00:00 2001 From: holyparzival Date: Thu, 20 Apr 2023 15:34:20 +0500 Subject: [PATCH 19/73] mpvScripts.mpvacious: 0.20 -> 0.23 --- pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index af033781ac2c..2ba2b80cbdcb 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.20"; + version = "0.23"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8="; + sha256 = "sha256-b0JUT5Y0u/H9p5whuFTU8EgQnKzFCUR2HA9NO+mxe04="; }; postPatch = '' From 3288cbdd097da51b371e6d6d1cabe72644d69c9a Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 20 Apr 2023 13:33:25 +0300 Subject: [PATCH 20/73] netbird: 0.14.6 -> 0.16.0 Also add updateScript --- pkgs/tools/networking/netbird/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index eaa905939c06..93ce3a08308a 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , nixosTests +, nix-update-script , buildGoModule , fetchFromGitHub , installShellFiles @@ -29,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.14.6"; + version = "0.16.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S11PshEVwOYPb8RGs5joC3Cr8CNKAenK6JRd/oV4LNQ="; + sha256 = "sha256-HtkMwy+8Af69vOz9VYMozOzW/W7CFSXlWR0vLlmYCeY="; }; - vendorHash = "sha256-RyTfEZPwr2CNb9M8vGmo4gtbqQDh2KWApyz2Yx6qPmk="; + vendorHash = "sha256-lag/usfAvpZhWeVe1wB3SJJsTCLcBeh04RvkE803OqQ="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -61,7 +62,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/netbirdio/netbird/client/system.version=${version}" + "-X github.com/netbirdio/netbird/version.version=${version}" "-X main.builtBy=nix" ]; @@ -97,7 +98,10 @@ buildGoModule rec { --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" ''; - passthru.tests.netbird = nixosTests.netbird; + passthru = { + tests.netbird = nixosTests.netbird; + updateScript = nix-update-script { }; + }; meta = with lib; { homepage = "https://netbird.io"; From d5bb5259e4ea86ab1e472dc4d1bcf897d0f6fba8 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 20 Apr 2023 13:55:09 +0300 Subject: [PATCH 21/73] nixos/netbird: allow configuring dns --- nixos/modules/services/networking/netbird.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 5bd9e9ca6169..647c0ce3e6d1 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -41,9 +41,10 @@ in { documentation = [ "https://netbird.io/docs/" ]; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ + openresolv + ]; serviceConfig = { - AmbientCapabilities = [ "CAP_NET_ADMIN" ]; - DynamicUser = true; Environment = [ "NB_CONFIG=/var/lib/netbird/config.json" "NB_LOG_FILE=console" From 99b4bedef83d05269215ad28ac2cd416fb0cd993 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 20 Apr 2023 14:14:59 +0200 Subject: [PATCH 22/73] python3Packages.ducc0: 0.29.0 -> 0.30.0 --- pkgs/development/python-modules/ducc0/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 3c2cdcd0eaa9..491e274bf798 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.29.0"; + version = "0.30.0"; disabled = pythonOlder "3.7"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-lI0h1dn+7qY6I4FWn7wFFu1mlqIILTX4wD8YjLzFt9c="; + hash = "sha256-xYjgJGtWl9AjnzlFvdj/0chnIUDmoH85AtKXsNBwWUU="; }; buildInputs = [ pybind11 ]; From ef3aae1a63fe8905f18a5360cdee3e1da3a0fa95 Mon Sep 17 00:00:00 2001 From: Stef Dunlap Date: Thu, 20 Apr 2023 12:34:54 -0400 Subject: [PATCH 23/73] opera: add kindrowboat (myself) as maintainer --- pkgs/applications/networking/browsers/opera/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 99ec447b6db7..be8a180b326f 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -137,5 +137,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ kindrowboat ]; }; } From b4841b7bda83492072aabca7cc93780a33ccf230 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 21 Apr 2023 03:15:34 +0800 Subject: [PATCH 24/73] speedtest-go: 1.5.2 -> 1.6.0 --- pkgs/tools/networking/speedtest-go/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index c2ebe7077562..8337e62a0dc7 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9jLreb3tEw5bCVka6/BzGbsd5V3+9OHNzENe/IxL1YM="; + hash = "sha256-LpsesUC0Cj9pkc/6c0wDEl6X9Y6GqwACwVv7J31TTg0="; }; - vendorHash = "sha256-A54G3fvs1bXSwPHVUNFC9VJqydqYR5t4I2fIBvrVoRE="; + vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; - subPackages = [ "speedtest.go" ]; + excludedPackages = [ "example" ]; # test suite requires network doCheck = false; @@ -27,6 +27,5 @@ buildGoModule rec { changelog = "https://github.com/showwin/speedtest-go/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aleksana ]; - mainProgram = "speedtest"; }; } From e14c31bb5f52182e9c94235dada8bf59f997855c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 19:45:21 +0000 Subject: [PATCH 25/73] konstraint: 0.27.0 -> 0.27.1 --- pkgs/development/tools/konstraint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index d08aee214a96..2a3eb62f4e98 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8n9VDFDpadbToHeefZLsqlRMwKPxDbQtjuDiOpts3qc="; + sha256 = "sha256-Ax85ePUzwzOP0dFtNxNj7/UvoyijuCnlqZokl4rGRZk="; }; - vendorHash = "sha256-fQZNQiyDpkPqwZXGEFPsUbEK7qvTObfDeA4PbS0TxAo="; + vendorHash = "sha256-9CDond0OMnqvsLipEqnxbXZD6v/w+CJkPophBUchb7s="; # Exclude go within .github folder excludedPackages = ".github"; From c188116f4d414bd2ce4e231929ada79e838eff4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 20:16:42 +0000 Subject: [PATCH 26/73] topicctl: 1.7.0 -> 1.9.1 --- pkgs/tools/misc/topicctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 26d7ac3971d7..fced21eb79c7 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.7.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-eHFqczZtJWcZ4ZVOzpCUlVoCJ7wjyWNpFfiZ9MaJHOI="; + sha256 = "sha256-R6Dw6/pgXUmQrq8iD93h64VVEvB4TBEcGb2Rbg6kTp0="; }; - vendorSha256 = "sha256-50UDRf8S9Yl0zwGOrFLa5L1TmSKF4RQ/ju0tnFzs56M="; + vendorHash = "sha256-UJ7U9CfQHKgK7wfb8zqLZ7na4OBBZBYiGayII3RTaiQ="; ldflags = [ "-X main.BuildVersion=${version}" From 490dc110824f834522b05e7e4bf8b88dc9824ad8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 20:49:47 +0000 Subject: [PATCH 27/73] elfinfo: 1.2.1 -> 1.2.2 --- pkgs/development/tools/misc/elfinfo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index c29a4cdccf9b..5ea97b77eeb8 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "elfinfo"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "xyproto"; repo = "elfinfo"; rev = version; - sha256 = "sha256-vnlPSNyabFjucxHU1w5EPIO9UmTiuCKEzGMC+EZRTtM="; + sha256 = "sha256-HnjHOjanStqmDXnc6Z9w0beCMJFf/ndWbYxoDEaOws4="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Small utility for showing information about ELF files"; From e41c5694290160d02ad776b1e4c446683f93225a Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 20 Apr 2023 23:48:58 +0200 Subject: [PATCH 28/73] nixos/authelia: Allow using Unix sockets --- nixos/modules/services/security/authelia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 143c441c7e15..28c5fd0a1df5 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -336,7 +336,7 @@ in ProtectProc = "noaccess"; ProtectSystem = "strict"; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; From 6fc1a1c91af4fe3b33abcbc78140005f720233eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Apr 2023 15:23:29 -0700 Subject: [PATCH 29/73] rapidfuzz-cpp: 1.11.2 -> 1.11.3 Diff: https://github.com/maxbachmann/rapidfuzz-cpp/compare/v1.11.2...v1.11.3 Changelog: https://github.com/maxbachmann/rapidfuzz-cpp/blob/v1.11.3/CHANGELOG.md --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 227d6ab10af4..2333b63057e2 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-1TO0CVq/b9odiwnfOQAcPiSM4EuxIAUPs+zS3F0caHg="; + hash = "sha256-Qqdw5dy+JUBSDpbWEh3Ap3+3h+CcNdfBL+rloRzWGEQ="; }; nativeBuildInputs = [ From bf1ecad5b6d82347d3b7dc8d66f3930ca4f16a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Apr 2023 16:31:33 -0700 Subject: [PATCH 30/73] python310Packages.cleo: relax rapidfuzz version contraint --- pkgs/development/python-modules/cleo/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index ce4b9237745a..ab3eb9514d15 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -5,6 +5,7 @@ , poetry-core , pytest-mock , pytestCheckHook +, pythonRelaxDepsHook , rapidfuzz }: @@ -22,6 +23,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "rapidfuzz" ]; propagatedBuildInputs = [ From 82f1d64ed196117af4d7bbb9da31000381efcd2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Apr 2023 16:32:39 -0700 Subject: [PATCH 31/73] python310Packages.syncedlyrics: relax rapidfuzz version contraint --- pkgs/development/python-modules/syncedlyrics/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index 661fd29a288c..f69ce5fe83e6 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -5,6 +5,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , rapidfuzz , requests }: @@ -25,6 +26,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "rapidfuzz" ]; propagatedBuildInputs = [ From 15b308284216bbdb747e84648f2548370e05eaa7 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 20 Apr 2023 19:04:03 -0600 Subject: [PATCH 32/73] python3Packages.pyqt6: 6.4.2 -> 6.5.0 --- pkgs/development/python-modules/pyqt/6.x.nix | 4 ++-- pkgs/development/python-modules/pyqt6-charts.nix | 4 ++-- pkgs/development/python-modules/pyqt6-webengine.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index efd47df61da1..cac7d2915035 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.4.2"; + version = "6.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dAJE9gj+Fe4diWlcQ/MaFMrspBxPAqw2yG37pKXVgT0="; + hash = "sha256-uXy0vpssiZeQTqZozzsKSuWCIZb3eSWQ0F7N5iFqn7w="; }; patches = [ diff --git a/pkgs/development/python-modules/pyqt6-charts.nix b/pkgs/development/python-modules/pyqt6-charts.nix index 66df9bbf0fbc..6d2a110c8890 100644 --- a/pkgs/development/python-modules/pyqt6-charts.nix +++ b/pkgs/development/python-modules/pyqt6-charts.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "PyQt6_Charts"; - version = "6.4.0"; + version = "6.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tG6xKEBRagOcNvcLs/hCMzf5j94ma1gs6tQEm3e0P2Q="; + sha256 = "sha256-b/APZbJRf5m/EG3dKMdvPKNE+R7PW6aBkeIKLZACSWI="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine.nix index b53714ca322d..d3b70a02f77d 100644 --- a/pkgs/development/python-modules/pyqt6-webengine.nix +++ b/pkgs/development/python-modules/pyqt6-webengine.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "PyQt6_WebEngine"; - version = "6.4.0"; + version = "6.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-THHBMIYKvNEeBMr7IuM5g/qaOu6DI8UZCbFaFwGCjiE="; + hash = "sha256-i6nbVsTBgaKi+rFnPKNeW2PcaRE/CFAn3cQ8cQttbuk="; }; # fix include path and increase verbosity From e910b5d5f15a05edc9512baf3844a0a7cec21775 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 21 Apr 2023 01:06:05 +0000 Subject: [PATCH 33/73] artyFX: unstable-2020-04-28 -> 1.3.1 (#227029) --- pkgs/applications/audio/artyFX/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 2bf6b2a8046f..f68c6fa5c7dc 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "artyFX"; - # Fix build with lv2 1.18: https://github.com/openAVproductions/openAV-ArtyFX/pull/41/commits/492587461b50d140455aa3c98d915eb8673bebf0 - version = "unstable-2020-04-28"; + version = "1.3.1"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa"; - sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; + rev = "release-${version}"; + hash = "sha256-GD9nwXdXSJX5OvAMxEAnngkvRW+E1jrNfWXK122bsTM="; }; nativeBuildInputs = [ cmake pkg-config ]; From 6d068eb4bbea88f488ab500e7297b6f3bd9fc290 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Fri, 21 Apr 2023 03:19:10 +0400 Subject: [PATCH 34/73] paperwm: 2022-12-14 -> 2023-04-20 --- pkgs/desktops/gnome/extensions/paperwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 7c63248dfee4..b90a363581e1 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "gnome-shell-extension-paperwm"; - version = "unstable-2022-12-14"; + version = "unstable-2023-04-20"; src = fetchFromGitHub { owner = "paperwm"; repo = "PaperWM"; - rev = "7c0863c944a02d4e8095034403bff6ade3579091"; - hash = "sha256-EN0sWW/NymRNKrApeFnqg8ax7Et4hr0gKZuvMF4kJYU="; + rev = "1130b663806d6daba1c8355c4b99c287d237e918"; + hash = "sha256-JlamW5DznVZ8G0REqXcxEt/IlHa3GMN184WFpeclhd4="; }; dontConfigure = true; From 574ad5d1e852fd1cb956fe64e8af37ec3781c59a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:01:28 -0300 Subject: [PATCH 35/73] tap-plugins: change self to finalAttrs --- pkgs/applications/audio/tap-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index cde74ae96ca0..7cd64eb42086 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -4,7 +4,7 @@ , ladspa-sdk }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "tap-plugins"; version = "unstable-2020-12-09"; From 7f5ff5eeeb1b6289637767a4b25346c79ca7e718 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:01:54 -0300 Subject: [PATCH 36/73] moe: change self to finalAttrs --- pkgs/applications/editors/moe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 197cccd43c3f..71449a0b8a80 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -5,12 +5,12 @@ , ncurses }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "moe"; version = "1.13"; src = fetchurl { - url = "mirror://gnu/moe/moe-${self.version}.tar.lz"; + url = "mirror://gnu/moe/moe-${finalAttrs.version}.tar.lz"; hash = "sha256-Q6VXvFEvidbHGOX0ECnP46BVaCYg642+zmMC80omFGs="; }; From 5243957ed34fc4983ec49431ab0c7d2ec7d70467 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:03:06 -0300 Subject: [PATCH 37/73] ppsspp: change self to finalAttrs --- pkgs/applications/emulators/ppsspp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 29b64ebb6bd8..afa361903f51 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -29,7 +29,7 @@ let in # Only SDL frontend needs to specify whether to use Wayland assert forceWayland -> !enableQt; -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "ppsspp" + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" @@ -39,13 +39,13 @@ stdenv.mkDerivation (self: { src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; }; postPatch = '' - substituteInPlace git-version.cmake --replace unknown ${self.src.rev} + substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share ''; From 96baf95cfeac39c2bb1a7c05071fcbbfe9b35ecf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:08:15 -0300 Subject: [PATCH 38/73] dosbox-staging: change self to finalAttrs --- pkgs/applications/emulators/dosbox-staging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index e7154aa3b5a9..fca2cf421044 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -29,14 +29,14 @@ , speexdsp }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "dosbox-staging"; version = "0.80.1"; src = fetchFromGitHub { owner = "dosbox-staging"; repo = "dosbox-staging"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; }; From ecde7e476236a323ea00ced82d9665a5affc8dd7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:08:49 -0300 Subject: [PATCH 39/73] rpcemu: change self to finalAttrs --- pkgs/applications/emulators/rpcemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/rpcemu/default.nix b/pkgs/applications/emulators/rpcemu/default.nix index 9befb172fe4b..9fad3725203f 100644 --- a/pkgs/applications/emulators/rpcemu/default.nix +++ b/pkgs/applications/emulators/rpcemu/default.nix @@ -7,13 +7,13 @@ let inherit (qt5) qtbase qtmultimedia wrapQtAppsHook; in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "rpcemu"; version = "0.9.4"; src = fetchhg { url = "http://www.home.marutan.net/hg/rpcemu"; - rev = "release_${self.version}"; + rev = "release_${finalAttrs.version}"; sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI="; }; From 8577d50d0dfb807bc2d885d3f38f4079aee9c3d2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:09:01 -0300 Subject: [PATCH 40/73] xemu: change self to finalAttrs --- pkgs/applications/emulators/xemu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 099fc5acca22..50f2b57f887a 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -25,14 +25,14 @@ , wrapGAppsHook }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "xemu"; version = "0.7.85"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-sVUkB2KegdKlHlqMvSwB1nLdJGun2x2x9HxtNHnpp1s="; fetchSubmodules = true; }; @@ -94,7 +94,7 @@ stdenv.mkDerivation (self: { # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) branch = "master"; commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; - inherit (self) version; + inherit (finalAttrs) version; in '' patchShebangs . configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") @@ -133,7 +133,7 @@ stdenv.mkDerivation (self: { Xbox game console, enabling people to play their original Xbox games on Windows, macOS, and Linux systems. ''; - changelog = "https://github.com/xemu-project/xemu/releases/tag/v${self.version}"; + changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; platforms = with lib.platforms; linux; From aa16ab8a04567793f3253b73ab0f70653fc04fc5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:09:42 -0300 Subject: [PATCH 41/73] yapesdl: change self to finalAttrs --- pkgs/applications/emulators/yapesdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix index 2ea3583edd76..136e6ce4eb89 100644 --- a/pkgs/applications/emulators/yapesdl/default.nix +++ b/pkgs/applications/emulators/yapesdl/default.nix @@ -5,14 +5,14 @@ , SDL2 }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "yapesdl"; version = "0.71.2"; src = fetchFromGitHub { owner = "calmopyrin"; repo = "yapesdl"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k="; }; From bc28e20568bbe617c85f3fb214b18dccbb6f0f6c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:09:53 -0300 Subject: [PATCH 42/73] mpv: change self to finalAttrs --- pkgs/applications/video/mpv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d36e2b677444..5fdb7d24f387 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -82,7 +82,7 @@ let inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); -in stdenv.mkDerivation (self: { +in stdenv.mkDerivation (finalAttrs: { pname = "mpv"; version = "0.35.1"; @@ -91,7 +91,7 @@ in stdenv.mkDerivation (self: { src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; @@ -233,7 +233,7 @@ in stdenv.mkDerivation (self: { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; - changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}"; + changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; From 794ee20683f34faad02db780ca0bccc007644eea Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:10:09 -0300 Subject: [PATCH 43/73] qmplay2: change self to finalAttrs --- pkgs/applications/video/qmplay2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index d4da46cfc887..72dd59613444 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -21,14 +21,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "qmplay2"; version = "23.02.05"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; - rev = self.version; + rev = finalAttrs.version; sha256 = "sha256-ZDpUgD9qTvjopGFVrwTBSEmrXn+4aKq2zeqoTnXwmI8="; fetchSubmodules = true; }; @@ -71,7 +71,7 @@ stdenv.mkDerivation (self: { files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3 browser. ''; - changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${self.version}"; + changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; From b181983d3fdb648d9bf594716fa533cf4a254eea Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:12:31 -0300 Subject: [PATCH 44/73] 2048-cli: change self to finalAttrs --- pkgs/games/2048-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix index bc93d51b10fd..7ef923215d6d 100644 --- a/pkgs/games/2048-cli/default.nix +++ b/pkgs/games/2048-cli/default.nix @@ -8,7 +8,7 @@ }: assert lib.elem ui [ "terminal" "curses" ]; -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "2048-cli"; version = "unstable-2019-12-10"; From f7ad06567ba9548817a7b7780bb463d515d14bcf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:12:46 -0300 Subject: [PATCH 45/73] lbreakouthd: change self to finalAttrs --- pkgs/games/lgames/lbreakouthd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix index 33c219a5f526..d9177c8fb2b2 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -8,12 +8,12 @@ , SDL2_ttf }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "lbreakouthd"; version = "1.1.2"; src = fetchurl { - url = "mirror://sourceforge/lgames/lbreakouthd-${self.version}.tar.gz"; + url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; hash = "sha256-fK7w5uS7zPJnbEmY3YpxoA9cGuooQbVlDB9Mu6yB8hw="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation (self: { hardeningDisable = [ "format" ]; passthru.updateScript = directoryListingUpdater { - inherit (self) pname version; + inherit (finalAttrs) pname version; url = "https://lgames.sourceforge.io/LBreakoutHD/"; extraRegex = "(?!.*-win(32|64)).*"; }; From f1965939513792045f607648c278a7204b90b814 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:14:36 -0300 Subject: [PATCH 46/73] alsa-tools: change self to finalAttrs --- pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix index e0170042027b..10f7f2e64d04 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix @@ -8,12 +8,12 @@ , pkg-config }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-tools"; version = "1.2.5"; src = fetchurl { - url = "mirror://alsa/tools/alsa-tools-${self.version}.tar.bz2"; + url = "mirror://alsa/tools/alsa-tools-${finalAttrs.version}.tar.bz2"; hash = "sha256-NacQJ6AfTX3kci4iNSDpQN5os8VwtsZxaRVnrij5iT4="; }; From ffef4e31487f238de140020b60914c74df0f437e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:16:11 -0300 Subject: [PATCH 47/73] hid-nintendo: change self to finalAttrs --- pkgs/os-specific/linux/hid-nintendo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix index e21fdf58fdf3..7b8c73fc0ccd 100644 --- a/pkgs/os-specific/linux/hid-nintendo/default.nix +++ b/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -4,14 +4,14 @@ , kernel }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "hid-nintendo"; version = "3.2"; src = fetchFromGitHub { owner = "nicman23"; repo = "dkms-hid-nintendo"; - rev = self.version; + rev = finalAttrs.version; hash = "sha256-2a+95zwyhJsF/KSo/Pm/JZ7ktDG02UZjsixSnVUXRrA="; }; From 0845ec7275f20aea2d71071cc56a5217e61ed857 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:16:28 -0300 Subject: [PATCH 48/73] nas: change self to finalAttrs --- pkgs/servers/nas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index e9355f489027..d7f71ff185f5 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -14,12 +14,12 @@ , xorgproto }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "nas"; version = "1.9.5"; src = fetchurl { - url = "mirror://sourceforge/nas/nas-${self.version}.tar.gz"; + url = "mirror://sourceforge/nas/nas-${finalAttrs.version}.tar.gz"; hash = "sha256-t4hK+zj+7AOhlr07fpxHuAPIMOzRDXRV6cl+Eiw3lEw="; }; From 9f4d408fcabb5f1d4bd9f9ca9b92d6f93e590115 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:35:57 -0300 Subject: [PATCH 49/73] podman-desktop: change self to finalAttrs --- .../virtualization/podman-desktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index e574bb32bad1..30dd54ba85ce 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -12,19 +12,19 @@ , makeDesktopItem }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; version = "0.12.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-desktop"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-gEjcI+bfETYZB/pHDXRcNxNVDsbwuqQL1E22fMkIJHI="; }; offlineCache = fetchYarnDeps { - yarnLock = "${self.src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; sha256 = "sha256-x0hqNxi6r1i3vBe1tJQl+Oht2St9VIH3Eq27MZLkojA="; }; @@ -103,7 +103,7 @@ stdenv.mkDerivation (self: { icon = "podman-desktop"; desktopName = "Podman Desktop"; genericName = "Desktop client for podman"; - comment = self.meta.description; + comment = finalAttrs.meta.description; categories = [ "Utility" ]; startupWMClass = "Podman Desktop"; }) @@ -112,7 +112,7 @@ stdenv.mkDerivation (self: { meta = with lib; { description = "A graphical tool for developing on containers and Kubernetes"; homepage = "https://podman-desktop.io"; - changelog = "https://github.com/containers/podman-desktop/releases/tag/v${self.version}"; + changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ panda2134 ]; inherit (electron.meta) platforms; From 768dce7a0d881c2e7fa1617fc3dc360bb630cfee Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:47:20 -0300 Subject: [PATCH 50/73] dwl: change self to finalAttrs --- pkgs/applications/window-managers/dwl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 6e2e45e8b9a6..7bab957da046 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -22,14 +22,14 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "dwl"; version = "0.4"; src = fetchFromGitHub { owner = "djpohly"; repo = "dwl"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; }; @@ -87,7 +87,7 @@ stdenv.mkDerivation (self: { - Limited to 2000 SLOC to promote hackability - Tied to as few external dependencies as possible ''; - changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}"; + changelog = "https://github.com/djpohly/dwl/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.AndersonTorres ]; inherit (wayland.meta) platforms; From d18b9182ffb332192adbacb1d4552ea0b716db21 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:48:07 -0300 Subject: [PATCH 51/73] hypr: change self to finalAttrs --- pkgs/applications/window-managers/hyprwm/hypr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 292894b47a01..18aa5e32261f 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -20,7 +20,7 @@ , xmodmap }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "hypr"; version = "unstable-2023-01-26"; @@ -72,7 +72,7 @@ stdenv.mkDerivation (self: { ''; meta = with lib; { - inherit (self.src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "A tiling X11 window manager written in modern C++"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; From b14126f2a8c5d4d789fd033857f7e6972e43032c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:48:25 -0300 Subject: [PATCH 52/73] katriawm: change self to finalAttrs --- pkgs/applications/window-managers/katriawm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix index 4c75b082506d..27ac9d75e8ae 100644 --- a/pkgs/applications/window-managers/katriawm/default.nix +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -7,13 +7,13 @@ , pkg-config }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "katriawm"; version = "22.12"; src = fetchzip { - name = self.pname + "-" + self.version; - url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz"; + name = finalAttrs.pname + "-" + finalAttrs.version; + url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc="; }; From ee65bb73eea6dfe5c7cb28005bab3d08f950535b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:48:46 -0300 Subject: [PATCH 53/73] labwc: change self to finalAttrs --- pkgs/applications/window-managers/labwc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index db8230e41c5e..4182eb2c6667 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -23,14 +23,14 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "labwc"; version = "0.6.2"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = self.version; + rev = finalAttrs.version; hash = "sha256-yZ1tXx7AA9pFc5C6c/J3B03/TfXw1PsAunNNiee3BGU="; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation (self: { meta = with lib; { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, similar to Openbox"; - changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md"; + changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; From 0b6dff5b3ec97d9e56070004ec53dd3dd6a22e18 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:49:04 -0300 Subject: [PATCH 54/73] pekwm: change self to finalAttrs --- pkgs/applications/window-managers/pekwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index f2d0e1d484d7..dcd2bb27a71d 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -16,14 +16,14 @@ , pkg-config }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "pekwm"; version = "0.3.0"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; - rev = "release-${self.version}"; + rev = "release-${finalAttrs.version}"; hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation (self: { they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md"; + changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; From 4961a108af05ded165c14b8ed2597cc92ba085d7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:49:29 -0300 Subject: [PATCH 55/73] hare: change self to finalAttrs --- pkgs/development/compilers/hare/hare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 297e5e6c82ca..684baf629ef0 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -12,7 +12,7 @@ let inherit (harePackages) harec; in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "hare"; version = "unstable-2023-03-15"; From 072e17f8f2469a33eb4f3747e1343ebd23f35d9a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:49:38 -0300 Subject: [PATCH 56/73] harec: change self to finalAttrs --- pkgs/development/compilers/hare/harec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix index e7902f6c29a5..ef5fae31b364 100644 --- a/pkgs/development/compilers/hare/harec/default.nix +++ b/pkgs/development/compilers/hare/harec/default.nix @@ -4,7 +4,7 @@ , qbe }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "harec"; version = "unstable-2023-02-18"; From cb1c86036fd1d28281cbe1f9d570a815e4b0cba5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:52:47 -0300 Subject: [PATCH 57/73] byacc: change self to finalAttrs --- pkgs/development/tools/parsing/byacc/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index adb8c7bd0422..a04527063a83 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -3,16 +3,14 @@ , fetchurl }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "byacc"; version = "20230219"; src = fetchurl { - urls = let - inherit (self) pname version; - in [ - "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" - "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" + urls = [ + "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz" + "ftp://ftp.invisible-island.net/byacc/byacc-${finalAttrs.version}.tgz" ]; hash = "sha256-NrlyptSul1hN0YaSX7vDl9JssgYyp2wvUqx2U80IG1g="; }; From c910d4628a7fddd6413e096d4460e4a4a986b133 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:53:09 -0300 Subject: [PATCH 58/73] luarocks: change self to finalAttrs --- pkgs/development/tools/misc/luarocks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 581b4eaeb892..c8d36a1e3313 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -17,14 +17,14 @@ , installShellFiles }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "luarocks"; version = "3.9.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-G6HDap3pspeQtGDBq+ukN7kftDaT/CozMVdYM60F6HI="; }; @@ -76,7 +76,7 @@ stdenv.mkDerivation (self: { --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ --suffix PATH : ${lib.makeBinPath ([ unzip ] ++ - lib.optionals (self.pname == "luarocks-nix") [ file nix-prefetch-git ])} + lib.optionals (finalAttrs.pname == "luarocks-nix") [ file nix-prefetch-git ])} } done '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From 68148c702430921c44307ae6a7583cf541b81dc0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:53:23 -0300 Subject: [PATCH 59/73] argbash: change self to finalAttrs --- pkgs/development/tools/misc/argbash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index 1b157702b299..bf33e788633e 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -7,14 +7,14 @@ , runtimeShell }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "argbash"; version = "2.10.0"; src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; - rev = self.version; + rev = finalAttrs.version; hash = "sha256-G739q6OhsXEldpIxiyOU51AmG4RChMqaN1t2wOy6sPU="; }; From a6fb545d93c87fea851eb2db5afea66162576207 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 17:53:37 -0300 Subject: [PATCH 60/73] acr: change self to finalAttrs --- pkgs/development/tools/misc/acr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/acr/default.nix b/pkgs/development/tools/misc/acr/default.nix index 14884f22af80..cfe15ac52150 100644 --- a/pkgs/development/tools/misc/acr/default.nix +++ b/pkgs/development/tools/misc/acr/default.nix @@ -3,14 +3,14 @@ , fetchFromGitHub }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "acr"; version = "2.1.1"; src = fetchFromGitHub { owner = "radareorg"; repo = "acr"; - rev = self.version; + rev = finalAttrs.version; hash = "sha256-JReYgIqQISQuLPd4pUbqbKtBOXT0/YJCn9czz2VTVBs="; }; From ae21df36c52818ba82c69f6ee43b8d21014a9552 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 18:00:56 -0300 Subject: [PATCH 61/73] build-lua-package.nix: change self to finalAttrs --- pkgs/development/interpreters/lua-5/build-lua-package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 0ae950216d8d..d29468df3b4d 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -93,9 +93,9 @@ let ); externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; - luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (self: let + luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (finalAttrs: let - rocksSubdir = "${self.pname}-${self.version}-rocks"; + rocksSubdir = "${finalAttrs.pname}-${finalAttrs.version}-rocks"; luarocks_content = let generatedConfig = luaLib.generateLuarocksConfig { externalDeps = externalDeps ++ externalDepsGenerated; @@ -108,13 +108,13 @@ let ''; in builtins.removeAttrs attrs ["disabled" "externalDeps" "extraVariables"] // { - name = namePrefix + pname + "-" + self.version; + name = namePrefix + pname + "-" + finalAttrs.version; inherit rockspecVersion; nativeBuildInputs = [ wrapLua luarocks - ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs); + ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ finalAttrs.nativeCheckInputs); buildInputs = buildInputs ++ (map (d: d.dep) externalDeps'); From 7fd9a81fc6500773a9706834164967d66c2020af Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 18 Apr 2023 11:35:22 +0800 Subject: [PATCH 62/73] deepin.deepin-editor: 5.10.35 -> 6.0.7 --- .../deepin/apps/deepin-editor/default.nix | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index b83ee544ab63..8724eec96850 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -1,48 +1,34 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory , cmake , pkg-config , qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins , qtbase , qtsvg -, wrapQtAppsHook +, dde-qt-dbus-factory , kcodecs , syntax-highlighting , libchardet , libuchardet , libiconv -, gtest }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "5.10.35"; + version = "6.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-X3tsmtqMUSpYQZqCmgtCLCSGwzSmCZagF7TUWQYJsqU="; + sha256 = "sha256-7dHSybjoWZ1alcMsMm4BEEQJjQgNmhC7Eskeo3ZmoS8="; }; - patches = [ - (fetchpatch { - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; - url = "https://github.com/linuxdeepin/deepin-editor/commit/7f4314f386a3c8f5cdea3618591b8eb027d034c3.patch"; - sha256 = "sha256-/aSBa2nILc/YrFchUyhBHHs2c7Mv6N1juwD5Sdc39Uo="; - }) - ]; - - postPatch = '' - substituteInPlace src/common/utils.h --replace "/usr/share" "$out/share" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -51,18 +37,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase - qtsvg dtkwidget qt5integration qt5platform-plugins + qtbase + qtsvg dde-qt-dbus-factory kcodecs syntax-highlighting libchardet libuchardet libiconv - gtest ]; strictDeps = true; From c6382f654490d6993291d662becce6111df8c24f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 22:17:15 +0000 Subject: [PATCH 63/73] cri-tools: 1.26.1 -> 1.27.0 --- pkgs/tools/virtualization/cri-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index e7fe212863aa..254352b1a9bc 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jJhHlqnc7wDsc6nn5CTZMnaZpUJrEDkGzyvQ2EoX4GE="; + sha256 = "sha256-5fBQkujOmxdiLkNuHL8y4QmuKQVGJuFlC7bRu+xElyk="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; From a774478c0a206a0715dffed6a20ad89411cd6854 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 04:44:45 +0000 Subject: [PATCH 64/73] python310Packages.google-cloud-securitycenter: 1.20.0 -> 1.21.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 809108160b94..4118f7040b5f 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.20.0"; + version = "1.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-r6HulAsKLJvL6jS/cKiMgdbYHeiChje4a7PCz6qA2yM="; + hash = "sha256-zk5yZYevzpWmTOAAJgdNx9lnoTxjaq5XFJ+2hDQOBuc="; }; propagatedBuildInputs = [ From da26831c44c29dda72be5ddf260b740a6bcc8c22 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:19:03 +0000 Subject: [PATCH 65/73] terraform-providers.azurerm: 3.52.0 -> 3.53.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 83d0c2c38ffa..32fa4db04579 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-MSglw8EylPaAoMFz3S7pUeedNROeNAPTSXWN+NiIXN8=", + "hash": "sha256-tStlnMSlkkL+X/DP0SBmnm7xL6dH8HfyiaKY/McuMQE=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.52.0", + "rev": "v3.53.0", "spdx": "MPL-2.0", "vendorHash": null }, From 4b1f46b783101d5df7cdcc7406458bef8914dc8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:21:47 +0000 Subject: [PATCH 66/73] terraform-providers.dns: 3.3.0 -> 3.3.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 32fa4db04579..d58c64a6803d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -318,11 +318,11 @@ "vendorHash": null }, "dns": { - "hash": "sha256-pTBPSiPO84L9vhBv4mJIMJP0UNVwrz/MX0YCZODwb7s=", + "hash": "sha256-Bzj1rLTzWJuqKEq5mz0UAbYMWMp4JoRhedfC2lORocE=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.3.0", + "rev": "v3.3.1", "spdx": "MPL-2.0", "vendorHash": "sha256-wx8BXlobu86Nk9D8o5loKhbO14ANI+shFQ2i7jswKgE=" }, From 0eeb356fd256c04ecd32be0e0627050862eb6daa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:23:41 +0000 Subject: [PATCH 67/73] terraform-providers.equinix: 1.14.0 -> 1.14.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 d58c64a6803d..cb4e9e4445bb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -354,11 +354,11 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-GGJNfHizFc+wXNo7u/mqtonIs5D/S8RydBsIkftNcjc=", + "hash": "sha256-wuOgnliqwA8huZHmFuegbtuFbpTpe1VgQ53Z+XcgHjw=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.14.0", + "rev": "v1.14.1", "spdx": "MIT", "vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k=" }, From 4cadff60a07470c01118cf392b05c3c536dbd24f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:28:14 +0000 Subject: [PATCH 68/73] terraform-providers.kubernetes: 2.19.0 -> 2.20.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 cb4e9e4445bb..26b9ffb01f4b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -638,11 +638,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-FV5FoEd0zjXa8x77r/z8Tn/I1lZI1NZ4a8yisAuAhNQ=", + "hash": "sha256-B13jQTZqFb5o/GRTf4iQWUbOPhbb4uYKUy35nQrKGLI=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.19.0", + "rev": "v2.20.0", "spdx": "MPL-2.0", "vendorHash": null }, From 63632f0424a8ff6a03efa634e4932498ceb994f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:31:27 +0000 Subject: [PATCH 69/73] terraform-providers.nomad: 1.4.19 -> 1.4.20 --- .../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 26b9ffb01f4b..24a71c15d480 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -773,13 +773,13 @@ "vendorHash": "sha256-WF4AdTu6lxoNSCsFKLMeQbHgH6j+hM0VNBRsue+azJA=" }, "nomad": { - "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", + "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v1.4.19", + "rev": "v1.4.20", "spdx": "MPL-2.0", - "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" + "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc=" }, "ns1": { "hash": "sha256-F7nKtDlVnW7jDPTeszYv9aYMAnHo2/k+MxsXdjghS88=", From fbb9beb4c76807a8601f72d92a7528c0d7bce831 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:34:08 +0000 Subject: [PATCH 70/73] terraform-providers.opentelekomcloud: 1.34.1 -> 1.34.2 --- .../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 24a71c15d480..5c9d87a5c900 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -855,13 +855,13 @@ "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI=" }, "opentelekomcloud": { - "hash": "sha256-QcpA7FreTgITmnt0fQHUmUK6FZMP0QCeQK2MN2Y9tFQ=", + "hash": "sha256-bRvs4IxnUObX/ChPdCn97VUQSxTjV2tfnmBmWmgAXUA=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.34.1", + "rev": "v1.34.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-4tJe8v31txzLBbruicOI6WUdDk38CqfLniFyc3hWVxg=" + "vendorHash": "sha256-VEreMBvqvBGUZz5EY5+0jbNDOVbmhYerfLYGa1rl+aw=" }, "opsgenie": { "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", From abb78acf5b864352a4c13e3b0f38ffd8287360ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:35:12 +0000 Subject: [PATCH 71/73] terraform-providers.pagerduty: 2.14.2 -> 2.14.3 --- .../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 5c9d87a5c900..077882acd9c5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -882,11 +882,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-1OmHEWpilZH+wIY9d9J2JvTgTXw5AzKXbt0JLSVL9/I=", + "hash": "sha256-NWrE6DFyoI1RQnxLThenGeFNGj8AFiVWhXysk8U7RpI=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.14.2", + "rev": "v2.14.3", "spdx": "MPL-2.0", "vendorHash": null }, From e201ba4fbcd15e340208bfd39cfee2fa974a50f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 03:35:25 +0000 Subject: [PATCH 72/73] terraform-providers.aws: 4.63.0 -> 4.64.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 077882acd9c5..a2dcc1f14efd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-XCGMoa/x8hkf+7gL0qYBX7jMx4wnMXxpyx/wH9ff+m4=", + "hash": "sha256-gI53y6/cbgXnWmFqihVPOZEtq4ZbpLtv1dgLiSxnYo4=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.63.0", + "rev": "v4.64.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-t6Hg1FLCd4dh6d3J0uNsNKKnz5T8/yoIXFo7bRO+XHM=" + "vendorHash": "sha256-1eIJCtcrod6MUragxcx2qoTJO9OVbD3n+VErL6xnvmw=" }, "azuread": { "hash": "sha256-bCnCj2pEd29aQVePGeaTbVhH6sF/Y+lj94SEw1+tROc=", From dae32f5930693299d8a6e4cfae7534a8a286cd0a Mon Sep 17 00:00:00 2001 From: David Hamelin Date: Wed, 19 Apr 2023 19:19:32 +0200 Subject: [PATCH 73/73] ocamlPackages.unisim_archisec: init at 0.0.5 --- maintainers/maintainer-list.nix | 6 ++++++ .../ocaml-modules/unisim_archisec/default.nix | 21 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/unisim_archisec/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cce68256a6a1..fa3f2990b9f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3522,6 +3522,12 @@ githubId = 10701143; name = "David Crompton"; }; + david-hamelin = { + email = "david.hamelin@outlook.fr"; + github = "HamelinDavid"; + githubId = 118536343; + name = "David Hamelin"; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix new file mode 100644 index 000000000000..a5b364312d41 --- /dev/null +++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "unisim_archisec"; + version = "0.0.5"; + + src = fetchurl { + url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.5/unisim_archisec-0.0.5.tbz"; + sha256 = "sha256-94Ky7rtR8oFTtWshTYaY6gyJdqrY3QKMF7qTkZQweXQ="; + }; + + duneVersion = "3"; + + meta = { + homepage = "https://binsec.github.io"; + downloadPage = "https://github.com/binsec/unisim_archisec"; + description = "UNISIM-VP DBA decoder"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.david-hamelin ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b03e77d20011..06c982d7e5d7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1628,6 +1628,8 @@ let unionFind = callPackage ../development/ocaml-modules/unionFind { }; + unisim_archisec = callPackage ../development/ocaml-modules/unisim_archisec { }; + unix-errno = callPackage ../development/ocaml-modules/unix-errno { }; unstrctrd = callPackage ../development/ocaml-modules/unstrctrd { };