nicotine-plus: 1.4.1 -> 3.0.6

+17 -26
+16 -23
pkgs/applications/networking/soulseek/nicotine-plus/default.nix
··· 1 - { lib, fetchFromGitHub, python27Packages, geoip }: 1 + { lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf 2 + , gobject-introspection, gtk3, wrapGAppsHook }: 2 3 3 4 with lib; 4 5 5 - python27Packages.buildPythonApplication { 6 + python3Packages.buildPythonApplication rec { 6 7 pname = "nicotine-plus"; 7 - version = "1.4.1"; 8 + version = "3.0.6"; 8 9 9 10 src = fetchFromGitHub { 10 11 owner = "Nicotine-Plus"; 11 12 repo = "nicotine-plus"; 12 - rev = "4e057d64184885c63488d4213ade3233bd33e67b"; 13 - sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c"; 13 + rev = version; 14 + sha256 = "sha256-NL6TXFRB7OeqNEfdANkEqh+MCOF1+ehR+6RO1XsIix8="; 14 15 }; 15 16 16 - propagatedBuildInputs = with python27Packages; [ 17 - pygtk 18 - miniupnpc 19 - mutagen 20 - notify 21 - (GeoIP.override { inherit geoip; }) 22 - ]; 17 + nativeBuildInputs = [ gettext wrapGAppsHook ]; 23 18 24 - # Insert real docs directory. 25 - # os.getcwd() is not needed 26 - postPatch = '' 27 - substituteInPlace ./pynicotine/gtkgui/frame.py \ 28 - --replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')" 29 - ''; 19 + propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ] 20 + ++ (with python3Packages; [ pygobject3 ]); 30 21 31 - postFixup = '' 32 - mkdir -p $out/doc/ 33 - mv ./doc/NicotinePlusGuide $out/doc/ 22 + postInstall = '' 34 23 mv $out/bin/nicotine $out/bin/nicotine-plus 24 + substituteInPlace $out/share/applications/org.nicotine_plus.Nicotine.desktop \ 25 + --replace "Exec=nicotine" "Exec=$out/bin/nicotine-plus" 35 26 ''; 27 + 28 + doCheck = false; 36 29 37 30 meta = { 38 31 description = "A graphical client for the SoulSeek peer-to-peer system"; 39 32 homepage = "https://www.nicotine-plus.org"; 40 - license = licenses.gpl3; 41 - maintainers = with maintainers; [ klntsky ]; 33 + license = licenses.gpl3Plus; 34 + maintainers = with maintainers; [ ehmry klntsky ]; 42 35 platforms = platforms.unix; 43 36 }; 44 37 }
+1 -3
pkgs/top-level/all-packages.nix
··· 24952 24952 24953 24953 newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; 24954 24954 24955 - nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { 24956 - geoip = geoipWithDatabase; 24957 - }; 24955 + nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; 24958 24956 24959 24957 nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; 24960 24958