diff --git a/.github/STALE-BOT.md b/.github/STALE-BOT.md
index 0c5a21cc3524..dff787300d40 100644
--- a/.github/STALE-BOT.md
+++ b/.github/STALE-BOT.md
@@ -1,6 +1,7 @@
# Stale bot information
- Thanks for your contribution!
+- Our stale bot will never close an issue or PR.
- To remove the stale label, just leave a new comment.
- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).
diff --git a/.github/stale.yml b/.github/stale.yml
index b5e6ec93baf9..d6134c7ce112 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -5,6 +5,5 @@ exemptLabels:
- "1.severity: security"
- "2.status: never-stale"
staleLabel: "2.status: stale"
-markComment: |
- I marked this as stale due to inactivity. → [More info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
+markComment: false
closeComment: false
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 79db7528e9f5..5f4e9940d2f7 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -2670,6 +2670,14 @@ cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
like firefox.
+
+
+ The default scribus version is now 1.5,
+ while version 1.4 is still available as
+ scribus_1_4
+ (#172700).
+
+
The Nextcloud module now supports to create a Mysql database
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a558695b248d..1583140a6162 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -928,6 +928,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `nss` package was split into `nss_esr` and `nss_latest`, with `nss` being an alias for `nss_esr`. This was done to ease maintenance of `nss` and dependent high-profile packages like `firefox`.
+- The default `scribus` version is now 1.5, while version 1.4 is still available as `scribus_1_4` ([#172700](https://github.com/NixOS/nixpkgs/pull/172700)).
+
- The Nextcloud module now supports to create a Mysql database automatically
with `services.nextcloud.database.createLocally` enabled.
diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index d983b9910e3b..4acb4c448f52 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -3,13 +3,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
- version = "1.5.1";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88=";
+ sha256 = "sha256-jPR996MEBCTT3k12qOdW1AO8LxA/pvQnw0qiW6//lcs=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix
index ceefa656de30..0a070407a600 100644
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -31,43 +31,43 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.All";
- version = "1.3.6";
- sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl";
+ version = "1.3.8";
+ sha256 = "0xjhxxp8gc06ivbxjbmcacq4pq1c3l3b03pwd785kblxbh7d8zxj";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Charge";
- version = "1.3.2";
- sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w";
+ version = "1.3.4";
+ sha256 = "1ic2kz9mpgcjkmj6a0kscn3iqqp905a4768bn2fx454swpn2w6f9";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.CLightning";
- version = "1.3.2";
- sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9";
- })
- (fetchNuGet {
- pname = "BTCPayServer.Lightning.Common";
- version = "1.2.7";
- sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6";
+ version = "1.3.5";
+ sha256 = "0k9v28h0kvcbwxrjmalk14sna505li125i9aigcj6lddsg1d3xr7";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Common";
version = "1.3.2";
sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0";
})
+ (fetchNuGet {
+ pname = "BTCPayServer.Lightning.Common";
+ version = "1.3.4";
+ sha256 = "1bic7hxw731c0mkjgak0pwlrc7a4yqsr1xi7r3x04cz98nvdlqfc";
+ })
(fetchNuGet {
pname = "BTCPayServer.Lightning.Eclair";
- version = "1.3.2";
- sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb";
+ version = "1.3.4";
+ sha256 = "0im3nzr7ki0nlr5miy7i7b9869vi7frq5g1idwfshqincpgps05g";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LNBank";
- version = "1.3.4";
- sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4";
+ version = "1.3.6";
+ sha256 = "08myhnk41l1zc3ih1h8l6583g4spgfgl1i65sjp02ab9v4i9lalw";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LND";
- version = "1.3.3";
- sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y";
+ version = "1.3.5";
+ sha256 = "1k5i4x382hx3zwczpjvzpxv4nmmlnnlaxcy018bz7b4hvd0l49wq";
})
(fetchNuGet {
pname = "BuildBundlerMinifier";
@@ -181,8 +181,8 @@
})
(fetchNuGet {
pname = "LNURL";
- version = "0.0.15";
- sha256 = "1fy6ywzqs5y9c6d156v08dg8c6689d5xb4y1ar7gqgz6f3cl842n";
+ version = "0.0.18";
+ sha256 = "1dy0if091s8j0klv58v8xy0lnwyw0mxl89m09wkfcs0d4kzmjsrj";
})
(fetchNuGet {
pname = "MailKit";
@@ -209,6 +209,11 @@
version = "5.2.7";
sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1";
})
+ (fetchNuGet {
+ pname = "Microsoft.AspNet.WebApi.Client";
+ version = "5.2.8";
+ sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj";
+ })
(fetchNuGet {
pname = "Microsoft.AspNetCore.Connections.Abstractions";
version = "3.1.10";
@@ -349,11 +354,6 @@
version = "4.0.1";
sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj";
})
- (fetchNuGet {
- pname = "Microsoft.CSharp";
- version = "4.3.0";
- sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb";
- })
(fetchNuGet {
pname = "Microsoft.CSharp";
version = "4.5.0";
@@ -834,11 +834,6 @@
version = "6.0.18";
sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s";
})
- (fetchNuGet {
- pname = "NBitcoin";
- version = "6.0.3";
- sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f";
- })
(fetchNuGet {
pname = "NBitcoin";
version = "6.0.8";
@@ -879,11 +874,6 @@
version = "3.0.14";
sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6";
})
- (fetchNuGet {
- pname = "Newtonsoft.Json";
- version = "10.0.3";
- sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq";
- })
(fetchNuGet {
pname = "Newtonsoft.Json";
version = "11.0.2";
@@ -1081,18 +1071,18 @@
})
(fetchNuGet {
pname = "Selenium.Support";
- version = "3.141.0";
- sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib";
+ version = "4.1.1";
+ sha256 = "1bcvvcybbw22yv9bz10jdms5za2ajczil9kzwjh9zs6yy41gqnwl";
})
(fetchNuGet {
pname = "Selenium.WebDriver.ChromeDriver";
- version = "100.0.4896.6000";
- sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6";
+ version = "101.0.4951.4100";
+ sha256 = "0iqkcmfgzvir4h24qz3namgv7pc14hancb26gqa9j3izb1813ndf";
})
(fetchNuGet {
pname = "Selenium.WebDriver";
- version = "3.141.0";
- sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq";
+ version = "4.1.1";
+ sha256 = "0gavlsanyiff9rxn34cinv0q2m3a8wh66ynlm9mxwkmmybzbbqz4";
})
(fetchNuGet {
pname = "Serilog.AspNetCore";
@@ -1209,16 +1199,6 @@
version = "6.0.0";
sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c";
})
- (fetchNuGet {
- pname = "System.Collections.NonGeneric";
- version = "4.3.0";
- sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
- })
- (fetchNuGet {
- pname = "System.Collections.Specialized";
- version = "4.3.0";
- sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
- })
(fetchNuGet {
pname = "System.Collections";
version = "4.0.11";
@@ -1229,21 +1209,6 @@
version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
- (fetchNuGet {
- pname = "System.ComponentModel.Primitives";
- version = "4.3.0";
- sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
- })
- (fetchNuGet {
- pname = "System.ComponentModel.TypeConverter";
- version = "4.3.0";
- sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
- })
- (fetchNuGet {
- pname = "System.ComponentModel";
- version = "4.3.0";
- sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
- })
(fetchNuGet {
pname = "System.Configuration.ConfigurationManager";
version = "4.5.0";
@@ -1304,11 +1269,6 @@
version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
})
- (fetchNuGet {
- pname = "System.Dynamic.Runtime";
- version = "4.3.0";
- sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
- })
(fetchNuGet {
pname = "System.Formats.Asn1";
version = "5.0.0";
@@ -1669,21 +1629,11 @@
version = "4.3.0";
sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
})
- (fetchNuGet {
- pname = "System.Runtime.Serialization.Formatters";
- version = "4.3.0";
- sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m";
- })
(fetchNuGet {
pname = "System.Runtime.Serialization.Primitives";
version = "4.1.1";
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
})
- (fetchNuGet {
- pname = "System.Runtime.Serialization.Primitives";
- version = "4.3.0";
- sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf";
- })
(fetchNuGet {
pname = "System.Runtime";
version = "4.1.0";
@@ -1959,11 +1909,6 @@
version = "4.0.1";
sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
})
- (fetchNuGet {
- pname = "System.Xml.XmlDocument";
- version = "4.3.0";
- sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
- })
(fetchNuGet {
pname = "System.Xml.XPath.XmlDocument";
version = "4.0.1";
diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix
index b7a517c3dbef..4d684f6a9350 100644
--- a/pkgs/applications/blockchains/nbxplorer/default.nix
+++ b/pkgs/applications/blockchains/nbxplorer/default.nix
@@ -2,13 +2,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
- version = "2.3.20";
+ version = "2.3.26";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
- sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc=";
+ sha256 = "sha256-PaunSwbIf9hGmZeS8ZI4M0C6T76bLCalnS4/x9TWrtY=";
};
projectFile = "NBXplorer/NBXplorer.csproj";
diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
index 2d3f41f25866..2a862c31c881 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p dotnet-sdk_3
+#!nix-shell -i bash -p dotnet-sdk_6
set -euo pipefail
# Writes deps for dotnet package in $pkgSrc to $depsFile.
diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
index 1ca9ef3444b5..033a7bbf4b6f 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
@@ -1,11 +1,13 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes
+#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_6 git gnupg nixFlakes
set -euo pipefail
# This script uses the following env vars:
# getVersionFromTags
# refetch
+trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
+
pkgName=$1
depsFile=$2
customFlags=$3
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index dcca5395defe..6cc8e60a39c1 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -32,9 +32,9 @@
}
},
"dev": {
- "version": "103.0.5060.13",
- "sha256": "1y7nadfmw4yxc2za7ln3h7xywlzdiscmsa8kjar17gmqz6ic69id",
- "sha256bin64": "0crs07sjqhgpr22vxa7c52ai8xvxp6c4cs82kaqzc5cgg97076gq",
+ "version": "103.0.5060.24",
+ "sha256": "1vdnq7vd0jdxkpc00xwvvk1mmyq2hcydms64l16nv3v8jgvizrha",
+ "sha256bin64": "0590ffrbpnd4v8z1wzn1baqvj59gx2yc3zp3qvhvmfrdmxz9i9b4",
"deps": {
"gn": {
"version": "2022-05-11",
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index aad4b24d7404..24b65db364d0 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -43,21 +43,6 @@ python3.pkgs.buildPythonApplication rec {
gettext wrapGAppsHook
];
- # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719.
- # We don't use plugin release URL because it's updated in place.
- plugins = fetchFromGitLab {
- domain = "dev.gajim.org";
- owner = "gajim";
- repo = "gajim-plugins";
- rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99";
- sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE=";
- };
-
- postPatch = ''
- mkdir -p gajim/data/plugins
- cp -r $plugins/plugin_installer gajim/data/plugins
- '';
-
dontWrapGApps = true;
preFixup = ''
@@ -65,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
'';
propagatedBuildInputs = with python3.pkgs; [
- nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging
+ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
@@ -88,7 +73,7 @@ python3.pkgs.buildPythonApplication rec {
description = "Jabber client written in PyGTK";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ raskin abbradar ];
- downloadPage = "http://gajim.org/downloads.php";
+ downloadPage = "http://gajim.org/download/";
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix
index b522b5190639..4bc80b84b847 100644
--- a/pkgs/applications/networking/mailreaders/mailspring/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix
@@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "mailspring";
- version = "1.10.2";
+ version = "1.10.3";
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
- sha256 = "sha256-6KHhkmHWhj/AgECYqNuJ0iSPEYyuBDac/3fW6J0fgTg=";
+ sha256 = "sha256-+H2KeaRBApveUG6Vz+Z8LWpmNpZ4lwyeX1LK0AKx/bw=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix
new file mode 100644
index 000000000000..a6427d0f890b
--- /dev/null
+++ b/pkgs/applications/office/scribus/1_4.nix
@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
+, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
+
+let
+ icon = fetchurl {
+ url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
+ sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
+ };
+
+ pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
+in stdenv.mkDerivation rec {
+ pname = "scribus";
+ version = "1.4.8";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
+ };
+
+ nativeBuildInputs = [ pkg-config cmake ];
+ buildInputs = with xorg;
+ [ freetype lcms libtiff libxml2 libart_lgpl qt4
+ pythonEnv cups fontconfig
+ libjpeg zlib libpng podofo hunspell cairo
+ boost # for internal 2geom library
+ libXaw libXext libX11 libXtst libXi libXinerama
+ libpthreadstubs libXau libXdmcp
+ imagemagick # To build the icon
+ ];
+
+ postPatch = ''
+ substituteInPlace scribus/util_ghostscript.cpp \
+ --replace 'QString gsName("gs");' \
+ 'QString gsName("${ghostscript}/bin/gs");'
+ '';
+
+ postInstall = ''
+ for i in 16 24 48 64 96 128 256 512; do
+ mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
+ convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
+ done
+ '';
+
+ meta = {
+ maintainers = [ lib.maintainers.marcweber ];
+ platforms = lib.platforms.linux;
+ description = "Desktop Publishing (DTP) and Layout program for Linux";
+ homepage = "https://www.scribus.net";
+ license = lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index a6427d0f890b..d3f706bbf054 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,52 +1,143 @@
-{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
-, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
+{ boost
+, cairo
+, cmake
+, cups
+, fetchurl
+, fetchpatch
+, fontconfig
+, freetype
+, harfbuzzFull
+, hunspell
+, lcms2
+, libjpeg
+, libtiff
+, libxml2
+, mkDerivation
+, pixman
+, pkg-config
+, podofo
+, poppler
+, poppler_data
+, python3
+, qtbase
+, qtimageformats
+, qttools
+, lib
+}:
let
- icon = fetchurl {
- url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
- sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
- };
-
- pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
-in stdenv.mkDerivation rec {
+ pythonEnv = python3.withPackages (
+ ps: [
+ ps.pillow
+ ps.tkinter
+ ]
+ );
+in
+mkDerivation rec {
pname = "scribus";
- version = "1.4.8";
+
+ version = "1.5.7";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
+ url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
+ sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
};
- nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = with xorg;
- [ freetype lcms libtiff libxml2 libart_lgpl qt4
- pythonEnv cups fontconfig
- libjpeg zlib libpng podofo hunspell cairo
- boost # for internal 2geom library
- libXaw libXext libX11 libXtst libXi libXinerama
- libpthreadstubs libXau libXdmcp
- imagemagick # To build the icon
+ patches = [
+ # For harfbuzz >= 2.9.0
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
+ sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
+ })
+ # For harfbuzz >= 3.0
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
+ sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
+ })
+ # For Poppler 22.02
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
+ sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
+ sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
+ })
+ # For Poppler 22.03
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
+ sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
+ sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
+ sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
+ sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
+ sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
+ })
+ # For Poppler 22.04
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
+ sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ boost
+ cairo
+ cups
+ fontconfig
+ freetype
+ harfbuzzFull
+ hunspell
+ lcms2
+ libjpeg
+ libtiff
+ libxml2
+ pixman
+ podofo
+ poppler
+ poppler_data
+ pythonEnv
+ qtbase
+ qtimageformats
+ qttools
+ ];
+
+ cmakeFlags = [
+ # poppler uses std::optional
+ "-DWANT_CPP17=ON"
+ ];
+
+ meta = with lib; {
+ maintainers = with maintainers; [
+ erictapen
+ kiwi
];
-
- postPatch = ''
- substituteInPlace scribus/util_ghostscript.cpp \
- --replace 'QString gsName("gs");' \
- 'QString gsName("${ghostscript}/bin/gs");'
- '';
-
- postInstall = ''
- for i in 16 24 48 64 96 128 256 512; do
- mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
- convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
- done
- '';
-
- meta = {
- maintainers = [ lib.maintainers.marcweber ];
- platforms = lib.platforms.linux;
+ platforms = platforms.linux;
description = "Desktop Publishing (DTP) and Layout program for Linux";
homepage = "https://www.scribus.net";
- license = lib.licenses.gpl2;
+ # There are a lot of licenses...
+ # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
+ license = with licenses; [
+ bsd3
+ gpl2Plus
+ mit
+ publicDomain
+ ];
};
}
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
deleted file mode 100644
index d3f706bbf054..000000000000
--- a/pkgs/applications/office/scribus/unstable.nix
+++ /dev/null
@@ -1,143 +0,0 @@
-{ boost
-, cairo
-, cmake
-, cups
-, fetchurl
-, fetchpatch
-, fontconfig
-, freetype
-, harfbuzzFull
-, hunspell
-, lcms2
-, libjpeg
-, libtiff
-, libxml2
-, mkDerivation
-, pixman
-, pkg-config
-, podofo
-, poppler
-, poppler_data
-, python3
-, qtbase
-, qtimageformats
-, qttools
-, lib
-}:
-
-let
- pythonEnv = python3.withPackages (
- ps: [
- ps.pillow
- ps.tkinter
- ]
- );
-in
-mkDerivation rec {
- pname = "scribus";
-
- version = "1.5.7";
-
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
- sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
- };
-
- patches = [
- # For harfbuzz >= 2.9.0
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
- sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
- })
- # For harfbuzz >= 3.0
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
- sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
- })
- # For Poppler 22.02
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
- sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
- sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
- })
- # For Poppler 22.03
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
- sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
- sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
- sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
- sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
- sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
- })
- # For Poppler 22.04
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
- sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
- })
- ];
-
- nativeBuildInputs = [
- cmake
- pkg-config
- ];
-
- buildInputs = [
- boost
- cairo
- cups
- fontconfig
- freetype
- harfbuzzFull
- hunspell
- lcms2
- libjpeg
- libtiff
- libxml2
- pixman
- podofo
- poppler
- poppler_data
- pythonEnv
- qtbase
- qtimageformats
- qttools
- ];
-
- cmakeFlags = [
- # poppler uses std::optional
- "-DWANT_CPP17=ON"
- ];
-
- meta = with lib; {
- maintainers = with maintainers; [
- erictapen
- kiwi
- ];
- platforms = platforms.linux;
- description = "Desktop Publishing (DTP) and Layout program for Linux";
- homepage = "https://www.scribus.net";
- # There are a lot of licenses...
- # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
- license = with licenses; [
- bsd3
- gpl2Plus
- mit
- publicDomain
- ];
- };
-}
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 44ae40411213..f399099d4dac 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -172,6 +172,6 @@ let
in
# A wrapper around sage that makes sure sage finds its docs (if they were build).
callPackage ./sage.nix {
- inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs;
+ inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs;
inherit withDoc requireSageTests;
}
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 78fd8d598d0b..87f3e1137b19 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -2,6 +2,7 @@
, makeWrapper
, sage-tests
, sage-with-env
+, jupyter-kernel-definition
, jupyter-kernel-specs
, sagedoc
, withDoc
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m
doc = sagedoc;
lib = sage-with-env.env.lib;
- kernelspec = jupyter-kernel-specs.definition.sagemath;
+ kernelspec = jupyter-kernel-definition;
};
meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index b2f5346bbfce..26632abe4694 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4=";
+ sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY=";
};
- vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI=";
+ vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM=";
doCheck = false;
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 8871ac2306ef..936660cf7984 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "git-lfs";
- version = "3.1.4";
+ version = "3.2.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "sha256-dGqb7gw7l2SPGwhHIFbEq6XqMB9QRw3+3Pfbk2S4kW4=";
+ sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=";
};
goPackagePath = "github.com/git-lfs/git-lfs";
@@ -30,7 +30,7 @@ buildGoPackage rec {
'';
postInstall = ''
- installManPage go/src/${goPackagePath}/man/*.{1,5}
+ installManPage go/src/${goPackagePath}/man/man*/*
'';
meta = with lib; {
diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix
index 995af6bb92b3..83dbf2a18fae 100644
--- a/pkgs/development/embedded/avrdude/default.nix
+++ b/pkgs/development/embedded/avrdude/default.nix
@@ -7,11 +7,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null;
stdenv.mkDerivation rec {
pname = "avrdude";
- version = "6.4";
+ version = "7.0";
src = fetchurl {
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
- sha256 = "sha256-qb5wZvcKnc9L8HNvz1MdtqMlCu0aJMxkOt0nZBtxEPk=";
+ sha256 = "sha256-wO9l2Y1gQMoLTytwDVFGPCoflGZUQfOdFdl0Qtu3m1Q=";
};
configureFlags = lib.optionals docSupport "--enable-doc";
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index 0c2a07149d20..79b0e4caa1f0 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa
stdenv.mkDerivation rec {
pname = "flint";
- version = "2.8.4";
+ version = "2.8.5";
src = fetchurl {
url = "https://www.flintlib.org/flint-${version}.tar.gz";
- sha256 = "sha256-Yd+S6oyOncaS1Gxx1/UKqgmjPUugjQKheEcwpEXl5L4=";
+ sha256 = "sha256-WRH+3/kREA8VeB8146T6k0/mDkrqAqjBDMiRgQHB7tg=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 5875c8070e76..412c5b8b2f3c 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "22.1.2";
+ version = "22.1.3";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "intel-gmmlib-${version}";
- sha256 = "sha256-5exS0B2iRbmFkKtoHzL4NnZ7L3DaukthUYkoj2tpZuE=";
+ sha256 = "sha256-YckzS9f0q+5YOR+8mTZ/u67NVFrwLllxfEuojuJC84E=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 3e22483eb07f..f5613d493680 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -19,7 +19,7 @@
, openjpeg
, pkg-config
, python3
-, scribusUnstable
+, scribus
, texlive
, zlib
, withData ? true, poppler_data
@@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
- version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+ version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
outputs = [ "out" "dev" ];
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
# These depend on internal poppler code that frequently changes.
- inherit inkscape cups-filters texlive scribusUnstable;
+ inherit inkscape cups-filters texlive scribus;
};
};
diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix
index 456186e45ab3..5af0c0b63cdc 100644
--- a/pkgs/development/python-modules/androidtv/default.nix
+++ b/pkgs/development/python-modules/androidtv/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "androidtv";
- version = "0.0.67";
+ version = "0.0.68";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "v${version}";
- hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";
+ hash = "sha256-cRupsdHpzzxV57ZsuWqZBvtbMYWwXFSVLqsNJ7kfpPA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix
new file mode 100644
index 000000000000..8e41d24c9e1b
--- /dev/null
+++ b/pkgs/development/python-modules/drf-spectacular/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, dj-rest-auth
+, django
+, django-allauth
+, django-filter
+, django-oauth-toolkit
+, django-polymorphic
+, django-rest-auth
+, django-rest-polymorphic
+, djangorestframework
+, djangorestframework-camel-case
+, djangorestframework-dataclasses
+, djangorestframework-recursive
+, djangorestframework-simplejwt
+, drf-jwt
+, drf-nested-routers
+, drf-spectacular-sidecar
+, inflection
+, jsonschema
+, psycopg2
+, pytest-django
+, pytestCheckHook
+, pyyaml
+, uritemplate
+}:
+
+buildPythonPackage rec {
+ pname = "drf-spectacular";
+ version = "0.22.1";
+
+ src = fetchFromGitHub {
+ owner = "tfranzel";
+ repo = "drf-spectacular";
+ rev = version;
+ sha256 = "sha256-SgzyIzgFBXsNHfY2OfCq0LhJyi/ZCOSA8QveKNduIBc=";
+ };
+
+ propagatedBuildInputs = [
+ django
+ djangorestframework
+ inflection
+ jsonschema
+ pyyaml
+ uritemplate
+ ];
+
+ checkInputs = [
+ dj-rest-auth
+ django-allauth
+ django-filter
+ django-oauth-toolkit
+ django-polymorphic
+ django-rest-auth
+ django-rest-polymorphic
+ djangorestframework-camel-case
+ djangorestframework-dataclasses
+ djangorestframework-recursive
+ djangorestframework-simplejwt
+ drf-jwt
+ drf-nested-routers
+ drf-spectacular-sidecar
+ psycopg2
+ pytest-django
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "drf_spectacular" ];
+
+ meta = with lib; {
+ description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework";
+ homepage = "https://github.com/tfranzel/drf-spectacular";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index ea3511e843a3..570598e1a993 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -17,7 +17,7 @@
}:
buildPythonPackage rec {
- version = "0.20.40";
+ version = "0.20.42";
pname = "dulwich";
format = "setuptools";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-vtcO/gt91RpHvOqbmEqwamdddDi3izLaHLr891D7utc=";
+ hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix
index d594f8c8ad5b..6fb99a918396 100644
--- a/pkgs/development/python-modules/feedparser/default.nix
+++ b/pkgs/development/python-modules/feedparser/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "feedparser";
- version = "6.0.9";
+ version = "6.0.10";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-2tQue+rsVfmcCLKwz3KIvHz9JLb3LI74VHi8tVZIzUI=";
+ sha256 = "sha256-J9pIX0Y3znFjzeqxOoAxK5O30MG3db70pHYpoxELylE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index 590f1d9f824e..17555cc50c63 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
- version = "0.28.29";
+ version = "0.28.30";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "flux_led";
- rev = version;
- sha256 = "sha256-Hwe8eshY5j+10fARCp7fMnZf2Sxal7+7Vj5DYVPNXks=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-ujox3Q8oyPw8+SBdF9O7ezu8FC/NnWxeSGW8Nfh7tZ8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix
index b6573db53268..00e50e8259d7 100644
--- a/pkgs/development/python-modules/hsluv/default.nix
+++ b/pkgs/development/python-modules/hsluv/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "hsluv";
- version = "5.0.2";
+ version = "5.0.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "hsluv";
repo = "hsluv-python";
rev = "v${version}";
- sha256 = "0r0w8ycjwfg3pmzjghzrs0lkam93fzvgiqvrwh3nl9jnqlpw7v7j";
+ sha256 = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix
index f017ff5fb54f..2cc9e3368c76 100644
--- a/pkgs/development/python-modules/pot/default.nix
+++ b/pkgs/development/python-modules/pot/default.nix
@@ -61,6 +61,9 @@ buildPythonPackage rec {
--replace " --junit-xml=junit-results.xml" ""
substituteInPlace setup.py \
--replace '"oldest-supported-numpy", ' ""
+
+ # we don't need setup.py to find the macos sdk for us
+ sed -i '/sdk_path/d' setup.py
'';
# To prevent importing of an incomplete package from the build directory
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
index 27470b66a624..7ee7b7e2c5b4 100644
--- a/pkgs/development/python-modules/pykeepass/default.nix
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pykeepass";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "libkeepass";
repo = "pykeepass";
- rev = version;
- sha256 = "sha256-D+loaPBpKdXyiqpdth3ANDjH6IewuKYhj/DzRE2hDn4=";
+ rev = "v${version}";
+ hash = "sha256-q6cBowEki5iJh04Hp1jwbWdteEu3HXtD3tG/TsYDRNI=";
};
postPatch = ''
@@ -30,9 +30,11 @@ buildPythonPackage rec {
${python.interpreter} -m unittest tests.tests
'';
+ pythonImportsCheck = [ "pykeepass" ];
+
meta = with lib; {
homepage = "https://github.com/libkeepass/pykeepass";
- changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst";
+ changelog = "https://github.com/libkeepass/pykeepass/blob/${src.rev}/CHANGELOG.rst";
description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 2158b96daa40..e69579c93589 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -87,6 +87,11 @@ buildPythonPackage rec {
# Fails to parse cmdline arguments
"test_dev"
"test_auto_reload"
+ "test_host_port_ipv6_loopback"
+ "test_num_workers"
+ "test_debug"
+ "test_access_logs"
+ "test_noisy_exceptions"
# OSError: foo
"test_bad_headers"
"test_create_server_trigger_events"
@@ -100,6 +105,8 @@ buildPythonPackage rec {
"test_keep_alive_connection_context"
# Racy tests
"test_keep_alive_client_timeout"
+ "test_keep_alive_server_timeout"
+ "test_zero_downtime"
];
disabledTestPaths = [
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 96d009a0b473..c908eade2059 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.27.27";
+ version = "2.27.29";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1hjZgJ+jL1FM8XzqhGCBTaZxxWNm+xyQiszKi/GDESs=";
+ sha256 = "sha256-+0U7OnakjspmOBzqgAT+quoSg16DgZb1x6yHx1xcGe8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index a3238d4c5484..2ed3bec5a73b 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "uvicorn";
- version = "0.17.5";
+ version = "0.17.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s=";
+ hash = "sha256-iJlAU7zZl9X3FcQlJoJ7KlETZOx6WsE9FcpCK4Cm/Fo=";
};
outputs = [
@@ -68,6 +68,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://www.uvicorn.org/";
+ changelog = "https://github.com/encode/uvicorn/blob/${src.rev}/CHANGELOG.md";
description = "The lightning-fast ASGI server";
license = licenses.bsd3;
maintainers = with maintainers; [ wd15 ];
diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix
index 8c43fe7f5947..55087a502100 100644
--- a/pkgs/development/tools/misc/go-md2man/default.nix
+++ b/pkgs/development/tools/misc/go-md2man/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "go-md2man";
- version = "2.0.1";
+ version = "2.0.2";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "cpuguy83";
repo = "go-md2man";
- sha256 = "sha256-DnXWnHWtczNnLaQg9Wnp9U/K4h/FbhqGgba44P6VNBQ=";
+ sha256 = "sha256-C+MaDtvfPYABSC2qoMfZVHe2xX/WtDjp6v/ayFCIGac=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix
index a0f1b097a98a..04526f59bd49 100644
--- a/pkgs/development/tools/misc/saleae-logic-2/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix
@@ -1,10 +1,10 @@
{ lib, fetchurl, makeDesktopItem, appimageTools }:
let
name = "saleae-logic-2";
- version = "2.3.52";
+ version = "2.3.53";
src = fetchurl {
url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
- sha256 = "sha256-Z1xDVb1qFPtTi40dZ1CBw6ZqtQbYjuUjeUinBV+wdw8=";
+ sha256 = "sha256-RZrOyL0tb1nH5SX7P6d4TFkxSwDZiJUpu1eZaXqX3ew=";
};
desktopItem = makeDesktopItem {
inherit name;
diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix
index 453104014d80..942d87c32e20 100644
--- a/pkgs/development/tools/pip-audit/default.nix
+++ b/pkgs/development/tools/pip-audit/default.nix
@@ -25,14 +25,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "pip-audit";
- version = "2.3.0";
+ version = "2.3.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "v${version}";
- hash = "sha256-OaWyBswqfzbo9pqN3oa92XNbfkMGARog2yH9kIyOzIk=";
+ hash = "sha256-W7g2ZV1Xf1s5sGRJiZdQcreBD6zp1/VRQPGs+VIOJE0=";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index e66a432836da..b6485a32851c 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,61 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.280-hardened1.patch",
- "sha256": "0hkn7rbgvnv9v7pzrg5g6ygmdzlrjl3yama9kp9aw0xw2akghmb4",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.280-hardened1/linux-hardened-4.14.280-hardened1.patch"
+ "name": "linux-hardened-4.14.281-hardened1.patch",
+ "sha256": "1i70qrv9dfpp0szl2m6icrnzpgw1r21nr4b6bbpdf1gmq22y9gf1",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.281-hardened1/linux-hardened-4.14.281-hardened1.patch"
},
- "sha256": "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr",
- "version": "4.14.280"
+ "sha256": "0pivb1m2cwqnlm8bhd4ccnlq9pwp2r5lmn77gp91k6vbjv3gkqis",
+ "version": "4.14.281"
},
"4.19": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.244-hardened1.patch",
- "sha256": "063q4vd0spk602s4if751341jaansh0764qq7fhy764j31678n0j",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.244-hardened1/linux-hardened-4.19.244-hardened1.patch"
+ "name": "linux-hardened-4.19.245-hardened1.patch",
+ "sha256": "181bsz4zzw1hmk3l0cxrgfxlf1z5gy86bxrnwxh08n3j35biywf2",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.245-hardened1/linux-hardened-4.19.245-hardened1.patch"
},
- "sha256": "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79",
- "version": "4.19.244"
+ "sha256": "1s58qci6xhmss12glzkqk41kp60pqmzh4d84kyz4m4nf4xhdvzcr",
+ "version": "4.19.245"
},
"5.10": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.117-hardened1.patch",
- "sha256": "1l53sjknm8q76r1jljm321cmh6ic36pc9w5rmi68lbds19ndfpx3",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.117-hardened1/linux-hardened-5.10.117-hardened1.patch"
+ "name": "linux-hardened-5.10.118-hardened1.patch",
+ "sha256": "0kn33lzb92p80rvy3jzkhnv5izr8h082x400s6ihxp1sqdal0fb7",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.118-hardened1/linux-hardened-5.10.118-hardened1.patch"
},
- "sha256": "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh",
- "version": "5.10.117"
+ "sha256": "0jqbzvgbvaldwwarvg27mcv2kfcgmfw72zpy4h4sp5d1hzqj1q65",
+ "version": "5.10.118"
},
"5.15": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.15.41-hardened1.patch",
- "sha256": "1y98rvn4qyx8w8bjchfzsd7g9gkhfm20cwaj3p88sgq7q81kyz8s",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.41-hardened1/linux-hardened-5.15.41-hardened1.patch"
+ "name": "linux-hardened-5.15.43-hardened1.patch",
+ "sha256": "03ilpzhr01567aaadwwk3qdnh9hlm427ihyrr59dwlwsfcqy2fd9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.43-hardened1/linux-hardened-5.15.43-hardened1.patch"
},
- "sha256": "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w",
- "version": "5.15.41"
+ "sha256": "04hwaykdjdqhcdk1pr6p4kkyw6h3z6ig4qpsra2klxsqklx92jq6",
+ "version": "5.15.43"
},
"5.17": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.17.9-hardened1.patch",
- "sha256": "0n7zz04vnajpsfn662fxx75jinnr0kpqwzyypgwn99v4lmsxvza1",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.9-hardened1/linux-hardened-5.17.9-hardened1.patch"
+ "name": "linux-hardened-5.17.11-hardened1.patch",
+ "sha256": "01l4k1j23ckkifjxwaq9lcfp7ynpasyn5f7nqsff6xx2wcg0qyxf",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.11-hardened1/linux-hardened-5.17.11-hardened1.patch"
},
- "sha256": "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p",
- "version": "5.17.9"
+ "sha256": "0c8vz02lbfm0zkgsr1gvdp8bzxz255dk863pnakw6d77z9bfc22p",
+ "version": "5.17.11"
},
"5.4": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.195-hardened1.patch",
- "sha256": "1q7a211jw22nl1yz3k3cv6g4h7csir0wwyypzij54xbg3k7by0p9",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.195-hardened1/linux-hardened-5.4.195-hardened1.patch"
+ "name": "linux-hardened-5.4.196-hardened1.patch",
+ "sha256": "11q9sadncbz84yhsai7xdbrgmcbghj0hc1lqc45767v1f3snmpyi",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.196-hardened1/linux-hardened-5.4.196-hardened1.patch"
},
- "sha256": "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj",
- "version": "5.4.195"
+ "sha256": "1x5irgki792f21hm5146xary0260cl9r475kvw8vm9w32vyx18ig",
+ "version": "5.4.196"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4c4d7c932450..bfed578429ef 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.280";
+ version = "4.14.281";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr";
+ sha256 = "0pivb1m2cwqnlm8bhd4ccnlq9pwp2r5lmn77gp91k6vbjv3gkqis";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index ea79db67ed75..606fe18413fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.244";
+ version = "4.19.245";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79";
+ sha256 = "1s58qci6xhmss12glzkqk41kp60pqmzh4d84kyz4m4nf4xhdvzcr";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 9f82f1805e90..93570b9b5c0e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.315";
+ version = "4.9.316";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1171p90s00jxg1clyz8kp81ilmdzygg131mxysr6lpkaisahkjg6";
+ sha256 = "05yd7djm6dcxv3vaylhmj3p0yml421azv8qabmhv4ric1f99idjp";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index daeabc538370..aa4a489692d9 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.117";
+ version = "5.10.118";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh";
+ sha256 = "0jqbzvgbvaldwwarvg27mcv2kfcgmfw72zpy4h4sp5d1hzqj1q65";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index f2d550a285b1..5c559fc86645 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.41";
+ version = "5.15.43";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -15,6 +15,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w";
+ sha256 = "04hwaykdjdqhcdk1pr6p4kkyw6h3z6ig4qpsra2klxsqklx92jq6";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix
index 46384061684d..19e521432fde 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.17.9";
+ version = "5.17.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p";
+ sha256 = "0c8vz02lbfm0zkgsr1gvdp8bzxz255dk863pnakw6d77z9bfc22p";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 1d5bbc07832f..b2d9a81d0f8b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.195";
+ version = "5.4.196";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj";
+ sha256 = "1x5irgki792f21hm5146xary0260cl9r475kvw8vm9w32vyx18ig";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix
index 92cf4cd66588..3352911a4434 100644
--- a/pkgs/servers/dex/default.nix
+++ b/pkgs/servers/dex/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dex";
- version = "2.31.1";
+ version = "2.31.2";
src = fetchFromGitHub {
owner = "dexidp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4BmZpN3k1qDYLdkXm4AX73bX5hBiyLv0nVKYVwD/HCM=";
+ sha256 = "sha256-x9U+LtcgVYODQoiTkFShdALFfrTIhingrJ43RpHbc78=";
};
vendorSha256 = "sha256-l+/qjYokg5zHAFkKxtkdX49HqVW6kfz7OHqs6SRKDYg=";
@@ -32,7 +32,7 @@ buildGoModule rec {
description = "OpenID Connect and OAuth2 identity provider with pluggable connectors";
homepage = "https://github.com/dexidp/dex";
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley techknowlogick ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index 772d91a83452..cf57dc336855 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
- version = "0.40.0";
+ version = "0.41.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
- sha256 = "sha256-UCyXDemrC6/8AreicZZwZ95+VgLOXsJ2nzlYvP6/6C8=";
+ sha256 = "sha256-vVmOEiP4oMvs8EmHAmp/xS1RMqs6ESDm4Ov9hAEeWPg=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index b0eea8778938..c23005e96d77 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -10,14 +10,14 @@
}:
stdenv.mkDerivation rec {
- version = "1.5.6";
+ version = "1.5.7";
pname = "goaccess";
src = fetchFromGitHub {
owner = "allinurl";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1yvFyTH5m+KIN/x61cbUNgweK38WFdIUDvnkFYmST9s=";
+ sha256 = "sha256-ElDsQliB2+4X/psiavGr/bHQ1tMw7VMJroqCPMkOGOs=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index b6cc6e4acc35..41e6694267fc 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pgmetrics";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "rapidloop";
repo = pname;
rev = "v${version}";
- sha256 = "1fwc4qc17fqmzx08kiyfx5iwgzr14dxk9i8zjd9bq5gk281v0ybd";
+ sha256 = "sha256-VDobaU+zY1ubVBrb/pdKKfSWCYTRDz1ssqZ0Fsv0KBc=";
};
- vendorSha256 = "18da45axjl8l3qb6f3w5v2c7clz4bjhdz2bck20j729k7693hpsl";
+ vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY=";
doCheck = false;
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 78e2dc219b73..8cc15590391d 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "8.3.1";
+ version = "9.0.0";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EsC17VUQDgrhCU26fsqf2zXOTKa/WeKHiWG0Zn1Qao4=";
+ sha256 = "sha256-D3yd5Xc+7VNBrRkkKW7BGxEXcZHmmESy2YOEKBf/k9M=";
};
- cargoSha256 = "sha256-e5QJw5yY+ZkijqoqRauA5ncvLWiRlalYZCwSG5U7uDk=";
+ cargoSha256 = "sha256-g3Efw8HQ/fvrACyM0sW0bNAVQDdGPLnARe8Uug3szj0=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ];
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index d03a0ce1cac8..cc4f60f1fb37 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
- version = "8.8.4";
+ version = "8.8.5";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EW5skmSnnQiMCMqyh51t1q4F5JVYWLSuj1qTqfWp/ok=";
+ sha256 = "sha256-+vuT60RtynjWNjBPpUzeKstqKrEg7pmZbl6qpGs3H/s=";
};
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index 9b4500019982..b98ca7ed817f 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -45,9 +45,9 @@ buildGoModule rec {
--replace "TestScanRepository" "SkipScanRepository" \
--replace "TestGit" "SkipGit"
- # without networking the branch context can't be fetched and is empty
+ # remove test that requires networking
substituteInPlace core/cautils/scaninfo_test.go \
- --replace 'assert.Equal(t, "master", ctx.RepoContextMetadata.Branch)' 'assert.Equal(t, "", ctx.RepoContextMetadata.Branch)'
+ --replace "TestSetContextMetadata" "SkipSetContextMetadata"
'';
postInstall = ''
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 3c198e9b7010..17e70a3113c7 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
- version = "3.0.7";
+ version = "3.0.8";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
- sha256 = "sha256-tO9/egY4eNwQpCZU0zx8G3k4UYsf7S3tUdr6pCMTAWU=";
+ sha256 = "sha256-fPQX/Iz+dc3nF3xMPt0bek4JC2XSHe4aC4O0tZwLf6Y=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 129a06484139..51f51534635e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1207,6 +1207,7 @@ mapAliases ({
scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15
scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22
scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
+ scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
sdlmame = mame; # Added 2019-10-30
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7ab64e64225..0f4597100d21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9315,7 +9315,9 @@ with pkgs;
pgcenter = callPackage ../tools/misc/pgcenter { };
- pgmetrics = callPackage ../tools/misc/pgmetrics { };
+ pgmetrics = callPackage ../tools/misc/pgmetrics {
+ buildGoModule = buildGo118Module;
+ };
pgsync = callPackage ../development/tools/database/pgsync { };
@@ -29433,11 +29435,12 @@ with pkgs;
scli = callPackage ../applications/misc/scli { };
- scribus = callPackage ../applications/office/scribus {
+ scribus_1_4 = callPackage ../applications/office/scribus/1_4.nix {
inherit (gnome2) libart_lgpl;
};
- scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { };
+ scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
+ scribus = scribus_1_5;
seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2fe618420d6f..3d4ff7c5ebb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2548,6 +2548,8 @@ in {
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
+ drf-spectacular = callPackage ../development/python-modules/drf-spectacular { };
+
drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { };
drf-yasg = callPackage ../development/python-modules/drf-yasg { };