From 1b3f8f6b9c98065d8ef47f52302db6a3902fa541 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Apr 2023 08:59:20 +0000 Subject: [PATCH 01/27] dex-oidc: 2.35.3 -> 2.36.0 --- pkgs/servers/dex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 3c82f71c09a2..01d71f73a6c9 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.35.3"; + version = "2.36.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sYEdlEEpO0JDPHuGC457IPUcpp5PO2BLX/Gvd/vJvWQ="; + sha256 = "sha256-EIkK+X08FJKTFU4V19cGSH1yGesUfS7AibQ3zGUFyWI="; }; - vendorSha256 = "sha256-2rg99+Zv+Lj6udhld0BwFrpVsyGC0IfX5Xqc7dRN13o="; + vendorHash = "sha256-Rsz7UnBlZdPRTrq3nfFaSVwok8wLDtd6aT1sEK+++vg="; subPackages = [ "cmd/dex" From 130219aa1957033cdaada05f0e6c5531d3ec37c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 23:26:09 +0200 Subject: [PATCH 02/27] python310Packages.iocextract: init at 1.15.1 --- .../python-modules/iocextract/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/iocextract/default.nix diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix new file mode 100644 index 000000000000..46ff17b9894b --- /dev/null +++ b/pkgs/development/python-modules/iocextract/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, regex +}: + +buildPythonPackage rec { + pname = "iocextract"; + version = "1.15.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "InQuest"; + repo = "python-iocextract"; + rev = "refs/tags/v${version}"; + hash = "sha256-muto8lr3sP44bLFIoAuPeS8pRv7pNP1JFKaAJV01TZY="; + }; + + propagatedBuildInputs = [ + regex + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "iocextract" + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + meta = with lib; { + description = "Module to extract Indicator of Compromises (IOC)"; + homepage = "https://github.com/InQuest/python-iocextract"; + changelog = "https://github.com/InQuest/python-iocextract/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f44d0b9895..a3f88d6e2117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8627,6 +8627,8 @@ with pkgs; ioccheck = callPackage ../tools/security/ioccheck { }; + iocextract = with python3Packages; toPythonApplication iocextract; + ioping = callPackage ../tools/system/ioping { }; ior = callPackage ../tools/system/ior { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 267dc6f25fc6..4c24b1fb8f2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4800,6 +4800,8 @@ self: super: with self; { iocapture = callPackage ../development/python-modules/iocapture { }; + iocextract = callPackage ../development/python-modules/iocextract { }; + ionhash = callPackage ../development/python-modules/ionhash { }; iotawattpy = callPackage ../development/python-modules/iotawattpy { }; From 4249504385852e1e53df9bd4fe0f97dcbbb4e050 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 4 Apr 2023 00:07:13 +0200 Subject: [PATCH 03/27] lutris: remove wine dependency --- pkgs/applications/misc/lutris/default.nix | 2 -- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 35dbf1fcb440..e70fe0a19c9c 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -44,7 +44,6 @@ , p7zip , xgamma , libstrangle -, wine , fluidsynth , xorgserver , xorg @@ -64,7 +63,6 @@ let p7zip xgamma libstrangle - wine fluidsynth xorgserver xorg.setxkbmap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f44d0b9895..087ef1ee1115 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31743,9 +31743,7 @@ with pkgs; luppp = callPackage ../applications/audio/luppp { }; - lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - wine = wineWowPackages.staging; - }; + lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; From b9e9319236b0744d6b4ebe919caac8015db16657 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Apr 2023 04:20:00 +0000 Subject: [PATCH 04/27] git-gone: 0.4.3 -> 0.5.0 https://github.com/swsnr/git-gone/releases/tag/v0.5.0 --- .../version-management/git-gone/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index fd93c337eac0..fb97bf9467cf 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "lunaryorn"; + owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-pHtFLJGZYlxvQxqG/LWoWeQDxa8i3ws0olAtuoyHXTM="; + hash = "sha256-bb7xeLxo/qk2yKctaX1JXzru1+tGTt8DmDVH6ZaARkU="; }; - cargoSha256 = "sha256-BfUR/9WBgyUlKZ80qtqX6+AK7hRBCCsEG/IWjbcDU3c="; + cargoHash = "sha256-tngsqAnQ2Um0UCSqBvrnpbDygF6CvL2fi0o9MVY0f4g="; nativeBuildInputs = [ installShellFiles ]; @@ -29,8 +29,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cleanup stale Git branches of merge requests"; - homepage = "https://github.com/lunaryorn/git-gone"; - changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md"; + homepage = "https://github.com/swsnr/git-gone"; + changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; From 34adc9e4e30210200c322bae2965faa5c35a86de Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Apr 2023 04:20:00 +0000 Subject: [PATCH 05/27] millet: 0.8.6 -> 0.8.7 --- .../tools/language-servers/millet/Cargo.lock | 103 +++++++++--------- .../tools/language-servers/millet/default.nix | 6 +- 2 files changed, 53 insertions(+), 56 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 3a911a5d7605..ff5974a8065b 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -16,7 +16,7 @@ name = "analysis" version = "0.1.0" dependencies = [ "config", - "diagnostic-util", + "diagnostic", "elapsed", "fmt-util", "input", @@ -67,7 +67,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "cm-syntax" @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", ] @@ -134,12 +134,9 @@ dependencies = [ ] [[package]] -name = "diagnostic-util" +name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" -dependencies = [ - "text-pos", -] +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "diff" @@ -156,7 +153,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "log", ] @@ -176,13 +173,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -198,7 +195,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "drop_bomb", "rowan", @@ -208,7 +205,7 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "rustc-hash", ] @@ -216,7 +213,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "form_urlencoded" @@ -263,7 +260,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "idna" @@ -278,7 +275,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "indexmap" @@ -296,7 +293,7 @@ version = "0.1.0" dependencies = [ "cm-syntax", "config", - "diagnostic-util", + "diagnostic", "fast-hash", "mlb-hir", "mlb-syntax", @@ -327,9 +324,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ "hermit-abi", "io-lifetimes", @@ -357,7 +354,7 @@ dependencies = [ "anyhow", "config", "crossbeam-channel", - "diagnostic-util", + "diagnostic", "elapsed", "fast-hash", "input", @@ -383,9 +380,9 @@ checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "log" @@ -442,7 +439,7 @@ version = "0.1.0" dependencies = [ "analysis", "config", - "diagnostic-util", + "diagnostic", "env_logger", "input", "paths", @@ -475,7 +472,7 @@ name = "mlb-statics" version = "0.1.0" dependencies = [ "config", - "diagnostic-util", + "diagnostic", "fast-hash", "mlb-hir", "once_cell", @@ -554,7 +551,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", "glob", @@ -565,7 +562,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", ] @@ -596,9 +593,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -661,9 +658,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.11" +version = "0.37.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" dependencies = [ "bitflags", "errno", @@ -681,29 +678,29 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", @@ -718,7 +715,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -782,7 +779,7 @@ dependencies = [ name = "sml-lex" version = "0.1.0" dependencies = [ - "diagnostic-util", + "diagnostic", "lex-util", "sml-syntax", ] @@ -797,7 +794,7 @@ name = "sml-lower" version = "0.1.0" dependencies = [ "config", - "diagnostic-util", + "diagnostic", "fast-hash", "lex-util", "num-traits", @@ -824,7 +821,7 @@ version = "0.1.0" name = "sml-parse" version = "0.1.0" dependencies = [ - "diagnostic-util", + "diagnostic", "event-parse", "fast-hash", "sml-fixity", @@ -845,7 +842,7 @@ version = "0.1.0" dependencies = [ "code-h2-md-map", "config", - "diagnostic-util", + "diagnostic", "drop_bomb", "elapsed", "fast-hash", @@ -904,7 +901,7 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "smol_str", ] @@ -922,9 +919,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.10" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -934,7 +931,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", "identifier-case", @@ -959,7 +956,7 @@ dependencies = [ "analysis", "cm-syntax", "config", - "diagnostic-util", + "diagnostic", "env_logger", "fast-hash", "input", @@ -980,7 +977,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", "text-size-util", @@ -995,7 +992,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "text-size", ] @@ -1018,7 +1015,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "toml" @@ -1057,7 +1054,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "ungrammar" @@ -1104,7 +1101,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "url" diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 9ba339270181..e1a9dfe2b279 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-TWxhppR3G1u3YkyeIHKBWprqOn22YhRIORkAVaFR/RY="; + hash = "sha256-kHw7hyOH/GAFRh0TErFMXU3NBge2AwpJr8oXbtnWCfc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-4DX/o1CjZ08mDXXPy87GNXiikP9L9nyhR7qYzCPVtAY="; + "char-name-0.1.0" = "sha256-8biNETzXhR3GE5Ywrbcd4199h3ipwwZbtpZOQGOYA1g="; "rowan-0.15.10" = "sha256-yOaUq2tQEiNgQB7qB8fFzfnwUWagu72MIPHmaTX0B0Y="; "sml-libs-0.1.0" = "sha256-6jbRMqlW5sL0x0i4qatduXvLHhrkUE7gsSwC6JYwiHQ="; }; From adcbb9f514e42f37bdb30f865616d247152d8d84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Apr 2023 04:20:00 +0000 Subject: [PATCH 06/27] blesh: 2022-07-29 -> 0.3.4 https://github.com/akinomyoga/ble.sh/releases/tag/v0.3.4 --- pkgs/shells/bash/blesh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/shells/bash/blesh/default.nix index caadb94f4f1f..c7789a8b0737 100644 --- a/pkgs/shells/bash/blesh/default.nix +++ b/pkgs/shells/bash/blesh/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "blesh"; - version = "unstable-2022-07-29"; + version = "0.3.4"; src = fetchzip { - url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20220729+a22e145.tar.xz"; - sha256 = "088jv02y40pjcfzgrbx8n6aksznfh6zl0j5siwfw3pmwn3i16njw"; + url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz"; + sha256 = "sha256-MGCQirZvqGfjTTsbDfihY2il/u2suWBaZ6dX8mF1zLk="; }; dontBuild = true; From f5f0feca54fbd8840403de84caa386c96d47e144 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 12:52:28 +0200 Subject: [PATCH 07/27] python310Packages.bc-detect-secrets: 1.4.15 -> 1.4.16 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 98a14ade57c3..dab2f6e5bbb5 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.15"; + version = "1.4.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-zTRrWgbuSRK1zRurv3a2G1gZ6LCzmVQh8eFFa3g6eSE="; + hash = "sha256-PBpxhZPFO4X4dhSYWG2TtHgaNx/SCQlnr2D57uB0kr4="; }; propagatedBuildInputs = [ From 344ebdf2e4ee1b62e7bd59fcc142bc313499308e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 12:54:49 +0200 Subject: [PATCH 08/27] python310Packages.fakeredis: 2.10.2 -> 2.10.3 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.10.3 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b71ba532c2e6..367c0f8b813e 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.10.2"; + version = "2.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-ZQC8KNHM6Nnytkr6frZMl5mBVPkpduWZwwooCPymbFY="; + hash = "sha256-qd8tofR5FdfV/A37gfNRYALf5rUMh7ldhS/hETUHo/k="; }; nativeBuildInputs = [ From acd90cdb0716e1d7bbee72d35120f23310bf2069 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 4 Apr 2023 13:33:32 +0200 Subject: [PATCH 09/27] mozart: use llvmPackages_8 instead of llvmPackages_5 Following issue #44372 logic, we want to get rid of older LLVMs. --- pkgs/development/compilers/mozart/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index b901e7c34891..fb47000ea080 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -7,7 +7,7 @@ , boost169 , pinnedBoost ? boost169 , llvmPackages -, llvmPackages_5 +, llvmPackages_8 , gmp , emacs , jre_headless @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin" + "-DCMAKE_PROGRAM_PATH=${llvmPackages_8.clang}/bin" # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to # infer that it is not a linking call, and stop trashing the command line # with linker flags. @@ -71,9 +71,9 @@ in stdenv.mkDerivation rec { buildInputs = [ pinnedBoost - llvmPackages_5.llvm - llvmPackages_5.clang - llvmPackages_5.clang-unwrapped + llvmPackages_8.llvm + llvmPackages_8.clang + llvmPackages_8.clang-unwrapped gmp emacs jre_headless From 2f27b9cb0ced564c66ed16a18de271518b966acd Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 4 Apr 2023 14:48:59 +0200 Subject: [PATCH 10/27] qgis-ltr: 3.22.16 -> 3.28.5 --- pkgs/applications/gis/qgis/ltr.nix | 1 + pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index 5db9a26ae758..d34e1e69833b 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -18,6 +18,7 @@ in symlinkJoin rec { pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); postBuild = '' + # unpackPhase buildPythonPath "$pythonInputs" diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a53ad337d542..ecce1cfdccea 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.16"; + version = "3.28.5"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8="; + hash = "sha256-3fQB0oCIZSVEVMZzmeyvw8/Ew+JjzAFnTIsnsklAayI="; }; passthru = { From 00aab4510243df735824d004a9fe569787dd57dc Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 4 Apr 2023 15:02:20 +0200 Subject: [PATCH 11/27] mozart: Simplify build thanks to the new sources format --- pkgs/development/compilers/mozart/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index fb47000ea080..8f68487ecf70 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -7,7 +7,6 @@ , boost169 , pinnedBoost ? boost169 , llvmPackages -, llvmPackages_8 , gmp , emacs , jre_headless @@ -42,23 +41,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper unzip ]; - # We cannot compile with both gcc and clang, but we need clang during the - # process, so we compile everything with clang. - # BUT, we need clang4 for parsing, and a more recent clang for compiling. cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++" - "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_8.clang}/bin" - # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to - # infer that it is not a linking call, and stop trashing the command line - # with linker flags. - # As it does not recognise -emit-ast, we pass -c immediately overridden - # by -emit-ast. - # The remaining is just the default flags that we cannot reuse and need - # to repeat here. - "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'" # We are building with clang, as nix does not support having clang and # gcc together as compilers and we need clang for the sources generation. # However, clang emits tons of warnings about gcc's atomic-base library. @@ -71,9 +56,6 @@ in stdenv.mkDerivation rec { buildInputs = [ pinnedBoost - llvmPackages_8.llvm - llvmPackages_8.clang - llvmPackages_8.clang-unwrapped gmp emacs jre_headless From 5ac23f930cc5aeadc48e4d5827b645cf14ecdcfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 15:38:22 +0200 Subject: [PATCH 12/27] python310Packages.lupa: 1.14.1 -> 2.0 --- pkgs/development/python-modules/lupa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index b5f40446bde7..6e3467290082 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.14.1"; + version = "2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4="; + hash = "sha256-rT/vSGvnrd3TSf6anDk3iQYTEs+Y68UztIm+NPSEy3k="; }; nativeBuildInputs = [ cython ]; From 9ca9baab512ca0bddd64029d55beafa93c85c988 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 15:43:18 +0200 Subject: [PATCH 13/27] python310Packages.lupa: add changelog to meta --- pkgs/development/python-modules/lupa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 6e3467290082..8851028d10a3 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Lua in Python"; homepage = "https://github.com/scoder/lupa"; + changelog = "https://github.com/scoder/lupa/blob/lupa-${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a32219871ee0044f8cf033fbeb9506304deb9867 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 15:45:22 +0200 Subject: [PATCH 14/27] python310Packages.lupa: disable on unsupported Python releases - add format --- pkgs/development/python-modules/lupa/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 8851028d10a3..b2123b92eb1f 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -2,20 +2,28 @@ , buildPythonPackage , cython , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "lupa"; version = "2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-rT/vSGvnrd3TSf6anDk3iQYTEs+Y68UztIm+NPSEy3k="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + ]; - pythonImportsCheck = [ "lupa" ]; + pythonImportsCheck = [ + "lupa" + ]; meta = with lib; { description = "Lua in Python"; From 2b21a945d997dbd79248d290a043f471ccdfffd7 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 4 Apr 2023 10:41:00 -0500 Subject: [PATCH 15/27] vimPlugins.autosave-nvim: init at 2022-10-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b7d7bf3ea89f..891e2454a08a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -809,6 +809,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; + autosave-nvim = buildVimPluginFrom2Nix { + pname = "autosave.nvim"; + version = "2022-10-13"; + src = fetchFromGitHub { + owner = "nullishamy"; + repo = "autosave.nvim"; + rev = "406a09c1ce679bc6fbde47d6ec61c753632b55f0"; + sha256 = "0f3rp80hwf6v2kw2hg5jysz9j4946bmwpbk6hxpw89b1vcgny66v"; + }; + meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; + }; + awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; version = "2022-05-04"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e6646d8c20c1..e15d497a80ad 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -121,6 +121,10 @@ self: super: { + autosave-nvim = super.autosave-nvim.overrideAttrs(old: { + dependencies = with super; [ plenary-nvim ]; + }); + barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; meta = { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 28d61f02be20..ee905498624f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -66,6 +66,7 @@ https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/vim-scripts/autoload_cscope.vim/,, +https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, https://github.com/taybart/b64.nvim/,HEAD, From e507ac4bdb0d81711900f6c9eefa78ebc28327f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2023 20:49:34 +0200 Subject: [PATCH 16/27] sysdig: also update driver --- pkgs/os-specific/linux/sysdig/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 70179065acc9..2157806e18dd 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -19,13 +19,8 @@ let driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "3.0.1+driver"; - sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c="; - }; - # Workaround for scap-driver compilation error on kernel 6.2: https://github.com/falcosecurity/libs/issues/918 - driverPatch = fetchpatch { - url = "https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f.patch"; - hash = "sha256-s7iHbOjVqHSWRY4gktZldgrU5OClqRmbqmDtUgFIeh0="; + rev = libsRev; + sha256 = libsSha256; }; in @@ -73,7 +68,6 @@ stdenv.mkDerivation rec { chmod -R +w libs cp -r ${driver} driver-src chmod -R +w driver-src - patch -p1 -d driver-src < ${driverPatch} cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include" From cd1e297b9327ff3242227264977e4bea2b747d81 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Tue, 4 Apr 2023 14:15:33 +0200 Subject: [PATCH 17/27] dune_3: 3.7.0 -> 3.7.1 Signed-off-by: Ali Caglayan --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 06d2323af7cd..74e3ce56ec93 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-4tY3ydCAMY/t9ecdKin7NnYk+CrEom6D3ys6A1UFKLg="; + sha256 = "sha256-rfw48UwBiKKtgNYUUdAR0nq4g5txdJLXrUL3y5EcVMM="; }; nativeBuildInputs = [ ocaml findlib ]; From 92dd06ae1d8d710250b644bd776bb4f174044a39 Mon Sep 17 00:00:00 2001 From: Kiran Ostrolenk Date: Sun, 19 Feb 2023 22:13:03 +0000 Subject: [PATCH 18/27] nu_scripts: init at unstable-2023-03-16 --- pkgs/shells/nushell/nu_scripts/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/shells/nushell/nu_scripts/default.nix diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix new file mode 100644 index 000000000000..68c5dccd4226 --- /dev/null +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "nu_scripts"; + version = "unstable-2023-03-16"; + + src = fetchFromGitHub { + owner = "nushell"; + repo = pname; + rev = "00b0039653be5dd2e6567ce8feea82064d27ae11"; + sha256 = "0m17cj5wzp94f01kwgs1dh76zwsl2irr7b06i9sb5skqxmmdnjnz"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/nu_scripts + mv ./* $out/share/nu_scripts + + runHook postInstall + ''; + + meta = { + description = "A place to share Nushell scripts with each other"; + homepage = "https://github.com/nushell/nu_scripts"; + license = lib.licenses.free; + + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.CardboardTurkey ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9d5e0e82f94..cca980259525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26800,6 +26800,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; + nu_scripts = callPackage ../shells/nushell/nu_scripts { }; + nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; From 2831eb0a083a08ccc76ae9b3727db66cb16b46ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 20:40:49 +0000 Subject: [PATCH 19/27] tbls: 1.63.0 -> 1.64.0 --- pkgs/tools/misc/tbls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 2fd8e30e6336..ec2e5b634e37 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.63.0"; + version = "1.64.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-r0jCuSTNx5BVkJshPSAO5Wwz1C2Lw2AYXYA46cMB+qY="; + hash = "sha256-XHHoPaT+qo2UBfYvslFhhSmo7a9YsBX3Ay+piOBVTxc="; }; vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; From 246567a3ad88e3119c2001e2fe78be233474cde0 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Tue, 4 Apr 2023 12:24:35 +0200 Subject: [PATCH 20/27] josm: 18678 -> 18700 --- pkgs/applications/misc/josm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 91db91efa09d..ffcf26f7c003 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18678"; + version = "18700"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-p0HjjF4SLPsD/KcAPNyHasuGrDPSQ/2KHjX1R2eywNo="; + hash = "sha256-rJw38pOHi+OIjIKgglU0Y2Tlc/b8K9f04ru2IH0CUJ0="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-YlSFHx37RkdTlQ3/ZAqj+ezv+cSVifsxR7s6S7pDd4o="; + hash = "sha256-RTRe2GZz5B9QEYF04PiKtKJkWu0Em5WBqK4dVQVHK0g="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk="; + sha256 = "sha256-/zdOaiyuvSwdVZcnw0ghDj2I+YKpFLc12fjZUMtRtVg="; }; }; in From 4a9c7011a18c90d9dee37fd1a994ac76a91de928 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:21:19 +1000 Subject: [PATCH 21/27] gh: 2.25.1 -> 2.26.0 Diff: https://github.com/cli/cli/compare/v2.25.1...v2.26.0 Changelog: https://github.com/cli/cli/releases/tag/v2.26.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 1d284681e440..4c97160f0d1a 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.25.1"; + version = "2.26.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-CE3Ds9z5CB49Hb9IVuDKwRjGwuw+0d5zBpw2IVsO7Tc="; + hash = "sha256-PsZSlLI6ZcHsKWIwETJKPdNWin4YySGNpgH2Yc7rdF8="; }; - vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY="; + vendorHash = "sha256-+8/cA0UxyVu7nyLhHYBWmn8Vs0O/EYepqTAOVU4gwt4="; nativeBuildInputs = [ installShellFiles ]; From 54cb3a75a9a2f8e99f417b817f3301ff5a400ee7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:25:05 +1000 Subject: [PATCH 22/27] vimv-rs: 1.8.0 -> 2.0.0 --- pkgs/tools/misc/vimv-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix index dd19b2e89c2f..a0da6f236e44 100644 --- a/pkgs/tools/misc/vimv-rs/default.nix +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "vimv-rs"; - version = "1.8.0"; + version = "2.0.0"; src = fetchCrate { inherit version; crateName = "vimv"; - hash = "sha256-HEWhWPLFIEo+sOz0pbvhoFRNhYh/x0ohqDs48sHgHHk="; + hash = "sha256-dc1jN9phrTfLwa6Dx1liXNu49V2qjpiuHqn4KQnPYWQ="; }; - cargoHash = "sha256-ghO8HrHk5rjUiNbutWnrQLAd8vtVKV6pK12XZuSudSs="; + cargoHash = "sha256-1Oa4R85w5FyC6rjoZe53bJIykSSkUv2X3LQvK4w+qs0="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; From 4c40162cb5a4317df6250308c93761cc29d09c40 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:31:41 +1000 Subject: [PATCH 23/27] clusterctl: 1.4.0 -> 1.4.1 Diff: https://github.com/kubernetes-sigs/cluster-api/compare/v1.4.0...v1.4.1 Changelog: https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.4.1 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index dd389a374c50..7564a2c0c96b 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-K67TpHpA4gCyJbdTKKRGnHzY+gM3wN6GIxxfFW+zyYI="; + hash = "sha256-ST/3zoZgeG0P8TwxHEKucZ7DHoD6e6Qx47jv6e+r4Rs="; }; - vendorHash = "sha256-b3bvLkBl8I/MJe16fRvjpYX2MbZhuG3loACArtZ5mg0="; + vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE="; subPackages = [ "cmd/clusterctl" ]; From dc2c96df1d5ee5da69f16b4b3f3f88eb010c63e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 19:48:18 +0000 Subject: [PATCH 24/27] gmic: 3.2.2 -> 3.2.3 --- pkgs/tools/graphics/gmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index af3e31e37489..19b04054eedd 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "3.2.2"; + version = "3.2.3"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "GreycLab"; repo = "gmic"; rev = "v.${version}"; - hash = "sha256-XLDnIs7IRIhQtz+qgdNypJODk6WJRPQ2M6LU6DJ+T7I="; + hash = "sha256-slEyZoYSNFrZ0d8a+mnJeqWQLqcJTPrkfpDpdag/vLA="; }; # TODO: build this from source @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - hash = "sha256-lABUPhwlzoRODX7z8arOEU0JJszcXREhZ20WRToKNY4="; + hash = "sha256-ExMCxFkkctqrdSy5M/TXD5GBRmRA9YEdsYW8nWiTEYY="; }; nativeBuildInputs = [ From b3c599ebb62ec6a637ecf13370a1c8e14560e84b Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 4 Apr 2023 16:28:04 -0400 Subject: [PATCH 25/27] cimg: 3.2.2 -> 3.2.3 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index b0173d3fa8ae..f47bf7a36a24 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-koXew0Lwb7wW8MQctTjxpo7TNVtrS5MzxQFfUS1gwZs="; + hash = "sha256-DFTqx4v3Hf2HyT02yBLo4n1yKPuPVz1oa2C5LsIeyCY="; }; outputs = [ "out" "doc" ]; From 0bb829166035c9559851a96c813a21aa4be54c42 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 4 Apr 2023 16:29:06 -0400 Subject: [PATCH 26/27] gmic-qt: 3.2.2 -> 3.2.3 --- pkgs/tools/graphics/gmic-qt/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index ef301c2b7abe..d81fe16a9109 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -2,7 +2,6 @@ , stdenv , variant ? "standalone" , fetchzip -, fetchpatch , cmake , pkg-config , ninja @@ -47,21 +46,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps stdenv.mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.2.2"; + version = "3.2.3"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - hash = "sha256-Z6FU0BRTiOIoM6ViYgcwOifat4/IISFJXvyC8PwR5mA="; + hash = "sha256-OTdf9BtaRak/jv1GknidDAkdxf99saBqj6EMoRJDIuo="; }; - patches = [ - (fetchpatch { - name = "gmic-3.2.2-cmake-fixes.patch"; - url = "https://github.com/c-koi/gmic-qt/compare/5379307f9e484ad171b8d09e3572b93d120a9159..420e85e005401d942a3ca5f5c39ee3c867fe8bdd.diff"; - hash = "sha256-l2y9EFtE3nv8NBSSn6Wo0pLRoYO2hoyb5HZk0QmlSpk="; - }) - ]; - sourceRoot = "source/gmic-qt"; nativeBuildInputs = [ From 6dba375c3c3cbed024b39d28fd4611db03654f27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 04:35:22 +0000 Subject: [PATCH 27/27] ventoy-bin-full: 1.0.89 -> 1.0.90 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 0bfb1456fc51..3de0397d0634 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.89"; + version = "1.0.90"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-dPBMABzmITUenOe57BD5EmofZeXC9v6IpW7m+OhhYdA="; + hash = "sha256-UJ4kgtF2lIZn37p1SDkvCyHmuBSFSHmMHKLD4/ZorbQ="; }; patches = [