transmission_4: 4.0.6 → 4.1.0 (#457906)

pkgs/applications/networking/p2p/transmission/4.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   pkg-config,
   python3,
@@ -13,13 +12,17 @@
   systemd,
   zlib,
   pcre,
+  rapidjson,
+  small,
   libb64,
   libutp,
   libdeflate,
   utf8cpp,
+  fast-float,
   fmt,
   libpsl,
   miniupnpc,
+  crc32c,
   dht,
   libnatpmp,
   libiconv,
@@ -62,30 +65,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "transmission";
-  version = "4.0.6";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "transmission";
     repo = "transmission";
-    rev = finalAttrs.version;
-    hash = "sha256-KBXvBFgrJ3njIoXrxHbHHLsiocwfd7Eba/GNI8uZA38=";
+    tag = finalAttrs.version;
+    hash = "sha256-glmwa06+jCyL9G2Rc58Yrvzo+/6Qu3bqwqy02RWgG64=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/transmission/transmission/commit/febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8.patch?full_index=1";
-      hash = "sha256-Ge0+AXf/ilfMieGBAdvvImY7JOb0gGIdeKprC37AROs=";
-      excludes = [
-        # The submodule that we don't use (we use our miniupnp)
-        "third-party/miniupnp"
-        # Hunk fails for this one, but we don't care because we don't rely upon
-        # xcode definitions even for the Darwin build.
-        "Transmission.xcodeproj/project.pbxproj"
-      ];
-    })
-  ];
-
   outputs = [
     "out"
     "apparmor"
@@ -109,20 +98,20 @@ stdenv.mkDerivation (finalAttrs: {
     # Excluding gtest since it is hardcoded to vendored version. The rest of the listed libraries are not packaged.
     pushd third-party
     for f in *; do
-        if [[ ! $f =~ googletest|wildmat|fast_float|wide-integer|jsonsl ]]; then
+        if [[ ! $f =~ googletest|wildmat|wide-integer|jsonsl ]]; then
             rm -r "$f"
         fi
     done
     popd
     rm \
+      cmake/FindFastFloat.cmake \
       cmake/FindFmt.cmake \
+      cmake/FindRapidJSON.cmake \
+      cmake/FindSmall.cmake \
       cmake/FindUtfCpp.cmake
     # Upstream uses different config file name.
-    substituteInPlace CMakeLists.txt --replace 'find_package(UtfCpp)' 'find_package(utf8cpp)'
-
-    # Use gettext even on Darwin
-    substituteInPlace libtransmission/utils.h \
-      --replace-fail '#if defined(HAVE_GETTEXT) && !defined(__APPLE__)' '#if defined(HAVE_GETTEXT)'
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'find_package(UtfCpp)' 'find_package(utf8cpp)'
   '';
 
   nativeBuildInputs = [
@@ -136,7 +125,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     curl
+    crc32c
     dht
+    fast-float
     fmt
     libb64
     libdeflate
@@ -147,6 +138,8 @@ stdenv.mkDerivation (finalAttrs: {
     miniupnpc
     openssl
     pcre
+    rapidjson
+    small
     utf8cpp
     zlib
   ]
@@ -193,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: {
       include if exists <local/bin.transmission-daemon>
     }
     EOF
-    install -Dm0444 -t $out/share/icons ../qt/icons/transmission.svg
+    install -Dm0444 -t $out/share/icons ../icons/hicolor_apps_scalable_transmission.svg
   '';
 
   passthru.tests = {

pkgs/by-name/sm/small/package.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "small";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "alandefreitas";
+    repo = "small";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+aPieFls2u2A57CKQz/q+ZqGjNyscDlWDryAp3VM1Lk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "C++ small containers";
+    homepage = "https://github.com/alandefreitas/small";
+    license = lib.licenses.boost;
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+})