Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
85a45c2a04
|
|
@ -136,6 +136,7 @@ rec {
|
|||
else if final.isPower then "powerpc"
|
||||
else if final.isRiscV then "riscv"
|
||||
else if final.isS390 then "s390"
|
||||
else if final.isLoongArch64 then "loongarch"
|
||||
else final.parsed.cpu.name;
|
||||
|
||||
qemuArch =
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
|
||||
# Linux
|
||||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "m68k-linux" "microblaze-linux"
|
||||
"armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux"
|
||||
"microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux"
|
||||
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux"
|
||||
"s390x-linux" "x86_64-linux"
|
||||
|
|
@ -86,6 +86,7 @@ in {
|
|||
m68k = filterDoubles predicates.isM68k;
|
||||
s390 = filterDoubles predicates.isS390;
|
||||
s390x = filterDoubles predicates.isS390x;
|
||||
loongarch64 = filterDoubles predicates.isLoongArch64;
|
||||
js = filterDoubles predicates.isJavaScript;
|
||||
|
||||
bigEndian = filterDoubles predicates.isBigEndian;
|
||||
|
|
|
|||
|
|
@ -90,6 +90,10 @@ rec {
|
|||
config = "mipsel-unknown-linux-gnu";
|
||||
} // platforms.fuloong2f_n32;
|
||||
|
||||
loongarch64-linux = {
|
||||
config = "loongarch64-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
# can execute on 32bit chip
|
||||
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
|
||||
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ rec {
|
|||
isM68k = { cpu = { family = "m68k"; }; };
|
||||
isS390 = { cpu = { family = "s390"; }; };
|
||||
isS390x = { cpu = { family = "s390"; bits = 64; }; };
|
||||
isLoongArch64 = { cpu = { family = "loongarch"; bits = 64; }; };
|
||||
isJavaScript = { cpu = cpuTypes.javascript; };
|
||||
|
||||
is32bit = { cpu = { bits = 32; }; };
|
||||
|
|
|
|||
|
|
@ -131,6 +131,8 @@ rec {
|
|||
|
||||
or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };
|
||||
|
||||
loongarch64 = { bits = 64; significantByte = littleEndian; family = "loongarch"; };
|
||||
|
||||
javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ with lib.systems.doubles; lib.runTests {
|
|||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" "loongarch64-linux" ];
|
||||
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||
|
|
|
|||
|
|
@ -14840,10 +14840,12 @@
|
|||
name = "Stijn DW";
|
||||
};
|
||||
StillerHarpo = {
|
||||
email = "florianengel39@gmail.com";
|
||||
email = "engelflorian@posteo.de";
|
||||
github = "StillerHarpo";
|
||||
githubId = 25526706;
|
||||
name = "Florian Engel";
|
||||
keys = [{ fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; }];
|
||||
matrix = "@qe7ftcyrpg:matrix.org";
|
||||
};
|
||||
stites = {
|
||||
email = "sam@stites.io";
|
||||
|
|
|
|||
|
|
@ -256,8 +256,6 @@ let
|
|||
|
||||
${proxyCachePathConfig}
|
||||
|
||||
${vhosts}
|
||||
|
||||
${optionalString cfg.statusPage ''
|
||||
server {
|
||||
listen ${toString cfg.defaultHTTPListenPort};
|
||||
|
|
@ -275,6 +273,8 @@ let
|
|||
}
|
||||
''}
|
||||
|
||||
${vhosts}
|
||||
|
||||
${cfg.appendHttpConfig}
|
||||
}''}
|
||||
|
||||
|
|
|
|||
|
|
@ -125,6 +125,10 @@ let
|
|||
magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
|
||||
mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
|
||||
};
|
||||
loongarch64-linux = {
|
||||
magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01'';
|
||||
mask = ''\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
|
||||
};
|
||||
wasm32-wasi = {
|
||||
magicOrExtension = ''\x00asm'';
|
||||
mask = ''\xff\xff\xff\xff'';
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dragonfly-reverb";
|
||||
version = "3.2.8";
|
||||
version = "3.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelwillis";
|
||||
repo = "dragonfly-reverb";
|
||||
rev = version;
|
||||
sha256 = "sha256-Jz0t9IO3H+guL4NiETCBHSb4rxFTxZRHw2v20yS/wlk=";
|
||||
sha256 = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kphotoalbum";
|
||||
version = "5.9.1";
|
||||
version = "5.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-kejzDYpBQEoGKgPzVcUVlGKmd1OoXx+W7t9p3MNNw/A=";
|
||||
hash = "sha256-rdEXgg5hwu52XJit07AbrSw7kLDNK+IpbIwKCV/Lhp8=";
|
||||
};
|
||||
|
||||
# not sure if we really need phonon when we have vlc, but on KDE it's bound to
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -29,11 +29,11 @@ rec {
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "113.0b4";
|
||||
version = "113.0b9";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "8f6e10bc1a0de54aec1f9ea3f6de67a7bed0ee176e65147a4944baa7f30d63714a37d89fe9437973b73f8504a0d771a4ad57fff2c80857966239273c137acc6f";
|
||||
sha512 = "de052b3df75a0d0e00ff6548dc5a47ca543855e819187a5d630d7352548ae5082ddc29c68c36f8effc421fae13fdb7e67c9b0fb63470af4e31fc360bc319b7df";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -56,12 +56,12 @@ rec {
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "113.0b4";
|
||||
version = "113.0b9";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "d89ccceebf66b8aadbfd2d4cc7d57322f0484cfc6818b3cabae04b700d9b62145c597eadd645233b920db09ffdc7d5f19fb74b1b8b672ae1dfa63b6f2178ac15";
|
||||
sha512 = "193b4b96dd3dfe9d95dc11ddc089a433a6fa4aff5d55d8294ff638dccacdd141b0977f9d87b7cb6c4f4f64af22166a517f2e751fee7059cd7e77ddb8ea977466";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "node-problem-detector";
|
||||
version = "0.8.12";
|
||||
version = "0.8.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FLOkGeGl2tpLCyJxiGubzo+d2fieF/aNfhNJ2nzOtfw=";
|
||||
sha256 = "sha256-nNi4YahrO4zwqwR90tIpQCAydGdQbfy5PXCifpP/T7Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@
|
|||
"vendorHash": "sha256-nF/efMhmrXfBlF9w9tC4npHxjX2/299OfqTpvPapfMo="
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-ofwJs9rOi8l9O2g9adFr3LI4M4pjIc1GzZ5TD70Lgto=",
|
||||
"hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=",
|
||||
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
|
||||
"owner": "akamai",
|
||||
"repo": "terraform-provider-akamai",
|
||||
"rev": "v3.5.0",
|
||||
"rev": "v3.6.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
|
||||
},
|
||||
|
|
@ -110,20 +110,20 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-gI53y6/cbgXnWmFqihVPOZEtq4ZbpLtv1dgLiSxnYo4=",
|
||||
"hash": "sha256-cmE7jJO49CuYdiKjrPaHhNCFoMbT0z4uSnFdC7Fnd9g=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.64.0",
|
||||
"rev": "v4.65.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-1eIJCtcrod6MUragxcx2qoTJO9OVbD3n+VErL6xnvmw="
|
||||
"vendorHash": "sha256-UvbuWjxlou7lwvU5D6DaEXuCFvn8ECTbkNvKGrHwsu8="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-bCnCj2pEd29aQVePGeaTbVhH6sF/Y+lj94SEw1+tROc=",
|
||||
"hash": "sha256-YdlH1c2Oeu9wDiZvlzgYhY8CvWCMM3W/ilEkTU3mR1k=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.37.2",
|
||||
"rev": "v2.38.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -466,13 +466,13 @@
|
|||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-vfH+KIOv/DXv4fUzUATgoL6s69NqGVP8Dn7aoEPfe8g=",
|
||||
"hash": "sha256-XY3nAaAB3h50IGE0Gp2xsqDppk6fmDIxHVJWstESMkM=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.38.0",
|
||||
"rev": "v1.39.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-MlqnDcig8/uiF8pNuEkTveN7kgsGEs4XOe5z4/a+Fm0="
|
||||
"vendorHash": "sha256-+g8Ryb1SgtI074R5vttd2CUneHRv64OvEFgbve+7xL4="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=",
|
||||
|
|
@ -1044,13 +1044,13 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-A9YPAIVH7kNQSirvxZYr8L1N4W5b/AJwWmatt3b/vBk=",
|
||||
"hash": "sha256-KC7A7BgGF2erEZKW/hTiveZB0GaCAkzpmkbsF21Ihsg=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.113.0",
|
||||
"rev": "v1.115.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-pN1GVA63sYs52IKkQ/jfeDOzAlH0fN9a9ZCgRjrQ+8E="
|
||||
"vendorHash": "sha256-6ZxurzzOa/1TXOApQNLFUrY+Ryxc7n+JwZG76JuePGc="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
|
||||
|
|
@ -1171,13 +1171,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"utils": {
|
||||
"hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=",
|
||||
"hash": "sha256-vxX8r6bbhp/lGeS2GciqAnwetjG3B5qzCLJnTQIWino=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
|
||||
"owner": "cloudposse",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "1.7.1",
|
||||
"rev": "1.8.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U="
|
||||
"vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-oyR9xqEnpt5JoTIe1jgV3aMDxKFdvrDx39UWNc5ECTM=",
|
||||
|
|
@ -1190,13 +1190,13 @@
|
|||
"vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="
|
||||
},
|
||||
"vcd": {
|
||||
"hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=",
|
||||
"hash": "sha256-AiVmxqktBgvXbMl6jA5sMa86sEAvxD1LjVuxdwdBJvU=",
|
||||
"homepage": "https://registry.terraform.io/providers/vmware/vcd",
|
||||
"owner": "vmware",
|
||||
"repo": "terraform-provider-vcd",
|
||||
"rev": "v3.8.2",
|
||||
"rev": "v3.9.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-fDMS1ne6EKAqQjfE4QT1A0ChloXKCrgZPcftxzN/JwU="
|
||||
"vendorHash": "sha256-dYFLohH/gU+cAiaLLNluxAjfj7giqnk+zQKGVSR1Kws="
|
||||
},
|
||||
"venafi": {
|
||||
"hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=",
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.224";
|
||||
version = "1.2.225";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j7Lio56CMC4bJ58Oucm1hCqFNzMeoDpDRh/ALmF9Y3Y=";
|
||||
hash = "sha256-t8IO+x8YXB+5TnO9fglzubNXOhCJQPw1p0E/pkgKGfM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SdBWW1tv3OauCex8l6Kg7uKLFUOvDvCE8rnULytndqw=";
|
||||
vendorHash = "sha256-GCGfhcm/96w73S/NQc8lBDUHon6pB0i5t5qIvBD8f08=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,21 +5,20 @@
|
|||
, glib
|
||||
, gobject-introspection
|
||||
, pkg-config
|
||||
, go
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotktrix";
|
||||
version = "unstable-2022-09-29";
|
||||
version = "unstable-2023-04-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diamondburned";
|
||||
repo = pname;
|
||||
rev = "3d9e8ac4810f7cb9d9ead7b4b13ffa6f5da8927f"; # compound
|
||||
sha256 = "sha256-VIV4vSntu3oCIE23f5fiYj8cxcKY1n4M4Xkf0MGhvxI=";
|
||||
rev = "a8f876a383cc34dac18edddbe22be2dd494b8d0c"; # compound
|
||||
hash = "sha256-BuiA9UajdMhSrEfaXdu5DZlVhC4GVUdUpQDLMvKGrEk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-R55tfTJL/bgNWTgmuBFRxIQleKS9zeDqvfez2VyzqjI=";
|
||||
vendorHash = "sha256-oo/j6i7slXILqyvj/EHojsyCZzJMGd10PTZaLvI1xoc=";
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "3.1.0";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o=";
|
||||
sha256 = "sha256-nleWdgIYmIltZKjjFl6axQd2fkL8UIXZRbATU96cdQ0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U=";
|
||||
vendorHash = "sha256-b6C1FbVXHeJqG9Vh8dqqZ+94T42oRM9kVbDmLuOiPvA=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, perl, flex, bison, python3, autoconf
|
||||
, which, cmake, help2man
|
||||
, makeWrapper, glibcLocales
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "5.006";
|
||||
version = "5.008";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PA8hbE6XECapuaO5YcgEodOoxSDqpMucdijJBBb7fZg=";
|
||||
hash = "sha256-+eJBGvQOk5w+PyUF3aieuXZVeKNS4cKQqHnJibKwFnM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ perl ];
|
||||
nativeBuildInputs = [ flex bison python3 autoconf help2man ];
|
||||
nativeBuildInputs = [ makeWrapper flex bison python3 autoconf help2man ];
|
||||
nativeCheckInputs = [ which ];
|
||||
|
||||
doCheck = stdenv.isLinux; # darwin tests are broken for now...
|
||||
|
|
@ -28,6 +29,12 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl}
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
for x in $(ls $out/bin/verilator*); do
|
||||
wrapProgram "$x" --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and robust (System)Verilog simulator/compiler";
|
||||
homepage = "https://www.veripool.org/wiki/verilator";
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ let
|
|||
else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1"
|
||||
# `ld-linux-riscv{32,64}-<abi>.so.1`
|
||||
else if targetPlatform.isRiscV then "${sharedLibraryLoader}/lib/ld-linux-riscv*.so.1"
|
||||
else if targetPlatform.isLoongArch64 then "${sharedLibraryLoader}/lib/ld-linux-loongarch*.so.1"
|
||||
else if targetPlatform.isDarwin then "/usr/lib/dyld"
|
||||
else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1"
|
||||
else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installTargets = [ "install" "install-otb" "fontdir" ];
|
||||
# fontdir depends on the previous two targets, but this is not known
|
||||
# to make, so we need to disable parallelism:
|
||||
enableParallelInstalling = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A clean fixed width font";
|
||||
|
|
|
|||
92
pkgs/desktops/deepin/core/dde-kwin/default.nix
Normal file
92
pkgs/desktops/deepin/core/dde-kwin/default.nix
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, extra-cmake-modules
|
||||
, deepin-gettext-tools
|
||||
, wrapQtAppsHook
|
||||
, makeWrapper
|
||||
, dtkcore
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, gsettings-qt
|
||||
, xorg
|
||||
, libepoxy
|
||||
, deepin-kwin
|
||||
, kdecoration
|
||||
, kconfig
|
||||
, kwayland
|
||||
, kwindowsystem
|
||||
, kglobalaccel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-kwin";
|
||||
version = "5.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = "b5c00527b86f773595c786c8015d60f8be3a681b";
|
||||
sha256 = "sha256-qXN9AwjLnqO5BpnrX5PaSCKZ6ff874r08ubCMM272tA=";
|
||||
};
|
||||
|
||||
/*
|
||||
This is the final version of dde-kwin, upstream has been archived.
|
||||
We should remove this package when deepin-kwin release a new version.
|
||||
*/
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/include/KWaylandServer" "${kwayland.dev}/include/KWaylandServer"
|
||||
substituteInPlace deepin-wm-dbus/deepinwmfaker.cpp \
|
||||
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" \
|
||||
--replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" \
|
||||
--replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
extra-cmake-modules
|
||||
deepin-gettext-tools
|
||||
wrapQtAppsHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkcore
|
||||
qtbase
|
||||
qtx11extras
|
||||
gsettings-qt
|
||||
xorg.libXdmcp
|
||||
libepoxy
|
||||
deepin-kwin
|
||||
kdecoration
|
||||
kconfig
|
||||
kwayland
|
||||
kwindowsystem
|
||||
kglobalaccel
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPROJECT_VERSION=${version}"
|
||||
"-DQT_INSTALL_PLUGINS=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
# kwin_no_scale is a shell script
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/kwin_no_scale \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH "${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "KWin configuration for Deepin Desktop Environment";
|
||||
homepage = "https://github.com/linuxdeepin/dde-kwin";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
120
pkgs/desktops/deepin/core/deepin-kwin/default.nix
Normal file
120
pkgs/desktops/deepin/core/deepin-kwin/default.nix
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wayland
|
||||
, dwayland
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, wrapQtAppsHook
|
||||
, extra-cmake-modules
|
||||
, gsettings-qt
|
||||
, libepoxy
|
||||
, kconfig
|
||||
, kconfigwidgets
|
||||
, kcoreaddons
|
||||
, kcrash
|
||||
, kdbusaddons
|
||||
, kiconthemes
|
||||
, kglobalaccel
|
||||
, kidletime
|
||||
, knotifications
|
||||
, kpackage
|
||||
, plasma-framework
|
||||
, kcmutils
|
||||
, knewstuff
|
||||
, kdecoration
|
||||
, kscreenlocker
|
||||
, breeze-qt5
|
||||
, libinput
|
||||
, mesa
|
||||
, lcms2
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-kwin";
|
||||
version = "5.24.3-deepin.1.9";
|
||||
|
||||
/*
|
||||
There are no buildable tag in github:
|
||||
- 5.15 tag in eagel branch is used for UOS, it's too old to compile.
|
||||
- 5.25 tag in master branch only work on unreleased deepin v23.
|
||||
Since deepin-kwin was not maintained on github before, we lost all
|
||||
tags in master branch, this version is read from debian/changelog
|
||||
*/
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = "98c9085670938937e2a1ce964f6acddc5c1d6eb5";
|
||||
sha256 = "sha256-/hgDuaDrpwAQsMIoaS8pGBJwWfJSrq6Yjic3a60ITtM=";
|
||||
};
|
||||
|
||||
# Avoid using absolute path to distinguish applications
|
||||
postPatch = ''
|
||||
substituteInPlace src/effects/screenshot/screenshotdbusinterface1.cpp \
|
||||
--replace 'file.readAll().startsWith(DEFINE_DDE_DOCK_PATH"dde-dock")' 'file.readAll().contains("dde-dock")'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
wayland
|
||||
dwayland
|
||||
libepoxy
|
||||
gsettings-qt
|
||||
|
||||
kconfig
|
||||
kconfigwidgets
|
||||
kcoreaddons
|
||||
kcrash
|
||||
kdbusaddons
|
||||
kiconthemes
|
||||
|
||||
kglobalaccel
|
||||
kidletime
|
||||
knotifications
|
||||
kpackage
|
||||
plasma-framework
|
||||
kcmutils
|
||||
knewstuff
|
||||
kdecoration
|
||||
kscreenlocker
|
||||
|
||||
breeze-qt5
|
||||
libinput
|
||||
mesa
|
||||
lcms2
|
||||
|
||||
xorg.libxcb
|
||||
xorg.libXdmcp
|
||||
xorg.libXcursor
|
||||
xorg.xcbutilcursor
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DKWIN_BUILD_RUNNERS=OFF"
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fork of kwin, an easy to use, but flexible, composited Window Manager";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-kwin";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -23,6 +23,8 @@ let
|
|||
util-dfm = callPackage ./library/util-dfm { };
|
||||
|
||||
#### CORE
|
||||
dde-kwin = callPackage ./core/dde-kwin { };
|
||||
deepin-kwin = callPackage ./core/deepin-kwin { };
|
||||
dde-app-services = callPackage ./core/dde-app-services { };
|
||||
dde-control-center = callPackage ./core/dde-control-center { };
|
||||
dde-calendar = callPackage ./core/dde-calendar { };
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.37.0";
|
||||
version = "1.40.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
sha256 = "sha256-jagI5pXH3+4K0cvRfFMFqcRe/FWFCunrckPFAQL7mPo=";
|
||||
sha256 = "sha256-L114Xh0O/Wu8IyrKohxalyXeSe/8oVcAXD4hpa6ocwU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -140,5 +140,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ethindp ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "8.0.0";
|
||||
version = "8.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NSD0xWqxRVFiearYRZFIllizsRHPylWYNzcNoC6+Cpg=";
|
||||
hash = "sha256-xSHwR2MGL49VDKjzAh+xYHbLz3FFg3KYVBjALVgKSQI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v0DLbYM9EoIcj0JEH+LWrMx14gLRfCLW8wYDFKdFNCs=";
|
||||
cargoHash = "sha256-A2JhjRFKPltHubiJYHBXj2H4cdU43Y2x6UjEpRGPX7U=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package wasmtime-cli"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, patches ? []
|
||||
}:
|
||||
|
||||
{ lib, stdenv, fetchurl, gmp
|
||||
{ lib, stdenv, fetchurl, gmp, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -19,6 +19,7 @@ stdenv.mkDerivation {
|
|||
inherit patches;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ autoreconfHook ];
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
inherit configureFlags;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
badPlatforms = [
|
||||
"alpha-linux"
|
||||
"loongarch64-linux"
|
||||
"riscv32-linux"
|
||||
"sparc-linux"
|
||||
"sparc64-linux"
|
||||
|
|
|
|||
161
pkgs/development/libraries/open62541/default.nix
Normal file
161
pkgs/development/libraries/open62541/default.nix
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, check
|
||||
, subunit
|
||||
, python3Packages
|
||||
|
||||
, withDoc ? false
|
||||
, graphviz-nox
|
||||
|
||||
, withExamples ? false
|
||||
|
||||
, withEncryption ? false # or "openssl" or "mbedtls"
|
||||
, openssl
|
||||
, mbedtls
|
||||
|
||||
, withPubSub ? false
|
||||
|
||||
# for passthru.tests only
|
||||
, open62541
|
||||
}:
|
||||
|
||||
let
|
||||
encryptionBackend = {
|
||||
inherit openssl mbedtls;
|
||||
}."${withEncryption}" or (throw "Unsupported encryption backend: ${withEncryption}");
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541";
|
||||
repo = "open62541";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-X0kdMKSqKAJvmrd1YcYe1mJpFONqPCALA09xwd6o7BQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "Ensure-absolute-paths-in-pkg-config-file.patch";
|
||||
url = "https://github.com/open62541/open62541/commit/023d4b6b8bdec987f8f3ffee6c09801bbee4fa2d.patch";
|
||||
sha256 = "sha256-mq4h32js2RjI0Ljown/01SXA3gc+7+zX8meIcvDPvoA=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOPEN62541_VERSION=v${finalAttrs.version}"
|
||||
|
||||
"-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
"-DUA_NAMESPACE_ZERO=FULL"
|
||||
|
||||
"-DUA_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
|
||||
]
|
||||
++ lib.optional withExamples "-DUA_BUILD_EXAMPLES=ON"
|
||||
++ lib.optional (withEncryption != false)
|
||||
"-DUA_ENABLE_ENCRYPTION=${lib.toUpper withEncryption}"
|
||||
++ lib.optional withPubSub "-DUA_ENABLE_PUBSUB=ON"
|
||||
;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3Packages.python
|
||||
]
|
||||
++ lib.optionals withDoc (with python3Packages; [
|
||||
sphinx
|
||||
sphinx_rtd_theme
|
||||
graphviz-nox
|
||||
]);
|
||||
|
||||
buildInputs = lib.optional (withEncryption != false) encryptionBackend;
|
||||
|
||||
buildFlags = [ "all" ] ++ lib.optional withDoc "doc";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
check
|
||||
subunit
|
||||
];
|
||||
|
||||
# Tests must run sequentially to avoid port collisions on localhost
|
||||
enableParallelChecking = false;
|
||||
|
||||
preCheck = let
|
||||
disabledTests =
|
||||
lib.optionals (withEncryption == "mbedtls") [
|
||||
"encryption_basic128rsa15"
|
||||
]
|
||||
++ lib.optionals withPubSub [
|
||||
# "Cannot set socket option IP_ADD_MEMBERSHIP"
|
||||
"pubsub_publish"
|
||||
"check_pubsub_get_state"
|
||||
"check_pubsub_publish_rt_levels"
|
||||
"check_pubsub_subscribe_config_freeze"
|
||||
"check_pubsub_subscribe_rt_levels"
|
||||
"check_pubsub_multiple_subscribe_rt_levels"
|
||||
];
|
||||
regex = "^(${builtins.concatStringsSep "|" disabledTests})\$";
|
||||
in lib.optionalString (disabledTests != []) ''
|
||||
checkFlagsArray+=(ARGS="-E ${lib.escapeRegex regex}")
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString withDoc ''
|
||||
# excluded files, see doc/CMakeLists.txt
|
||||
rm -r doc/{_sources/,CMakeFiles/,cmake_install.cmake}
|
||||
|
||||
# doc is not installed automatically
|
||||
mkdir -p $out/share/doc/open62541
|
||||
cp -r doc/ $out/share/doc/open62541/html
|
||||
'' + lib.optionalString withExamples ''
|
||||
# install sources of examples
|
||||
mkdir -p $out/share/open62541
|
||||
cp -r ../examples $out/share/open62541
|
||||
|
||||
${lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
# remove .exe suffix
|
||||
mv -v $out/bin/ua_server_ctt.exe $out/bin/ua_server_ctt
|
||||
''}
|
||||
|
||||
# remove duplicate libraries in build/bin/, which cause forbidden
|
||||
# references to /build/ in ua_server_ctt
|
||||
rm -r bin/libopen62541*
|
||||
'';
|
||||
|
||||
passthru.tests = let
|
||||
open62541Full = encBackend: open62541.override {
|
||||
withDoc = true;
|
||||
# if (withExamples && withPubSub), one of the example currently fails to build
|
||||
#withExamples = true;
|
||||
withEncryption = encBackend;
|
||||
withPubSub = true;
|
||||
};
|
||||
in {
|
||||
open62541Full = open62541Full false;
|
||||
open62541Full-openssl = open62541Full "openssl";
|
||||
open62541Full-mbedtls = open62541Full "mbedtls";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source implementation of OPC UA";
|
||||
longDescription = ''
|
||||
open62541 (http://open62541.org) is an open source and free implementation
|
||||
of OPC UA (OPC Unified Architecture) written in the common subset of the
|
||||
C99 and C++98 languages.
|
||||
The library is usable with all major compilers and provides the necessary
|
||||
tools to implement dedicated OPC UA clients and servers, or to integrate
|
||||
OPC UA-based communication into existing applications.
|
||||
'';
|
||||
homepage = "https://www.open62541.org";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ panicgh ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -21,12 +22,23 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "basilfx";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-exxpJJA+JnVuehCnWs/ihk/SSPUqV7ODXZxvbmuHe8U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/basilfx/aiobiketrax/pull/63
|
||||
substituteInPlace aiobiketrax/api.py \
|
||||
--replace "auth0.v3" "auth0"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"auth0-python"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc";
|
||||
version = "17.0.8";
|
||||
version = "17.1.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-URN9ACnHbQnq7UqfKwhofOdpE/Bjz7WrbdWQikxpVOU=";
|
||||
hash = "sha256-vXEN7aotz7h0N9bE3fJgEoonzEZicAeOLg5rsz4LoyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "annoy";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vxd9vq+4H2OyrB4SRrHyairMguc7pGY4c00p2CWBIto=";
|
||||
hash = "sha256-5nv7uDfRMG2kVVyIOGDHshXLMqhk5AAiKS1YR60foLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,6 +33,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk";
|
||||
homepage = "https://github.com/spotify/annoy";
|
||||
changelog = "https://github.com/spotify/annoy/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ timokau ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,21 +13,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "auth0-python";
|
||||
version = "4.0.0";
|
||||
version = "4.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gza5HYtxgmTfC+u+WlBiuOinBNXYIfVBa5IX8lr0Hj8=";
|
||||
hash = "sha256-or9lrvCWBTrbRhKDs12KVIukoeo2T8Sb2sex57DfArc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
pyjwt
|
||||
]
|
||||
++ pyjwt.optional-dependencies.crypto;
|
||||
] ++ pyjwt.optional-dependencies.crypto;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiohttp
|
||||
|
|
@ -51,6 +50,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Auth0 Python SDK";
|
||||
homepage = "https://github.com/auth0/auth0-python";
|
||||
changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "axis";
|
||||
version = "47";
|
||||
version = "48";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-a8YvFX3IcbX4Sm75GzGv7vIyMmSHxwGejyq6nE7foOE=";
|
||||
hash = "sha256-/Iz1F40Y00bgJUvNrkPGyA8Kkch92Kijeg8TQ8mostM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
pname = "azure-mgmt-apimanagement";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154";
|
||||
sha256 = "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitlist";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rpXQKkV2RUuYza+gfpGEH3kFJ+hjuNGKV2i46eXQUUI=";
|
||||
hash = "sha256-eViakuhgSe9E8ltxzeg8m6/ze7QQvoKBtYZoBZzHxlA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,25 +1,45 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pycryptodomex, filelock, urllib3, lxml }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, lxml
|
||||
, pycryptodomex
|
||||
, pythonOlder
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blobfile";
|
||||
version = "2.0.1";
|
||||
format = "wheel";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
python = "py3";
|
||||
dist = "py3";
|
||||
hash = "sha256-b1Gz6UjzCpLnNKl0sk/ND2pRhB/Qg96WiJkjFIE1jaI=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christopher-hesse";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vVoiNIN/LNdbedaOQ+gtj4jhzmrGri49fftHKG+K/fg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pycryptodomex filelock urllib3 lxml ];
|
||||
propagatedBuildInputs = [
|
||||
pycryptodomex
|
||||
filelock
|
||||
urllib3
|
||||
lxml
|
||||
];
|
||||
|
||||
# Tests require a running Docker instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"blobfile"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read Google Cloud Storage, Azure Blobs, and local paths with the same interface";
|
||||
homepage = "https://github.com/christopher-hesse/blobfile";
|
||||
description = "Read Google Cloud Storage, Azure Blobs, and local paths with the same interface ";
|
||||
changelog = "https://github.com/christopher-hesse/blobfile/blob/v${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,19 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, django
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dj-database-url";
|
||||
version = "1.3.0";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h75ffEyD2bPYzpS4NPls6hSzmG82KarAl6/dkxjXsJg=";
|
||||
hash = "sha256-o1qfD0N3XKb5DYGdxFYjPve8x2tHN31dkIt1x+syBiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -21,9 +24,15 @@ buildPythonPackage rec {
|
|||
# Tests access a DB via network
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dj_database_url"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Use Database URLs in your Django Application";
|
||||
homepage = "https://github.com/kennethreitz/dj-database-url";
|
||||
homepage = "https://github.com/jazzband/dj-database-url";
|
||||
changelog = "https://github.com/jazzband/dj-database-url/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ lib
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, flask
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-httpauth";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.pythonOlder "3";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-HTTPAuth";
|
||||
version = version;
|
||||
hash = "sha256-9xmee60g1baLPwtivd/KdjfFUIfp0C9gWuJuDeR5/ZQ=";
|
||||
hash = "sha256-ZlaKBbxzlCxl8eIgGudGKVgW3ACe3YS0gsRMdY11CXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,6 +39,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Extension that provides HTTP authentication for Flask routes";
|
||||
homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth";
|
||||
changelog = "https://github.com/miguelgrinberg/Flask-HTTPAuth/blob/v${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fountains";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9ASOgqkE1vwCKGAZXEJaHoABMXomIWTGv3jAsNssdsU=";
|
||||
hash = "sha256-gYVguXMVrXxra/xy+R4RXVk9yDGKiKE8u3qWUk8sjt4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "opencensus";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tS3WtAE8Ezpr6fD/LpBoxkAdMzKw7MX67z3WxCFm9vM=";
|
||||
hash = "sha256-YVQEKiNrns3VWiPfuydDuz3qzQaH4+A5HsLgx0lQ1m8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "parts";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gOPDqXF05bQcG0Kv0+akBrikRr/CfHB9/tM/TJDPHdM=";
|
||||
hash = "sha256-anjD/UfKyfgfJh16cR8ZSUjdAmswO3cdMYKRczyMN3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-vlc";
|
||||
version = "3.0.18121";
|
||||
version = "3.0.18122";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JFUDFKPm7VX9NHsAlJHJi4ZfnfoFqS6InXsKIhDnSFs=";
|
||||
hash = "sha256-EDm94oeFO0t7Yboi2DdhgyQ094UG2nYt+wYCkb8yiX0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
|||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fAlEh3S95Dyw1xHK2XaqbA6xUsASXbhzELGZTH/G+kg=";
|
||||
hash = "sha256-9uubXaGISzenLH0qmNbZpQQTOOplVO3k6aKACmv3dbY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.97";
|
||||
version = "0.0.98";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-A96Q+BoHKc9Q2XY70gAZYg1f1l8hts9P0kiBQwDMN+s=";
|
||||
hash = "sha256-y1lpcxygU4S08E00mSizVvDyuPnoZU5ixnnXhgdr+ck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
withGold = platform: platform.parsed.kernel.execFormat.name == "elf" && !platform.isRiscV;
|
||||
withGold = platform: platform.parsed.kernel.execFormat.name == "elf" && !platform.isRiscV && !platform.isLoongArch64;
|
||||
in
|
||||
|
||||
{ stdenv
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, dejagnu, sourceHighlight
|
||||
|
||||
, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null
|
||||
, enableDebuginfod ? true, elfutils
|
||||
, enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform elfutils, elfutils
|
||||
, guile ? null
|
||||
, hostCpuOnly ? false
|
||||
, safePaths ? [
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.4.2";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T0i0vgwWupCc6C1Cn+Mwo+5CsTmmjD6F6nzsIuOZr/M=";
|
||||
hash = "sha256-EfkN0cKCoe6NA3thCVb2uY664GmQdSitv1yg/DTYtls=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoHash = "sha256-+CNsChYJU5ut9y7JlqhWZH9VuGwnrxZMguROFtdjFMU=";
|
||||
cargoHash = "sha256-BT1wslIrCCmehWfs9QuT5/HqKJVq5BkoyfKvUIx2nQw=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.522";
|
||||
version = "0.0.539";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8t5NZ8YLVA8eT/e7DKyTl1XKYq/Ve/Xih54H4jNH0/g=";
|
||||
hash = "sha256-WsuVn6J2T60bktjU5PqLEkY2FbA1aumymDrF5p/PKTc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aAmhEzUbX00MarPPoz6jM2kaDUK5H8snFeCeIVt2wns=";
|
||||
vendorHash = "sha256-FhJxal/pla3unlKN84qqKi7xuFXXjFz8XnZUmkohhxg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
patches =
|
||||
lib.optional
|
||||
(!isFuse3 && stdenv.isAarch64)
|
||||
(!isFuse3 && (stdenv.isAarch64 || stdenv.hostPlatform.isLoongArch64))
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
|
||||
sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geoserver";
|
||||
version = "2.22.2";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
|
||||
sha256 = "sha256-usVqjXXjMCvbjEz6TKz7RM5A2oUVryjsjFBDUftQcRI=";
|
||||
sha256 = "sha256-qoRyU+dZrgYKa6tqe13nHJacOlNiSMuCECtfMFxu1Vg=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "icingaweb2-ipl";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icinga-php-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3Vf3jT+/jh1YxJrnOFuGkhNIOyioZavSAHMmmkgA2gg=";
|
||||
hash = "sha256-XvlLNCpCLALaw4iEtDCjkLEbqcY6uTnC20UnxIRIbII=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mediamtx";
|
||||
version = "0.22.0";
|
||||
version = "0.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x+4dU+SHkkF0E/NoVvK0aNBCyAIL3Nfbh1tBVe//nx0=";
|
||||
hash = "sha256-NGUEDOME6jzckHrzOboQr5KrZ8Z4iLCTHGCRGhbQThU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pcHtmkYV3hqb6QQ7O6WQSHqwuYWFq3Xx6vhPAIyuFEI=";
|
||||
vendorHash = "sha256-7+0+F1dW70GXjOzJ/+KTFZPp8o1w2wDvQlX0Zrrx7qU=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.38.3";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CSqueR++2vL4K8aexpbzawIhN0dJoSvS6Nzrn97hJe4=";
|
||||
sha256 = "sha256-vhzhYFmU4aIMDbqF33bQSl50DTLs8NQd0SSYsU1wnO0=";
|
||||
};
|
||||
# hash missmatch on across linux and darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-ZB3QVMeLtR9bNUnGVqcADf3RHT99b1jiVvBuGYjtJds=";
|
||||
vendorHash = "sha256-3h4S97wygLH957+PyeaQyc8qnQHie77gJ1kjsTKVFtQ=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
excludedPackages = [ "magefiles" "misc" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2023.4.1";
|
||||
version = "2023.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XnsEidB/rqpiDABLMHHYX7ZMzyXi9OuAnyNFQAmLojA=";
|
||||
hash = "sha256-ThawFY2TPDF70YCh/XJR07YJ5GhbcjFpanLo12Pj3Gk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "miniserve";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "miniserve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Syh7vBaTH5bvmiTm7VuZMX/MCzH7Jw4UpvtEYcG3+dA=";
|
||||
hash = "sha256-nHcJw5RwvXoBQRS/AtUqCuoFRc9FnYtehkMSWn7GiKI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Ip10ihsqsTtFPu26+8eQfzxfjg3i7O0iqz5MkutBvO8=";
|
||||
cargoHash = "sha256-97eNe+gmRXhmfw+pkHAfG8TTxOgBZOPPuXeKT0fWGr4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pistol";
|
||||
version = "0.3.3";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doronbehar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6V3Du3+0YliwzsvZolapBAnyqbsv1WZhWQkaldDR+Ok=";
|
||||
sha256 = "sha256-umejrLdx8R//o9uQIT9JhAKJOIF5Ifpx7s3x3ejsJgo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jURN0NSc9SFHFMS8QdaEqqBwOHnAEEJQlQXHTUDRiyE=";
|
||||
vendorHash = "sha256-zs7qzXvOnIiDwwNldMPB4Jkm2GWxVZnLpDzpf+ivhCc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,16 @@ let
|
|||
datadog_checks_base = buildIntegration {
|
||||
pname = "checks-base";
|
||||
sourceRoot = "datadog_checks_base";
|
||||
|
||||
# Make setuptools build the 'base' and 'checks' modules.
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "from setuptools import setup" "from setuptools import find_packages, setup" \
|
||||
--replace "packages=['datadog_checks']" "packages=find_packages()"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
binary
|
||||
cachetools
|
||||
cryptography
|
||||
immutables
|
||||
|
|
@ -76,6 +85,12 @@ let
|
|||
uptime
|
||||
wrapt
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"datadog_checks.base"
|
||||
"datadog_checks.base.checks"
|
||||
"datadog_checks.checks"
|
||||
];
|
||||
};
|
||||
|
||||
# Default integrations that should be built:
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cliam";
|
||||
version = "2.0.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "securisec";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TEpAY1yY5AFTg5yUZMvTFdZiQ7yBi0rjYgCCksiMfDU=";
|
||||
hash = "sha256-59nPoH0+k1umMwFg95hQHOr/SRGKqr1URFG7xtVRiTs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VCai9rxpnlpviN5W/VIRcNGvPljE2gbFnxA1OKhVElk=";
|
||||
vendorHash = "sha256-Tcz8W/PX+9WE+0iFVhqHuElJI7qWD+AdwOKdTc7FQTE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-04-26";
|
||||
version = "2023-04-28";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FewjLaCJbZKEZd+bCtpeyRahR3Yc/mn8pixYHHaUQrQ=";
|
||||
hash = "sha256-1AF7TtPcciUX2RmxFsytzTMd22GfCH6Ccu+elcidgPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tlsx";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5dVPHuwO2ELekgiIIDHu6CLgyxNoiu4jpvIoCzUA/qU=";
|
||||
hash = "sha256-qwLYRRta1ElnhwWWBMAv6iXWKfic4vR9fuULATWJF3I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3KWvMhFjFupQWZikyTM01GKGtIvtQxxvK9o7UWQULTs=";
|
||||
vendorHash = "sha256-0Nyt/XY4gWL4yoS+Zq3hZUzjf3SySLmxrxfFryCTbTc=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pcre, libiconv, perl }:
|
||||
{ lib, stdenv, fetchurl, pcre, libiconv, perl, autoreconfHook }:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
|
|
@ -16,8 +16,11 @@ stdenv.mkDerivation {
|
|||
sha256 = "0g42svbc1nq5bamxfj6x7320wli4dlj86padk0hwgbk04hqxl42w";
|
||||
};
|
||||
|
||||
# https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=b50c6442e43d79471a31a2a202d3e50c0557446f
|
||||
patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./sigsegv-loongarch.patch;
|
||||
|
||||
# Perl is needed for testing
|
||||
nativeBuildInputs = [ perl ];
|
||||
nativeBuildInputs = [ perl ] ++ lib.optional stdenv.hostPlatform.isLoongArch64 autoreconfHook;
|
||||
outputs = [ "out" "info" ]; # the man pages are rather small
|
||||
|
||||
buildInputs = [ pcre libiconv ];
|
||||
|
|
|
|||
31
pkgs/tools/text/gnugrep/sigsegv-loongarch.patch
Normal file
31
pkgs/tools/text/gnugrep/sigsegv-loongarch.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
From b50c6442e43d79471a31a2a202d3e50c0557446f Mon Sep 17 00:00:00 2001
|
||||
From: Sun Haiyong <youbest@sina.com>
|
||||
Date: Sat, 4 Sep 2021 15:06:43 +0200
|
||||
Subject: sigsegv: Improve cross-compilation support for LoongArch CPU.
|
||||
|
||||
* m4/stack-direction.m4 (SV_STACK_DIRECTION): Assume the stack grows
|
||||
down on LoongArch.
|
||||
---
|
||||
m4/stack-direction.m4 | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
|
||||
index 9328725..e682be9 100644
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -1,4 +1,4 @@
|
||||
-# stack-direction.m4 serial 7
|
||||
+# stack-direction.m4 serial 8
|
||||
dnl Copyright (C) 2002-2021 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--
|
||||
cgit v1.1
|
||||
|
|
@ -5629,7 +5629,7 @@ with pkgs;
|
|||
river = callPackage ../applications/window-managers/river { };
|
||||
|
||||
rivercarro = callPackage ../applications/misc/rivercarro {
|
||||
zig = zig_0_9;
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
|
||||
river-luatile = callPackage ../applications/misc/river-luatile{ };
|
||||
|
|
@ -7446,7 +7446,7 @@ with pkgs;
|
|||
findutils = callPackage ../tools/misc/findutils { };
|
||||
|
||||
findup = callPackage ../tools/misc/findup {
|
||||
zig = zig_0_9;
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
|
||||
fingerprintx = callPackage ../tools/security/fingerprintx { };
|
||||
|
|
@ -17412,7 +17412,7 @@ with pkgs;
|
|||
verible = callPackage ../development/tools/language-servers/verible { };
|
||||
|
||||
zls = callPackage ../development/tools/language-servers/zls {
|
||||
zig = zig_0_10;
|
||||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
|
||||
ansible-later = with python3.pkgs; toPythonApplication ansible-later;
|
||||
|
|
@ -22977,6 +22977,8 @@ with pkgs;
|
|||
|
||||
ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { };
|
||||
|
||||
open62541 = callPackage ../development/libraries/open62541 { };
|
||||
|
||||
openalSoft = callPackage ../development/libraries/openal-soft {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
|
||||
};
|
||||
|
|
@ -26321,7 +26323,7 @@ with pkgs;
|
|||
busybox = callPackage ../os-specific/linux/busybox { };
|
||||
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
|
||||
# musl roadmap has RISC-V support projected for 1.1.20
|
||||
busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"
|
||||
busybox = if !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isLoongArch64 && stdenv.hostPlatform.libc != "bionic"
|
||||
then pkgsStatic.busybox
|
||||
else busybox;
|
||||
};
|
||||
|
|
@ -31121,7 +31123,7 @@ with pkgs;
|
|||
waybar = callPackage ../applications/misc/waybar { };
|
||||
|
||||
waylock = callPackage ../applications/misc/waylock {
|
||||
zig = zig_0_10;
|
||||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
|
||||
wayshot = callPackage ../tools/misc/wayshot { };
|
||||
|
|
@ -32069,7 +32071,7 @@ with pkgs;
|
|||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
mepo = callPackage ../applications/misc/mepo {
|
||||
zig = zig_0_9;
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
|
||||
meshcentral = callPackage ../tools/admin/meshcentral { };
|
||||
|
|
@ -32734,7 +32736,7 @@ with pkgs;
|
|||
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
|
||||
|
||||
ncdu = callPackage ../tools/misc/ncdu {
|
||||
zig = zig_0_10;
|
||||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
|
||||
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
|
||||
|
|
@ -35830,7 +35832,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
blackshades = callPackage ../games/blackshades {
|
||||
zig = zig_0_9;
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
|
||||
blobby = callPackage ../games/blobby { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue