diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md
index d6a456f01883..1bec023b613a 100644
--- a/nixos/doc/manual/development/running-nixos-tests.section.md
+++ b/nixos/doc/manual/development/running-nixos-tests.section.md
@@ -24,8 +24,8 @@ After building/downloading all required dependencies, this will perform
a build that starts a QEMU/KVM virtual machine containing a NixOS
system. The virtual machine mounts the Nix store of the host; this makes
VM creation very fast, as no disk image needs to be created. Afterwards,
-you can view a pretty-printed log of the test:
+you can view a log of the test:
```ShellSession
-$ firefox result/log.html
+$ nix-store --read-log result
```
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml
index 7159b95b22b0..da2e5076c956 100644
--- a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml
+++ b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml
@@ -26,9 +26,9 @@ machine: QEMU running (pid 8841)
perform a build that starts a QEMU/KVM virtual machine containing a
NixOS system. The virtual machine mounts the Nix store of the host;
this makes VM creation very fast, as no disk image needs to be
- created. Afterwards, you can view a pretty-printed log of the test:
+ created. Afterwards, you can view a log of the test:
-$ firefox result/log.html
+$ nix-store --read-log result
diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix
index f5c8efb3076c..a0846ad52902 100644
--- a/nixos/modules/services/mail/postfixadmin.nix
+++ b/nixos/modules/services/mail/postfixadmin.nix
@@ -114,7 +114,7 @@ in
location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${fpm.socket};
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf;
}
'';
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index ac192c56aa60..1dd393da8822 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -153,7 +153,7 @@ in
location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${fpm.socket};
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf;
}
'';
diff --git a/nixos/modules/services/misc/sourcehut/git.nix b/nixos/modules/services/misc/sourcehut/git.nix
index 5ce16df8cd87..ff110905d184 100644
--- a/nixos/modules/services/misc/sourcehut/git.nix
+++ b/nixos/modules/services/misc/sourcehut/git.nix
@@ -207,7 +207,7 @@ in
fastcgi_param PATH_INFO $uri;
fastcgi_param GIT_PROJECT_ROOT $document_root;
fastcgi_read_timeout 500s;
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
gzip off;
}
'';
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 407742f72ad5..a557e742b7cf 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -254,7 +254,7 @@ in {
location /cgi-bin {
gzip off;
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME ${pkg}/libexec/zoneminder/${zms};
fastcgi_param HTTP_PROXY "";
fastcgi_intercept_errors on;
@@ -270,7 +270,7 @@ in {
try_files $uri =404;
fastcgi_index index.php;
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_param HTTP_PROXY "";
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index 30913ced8849..1f8ca742db95 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -376,7 +376,7 @@ in
"~ \\.php$" = {
extraConfig = ''
try_files $uri $uri/ /doku.php;
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket};
diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix
index a95e2b4f82a9..328c61c8e646 100644
--- a/nixos/modules/services/web-apps/jirafeau.nix
+++ b/nixos/modules/services/web-apps/jirafeau.nix
@@ -136,7 +136,7 @@ in
'';
locations = {
"~ \\.php$".extraConfig = ''
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket};
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index fd97ab76a5f6..4b36cc8754c6 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -235,7 +235,7 @@ in
locations."~ \\.php$" = {
tryFiles = "$uri =404";
extraConfig = ''
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_pass unix:${fpm.socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix
index 456ca00416fe..f2b6d9559823 100644
--- a/nixos/modules/services/web-apps/rss-bridge.nix
+++ b/nixos/modules/services/web-apps/rss-bridge.nix
@@ -111,7 +111,7 @@ in
locations."~ ^/index.php(/|$)" = {
extraConfig = ''
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix
index 11bf2a309ea8..db45577a46d1 100644
--- a/nixos/modules/services/web-servers/nginx/gitweb.nix
+++ b/nixos/modules/services/web-servers/nginx/gitweb.nix
@@ -79,7 +79,7 @@ in
};
locations."${cfg.location}/" = {
extraConfig = ''
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile};
fastcgi_pass unix:/run/gitweb/gitweb.sock;
'';
diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix
index fc9b214b762e..38f8d5c883fd 100644
--- a/nixos/tests/gitolite-fcgiwrap.nix
+++ b/nixos/tests/gitolite-fcgiwrap.nix
@@ -42,7 +42,7 @@ import ./make-test-python.nix (
auth_basic_user_file /etc/gitolite/htpasswd;
# common FastCGI parameters are required
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
# strip the CGI program prefix
fastcgi_split_path_info ^(/git)(.*)$;
diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix
index 31a79bb4dbe3..718a635a6c7c 100644
--- a/nixos/tests/php/fpm.nix
+++ b/nixos/tests/php/fpm.nix
@@ -17,7 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: {
locations."~ \\.php$".extraConfig = ''
fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket};
fastcgi_index index.php;
- include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf;
'';
locations."/" = {
diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix
index 0685cb134921..21b92f3823ec 100644
--- a/pkgs/applications/misc/feedbackd/default.nix
+++ b/pkgs/applications/misc/feedbackd/default.nix
@@ -17,6 +17,15 @@
, dbus
}:
+let
+ themes = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = "feedbackd-device-themes";
+ rev = "v0.0.20210909";
+ sha256 = "1d041wnq39sa0sl08xya4yp3n7j6aw560i38chl10vgpmwk9mmhr";
+ };
+in
stdenv.mkDerivation rec {
pname = "feedbackd";
# Not an actual upstream project release,
@@ -63,6 +72,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/lib/udev/rules.d
sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules
+ cp ${themes}/data/* $out/share/feedbackd/themes/
'';
meta = with lib; {
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 3046638ec4a6..bffe67491c35 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yate";
- version = "6.1.0-1";
+ version = "6.4.0-1";
src = fetchurl {
url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
- sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d";
+ hash = "sha256-jCPca/+/jUeNs6hZZLUBl3HI9sms9SIPNGVRanSKA7A=";
};
# TODO zaptel ? postgres ?
@@ -14,12 +14,14 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 openssl ];
# /dev/null is used when linking which is a impure path for the wrapper
- preConfigure =
+ postPatch =
''
- sed -i 's@,/dev/null@@' configure
patchShebangs configure
+ substituteInPlace configure --replace ",/dev/null" ""
'';
+ enableParallelBuilding = false; # fails to build if true
+
# --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
preBuild =
''
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://yate.null.ro/";
# Yate's license is GPL with an exception for linking with
# OpenH323 and PWlib (licensed under MPL).
- license = ["GPL" "MPL"];
+ license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.marcweber ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 1fb348242c7e..bf370dd6ec0c 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.10.5";
+ version = "1.10.6";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-n6viI9yEqb73691s499vRB48LCOV0LdTbMR81P+Q5pM=";
+ sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index c4d59e88b9d0..47392ea83a54 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.25.0";
+ version = "0.25.1";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-OWLyjXsV2MX1WfSjRD1/0oAeZxQpeWz5xIyYTLnn+eA=";
+ sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index 73506867a32d..2769ec44ea2b 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "werf";
- version = "1.2.67";
+ version = "1.2.69";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- sha256 = "sha256-SCSj+spANhbrdhj204fsvshkDi0fKmt8jbc11UHJARw=";
+ sha256 = "sha256-rmDP8qPOPhUrygt5gAF2MOVNCHqh+1Gc50mnVFXpev4=";
};
vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0=";
proxyVendor = true;
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 38fc90d8e589..d1df2fea444c 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tribler";
- version = "7.10.0";
+ version = "7.11.0";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
- hash = "sha256-CVZOVOWS0fvfg1yDiWFRa4v4Tpzl8RMVBQ6z0Ib4hfQ=";
+ sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx";
};
nativeBuildInputs = [
@@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
service-identity
twisted
yappi
+ pydantic
+ anyio
]);
installPhase = ''
@@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
cp -prvd ./* $out/
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
+ --set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \
--set _TRIBLERPATH $out/src \
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
--set NO_AT_BRIDGE 1 \
@@ -78,10 +81,17 @@ stdenv.mkDerivation rec {
--add-flags "-O $out/src/run_tribler.py"
mkdir -p $out/share/applications $out/share/icons
- cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop
+ cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
'';
+ shellHook = ''
+ wrapPythonPrograms || true
+ export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms)
+ export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH
+ export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"
+ '';
+
meta = with lib; {
description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
homepage = "https://www.tribler.org/";
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index da07d7d72ab9..58ce130a7305 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "remmina";
- version = "1.4.23";
+ version = "1.4.24";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "sha256-MyemiSAMZEa9Ng6WHEyHgrze8YtIbzMCR8CTb86PDsg=";
+ sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix
new file mode 100644
index 000000000000..36272ff207f5
--- /dev/null
+++ b/pkgs/development/coq-modules/LibHyps/default.nix
@@ -0,0 +1,21 @@
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib;
+mkCoqDerivation {
+ pname = "LibHyps";
+ owner = "Matafou";
+ inherit version;
+ defaultVersion = if (versions.range "8.11" "8.15") coq.version then "2.0.4.1" else null;
+ release = {
+ "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h";
+ };
+
+ configureScript = "./configure.sh";
+
+ releaseRev = (v: "libhyps-${v}");
+
+ meta = {
+ description = "Hypotheses manipulation library";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix
index 929d23c81869..c6b6f79bf017 100644
--- a/pkgs/development/coq-modules/addition-chains/default.nix
+++ b/pkgs/development/coq-modules/addition-chains/default.nix
@@ -8,11 +8,12 @@ mkCoqDerivation {
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
+ release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.13" "8.14"; out = "0.5"; }
+ { case = range "8.13" "8.15"; out = "0.6"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix
index 5b76cb9148f0..d4bcaa8ef81f 100644
--- a/pkgs/development/coq-modules/gaia-hydras/default.nix
+++ b/pkgs/development/coq-modules/gaia-hydras/default.nix
@@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec {
repo = "hydra-battles";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
+ release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [
+ { cases = [ (range "8.14" "8.15") (isGe "1.12.0") ]; out = "0.6"; }
{ cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }
] null;
diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix
index faec5d3e330c..e7dc7474e857 100644
--- a/pkgs/development/coq-modules/hydra-battles/default.nix
+++ b/pkgs/development/coq-modules/hydra-battles/default.nix
@@ -1,22 +1,21 @@
-{ lib, mkCoqDerivation, coq, equations, version ? null }:
+{ lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }:
with lib;
-mkCoqDerivation {
+(mkCoqDerivation {
pname = "hydra-battles";
owner = "coq-community";
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
+ release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.13" "8.14"; out = "0.5"; }
+ { case = range "8.13" "8.15"; out = "0.6"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
- propagatedBuildInputs = [ equations ];
-
useDune2 = true;
meta = {
@@ -32,4 +31,7 @@ mkCoqDerivation {
license = licenses.mit;
platforms = platforms.unix;
};
-}
+}).overrideAttrs(o:
+ let inherit (o) version; in {
+ propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version) LibHyps;
+ })
diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix
index 316b37f2e099..4bd00811b5fb 100644
--- a/pkgs/development/interpreters/php/7.4.nix
+++ b/pkgs/development/interpreters/php/7.4.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "7.4.27";
- sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563";
+ version = "7.4.28";
+ sha256 = "sha256-IIUIaoY0RLDjlUfeGklp/RxAoMGI61j6spOLZJsMS1g=";
});
in
diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index b34f5974ff4e..1f1fa1dfbc45 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.0.14";
- sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v";
+ version = "8.0.16";
+ sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk=";
});
in
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index d339e7801018..8d87a5e7a225 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.1.2";
- sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci";
+ version = "8.1.3";
+ sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4=";
});
in
diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix
index 759549dbb289..88588a9fee75 100644
--- a/pkgs/development/libraries/libliftoff/default.nix
+++ b/pkgs/development/libraries/libliftoff/default.nix
@@ -1,17 +1,18 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitLab
, meson, pkg-config, ninja
, libdrm
}:
stdenv.mkDerivation rec {
pname = "libliftoff";
- version = "0.1.0";
+ version = "0.2.0";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
owner = "emersion";
repo = pname;
rev = "v${version}";
- sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla";
+ sha256 = "1ysxm7kg1gwrsn29lw8kngvkxp46g4m2pvbwcvscgvr54ikirn4q";
};
nativeBuildInputs = [ meson pkg-config ninja ];
diff --git a/pkgs/development/nim-packages/jsonschema/default.nix b/pkgs/development/nim-packages/jsonschema/default.nix
index 8dc195b8b822..e19af7fbb865 100644
--- a/pkgs/development/nim-packages/jsonschema/default.nix
+++ b/pkgs/development/nim-packages/jsonschema/default.nix
@@ -1,8 +1,22 @@
-{ fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }:
-fetchFromGitHub {
- owner = "PMunch";
- repo = "jsonschema";
- rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
- sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz";
+buildNimPackage rec {
+ pname = "jsonschema";
+ version = "unstable-2019-09-12";
+
+ src = fetchFromGitHub {
+ owner = "PMunch";
+ repo = "jsonschema";
+ rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
+ sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz";
+ };
+
+ propagatedBuildInputs = [ astpatternmatching ];
+
+ meta = with lib; {
+ homepage = "https://github.com/PMunch/jsonschema";
+ description = "Schema validation of JSON for Nim";
+ license = licenses.mit;
+ maintainers = [ maintainers.marsam ];
+ };
}
diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix
new file mode 100644
index 000000000000..8831999e9923
--- /dev/null
+++ b/pkgs/development/python-modules/ciscoconfparse/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchFromGitHub, passlib, dnspython, loguru, toml
+, ipaddr, poetry, poetry-core, black, Fabric, pytest, sphinx }:
+
+buildPythonPackage rec {
+ pname = "ciscoconfparse";
+ version = "1.6.21";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "mpenning";
+ repo = pname;
+ rev = version;
+ sha256 = "1d6nzhmdg7zlg1h3lm4v7j4hsb2aqd475r5q5vcqxfdxszc92w21";
+ };
+
+ patchPhase = ''
+ patchShebangs tests
+ '';
+
+ propagatedBuildInputs =
+ [ passlib dnspython loguru toml ipaddr poetry black Fabric sphinx ];
+
+ checkInputs = [ pytest ];
+
+ meta = with lib; {
+ description =
+ "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations";
+ homepage = "https://github.com/mpenning/ciscoconfparse";
+ license = licenses.gpl3Only;
+ maintainers = [ maintainers.astro ];
+ };
+}
diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix
index 3c786d869155..b6d31ddaf947 100644
--- a/pkgs/development/python-modules/enlighten/default.nix
+++ b/pkgs/development/python-modules/enlighten/default.nix
@@ -5,28 +5,41 @@
, blessed
, prefixed
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "enlighten";
version = "1.10.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "7a5b83cd0f4d095e59d80c648ebb5f7ffca0cd8bcf7ae6639828ee1ad000632a";
+ hash = "sha256-eluDzQ9NCV5Z2Axkjrtff/ygzYvPeuZjmCjuGtAAYyo=";
};
propagatedBuildInputs = [
blessed
prefixed
];
- checkInputs = [ pytestCheckHook ];
- pythonImportsCheck = [ "enlighten" ];
- disabledTests =
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "enlighten"
+ ];
+
+ disabledTests = [
+ # AssertionError: <_io.TextIOWrapper name='' mode='w' encoding='utf-8'> is not...
+ "test_init"
+ ] ++ lib.optional stdenv.isDarwin [
# https://github.com/Rockhopper-Technologies/enlighten/issues/44
- lib.optional stdenv.isDarwin "test_autorefresh"
- ;
+ "test_autorefresh"
+ ];
meta = with lib; {
description = "Enlighten Progress Bar for Python Console Apps";
diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
new file mode 100644
index 000000000000..41ef6faa7c37
--- /dev/null
+++ b/pkgs/development/python-modules/ipaddr/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "ipaddr";
+ version = "2.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0";
+ };
+
+ checkPhase = ''
+ python ipaddr_test.py
+ '';
+
+ meta = with lib; {
+ description = "IP address manipulation library";
+ homepage = "https://github.com/google/ipaddr-py";
+ license = licenses.asl20;
+ maintainers = [ maintainers.astro ];
+ };
+}
diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 0ad388db3292..f049e2a09d3d 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "jsonrpclib-pelix";
- version = "0.4.3.1";
+ version = "0.4.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f6f376c72ec1c0dfd69fcc2721d711f6ca1fe22bf71f99e6884c5e43e9b58c95";
+ sha256 = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw=";
};
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix
new file mode 100644
index 000000000000..2266283cc53b
--- /dev/null
+++ b/pkgs/development/python-modules/napalm/default.nix
@@ -0,0 +1,44 @@
+{ lib, buildPythonPackage, fetchFromGitHub, callPackage, setuptools, cffi
+, paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko
+, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock }:
+
+buildPythonPackage rec {
+ pname = "napalm";
+ version = "3.3.1";
+
+ src = fetchFromGitHub {
+ owner = "napalm-automation";
+ repo = "napalm";
+ rev = version;
+ sha256 = "15h1h1a3avv48i14x96b8v7zkhmwg7dnzxycxr18f9530j237rq6";
+ };
+
+ buildInputs = [ setuptools ];
+ propagatedBuildInputs = [
+ cffi
+ paramiko
+ requests
+ future
+ textfsm
+ jinja2
+ netaddr
+ pyyaml
+ pyeapi
+ netmiko
+ junos-eznc
+ ciscoconfparse
+ scp
+ lxml
+ ncclient
+ ];
+
+ checkInputs = [ pytestCheckHook mock ddt ];
+
+ meta = with lib; {
+ description =
+ "Network Automation and Programmability Abstraction Layer with Multivendor support";
+ homepage = "https://github.com/napalm-automation/napalm";
+ license = licenses.asl20;
+ maintainers = [ maintainers.astro ];
+ };
+}
diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix
new file mode 100644
index 000000000000..774fdd2299cc
--- /dev/null
+++ b/pkgs/development/python-modules/napalm/hp-procurve.nix
@@ -0,0 +1,41 @@
+{ lib, buildPythonPackage, fetchFromGitHub, setuptools, napalm, netmiko
+, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "napalm-hp-procurve";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "napalm-automation-community";
+ repo = pname;
+ rev = version;
+ sha256 = "1lspciddkd1w5lfyz35i0qwgpbn5jq9cbqkwjbsvi4kliz229vkh";
+ };
+
+ # dependency installation in setup.py doesn't work
+ patchPhase = ''
+ echo -n > requirements.txt
+ '';
+
+ buildInputs = [ setuptools napalm ];
+ propagatedBuildInputs = [ netmiko ];
+
+ # setup.cfg seems to contain invalid pytest parameters
+ preCheck = ''
+ rm setup.cfg
+ '';
+ checkInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # AssertionError: Some methods vary.
+ "test_method_signatures"
+ # AttributeError: 'PatchedProcurveDriver' object has no attribute 'platform'
+ "test_get_config_filtered"
+ ];
+
+ meta = with lib; {
+ description = "HP ProCurve Driver for NAPALM automation frontend";
+ homepage =
+ "https://github.com/napalm-automation-community/napalm-hp-procurve";
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix
new file mode 100644
index 000000000000..0934439f7473
--- /dev/null
+++ b/pkgs/development/python-modules/netmiko/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, setuptools, paramiko, scp, tenacity
+, textfsm, ntc-templates, pyserial, pytestCheckHook, pyyaml }:
+
+buildPythonPackage rec {
+ pname = "netmiko";
+ version = "3.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "14s9c6ws32swizcmfdqmlkkk2yqw6071ybq3w94fhkl6jzfvkbdc";
+ };
+
+ buildInputs = [ setuptools ];
+ propagatedBuildInputs =
+ [ paramiko scp tenacity textfsm ntc-templates pyserial ];
+
+ # tests require closed-source pyats and genie packages
+ doCheck = false;
+
+ meta = with lib; {
+ description =
+ "Multi-vendor library to simplify Paramiko SSH connections to network devices";
+ homepage = "https://github.com/ktbyers/netmiko/";
+ license = licenses.mit;
+ maintainers = [ maintainers.astro ];
+ };
+}
diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix
index caf8eaa51d8b..a881292ada2d 100644
--- a/pkgs/development/python-modules/protego/default.nix
+++ b/pkgs/development/python-modules/protego/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "Protego";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-G5lgVhekLOB7BJ4LnW3D7l77mSTyb9EV6q+8j5o3Rw4=";
+ sha256 = "sha256-32ZtQwTat3Ti3J/rIIuxrI1x6lzuwS9MmeujD71kL/I=";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix
new file mode 100644
index 000000000000..101f41c5ca01
--- /dev/null
+++ b/pkgs/development/python-modules/pyeapi/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, netaddr, pytestCheckHook, coverage
+, mock }:
+
+buildPythonPackage rec {
+ pname = "pyeapi";
+ version = "0.8.4";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "arista-eosplus";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b";
+ };
+
+ propagatedBuildInputs = [ netaddr ];
+
+ checkInputs = [ coverage mock ];
+ checkPhase = ''
+ make unittest
+ '';
+
+ meta = with lib; {
+ description = "Client for Arista eAPI";
+ homepage = "https://github.com/arista-eosplus/pyeapi";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.astro ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index 49dc1589ad76..5254a6cbab25 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "python-socks";
- version = "2.0.2";
+ version = "2.0.3";
format = "setuptools";
disabled = pythonOlder "3.6.1";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "romis2012";
repo = pname;
rev = "v${version}";
- sha256 = "1ixhi23x28bg45146p23z26y38rlz445xr0inwgx7avh0rs7vwfx";
+ sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 196d3641eeb4..7b94067aeee9 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "slack-sdk";
- version = "3.15.0";
+ version = "3.15.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
- sha256 = "sha256-ndJdf8BGYfJsLVWqp00YD4vndS3n24UBm06ibcVRMpY=";
+ sha256 = "sha256-N8JvNK1ddlCabzCmEv9TItqXDT7A4Dt8dhMLBICWXHA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix
index 673e2682660b..c2c223586616 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "symengine";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "symengine";
repo = "symengine.py";
rev = "v${version}";
- sha256 = "0yyi3w03fk19i32jmns1baq3rpmf7xfykzkivc7dmnxmjmxvq2gr";
+ sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg=";
};
postConfigure = ''
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 54ede5fc3451..ec56d582e603 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
- version = "4.4.3";
+ version = "4.7.1";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-td+mBf/JhTw5vvlupyllpZ2e4So7y1kEC1OdR4LUv/k=";
+ sha256 = "sha256-cHMsBkP5R7rxRZgzzKaHJrFq36xC9PBuzTzc1kHKc4U=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix
index 0e837b8fd614..41eb9567150c 100644
--- a/pkgs/development/tools/misc/nimlsp/default.nix
+++ b/pkgs/development/tools/misc/nimlsp/default.nix
@@ -2,17 +2,17 @@
nimPackages.buildNimPackage rec {
pname = "nimlsp";
- version = "0.3.2";
+ version = "0.4.0";
nimBinOnly = true;
src = fetchFromGitHub {
owner = "PMunch";
repo = "nimlsp";
rev = "v${version}";
- sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq";
+ sha256 = "sha256-eih8JmofLFXkidanRocjtA6wv84HkA1bi0M4dxkiDr4=";
};
- buildInputs = with nimPackages; [ astpatternmatching jsonschema ];
+ buildInputs = with nimPackages; [ jsonschema ];
nimFlags = [
"--threads:on"
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 2ce704a00b67..d049d9946363 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wabt";
- version = "1.0.26";
+ version = "1.0.27";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
- sha256 = "sha256-xX654awHD7tHRhM6VYmbgsX3/XQDLmAUJ1EpBIQMc3M=";
+ sha256 = "sha256-13et9+yoxoITOO9EEyLMNhG4VCj0jd+JhOlw0DxvwOg=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index aadc0f58dfa7..483523e1807b 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.20.1";
+ version = "4.20.2";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
- sha256 = "sha256-3UOKcm8RzCa7eSUJsUKBJkKTNi4B3GMY+EOOEk4t2So=";
+ sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE=";
};
vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE=";
diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix
index 6477e3fb37d5..aa76cc17b402 100644
--- a/pkgs/games/alephone/default.nix
+++ b/pkgs/games/alephone/default.nix
@@ -91,10 +91,10 @@ in self // {
makeWrapper ${alephone}/bin/alephone $out/bin/$pname \
--add-flags $out/data/$pname
'';
-
+ } // extraArgs // {
meta = alephone.meta // {
license = lib.licenses.free;
hydraPlatforms = [ ];
} // meta;
- } // extraArgs);
+ });
}
diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix
index f6002469a096..463915314adc 100644
--- a/pkgs/games/alephone/infinity/default.nix
+++ b/pkgs/games/alephone/infinity/default.nix
@@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon-infinity";
desktopName = "Marathon-Infinity";
- version = "20210408";
+ version = "20220115";
icon = alephone.icons + "/marathon-infinity.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
- sha256 = "sha256-j9iwSrI7cjqnuRQX+qn8sWXQ6E+DQ19l7OzAL9KHcJU=";
+ sha256 = "sha256-00Wp+y+b82uZZ8fNeU3N5UAKlk0Sd1SfAEGL6RpyVf8=";
};
meta = {
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 4c03435b87e3..1e7fa059d7e2 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "headscale";
- version = "0.12.4";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "sha256-BSKJkNKQP7xDNN10c/lvv83ivAGXhPg1k3A8F58kp/0=";
+ sha256 = "sha256-nVGhLL7HN9m5zIZOFVOMYZXxUUx3WkLpeH/59kXoTHo=";
};
- vendorSha256 = "sha256-hqiG1m/rMGcCmtNagGZ4y34eu1MyVwqkul70aYiTZsk=";
+ vendorSha256 = "sha256-v76UWaF6kdmuvABg6sDMmDpJ4HWvgliyEWAbAebK3wM=";
ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index fefd8a72570d..799b812047dc 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
- version = "0.20.576";
+ version = "0.20.596";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "UCYGxeA3ptSNDZ3vONxlr5SKhdvPxLIeslP23ULHy7M=";
+ sha256 = "wIJSqsIb3/SOicjLgnv0Lt3Wv1qKPHslRcDlZCvckUs=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index 09d6d0cc105a..a173c594c6b0 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv
+{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, fetchpatch, bundlerEnv
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
# Allow building a fork or custom version of Mastodon:
@@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
# Putting the callPackage up in the arguments list also does not work.
src = if srcOverride != null then srcOverride else callPackage ./source.nix {};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2022-0432.patch";
+ url = "https://github.com/mastodon/mastodon/commit/4d6d4b43c6186a13e67b92eaf70fe1b70ea24a09.patch";
+ sha256 = "sha256-C18X2ErBqP/dIEt8NrA7hdiqxUg5977clouuu7Lv4/E=";
+ })
+ ];
+
mastodon-gems = bundlerEnv {
name = "${pname}-gems-${version}";
inherit version;
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index bb00d37fc2ab..4576febce910 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
- version = "5.3.0";
+ version = "5.3.1";
src = fetchFromGitHub {
owner = "2ndQuadrant";
repo = "repmgr";
rev = "v${version}";
- sha256 = "sha256-hDBdtp6wPjvtc0MO8aG0Tdx5JiQJf8KS0f778R5xCZc=";
+ sha256 = "sha256-fHoXbFOF3xj/eNHgQIghF15vbDObnuwl2DAH+zRVGZQ=";
};
nativeBuildInputs = [ flex ];
diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix
index b39d7a00cedc..3da93fb28d04 100644
--- a/pkgs/servers/web-apps/shiori/default.nix
+++ b/pkgs/servers/web-apps/shiori/default.nix
@@ -2,9 +2,9 @@
buildGoModule rec {
pname = "shiori";
- version = "1.5.0";
+ version = "1.5.1";
- vendorSha256 = "1ik5faysc880kz7nymvbmjj006l1fsqfy76036szwzg314v78643";
+ vendorSha256 = "sha256-6XF4wBwoRnINAskhGHTw4eAJ9zAaoZcEYo9/xZk4ems=";
doCheck = false;
@@ -12,7 +12,7 @@ buildGoModule rec {
owner = "go-shiori";
repo = pname;
rev = "v${version}";
- sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq";
+ sha256 = "sha256-ulq2Uy0NFzGTIHqbA/LiUaXzlYYPbswDm9uiLYzxx+k=";
};
meta = with lib; {
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index e0ab463b4180..622521781c1b 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -186,6 +186,7 @@ let
nativeBuildInputs = [
cmake
+ gettext
];
buildInputs = [
@@ -200,8 +201,14 @@ let
"-DMAC_CODESIGN_ID=OFF"
];
+ # The optional string is kind of an inelegant way to get fish to cross compile.
+ # Fish needs coreutils as a runtime dependency, and it gets put into
+ # CMAKE_PREFIX_PATH, which cmake uses to look up build time programs, so it
+ # was clobbering the PATH. It probably needs to be fixed at a lower level.
preConfigure = ''
patchShebangs ./build_tools/git_version_gen.sh
+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ export CMAKE_PREFIX_PATH=
'';
# Required binaries during execution
diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix
index 6c4785c81c59..e42e2e06de66 100644
--- a/pkgs/tools/admin/ssmsh/default.nix
+++ b/pkgs/tools/admin/ssmsh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssmsh";
- version = "1.4.5";
+ version = "1.4.7";
src = fetchFromGitHub {
owner = "bwhaley";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-WZ2glv/f4LwTK/G8QdaVRIAHvgGLPLPL8xjAg/kUokQ=";
+ sha256 = "sha256-juyTCtcuFIlKyLxDrK5tRRzCMwoSXG4EUA32E/Z4y5c=";
};
- vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ=";
+ vendorSha256 = "sha256-dqUMwnHRsR8n4bHEKoePyuqr8sE4NWPpuYo5SwOw0Rw=";
doCheck = true;
diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix
index 92e31c2f57be..aebcc608c76d 100644
--- a/pkgs/tools/backup/autorestic/default.nix
+++ b/pkgs/tools/backup/autorestic/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "autorestic";
- version = "1.5.2";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "cupcakearmy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9nYLjnJZlwmDkamip1BVF/2NeFmGP+Oot3vRfl2Pcy0=";
+ sha256 = "sha256-JOiFsH9r92Gac7DH7h/4Q6hwXBtqLwHNQpW3gKBybHo=";
};
- vendorSha256 = "sha256-eKsPdmPJXiCwvb2A28tNxF4xStry3iA6aLb+XYFJYSg=";
+ vendorSha256 = "sha256-WzmgV0wUsGfMVeho6M8wXJKD9adaAKRYmaJYaAcXwFc=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/tools/networking/tuntox/default.nix
new file mode 100644
index 000000000000..8870f0e32ce7
--- /dev/null
+++ b/pkgs/tools/networking/tuntox/default.nix
@@ -0,0 +1,80 @@
+{ lib
+, stdenv
+, cscope
+, fetchFromGitHub
+, fetchpatch
+, git
+, libevent
+, libopus
+, libsodium
+, libtoxcore
+, libvpx
+, pkg-config
+, python3
+, python3Packages
+}:
+
+stdenv.mkDerivation rec {
+ pname = "tuntox";
+ version = "0.0.10";
+
+ src = fetchFromGitHub {
+ owner = "gjedeer";
+ repo = pname;
+ rev = "${version}";
+ sha256 = "sha256-c/0OxUH8iw8nRuVg4Fszf6Z/JiEV+m0B2ofzy81uFu8=";
+ };
+
+ nativeBuildInputs = [ cscope git pkg-config ];
+
+ buildInputs = [ libopus libtoxcore libsodium libevent libvpx python3 ];
+
+ pythonBuildInputs = with python3Packages; [
+ jinja2
+ requests
+ ];
+
+ patches = [
+ # https://github.com/gjedeer/tuntox/pull/67
+ (fetchpatch {
+ url = "https://github.com/gjedeer/tuntox/compare/a646402f42e120c7148d4de29dbdf5b09027a80a..365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4.patch";
+ sha256 = "sha256-P3uIRnV+pBi3s3agGYUMt2PZU4CRxx/DUR8QPVQ+UN8=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace gitversion.h --replace '7d45afdf7d00a95a8c3687175e2b1669fa1f7745' '365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4'
+ '' + lib.optionalString stdenv.isLinux ''
+ substituteInPlace Makefile --replace ' -static ' ' '
+ substituteInPlace Makefile --replace 'CC=gcc' ' '
+ '' + lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Makefile.mac --replace '.git/HEAD .git/index' ' '
+ substituteInPlace Makefile.mac --replace '/usr/local/lib/libtoxcore.a' '${libtoxcore}/lib/libtoxcore.a'
+ substituteInPlace Makefile.mac --replace '/usr/local/lib/libsodium.a' '${libsodium}/lib/libsodium.dylib'
+ substituteInPlace Makefile.mac --replace 'CC=gcc' ' '
+ '';
+
+ buildPhase = ''
+ '' + lib.optionalString stdenv.isLinux ''
+ make
+ '' + lib.optionalString stdenv.isDarwin ''
+ make -f Makefile.mac tuntox
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv tuntox $out/bin/
+ '';
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Tunnel TCP connections over the Tox protocol";
+ homepage = "https://github.com/gjedeer/tuntox";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [
+ willcohen
+ ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 1d3f6b3b9f61..416d8863cb4a 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
description = "Validating, recursive, and caching DNS resolver";
license = licenses.bsd3;
homepage = "https://www.unbound.net";
- maintainers = with maintainers; [ ehmry fpletz globin ];
+ maintainers = with maintainers; [ fpletz globin ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index cf8ecf180b3a..d5fe8c4faa44 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "pcsc-tools";
- version = "1.5.8";
+ version = "1.6.0";
src = fetchurl {
url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2";
- sha256 = "sha256-h8HtvbjJc1Bj9oiqPgXjiTqI54syLcaa+AdX7ZAoIhI=";
+ sha256 = "sha256-ZRyN10vLM9tMFpNc5dgN0apusgup1cS5YxoJgybvi58=";
};
postPatch = ''
diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix
index f05658f8a98e..648165d8262e 100644
--- a/pkgs/tools/security/swtpm/default.nix
+++ b/pkgs/tools/security/swtpm/default.nix
@@ -11,17 +11,18 @@
# Tests
, python3, which
+, nixosTests
}:
stdenv.mkDerivation rec {
pname = "swtpm";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "swtpm";
rev = "v${version}";
- sha256 = "sha256-5MKQmZxTW8WofmTkV9kGeGN5RxsgVVMFZEF3rPDUO6Q=";
+ sha256 = "sha256-LJQF8PlRkhCJ8rjZzDetg1BFuTb7GBJ8lW6u5hO134k=";
};
nativeBuildInputs = [
@@ -65,6 +66,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
+ passthru.tests = { inherit (nixosTests) systemd-cryptenroll; };
+
meta = with lib; {
description = "Libtpms-based TPM emulator";
homepage = "https://github.com/stefanberger/swtpm";
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index d27985edbc4d..f11a05fdbd64 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rsyslog";
- version = "8.2112.0";
+ version = "8.2202.0";
src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
- sha256 = "sha256-aiqXOGHpJm2ze9K3ufZytrlwv810Ojl7ju5rDcSFLEE=";
+ sha256 = "sha256-5BMIpaFxk5s8vCRunUvTC+ROgBUh4EzZXQUfo4Z9Zzg=";
};
#patches = [ ./fix-gnutls-detection.patch ];
diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix
new file mode 100644
index 000000000000..0b6bf003e5b0
--- /dev/null
+++ b/pkgs/tools/system/skeema/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "skeema";
+ version = "1.7.0";
+
+ src = fetchFromGitHub {
+ owner = "skeema";
+ repo = "skeema";
+ rev = "v${version}";
+ sha256 = "1a75vixrpidim641809nj931r73zvbj2rsls7d80z7w87maav51m";
+ };
+
+ vendorSha256 = null;
+
+ CGO_ENABLED = 0;
+
+ ldflags = [ "-s" "-w" ];
+
+ checkFlags = [ "-short" ];
+
+ meta = with lib; {
+ description = "Declarative pure-SQL schema management for MySQL and MariaDB";
+ homepage = "https://skeema.io/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ aaronjheng ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fce0036a444..04d83ecb78c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3769,6 +3769,8 @@ with pkgs;
syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
+ skeema = callPackage ../tools/system/skeema {};
+
syslogng = callPackage ../tools/system/syslog-ng { };
syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
@@ -10541,6 +10543,8 @@ with pkgs;
trytond = with python3Packages; toPythonApplication trytond;
+ tuntox = callPackage ../tools/networking/tuntox { };
+
omapd = callPackage ../tools/security/omapd { };
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
@@ -21359,6 +21363,15 @@ with pkgs;
myserver = callPackage ../servers/http/myserver { };
+ napalm = with python3Packages; toPythonApplication (
+ napalm.overridePythonAttrs (attrs: {
+ # add community frontends that depend on the napalm python package
+ propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+ napalm-hp-procurve
+ ];
+ })
+ );
+
nas = callPackage ../servers/nas { };
nats-streaming-server = callPackage ../servers/nats-streaming-server { };
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index c1a29b60306f..b5b7158de647 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -58,6 +58,7 @@ let
iris = callPackage ../development/coq-modules/iris {};
itauto = callPackage ../development/coq-modules/itauto { };
ITree = callPackage ../development/coq-modules/ITree { };
+ LibHyps = callPackage ../development/coq-modules/LibHyps {};
ltac2 = callPackage ../development/coq-modules/ltac2 {};
math-classes = callPackage ../development/coq-modules/math-classes { };
mathcomp = callPackage ../development/coq-modules/mathcomp {};
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index cea65edb41fc..3a9bd1f1fede 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -545,11 +545,6 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "sockets";
doCheck = false;
- patches = lib.optional (php.version == "8.1.2")
- (fetchpatch {
- url = "https://github.com/php/php-src/commit/07aaa34cd418c44f7bc653fafbf49f07fc71b2bf.patch";
- sha256 = "sha256-EwVb09/zV2vJ8PuyLpKFCovxe6yKct0UBvishZaordM=";
- });
}
{ name = "sodium"; buildInputs = [ libsodium ]; }
{ name = "sqlite3"; buildInputs = [ sqlite ]; }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2175c2d96ab5..8711d886504e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1613,6 +1613,8 @@ in {
cirq-web = callPackage ../development/python-modules/cirq-web { };
+ ciscoconfparse = callPackage ../development/python-modules/ciscoconfparse { };
+
ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
@@ -4048,6 +4050,8 @@ in {
iowait = callPackage ../development/python-modules/iowait { };
+ ipaddr = callPackage ../development/python-modules/ipaddr { };
+
ipaddress = callPackage ../development/python-modules/ipaddress { };
ipdb = callPackage ../development/python-modules/ipdb { };
@@ -5328,6 +5332,10 @@ in {
nanotime = callPackage ../development/python-modules/nanotime { };
+ napalm = callPackage ../development/python-modules/napalm { };
+
+ napalm-hp-procurve = callPackage ../development/python-modules/napalm/hp-procurve.nix { };
+
napari = callPackage ../development/python-modules/napari {
inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook;
};
@@ -5408,6 +5416,8 @@ in {
netifaces = callPackage ../development/python-modules/netifaces { };
+ netmiko = callPackage ../development/python-modules/netmiko { };
+
netio = callPackage ../development/python-modules/netio { };
nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { };
@@ -8195,6 +8205,8 @@ in {
inherit (pkgs.llvmPackages) openmp;
};
+ pyeapi = callPackage ../development/python-modules/pyeapi { };
+
pyeverlights = callPackage ../development/python-modules/pyeverlights { };
pytibber = callPackage ../development/python-modules/pytibber { };