diff options
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/hqplayerd/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/hylafaxplus/libtiff-4.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/plex/raw.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/plausible/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch | 26 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 2 |
7 files changed, 50 insertions, 18 deletions
diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index ea6cd9ae04c..594085d422e 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -4,6 +4,7 @@ , cairo , fetchurl , flac +, gcc11 , gnome , gssdp , gupnp @@ -16,13 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.24.1-62"; + version = "4.24.2-63"; src = fetchurl { - # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs - # c.f. https://github.com/NixOS/nixpkgs/pull/111616 - url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs="; + url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; + sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg="; }; unpackPhase = '' @@ -35,6 +34,7 @@ stdenv.mkDerivation rec { alsa-lib cairo flac + gcc11.cc.lib gnome.rygel gssdp gupnp @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { # misc service support files mkdir -p $out/var/lib/hqplayerd - cp -r ./var/hqplayer/web $out/var/lib/hqplayerd + cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer runHook postInstall ''; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 4ce0d63f6be..04be8c63599 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -2,7 +2,6 @@ , lib , fakeroot , fetchurl -, fetchpatch , libfaketime , substituteAll ## runtime dependencies @@ -70,11 +69,7 @@ stdenv.mkDerivation { }; patches = [ # 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"; - }) + ./libtiff-4.patch ]; # 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.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch new file mode 100644 index 00000000000..daf7b4f7d05 --- /dev/null +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/706154 +--- 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.[0-9]) tiff_runlen_t="uint32" + tiff_offset_t="uint64" + echo '#define TIFFSTRIPBYTECOUNTS uint64' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 3b67c64ffb7..feab959a2df 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; - unpackPhase = '' dpkg-deb -R $src . ''; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index bf408551a44..2cdd33a245e 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -26,12 +26,15 @@ let mixFodDeps = beamPackages.fetchMixDeps { pname = "${pname}-deps"; inherit src version; - sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6"; + sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi"; # We need ecto 3.6 as this version checks whether the database exists before # trying to create it. The creation attempt would always require super-user privileges # and since 3.6 this isn't the case anymore. - patches = [ ./ecto_sql-fix.patch ]; + patches = [ + ./ecto_sql-fix.patch + ./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch + ]; }; yarnDeps = mkYarnModules { diff --git a/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch b/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch new file mode 100644 index 00000000000..b8aa7319a21 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch @@ -0,0 +1,26 @@ +From 127a77882879e5cdf32d908ee3b1b6cbdc9e482e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> +Date: Wed, 14 Jul 2021 01:20:29 +0200 +Subject: [PATCH] Bump `clickhouse_ecto` dependency to be compatible with ecto + 3.6 + +--- + mix.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mix.lock b/mix.lock +index ecae8ac..d42af1e 100644 +--- a/mix.lock ++++ b/mix.lock +@@ -12,7 +12,7 @@ + "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"}, + "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"}, + "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"}, +- "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "b30ccc93a4101a25ff0bba92113e18d8a9a8b28e", []}, ++ "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "1969f14ecef7c357b2bd8bdc3e566234269de58c", []}, + "clickhousex": {:git, "https://github.com/plausible/clickhousex", "0832dd4b1af1f0eba1d1018c231bf0d8d281f031", []}, + "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"}, + "comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"}, +-- +2.31.1 + diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index bf0b7472c57..bec59404103 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -52,8 +52,6 @@ in stdenv.mkDerivation rec { makeFlags = [ "deps" ]; - phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ]; - installPhase = '' for i in deps/*; do ( cd $i |