Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
00aa7f762f
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
pname = "jpegoptim";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tjko";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4=";
|
||||
sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE=";
|
||||
};
|
||||
|
||||
# There are no checks, it seems.
|
||||
|
|
|
|||
|
|
@ -130,11 +130,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-xrP3znKMbS4jwtKxIobo8IIeiDp+clFboPrJY6aVYlA=",
|
||||
"hash": "sha256-ZLQV8hHh5U+qvBQovPxisPZ1BDUBH5YoKEt240bzQ0Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.37.0",
|
||||
"rev": "v3.38.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -149,11 +149,11 @@
|
|||
},
|
||||
"baiducloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-g3+n0Q0Hl4yRaYK0snl4um5B5FS54Y6aMM7LeluPik4=",
|
||||
"hash": "sha256-tEvD70BbN/4376HjE2Yez2qHOM2o3/Uu925HRnmJNwg=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.19.2",
|
||||
"rev": "v1.19.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY="
|
||||
},
|
||||
|
|
@ -167,11 +167,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-xDUL9W6lQGMZPQBe4eghW9JcQeTUgm+3ND6erikVFMM=",
|
||||
"hash": "sha256-i9Ka0RoHWcrctgJIusQyySirLSXVbD9MFJ6gljzgSl4=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.29.0",
|
||||
"rev": "v2.29.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0="
|
||||
},
|
||||
|
|
@ -969,13 +969,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-2991jDjOlyJuVcgzTmfKfMt4NfLc1QP7TY9mw+5Z5aM=",
|
||||
"hash": "sha256-dxXEGAkmemTHmGvKOwe3+xVE+nP4CAr82JmL3Nh+BQA=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.8.0",
|
||||
"rev": "v2.9.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-YlZSM3duS2QEZo5j+WvCw5KFPbY+NadYonylpB8Zw+o="
|
||||
"vendorHash": "sha256-bzx/Hl2JobtIa+ndvu1ssKg+faxt+JmJe4BL/go/0WY="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
|
|
@ -1014,13 +1014,13 @@
|
|||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"signalfx": {
|
||||
"hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=",
|
||||
"hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v6.18.0",
|
||||
"rev": "v6.20.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc="
|
||||
"vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ="
|
||||
},
|
||||
"skytap": {
|
||||
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = looking-glass-client.src;
|
||||
|
||||
sourceRoot = "source/obs";
|
||||
sourceRoot = "${looking-glass-client.src.name}/obs";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio libbfd SDL2 ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenvNoCC, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip, nix-update-script }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "smiley-sans";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
|
||||
sha256 = "sha256-LE0CZkWiXjyuiEk316ABCNQL9n5GID8CipjBIu2o6uk=";
|
||||
sha256 = "sha256-ufx/n3c7XoTZAxmdUMD4fc25z6By3/H4TOn0RtHOwyQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
@ -18,6 +18,10 @@ stdenvNoCC.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
|
||||
homepage = "https://atelier-anchor.com/typefaces/smiley-sans/";
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-feedback";
|
||||
version = "6.1.2";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "feedback";
|
||||
rev = version;
|
||||
sha256 = "sha256-vZTc6n7SHtHTCmC/RsCibVHcj67ksbghDosHBZfOIHM=";
|
||||
sha256 = "sha256-QvqyaI9szZuYuE3D6o4zjr5J6mvEzNHqTBWii+gjyMc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -71,13 +71,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "0.24";
|
||||
version = "0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-rso08/b0ukrh6KYFpn4bFn0pP83URfeJGw28iLIjlPw=";
|
||||
hash = "sha256-hOuuKvT6ZM7G0HTGtVeEHHfJWqwUinD+DxT3r0CQZH0=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "1.0.168";
|
||||
version = "1.0.169";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-K56SEfSq0mjltUwR2VZxGiGn9nnEdDBoZrkaBOIIl7k=";
|
||||
sha256 = "sha256-R4oGMN/2oVPKe0JBXXQ1mzw0F66Wn+WiP0kVs53zdoI=";
|
||||
};
|
||||
|
||||
executable = "bb";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
||||
# popular downstream dependencies
|
||||
, aiohttp
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -32,6 +36,8 @@ buildPythonPackage rec {
|
|||
"charset_normalizer"
|
||||
];
|
||||
|
||||
passthru.tests = { inherit aiohttp requests; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for encoding and language detection";
|
||||
homepage = "https://charset-normalizer.readthedocs.io/";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
, fetchFromGitHub
|
||||
, dos2unix
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, SDL2
|
||||
, libGL
|
||||
, curl
|
||||
|
|
@ -21,7 +23,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dos2unix makeWrapper ];
|
||||
nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = pname;
|
||||
genericName = "Sandbox Block Game";
|
||||
exec = "ClassiCube";
|
||||
icon = "CCicon";
|
||||
comment = "Minecraft Classic inspired sandbox game";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
# The ClassiCube sources have DOS-style newlines
|
||||
|
|
@ -64,6 +78,8 @@ stdenv.mkDerivation rec {
|
|||
postBuild = "cd -";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
cp 'src/ClassiCube' "$out/bin"
|
||||
# ClassiCube puts downloaded resources
|
||||
|
|
@ -75,6 +91,11 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram "$out/bin/ClassiCube" \
|
||||
--run 'mkdir -p "$HOME/.local/share/ClassiCube"' \
|
||||
--run 'cd "$HOME/.local/share/ClassiCube"'
|
||||
|
||||
mkdir -p "$out/share/icons/hicolor/256x256/apps"
|
||||
cp misc/CCicon.png "$out/share/icons/hicolor/256x256/apps"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
Loading…
Reference in a new issue