From c358992d69569a40c5f636c6cc208fb7bf90c20d Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 5 Sep 2022 22:16:45 +0800 Subject: [PATCH 1/6] fsearch: 2021-06-23 -> 0.2.2 --- pkgs/tools/misc/fsearch/default.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index a7b95f3efa63..6af61b122337 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -2,26 +2,26 @@ , stdenv , fetchFromGitHub , gtk3 -, pcre +, pcre2 , glib , desktop-file-utils , meson , ninja , pkg-config , wrapGAppsHook -, unstableGitUpdater , gettext +, icu }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fsearch"; - version = "unstable-2021-06-23"; + version = "0.2.2"; src = fetchFromGitHub { owner = "cboxdoerfer"; - repo = "fsearch"; - rev = "9300cc03ab2f0cea3a70abb5477bda8b52c4afd1"; - sha256 = "16qh2si48j113yhay5wawr7dvldks6jb32za41j2sng7n4ryw221"; + repo = pname; + rev = version; + hash = "sha256-1nu6J5eHVpPHGXcFKHSnUhAJccxABBht5H2bpBx42og="; }; nativeBuildInputs = [ @@ -36,7 +36,8 @@ stdenv.mkDerivation { buildInputs = [ glib gtk3 - pcre + pcre2 + icu ]; preFixup = '' @@ -44,10 +45,6 @@ stdenv.mkDerivation { --replace "Exec=fsearch" "Exec=$out/bin/fsearch" ''; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/cboxdoerfer/fsearch.git"; - }; - meta = with lib; { description = "A fast file search utility for Unix-like systems based on GTK+3"; homepage = "https://github.com/cboxdoerfer/fsearch.git"; From b53d99bd63f23e6370dfd45b2597c7dde3dee021 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 11:40:52 +0000 Subject: [PATCH 2/6] discordchatexporter-cli: 2.35.2 -> 2.35.2 --- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 22a0d10b3c9f..a276aa3bd57a 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.0"; sha256 = "0dxxd5hm7gnc1lhq7k266nkcl84w0844r3cdxdcksvcc786f43vp"; }) From 5b9a398716f40fabe95502d97ecf7af116a9a852 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Sep 2022 14:14:19 +0200 Subject: [PATCH 3/6] =?UTF-8?q?ocamlPackages.mirage-unix:=204.0.1=20?= =?UTF-8?q?=E2=86=92=205.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.mirage-crypto: 0.10.5 → 0.10.6 --- .../ocaml-modules/mirage-crypto/default.nix | 14 ++++++-------- .../development/ocaml-modules/mirage-crypto/ec.nix | 4 +--- .../development/ocaml-modules/mirage-crypto/pk.nix | 6 +++--- .../ocaml-modules/mirage-crypto/rng-async.nix | 2 +- .../ocaml-modules/mirage-crypto/rng-mirage.nix | 2 +- .../ocaml-modules/mirage-crypto/rng.nix | 6 +++--- .../ocaml-modules/mirage-unix/default.nix | 6 +++--- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index c942972597ad..5679b77b3277 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,23 +1,21 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.5"; + version = "0.10.6"; src = fetchurl { - url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU="; + url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; + sha256 = "sha256-AdZHek7crQB7Vpg5VdMn8OYcPzZJSCLzdVAX0m6PlBA="; }; - useDune2 = true; - doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 5506243ec3a4..098b587f3d59 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -21,10 +21,8 @@ buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) - minimumOCamlVersion src - version - useDune2; + version; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 9a2b9c98e458..0793bf5c4f39 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,10 +1,10 @@ -{ buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng +{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng , cstruct, sexplib0, zarith, eqaf, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; - inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src; buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng @@ -13,7 +13,7 @@ buildDunePackage rec { strictDeps = !doCheck; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index 91da7aa56816..5752507f9ef9 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -6,7 +6,7 @@ buildDunePackage { pname = "mirage-crypto-rng-async"; - inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; + inherit (mirage-crypto) version src; buildInputs = [ dune-configurator diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 8d67ade9b465..bf940c3eb70c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; - inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto-rng) version src; doCheck = true; checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 2281f10580cd..8900dd611d89 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,13 +1,13 @@ -{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator +{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator , cstruct, duration, logs, mtime, ocaml_lwt }: buildDunePackage rec { pname = "mirage-crypto-rng"; - inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 68ee12f12c9d..0c7fe10246b8 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-unix"; - version = "4.0.1"; + version = "5.0.0"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4="; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "sha256-gQ16af73ebsg131d+DqUy7iKzdlWrxp2aczQJ4T8Hps="; }; propagatedBuildInputs = [ lwt duration mirage-runtime io-page ]; From 63cf026762989b0f485caa30d1aa93a717a4b5da Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 15 Sep 2022 16:32:23 +0200 Subject: [PATCH 4/6] =?UTF-8?q?ocamlPackages.mirage-unix:=205.0.0=20?= =?UTF-8?q?=E2=86=92=205.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-unix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 0c7fe10246b8..3663e4b9cb71 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }: +{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime }: buildDunePackage rec { pname = "mirage-unix"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-gQ16af73ebsg131d+DqUy7iKzdlWrxp2aczQJ4T8Hps="; + sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; }; - propagatedBuildInputs = [ lwt duration mirage-runtime io-page ]; + propagatedBuildInputs = [ lwt duration mirage-runtime ]; doCheck = true; meta = with lib; { From 384f3c53a83af3179f48511bed20fb7ba661f983 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 15 Sep 2022 16:32:38 +0200 Subject: [PATCH 5/6] =?UTF-8?q?ocamlPackages.mirage-crypto:=200.10.6=20?= =?UTF-8?q?=E2=86=92=200.10.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 5679b77b3277..5b67c9ac4340 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.6"; + version = "0.10.7"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-AdZHek7crQB7Vpg5VdMn8OYcPzZJSCLzdVAX0m6PlBA="; + sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw="; }; doCheck = true; From 2d342085201cc1df6cdc597540a8173f5a0d08da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 09:43:17 +0000 Subject: [PATCH 6/6] gamescope: 3.11.43 -> 3.11.45-2 --- pkgs/applications/window-managers/gamescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 3b7e4c4a4b04..f4392408c9e6 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.43"; + version = "3.11.45-2"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM="; + hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc="; }; patches = [ ./use-pkgconfig.patch ];