mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #83414 from dasj19/qbittorrent-update
libtorrent-raster: 1.1.11 -> 1.2.5; qbittorrent: 4.2.1 -> 4.2.2
This commit is contained in:
commit
eb2f8d2a8b
2 changed files with 5 additions and 4 deletions
|
@ -10,13 +10,13 @@ with lib;
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "qbittorrent";
|
pname = "qbittorrent";
|
||||||
version = "4.2.1";
|
version = "4.2.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qbittorrent";
|
owner = "qbittorrent";
|
||||||
repo = "qbittorrent";
|
repo = "qbittorrent";
|
||||||
rev = "release-${version}";
|
rev = "release-${version}";
|
||||||
sha256 = "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil";
|
sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc";
|
||||||
};
|
};
|
||||||
|
|
||||||
# NOTE: 2018-05-31: CMake is working but it is not officially supported
|
# NOTE: 2018-05-31: CMake is working but it is not officially supported
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.1.11";
|
version = "1.2.5";
|
||||||
formattedVersion = lib.replaceChars ["."] ["_"] version;
|
formattedVersion = lib.replaceChars ["."] ["_"] version;
|
||||||
|
|
||||||
# Make sure we override python, so the correct version is chosen
|
# Make sure we override python, so the correct version is chosen
|
||||||
|
@ -17,13 +17,14 @@ in stdenv.mkDerivation {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "arvidn";
|
owner = "arvidn";
|
||||||
repo = "libtorrent";
|
repo = "libtorrent";
|
||||||
rev = "libtorrent_${formattedVersion}";
|
rev = "libtorrent-${formattedVersion}";
|
||||||
sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
|
sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
|
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
|
||||||
buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
|
buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
|
||||||
|
|
||||||
preConfigure = "./autotool.sh";
|
preConfigure = "./autotool.sh";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
Loading…
Reference in a new issue