mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f38c4cce4a
@ -5188,6 +5188,12 @@
|
||||
githubId = 606000;
|
||||
name = "Gabriel Adomnicai";
|
||||
};
|
||||
garaiza-93 = {
|
||||
email = "araizagustavo93@gmail.com";
|
||||
github = "garaiza-93";
|
||||
githubId = 57430880;
|
||||
name = "Gustavo Araiza";
|
||||
};
|
||||
Gabriel439 = {
|
||||
email = "Gabriel439@gmail.com";
|
||||
github = "Gabriella439";
|
||||
|
||||
@ -30,8 +30,8 @@ with lib;
|
||||
beam = super.beam_nox;
|
||||
cairo = super.cairo.override { x11Support = false; };
|
||||
dbus = super.dbus.override { x11Support = false; };
|
||||
ffmpeg_4 = super.ffmpeg_4-headless;
|
||||
ffmpeg_5 = super.ffmpeg_5-headless;
|
||||
ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; };
|
||||
ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; };
|
||||
# dep of graphviz, libXpm is optional for Xpm support
|
||||
gd = super.gd.override { withXorg = false; };
|
||||
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
|
||||
|
||||
@ -2,24 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fdkaac";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nu774";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo=";
|
||||
sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-37781.patch";
|
||||
url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch";
|
||||
sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ fdk_aac ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mmtc";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "figsoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE=";
|
||||
sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk=";
|
||||
cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,12 +5,12 @@
|
||||
{
|
||||
ada = buildGrammar {
|
||||
language = "ada";
|
||||
version = "e9e2ec9";
|
||||
version = "42cc2eb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "briot";
|
||||
repo = "tree-sitter-ada";
|
||||
rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121";
|
||||
hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg=";
|
||||
rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba";
|
||||
hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/briot/tree-sitter-ada";
|
||||
};
|
||||
@ -271,12 +271,12 @@
|
||||
};
|
||||
diff = buildGrammar {
|
||||
language = "diff";
|
||||
version = "1d63cd4";
|
||||
version = "f69bde8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-mikedavis";
|
||||
repo = "tree-sitter-diff";
|
||||
rev = "1d63cd49529ef3153393cf8f620718b274bba715";
|
||||
hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk=";
|
||||
rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f";
|
||||
hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
|
||||
};
|
||||
@ -404,12 +404,12 @@
|
||||
};
|
||||
fish = buildGrammar {
|
||||
language = "fish";
|
||||
version = "6675b56";
|
||||
version = "f917690";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ram02z";
|
||||
repo = "tree-sitter-fish";
|
||||
rev = "6675b56266b3f615fb112205b6b83a79315309c4";
|
||||
hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A=";
|
||||
rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9";
|
||||
hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
|
||||
};
|
||||
@ -426,12 +426,12 @@
|
||||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "bfa6fd4";
|
||||
version = "069bd7c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "bfa6fd4c4aa0bb9b39ad33daa004ad4637a91d20";
|
||||
hash = "sha256-5Lf/6jhgRPgSPNCHqiYT8OeI7UUnTfQqH8rzf8ggHj0=";
|
||||
rev = "069bd7c864fe2dee1115140cc2621d140b16a643";
|
||||
hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
@ -470,12 +470,12 @@
|
||||
};
|
||||
gdscript = buildGrammar {
|
||||
language = "gdscript";
|
||||
version = "5d43d78";
|
||||
version = "31ebb7c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-gdscript";
|
||||
rev = "5d43d78c276570f76773685f08baf9e4ada09639";
|
||||
hash = "sha256-SNyZutgab3T1UaD/D6jnhF3QmAR/UVtlXTpNjYlf2+Y=";
|
||||
rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc";
|
||||
hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
@ -1046,12 +1046,12 @@
|
||||
};
|
||||
norg = buildGrammar {
|
||||
language = "norg";
|
||||
version = "6348056";
|
||||
version = "1a30509";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "tree-sitter-norg";
|
||||
rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712";
|
||||
hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI=";
|
||||
rev = "1a305093569632de50f9a316ff843dcda25b4ef5";
|
||||
hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
|
||||
};
|
||||
@ -1258,12 +1258,12 @@
|
||||
};
|
||||
racket = buildGrammar {
|
||||
language = "racket";
|
||||
version = "dc9c334";
|
||||
version = "1a5df02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "6cdh";
|
||||
repo = "tree-sitter-racket";
|
||||
rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37";
|
||||
hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8=";
|
||||
rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b";
|
||||
hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
|
||||
};
|
||||
@ -1525,12 +1525,12 @@
|
||||
};
|
||||
teal = buildGrammar {
|
||||
language = "teal";
|
||||
version = "1ae8c68";
|
||||
version = "2158ecc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "euclidianAce";
|
||||
repo = "tree-sitter-teal";
|
||||
rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2";
|
||||
hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc=";
|
||||
rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2";
|
||||
hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
|
||||
@ -1549,12 +1549,12 @@
|
||||
};
|
||||
thrift = buildGrammar {
|
||||
language = "thrift";
|
||||
version = "763ae3d";
|
||||
version = "d1f350b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "duskmoon314";
|
||||
repo = "tree-sitter-thrift";
|
||||
rev = "763ae3d760b7a7719b57568bdf9ffae2d896680f";
|
||||
hash = "sha256-LXHXCaD76H9kWjOwCPfrpO2ZEv3mlq0IpWnwzV/qr2M=";
|
||||
rev = "d1f350b19dd70ccdbd6d565dbea4879e4cef03da";
|
||||
hash = "sha256-RxrusaDiDjs25EcyrcnnjJIaeZaZhQdcxOWwtZ8Xe0U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||
};
|
||||
|
||||
@ -1092,7 +1092,7 @@ self: super: {
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-JQwT7IFYC/K+t3YO34hoalxdt1TEsmEcBXtDKFVdles=";
|
||||
cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
||||
@ -472,6 +472,7 @@ https://github.com/figsoda/nix-develop.nvim/,HEAD,
|
||||
https://github.com/tamago324/nlsp-settings.nvim/,main,
|
||||
https://github.com/tjdevries/nlua.nvim/,,
|
||||
https://github.com/mcchrish/nnn.vim/,,
|
||||
https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
|
||||
https://github.com/folke/noice.nvim/,HEAD,
|
||||
https://github.com/arcticicestudio/nord-vim/,,
|
||||
https://github.com/shaunsingh/nord.nvim/,,
|
||||
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
slang
|
||||
zip
|
||||
] ++ lib.optional x11Support [ libX11 ]
|
||||
] ++ lib.optionals x11Support [ libX11 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "holochain-launcher";
|
||||
version = "0.6.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
|
||||
sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E=";
|
||||
sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waylock";
|
||||
version = "0.6.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifreund";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w=";
|
||||
hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -639,20 +639,20 @@
|
||||
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
|
||||
},
|
||||
"kubernetes": {
|
||||
"hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=",
|
||||
"hash": "sha256-UqMPeyMTXTnVknFqhCSm/wG8IYLW63n/wSvc5/ofjW0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.17.0",
|
||||
"rev": "v2.18.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=",
|
||||
"hash": "sha256-41lGYGf2t9q5tLHZbL2IksmYAy4Dw3nBZuiSOuG9/r8=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.9.4",
|
||||
"rev": "v2.9.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk="
|
||||
},
|
||||
@ -811,11 +811,11 @@
|
||||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-mzAfqJcAZEFGmptjaXAtbmcrtVyufd2LLTe8TmFHtQc=",
|
||||
"hash": "sha256-PjtsFrUwLsSLXog/n6JkFLFPZm7FPa/n8N5IJ0vkuuE=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.107.0",
|
||||
"rev": "v4.108.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -883,11 +883,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"pagerduty": {
|
||||
"hash": "sha256-oD8YytttqaZwYk8/c5t7TvFpxw3QViZpkHiOpuMxaFI=",
|
||||
"hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=",
|
||||
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
|
||||
"owner": "PagerDuty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v2.10.2",
|
||||
"rev": "v2.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1045,13 +1045,13 @@
|
||||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-5irTp8teFShAd0FV2fIKf4dE9WokmxK3rREEozinQZM=",
|
||||
"hash": "sha256-u+wOQwLejlS8Bap8M92wu1jdc0NAemnJsUjNIacGX+A=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.99.0",
|
||||
"rev": "v1.100.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yuGUEy9us2BL2v06tL3XDcpCujQk8H2DUzQiJQQNsvo="
|
||||
"vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
|
||||
@ -1090,11 +1090,11 @@
|
||||
"vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-NglAzuZr3OqLHunMbmLm7Cnh24otQXRP1y3ZaDFrXAc=",
|
||||
"hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.79.9",
|
||||
"rev": "v1.79.10",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@ -12,18 +12,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
generic = { version, sha256, vendorSha256 ? null, ... }@attrs:
|
||||
let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ];
|
||||
generic = { version, hash, vendorHash ? null, ... }@attrs:
|
||||
let attrs' = builtins.removeAttrs attrs [ "version" "hash" "vendorHash" ];
|
||||
in
|
||||
buildGoModule ({
|
||||
pname = "terraform";
|
||||
inherit version vendorSha256;
|
||||
inherit version vendorHash;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform";
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
@ -168,9 +168,9 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.3.8";
|
||||
sha256 = "sha256-AXLk5s3qu3QZ1aXx/FwPNq3hM26skBj0wyn/x8nVMkE=";
|
||||
vendorSha256 = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY=";
|
||||
version = "1.3.9";
|
||||
hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4=";
|
||||
vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-01-31";
|
||||
version = "unstable-2023-02-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "44206849d03c8983e41d2aeca70a06e04365d88d";
|
||||
sha256 = "bUyM0zWVO7HWBiWi0mhkDlVxgqMHoFiR78XpiG8q/V4=";
|
||||
rev = "16d449a3bf2805c1fc683fdc183e0e8390074252";
|
||||
sha256 = "jm6bLu+6G3VMSyB56B5qATqFZ3sXjm8s66Gx2oZyvFA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitmux";
|
||||
version = "0.7.10";
|
||||
version = "0.7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0=";
|
||||
sha256 = "sha256-JPrXq4+53cem0TVnm1/AJz/mYcEKaYzqhptJU4V2U0o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig=";
|
||||
vendorHash = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig=";
|
||||
|
||||
# GitHub source does contain a regression test for the module
|
||||
# but it requires networking as it git clones a repo from github
|
||||
|
||||
32
pkgs/data/icons/volantes-cursors/default.nix
Normal file
32
pkgs/data/icons/volantes-cursors/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, inkscape
|
||||
, xcursorgen
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "volantes-cursors";
|
||||
version = "2022-08-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "varlesh";
|
||||
repo = "volantes-cursors";
|
||||
rev = "b13a4bbf6bd1d7e85fadf7f2ecc44acc198f8d01";
|
||||
hash = "sha256-vJe1S+YHrUBwJSwt2+InTu5ho2FOtz7FjDxu0BIA1Js=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ inkscape xcursorgen ];
|
||||
|
||||
makeTargets = [ "build" ];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.pling.com/p/1356095/";
|
||||
description = "Classic cursor theme with a flying style";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jordanisaacs ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
38
pkgs/data/themes/tokyo-night-gtk/default.nix
Normal file
38
pkgs/data/themes/tokyo-night-gtk/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gtk-engine-murrine
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "tokyo-night-gtk";
|
||||
version = "2023.01.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Tokyo-Night-GTK-Theme";
|
||||
rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb";
|
||||
sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cp -a themes/* $out/share/themes
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK theme based on the Tokyo Night colour palette.";
|
||||
homepage = "www.pling.com/p/1681315/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ garaiza-93 ];
|
||||
};
|
||||
}
|
||||
79
pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
Normal file
79
pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
Normal file
@ -0,0 +1,79 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, qtmultimedia
|
||||
, qtwebengine
|
||||
, libvlc
|
||||
, gst_all_1
|
||||
, gtest
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-voice-note";
|
||||
version = "5.10.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZDw/kGmhcoTPDUsZa9CYhrVbK4Uo75G0L4q4cCBPr7E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/common/audiowatcher.cpp \
|
||||
--replace "/usr/share" "$out/share"
|
||||
substituteInPlace assets/deepin-voice-note.desktop \
|
||||
--replace "/usr/bin" "$out/bin"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
qtmultimedia
|
||||
qtwebengine
|
||||
libvlc
|
||||
gtest
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0";
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple memo software with texts and voice recordings";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-voice-note";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@ -39,6 +39,7 @@ let
|
||||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
deepin-voice-note = callPackage ./apps/deepin-voice-note { };
|
||||
|
||||
#### Go Packages
|
||||
go-lib = callPackage ./go-package/go-lib { inherit replaceAll; };
|
||||
|
||||
@ -180,6 +180,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -180,6 +180,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -120,8 +120,7 @@ let
|
||||
'' + concatProducts "postInstall";
|
||||
|
||||
preFixup = lib.optionalString (stdenv.isLinux) ''
|
||||
# Find all executables in any directory that contains '/bin/'
|
||||
for bin in $(find "$out" -executable -type f -wholename '*/bin/*'); do
|
||||
for bin in $(find "$out/bin" -executable -type f); do
|
||||
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
|
||||
done
|
||||
'' + concatProducts "preFixup";
|
||||
|
||||
@ -74,6 +74,17 @@ stdenv.mkDerivation ({
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
# Allow autoPatchelf to automatically fix lib references between products
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
mkdir -p $out/lib
|
||||
shopt -s globstar
|
||||
ln -s $out/languages/**/lib/*.so $out/lib
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
dontInstall = true;
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
|
||||
@ -22,20 +22,28 @@ in
|
||||
rec {
|
||||
inherit buildGraalvm buildGraalvmProduct;
|
||||
|
||||
graalvm11-ce = buildGraalvm rec {
|
||||
### Java 11 ###
|
||||
|
||||
# Mostly available for build purposes, not to be exposed at the top level
|
||||
graalvm11-ce-bare = buildGraalvm rec {
|
||||
version = "22.3.1";
|
||||
javaVersion = "11";
|
||||
src = fetchurl (source "graalvm-ce" javaVersion);
|
||||
meta.platforms = builtins.attrNames javaPlatform;
|
||||
products = [ ];
|
||||
};
|
||||
|
||||
graalvm11-ce = graalvm11-ce-bare.override {
|
||||
products = [ native-image-installable-svm-java11 ];
|
||||
};
|
||||
|
||||
# Mostly available for testing, not to be exposed at the top level
|
||||
graalvm11-ce-full = graalvm11-ce.override {
|
||||
graalvm11-ce-full = graalvm11-ce-bare.override {
|
||||
products = [
|
||||
js-installable-svm-java11
|
||||
llvm-installable-svm-java11
|
||||
native-image-installable-svm-java11
|
||||
nodejs-installable-svm-java11
|
||||
python-installable-svm-java11
|
||||
ruby-installable-svm-java11
|
||||
wasm-installable-svm-java11
|
||||
@ -60,6 +68,13 @@ rec {
|
||||
src = fetchurl (source "native-image-installable-svm" javaVersion);
|
||||
};
|
||||
|
||||
nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec {
|
||||
javaVersion = "11";
|
||||
version = "22.3.1";
|
||||
src = fetchurl (source "nodejs-installable-svm" javaVersion);
|
||||
graalvm-ce = graalvm11-ce-bare;
|
||||
};
|
||||
|
||||
python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec {
|
||||
javaVersion = "11";
|
||||
version = "22.3.1";
|
||||
@ -79,20 +94,28 @@ rec {
|
||||
src = fetchurl (source "wasm-installable-svm" javaVersion);
|
||||
};
|
||||
|
||||
graalvm17-ce = buildGraalvm rec {
|
||||
### Java 17 ###
|
||||
|
||||
# Mostly available for build purposes, not to be exposed at the top level
|
||||
graalvm17-ce-bare = buildGraalvm rec {
|
||||
version = "22.3.1";
|
||||
javaVersion = "17";
|
||||
src = fetchurl (source "graalvm-ce" javaVersion);
|
||||
meta.platforms = builtins.attrNames javaPlatform;
|
||||
products = [ ];
|
||||
};
|
||||
|
||||
graalvm17-ce = graalvm17-ce-bare.override {
|
||||
products = [ native-image-installable-svm-java17 ];
|
||||
};
|
||||
|
||||
# Mostly available for testing, not to be exposed at the top level
|
||||
graalvm17-ce-full = graalvm17-ce.override {
|
||||
graalvm17-ce-full = graalvm17-ce-bare.override {
|
||||
products = [
|
||||
js-installable-svm-java17
|
||||
llvm-installable-svm-java17
|
||||
native-image-installable-svm-java17
|
||||
nodejs-installable-svm-java17
|
||||
python-installable-svm-java17
|
||||
ruby-installable-svm-java17
|
||||
wasm-installable-svm-java17
|
||||
@ -117,6 +140,13 @@ rec {
|
||||
src = fetchurl (source "native-image-installable-svm" javaVersion);
|
||||
};
|
||||
|
||||
nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec {
|
||||
javaVersion = "17";
|
||||
version = "22.3.1";
|
||||
src = fetchurl (source "nodejs-installable-svm" javaVersion);
|
||||
graalvm-ce = graalvm17-ce-bare;
|
||||
};
|
||||
|
||||
python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec {
|
||||
javaVersion = "17";
|
||||
version = "22.3.1";
|
||||
|
||||
@ -34,6 +34,40 @@
|
||||
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar";
|
||||
};
|
||||
};
|
||||
"nodejs-installable-svm" = {
|
||||
"11-linux-aarch64" = {
|
||||
sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar";
|
||||
};
|
||||
"17-linux-aarch64" = {
|
||||
sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar";
|
||||
};
|
||||
"11-linux-amd64" = {
|
||||
sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar";
|
||||
};
|
||||
"17-linux-amd64" = {
|
||||
sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar";
|
||||
};
|
||||
"11-darwin-aarch64" = {
|
||||
sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar";
|
||||
};
|
||||
"17-darwin-aarch64" = {
|
||||
sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar";
|
||||
};
|
||||
"11-darwin-amd64" = {
|
||||
sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar";
|
||||
};
|
||||
"17-darwin-amd64" = {
|
||||
sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar";
|
||||
};
|
||||
};
|
||||
"wasm-installable-svm" = {
|
||||
"11-linux-aarch64" = {
|
||||
sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1";
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, graalvm-ce
|
||||
, graalvmCEPackages
|
||||
, javaVersion
|
||||
, src
|
||||
|
||||
@ -10,10 +10,6 @@ graalvmCEPackages.buildGraalvmProduct rec {
|
||||
inherit src javaVersion version;
|
||||
product = "llvm-installable-svm";
|
||||
|
||||
postUnpack = ''
|
||||
ln -s $out/languages/llvm/native/lib/*.so $out/lib
|
||||
'';
|
||||
|
||||
# TODO: improve this test
|
||||
graalvmPhases.installCheckPhase = ''
|
||||
echo "Testing llvm"
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, graalvmCEPackages
|
||||
, graalvm-ce
|
||||
, javaVersion
|
||||
, src
|
||||
, version
|
||||
}:
|
||||
|
||||
graalvmCEPackages.buildGraalvmProduct rec {
|
||||
inherit src javaVersion version;
|
||||
product = "nodejs-installable-svm";
|
||||
|
||||
extraNativeBuildInputs = [ graalvm-ce ];
|
||||
|
||||
# TODO: improve test
|
||||
graalvmPhases.installCheckPhase = ''
|
||||
echo "Testing NodeJS"
|
||||
$out/bin/npx --help
|
||||
'';
|
||||
}
|
||||
@ -1,12 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, graalvmCEPackages
|
||||
, llvm-installable-svm
|
||||
, openssl
|
||||
, javaVersion
|
||||
, musl
|
||||
, src
|
||||
, version
|
||||
, llvm-installable-svm
|
||||
}:
|
||||
|
||||
graalvmCEPackages.buildGraalvmProduct rec {
|
||||
|
||||
@ -6,6 +6,8 @@ set -eou pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
tmpfile="$(mktemp --suffix=.nix)"
|
||||
|
||||
trap 'rm -rf "$tmpfile"' EXIT
|
||||
|
||||
info() { echo "[INFO] $*"; }
|
||||
|
||||
echo_file() { echo "$@" >> "$tmpfile"; }
|
||||
@ -43,6 +45,7 @@ declare -r -A products_urls=(
|
||||
[js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar"
|
||||
[llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar"
|
||||
[native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar"
|
||||
[nodejs-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/nodejs-installable-svm-java@platform@-${new_version}.jar"
|
||||
[python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar"
|
||||
[ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar"
|
||||
[wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar"
|
||||
@ -59,7 +62,7 @@ readonly platforms=(
|
||||
"17-darwin-amd64"
|
||||
)
|
||||
|
||||
info "Generating hashes.nix file for 'graalvm-ce' $new_version. This will take a while..."
|
||||
info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..."
|
||||
|
||||
# Indentation of `echo_file` function is on purpose to make it easier to visualize the output
|
||||
echo_file "# Generated by $0 script"
|
||||
@ -68,14 +71,16 @@ for product in "${!products_urls[@]}"; do
|
||||
url="${products_urls["${product}"]}"
|
||||
echo_file " \"$product\" = {"
|
||||
for platform in "${platforms[@]}"; do
|
||||
# Reuse cache as long the version is the same
|
||||
if [[ "$current_version" == "$new_version" ]]; then
|
||||
previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r || true)"
|
||||
args=("${url//@platform@/$platform}")
|
||||
# Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same
|
||||
# e.g.: when adding a new product and running this script with FORCE=1
|
||||
if [[ "$current_version" == "$new_version" ]] && \
|
||||
previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r)"; then
|
||||
args+=("$previous_hash" "--type" "sha256")
|
||||
else
|
||||
previous_hash=""
|
||||
info "Hash in '$product' for '$platform' not found. Re-downloading it..."
|
||||
fi
|
||||
# Lack of quoting in $previous_hash is proposital
|
||||
if hash="$(nix-prefetch-url "${url//@platform@/$platform}" $previous_hash)"; then
|
||||
if hash="$(nix-prefetch-url "${args[@]}")"; then
|
||||
echo_file " \"$platform\" = {"
|
||||
echo_file " sha256 = \"$hash\";"
|
||||
echo_file " url = \"${url//@platform@/${platform}}\";"
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "httplib";
|
||||
version = "0.11.4";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RTC2Q8T5tvi27BuZuH++wmKZ3bvIHL09S4F8YeO5Fbg=";
|
||||
hash = "sha256-Qr8jaZSj5xPiTF8reur09/R2jrtDk5hxHKeVTccHbZQ=";
|
||||
};
|
||||
|
||||
# Header-only library.
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-kg/dVarfmDibZXLGY4zXfReNQ1DC4T/3g54g8zxNmEs=";
|
||||
sha256 = "sha256-gyGlx43LdBkZvwN8EeZvaLzdTgYT3PFnSX9eZyAWNc4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gIRfmCCkDokUhBKsQnWx8jQtfoYBgY65IS+tdmgeaYE=";
|
||||
sha256 = "sha256-KyxtAOKhk3p/TuA0jz2hMCkGDwKLPC7rIodhHvcE4tk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.37";
|
||||
version = "9.2.38";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MFQiLOCqEAKzST7voMIQH0TYGuwICSVBcQZwUkk9S1Q=";
|
||||
hash = "sha256-nhvFBXOoxCWaSjUdPyQP234URI50DM3ZoweRK9d1LIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,19 +3,21 @@
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, prettytable
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosomecomfort";
|
||||
version = "0.0.7";
|
||||
|
||||
version = "0.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkmer";
|
||||
repo = "AIOSomecomfort";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NVtoQJOC4rNny95/lFk2eJ5mycNSuZrIy1GGZKYZ1VA=";
|
||||
hash = "sha256-SwNHLDizkpOP+zSDzn84J2l8ltZi/ponnptzuVJMHUA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -32,6 +34,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "AsyicIO client for US models of Honeywell Thermostats";
|
||||
homepage = "https://github.com/mkmer/AIOSomecomfort";
|
||||
changelog = "https://github.com/mkmer/AIOSomecomfort/releases/tag/${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.37";
|
||||
version = "9.2.38";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sl3GzNMN90ez1Zks43B2How7QTaaJZbxOxK2hl/UzdQ=";
|
||||
hash = "sha256-9/7GiF+Q7AUmKEqleVF8brCFSAqswalXxgPCApD19ZE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.37";
|
||||
version = "9.2.38";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WGc6FmrS0aVmiY5s8fUVHCT6cqcmj52H6FD2TR1HyK0=";
|
||||
hash = "sha256-fpYoX5+TrZaozq7E3qBlhYUPrbbL3fb+wadQToLqtU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.37";
|
||||
version = "9.2.38";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8kABsLp3Nrzjn7staiNfU6HdQTu1x6DNQzilMceqKVY=";
|
||||
hash = "sha256-nKUp8N1T6fcXd1V9Ppqb5fFy8UHGPE/tiyHIanhgUoE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.37";
|
||||
version = "9.2.38";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vgH8UAR8B4l29RH0dwMlGVjOHgdcOTfLMHPiKN9Z36s=";
|
||||
hash = "sha256-3B62NMlAGv4Q6HOkACafBETbOj4QsWsvfrTAM+5b9NY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-camel-case";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-SNkv1llh/2uzIKAMkmqnpab3sCeNCP0cXpYFSycIF58=";
|
||||
sha256 = "sha256-za51hGZIq7ZYXHRwY5odL7Bk3EX46LYqqlC+fxp6YfQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openstacksdk";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z2vVGeMB94S/51bB+Tf47ByvP9BWQ1TzQHpFGS8FR8w=";
|
||||
hash = "sha256-Nl5dzKZOFudKT5+dKh8iB5cOlG2aXEglSc+l7ALKLJg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.2.8";
|
||||
version = "23.2.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yxE+Gx48JQE++7SB8ouwgh2/rKKv8CC0QQSvwaSeFVc=";
|
||||
hash = "sha256-+oHqBopA2FLrDdxsVQhciW4ZXluZn+z05LmHtyDtFyI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "2.0.98";
|
||||
version = "2.0.99";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pyrogram";
|
||||
repo = "pyrogram";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pxhErSlJxaQmms3T/AelsudPFYfH7YaH3ePSR5L33tY=";
|
||||
hash = "sha256-QQFRDLB+gf5jzCf8imHwkSgOkAyLWJF3UDStnpq6+04=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.37";
|
||||
version = "9.2.38";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JGTfOE16tycBkbsihKPgSZPlfqun1vr/86kAlNwrSZA=";
|
||||
hash = "sha256-9Cv0Quh0uN/DxOG1J2QCFb8fqRJTyovixmU8X721t8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yfinance";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "ranaroussi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1LRnvyr3QNYR33qTyN/WepGH8InYmXWwO5gQfm20MP4=";
|
||||
hash = "sha256-Lp8HqXq4PhvpTzFbldk70pU03+qsHzGeHIkaPdedvRo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -45,13 +45,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-runner";
|
||||
version = "2.301.1";
|
||||
version = "2.302.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GIWuN3/CnA0uZfpo1Gty+5tL2eDXmFyzYFHrRozHwk0=";
|
||||
hash = "sha256-eIMiXdw62JGlSnMkmFf9vqOpp1QC9DkD/2wDPHJuVBI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -357,7 +357,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Self-hosted runner for GitHub Actions";
|
||||
homepage = "https://github.com/actions/runner";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse ];
|
||||
maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ];
|
||||
platforms = attrNames runtimeIds;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ihp-new";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitallyinduced";
|
||||
repo = "ihp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8RBZn74pMAOHZL1VzO9DeEeDYm5CE1HOobP9e7Ze0Us=";
|
||||
sha256 = "sha256-LUIC7Olu2qTxZwgkgVpmTgCEQYDlwvLQFQt3Ox/Vm48=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.6.3";
|
||||
version = "3.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5oER0KMhBBu8AiawxHNoYIV+farcLBjB8HpO+1UluSY=";
|
||||
sha256 = "sha256-CWA2xmVWvPeKCvssQAMHMYJ3CxJ7sIC7GX3qb3QFLuA=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "undocker";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~motiejus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SmtM25sijcm5NF0ZrSqrRQDXiLMNp8WGAZX9yKvj1rQ=";
|
||||
hash = "sha256-I+pTbr1lKELyYlyHrx2gB+aeZ3/PmcePQfXu1ckhKAk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://git.sr.ht/~motiejus/undocker";
|
||||
description = "A CLI tool to convert a Docker image to a flattened rootfs tarball";
|
||||
license = licenses.mit;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jordanisaacs ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mitmproxy2swagger";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alufers";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA=";
|
||||
hash = "sha256-HD+zYWQvmAqtJqG8I2Yib/UWCvUewGsXxTtd2E4GyJ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -30313,7 +30313,7 @@ with pkgs;
|
||||
waybar = callPackage ../applications/misc/waybar {};
|
||||
|
||||
waylock = callPackage ../applications/misc/waylock {
|
||||
zig = zig_0_9;
|
||||
zig = zig_0_10;
|
||||
};
|
||||
|
||||
wayshot = callPackage ../tools/misc/wayshot { };
|
||||
@ -33396,6 +33396,8 @@ with pkgs;
|
||||
|
||||
tofi = callPackage ../applications/misc/tofi { };
|
||||
|
||||
tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { };
|
||||
|
||||
topydo = callPackage ../applications/misc/topydo {};
|
||||
|
||||
torrential = callPackage ../applications/networking/p2p/torrential { };
|
||||
@ -39147,4 +39149,6 @@ with pkgs;
|
||||
resgate = callPackage ../servers/resgate { };
|
||||
|
||||
oversteer = callPackage ../applications/misc/oversteer { };
|
||||
|
||||
volantes-cursors = callPackage ../data/icons/volantes-cursors { };
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user