Merge master into staging-next
This commit is contained in:
commit
c37aa21a14
|
@ -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 ];
|
||||
|
|
|
@ -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.7";
|
||||
|
||||
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-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
checkInputs = [ ounit2 ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
|
|
@ -21,10 +21,8 @@ buildDunePackage rec {
|
|||
pname = "mirage-crypto-ec";
|
||||
|
||||
inherit (mirage-crypto)
|
||||
minimumOCamlVersion
|
||||
src
|
||||
version
|
||||
useDune2;
|
||||
version;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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 = "4.0.1";
|
||||
version = "5.0.1";
|
||||
|
||||
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-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lwt duration mirage-runtime io-page ];
|
||||
propagatedBuildInputs = [ lwt duration mirage-runtime ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -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"; })
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue