cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-02-20 18:01:37 +00:00 committed by GitHub
commit 3a2427bf02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 531 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/doc/manual/development/running-nixos-tests.section.md
View file

@ -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 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 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, 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 ```ShellSession
$ firefox result/log.html $ nix-store --read-log result
``` ```

4
nixos/doc/manual/from_md/development/running-nixos-tests.section.xml
View file

@ -26,9 +26,9 @@ machine: QEMU running (pid 8841)
perform a build that starts a QEMU/KVM virtual machine containing a perform a build that starts a QEMU/KVM virtual machine containing a
NixOS system. The virtual machine mounts the Nix store of the host; 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 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:
</para> </para>
<programlisting> <programlisting>
$ firefox result/log.html $ nix-store --read-log result
</programlisting> </programlisting>
</section> </section>

2
nixos/modules/services/mail/postfixadmin.nix
View file

@ -114,7 +114,7 @@ in
location ~* \.php$ { location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${fpm.socket}; 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; include ${pkgs.nginx}/conf/fastcgi.conf;
} }
''; '';

2
nixos/modules/services/mail/roundcube.nix
View file

@ -153,7 +153,7 @@ in
location ~* \.php$ { location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${fpm.socket}; 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; include ${pkgs.nginx}/conf/fastcgi.conf;
} }
''; '';

2
nixos/modules/services/misc/sourcehut/git.nix
View file

@ -207,7 +207,7 @@ in
fastcgi_param PATH_INFO $uri; fastcgi_param PATH_INFO $uri;
fastcgi_param GIT_PROJECT_ROOT $document_root; fastcgi_param GIT_PROJECT_ROOT $document_root;
fastcgi_read_timeout 500s; fastcgi_read_timeout 500s;
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
gzip off; gzip off;
} }
''; '';

4
nixos/modules/services/misc/zoneminder.nix
View file

@ -254,7 +254,7 @@ in {
location /cgi-bin { location /cgi-bin {
gzip off; 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 SCRIPT_FILENAME ${pkg}/libexec/zoneminder/${zms};
fastcgi_param HTTP_PROXY ""; fastcgi_param HTTP_PROXY "";
fastcgi_intercept_errors on; fastcgi_intercept_errors on;
@ -270,7 +270,7 @@ in {
try_files $uri =404; try_files $uri =404;
fastcgi_index index.php; 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 SCRIPT_FILENAME $request_filename;
fastcgi_param HTTP_PROXY ""; fastcgi_param HTTP_PROXY "";

2
nixos/modules/services/web-apps/dokuwiki.nix
View file

@ -376,7 +376,7 @@ in
"~ \\.php$" = { "~ \\.php$" = {
extraConfig = '' extraConfig = ''
try_files $uri $uri/ /doku.php; 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 SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200; fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket};

2
nixos/modules/services/web-apps/jirafeau.nix
View file

@ -136,7 +136,7 @@ in
''; '';
locations = { locations = {
"~ \\.php$".extraConfig = '' "~ \\.php$".extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket}; fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket};

2
nixos/modules/services/web-apps/restya-board.nix
View file

@ -235,7 +235,7 @@ in
locations."~ \\.php$" = { locations."~ \\.php$" = {
tryFiles = "$uri =404"; tryFiles = "$uri =404";
extraConfig = '' extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_pass unix:${fpm.socket}; fastcgi_pass unix:${fpm.socket};
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

2
nixos/modules/services/web-apps/rss-bridge.nix
View file

@ -111,7 +111,7 @@ in
locations."~ ^/index.php(/|$)" = { locations."~ ^/index.php(/|$)" = {
extraConfig = '' extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

2
nixos/modules/services/web-servers/nginx/gitweb.nix
View file

@ -79,7 +79,7 @@ in
}; };
locations."${cfg.location}/" = { locations."${cfg.location}/" = {
extraConfig = '' extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile}; fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile};
fastcgi_pass unix:/run/gitweb/gitweb.sock; fastcgi_pass unix:/run/gitweb/gitweb.sock;
''; '';

2
nixos/tests/gitolite-fcgiwrap.nix
View file

@ -42,7 +42,7 @@ import ./make-test-python.nix (
auth_basic_user_file /etc/gitolite/htpasswd; auth_basic_user_file /etc/gitolite/htpasswd;
# common FastCGI parameters are required # common FastCGI parameters are required
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
# strip the CGI program prefix # strip the CGI program prefix
fastcgi_split_path_info ^(/git)(.*)$; fastcgi_split_path_info ^(/git)(.*)$;

2
nixos/tests/php/fpm.nix
View file

@ -17,7 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: {
locations."~ \\.php$".extraConfig = '' locations."~ \\.php$".extraConfig = ''
fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket}; fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket};
fastcgi_index index.php; fastcgi_index index.php;
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf; include ${pkgs.nginx}/conf/fastcgi.conf;
''; '';
locations."/" = { locations."/" = {

10
pkgs/applications/misc/feedbackd/default.nix
View file

@ -17,6 +17,15 @@
, dbus , dbus
}: }:
let
themes = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = "feedbackd-device-themes";
rev = "v0.0.20210909";
sha256 = "1d041wnq39sa0sl08xya4yp3n7j6aw560i38chl10vgpmwk9mmhr";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "feedbackd"; pname = "feedbackd";
# Not an actual upstream project release, # Not an actual upstream project release,
@ -63,6 +72,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $out/lib/udev/rules.d 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 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; { meta = with lib; {

12
pkgs/applications/misc/yate/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yate"; pname = "yate";
version = "6.1.0-1"; version = "6.4.0-1";
src = fetchurl { src = fetchurl {
url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz"; url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d"; hash = "sha256-jCPca/+/jUeNs6hZZLUBl3HI9sms9SIPNGVRanSKA7A=";
}; };
# TODO zaptel ? postgres ? # TODO zaptel ? postgres ?
@ -14,12 +14,14 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 openssl ]; buildInputs = [ qt4 openssl ];
# /dev/null is used when linking which is a impure path for the wrapper # /dev/null is used when linking which is a impure path for the wrapper
preConfigure = postPatch =
'' ''
sed -i 's@,/dev/null@@' configure
patchShebangs 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? # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
preBuild = preBuild =
'' ''
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://yate.null.ro/"; homepage = "http://yate.null.ro/";
# Yate's license is GPL with an exception for linking with # Yate's license is GPL with an exception for linking with
# OpenH323 and PWlib (licensed under MPL). # OpenH323 and PWlib (licensed under MPL).
license = ["GPL" "MPL"]; license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.marcweber ]; maintainers = [ lib.maintainers.marcweber ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };

4
pkgs/applications/networking/browsers/lagrange/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lagrange"; pname = "lagrange";
version = "1.10.5"; version = "1.10.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "skyjake"; owner = "skyjake";
repo = "lagrange"; repo = "lagrange";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-n6viI9yEqb73691s499vRB48LCOV0LdTbMR81P+Q5pM="; sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/applications/networking/cluster/tilt/default.nix
View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself /* 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 running in development environment and try to serve assets from the
source tree, which is not there once build completes. */ source tree, which is not there once build completes. */
version = "0.25.0"; version = "0.25.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-OWLyjXsV2MX1WfSjRD1/0oAeZxQpeWz5xIyYTLnn+eA="; sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU=";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/applications/networking/cluster/werf/default.nix
View file

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "werf"; pname = "werf";
version = "1.2.67"; version = "1.2.69";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "werf"; owner = "werf";
repo = "werf"; repo = "werf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SCSj+spANhbrdhj204fsvshkDi0fKmt8jbc11UHJARw="; sha256 = "sha256-rmDP8qPOPhUrygt5gAF2MOVNCHqh+1Gc50mnVFXpev4=";
}; };
vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0=";
proxyVendor = true; proxyVendor = true;

16
pkgs/applications/networking/p2p/tribler/default.nix
View file

@ -13,11 +13,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tribler"; pname = "tribler";
version = "7.10.0"; version = "7.11.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
hash = "sha256-CVZOVOWS0fvfg1yDiWFRa4v4Tpzl8RMVBQ6z0Ib4hfQ="; sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
service-identity service-identity
twisted twisted
yappi yappi
pydantic
anyio
]); ]);
installPhase = '' installPhase = ''
@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
cp -prvd ./* $out/ cp -prvd ./* $out/
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ --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 _TRIBLERPATH $out/src \
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
--set NO_AT_BRIDGE 1 \ --set NO_AT_BRIDGE 1 \
@ -78,10 +81,17 @@ stdenv.mkDerivation rec {
--add-flags "-O $out/src/run_tribler.py" --add-flags "-O $out/src/run_tribler.py"
mkdir -p $out/share/applications $out/share/icons 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 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; { meta = with lib; {
description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
homepage = "https://www.tribler.org/"; homepage = "https://www.tribler.org/";

4
pkgs/applications/networking/remote/remmina/default.nix
View file

@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "remmina"; pname = "remmina";
version = "1.4.23"; version = "1.4.24";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "Remmina"; owner = "Remmina";
repo = "Remmina"; repo = "Remmina";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MyemiSAMZEa9Ng6WHEyHgrze8YtIbzMCR8CTb86PDsg="; sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0=";
}; };
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];

21
pkgs/development/coq-modules/LibHyps/default.nix Normal file
View file

@ -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;
};
}

3
pkgs/development/coq-modules/addition-chains/default.nix
View file

@ -8,11 +8,12 @@ mkCoqDerivation {
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
releaseRev = (v: "v${v}"); releaseRev = (v: "v${v}");
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-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"; } { case = range "8.11" "8.12"; out = "0.4"; }
] null; ] null;

2
pkgs/development/coq-modules/gaia-hydras/default.nix
View file

@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec {
repo = "hydra-battles"; repo = "hydra-battles";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
releaseRev = (v: "v${v}"); releaseRev = (v: "v${v}");
inherit version; inherit version;
defaultVersion = with versions; switch [coq.coq-version mathcomp.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"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }
] null; ] null;

14
pkgs/development/coq-modules/hydra-battles/default.nix
View file

@ -1,22 +1,21 @@
{ lib, mkCoqDerivation, coq, equations, version ? null }: { lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }:
with lib; with lib;
mkCoqDerivation { (mkCoqDerivation {
pname = "hydra-battles"; pname = "hydra-battles";
owner = "coq-community"; owner = "coq-community";
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
releaseRev = (v: "v${v}"); releaseRev = (v: "v${v}");
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-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"; } { case = range "8.11" "8.12"; out = "0.4"; }
] null; ] null;
propagatedBuildInputs = [ equations ];
useDune2 = true; useDune2 = true;
meta = { meta = {
@ -32,4 +31,7 @@ mkCoqDerivation {
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }).overrideAttrs(o:
let inherit (o) version; in {
propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version) LibHyps;
})

4
pkgs/development/interpreters/php/7.4.nix
View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "7.4.27"; version = "7.4.28";
sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563"; sha256 = "sha256-IIUIaoY0RLDjlUfeGklp/RxAoMGI61j6spOLZJsMS1g=";
}); });
in in

4
pkgs/development/interpreters/php/8.0.nix
View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "8.0.14"; version = "8.0.16";
sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v"; sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk=";
}); });
in in

4
pkgs/development/interpreters/php/8.1.nix
View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "8.1.2"; version = "8.1.3";
sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci"; sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4=";
}); });
in in

9
pkgs/development/libraries/libliftoff/default.nix
View file

@ -1,17 +1,18 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitLab
, meson, pkg-config, ninja , meson, pkg-config, ninja
, libdrm , libdrm
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libliftoff"; pname = "libliftoff";
version = "0.1.0"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "emersion"; owner = "emersion";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla"; sha256 = "1ysxm7kg1gwrsn29lw8kngvkxp46g4m2pvbwcvscgvr54ikirn4q";
}; };
nativeBuildInputs = [ meson pkg-config ninja ]; nativeBuildInputs = [ meson pkg-config ninja ];

26
pkgs/development/nim-packages/jsonschema/default.nix
View file

@ -1,8 +1,22 @@
{ fetchFromGitHub }: { lib, buildNimPackage, fetchFromGitHub, astpatternmatching }:
fetchFromGitHub { buildNimPackage rec {
owner = "PMunch"; pname = "jsonschema";
repo = "jsonschema"; version = "unstable-2019-09-12";
rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; 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 ];
};
} }

32
pkgs/development/python-modules/ciscoconfparse/default.nix Normal file
View file

@ -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 ];
};
}

25
pkgs/development/python-modules/enlighten/default.nix
View file

@ -5,28 +5,41 @@
, blessed , blessed
, prefixed , prefixed
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "enlighten"; pname = "enlighten";
version = "1.10.2"; version = "1.10.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7a5b83cd0f4d095e59d80c648ebb5f7ffca0cd8bcf7ae6639828ee1ad000632a"; hash = "sha256-eluDzQ9NCV5Z2Axkjrtff/ygzYvPeuZjmCjuGtAAYyo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
blessed blessed
prefixed prefixed
]; ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "enlighten" ]; checkInputs = [
disabledTests = pytestCheckHook
];
pythonImportsCheck = [
"enlighten"
];
disabledTests = [
# AssertionError: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='utf-8'> is not...
"test_init"
] ++ lib.optional stdenv.isDarwin [
# https://github.com/Rockhopper-Technologies/enlighten/issues/44 # https://github.com/Rockhopper-Technologies/enlighten/issues/44
lib.optional stdenv.isDarwin "test_autorefresh" "test_autorefresh"
; ];
meta = with lib; { meta = with lib; {
description = "Enlighten Progress Bar for Python Console Apps"; description = "Enlighten Progress Bar for Python Console Apps";

22
pkgs/development/python-modules/ipaddr/default.nix Normal file
View file

@ -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 ];
};
}

4
pkgs/development/python-modules/jsonrpclib-pelix/default.nix
View file

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jsonrpclib-pelix"; pname = "jsonrpclib-pelix";
version = "0.4.3.1"; version = "0.4.3.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f6f376c72ec1c0dfd69fcc2721d711f6ca1fe22bf71f99e6884c5e43e9b58c95"; sha256 = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw=";
}; };
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.

44
pkgs/development/python-modules/napalm/default.nix Normal file
View file

@ -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 ];
};
}

41
pkgs/development/python-modules/napalm/hp-procurve.nix Normal file
View file

@ -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;
};
}

27
pkgs/development/python-modules/netmiko/default.nix Normal file
View file

@ -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 ];
};
}

4
pkgs/development/python-modules/protego/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Protego"; pname = "Protego";
version = "0.2.0"; version = "0.2.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-G5lgVhekLOB7BJ4LnW3D7l77mSTyb9EV6q+8j5o3Rw4="; sha256 = "sha256-32ZtQwTat3Ti3J/rIIuxrI1x6lzuwS9MmeujD71kL/I=";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

29
pkgs/development/python-modules/pyeapi/default.nix Normal file
View file

@ -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 ];
};
}

4
pkgs/development/python-modules/python-socks/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-socks"; pname = "python-socks";
version = "2.0.2"; version = "2.0.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6.1"; disabled = pythonOlder "3.6.1";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "romis2012"; owner = "romis2012";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ixhi23x28bg45146p23z26y38rlz445xr0inwgx7avh0rs7vwfx"; sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/slack-sdk/default.nix
View file

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "slack-sdk"; pname = "slack-sdk";
version = "3.15.0"; version = "3.15.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "slackapi"; owner = "slackapi";
repo = "python-slack-sdk"; repo = "python-slack-sdk";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ndJdf8BGYfJsLVWqp00YD4vndS3n24UBm06ibcVRMpY="; sha256 = "sha256-N8JvNK1ddlCabzCmEv9TItqXDT7A4Dt8dhMLBICWXHA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/symengine/default.nix
View file

@ -11,13 +11,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "symengine"; pname = "symengine";
version = "0.8.1"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "symengine"; owner = "symengine";
repo = "symengine.py"; repo = "symengine.py";
rev = "v${version}"; rev = "v${version}";
sha256 = "0yyi3w03fk19i32jmns1baq3rpmf7xfykzkivc7dmnxmjmxvq2gr"; sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg=";
}; };
postConfigure = '' postConfigure = ''

4
pkgs/development/tools/database/liquibase/default.nix
View file

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liquibase"; pname = "liquibase";
version = "4.4.3"; version = "4.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; 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 ]; nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/misc/nimlsp/default.nix
View file

@ -2,17 +2,17 @@
nimPackages.buildNimPackage rec { nimPackages.buildNimPackage rec {
pname = "nimlsp"; pname = "nimlsp";
version = "0.3.2"; version = "0.4.0";
nimBinOnly = true; nimBinOnly = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PMunch"; owner = "PMunch";
repo = "nimlsp"; repo = "nimlsp";
rev = "v${version}"; rev = "v${version}";
sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq"; sha256 = "sha256-eih8JmofLFXkidanRocjtA6wv84HkA1bi0M4dxkiDr4=";
}; };
buildInputs = with nimPackages; [ astpatternmatching jsonschema ]; buildInputs = with nimPackages; [ jsonschema ];
nimFlags = [ nimFlags = [
"--threads:on" "--threads:on"

4
pkgs/development/tools/wabt/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wabt"; pname = "wabt";
version = "1.0.26"; version = "1.0.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WebAssembly"; owner = "WebAssembly";
repo = "wabt"; repo = "wabt";
rev = version; rev = version;
sha256 = "sha256-xX654awHD7tHRhM6VYmbgsX3/XQDLmAUJ1EpBIQMc3M="; sha256 = "sha256-13et9+yoxoITOO9EEyLMNhG4VCj0jd+JhOlw0DxvwOg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/development/tools/yq-go/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "yq-go"; pname = "yq-go";
version = "4.20.1"; version = "4.20.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mikefarah"; owner = "mikefarah";
repo = "yq"; repo = "yq";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3UOKcm8RzCa7eSUJsUKBJkKTNi4B3GMY+EOOEk4t2So="; sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE=";
}; };
vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE=";

4
pkgs/games/alephone/default.nix
View file

@ -91,10 +91,10 @@ in self // {
makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ makeWrapper ${alephone}/bin/alephone $out/bin/$pname \
--add-flags $out/data/$pname --add-flags $out/data/$pname
''; '';
} // extraArgs // {
meta = alephone.meta // { meta = alephone.meta // {
license = lib.licenses.free; license = lib.licenses.free;
hydraPlatforms = [ ]; hydraPlatforms = [ ];
} // meta; } // meta;
} // extraArgs); });
} }

4
pkgs/games/alephone/infinity/default.nix
View file

@ -3,13 +3,13 @@
alephone.makeWrapper rec { alephone.makeWrapper rec {
pname = "marathon-infinity"; pname = "marathon-infinity";
desktopName = "Marathon-Infinity"; desktopName = "Marathon-Infinity";
version = "20210408"; version = "20220115";
icon = alephone.icons + "/marathon-infinity.png"; icon = alephone.icons + "/marathon-infinity.png";
zip = fetchurl { zip = fetchurl {
url = url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; "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 = { meta = {

6
pkgs/servers/headscale/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "headscale"; pname = "headscale";
version = "0.12.4"; version = "0.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juanfont"; owner = "juanfont";
repo = "headscale"; repo = "headscale";
rev = "v${version}"; 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}" ]; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];

4
pkgs/servers/jackett/default.nix
View file

@ -9,13 +9,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.20.576"; version = "0.20.596";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "UCYGxeA3ptSNDZ3vONxlr5SKhdvPxLIeslP23ULHy7M="; sha256 = "wIJSqsIb3/SOicjLgnv0Lt3Wv1qKPHslRcDlZCvckUs=";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

10
pkgs/servers/mastodon/default.nix
View file

@ -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 , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
# Allow building a fork or custom version of Mastodon: # 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. # Putting the callPackage up in the arguments list also does not work.
src = if srcOverride != null then srcOverride else callPackage ./source.nix {}; 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 { mastodon-gems = bundlerEnv {
name = "${pname}-gems-${version}"; name = "${pname}-gems-${version}";
inherit version; inherit version;

4
pkgs/servers/sql/postgresql/ext/repmgr.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "repmgr"; pname = "repmgr";
version = "5.3.0"; version = "5.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "2ndQuadrant"; owner = "2ndQuadrant";
repo = "repmgr"; repo = "repmgr";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hDBdtp6wPjvtc0MO8aG0Tdx5JiQJf8KS0f778R5xCZc="; sha256 = "sha256-fHoXbFOF3xj/eNHgQIghF15vbDObnuwl2DAH+zRVGZQ=";
}; };
nativeBuildInputs = [ flex ]; nativeBuildInputs = [ flex ];

6
pkgs/servers/web-apps/shiori/default.nix
View file

@ -2,9 +2,9 @@
buildGoModule rec { buildGoModule rec {
pname = "shiori"; pname = "shiori";
version = "1.5.0"; version = "1.5.1";
vendorSha256 = "1ik5faysc880kz7nymvbmjj006l1fsqfy76036szwzg314v78643"; vendorSha256 = "sha256-6XF4wBwoRnINAskhGHTw4eAJ9zAaoZcEYo9/xZk4ems=";
doCheck = false; doCheck = false;
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "go-shiori"; owner = "go-shiori";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq"; sha256 = "sha256-ulq2Uy0NFzGTIHqbA/LiUaXzlYYPbswDm9uiLYzxx+k=";
}; };
meta = with lib; { meta = with lib; {

7
pkgs/shells/fish/default.nix
View file

@ -186,6 +186,7 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
gettext
]; ];
buildInputs = [ buildInputs = [
@ -200,8 +201,14 @@ let
"-DMAC_CODESIGN_ID=OFF" "-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 = '' preConfigure = ''
patchShebangs ./build_tools/git_version_gen.sh patchShebangs ./build_tools/git_version_gen.sh
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
export CMAKE_PREFIX_PATH=
''; '';
# Required binaries during execution # Required binaries during execution

6
pkgs/tools/admin/ssmsh/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ssmsh"; pname = "ssmsh";
version = "1.4.5"; version = "1.4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bwhaley"; owner = "bwhaley";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WZ2glv/f4LwTK/G8QdaVRIAHvgGLPLPL8xjAg/kUokQ="; sha256 = "sha256-juyTCtcuFIlKyLxDrK5tRRzCMwoSXG4EUA32E/Z4y5c=";
}; };
vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ="; vendorSha256 = "sha256-dqUMwnHRsR8n4bHEKoePyuqr8sE4NWPpuYo5SwOw0Rw=";
doCheck = true; doCheck = true;

6
pkgs/tools/backup/autorestic/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "autorestic"; pname = "autorestic";
version = "1.5.2"; version = "1.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cupcakearmy"; owner = "cupcakearmy";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9nYLjnJZlwmDkamip1BVF/2NeFmGP+Oot3vRfl2Pcy0="; sha256 = "sha256-JOiFsH9r92Gac7DH7h/4Q6hwXBtqLwHNQpW3gKBybHo=";
}; };
vendorSha256 = "sha256-eKsPdmPJXiCwvb2A28tNxF4xStry3iA6aLb+XYFJYSg="; vendorSha256 = "sha256-WzmgV0wUsGfMVeho6M8wXJKD9adaAKRYmaJYaAcXwFc=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

80
pkgs/tools/networking/tuntox/default.nix Normal file
View file

@ -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;
};
}

2
pkgs/tools/networking/unbound/default.nix
View file

@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
description = "Validating, recursive, and caching DNS resolver"; description = "Validating, recursive, and caching DNS resolver";
license = licenses.bsd3; license = licenses.bsd3;
homepage = "https://www.unbound.net"; homepage = "https://www.unbound.net";
maintainers = with maintainers; [ ehmry fpletz globin ]; maintainers = with maintainers; [ fpletz globin ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/tools/security/pcsctools/default.nix
View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pcsc-tools"; pname = "pcsc-tools";
version = "1.5.8"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2"; url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2";
sha256 = "sha256-h8HtvbjJc1Bj9oiqPgXjiTqI54syLcaa+AdX7ZAoIhI="; sha256 = "sha256-ZRyN10vLM9tMFpNc5dgN0apusgup1cS5YxoJgybvi58=";
}; };
postPatch = '' postPatch = ''

7
pkgs/tools/security/swtpm/default.nix
View file

@ -11,17 +11,18 @@
# Tests # Tests
, python3, which , python3, which
, nixosTests
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swtpm"; pname = "swtpm";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stefanberger"; owner = "stefanberger";
repo = "swtpm"; repo = "swtpm";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5MKQmZxTW8WofmTkV9kGeGN5RxsgVVMFZEF3rPDUO6Q="; sha256 = "sha256-LJQF8PlRkhCJ8rjZzDetg1BFuTb7GBJ8lW6u5hO134k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -65,6 +66,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
passthru.tests = { inherit (nixosTests) systemd-cryptenroll; };
meta = with lib; { meta = with lib; {
description = "Libtpms-based TPM emulator"; description = "Libtpms-based TPM emulator";
homepage = "https://github.com/stefanberger/swtpm"; homepage = "https://github.com/stefanberger/swtpm";

4
pkgs/tools/system/rsyslog/default.nix
View file

@ -14,11 +14,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rsyslog"; pname = "rsyslog";
version = "8.2112.0"; version = "8.2202.0";
src = fetchurl { src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
sha256 = "sha256-aiqXOGHpJm2ze9K3ufZytrlwv810Ojl7ju5rDcSFLEE="; sha256 = "sha256-5BMIpaFxk5s8vCRunUvTC+ROgBUh4EzZXQUfo4Z9Zzg=";
}; };
#patches = [ ./fix-gnutls-detection.patch ]; #patches = [ ./fix-gnutls-detection.patch ];

28
pkgs/tools/system/skeema/default.nix Normal file
View file

@ -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 ];
};
}

13
pkgs/top-level/all-packages.nix
View file

@ -3769,6 +3769,8 @@ with pkgs;
syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
skeema = callPackage ../tools/system/skeema {};
syslogng = callPackage ../tools/system/syslog-ng { }; syslogng = callPackage ../tools/system/syslog-ng { };
syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
@ -10541,6 +10543,8 @@ with pkgs;
trytond = with python3Packages; toPythonApplication trytond; trytond = with python3Packages; toPythonApplication trytond;
tuntox = callPackage ../tools/networking/tuntox { };
omapd = callPackage ../tools/security/omapd { }; omapd = callPackage ../tools/security/omapd { };
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
@ -21359,6 +21363,15 @@ with pkgs;
myserver = callPackage ../servers/http/myserver { }; 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 { }; nas = callPackage ../servers/nas { };
nats-streaming-server = callPackage ../servers/nats-streaming-server { }; nats-streaming-server = callPackage ../servers/nats-streaming-server { };

1
pkgs/top-level/coq-packages.nix
View file

@ -58,6 +58,7 @@ let
iris = callPackage ../development/coq-modules/iris {}; iris = callPackage ../development/coq-modules/iris {};
itauto = callPackage ../development/coq-modules/itauto { }; itauto = callPackage ../development/coq-modules/itauto { };
ITree = callPackage ../development/coq-modules/ITree { }; ITree = callPackage ../development/coq-modules/ITree { };
LibHyps = callPackage ../development/coq-modules/LibHyps {};
ltac2 = callPackage ../development/coq-modules/ltac2 {}; ltac2 = callPackage ../development/coq-modules/ltac2 {};
math-classes = callPackage ../development/coq-modules/math-classes { }; math-classes = callPackage ../development/coq-modules/math-classes { };
mathcomp = callPackage ../development/coq-modules/mathcomp {}; mathcomp = callPackage ../development/coq-modules/mathcomp {};

5
pkgs/top-level/php-packages.nix
View file

@ -545,11 +545,6 @@ lib.makeScope pkgs.newScope (self: with self; {
{ {
name = "sockets"; name = "sockets";
doCheck = false; 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 = "sodium"; buildInputs = [ libsodium ]; }
{ name = "sqlite3"; buildInputs = [ sqlite ]; } { name = "sqlite3"; buildInputs = [ sqlite ]; }

12
pkgs/top-level/python-packages.nix
View file

@ -1613,6 +1613,8 @@ in {
cirq-web = callPackage ../development/python-modules/cirq-web { }; cirq-web = callPackage ../development/python-modules/cirq-web { };
ciscoconfparse = callPackage ../development/python-modules/ciscoconfparse { };
ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { }; ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { }; ciso8601 = callPackage ../development/python-modules/ciso8601 { };
@ -4048,6 +4050,8 @@ in {
iowait = callPackage ../development/python-modules/iowait { }; iowait = callPackage ../development/python-modules/iowait { };
ipaddr = callPackage ../development/python-modules/ipaddr { };
ipaddress = callPackage ../development/python-modules/ipaddress { }; ipaddress = callPackage ../development/python-modules/ipaddress { };
ipdb = callPackage ../development/python-modules/ipdb { }; ipdb = callPackage ../development/python-modules/ipdb { };
@ -5328,6 +5332,10 @@ in {
nanotime = callPackage ../development/python-modules/nanotime { }; 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 { napari = callPackage ../development/python-modules/napari {
inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook; inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook;
}; };
@ -5408,6 +5416,8 @@ in {
netifaces = callPackage ../development/python-modules/netifaces { }; netifaces = callPackage ../development/python-modules/netifaces { };
netmiko = callPackage ../development/python-modules/netmiko { };
netio = callPackage ../development/python-modules/netio { }; netio = callPackage ../development/python-modules/netio { };
nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { }; nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { };
@ -8195,6 +8205,8 @@ in {
inherit (pkgs.llvmPackages) openmp; inherit (pkgs.llvmPackages) openmp;
}; };
pyeapi = callPackage ../development/python-modules/pyeapi { };
pyeverlights = callPackage ../development/python-modules/pyeverlights { }; pyeverlights = callPackage ../development/python-modules/pyeverlights { };
pytibber = callPackage ../development/python-modules/pytibber { }; pytibber = callPackage ../development/python-modules/pytibber { };