Merge staging-next into staging
This commit is contained in:
commit
d54f37c561
@ -199,10 +199,10 @@ in {
|
||||
};
|
||||
|
||||
backend = mkOption {
|
||||
type = types.enum [ "glx" "xrender" "xr_glx_hybrid" ];
|
||||
type = types.enum [ "egl" "glx" "xrender" "xr_glx_hybrid" ];
|
||||
default = "xrender";
|
||||
description = lib.mdDoc ''
|
||||
Backend to use: `glx`, `xrender` or `xr_glx_hybrid`.
|
||||
Backend to use: `egl`, `glx`, `xrender` or `xr_glx_hybrid`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "senv";
|
||||
@ -20,5 +20,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/SpectralOps/senv";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
broken = stdenv.isDarwin; # needs golang.org/x/sys bump
|
||||
};
|
||||
}
|
||||
|
@ -29,6 +29,6 @@ buildGoModule rec {
|
||||
description = "Build a digital writing community";
|
||||
homepage = "https://github.com/writeas/writefreely";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -340,13 +340,13 @@
|
||||
"version": "0.15.0"
|
||||
},
|
||||
"docker": {
|
||||
"hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=",
|
||||
"hash": "sha256-SWfA3WaShBa+5FTyqLv+idVdvavet7V6qRKRGwYePUM=",
|
||||
"owner": "kreuzwerker",
|
||||
"provider-source-address": "registry.terraform.io/kreuzwerker/docker",
|
||||
"repo": "terraform-provider-docker",
|
||||
"rev": "v2.23.0",
|
||||
"vendorHash": "sha256-0JRJAwc4LbPXi6GJdrIGwuIaCzaP5MtIMuijYoOEjYA=",
|
||||
"version": "2.23.0"
|
||||
"rev": "v2.23.1",
|
||||
"vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=",
|
||||
"version": "2.23.1"
|
||||
},
|
||||
"elasticsearch": {
|
||||
"hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=",
|
||||
@ -385,13 +385,13 @@
|
||||
"version": "2.2.3"
|
||||
},
|
||||
"fastly": {
|
||||
"hash": "sha256-cLiR9QAhIJCGHDGNZo2P3seqsAd9VibSb+7HKZwMS9Q=",
|
||||
"hash": "sha256-X2T/t3uDY1jDPhx7IZOwVLx1o4pse5/0T+nrJtRB1Lk=",
|
||||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v3.0.1",
|
||||
"rev": "v3.0.2",
|
||||
"vendorHash": null,
|
||||
"version": "3.0.1"
|
||||
"version": "3.0.2"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=",
|
||||
@ -887,13 +887,13 @@
|
||||
"version": "1.31.8"
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-OTwQ/sF4/xSyJjYy1TvLOr1guGcho+Es9/WkonfVvcg=",
|
||||
"hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=",
|
||||
"owner": "opsgenie",
|
||||
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.17",
|
||||
"rev": "v0.6.18",
|
||||
"vendorHash": null,
|
||||
"version": "0.6.17"
|
||||
"version": "0.6.18"
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-6lBhEmeAvTv8xRMi5ZabcJg/59xJ9o4/MaAJP+H7pqk=",
|
||||
@ -1112,13 +1112,13 @@
|
||||
"version": "0.13.5"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-62G9q/MZtVnKO0ALXX9/pgkHDV6Bfdol4tSVdl0kx3I=",
|
||||
"hash": "sha256-XycVc3PO7heRYZwl9tsOgErzDfyifMnO4X33oihFPRU=",
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.78.13",
|
||||
"rev": "v1.78.14",
|
||||
"vendorHash": null,
|
||||
"version": "1.78.13"
|
||||
"version": "1.78.14"
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=",
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "8.0.2";
|
||||
version = "8.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2ZWfQI2D2C56qrU0xKYo7fJcKe8v8zFIYHtWYy+KIDw=";
|
||||
hash = "sha256-/zXfobbruhtTMeONA1fxYayMAR51S0u53TRkwx6RvsE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -12,36 +12,34 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ouch";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ouch-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-I9CgkYxcK+Ih9UlcYBa8QAZZsPvzPUK5ZUYKPxzgs38=";
|
||||
sha256 = "sha256-XB0J7Qeru+FX5YprepglfTndS8b3zsAw1b9mc4n6EdA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jEprWtIl5LihD9fOMYHGGlk0+h4woUlwUWNfSkd2t10=";
|
||||
cargoSha256 = "sha256-aW1aDXxs64ScocrnlsGy2+NAs6aC8F0/S1f32f9BDJU=";
|
||||
|
||||
nativeBuildInputs = [ help2man installShellFiles pkg-config ];
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
buildInputs = [ bzip2 xz zlib zstd ];
|
||||
|
||||
buildFeatures = [ "zstd/pkg-config" ];
|
||||
|
||||
postInstall = ''
|
||||
help2man $out/bin/ouch > ouch.1
|
||||
installManPage ouch.1
|
||||
|
||||
completions=($releaseDir/build/ouch-*/out/completions)
|
||||
installShellCompletion $completions/ouch.{bash,fish} --zsh $completions/_ouch
|
||||
installManPage artifacts/*.1
|
||||
installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch
|
||||
'';
|
||||
|
||||
GEN_COMPLETIONS = 1;
|
||||
OUCH_ARTIFACTS_FOLDER = "artifacts";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line utility for easily compressing and decompressing files and directories";
|
||||
homepage = "https://github.com/ouch-org/ouch";
|
||||
changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda psibi ];
|
||||
};
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
@ -41,5 +42,6 @@ buildGoModule rec {
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fgaz SuperSandro2000 ];
|
||||
broken = stdenv.isDarwin; # needs golang.org/x/sys bump
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user