Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 51c13292bd41
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 380c91ddfb58
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 3, 2018

  1. libtorrent-rasterbar: 1.1.6 -> 1.1.7 

    Also remove the default/generic split as it seems there's only one
version anyway.
    @obadz @globin
    obadz authored and globin committed May 3, 2018
    Copy the full SHA
    380c91d View commit details
Showing with 36 additions and 48 deletions.
  1. +36 −5 pkgs/development/libraries/libtorrent-rasterbar/default.nix
  2. +0 −43 pkgs/development/libraries/libtorrent-rasterbar/generic.nix
41 changes: 36 additions & 5 deletions pkgs/development/libraries/libtorrent-rasterbar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,37 @@
args@{ callPackage, ... }:
{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:

callPackage (import ./generic.nix {
version = "1.1.6";
sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7";
}) args
stdenv.mkDerivation rec {
name = "libtorrent-rasterbar-${version}";
version = "1.1.7";

src =
let formattedVersion = lib.replaceChars ["."] ["_"] version;
in fetchurl {
url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
};

nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boost openssl zlib python libiconv geoip ];

preConfigure = "./autotool.sh";

configureFlags = [
"--enable-python-binding"
"--with-libgeoip=system"
"--with-libiconv=yes"
"--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib"
"--with-libiconv=yes"
];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = http://www.rasterbar.com/products/libtorrent/;
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
platforms = platforms.unix;
};
}
43 changes: 0 additions & 43 deletions pkgs/development/libraries/libtorrent-rasterbar/generic.nix
View file

This file was deleted.