diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-21 12:28:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-21 12:28:43 +0000 |
commit | 929b12e7b5b4f0f081e3ba735d39acb4ea6c858a (patch) | |
tree | 3f7dfe660137f6339c8268698ad96d70e94de93c /pkgs/servers | |
parent | acb7a605e21db44bc6e2fa7b11e1cdfbe082f4c0 (diff) | |
parent | c455f3ccaf7e4881f1435c33fc5583bad9053acb (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 18 | ||||
-rw-r--r-- | pkgs/servers/hylafaxplus/libtiff-4.2.patch | 13 | ||||
-rw-r--r-- | pkgs/servers/hylafaxplus/post-patch.sh | 7 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/web-apps/moodle/default.nix | 4 |
5 files changed, 18 insertions, 32 deletions
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index e8bf832a15cf7..4ce0d63f6bed8 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -2,6 +2,7 @@ , lib , fakeroot , fetchurl +, fetchpatch , libfaketime , substituteAll ## runtime dependencies @@ -29,12 +30,12 @@ let - name = "hylafaxplus-${version}"; + pname = "hylafaxplus"; version = "7.0.3"; sha256 = "139iwcwrn9i5lragxi33ilzah72w59wg4midfjjgx5cly3ah0iy4"; configSite = substituteAll { - name = "hylafaxplus-config.site"; + name = "${pname}-config.site"; src = ./config.site; config_maxgid = lib.optionalString (maxgid!=null) ''CONFIG_MAXGID=${builtins.toString maxgid}''; ghostscript_version = ghostscript.version; @@ -43,7 +44,7 @@ let }; postPatch = substituteAll { - name = "hylafaxplus-post-patch.sh"; + name = "${pname}-post-patch.sh"; src = ./post-patch.sh; inherit configSite; maxuid = lib.optionalString (maxuid!=null) (builtins.toString maxuid); @@ -54,7 +55,7 @@ let }; postInstall = substituteAll { - name = "hylafaxplus-post-install.sh"; + name = "${pname}-post-install.sh"; src = ./post-install.sh; inherit fakeroot libfaketime; }; @@ -62,13 +63,18 @@ let in stdenv.mkDerivation { - inherit name version; + inherit pname version; src = fetchurl { url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; inherit sha256; }; patches = [ - ./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1 + # adjust configure check to work with libtiff > 4.1 + (fetchpatch { + name = "libtiff-4.2.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6"; + sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw"; + }) ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/pkgs/servers/hylafaxplus/libtiff-4.2.patch b/pkgs/servers/hylafaxplus/libtiff-4.2.patch deleted file mode 100644 index 5da106565f06c..0000000000000 --- a/pkgs/servers/hylafaxplus/libtiff-4.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 7456dcb..90f0e8d 100755 ---- a/configure -+++ b/configure -@@ -2583,7 +2583,7 @@ EOF - echo '#define TIFFSTRIPBYTECOUNTS uint32' - echo '#define TIFFVERSION TIFF_VERSION' - echo '#define TIFFHEADER TIFFHeader';; -- 4.[01]) tiff_runlen_t="uint32" -+ 4.[012]) tiff_runlen_t="uint32" - tiff_offset_t="uint64" - echo '#define TIFFSTRIPBYTECOUNTS uint64' - echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/pkgs/servers/hylafaxplus/post-patch.sh index 6ec5937147e20..43ee91d2f62cc 100644 --- a/pkgs/servers/hylafaxplus/post-patch.sh +++ b/pkgs/servers/hylafaxplus/post-patch.sh @@ -1,10 +1,3 @@ -# `configure` (maybe others) set `POSIXLY_CORRECT`, which -# breaks the gcc wrapper script of nixpkgs (maybe others). -# We simply un-export `POSIXLY_CORRECT` after each export so -# its effects don't apply within nixpkgs wrapper scripts. -grep -rlF POSIXLY_CORRECT | xargs \ - sed '/export *POSIXLY_CORRECT/a export -n POSIXLY_CORRECT' -i - # Replace strange default value for the nobody account. if test -n "@maxuid@" then diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index ad1d25a3cec3d..b5438d84ba838 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: +{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline, libkrb5 }: stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "14bh3cqkdd1z16iy0lmv8a3f8gmmink1nzhf5jhkd0n6g7r65p6d"; + sha256 = "1svzln0dc1vidb9qmg4m881pvmqqjq8d43ghb8yjl7shirawqkqx"; }; - buildInputs = [ postgresql openssl zlib readline ]; + buildInputs = [ postgresql openssl zlib readline libkrb5 ]; installPhase = '' install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 4cc51baacea82..bd90e908f1c4e 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.10.2"; + version = "3.11"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-s20GtwqV1BAVr2q+DxG6hqKnDqM0dVm6TbokmPC8Hrs="; + sha256 = "sha256-rZKY26ZPvubSr6nZ+Kguj1uKoEJbF3pEIKjjh6weyYo"; }; phpConfig = writeText "config.php" '' |