From 1ab0cd12423bbfc6c396f29fed7d2101f9fce430 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 21 May 2014 21:45:23 +0200 Subject: [PATCH 1/3] transmission: Update from 2.82 -> 2.83 --- pkgs/applications/networking/p2p/transmission/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 29fb558c83d..0f1ce2b2efa 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.82"; + version = "2.83"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz"; - sha256 = "08imy28hpjxwdzgvhm66hkfyzp8qnnqr4jhv3rgshryzhw86b5ir"; + sha256 = "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh"; }; buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] From f9daf5021464e8443ab21312f15a66b04774d8fc Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 22 May 2014 11:34:47 +0200 Subject: [PATCH 2/3] transmission: Fix compilation due to missing systemd dependency --- pkgs/applications/networking/p2p/transmission/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 0f1ce2b2efa..f260e3eb30a 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper -, openssl, curl, libevent, inotifyTools +, openssl, curl, libevent, inotifyTools, systemd , enableGTK3 ? false, gtk3 }: @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] - ++ optionals enableGTK3 [ gtk3 makeWrapper ]; + ++ optionals enableGTK3 [ gtk3 makeWrapper ] + ++ optional stdenv.isLinux systemd; preConfigure = '' sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure From a131baf502512b891d4efde73d458da325f69c2b Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 22 May 2014 19:10:46 +0200 Subject: [PATCH 3/3] transmission: Fix apparmor rules to allow loading more libraries --- .../modules/services/torrent/transmission.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5cdecd1eb57..02db4a7a5b2 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -125,13 +125,17 @@ in #include #include - ${pkgs.glibc}/lib/*.so mr, - ${pkgs.libevent}/lib/libevent*.so* mr, - ${pkgs.curl}/lib/libcurl*.so* mr, - ${pkgs.openssl}/lib/libssl*.so* mr, - ${pkgs.openssl}/lib/libcrypto*.so* mr, - ${pkgs.zlib}/lib/libz*.so* mr, - ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.glibc}/lib/*.so mr, + ${pkgs.libevent}/lib/libevent*.so* mr, + ${pkgs.curl}/lib/libcurl*.so* mr, + ${pkgs.openssl}/lib/libssl*.so* mr, + ${pkgs.openssl}/lib/libcrypto*.so* mr, + ${pkgs.zlib}/lib/libz*.so* mr, + ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.systemd}/lib/libsystemd*.so* mr, + ${pkgs.xz}/lib/liblzma*.so* mr, + ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr, + ${pkgs.libgpgerror}/lib/libgpg-error*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r,