diff options
Diffstat (limited to 'pkgs')
7 files changed, 50 insertions, 15 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index f0e5a1c13e141..8ff11dba9055f 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.1.11"; + version = "3.2.3"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i"; + sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -23,14 +23,13 @@ stdenv.mkDerivation rec { ++ optional guiSupport dbus_libs; configureFlags = [ - "--with-libboost-lib=${boost.lib}/lib" - "--with-libboost-inc=${boost.dev}/include" + "--with-boost-libdir=${boost.lib}/lib" + "--with-boost=${boost.dev}" (if guiSupport then "" else "--disable-gui") (if webuiSupport then "" else "--disable-webui") ] ++ optional debugSupport "--enable-debug"; - # https://github.com/qbittorrent/qBittorrent/issues/1992 - enableParallelBuilding = false; + enableParallelBuilding = true; meta = { description = "Free Software alternative to µtorrent"; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 8ec4c87b82d14..58cf642c69de4 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -34,7 +34,7 @@ let ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku aisleriot + tali quadrapassel gnome-sudoku aisleriot five-or-more ]; inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; @@ -298,6 +298,8 @@ let aisleriot = callPackage ./games/aisleriot { }; + five-or-more = callPackage ./games/five-or-more { }; + gnome-sudoku = callPackage ./games/gnome-sudoku { }; iagno = callPackage ./games/iagno { }; diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix new file mode 100644 index 0000000000000..26af4d7286a39 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + name = "five-or-more-${gnome3.version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz"; + sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3"; + }; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + hicolor_icon_theme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Five_or_more; + description = "Remove colored balls from the board by forming lines"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix index 6298f2f0c0f31..985c570a34e0f 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "0.16.17"; - sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7"; + version = "0.16.19"; + sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw"; }) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index e1f1fc179d638..725b98cdae65e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.0.2"; - sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w"; + version = "1.0.6"; + sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r"; }) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index b866f66dbfa26..a5bb258af1a93 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip +{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip # Version specific options , version, sha256 , ... }: +let formattedVersion = lib.replaceChars ["."] ["_"] version; + +in + stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; src = fetchurl { - url = "mirror://sourceforge/libtorrent/${name}.tar.gz"; + url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; inherit sha256; }; + nativeBuildInputs = [automake autoconf libtool ]; + buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ]; + preConfigure = "./autotool.sh"; + configureFlags = [ "--enable-python-binding" "--with-libgeoip=system" @@ -21,6 +29,8 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.lib}/lib" "--with-libiconv=yes" ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.rasterbar.com/products/libtorrent/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95152c65de92d..ed6d9a0f92c3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12466,8 +12466,8 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { - boost = boost156; - libtorrentRasterbar = libtorrentRasterbar_0_16; + boost = boost; + libtorrentRasterbar = libtorrentRasterbar; }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; |