diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
| commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
| tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/applications/misc | |
| parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
| parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
| download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip | |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
113 files changed, 785 insertions, 562 deletions
diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index a25d40e29bd0..6de7c3daed19 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "1password-${version}"; - version = "0.5.4"; + pname = "1password"; + version = "0.5.5"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "0wni2hk5b1qfr24vi24jiprpi08k3qgaw9lqp61k41a1sjp3izv0"; + sha256 = "14qx69fq1a3h93h167nhwp6gxka8r34295p82kim9grijrx5zz5f"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "169d5fl3cfw3xrlpm9nlmwbnp0xgh0la9qybzf8ragp0020nlyih"; + sha256 = "1jh1sk07k3whbr0rvc4kf221wskcdbk0zpxaj49qbwq1d89cjnpg"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "1scikv7v33kzg9rqsrz97yklxaskvif84br13zg8annm43k5vlma"; + sha256 = "1s6gw2qwsbhj4z9nrwrxs776y45ingpfp9533qz0gc1pk7ia99js"; stripRoot = false; } else throw "Architecture not supported"; diff --git a/nixpkgs/pkgs/applications/misc/alacritty/default.nix b/nixpkgs/pkgs/applications/misc/alacritty/default.nix index 5d1e43769b7e..06512f6123b1 100644 --- a/nixpkgs/pkgs/applications/misc/alacritty/default.nix +++ b/nixpkgs/pkgs/applications/misc/alacritty/default.nix @@ -43,16 +43,16 @@ let ]; in buildRustPackage rec { name = "alacritty-${version}"; - version = "0.2.4"; + version = "0.2.6"; src = fetchFromGitHub { owner = "jwilm"; repo = "alacritty"; rev = "v${version}"; - sha256 = "1mf0x8dc196qf08lqpm0n4a5954cx9qfb09dq8ab7mp3xnyrnqzx"; + sha256 = "1yjmlvxs5vwqhgjlb83a4hq2b12zzhr4pp209djprgdi0cf2bbqw"; }; - cargoSha256 = "0p3bygvmpmy09h7972nhmma51lxp8q91cdlaw3s6p35i79hq3bmp"; + cargoSha256 = "11n5xl43l07zycdg0icv4i7mh6zy4ia6aw48i0wm59xqdl7xqn9f"; nativeBuildInputs = [ cmake @@ -71,9 +71,6 @@ in buildRustPackage rec { outputs = [ "out" "terminfo" ]; - # https://github.com/NixOS/nixpkgs/issues/49693 - doCheck = !stdenv.isDarwin; - postPatch = '' substituteInPlace copypasta/src/x11.rs \ --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) diff --git a/nixpkgs/pkgs/applications/misc/albert/default.nix b/nixpkgs/pkgs/applications/misc/albert/default.nix index 39dae0db1250..2dda615081c0 100644 --- a/nixpkgs/pkgs/applications/misc/albert/default.nix +++ b/nixpkgs/pkgs/applications/misc/albert/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "albert"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "063z9yq6bsxcsqsw1n93ks5dzhzv6i252mjz1d5mxhxvgmqlfk0v"; + sha256 = "04sr35fqz66i24lv7r2p9qfqxs55i8xpj7aam0v9yakcr33lf55a"; fetchSubmodules = true; }; @@ -25,7 +25,7 @@ mkDerivation rec { postPatch = '' sed -i "/QStringList dirs = {/a \"$out/libs\"," \ - lib/albertcore/src/core/albert.cpp + src/app/main.cpp ''; preBuild = '' diff --git a/nixpkgs/pkgs/applications/misc/aminal/default.nix b/nixpkgs/pkgs/applications/misc/aminal/default.nix index e80921f46ebd..1c769e58705a 100644 --- a/nixpkgs/pkgs/applications/misc/aminal/default.nix +++ b/nixpkgs/pkgs/applications/misc/aminal/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "aminal-${version}"; - version = "0.7.12"; + version = "0.8.6"; goPackagePath = "github.com/liamg/aminal"; @@ -36,7 +36,7 @@ buildGoPackage rec { owner = "liamg"; repo = "aminal"; rev = "v${version}"; - sha256 = "1ak5g2i4ggi00b4q7qigfwsrwb5rvswjjbr2hp9kyxd45nycb0g4"; + sha256 = "0qhjdckj2kr0vza6qssd9z8dfrsif1qxb1mal1d4wgdsy12lrmwl"; }; preBuild = '' diff --git a/nixpkgs/pkgs/applications/misc/artha/default.nix b/nixpkgs/pkgs/applications/misc/artha/default.nix index f69152820e43..202c1669f858 100644 --- a/nixpkgs/pkgs/applications/misc/artha/default.nix +++ b/nixpkgs/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: +{ stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -9,9 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ dbus-glib gtk2 wordnet ]; + patches = [ + ./gio-underlink.patch + ]; + meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; homepage = http://artha.sourceforge.net; diff --git a/nixpkgs/pkgs/applications/misc/artha/gio-underlink.patch b/nixpkgs/pkgs/applications/misc/artha/gio-underlink.patch new file mode 100644 index 000000000000..08d9c4787369 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/artha/gio-underlink.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 0236d72..bcc1182 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -38,7 +38,7 @@ artha_LDADD = libwni.a $(WORDNET_LIB) + + if POSIX + AM_CFLAGS += @libdbus_CFLAGS@ +-artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgtk-x11-2.0 \ ++artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgio-2.0 -lgtk-x11-2.0 \ + -lgdk-x11-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 + else + artha_LDADD += @GTK_LIBS@ diff --git a/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix new file mode 100644 index 000000000000..912f18890b5f --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, perlPackages }: + +let version = "1.1"; +in stdenv.mkDerivation { + name = "asciiquarium-${version}"; + src = fetchurl { + url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"; + sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; + + installPhase = '' + mkdir -p $out/bin + cp asciiquarium $out/bin + chmod +x $out/bin/asciiquarium + wrapProgram $out/bin/asciiquarium \ + --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.TermAnimation ] } + ''; + + meta = with stdenv.lib; { + description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; + homepage = https://robobunny.com/projects/asciiquarium/html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.utdemir ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index b9d4b83e4f1f..89bd8ee4b3e0 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { "-DWITH_SYSTEM_OPENJPEG=ON" "-DWITH_PLAYER=ON" "-DWITH_OPENSUBDIV=ON" - "-DPYTHON_LIBRARY=python${python.majorVersion}m" + "-DPYTHON_LIBRARY=${python.libPrefix}m" "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" - "-DPYTHON_VERSION=${python.majorVersion}" + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}m" + "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" ] @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ] ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { postInstall = optionalString enableNumpy '' wrapProgram $out/bin/blender \ - --prefix PYTHONPATH : ${pythonPackages.numpy}/lib/python${python.majorVersion}/site-packages + --prefix PYTHONPATH : ${pythonPackages.numpy}/${python.sitePackages} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/buku/default.nix b/nixpkgs/pkgs/applications/misc/buku/default.nix index dacfa908b516..0a1275cb17a2 100644 --- a/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.8"; + version = "4.1"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0gv26c4rr1akcaiff1nrwil03sv7d58mfxr86pgsw6nwld67ns0r"; + sha256 = "166l1fmpqn4hys4l0ssc4yd590mmav1w62vm9l5ijhjhmlnrzfax"; }; checkInputs = [ @@ -33,8 +33,17 @@ with python3.pkgs; buildPythonApplication rec { arrow werkzeug click + html5lib + vcrpy ]; + postPatch = '' + # Jailbreak problematic dependencies + sed -i \ + -e "s,'PyYAML.*','PyYAML',g" \ + setup.py + ''; + preCheck = '' # Fixes two tests for wrong encoding export PYTHONIOENCODING=utf-8 diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index 6da1cdefa700..b52156beac6d 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.36.0"; + version = "3.39.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0fbf4b29vkka3gg8c5n9dc7qhv43jpw6naz6w83jkz7andypikb8"; + sha256 = "08c1wsdn0giv9zfb6bis9bbrw687rci8fs26qsal8ijmjk55dfsh"; }; patches = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5_with_qtwebkit}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ - apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow - python pyqt5 sip + apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow + python pyqt5_with_qtwebkit sip regex msgpack # the following are distributed with calibre, but we use upstream instead odfpy diff --git a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index cf93096c7873..78059191c2c3 100644 --- a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.38.6"; + version = "0.38.7"; src = fetchurl { url = "https://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "0b83ygv0y4lrclsyagmllkwiia62xkwij14i6z53avba191jvhma"; + sha256 = "1ls7vz993hj5gd99imlrzahxznfg6fa4n77ikkj79va4csw9b892"; }; buildInputs = with pythonPackages; diff --git a/nixpkgs/pkgs/applications/misc/chirp/default.nix b/nixpkgs/pkgs/applications/misc/chirp/default.nix index db67514cd077..acc35131e2d5 100644 --- a/nixpkgs/pkgs/applications/misc/chirp/default.nix +++ b/nixpkgs/pkgs/applications/misc/chirp/default.nix @@ -2,12 +2,12 @@ , pyserial, pygtk }: stdenv.mkDerivation rec { - name = "chirp-daily-${version}"; - version = "20181018"; + pname = "chirp-daily"; + version = "20190201"; src = fetchurl { - url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0jd7xi6q09b3djn1k7pj1sbqvw24kn7dcp9r6abvxily4pc1xhdr"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; + sha256 = "1ag3qzdq39zhpagviq9gpwk4y3h11z0j40nccsnhlq8h8bxpvwlf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix index 6dd68123b132..7a47a0e3bc0b 100644 --- a/nixpkgs/pkgs/applications/misc/clipmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { name = "clipmenu-${version}"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "15if7bwqviyynbrcwrn04r418cfnxf2mkmq112696np24bggvljg"; + sha256 = "13hyarzazh6j33d808h3s5yk320wqzivc0ni9xm8kalvn4k3a0bq"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix b/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix index 1c2045f4141e..f2372aa51e68 100644 --- a/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix +++ b/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix @@ -2,14 +2,14 @@ , qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.1.1"; name = "cool-retro-term-${version}"; src = fetchFromGitHub { owner = "Swordfish90"; repo = "cool-retro-term"; rev = version; - sha256 = "1ah54crqv13xsg9cvlwmgyhz90xjjy3vy8pbn9i0vc0ljmpgkqd5"; + sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/copyq/default.nix b/nixpkgs/pkgs/applications/misc/copyq/default.nix index fa5a9b466673..5609b6a8bebe 100644 --- a/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.7.1"; + version = "3.7.3"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0b3lrhrffvq46n9xc0lzbxhhn1lzmq2lrijjdwizc52458d6h90y"; + sha256 = "1nxxxq0lfs4r673i70dh2xwdn3chcjl913bkz14kyna29i6n1nwm"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix index a6afee13e47b..0601514546f2 100644 --- a/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix @@ -22,6 +22,11 @@ in pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ pytest mock ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace '==' '>=' + ''; + preConfigure = '' export LC_ALL=en_US.utf-8 ''; diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index e90fccefb065..de42f2d96571 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.3.0"; + version = "5.3.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1gn52bffjn2fw9yhi1rv4iy9dfdn5qxc51gv6qri5g0c8pblvh7m"; + sha256 = "05ra1bicah588q5n114vd9jqk9qdjix7b0zv5z83cagksb3n52rc"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix index 3e6a6ab53f77..939e2e9fc166 100644 --- a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix +++ b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix @@ -6,7 +6,7 @@ , libcap , libevent , libtool -, libqrencode +, qrencode , udev , libusb , makeWrapper @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { libtool udev libusb - libqrencode + qrencode qtbase qtwebsockets diff --git a/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix index 924b95d8b6a9..1c3b41338674 100644 --- a/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix @@ -1,21 +1,30 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, requests, dmenu }: +{ stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: buildPythonApplication rec { - name = "dmensamenu-${version}"; - version = "1.1.1"; - - propagatedBuildInputs = [ - requests - dmenu - ]; + pname = "dmensamenu"; + version = "1.2.1"; src = fetchFromGitHub { owner = "dotlambda"; repo = "dmensamenu"; rev = version; - sha256 = "0gc23k2zbv9zfc0v27y4spiva8cizxavpzd5pch5qbawh2lak6a3"; + sha256 = "15c8g2vdban3dw3g979icypgpx52irpvv39indgk19adicgnzzqp"; }; + patches = [ + (substituteAll { + src = ./dmenu-path.patch; + inherit dmenu; + }) + ]; + + propagatedBuildInputs = [ + requests + ]; + + # No tests implemented + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/dotlambda/dmensamenu; description = "Print German canteen menus using dmenu and OpenMensa"; diff --git a/nixpkgs/pkgs/applications/misc/dmensamenu/dmenu-path.patch b/nixpkgs/pkgs/applications/misc/dmensamenu/dmenu-path.patch new file mode 100644 index 000000000000..1508e5142d29 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/dmensamenu/dmenu-path.patch @@ -0,0 +1,13 @@ +diff --git a/dmensamenu/dmensamenu.py b/dmensamenu/dmensamenu.py +index 7df49f2..052ef1b 100644 +--- a/dmensamenu/dmensamenu.py ++++ b/dmensamenu/dmensamenu.py +@@ -99,7 +99,7 @@ def main(): + parser.add_argument('--city', + help='When searching for a canteen, only show the ones from the city specified' + +' (case-insensitive).') +- parser.add_argument('--dmenu', metavar='CMD', default='dmenu -i -l "$lines" -p "$date"', ++ parser.add_argument('--dmenu', metavar='CMD', default='@dmenu@/bin/dmenu -i -l "$lines" -p "$date"', + help='Command to execute. ' + 'Can be used to pass custom parameters to dmenu. ' + 'The shell variable $lines will be set to the number of items on the menu ' diff --git a/nixpkgs/pkgs/applications/misc/dmenu/default.nix b/nixpkgs/pkgs/applications/misc/dmenu/default.nix index 3ee2006ab0c0..90754b8fb1d8 100644 --- a/nixpkgs/pkgs/applications/misc/dmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-4.8"; + name = "dmenu-4.9"; src = fetchurl { url = "https://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy"; + sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/nixpkgs/pkgs/applications/misc/dunst/default.nix b/nixpkgs/pkgs/applications/misc/dunst/default.nix index 12f1f78acb9e..b28e76739929 100644 --- a/nixpkgs/pkgs/applications/misc/dunst/default.nix +++ b/nixpkgs/pkgs/applications/misc/dunst/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg, dunstify ? false +, libXinerama, libnotify, libxdg_basedir, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver - libXinerama libnotify libxdg_basedir pango xproto librsvg libXrandr + libXinerama libnotify libxdg_basedir pango xorgproto librsvg libXrandr ]; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/applications/misc/eaglemode/default.nix b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix index 0404ef8ce220..255396a79502 100644 --- a/nixpkgs/pkgs/applications/misc/eaglemode/default.nix +++ b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix @@ -1,35 +1,36 @@ -{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }: +{ stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig, +librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { - name = "eaglemode-0.86.0"; + name = "eaglemode-${version}"; + version = "0.94.0"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; - sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f"; + sha256 = "1sr3bd9y9j2svqvdwhrak29yy9cxf92w9vq2cim7a8hzwi9qfy9k"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl libX11 libjpeg libpng libtiff - librsvg glib gtk2 libXxf86vm libXext poppler xineLib ]; + buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff + librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ]; - # The program tries to dlopen both Xxf86vm and Xext, so we use the + # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. # I use 'yes y' to skip a build error linking with xineLib, # because xine stopped exporting "_x_vo_new_port" # https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext" + export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext -lXinerama" perl make.pl build ''; dontPatchELF = true; + # eaglemode expects doc to be in the root directory + forceShare = [ "man" "info" ]; installPhase = '' perl make.pl install dir=$out - # I don't like this... but it seems the way they plan to run it by now. - # Run 'eaglemode.sh', not 'eaglemode'. - ln -s $out/eaglemode.sh $out/bin/eaglemode.sh + wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin" ''; meta = with stdenv.lib; { @@ -38,6 +39,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.linux; - broken = true; }; } diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 9adcea837735..c6f83104fb13 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar }: +{ stdenv, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let qdarkstyle = python3Packages.buildPythonPackage rec { @@ -13,15 +13,20 @@ let in python3Packages.buildPythonApplication rec { - name = "electrum-${version}"; - version = "3.2.3"; + pname = "electrum"; + version = "3.3.2"; - src = fetchurl { - url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c"; + src = fetchFromGitHub { + owner = "spesmilo"; + repo = "electrum"; + rev = version; + sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; }; propagatedBuildInputs = with python3Packages; [ + aiorpcx + aiohttp + aiohttp-socks dnspython ecdsa jsonrpclib-pelix @@ -36,7 +41,6 @@ python3Packages.buildPythonApplication rec { qrcode requests tlslite-ng - typing # plugins keepkey @@ -53,6 +57,7 @@ python3Packages.buildPythonApplication rec { # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py + substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; postInstall = '' @@ -65,10 +70,10 @@ python3Packages.buildPythonApplication rec { --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; - doCheck = false; + checkInputs = with python3Packages; [ pytest ]; - doInstallCheck = true; - installCheckPhase = '' + checkPhase = '' + py.test electrum/tests $out/bin/electrum help >/dev/null ''; diff --git a/nixpkgs/pkgs/applications/misc/ephemeralpg/default.nix b/nixpkgs/pkgs/applications/misc/ephemeralpg/default.nix deleted file mode 100644 index 0ade32d99899..000000000000 --- a/nixpkgs/pkgs/applications/misc/ephemeralpg/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, postgresql, makeWrapper }: -stdenv.mkDerivation rec { - name = "ephemeralpg-${version}"; - version = "2.5"; - src = fetchurl { - url = "http://ephemeralpg.org/code/${name}.tar.gz"; - sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk"; - }; - buildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out - PREFIX=$out make install - wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin - ''; - meta = { - description = ''Run tests on an isolated, temporary PostgreSQL database.''; - license = stdenv.lib.licenses.isc; - homepage = http://ephemeralpg.org/; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/evilvte/default.nix b/nixpkgs/pkgs/applications/misc/evilvte/default.nix index b72fcde4a9ee..f088016938aa 100644 --- a/nixpkgs/pkgs/applications/misc/evilvte/default.nix +++ b/nixpkgs/pkgs/applications/misc/evilvte/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11 - xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig + xorg.xorgproto xorg.libXext makeWrapper pkgconfig ]; buildPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/extract_url/default.nix b/nixpkgs/pkgs/applications/misc/extract_url/default.nix index 389ac7dfb1fc..2b7888c9cd04 100644 --- a/nixpkgs/pkgs/applications/misc/extract_url/default.nix +++ b/nixpkgs/pkgs/applications/misc/extract_url/default.nix @@ -1,14 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, perl -, MIMEtools, HTMLParser -, cursesSupport ? true, CursesUI -, uriFindSupport ? true, URIFind +{ stdenv, lib, fetchFromGitHub, makeWrapper, perlPackages +, cursesSupport ? true +, uriFindSupport ? true }: let perlDeps = - [ MIMEtools HTMLParser ] - ++ lib.optional cursesSupport CursesUI - ++ lib.optional uriFindSupport URIFind; + [ perlPackages.MIMEtools perlPackages.HTMLParser ] + ++ lib.optional cursesSupport perlPackages.CursesUI + ++ lib.optional uriFindSupport perlPackages.URIFind; in stdenv.mkDerivation rec { name = "extract_url-${version}"; @@ -22,14 +21,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ] ++ perlDeps; + buildInputs = [ perlPackages.perl ] ++ perlDeps; makeFlags = [ "prefix=$(out)" ]; installFlags = [ "INSTALL=install" ]; postFixup = '' wrapProgram "$out/bin/extract_url" \ - --set PERL5LIB "${lib.makeFullPerlPath perlDeps}" + --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/fff/default.nix b/nixpkgs/pkgs/applications/misc/fff/default.nix new file mode 100644 index 000000000000..e87c86f1b4b3 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/fff/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: + +stdenv.mkDerivation rec { + pname = "fff"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "dylanaraps"; + repo = pname; + rev = version; + sha256 = "0s5gi5ghwax5gc886pvbpcmsbmzhxzywajwzjsdxwjyd1v1iynwh"; + }; + + pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bashInteractive ]; + dontBuild = true; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram "$out/bin/fff" --prefix PATH : $pathAdd + ''; + + meta = with stdenv.lib; { + description = "Fucking Fast File-Manager"; + homepage = https://github.com/dylanaraps/fff; + license = licenses.mit; + maintainers = [ maintainers.tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/flmsg/default.nix b/nixpkgs/pkgs/applications/misc/flmsg/default.nix index afdf0f91a910..239d392c374e 100644 --- a/nixpkgs/pkgs/applications/misc/flmsg/default.nix +++ b/nixpkgs/pkgs/applications/misc/flmsg/default.nix @@ -6,13 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.7"; + version = "4.0.8"; pname = "flmsg"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "1kdlwhxsw02pas9d0kakkq2713wj1m4q881f6am5aq4x8n01f4xw"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; + sha256 = "1yy9z6mchs7r3x108z5rp0h6a18zjqrn9zq5x72qwqh1byjnfwc8"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/flrig/default.nix b/nixpkgs/pkgs/applications/misc/flrig/default.nix index 64d2677d4e13..de4b448b5c37 100644 --- a/nixpkgs/pkgs/applications/misc/flrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/flrig/default.nix @@ -6,13 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.41"; + version = "1.3.42"; pname = "flrig"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "0vh14azg3pppyg3fb7kf6q3ighw1ka9m60jf2dzsd77f4hidhqx4"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; + sha256 = "10qn710ms145zq2xzb6z2fnygxmh5pmfmyfdbphrc7mrvd0phzp0"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/font-manager/correct-post-install.patch b/nixpkgs/pkgs/applications/misc/font-manager/correct-post-install.patch new file mode 100644 index 000000000000..47e9800d2657 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/font-manager/correct-post-install.patch @@ -0,0 +1,13 @@ +diff --git a/meson_post_install.py b/meson_post_install.py +index 8d00e70..c28d19e 100644 +--- a/meson_post_install.py ++++ b/meson_post_install.py +@@ -7,7 +7,7 @@ prefix = environ['MESON_INSTALL_PREFIX'] + data_dir = path.join(prefix, 'share') + schema_dir = path.join(data_dir, 'glib-2.0', 'schemas') + +-if not environ['DESTDIR']: ++if not environ.get('DESTDIR'): + print('Compiling gsettings schemas...') + call(['glib-compile-schemas', schema_dir]) + print('Updating desktop database...') diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index 998074e8aa0f..ee8766f766f1 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, - librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, + pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, + vala, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { - name = "font-manager-${version}"; - version = "0.7.3.1"; + pname = "font-manager"; + version = "0.7.4.2"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0i65br0bk3r6x8wcl8jhc0v0agl0k6fy5g60ss1bnw4md7ldpgyi"; - }; + sha256 = "15814czap0qg2h9nkcn9fg4i4xxa1lgw1vi6h3hi242qfwc7fh3i"; + }; nativeBuildInputs = [ pkgconfig - automake autoconf libtool - file - intltool + meson + ninja + gettext + python3 itstool + desktop-file-utils vala gnome3.yelp-tools wrapGAppsHook @@ -33,21 +35,23 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.libgee gnome3.defaultIconTheme ]; - enableParallelBuilding = true; + patches = [ ./correct-post-install.patch ]; + + mesonFlags = [ + "-Ddisable_pycompile=true" + ]; - preConfigure = '' - NOCONFIGURE=true ./autogen.sh - substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; - configureFlags = [ - "--with-file-roller" - "--disable-pycompile" - ]; + postInstall = '' + rm $out/share/applications/mimeinfo.cache + ''; meta = { homepage = https://fontmanager.github.io/; diff --git a/nixpkgs/pkgs/applications/misc/fsv/default.nix b/nixpkgs/pkgs/applications/misc/fsv/default.nix new file mode 100644 index 000000000000..782a37040d8f --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/fsv/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +, libtool, pkgconfig, gtk2, libGLU, file +}: + +let + gtkglarea = stdenv.mkDerivation rec { + name = "gtkglarea-${version}"; + version = "2.1.0"; + src = fetchurl { + url = "mirror://gnome/sources/gtkglarea/2.1/${name}.tar.xz"; + sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; + }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libGLU ]; + hardeningDisable = [ "format" ]; + }; + +in stdenv.mkDerivation rec { + name = "fsv-${version}"; + version = "0.9-1"; + + src = fetchFromGitHub { + owner = "mcuelenaere"; + repo = "fsv"; + rev = name; + sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj"; + }; + + nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + buildInputs = [ file gtk2 libGLU gtkglarea ]; + + meta = with stdenv.lib; { + description = "fsv is a file system visualizer in cyberspace"; + longDescription = '' + fsv (pronounced eff-ess-vee) is a file system visualizer in cyberspace. + It lays out files and directories in three dimensions, geometrically + representing the file system hierarchy to allow visual overview + and analysis. fsv can visualize a modest home directory, a workstation's + hard drive, or any arbitrarily large collection of files, limited only + by the host computer's memory and graphics hardware. + ''; + homepage = https://github.com/mcuelenaere/fsv; + license = licenses.lgpl2; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/default.nix b/nixpkgs/pkgs/applications/misc/gnuradio/default.nix index a7c00cceaa72..f9a50313c472 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnuradio/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; + NIX_LDFLAGS = [ + "-lpthread" + ]; + enableParallelBuilding = true; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/osmosdr.nix b/nixpkgs/pkgs/applications/misc/gnuradio/osmosdr.nix index 355ca0e95449..846afe0e95d4 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/osmosdr.nix +++ b/nixpkgs/pkgs/applications/misc/gnuradio/osmosdr.nix @@ -1,24 +1,33 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd -, makeWrapper, hackrf, airspy +{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper +, boost , pythonSupport ? true, python, swig +, airspy +, gnuradio +, hackrf +, libbladeRF +, rtl-sdr +, soapysdr-with-plugins +, uhd }: assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-osmosdr-${version}"; - version = "0.1.4"; + version = "2018-08-15"; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; - rev = "refs/tags/v${version}"; - sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; + rev = "4d83c6067f059b0c5015c3f59f8117bbd361e877"; + sha256 = "1d5nb47506qry52bg4cn02d3l4lwxwz44g2fz1ph0q93c7892j60"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + cmake makeWrapper boost + airspy gnuradio hackrf libbladeRF rtl-sdr uhd + ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] + ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/rds.nix b/nixpkgs/pkgs/applications/misc/gnuradio/rds.nix index 5d9670ba3072..2e5443227fda 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/rds.nix +++ b/nixpkgs/pkgs/applications/misc/gnuradio/rds.nix @@ -6,13 +6,13 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-rds-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bastibl"; repo = "gr-rds"; rev = "v${version}"; - sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; + sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index 01447281fe76..edf16f806a6b 100644 --- a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -26,6 +26,9 @@ in stdenv.mkDerivation rec { qtconnectivity ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; + NIX_LDFLAGS = [ + "-lz" + ]; preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri diff --git a/nixpkgs/pkgs/applications/misc/googleearth/default.nix b/nixpkgs/pkgs/applications/misc/googleearth/default.nix index 96f8cb116143..0fccf83acf76 100644 --- a/nixpkgs/pkgs/applications/misc/googleearth/default.nix +++ b/nixpkgs/pkgs/applications/misc/googleearth/default.nix @@ -79,6 +79,15 @@ stdenv.mkDerivation rec { for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done + + # Add desktop config file and icons + mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} + ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop + sed -i -e "s|Exec=.*|Exec=$out/bin/googleearth|g" $out/opt/google/earth/free/google-earth.desktop + for size in 16 22 24 32 48 64 128 256; do + ln -s $out/opt/google/earth/free/product_logo_"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/google-earth.png + done + ln -s $out/opt/google/earth/free/product_logo_256.png $out/share/pixmaps/google-earth.png ''; checkPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix b/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix index 1810d6d5c476..f7cfee3e6516 100644 --- a/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; + buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { homepage = https://blog.sarine.nl/tag/gpxviewer/; diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 50a81890789a..5ef64b2b801c 100644 --- a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "6.3"; + version = "7.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0kbnmcis04kjqkd0msfjd8rdmdf23c71dpzx9wcpf2yadc9rv4c9"; + sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5"; }; nativeBuildInputs = [ qmake ]; buildInputs = [ qttools ]; preConfigure = '' - substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee + substituteInPlace src/common/programpaths.cpp --replace /usr/share/ $out/share/ lrelease lang/*.ts ''; @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.gpxsee.org/; + homepage = https://www.gpxsee.org/; description = "GPX viewer and analyzer"; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, - TCX, KML, FIT, IGC and NMEA files. + TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files. ''; license = licenses.gpl3; maintainers = [ maintainers.womfoo ]; diff --git a/nixpkgs/pkgs/applications/misc/gramps/default.nix b/nixpkgs/pkgs/applications/misc/gramps/default.nix index 920bec56a9bc..db18ff73412c 100644 --- a/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -9,7 +9,7 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "5.0.0"; + version = "5.0.1"; name = "gramps-${version}"; nativeBuildInputs = [ wrapGAppsHook ]; @@ -27,7 +27,7 @@ in buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "056l4ihmd3gdsiv6wwv4ckgh8bfzd5nii6z4afsdn2nmjbj4hw9m"; + sha256 = "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7"; }; pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; diff --git a/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index 1fa016627d4e..e09e65738e5d 100644 --- a/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python }: +{ stdenv, python, fetchpatch }: with python.pkgs; @@ -11,6 +11,12 @@ buildPythonApplication rec { sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; }; + # allow newer click version + patches = fetchpatch { + url = "${meta.homepage}/commit/5b0d3ef1775756ca15b6d83fba1fb751846b5427.patch"; + sha256 = "1551knh2f7yarqzcpip16ijmbx8kzdna8cihxlxx49ww55f5sg67"; + }; + propagatedBuildInputs = [ click colorama diff --git a/nixpkgs/pkgs/applications/misc/hyper/default.nix b/nixpkgs/pkgs/applications/misc/hyper/default.nix index 5e1626e12c57..04c3e0320f65 100644 --- a/nixpkgs/pkgs/applications/misc/hyper/default.nix +++ b/nixpkgs/pkgs/applications/misc/hyper/default.nix @@ -11,11 +11,11 @@ let ]; in stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.1.1"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "04241kjy65pnp5q9z901910rmvcx18x0qaqfl31i0l4c2xj83ws0"; + sha256 = "1vr4j2vb2wpn8qzgq30l8kfck2an03jwchwywyx4zsl2vz3qp70x"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix b/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix index 6e4fc2065885..957f0f7f68bb 100644 --- a/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix +++ b/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix @@ -1,13 +1,9 @@ -{ stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML -, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate -, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer -, LWPxParanoidAgent, CryptSSLeay +{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null , bazaarSupport ? false, bazaar ? null -, cvsSupport ? false, cvs ? null, cvsps ? null, Filechdir ? null +, cvsSupport ? false, cvs ? null, cvsps ? null , subversionSupport ? false, subversion ? null , mercurialSupport ? false, mercurial ? null , extraUtils ? [] @@ -17,7 +13,7 @@ assert docutilsSupport -> (python != null && docutils != null); assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); assert bazaarSupport -> (bazaar != null); -assert cvsSupport -> (cvs != null && cvsps != null && Filechdir != null); +assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null); assert subversionSupport -> (subversion != null); assert mercurialSupport -> (mercurial != null); @@ -35,20 +31,21 @@ stdenv.mkDerivation { sha256 = "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz"; }; - buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase - NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ] + buildInputs = [ which ] + ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase + NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] ++ lib.optionals bazaarSupport [bazaar] - ++ lib.optionals cvsSupport [cvs cvsps Filechdir] + ++ lib.optionals cvsSupport [cvs cvsps perlPackages.Filechdir] ++ lib.optionals subversionSupport [subversion] ++ lib.optionals mercurialSupport [mercurial]; patchPhase = '' - sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man + sed -i s@/usr/bin/perl@${perlPackages.perl}/bin/perl@ pm_filter mdwn2man sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL sed -i /ENV{PATH}/d ikiwiki.in # State the gcc dependency, and make the cgi use our wrapper @@ -60,7 +57,7 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do - wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \ + wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} diff --git a/nixpkgs/pkgs/applications/misc/img2pdf/default.nix b/nixpkgs/pkgs/applications/misc/img2pdf/default.nix index c718d6c7bfd5..902e9268f722 100644 --- a/nixpkgs/pkgs/applications/misc/img2pdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/img2pdf/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "img2pdf"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "07wxgn5khmy94zqqv8l84q9b3yy84ddvwr2f7j4pjycrj2gg7si8"; + sha256 = "1ksn33j9d9df04n4jx7dli70d700rafbm37gjaz6lwsswrzc2xwx"; }; doCheck = false; # needs pdfrw diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 847ac3e299c2..7304ad7141a9 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14460"; + version = "14620"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1j95319dvj4cwi1af94n1p8m1z1191j1jx6x06l4vz8bcjxaaqf5"; + sha256 = "0ypn2awmclxsx4i7mmghs5blz2j5srdayzcxcqn5b4p1r57072bn"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 30e36c3dcf0f..3260f6a50690 100644 --- a/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz six tzlocal keyring argparse dateutil + pytz six tzlocal keyring dateutil parsedatetime pycrypto ]; diff --git a/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix index 8f69abd3a987..0049e9aca755 100644 --- a/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix +++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix @@ -6,19 +6,29 @@ , enableJPEG2K ? true, jasper , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes -, enableTesseract ? true, leptonica, tesseract +, enableTesseract ? true, leptonica, tesseract4 }: with stdenv.lib; stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.42"; + version = "2.51a"; - src = fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1zag4jmkr0qrcpqqb5davmvdrabhdyz87q4zz0xpfkl6xw2dn9bk"; - }; + src = (fetchzip { + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip"; + sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9"; + }); + + # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip. + v251a_src = (fetchzip { + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip"; + sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6"; + }); + + postUnpack = '' + cp -r ${v251a_src}/* $sourceRoot + ''; patches = [ ./k2pdfopt.patch ]; @@ -27,65 +37,43 @@ stdenv.mkDerivation rec { buildInputs = let mupdf_modded = mupdf.overrideAttrs (attrs: { - name = "mupdf-1.10a"; - version = "1.10a"; - src = fetchurl { - url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; - sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; - }; # Excluded the pdf-*.c files, since they mostly just broke the #includes prePatch = '' cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/ cp ${src}/mupdf_mod/font-win32.c source/pdf/ ''; - # Patches from previous 1.10a version in nixpkgs - patches = [ - # Compatibility with new openjpeg - ./load-jpx.patch - - (fetchurl { - name = "CVE-2017-5896.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; - sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; - }) - - (fetchpatch { - name = "mupdf-1.10a-shared_libs-1.patch"; - url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch"; - sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; - }) - ]; - - # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 - preConfigure = '' - # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} - ''; - postPatch = let - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); - in '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c - ''; }); + leptonica_modded = leptonica.overrideAttrs (attrs: { + name = "leptonica-1.74.4"; + # Modified source files apply to this particular version of leptonica + version = "1.74.4"; + + src = fetchurl { + url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz"; + sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9"; + }; + prePatch = '' - cp ${src}/leptonica_mod/* src/ + cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/ ''; + patches = []; }); - tesseract_modded = tesseract.override { - tesseractBase = tesseract.tesseractBase.overrideAttrs (_: { + tesseract_modded = tesseract4.override { + tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { prePatch = '' - cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/ - cp ${src}/tesseract_mod/dawg.cpp api/ - cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/ - cp ${src}/tesseract_mod/openclwrapper.h opencl/ - cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/ - cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/ - cp ${src}/tesseract_mod/tesscapi.cpp api/ - cp ${src}/include_mod/{tesseract.h,leptonica.h} api/ + cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/ + cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/ + cp ${src}/tesseract_mod/genericvector.h src/ccutil/ + cp ${src}/tesseract_mod/input.cpp src/lstm/ + cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/ + cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/ + cp ${src}/tesseract_mod/params.cpp src/ccutil/ + cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/ + cp ${src}/tesseract_mod/tesscapi.cpp src/api/ + cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/ + cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/ + cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/ ''; patches = [ ./tesseract.patch ]; }); @@ -104,6 +92,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ]; + NIX_LDFLAGS = [ + "-lpthread" + ]; + installPhase = '' install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; diff --git a/nixpkgs/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/load-jpx.patch deleted file mode 100644 index 02a3799d040a..000000000000 --- a/nixpkgs/pkgs/applications/misc/k2pdfopt/load-jpx.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/source/fitz/load-jpx.c -+++ b/source/fitz/load-jpx.c -@@ -484,12 +484,16 @@ - /* Without the definition of OPJ_STATIC, compilation fails on windows - * due to the use of __stdcall. We believe it is required on some - * linux toolchains too. */ -+#ifdef __cplusplus -+extern "C" -+{ - #define OPJ_STATIC - #ifndef _MSC_VER - #define OPJ_HAVE_STDINT_H - #endif -+#endif - --#include <openjpeg.h> -+#include <openjpeg-__OPENJPEG__VERSION__/openjpeg.h> - - /* OpenJPEG does not provide a safe mechanism to intercept - * allocations. In the latest version all allocations go -@@ -971,4 +975,8 @@ - fz_drop_pixmap(ctx, img); - } - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* HAVE_LURATECH */ diff --git a/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch index 4827daa1a905..b882f5b949c3 100644 --- a/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -1,7 +1,7 @@ -diff --git a/api/Makefile.am b/api/Makefile.am +diff --git a/src/api/Makefile.am b/src/api/Makefile.am index d8c1e54..46ead13 100644 ---- a/api/Makefile.am -+++ b/api/Makefile.am +--- a/src/api/Makefile.am ++++ b/src/api/Makefile.am @@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS) if VISIBILITY libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS diff --git a/nixpkgs/pkgs/applications/misc/keepassx/default.nix b/nixpkgs/pkgs/applications/misc/keepassx/default.nix index ed706b138cc5..89ceca8a4f10 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xextproto, libXtst }: +{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: stdenv.mkDerivation rec { name = "keepassx-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./random.patch ]; - buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ]; + buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ]; nativeBuildInputs = [ qmake4Hook ]; diff --git a/nixpkgs/pkgs/applications/misc/khard/default.nix b/nixpkgs/pkgs/applications/misc/khard/default.nix index 8ec4e7f06d16..d6e05056e1c1 100644 --- a/nixpkgs/pkgs/applications/misc/khard/default.nix +++ b/nixpkgs/pkgs/applications/misc/khard/default.nix @@ -17,13 +17,13 @@ let }; in with python.pkgs; buildPythonApplication rec { - version = "0.12.2"; + version = "0.13.0"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j"; + sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f"; }; # setup.py reads the UTF-8 encoded readme. @@ -34,7 +34,6 @@ in with python.pkgs; buildPythonApplication rec { atomicwrites configobj vobject - argparse ruamel_yaml ruamel_base unidecode diff --git a/nixpkgs/pkgs/applications/misc/kitty/default.nix b/nixpkgs/pkgs/applications/misc/kitty/default.nix index d3f20f0282f7..845de8b0388a 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.13.1"; + version = "0.13.3"; name = "kitty-${version}"; format = "other"; @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1j24zjasdh48z7majfpqr71n1wn5a9688wsmmqn26v8kfb68pqs4"; + sha256 = "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb"; }; buildInputs = [ @@ -45,6 +45,12 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} $out wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}" runHook postInstall + + # ZSH completions need to be invoked with `source`: + # https://github.com/kovidgoyal/kitty/blob/8ceb941051b89b7c50850778634f0b6137aa5e6e/docs/index.rst#zsh + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" + "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" ''; postInstall = '' diff --git a/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch b/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch index e22f4570a4b7..d6e52adc4452 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch +++ b/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch @@ -6,8 +6,8 @@ static bool done = false; - static const char* libname = "libstartup-notification-1.so"; + static const char* libname = "@libstartup_notification@"; - if (!done) { - done = true; + // some installs are missing the .so symlink, so try the full name + static const char* libname2 = "libstartup-notification-1.so.0"; --- a/docs/Makefile +++ b/docs/Makefile diff --git a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index a00a85b7a81c..ec571c0284b6 100644 --- a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.3"; + version = "0.8.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1jgg1ag8sxrkif1bqgz5pizn1xmiljas00rqcskszx10j0595mnk"; + sha256 = "1yhnmppp65xy8skainn438q3hwlpsz8qcj4ksvl8xdz5jzn7gs7k"; name = "${name}.tar.xz"; }; diff --git a/nixpkgs/pkgs/applications/misc/libosmocore/default.nix b/nixpkgs/pkgs/applications/misc/libosmocore/default.nix index 13e7e4f98011..4b3654f9a97b 100644 --- a/nixpkgs/pkgs/applications/misc/libosmocore/default.nix +++ b/nixpkgs/pkgs/applications/misc/libosmocore/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "libosmocore-${version}"; - version = "0.12.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - sha256 = "140c9jii0qs00s50kji1znc2339s22x8sz259x4pj35rrjzyyjgp"; + sha256 = "08xbj2calh1zkp79kxbq01vnh0y7nkgd4cgsivrzlyqahilbzvd9"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index 69e33fbfc184..a3320a16ee91 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.08.1"; + version = "18.12"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9"; + sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/mrxvt/default.nix b/nixpkgs/pkgs/applications/misc/mrxvt/default.nix index 3f7ce3cc5d5b..a6efb19b5774 100644 --- a/nixpkgs/pkgs/applications/misc/mrxvt/default.nix +++ b/nixpkgs/pkgs/applications/misc/mrxvt/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE +{ stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE , freetype, pkgconfig, which }: stdenv.mkDerivation { name = "mrxvt-0.5.4"; buildInputs = - [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ]; + [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ]; configureFlags = [ "--with-x" diff --git a/nixpkgs/pkgs/applications/misc/multimon-ng/default.nix b/nixpkgs/pkgs/applications/misc/multimon-ng/default.nix index 3fb268017750..b58872975aea 100644 --- a/nixpkgs/pkgs/applications/misc/multimon-ng/default.nix +++ b/nixpkgs/pkgs/applications/misc/multimon-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let - version = "1.1.6"; + version = "1.1.7"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "EliasOenal"; repo = "multimon-ng"; rev = "${version}"; - sha256 = "1a166mh73x77yrrnhhhzk44qrkgwav26vpidv1547zj3x3m8p0bm"; + sha256 = "11wfk8jw86z44y0ji4jr4s8ig3zwxp6g9h3sl81pvk6l3ipqqbgi"; }; buildInputs = [ qt4 libpulseaudio ]; diff --git a/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/nixpkgs/pkgs/applications/misc/mupdf/default.nix index d4f59272c9c9..38f5075d10f2 100644 --- a/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl @@ -24,7 +24,14 @@ in stdenv.mkDerivation rec { patches = # Use shared libraries to decrease size - stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + [( fetchpatch + { + name = "CVE-2018-18662"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=164ddc22ee0d5b63a81d5148f44c37dd132a9356"; + sha256 = "1jkzh20n3b854871h86cy5y7fvy0d5wyqy51b3fg6gj3a0jqpzzd"; + } + )] + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; @@ -60,7 +67,7 @@ in stdenv.mkDerivation rec { Name: mupdf Description: Library for rendering PDF documents Version: ${version} - Libs: -L$out/lib -lmupdf -lmupdfthird + Libs: -L$out/lib -lmupdf -lmupdf-third Cflags: -I$dev/include EOF diff --git a/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index daeb8b159f7a..8068a8cfd7e9 100644 --- a/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.13"; + version = "8.0.14"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj"; + sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/nnn/default.nix b/nixpkgs/pkgs/applications/misc/nnn/default.nix index 0e60c2bfa16e..9eb5382cde9f 100644 --- a/nixpkgs/pkgs/applications/misc/nnn/default.nix +++ b/nixpkgs/pkgs/applications/misc/nnn/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "1vkrhsdwgacln335rjywdf7nj7fg1x55szmm8xrvwda8y2qjqhc4"; + sha256 = "01y2vkw1wakpnpzhzia3d44iir060i8vma3b3ww5wgwg7bfpzs4b"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses readline ]; + buildInputs = [ ncurses ]; - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + + # shell completions + postInstall = '' + install -Dm555 scripts/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash + install -Dm555 scripts/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions + install -Dm555 scripts/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + ''; meta = { description = "Small ncurses-based file browser forked from noice"; diff --git a/nixpkgs/pkgs/applications/misc/notejot/default.nix b/nixpkgs/pkgs/applications/misc/notejot/default.nix index a687e1046050..fa5477697db0 100644 --- a/nixpkgs/pkgs/applications/misc/notejot/default.nix +++ b/nixpkgs/pkgs/applications/misc/notejot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.2"; + version = "1.5.4"; name = "${pname}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk"; + sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index 2e3bc058280a..327a59618c2b 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -2,6 +2,8 @@ let buildPlugin = args: python2Packages.buildPythonPackage (args // { + pname = "OctoPrintPlugin-${args.pname}"; + inherit (args) version; propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ]; # none of the following have tests doCheck = false; @@ -13,7 +15,7 @@ let m3d-fio = self.m33-fio; # added 2016-08-13 m33-fio = buildPlugin rec { - name = "M33-Fio-${version}"; + pname = "M33-Fio"; version = "1.21"; src = fetchFromGitHub { @@ -36,16 +38,15 @@ let ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M33-Fio; description = "OctoPrint plugin for the Micro 3D printer"; - platforms = platforms.all; + homepage = https://github.com/donovan6000/M33-Fio; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; }; mqtt = buildPlugin rec { - name = "OctoPrint-MQTT-${version}"; + pname = "MQTT"; version = "0.8.0"; src = fetchFromGitHub { @@ -58,16 +59,15 @@ let propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; meta = with stdenv.lib; { - homepage = https://github.com/OctoPrint/OctoPrint-MQTT; description = "Publish printer status MQTT"; - platforms = platforms.all; + homepage = https://github.com/OctoPrint/OctoPrint-MQTT; license = licenses.agpl3; maintainers = with maintainers; [ peterhoeg ]; }; }; titlestatus = buildPlugin rec { - name = "OctoPrint-TitleStatus-${version}"; + pname = "TitleStatus"; version = "0.0.4"; src = fetchFromGitHub { @@ -78,16 +78,15 @@ let }; meta = with stdenv.lib; { - homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; description = "Show printers status in window title"; - platforms = platforms.all; + homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; }; stlviewer = buildPlugin rec { - name = "OctoPrint-STLViewer-${version}"; + pname = "STLViewer"; version = "0.4.1"; src = fetchFromGitHub { @@ -98,9 +97,8 @@ let }; meta = with stdenv.lib; { - homepage = https://github.com/jneilliii/Octoprint-STLViewer; description = "A simple stl viewer tab for OctoPrint"; - platforms = platforms.all; + homepage = https://github.com/jneilliii/Octoprint-STLViewer; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix index f52215fa4a26..5533bf6eeded 100644 --- a/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -9,7 +9,7 @@ let pname = "orca"; - version = "3.30.1"; + version = "3.30.2"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -17,7 +17,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b9s69frjmghjm1p9a4rrvknl9m0qlwr7mr4lsxkvjnblhsnw0g7"; + sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 232184c1976c..0e424a97d8dd 100644 --- a/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { - repo = "pdfpc"; - owner = "pdfpc"; + repo = product; + owner = product; rev = "v${version}"; - sha256 = "1ild2p2lv89yj74fbbdsg3jb8dxpzdamsw0l0xs5h20fd2lsrwcd"; + sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix index 626e400eac4b..cc6b74dc9989 100644 --- a/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk_pixbuf, libdbusmenu-gtk3, file +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus , wrapGAppsHook, autoreconfHook, gobject-introspection }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ vala atk cairo glib gnome3.gnome-menus + buildInputs = [ vala atk cairo glib gnome-menus gtk3 gnome3.libgee libwnck3 libX11 libXfixes libXi pango gnome3.gnome-common bamf gdk_pixbuf libdbusmenu-gtk3 gnome3.dconf ]; diff --git a/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index e1b6b7fcc464..c31d442d2d67 100644 --- a/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -22,7 +22,7 @@ }: let - version = "4.3.3"; + version = "4.3.4"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -55,7 +55,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak"; + sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/pmenu/default.nix b/nixpkgs/pkgs/applications/misc/pmenu/default.nix index b14bb445b5d1..4b39e9291a8a 100644 --- a/nixpkgs/pkgs/applications/misc/pmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python2Packages, gnome3 }: +{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ]; + buildInputs = [ python2Packages.pygtk gnome-menus ]; pythonPath = [ python2Packages.pygtk ]; diff --git a/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix index bcff0db65ab1..18bd46a30bd5 100644 --- a/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.5.1"; + version = "1.9.0"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "1nnbybrzk1ms83490gbw5gakfim0j2c8gp83d9iaqwl4590qgwlg"; + sha256 = "1kvgmb7kvqc6pzcr0yp8x9mxwymiy85yr0cx3k2sclqlksrc5dzx"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/polybar/default.nix b/nixpkgs/pkgs/applications/misc/polybar/default.nix index 0310b1a2f748..9e2beb5b07cf 100644 --- a/nixpkgs/pkgs/applications/misc/polybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/polybar/default.nix @@ -1,4 +1,4 @@ -{ cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig +{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper @@ -26,11 +26,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.2.1"; - src = fetchgit { - url = "https://github.com/jaagr/polybar"; + version = "3.3.0"; + src = fetchFromGitHub { + owner = "jaagr"; + repo = "polybar"; rev = version; - sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz"; + sha256 = "18hrsbq62na2i4rlwbs2ih7v9shnayg76nw14i6az28wpf8kx4rr"; + fetchSubmodules = true; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 7b0e299924cb..25b3a6b4e7af 100644 --- a/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto -, libqrencode, libuuid, libyubikey, yubikey-personalization +, wxGTK31, libXi, libXt, libXtst, xercesc, xorgproto +, qrencode, libuuid, libyubikey, yubikey-personalization }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ - gettext perl libqrencode libuuid - libXi libXt libXtst wxGTK31 xercesc xextproto + gettext perl qrencode libuuid + libXi libXt libXtst wxGTK31 xercesc xorgproto libyubikey yubikey-personalization ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix b/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix new file mode 100644 index 000000000000..e0a1e33dc628 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: + +stdenv.mkDerivation rec { + name = "qMasterPassword"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "bkueng"; + repo = name; + rev = "v${version}"; + sha256 = "0l0jarvfdc69rcjl2wa0ixq8gp3fmjsy9n84m38sxf3n9j2bh13c"; + }; + + buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; + nativeBuildInputs = [ qmake ]; + + # Upstream install is mostly defunct. It hardcodes target.path and doesn't + # install anything but the binary. + installPhase = if stdenv.isDarwin then '' + mkdir -p "$out"/{Applications,bin} + mv qMasterPassword.app "$out"/Applications/ + ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword + '' else '' + mkdir -p $out/bin + mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps} + mv qMasterPassword $out/bin + mv data/qMasterPassword.desktop $out/share/applications + mv LICENSE README.md $out/share/doc/qMasterPassword + mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png + mv data/icons/* $out/share/icons/qmasterpassword + ''; + + meta = with stdenv.lib; { + description = "Stateless Master Password Manager"; + longDescription = '' + Access all your passwords using only a single master password. But in + contrast to other managers it does not store any passwords: Unique + passwords are generated from the master password and a site name. This + means you automatically get different passwords for each account and + there is no password file that can be lost or get stolen. There is also + no need to trust any online password service. + ''; + homepage = https://github.com/bkueng/qMasterPassword; + license = licenses.gpl3; + maintainers = [ maintainers.tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index cbbac11424ec..abf4bb054621 100644 --- a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, qmake , coreutils, xdg_utils, bash -, perl, makeWrapper, perlPackages }: +, makeWrapper, perlPackages }: let - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation rec { name = "qdirstat-${version}"; @@ -11,27 +11,18 @@ in stdenv.mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh"; + sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc"; }; nativeBuildInputs = [ qmake makeWrapper ]; - buildInputs = [ perl ]; + buildInputs = [ perlPackages.perl ]; preBuild = '' substituteInPlace scripts/scripts.pro \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /usr/bin $out/bin - substituteInPlace src/src.pro \ - --replace /usr/bin $out/bin \ - --replace /usr/share $out/share - for i in doc/doc.pro doc/stats/stats.pro - do - substituteInPlace $i \ - --replace /usr/share $out/share - done + --replace /bin/true ${coreutils}/bin/true - for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp + for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open @@ -45,10 +36,13 @@ in stdenv.mkDerivation rec { substituteInPlace src/StdCleanup.cpp \ --replace /bin/bash ${bash}/bin/bash ''; + postPatch = '' + export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" + ''; postInstall = '' wrapProgram $out/bin/qdirstat-cache-writer \ - --set PERL5LIB "${stdenv.lib.makePerlPath [ perlPackages.URI ]}" + --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.URI ]}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index eae3216c964f..878de748dec9 100644 --- a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { name = "qlcplus-${version}"; - version = "4.11.2"; + version = "4.12.0"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "0ry7j8d5mm3h3mzd49xqlagnldmfhfr6plwk73pz62hxr4j58s6w"; + sha256 = "056ccgcz3rpbic2hqg4r1rq8svq7070j2h6l3hbb1p8h3qxwamzh"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix index 444c72602d35..9ad9f4fe15a7 100644 --- a/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, qt5 }: let - version = "1.40.30"; + version = "1.40.40"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; src = fetchzip { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "0xbgdmwb8d3lrddcnx2amfsknd3g408f5gy5mdydcm3vqqfi9a0c"; + sha256 = "10gxxkmn7w2hbmznpx6ybbbvlvh640nyzya1yfn162vzbjg14jdi"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/nixpkgs/pkgs/applications/misc/ranger/default.nix b/nixpkgs/pkgs/applications/misc/ranger/default.nix index 5417a135dda4..7045228d6a2f 100644 --- a/nixpkgs/pkgs/applications/misc/ranger/default.nix +++ b/nixpkgs/pkgs/applications/misc/ranger/default.nix @@ -16,8 +16,11 @@ python3Packages.buildPythonApplication rec { sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; + LC_ALL = "en_US.UTF-8"; + checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = [ file ]; + propagatedBuildInputs = [ file ] + ++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ]; checkPhase = '' py.test tests diff --git a/nixpkgs/pkgs/applications/misc/rescuetime/default.nix b/nixpkgs/pkgs/applications/misc/rescuetime/default.nix index d9cd85d5098a..b934788cdbeb 100644 --- a/nixpkgs/pkgs/applications/misc/rescuetime/default.nix +++ b/nixpkgs/pkgs/applications/misc/rescuetime/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt4, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }: let src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "06q1jwqsrjvlj820dd4vl80jznwafsqshsg0p6si8qx4721blryz"; + sha256 = "136ci4q0ns0qzikndlkbab947m47zv2nmnn8mda2374ip43kn6ri"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab"; + sha256 = "1cw10lr7hrsr9xvq3wv1wkyk7jqsgfnnlkq4km9kxr39f51hv6na"; }; in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.10.0.1322"; + name = "rescuetime-2.14.2.1"; inherit src; buildInputs = [ dpkg makeWrapper ]; # avoid https://github.com/NixOS/patchelf/issues/99 @@ -29,7 +29,7 @@ in stdenv.mkDerivation { ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \ + --set-rpath "${lib.makeLibraryPath [ qt5.qtbase libXtst libXext libX11 libXScrnSaver ]}" \ $out/bin/rescuetime ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/rofi/config.patch b/nixpkgs/pkgs/applications/misc/rofi/config.patch deleted file mode 100644 index 46982d51e00c..000000000000 --- a/nixpkgs/pkgs/applications/misc/rofi/config.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector -index 0646e4bc..f827dbfe 100755 ---- a/script/rofi-theme-selector -+++ b/script/rofi-theme-selector -@@ -42,34 +42,7 @@ function find_themes() - DIRS=${XDG_DATA_DIRS} - OLDIFS=${IFS} - IFS=: -- if [ -z "${XDG_DATA_DIRS}" ] -- then -- echo "XDG_DATA_DIRS needs to be set for this script to function correctly." -- echo -n "Using dirs from \$PATH: " -- DIRS= -- # Iterate over items in $PATH -- for p in ${PATH}; do -- # Remove trailing / if exists. -- x=${p%/} -- # remove both /bin and /sbin and /games from end -- x=${x%/bin} -- x=${x%/sbin} -- x=${x%/games} -- # Add /share -- x=${x}/share -- # Check if entry exists Prepend : so :${x}: matches nicely -- case ":${DIRS}" in -- *$x:*);; -- *) DIRS+="$x:";; -- esac -- done -- # Remove trailing : -- DIRS=${DIRS%:} -- echo "${DIRS}" -- fi -- # Add user dir. -- DIRS+=":${HOME}/.local/share/" -- DIRS+=":${HOME}/.config/" -+ DIRS+=":%ROFIOUT%/" - for p in ${DIRS}; do - p=${p%/} - TD=${p}/rofi/themes -@@ -164,7 +137,12 @@ Current theme: <b>${CUR}</b>""" - ### - function set_theme() - { -- CDIR="${HOME}/.config/rofi/" -+ if [ -d "${XDG_CONFIG_HOME}" ]; then -+ CDIR="${XDG_CONFIG_HOME}/rofi/" -+ else -+ CDIR="${HOME}/.config/rofi/" -+ fi -+ - if [ ! -d "${CDIR}" ] - then - mkdir -p ${CDIR} diff --git a/nixpkgs/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix index 63b047976b3d..0edcde12e341 100644 --- a/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -4,28 +4,20 @@ }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.5.2"; name = "rofi-unwrapped-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679"; + sha256 = "1rczxz6l32vnclarzga1sm1d5iq9rfscb9j7f8ih185n59hf0517"; }; - # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781 - patches = [ ./config.patch ]; - preConfigure = '' patchShebangs "script" # root not present in build /etc/passwd sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - postFixup = '' - substituteInPlace "$out"/bin/rofi-theme-selector \ - --replace "%ROFIOUT%" "$out/share" - ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix index 0e59ef5512d8..2ae33a1eaa51 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix @@ -47,12 +47,12 @@ stdenv.mkDerivation (rec { configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2" - NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " + NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender -lpthread " '' # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically + stdenv.lib.optionalString perlSupport '' - mkdir -p $out/lib/perl5 - ln -s $out/{lib/urxvt,lib/perl5/site_perl} + mkdir -p $out/$(dirname ${perl.libPrefix}) + ln -s $out/lib/urxvt $out/${perl.libPrefix} ''; postInstall = '' diff --git a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index 54c2a68fd597..deb456e53ed9 100644 --- a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { name = "${pname}-${version}"; pname = "safeeyes"; - version = "2.0.6"; + version = "2.0.8"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "0s14pxicgq33srvhf6bvfq48wv3z4rlsmzkccz4ky9vh3gfx7zka"; + sha256 = "08acrf9sngjjmplszjxzfq3af9xg4xscga94q0lkck2l1kqckc2l"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 670e2be47164..72a1465a2c83 100644 --- a/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils -, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }: +, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }: let - version = "0.6.5"; + version = "0.6.7"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,16 +17,16 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "18d0dwrsn69fx1lwm6ihhk2r4996pxiy4hfv608gc1kl4s4f4sqp"; + sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ]; - buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ]; + buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ]; postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/sigal/default.nix b/nixpkgs/pkgs/applications/misc/sigal/default.nix index e57e9394c105..a10b58d00b61 100644 --- a/nixpkgs/pkgs/applications/misc/sigal/default.nix +++ b/nixpkgs/pkgs/applications/misc/sigal/default.nix @@ -1,16 +1,16 @@ -{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: +{ lib, python3Packages, ffmpeg }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "1.4.1"; pname = "sigal"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit version pname; sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61"; }; - buildInputs = with pythonPackages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ pytest ]; + propagatedBuildInputs = with python3Packages; [ jinja2 markdown pillow @@ -32,4 +32,3 @@ buildPythonApplication rec { maintainers = with maintainers; [ domenkozar ]; }; } - diff --git a/nixpkgs/pkgs/applications/misc/slic3r/default.nix b/nixpkgs/pkgs/applications/misc/slic3r/default.nix index 7b28462d5527..e012c3763b34 100644 --- a/nixpkgs/pkgs/applications/misc/slic3r/default.nix +++ b/nixpkgs/pkgs/applications/misc/slic3r/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; - buildInputs = - [boost] ++ + buildInputs = + [boost] ++ (with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp threads + EncodeLocale MathClipper ExtUtilsXSpp MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP diff --git a/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix b/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix index 251ee4d918b4..ddf8cf18fc71 100644 --- a/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl, gtest, nlopt, pcre, xorg }: + glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { Moo NetDBus OpenGL - threads XMLSAX ]); @@ -113,6 +112,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/var cp -r ../resources/icons/* $out/bin/var/ cp -r ../resources $out/bin/ + + + mkdir -p "$out/share/pixmaps/" + ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; src = fetchFromGitHub { @@ -122,6 +127,16 @@ stdenv.mkDerivation rec { rev = "version_${version}"; }; + desktopItem = makeDesktopItem { + name = "slic3r-Prusa-Edition"; + exec = "slic3r-prusa3d"; + icon = "slic3r-prusa"; + comment = "G-code generator for 3D printers"; + desktopName = "Slic3r Prusa Edition"; + genericName = "3D printer tool"; + categories = "Application;Development;"; + }; + meta = with stdenv.lib; { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; diff --git a/nixpkgs/pkgs/applications/misc/soapysdr/default.nix b/nixpkgs/pkgs/applications/misc/soapysdr/default.nix index f14b560bf52c..6754e8f2a55c 100644 --- a/nixpkgs/pkgs/applications/misc/soapysdr/default.nix +++ b/nixpkgs/pkgs/applications/misc/soapysdr/default.nix @@ -6,7 +6,11 @@ } : let - version = "0.7.0"; + + version = "0.7.1"; + modulesVersion = with lib; versions.major version + "." + versions.minor version; + modulesPath = "lib/SoapySDR/modules" + modulesVersion; + extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; in stdenv.mkDerivation { name = "soapysdr-${version}"; @@ -15,11 +19,11 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13"; + sha256 = "1rbnd3w12kzsh94fiywyn4vch7h0kf75m88fi6nq992b3vnmiwvl"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + buildInputs = [ libusb ncurses numpy python swig2 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -31,11 +35,9 @@ in stdenv.mkDerivation { for i in ${toString extraPackages}; do ${lndir}/bin/lndir -silent $i $out done - # Needed for at least the remote plugin server for file in $out/bin/*; do - wrapProgram "$file" \ - --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} + wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${extraPackagesSearchPath} done ''; @@ -47,4 +49,3 @@ in stdenv.mkDerivation { platforms = platforms.linux; }; } - diff --git a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index 3c56a6a046fb..825b52cda7f8 100644 --- a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, makeDesktopItem, jdk, jre, ant , gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: let @@ -74,16 +74,15 @@ let in rec { application = mkSweetHome3D rec { - version = "5.4"; + version = "6.0"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "09sk4svmaiw8dabcya3407iq5yjwxbss8pik1rzalrlds2428vyw"; - module = module; - tag = "V_" + d2u version; + src = fetchsvn { + url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; + sha256 = "1l4kc1c2iwkggmcdb2wksb4vrh97ll804vc51yawhdlq9g567ky9"; + rev = "6647"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/nixpkgs/pkgs/applications/misc/synergy/default.nix b/nixpkgs/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfcd..25855c2a6130 100644 --- a/nixpkgs/pkgs/applications/misc/synergy/default.nix +++ b/nixpkgs/pkgs/applications/misc/synergy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper -, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver, cf-private , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl openssl ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ApplicationServices Carbon Cocoa CoreServices ScreenSaver cf-private ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/tangogps/default.nix b/nixpkgs/pkgs/applications/misc/tangogps/default.nix index bde30d9041ae..08bea18d8e9a 100644 --- a/nixpkgs/pkgs/applications/misc/tangogps/default.nix +++ b/nixpkgs/pkgs/applications/misc/tangogps/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ]; + NIX_LDFLAGS = [ "-lm" ]; # bogus includes fail with newer library version postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/tdrop/default.nix b/nixpkgs/pkgs/applications/misc/tdrop/default.nix new file mode 100644 index 000000000000..15ee275c0e19 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/tdrop/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper +, xwininfo, xdotool, xprop }: + +stdenv.mkDerivation rec { + pname = "tdrop"; + version = "unstable-2018-11-13"; + + src = fetchFromGitHub { + owner = "noctuid"; + repo = "tdrop"; + rev = "198795c0d2573a31979330d6a2ae946eb81deebf"; + sha256 = "1fhibqgmls64mylcb6q46ipmg1q6pvaqm26vz933gqav6cqsbdzs"; + }; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/tdrop \ + --prefix PATH : ${lib.makeBinPath [ xwininfo xdotool xprop ]} + ''; + + nativeBuildInputs = [ makeWrapper ]; + + meta = with stdenv.lib; { + description = "A Glorified WM-Independent Dropdown Creator"; + homepage = https://github.com/noctuid/tdrop; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ wedens ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/terminator/default.nix b/nixpkgs/pkgs/applications/misc/terminator/default.nix index f32a27b9b78d..4a6ad4e5ea38 100644 --- a/nixpkgs/pkgs/applications/misc/terminator/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection -, libnotify, wrapGAppsHook, gnome3 +, libnotify, wrapGAppsHook, vte }: python2.pkgs.buildPythonApplication rec { @@ -12,7 +12,7 @@ python2.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + buildInputs = [ gtk3 vte libnotify keybinder3 ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/termite/default.nix b/nixpkgs/pkgs/applications/misc/termite/default.nix index 957b5bc0e8d5..22f669f03294 100644 --- a/nixpkgs/pkgs/applications/misc/termite/default.nix +++ b/nixpkgs/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte gtk3 ncurses ]; + buildInputs = [ vte-ng gtk3 ncurses ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/tilix/default.nix b/nixpkgs/pkgs/applications/misc/tilix/default.nix index eb7a8e41d4b0..ab6ef3294700 100644 --- a/nixpkgs/pkgs/applications/misc/tilix/default.nix +++ b/nixpkgs/pkgs/applications/misc/tilix/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus , gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret -, perlPackages, wrapGAppsHook, xdg_utils }: +, glib, perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { - name = "tilix-${version}"; - version = "1.8.5"; + pname = "tilix"; + version = "1.8.9"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; - sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7"; + rev = version; + sha256 = "1l1ib3g01mxiywbwjxc2522qgjy3ymjzy8bxl42k0hprpp95rw9d"; }; nativeBuildInputs = [ @@ -25,22 +25,20 @@ stdenv.mkDerivation rec { ) ''; - postInstall = with gnome3; '' + postInstall = '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - - wrapProgram $out/bin/tilix \ - --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; - preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH ":" "${libsecret}/lib") + substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop ''; meta = with stdenv.lib; { - description = "Tiling terminal emulator following the Gnome Human Interface Guidelines."; + description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = https://gnunn1.github.io/tilix-web; license = licenses.mpl20; maintainers = with maintainers; [ midchildan ]; diff --git a/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix index bc36ffa5e101..b268bdd0962e 100644 --- a/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco -, qtbase, qtwebkit, qtx11extras, sqlite }: +, qtbase, qtwebengine, qtx11extras, sqlite }: let name = "toggldesktop-${version}"; @@ -39,15 +39,15 @@ let qt-oauth-lib = stdenv.mkDerivation rec { name = "qt-oauth-lib-${version}"; - version = "20180521.233208"; + version = "20190125.190943"; src = fetchzip { url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; - sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebkit ]; + buildInputs = [ qtbase qtwebengine ]; }; poco-pc = writeText "poco.pc" '' @@ -100,7 +100,7 @@ let libtoggl qxtglobalshortcut qtbase - qtwebkit + qtwebengine qt-oauth-lib qtx11extras libX11 diff --git a/nixpkgs/pkgs/applications/misc/toot/default.nix b/nixpkgs/pkgs/applications/misc/toot/default.nix index cb3146d4c0dd..c6ee75088902 100644 --- a/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.19.0"; + version = "0.20.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "1z0r6yqi522d5jbpd0w3prd33l067jb1jhfnxf6hkzhnx1wddjsa"; + sha256 = "0s5i6fjip5kvvyb59yndi2rhgn962lr0g9b0pi5w2aqnv1mwjbfh"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/nixpkgs/pkgs/applications/misc/translate-shell/default.nix b/nixpkgs/pkgs/applications/misc/translate-shell/default.nix index 15c4b8185a22..5d50238a9f00 100644 --- a/nixpkgs/pkgs/applications/misc/translate-shell/default.nix +++ b/nixpkgs/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.8"; + version = "0.9.6.9"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8"; + sha256 = "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/urh/default.nix b/nixpkgs/pkgs/applications/misc/urh/default.nix index 4dc8d5cfa3e7..8f490c971c71 100644 --- a/nixpkgs/pkgs/applications/misc/urh/default.nix +++ b/nixpkgs/pkgs/applications/misc/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.5.1"; + version = "2.5.5"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "01n4swm2q2i10qvhfw1q04wxf48xwqlddfg7842ff98i2d9yxy13"; + sha256 = "14aw8bvqb32976qmm124i5sv99nwv1jvs1r9ylbsmlg31dvla7ql"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/nixpkgs/pkgs/applications/misc/urlscan/default.nix index a82d7792cabd..43861d9f60a6 100644 --- a/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "0np7w38wzs72kxap9fsdliafqs0xfqnfj01i7b0fh7k235bgrapz"; + sha256 = "16cc1vvvhylrl9208d253k11rqzi95mg7hrf7xbd0bqxvd6rmxar"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index 20e3c3daccb0..5ebc98b57123 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { name = "${pname}-${version}"; pname = "visidata"; - version = "1.5"; + version = "1.5.2"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "0schpfksxddbsv0s54pv1jrf151nw9kr51m41fp0ycnw7z2jqirm"; + sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0"; }; propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools diff --git a/nixpkgs/pkgs/applications/misc/wsjtx/default.nix b/nixpkgs/pkgs/applications/misc/wsjtx/default.nix index fd6be8f59201..930515b93825 100644 --- a/nixpkgs/pkgs/applications/misc/wsjtx/default.nix +++ b/nixpkgs/pkgs/applications/misc/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "wsjtx-${version}"; - version = "1.9.1"; + version = "2.0.0"; - # This is a composite source tarball containing both wsjtx and a hamlib fork + # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { - url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz"; - sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc"; + url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; + sha256 = "66434f69f256742da1fe057ec51e4464cab2614f0bfb1a310c04a385b77bd014"; }; # Hamlib builds with autotools, wsjtx builds with cmake @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; - # Composite build has its own patch step after it extracts the inner archives + # Remove Git dependency from superbuild since sources are included + patches = [ ./super.patch ]; + + # Superbuild has its own patch step after it extracts the inner archives postPatch = "cp ${./wsjtx.patch} wsjtx.patch"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/wsjtx/super.patch b/nixpkgs/pkgs/applications/misc/wsjtx/super.patch new file mode 100644 index 000000000000..d903171ffc5a --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/wsjtx/super.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3bf97a4..2c9dce5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,6 @@ source tarball." ) + # + # Find_library (USB_LIBRARY NAMES libusb.a usb) + Find_program (PATCH_EXECUTABLE patch REQUIRED) +-Find_package (Git REQUIRED) + + # + # extra C flags to minimize hamlib excutable sizes diff --git a/nixpkgs/pkgs/applications/misc/wsjtx/wsjtx.patch b/nixpkgs/pkgs/applications/misc/wsjtx/wsjtx.patch index a5bd7ec3e196..e92b420e58a4 100644 --- a/nixpkgs/pkgs/applications/misc/wsjtx/wsjtx.patch +++ b/nixpkgs/pkgs/applications/misc/wsjtx/wsjtx.patch @@ -1,11 +1,11 @@ -Index: wsjtx/CMakeLists.txt -=================================================================== ---- wsjtx/CMakeLists.txt (revision 8382) -+++ wsjtx/CMakeLists.txt (working copy) -@@ -866,6 +866,7 @@ - find_package (Qt5Widgets 5 REQUIRED) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e7e816b..e7dbb14a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED) find_package (Qt5Multimedia 5 REQUIRED) find_package (Qt5PrintSupport 5 REQUIRED) + find_package (Qt5Sql 5 REQUIRED) +find_package (Qt5SerialPort 5 REQUIRED) if (WIN32) diff --git a/nixpkgs/pkgs/applications/misc/xastir/default.nix b/nixpkgs/pkgs/applications/misc/xastir/default.nix index c677f7371fca..969661ea7b4e 100644 --- a/nixpkgs/pkgs/applications/misc/xastir/default.nix +++ b/nixpkgs/pkgs/applications/misc/xastir/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "xastir-${version}"; - version = "208"; + pname = "xastir"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "Xastir"; - repo = "Xastir"; - rev = "707f3aa8c7ca3e3fecd32d5a4af3f742437e5dce"; - sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl"; + owner = pname; + repo = pname; + rev = "Release-${version}"; + sha256 = "16zsgy3589snawr8f1fa22ymvpnjy6njvxmsck7q8p2xmmz2ry7r"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index 045354da3d60..bf3d9b737a9e 100644 --- a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { mkdir .bin ln -s ${qt4}/bin/moc .bin/moc-qt4 addToSearchPath PATH .bin + sed -i -e "s@LD=\$_cc@LD=\$_cxx@" configure ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/xkbd/default.nix b/nixpkgs/pkgs/applications/misc/xkbd/default.nix index ccbb88bd1a8e..3023e830dc79 100644 --- a/nixpkgs/pkgs/applications/misc/xkbd/default.nix +++ b/nixpkgs/pkgs/applications/misc/xkbd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto -, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook +{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xorgproto +, xinput, libXi, libXext, libXtst, libXpm, libX11, autoreconfHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libXrender libXft libXext libXtst libXpm libX11 - libXi xextproto xinput xproto + libXi xorgproto xinput ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/misc/xkbmon/default.nix b/nixpkgs/pkgs/applications/misc/xkbmon/default.nix index 38bda9a8f560..4fa1c833df53 100644 --- a/nixpkgs/pkgs/applications/misc/xkbmon/default.nix +++ b/nixpkgs/pkgs/applications/misc/xkbmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xkbmon-${version}"; - version = "0.1"; + version = "0.3"; src = fetchFromGitHub { owner = "xkbmon"; repo = "xkbmon"; rev = version; - sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67"; + sha256 = "03v8f6fijgwagjphyj8w7lgh5hlc8jk0j2n45n7fm0xwy82cxxx9"; }; buildInputs = [ libX11 ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/xkbmon/xkbmon; description = "Command-line keyboard layout monitor for X11"; - license = licenses.gpl3; + license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/applications/misc/xlog/default.nix b/nixpkgs/pkgs/applications/misc/xlog/default.nix index c0b0ef63369f..7b9cf0a4ee55 100644 --- a/nixpkgs/pkgs/applications/misc/xlog/default.nix +++ b/nixpkgs/pkgs/applications/misc/xlog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: stdenv.mkDerivation rec { - name = "xlog-${version}"; - version = "2.0.15"; - + pname = "xlog"; + version = "2.0.17"; + src = fetchurl { - url = "https://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; - sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; + url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; + sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; }; buildInputs = [ glib pkgconfig gtk2 hamlib ]; @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, location in latitude and longitude and distance and heading in kilometers or miles, - both for short and long path. + both for short and long path. ''; homepage = https://www.nongnu.org/xlog; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; }; - } diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index c13f8ed4f400..c8ff2d479a06 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.8.3"; + version = "2.10.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "144i24c707fja89iqcc511b4077p53q8w2cq5zd26hry2i4i3abi"; + sha256 = "10nqwxj8j2ciw2h178g2z5lrzv48xsi2a4v6s0ha93hfbjzvag5a"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/xpad/default.nix b/nixpkgs/pkgs/applications/misc/xpad/default.nix index f066876f5730..5db4a2508399 100644 --- a/nixpkgs/pkgs/applications/misc/xpad/default.nix +++ b/nixpkgs/pkgs/applications/misc/xpad/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "xpad-${version}"; - version = "5.2.0"; + version = "5.4.0"; src = fetchurl { url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "1ab33vg3fz57lz19jjwa3vp3vnln4pnh60hwlkq59la53s8lyijk"; + sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/misc/xterm/default.nix b/nixpkgs/pkgs/applications/misc/xterm/default.nix index 3a3025e7d692..ee267c1ec7cc 100644 --- a/nixpkgs/pkgs/applications/misc/xterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/xterm/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "xterm-339"; + name = "xterm-342"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1kigkl4va1jxycqcf5dkg4d74j1fgrxhfbp8ib367crn6fqnprk5"; + sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0"; }; buildInputs = - [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE + [ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/yarssr/default.nix b/nixpkgs/pkgs/applications/misc/yarssr/default.nix index a8ff981400a9..a47fb93512db 100644 --- a/nixpkgs/pkgs/applications/misc/yarssr/default.nix +++ b/nixpkgs/pkgs/applications/misc/yarssr/default.nix @@ -1,8 +1,4 @@ -{ -fetchFromGitHub, stdenv, lib, -makeWrapper, pkgs, -perl, perlPackages, -gnome2 }: +{ fetchFromGitHub, stdenv, lib, gettext, gtk2, makeWrapper, perlPackages, gnome2 }: let perlDeps = with perlPackages; [ @@ -24,7 +20,7 @@ let ]; libs = [ stdenv.cc.cc.lib - pkgs.gtk2 + gtk2 ]; in stdenv.mkDerivation rec { @@ -38,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; }; - nativeBuildInputs = [ perl pkgs.gettext makeWrapper ]; + nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; buildInputs = perlDeps ++ [gnome2.libglade]; propagatedBuildInputs = libs ++ perlDeps; @@ -55,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/yarssr \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ - --set PERL5LIB "${lib.makePerlPath perlDeps}" + --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index 8843c821ffb4..d1fa28318d00 100644 --- a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,41 +1,56 @@ -{ stdenv, fetchurl, python27Packages, pcsclite, yubikey-personalization }: +{ stdenv, fetchurl, fetchFromGitHub +, qmake, qtbase, qtquickcontrols, qtsvg +, python3, pyotherside, ncurses +, pcsclite, yubikey-personalization +, yubikey-manager, makeWrapper }: -python27Packages.buildPythonApplication rec { - namePrefix = ""; - name = "yubioath-desktop-${version}"; - version = "3.1.0"; +stdenv.mkDerivation rec { + pname = "yubioath-desktop"; + version = "4.3.4"; - src = fetchurl { - url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw"; - }; + src = fetchurl { + url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; + sha256 = "0hb7j71032sigs8zd5r8yr0m59sjkb24vhs2l4jarpvj8q7hv30d"; + }; - doCheck = false; + doCheck = false; - buildInputs = [ stdenv ]; + buildInputs = [ stdenv qtbase qtquickcontrols pyotherside python3 ]; - propagatedBuildInputs = [ python27Packages.pycrypto python27Packages.click python27Packages.pyscard python27Packages.pyside ]; + nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; - # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary - # support that the yubicommon library uses to load libykpers - makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + postPatch = '' + substituteInPlace deployment.pri \ + --replace '/usr/bin' "$out/bin" + ''; + + pythonPath = [ yubikey-manager ]; + + # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary + # support that the yubicommon library uses to load libykpers + + postInstall = '' + buildPythonPath "$out $pythonPath" + wrapProgram $out/bin/yubioath-desktop \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" - postInstall = '' mkdir -p $out/share/applications - cp resources/yubioath.desktop $out/share/applications/yubioath.desktop + cp resources/yubioath-desktop.desktop \ + $out/share/applications/yubioath-desktop.desktop mkdir -p $out/share/yubioath/icons - cp resources/yubioath*.{icns,ico,png,xpm} $out/share/yubioath/icons - substituteInPlace $out/share/applications/yubioath.desktop \ - --replace 'Exec=yubioath-gui' "Exec=$out/bin/yubioath-gui" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons" - - ''; + cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons + substituteInPlace $out/share/applications/yubioath-desktop.desktop \ + --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ + ''; - meta = { - description = "Yubikey Desktop Authenticator"; + meta = with stdenv.lib; { + description = "Yubikey Desktop Authenticator"; - homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/; + homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/; - license = stdenv.lib.licenses.gpl3; - }; + license = stdenv.lib.licenses.gpl3; + maintainers = with maintainers; [ mic92 ]; + }; } |