···137 wantedBy = [ "multi-user.target" ];
138 wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
139 after = [ "network-online.target" ] ++ cfg.serviceDependencies;
140- path = [ pkgs.lottieconverter pkgs.ffmpeg-full ];
141142 # mautrix-telegram tries to generate a dotfile in the home directory of
143 # the running user if using a postgresql database:
···137 wantedBy = [ "multi-user.target" ];
138 wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
139 after = [ "network-online.target" ] ++ cfg.serviceDependencies;
140+ path = [ pkgs.lottieconverter pkgs.ffmpeg-headless ];
141142 # mautrix-telegram tries to generate a dotfile in the home directory of
143 # the running user if using a postgresql database:
···2122stdenv.mkDerivation rec {
23 pname = "singular";
24- version = "4.3.2p16";
2526 # since the tarball does not contain tests, we fetch from GitHub.
27 src = fetchFromGitHub {
···31 # if a release is tagged (which sometimes does not happen), it will
32 # be in the format below.
33 rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
34- hash = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk=";
3536 # the repository's .gitattributes file contains the lines "/Tst/
37 # export-ignore" and "/doc/ export-ignore" so some directories are
···2122stdenv.mkDerivation rec {
23 pname = "singular";
24+ version = "4.4.0p6";
2526 # since the tarball does not contain tests, we fetch from GitHub.
27 src = fetchFromGitHub {
···31 # if a release is tagged (which sometimes does not happen), it will
32 # be in the format below.
33 rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
34+ hash = "sha256-QxMMMnXaWe+0ogA6+3eOtdROb0RolSveya6DIx97/YY=";
3536 # the repository's .gitattributes file contains the lines "/Tst/
37 # export-ignore" and "/doc/ export-ignore" so some directories are
···6263 ### _ ###
64 _1password = lib.warn "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
06566 ### A ###
67
···6263 ### _ ###
64 _1password = lib.warn "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
65+ "7z2hashcat" = throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
6667 ### A ###
68
+1-5
pkgs/top-level/all-packages.nix
···1606 android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });
16071608 angie = callPackage ../servers/http/angie {
1609- zlib = zlib-ng.override { withZlibCompat = true; };
1610 withPerl = false;
1611 # We don't use `with` statement here on purpose!
1612 # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
···1614 };
16151616 angieQuic = callPackage ../servers/http/angie {
1617- zlib = zlib-ng.override { withZlibCompat = true; };
1618 withPerl = false;
1619 withQuic = true;
1620 # We don't use `with` statement here on purpose!
···11771 nginx = nginxStable;
1177211773 nginxQuic = callPackage ../servers/http/nginx/quic.nix {
11774- zlib = zlib-ng.override { withZlibCompat = true; };
11775 withPerl = false;
11776 # We don't use `with` statement here on purpose!
11777 # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
···11781 };
1178211783 nginxStable = callPackage ../servers/http/nginx/stable.nix {
11784- zlib = zlib-ng.override { withZlibCompat = true; };
11785 withPerl = false;
11786 # We don't use `with` statement here on purpose!
11787 # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
···11789 };
1179011791 nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
11792- zlib = zlib-ng.override { withZlibCompat = true; };
11793 withKTLS = true;
11794 withPerl = false;
11795 # We don't use `with` statement here on purpose!
···11818 openafs = callPackage ../servers/openafs/1.8 { };
1181911820 openresty = callPackage ../servers/http/openresty {
011821 withPerl = false;
11822 modules = [];
11823 };
···1606 android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });
16071608 angie = callPackage ../servers/http/angie {
01609 withPerl = false;
1610 # We don't use `with` statement here on purpose!
1611 # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
···1613 };
16141615 angieQuic = callPackage ../servers/http/angie {
01616 withPerl = false;
1617 withQuic = true;
1618 # We don't use `with` statement here on purpose!
···11769 nginx = nginxStable;
1177011771 nginxQuic = callPackage ../servers/http/nginx/quic.nix {
011772 withPerl = false;
11773 # We don't use `with` statement here on purpose!
11774 # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
···11778 };
1177911780 nginxStable = callPackage ../servers/http/nginx/stable.nix {
011781 withPerl = false;
11782 # We don't use `with` statement here on purpose!
11783 # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
···11785 };
1178611787 nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
011788 withKTLS = true;
11789 withPerl = false;
11790 # We don't use `with` statement here on purpose!
···11813 openafs = callPackage ../servers/openafs/1.8 { };
1181411815 openresty = callPackage ../servers/http/openresty {
11816+ zlib-ng = zlib;
11817 withPerl = false;
11818 modules = [];
11819 };