Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -157,6 +157,15 @@ let
|
||||
{
|
||||
options = {
|
||||
package = mkPackageOption pkgs "wordpress" { };
|
||||
finalPackage = mkOption {
|
||||
type = types.package;
|
||||
readOnly = true;
|
||||
default = pkg name config;
|
||||
defaultText = literalExpression "pkg name config";
|
||||
description = ''
|
||||
WordPress package with bundled configuration, plugins and themes.
|
||||
'';
|
||||
};
|
||||
|
||||
uploadsDir = mkOption {
|
||||
type = types.path;
|
||||
@@ -489,9 +498,9 @@ in
|
||||
mkMerge [
|
||||
cfg.virtualHost
|
||||
{
|
||||
documentRoot = mkForce "${pkg hostName cfg}/share/wordpress";
|
||||
documentRoot = mkForce "${cfg.finalPackage}/share/wordpress";
|
||||
extraConfig = ''
|
||||
<Directory "${pkg hostName cfg}/share/wordpress">
|
||||
<Directory "${cfg.finalPackage}/share/wordpress">
|
||||
<FilesMatch "\.php$">
|
||||
<If "-f %{REQUEST_FILENAME}">
|
||||
SetHandler "proxy:unix:${
|
||||
@@ -571,7 +580,7 @@ in
|
||||
enable = true;
|
||||
virtualHosts = mapAttrs (hostName: cfg: {
|
||||
serverName = mkDefault hostName;
|
||||
root = "${pkg hostName cfg}/share/wordpress";
|
||||
root = "${cfg.finalPackage}/share/wordpress";
|
||||
extraConfig = ''
|
||||
index index.php;
|
||||
'';
|
||||
@@ -628,7 +637,7 @@ in
|
||||
hostName: cfg:
|
||||
(nameValuePair hostName {
|
||||
extraConfig = ''
|
||||
root * /${pkg hostName cfg}/share/wordpress
|
||||
root * /${cfg.finalPackage}/share/wordpress
|
||||
file_server
|
||||
|
||||
php_fastcgi unix/${config.services.phpfpm.pools."wordpress-${hostName}".socket}
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "debos";
|
||||
version = "1.1.5";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-debos";
|
||||
repo = "debos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1Xv7r1uyISp1whALtFZWNQgTMH0swd/0+QdRCmXM4DQ=";
|
||||
hash = "sha256-Bu0rLrRp1oeWSMm78DhNM6MsBeG+vAkoRbbqKTThD/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FdcmitxGKzkHqFjllDGW24Lr8yrsYDBzuEDRco9CW14=";
|
||||
vendorHash = "sha256-+3PAqCOFtR8HC4uNNxH1cKk/qkD13zuydTsZte1mQ+c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
|
||||
@@ -20,11 +20,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apache-druid";
|
||||
version = "34.0.0";
|
||||
version = "36.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/druid/${finalAttrs.version}/apache-druid-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha256-y5Sx8mubb+XEqPxlhPL67od1kVck2M+IkvQP/CyrZpA=";
|
||||
hash = "sha256-5KYbGtpq7bp3sSqYGaA+RS4WfZYF/XHBKvilkHS5tJA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "florist";
|
||||
version = "24.2";
|
||||
version = "26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adacore";
|
||||
repo = "florist";
|
||||
rev = "refs/heads/${finalAttrs.version}";
|
||||
hash = "sha256-EFGmcQfWpxEWfsAoQrHegTlizl6siE8obKx+fCpVwUQ=";
|
||||
hash = "sha256-83bfO7RTVs3b7nEzjxnr2eRXggoMjTLIa9agwYKgP9g=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ginac";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ginac.de/ginac-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "sha256-bP1Gz043NpDhLRa3cteu0PXEM9qMfs0kd/LnNkg7tDk=";
|
||||
sha256 = "sha256-bKwZc6UyXeC5vLjjkpiK6V+8N6pmwPHx07jmTAjOwbk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cln ];
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glslviewer";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "patriciogonzalezvivo";
|
||||
repo = "glslViewer";
|
||||
fetchSubmodules = true;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-gQF3hkudQXxI3t1e0Iaa4dYbVc3I7lBekt5jmJLJFpI=";
|
||||
hash = "sha256-rfiTiyCcOa5+ZTU7JrM35mmoZNRzco6M3ZyeZ+hio4w=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.1542";
|
||||
version = "0.24.1591";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sb6a7vIEzrdhMCiENvLcB1V5EhqYQkZ8GObXBoDJAcM=";
|
||||
hash = "sha256-HMf88nXx8FZBsVKttCziHARwlckTTMia4gK3BpQQ5Do=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index d26c293..3276f36 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,12 +1,24 @@
|
||||
module github.com/simeji/jid
|
||||
|
||||
+go 1.19
|
||||
+
|
||||
require (
|
||||
github.com/bitly/go-simplejson v0.5.0
|
||||
- github.com/fatih/color v1.7.0 // indirect
|
||||
- github.com/mattn/go-colorable v0.0.9 // indirect
|
||||
- github.com/mattn/go-isatty v0.0.4 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.4
|
||||
github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed
|
||||
github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5
|
||||
github.com/pkg/errors v0.8.0
|
||||
+ github.com/stretchr/testify v1.8.2
|
||||
+)
|
||||
+
|
||||
+require (
|
||||
+ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
|
||||
+ github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
+ github.com/fatih/color v1.7.0 // indirect
|
||||
+ github.com/kr/pretty v0.3.1 // indirect
|
||||
+ github.com/mattn/go-colorable v0.0.9 // indirect
|
||||
+ github.com/mattn/go-isatty v0.0.4 // indirect
|
||||
+ github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
+ golang.org/x/sys v0.5.0 // indirect
|
||||
+ gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
diff --git a/go.sum b/go.sum
|
||||
index 2fb379f..07d786d 100644
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -1,7 +1,17 @@
|
||||
github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
|
||||
github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
|
||||
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
|
||||
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
|
||||
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
|
||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||||
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
|
||||
@@ -12,5 +22,24 @@ github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed h1:bAVGG6B+R5qpSylr
|
||||
github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
|
||||
github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 h1:d+C3xJdxZT7wNlxqEwbXn3R355CwAhYBL9raVNfSnK0=
|
||||
github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5/go.mod h1:GYFm0zZgTNeoK1QxuIofRDasy2ibmaJZhZLzwsMXUF4=
|
||||
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
|
||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
|
||||
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
|
||||
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
@@ -8,21 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jid";
|
||||
version = "0.7.6";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simeji";
|
||||
repo = "jid";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fZzEbVNGsDNQ/FhII+meQvKeyrgxn3wtFW8VfNmJz5U=";
|
||||
hash = "sha256-Zf1YIEhvmvO482wh8VqQhyvHp7Nz6MXQ1SG0RCG0lRI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lq8ouTjPsGhqDwrCMpqkSU7FEGszYwAkwl92vAEZ68w=";
|
||||
|
||||
patches = [
|
||||
# Run go mod tidy
|
||||
./go-mod.patch
|
||||
];
|
||||
vendorHash = "sha256-ZqnIBmziPX45wqiEzD9mq4jLLW69mgGYhDSOTj20auQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jsonnet-language-server";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "jsonnet-language-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xvN2fq94sD6E/HwZrLSr3TIO5eeuyhvj4UmJCIUFSH0=";
|
||||
hash = "sha256-hMs26mCPghCTCs8Ixf/wcHbUUpMPLicTK6HuUFMzkws=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Kb/ejDUdS+YZnVpzxscOnVVpQcdVicDdJvfUTc6Kg0o=";
|
||||
|
||||
+4
-4
@@ -14,14 +14,14 @@
|
||||
which,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jwm-settings-manager";
|
||||
version = "2019-01-27";
|
||||
|
||||
src = fetchbzr {
|
||||
url = "lp:${pname}";
|
||||
url = "lp:jwm-settings-manager";
|
||||
rev = "292";
|
||||
sha256 = "1yqc1ac2pbkc88z7p1qags1jygdlr5y1rhc5mx6gapcf54bk0lmi";
|
||||
hash = "sha256-sVIwFymOXfVMr4XBHHzJtD0vg34Kh3s+QmyuK5gKDPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -55,4 +55,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -27,14 +27,14 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jwm";
|
||||
version = "2.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joewing";
|
||||
repo = "jwm";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-odGqHdm8xnjEcXmpKMy51HEhbjcROLL3hRSdlbmTr2g=";
|
||||
};
|
||||
|
||||
@@ -86,4 +86,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
mainProgram = "jwm";
|
||||
};
|
||||
}
|
||||
})
|
||||
+3
-2
@@ -9,10 +9,11 @@
|
||||
withALSA ? stdenv.hostPlatform.isLinux,
|
||||
alsa-lib,
|
||||
alsa-plugins,
|
||||
withPortAudio ? false,
|
||||
withPortAudio ? stdenv.hostPlatform.isDarwin,
|
||||
portaudio,
|
||||
withPulseAudio ? false,
|
||||
withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||
libpulseaudio,
|
||||
config,
|
||||
withRodio ? true,
|
||||
withAvahi ? false,
|
||||
withMDNS ? true,
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libvisio2svg";
|
||||
version = "0.5.6";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kakwa";
|
||||
repo = "libvisio2svg";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-MklZ/pY04kw8BJxoGcBQAWdXytAPkrDz0N0W1t9I5Is=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Qpkt7HyicK1lGVrXkcaHabXkIwUhEKUAc84rGmbHE/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "mosdepth";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
|
||||
requiredNimVersion = 1;
|
||||
|
||||
@@ -15,7 +15,7 @@ buildNimPackage (finalAttrs: {
|
||||
owner = "brentp";
|
||||
repo = "mosdepth";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6iKUTnukAAqMWDpmxmFZiHB5v5ztyaTOHzb0F/jIigM=";
|
||||
hash = "sha256-UjyfJSykAbE2RhRsixNx2JwCINMdSmukF5oW9OalyeA=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pure-ftpd";
|
||||
version = "1.0.52";
|
||||
version = "1.0.53";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-ESbzqVhW0IiJ/4lwPLGqnsmSTZOdFU6WkEySDwXcPHQ=";
|
||||
hash = "sha256-s/KwGUIjseiL+LDfnpH/tdG5gSNW6d1GXy+XtyshJl8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -117,12 +117,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shipwright";
|
||||
version = "9.2.1";
|
||||
version = "9.2.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "harbourmasters";
|
||||
repo = "shipwright";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-t3QwJqXMmeC2B26YW1kMnnmRVXOVZA+1SMmDPvTa0FQ=";
|
||||
hash = "sha256-hQxYKZi6YJPittwes3sUZySChPBdGTz0GADbqgfjP5M=";
|
||||
fetchSubmodules = true;
|
||||
deepClone = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "silverbullet";
|
||||
version = "2.5.2";
|
||||
version = "2.6.1";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -31,22 +31,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-linux-x86_64.zip";
|
||||
hash = "sha256-OvwFYPxR6N/njtaaNX0TolgRxZnhX3qBIvT2okoy2cQ=";
|
||||
hash = "sha256-m0bQ3J99WZ9CBrA7M2i7Sh/lOI5c+z/an+9bNfQZW4c=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"aarch64-linux" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-linux-aarch64.zip";
|
||||
hash = "sha256-+VhgiAvDApb7Xi3Ob+fDpq1LrhmqAANZGjLsyhbmfNQ=";
|
||||
hash = "sha256-BqTKMCpifX3Y5kFWQb/9exAjjTc/KeUhYtsHSR850qE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"x86_64-darwin" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-darwin-x86_64.zip";
|
||||
hash = "sha256-jC39IZlFRnZ86I6JMXaaEyET4jwmOI0XKohxxr4VvZc=";
|
||||
hash = "sha256-sqvB9kEpMimcH/rtOc7lBMptu3Cdu6M3z85TfD9QuZ4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"aarch64-darwin" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-darwin-aarch64.zip";
|
||||
hash = "sha256-7njnFI3Ui7+6/kmbdCeEZ4f4gXKfzIx3YCfyB99k/f4=";
|
||||
hash = "sha256-K/4w4jsa+RIYQA9cW2U/oycJx7PfUzcdG6WjZswRLU0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "thermald";
|
||||
version = "2.5.10";
|
||||
version = "2.5.11";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "intel";
|
||||
repo = "thermal_daemon";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-+dk3lOlI8kaf8NvcWQSvTxSqVGPCgvVnTB9nltqQHrU=";
|
||||
sha256 = "sha256-IHBfNqiMd2q5vj+xpo31LFy19zwv0GkB0GoHq8Ni7aA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tqsl";
|
||||
version = "2.8.2";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.arrl.org/files/file/LoTW%20Instructions/tqsl-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-HH78pTeT/wW9dZggxcqRiZ3OqShU7B2uPWa4ya59LfA=";
|
||||
hash = "sha256-bnGXKrH2c0Ng/50Rbzg4z3M6D/EuJ0mkYIThoU94QPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wiki-js";
|
||||
version = "2.5.311";
|
||||
version = "2.5.312";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Requarks/wiki/releases/download/v${finalAttrs.version}/wiki-js.tar.gz";
|
||||
hash = "sha256-XNWJ2XyjTJmt+/Yjiu+w2nIZS9fqlyi11aiV5V4ekwI=";
|
||||
hash = "sha256-J87NrQ+zkUlREe0lGERFFAEW8EFysK5RJhM6OUVI1J0=";
|
||||
};
|
||||
|
||||
# Unpack the tarball into a subdir. All the contents are copied into `$out`.
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yacreader";
|
||||
version = "9.15.0";
|
||||
version = "9.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YACReader";
|
||||
repo = "yacreader";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE=";
|
||||
hash = "sha256-3mLmH6HJnH+LH/NkqI4G8Si5od3YiWnQ/kv5rmPFhlE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.122";
|
||||
hash = "sha256-RJUaC1LZvmfUK/4D6/fD2ge9I4bm1+UGxgKG1mX1Fjc=";
|
||||
version = "3.122.1";
|
||||
hash = "sha256-ujWCx1fm5JbAUX90+3pekNxh12X9vJHRzHDKgP3UwL8=";
|
||||
filename = "latest.nix";
|
||||
versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "dns";
|
||||
version = "10.2.3";
|
||||
version = "10.2.4";
|
||||
|
||||
minimalOCamlVersion = "4.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-yJWy0RLEqmDAmHoJ61nw2WAr2AT+z0EkeVvhbkqGc0o=";
|
||||
hash = "sha256-2FLRXKL1jbVzZ5vxhoh0VgC5Epbi5USGYJhp1mbz0S8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,19 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
attrs,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
attrs,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "attrs-strict";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
@@ -16,7 +22,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = "attrs-strict";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dDOD4Y57E+i8D0S4q+C6t7zjBTsS8q2UFiS22Dsp0Z8=";
|
||||
};
|
||||
|
||||
@@ -35,11 +41,18 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: Regex pattern did not match
|
||||
"test_real_types"
|
||||
"test_recursive"
|
||||
"test_union_when_type_is_not_specified_raises"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/bloomberg/attrs-strict/releases/tag/${version}";
|
||||
description = "Python package which contains runtime validation for attrs data classes based on the types existing in the typing module";
|
||||
homepage = "https://github.com/bloomberg/attrs-strict";
|
||||
changelog = "https://github.com/bloomberg/attrs-strict/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,25 +3,32 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
aniso8601,
|
||||
jsonschema,
|
||||
flask,
|
||||
importlib-resources,
|
||||
werkzeug,
|
||||
jsonschema,
|
||||
pytz,
|
||||
werkzeug,
|
||||
|
||||
# tests
|
||||
blinker,
|
||||
faker,
|
||||
mock,
|
||||
blinker,
|
||||
py,
|
||||
pytest-benchmark,
|
||||
pytest-flask,
|
||||
pytest-mock,
|
||||
pytest-benchmark,
|
||||
pytest-vcr,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "flask-restx";
|
||||
version = "1.3.2";
|
||||
pyproject = true;
|
||||
@@ -30,7 +37,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-restx";
|
||||
repo = "flask-restx";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-KSHRfGX6M/w09P35A68u7uzMKaRioytScPh0Sw8JBfw=";
|
||||
};
|
||||
|
||||
@@ -80,6 +87,18 @@ buildPythonPackage rec {
|
||||
# we disable the tests in the meanwhile and let upstream decide
|
||||
"test_rfc822_value"
|
||||
"test_iso8601_value"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# TypeError: Wildcard.__init__() takes 2 positional arguments but 3 were given
|
||||
"test_description"
|
||||
"test_max_length"
|
||||
"test_max_length_as_callable"
|
||||
"test_min_length"
|
||||
"test_min_length_as_callable"
|
||||
"test_pattern"
|
||||
"test_readonly"
|
||||
"test_required"
|
||||
"test_title"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flask_restx" ];
|
||||
@@ -87,8 +106,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Fully featured framework for fast, easy and documented API development with Flask";
|
||||
homepage = "https://github.com/python-restx/flask-restx";
|
||||
changelog = "https://github.com/python-restx/flask-restx/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/python-restx/flask-restx/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,16 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
django,
|
||||
fetchFromGitHub,
|
||||
netaddr,
|
||||
netbox,
|
||||
numpy,
|
||||
requests,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
django,
|
||||
netaddr,
|
||||
numpy,
|
||||
psycopg,
|
||||
requests,
|
||||
|
||||
# tests
|
||||
netbox,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "netbox-interface-synchronization";
|
||||
version = "4.1.7";
|
||||
pyproject = true;
|
||||
@@ -18,7 +25,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetTech2001";
|
||||
repo = "netbox-interface-synchronization";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-02fdfE1BwpWsh21M0oP65kMAbFxDxYHsAEWA64rUl18=";
|
||||
};
|
||||
|
||||
@@ -29,6 +36,7 @@ buildPythonPackage rec {
|
||||
netaddr
|
||||
requests
|
||||
numpy
|
||||
psycopg # not specified in pyproject.toml, but required at import time
|
||||
];
|
||||
|
||||
# netbox is required for the pythonImportsCheck; plugin does not provide unit tests
|
||||
@@ -43,9 +51,9 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Netbox plugin to compare and synchronize interfaces between devices and device types";
|
||||
homepage = "https://github.com/NetTech2001/netbox-interface-synchronization";
|
||||
changelog = "https://github.com/NetTech2001/netbox-interface-synchronization/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/NetTech2001/netbox-interface-synchronization/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ felbinger ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
django,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
django,
|
||||
netaddr,
|
||||
netbox,
|
||||
poetry-core,
|
||||
psycopg,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -30,6 +35,7 @@ buildPythonPackage (finalAttrs: {
|
||||
dependencies = [
|
||||
django
|
||||
netaddr
|
||||
psycopg # not specified in pyproject.toml, but required at import time
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ netbox ];
|
||||
|
||||
@@ -1,16 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
django,
|
||||
fetchFromGitHub,
|
||||
netaddr,
|
||||
netbox,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
pillow,
|
||||
qrcode,
|
||||
setuptools,
|
||||
psycopg,
|
||||
|
||||
# nativeCheckInputs
|
||||
django,
|
||||
netaddr,
|
||||
netbox,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "netbox-qrcode";
|
||||
version = "0.0.20";
|
||||
pyproject = true;
|
||||
@@ -18,7 +25,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = "netbox-qrcode";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7dPMpuJ2nuj9rRmVrfthD+xrEHoUaLFqDJWC6cGGCwY=";
|
||||
};
|
||||
|
||||
@@ -33,6 +40,7 @@ buildPythonPackage rec {
|
||||
django
|
||||
netaddr
|
||||
netbox
|
||||
psycopg # not specified in pyproject.toml, but required at import time
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
@@ -44,9 +52,9 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Netbox plugin for generate QR codes for objects: Rack, Device, Cable";
|
||||
homepage = "https://github.com/netbox-community/netbox-qrcode";
|
||||
changelog = "https://github.com/netbox-community/netbox-qrcode/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/netbox-community/netbox-qrcode/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ felbinger ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhomee";
|
||||
version = "1.3.8";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taraman17";
|
||||
repo = "pyHomee";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7Op+l6gIyPPE4DX3XGi1hpgWRllOTbaqqUuop7JDMhY=";
|
||||
hash = "sha256-kFsg1abnH9aL5dwSNwQ1WHPdZ6EApc48j8si92kR8ts=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypiserver";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pypiserver";
|
||||
repo = "pypiserver";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tbBSZdkZJGcas3PZ3dj7CqAYNH2Mt0a4aXl6t7E+wNY=";
|
||||
hash = "sha256-nqoAT3g32srJ0c3sGNFQBznLsnymDPUfL7kcON+BP0k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,47 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
flask,
|
||||
pytest,
|
||||
pytestCheckHook,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools-scm,
|
||||
|
||||
# buildInputs
|
||||
pytest,
|
||||
|
||||
# dependencies
|
||||
flask,
|
||||
werkzeug,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytest-flask";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WL4cl7Ibo8TUfgp2ketBAHdIUGw2v1EAT3jfEGkfqV4=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytest-dev";
|
||||
repo = "pytest-flask";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mcBHpP6A+ehqowDccfcn+wv6WXRrF0cY9ez7kqkb3Hc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
flask
|
||||
werkzeug
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pytest_flask" ];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"tests/test_live_server.py"
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.14") [
|
||||
# Failed: nomatch: '*PASSED*'
|
||||
"test_add_endpoint_to_live_server"
|
||||
"test_clean_stop_live_server"
|
||||
"test_live_server_fixed_host"
|
||||
"test_live_server_fixed_port"
|
||||
"test_rewrite_application_server_name"
|
||||
"test_start_live_server"
|
||||
|
||||
# _pickle.PicklingError: Can't pickle local object
|
||||
"test_init"
|
||||
"test_server_is_alive"
|
||||
"test_server_listening"
|
||||
"test_set_application_server_name"
|
||||
"test_stop_cleanly_join_exception"
|
||||
"test_url_for"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Set of pytest fixtures to test Flask applications";
|
||||
homepage = "https://pytest-flask.readthedocs.io/";
|
||||
changelog = "https://github.com/pytest-dev/pytest-flask/blob/${version}/docs/changelog.rst";
|
||||
changelog = "https://github.com/pytest-dev/pytest-flask/blob/${finalAttrs.src.tag}/docs/changelog.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vanschelven ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,10 +6,17 @@
|
||||
six,
|
||||
pypblib,
|
||||
pytestCheckHook,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
kissat404src = fetchurl {
|
||||
url = "https://github.com/arminbiere/kissat/archive/refs/tags/rel-4.0.4.tar.gz";
|
||||
hash = "sha256-v+k+qmMjtIAR5LH890s/LiD53lRHZ+coAJ5bIBgpYZM=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-sat";
|
||||
version = "1.8.dev30";
|
||||
version = "1.9.dev2";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -17,9 +24,15 @@ buildPythonPackage (finalAttrs: {
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) version;
|
||||
pname = "python_sat";
|
||||
hash = "sha256-KaR6NPD6wzA0WcYzq/ptRFBeI0Pfumz/S2rVlsDKnU4=";
|
||||
hash = "sha256-JntHdC4xhDVt8uzZzMn7bmIkMFjrwlZWBs8z0E4WeeU=";
|
||||
};
|
||||
|
||||
# The kissat source archive is not included in the repo and pysat attempts to
|
||||
# download it at build time. We therefore prefetch and link it.
|
||||
prePatch = ''
|
||||
ln -s ${kissat404src} solvers/kissat404.tar.gz
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export MAKEFLAGS="-j$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
@@ -3,6 +3,13 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
backports-entry-points-selectable,
|
||||
click,
|
||||
deprecated,
|
||||
@@ -11,8 +18,8 @@
|
||||
requests,
|
||||
sentry-sdk,
|
||||
tenacity,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# tests
|
||||
aiohttp-utils,
|
||||
flask,
|
||||
hypothesis,
|
||||
@@ -114,6 +121,13 @@ buildPythonPackage (finalAttrs: {
|
||||
pkgs.zstd
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
|
||||
# shutil.RegistryError: .tar.zst is already registered for "zstdtar"
|
||||
"swh/core/tests/test_cli_nar.py"
|
||||
"swh/core/tests/test_nar.py"
|
||||
"swh/core/tests/test_tarball.py"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# FileExistsError: [Errno 17] File exists:
|
||||
"test_uncompress_upper_archive_extension"
|
||||
|
||||
@@ -3,8 +3,14 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
pythonAtLeast,
|
||||
util-linux,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
backports-entry-points-selectable,
|
||||
cassandra-driver,
|
||||
click,
|
||||
@@ -15,10 +21,12 @@
|
||||
mypy-extensions,
|
||||
psycopg,
|
||||
redis,
|
||||
tenacity,
|
||||
swh-core,
|
||||
swh-model,
|
||||
swh-shard,
|
||||
tenacity,
|
||||
|
||||
# tests
|
||||
aiohttp,
|
||||
azure-core,
|
||||
azure-storage-blob,
|
||||
@@ -26,16 +34,15 @@
|
||||
libcloud,
|
||||
postgresql,
|
||||
postgresqlTestHook,
|
||||
pytestCheckHook,
|
||||
pytest-mock,
|
||||
pytest-postgresql,
|
||||
pytestCheckHook,
|
||||
requests-mock,
|
||||
requests-toolbelt,
|
||||
systemd-python,
|
||||
types-python-dateutil,
|
||||
types-pyyaml,
|
||||
types-requests,
|
||||
util-linux,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -52,6 +59,13 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-NnNT9Lt/LGDIJpUmfkfPn6JnF3k8Usf2UVa88zHPKlg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace swh/objstorage/backends/winery/roshard.py \
|
||||
--replace-fail \
|
||||
"/usr/bin/fallocate" \
|
||||
"${lib.getExe' util-linux "fallocate"}"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -68,17 +82,12 @@ buildPythonPackage (finalAttrs: {
|
||||
mypy-extensions
|
||||
psycopg
|
||||
redis
|
||||
tenacity
|
||||
swh-core
|
||||
swh-model
|
||||
swh-shard
|
||||
tenacity
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace swh/objstorage/backends/winery/roshard.py \
|
||||
--replace-fail "/usr/bin/fallocate" "fallocate"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "swh.objstorage" ];
|
||||
|
||||
# Many broken tests on Darwin. Disabling them for now.
|
||||
@@ -94,9 +103,9 @@ buildPythonPackage (finalAttrs: {
|
||||
libcloud
|
||||
postgresql
|
||||
postgresqlTestHook
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytest-postgresql
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
requests-toolbelt
|
||||
systemd-python
|
||||
@@ -107,11 +116,20 @@ buildPythonPackage (finalAttrs: {
|
||||
]
|
||||
++ psycopg.optional-dependencies.pool;
|
||||
|
||||
disabledTests = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
|
||||
# FAILED swh/objstorage/tests/test_objstorage_winery.py::test_winery_leaky_bucket_tick - assert 1 == 0
|
||||
"test_winery_leaky_bucket_tick"
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
|
||||
# _pickle.PicklingError: Can't pickle local object
|
||||
"swh/objstorage/tests/test_objstorage_api.py"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
lib.optionals (pythonAtLeast "3.14") [
|
||||
"test_winery_add_and_pack"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# FAILED swh/objstorage/tests/test_objstorage_winery.py::test_winery_leaky_bucket_tick - assert 1 == 0
|
||||
"test_winery_leaky_bucket_tick"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage/-/tags/${finalAttrs.src.tag}";
|
||||
description = "Content-addressable object storage for the Software Heritage project";
|
||||
|
||||
@@ -3,20 +3,27 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
requests,
|
||||
ndjson,
|
||||
|
||||
# dependencies
|
||||
flask,
|
||||
importlib-metadata,
|
||||
ndjson,
|
||||
requests,
|
||||
swh-auth,
|
||||
swh-core,
|
||||
swh-model,
|
||||
swh-auth,
|
||||
swh-web-client,
|
||||
|
||||
# tests
|
||||
beautifulsoup4,
|
||||
pytestCheckHook,
|
||||
pytest-flask,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
types-beautifulsoup4,
|
||||
types-pyyaml,
|
||||
types-requests,
|
||||
@@ -42,13 +49,13 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
ndjson
|
||||
flask
|
||||
importlib-metadata
|
||||
ndjson
|
||||
requests
|
||||
swh-auth
|
||||
swh-core
|
||||
swh-model
|
||||
swh-auth
|
||||
swh-web-client
|
||||
];
|
||||
|
||||
@@ -56,9 +63,9 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
beautifulsoup4
|
||||
pytestCheckHook
|
||||
pytest-flask
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
swh-core
|
||||
swh-model
|
||||
types-beautifulsoup4
|
||||
@@ -66,12 +73,19 @@ buildPythonPackage (finalAttrs: {
|
||||
types-requests
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Failed: Failed to start the server after 5 seconds.
|
||||
"test_add_provenance_with_release"
|
||||
"test_add_provenance_with_revision"
|
||||
"test_scanner_result"
|
||||
];
|
||||
disabledTests =
|
||||
lib.optionals (pythonAtLeast "3.14") [
|
||||
# _pickle.PicklingError: Can't pickle local object
|
||||
"test_add_provenance_with_release"
|
||||
"test_add_provenance_with_revision"
|
||||
"test_scanner_result"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Failed: Failed to start the server after 5 seconds.
|
||||
"test_add_provenance_with_release"
|
||||
"test_add_provenance_with_revision"
|
||||
"test_scanner_result"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# pytestRemoveBytecodePhase fails with: "error (ignored): error: opening directory "/tmp/nix-build-python3.12-swh-scanner-0.8.3.drv-5/build/pytest-of-nixbld/pytest-0/test_randomdir_policy_info_cal0/big-directory/dir/dir/dir/ ......"
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "torchcodec";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meta-pytorch";
|
||||
repo = "torchcodec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VKpwKV+B2e5z1V1XAdvk6K4/4C3ISPsSiwZ05w5XTBU=";
|
||||
hash = "sha256-aYQp9vEVQJgF1n/KsfnDvLQf5nD0/gsG+RAgVlhk7t8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -685,7 +685,8 @@ let
|
||||
FANOTIFY = yes;
|
||||
FANOTIFY_ACCESS_PERMISSIONS = yes;
|
||||
|
||||
FS_DAX = yes;
|
||||
# DAX requires 64BIT via ZONE_DEVICE and MEMORY_HOTPLUG.
|
||||
FS_DAX = lib.mkIf stdenv.hostPlatform.is64bit yes;
|
||||
|
||||
TMPFS = yes;
|
||||
TMPFS_POSIX_ACL = yes;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
|
||||
version = "2.26.2";
|
||||
version = "2.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = "timescaledb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OGo1EFKcMnR8CR6U8emfAJtwhhIx1EEPddmt5gQA04Q=";
|
||||
hash = "sha256-2ZBra4GumVvbr2GQIM2BQ87X6TeX4LdSIUqpj203L/0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -9544,12 +9544,6 @@ with pkgs;
|
||||
}
|
||||
);
|
||||
|
||||
librespot = callPackage ../applications/audio/librespot {
|
||||
withALSA = stdenv.hostPlatform.isLinux;
|
||||
withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux;
|
||||
withPortAudio = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
linssid = libsForQt5.callPackage ../applications/networking/linssid { };
|
||||
|
||||
deadd-notification-center = haskell.lib.compose.justStaticExecutables (
|
||||
@@ -9770,10 +9764,6 @@ with pkgs;
|
||||
|
||||
jackmix_jack1 = jackmix.override { jack = jack1; };
|
||||
|
||||
jwm = callPackage ../applications/window-managers/jwm { };
|
||||
|
||||
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
|
||||
|
||||
inherit (callPackage ../applications/networking/cluster/k3s { })
|
||||
k3s_1_33
|
||||
k3s_1_34
|
||||
|
||||
Reference in New Issue
Block a user