2018-07-21 01:44:44 +01:00
|
|
|
{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme
|
2013-10-04 19:31:02 +01:00
|
|
|
, enableGTK3 ? false, gtk3
|
2017-01-05 23:24:08 +00:00
|
|
|
, enableSystemd ? stdenv.isLinux
|
2017-01-05 23:27:16 +00:00
|
|
|
, enableDaemon ? true
|
2017-01-05 23:26:51 +00:00
|
|
|
, enableCli ? true
|
2013-10-04 19:31:02 +01:00
|
|
|
}:
|
2013-03-17 21:27:55 +00:00
|
|
|
|
2017-02-09 01:52:13 +00:00
|
|
|
let inherit (stdenv.lib) optional optionals optionalString; in
|
2010-05-20 14:39:16 +01:00
|
|
|
|
2010-03-28 00:06:30 +00:00
|
|
|
stdenv.mkDerivation rec {
|
2013-10-04 19:31:02 +01:00
|
|
|
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
|
2018-05-02 17:02:40 +01:00
|
|
|
version = "2.94";
|
2012-06-18 16:18:45 +01:00
|
|
|
|
2010-03-28 00:06:30 +00:00
|
|
|
src = fetchurl {
|
2018-05-02 17:02:40 +01:00
|
|
|
url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz";
|
|
|
|
|
sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m";
|
2010-03-28 00:06:30 +00:00
|
|
|
};
|
2012-06-18 16:18:45 +01:00
|
|
|
|
2017-11-30 07:04:57 +00:00
|
|
|
nativeBuildInputs = [ pkgconfig ]
|
|
|
|
|
++ optionals enableGTK3 [ wrapGAppsHook ];
|
2017-09-05 22:26:13 +01:00
|
|
|
buildInputs = [ intltool file openssl curl libevent zlib ]
|
2017-11-30 07:04:57 +00:00
|
|
|
++ optionals enableGTK3 [ gtk3 ]
|
2017-01-05 23:24:08 +00:00
|
|
|
++ optionals enableSystemd [ systemd ]
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
++ optionals stdenv.isLinux [ inotify-tools ]
|
|
|
|
|
++ optionals enableGTK3 [ hicolor-icon-theme ];
|
2012-06-18 16:18:45 +01:00
|
|
|
|
2016-05-28 13:23:47 +01:00
|
|
|
postPatch = ''
|
|
|
|
|
substituteInPlace ./configure \
|
|
|
|
|
--replace "libsystemd-daemon" "libsystemd" \
|
2017-01-05 23:28:13 +00:00
|
|
|
--replace "/usr/bin/file" "${file}/bin/file" \
|
|
|
|
|
--replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false"
|
2013-02-27 12:05:21 +00:00
|
|
|
'';
|
2011-06-13 15:15:15 +01:00
|
|
|
|
2017-01-05 23:24:08 +00:00
|
|
|
configureFlags = [
|
2017-01-05 23:26:51 +00:00
|
|
|
("--enable-cli=" + (if enableCli then "yes" else "no"))
|
2017-01-05 23:27:16 +00:00
|
|
|
("--enable-daemon=" + (if enableDaemon then "yes" else "no"))
|
2017-01-05 23:28:13 +00:00
|
|
|
"--disable-mac" # requires xcodebuild
|
2017-01-05 23:24:08 +00:00
|
|
|
]
|
|
|
|
|
++ optional enableSystemd "--with-systemd-daemon"
|
2013-10-04 19:31:02 +01:00
|
|
|
++ optional enableGTK3 "--with-gtk";
|
2013-03-17 21:27:55 +00:00
|
|
|
|
2017-01-05 23:28:13 +00:00
|
|
|
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
|
|
|
|
|
|
2013-10-04 19:31:02 +01:00
|
|
|
meta = with stdenv.lib; {
|
2010-05-20 14:39:16 +01:00
|
|
|
description = "A fast, easy and free BitTorrent client";
|
2010-03-28 00:06:30 +00:00
|
|
|
longDescription = ''
|
|
|
|
|
Transmission is a BitTorrent client which features a simple interface
|
|
|
|
|
on top of a cross-platform back-end.
|
|
|
|
|
Feature spotlight:
|
|
|
|
|
* Uses fewer resources than other clients
|
|
|
|
|
* Native Mac, GTK+ and Qt GUI clients
|
|
|
|
|
* Daemon ideal for servers, embedded systems, and headless use
|
|
|
|
|
* All these can be remote controlled by Web and Terminal clients
|
|
|
|
|
* Bluetack (PeerGuardian) blocklists with automatic updates
|
|
|
|
|
* Full encryption, DHT, and PEX support
|
|
|
|
|
'';
|
|
|
|
|
homepage = http://www.transmissionbt.com/;
|
2013-10-04 19:31:02 +01:00
|
|
|
license = licenses.gpl2; # parts are under MIT
|
2014-03-14 20:18:16 +00:00
|
|
|
maintainers = with maintainers; [ astsmtl vcunat wizeman ];
|
2017-01-05 23:28:13 +00:00
|
|
|
platforms = platforms.unix;
|
2010-03-28 00:06:30 +00:00
|
|
|
};
|
|
|
|
|
}
|
2013-10-04 19:31:02 +01:00
|
|
|
|
