diff options
author | obadz <obadz-git@obadz.com> | 2016-09-07 02:27:39 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-09-07 02:30:03 +0100 |
commit | 39e197ab1ccad9f1b57c10afe4cfe592a9e40270 (patch) | |
tree | ed2e7a4deceff926009ff2f7a50dbffba8a0e6cf /pkgs/servers/uhub/default.nix | |
parent | 1c7270f001d2f701cdbde0bbdfaaf779a3acdf6b (diff) | |
download | nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.gz nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.bz2 nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.lz nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.xz nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.zst nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.zip |
uhub: 0.4.1 -> 0.5.0 (fixes build)
@ehmry: please have a look so that we can cherry-pick in release-16.09 and move forward on #18209
Diffstat (limited to 'pkgs/servers/uhub/default.nix')
-rw-r--r-- | pkgs/servers/uhub/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 0d276c18f2d7..8871c01e1a16 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -3,13 +3,13 @@ assert tlsSupport -> openssl != null; -let version = "0.4.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "uhub-${version}"; + version = "0.5.0"; src = fetchurl { url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; - sha256 = "1q0n74fb0h5w0k9fhfkznxb4r46qyfb8g2ss3wflivx4l0m1f9x2"; + sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl; @@ -19,14 +19,21 @@ stdenv.mkDerivation { "mod_welcome" "mod_logging" "mod_auth_simple" - "mod_auth_sqlite" "mod_chat_history" "mod_chat_only" "mod_topic" "mod_no_guest_downloads" ]; - patches = [ ./plugin-dir.patch ./systemd.patch ]; + patches = [ + ./plugin-dir.patch + + # Fixed compilation on systemd > 210 + (fetchurl { + url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff"; + sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp"; + }) + ]; cmakeFlags = '' -DSYSTEMD_SUPPORT=ON @@ -40,4 +47,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; -} \ No newline at end of file +} |