diff options
Diffstat (limited to 'pkgs/applications/misc')
38 files changed, 383 insertions, 66 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 4544ed1fba3b..34e46e9fa0f0 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -51,14 +51,14 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2018-08-30"; + version = "0.2.0"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0izvg7dwwb763jc6gnmn47i5zrkxvmh3vssn6vzrrmqhd4j3msmf"; + sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn"; fetchSubmodules = true; }; @@ -119,5 +119,6 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 8a26631d5c0d..051e2c010a81 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180815"; + version = "20180906"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv"; + sha256 = "00cq15892p46z1j1fl2pd17y7k4rc6cfz7gaxb446mshxrvbfgam"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 66a423238b34..8105f4d61bd8 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec { # plugins keepkey trezor + btchip ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 95754579c487..537627a10d2d 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -41,10 +41,10 @@ python3Packages.buildPythonApplication rec { # plugins keepkey trezor + btchip # TODO plugins # amodem - # btchip ]; preBuild = '' diff --git a/pkgs/applications/misc/fllog/default.nix b/pkgs/applications/misc/fllog/default.nix new file mode 100644 index 000000000000..348b1155e41e --- /dev/null +++ b/pkgs/applications/misc/fllog/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, fltk13 +, libjpeg +, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "1.2.5"; + pname = "fllog"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + sha256 = "042j1g035338vfbl4i9laai8af8iakavar05xn2m4p7ww6x76zzl"; + }; + + buildInputs = [ + fltk13 + libjpeg + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + meta = { + description = "Digital modem log program"; + homepage = https://sourceforge.net/projects/fldigi/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ dysinger ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/flmsg/default.nix b/pkgs/applications/misc/flmsg/default.nix new file mode 100644 index 000000000000..afdf0f91a910 --- /dev/null +++ b/pkgs/applications/misc/flmsg/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, fltk13 +, libjpeg +, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "4.0.7"; + pname = "flmsg"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + sha256 = "1kdlwhxsw02pas9d0kakkq2713wj1m4q881f6am5aq4x8n01f4xw"; + }; + + buildInputs = [ + fltk13 + libjpeg + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + meta = { + description = "Digital modem message program"; + homepage = https://sourceforge.net/projects/fldigi/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ dysinger ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix new file mode 100644 index 000000000000..baee3010d696 --- /dev/null +++ b/pkgs/applications/misc/flrig/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, fltk13 +, libjpeg +, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "1.3.40"; + pname = "flrig"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + sha256 = "1wr7bb2577gha7y3a8m5w60m4xdv8m0199cj2c6349sgbds373w9"; + }; + + buildInputs = [ + fltk13 + libjpeg + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + meta = { + description = "Digital modem rig control program"; + homepage = https://sourceforge.net/projects/fldigi/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ dysinger ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/flwrap/default.nix b/pkgs/applications/misc/flwrap/default.nix new file mode 100644 index 000000000000..b96f3c2b3278 --- /dev/null +++ b/pkgs/applications/misc/flwrap/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, fltk13 +, libjpeg +, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "1.3.5"; + pname = "flwrap"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg"; + }; + + buildInputs = [ + fltk13 + libjpeg + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + meta = { + description = "Digital modem file transfer program"; + homepage = https://sourceforge.net/projects/fldigi/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ dysinger ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 6a7a7ae604de..25ea9ef06b84 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -33,14 +33,14 @@ let }; in with py.pkgs; buildPythonApplication rec { - version = "3.4.0"; + version = "4.0.0a4"; name = "gcalcli-${version}"; src = fetchFromGitHub { owner = "insanum"; repo = "gcalcli"; rev = "v${version}"; - sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; + sha256 = "00giq5cdigidzv5bz4wgzi1yp6xlf2rdcy6ynmsc6bcf0cl5x64d"; }; propagatedBuildInputs = [ @@ -55,7 +55,7 @@ in with py.pkgs; buildPythonApplication rec { "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" ''; - # There are no tests as of 3.4.0 + # There are no tests as of 4.0.0a4 doCheck = false; meta = with lib; { diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index dc70747784cf..0dfeac3cf8b2 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; - sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp"; + sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index f99344b83d64..0f7a89b3c525 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq"; }; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 0224d5fd68c7..a7c00cceaa72 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.13.3"; + version = "3.7.13.4"; src = fetchFromGitHub { owner = "gnuradio"; repo = "gnuradio"; rev = "v${version}"; - sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib"; + sha256 = "0ybfn2zfr9lc1bi3c794l4bzpj8y6vas9c4rbcj4nqlx0zf3p8fn"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index eecc34b3d94f..01447281fe76 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,8 +1,19 @@ { stdenv, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity -, yacc, flex, zlib, qmake, makeWrapper +, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: -stdenv.mkDerivation rec { + +let + desktopItem = makeDesktopItem { + name = "goldencheetah"; + exec = "GoldenCheetah"; + icon = "goldencheetah"; + desktopName = "GoldenCheetah"; + genericName = "GoldenCheetah"; + comment = "Performance software for cyclists, runners and triathletes"; + categories = "Application;Utility;"; + }; +in stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; version = "3.4"; src = fetchurl { @@ -27,6 +38,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp src/GoldenCheetah $out/bin wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" + install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ + install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png runHook postInstall ''; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index f63ffa091a07..977bd5e50ddd 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -11,22 +11,22 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gollum (4.1.3) + gollum (4.1.4) gemojione (~> 3.2) - gollum-lib (>= 4.2.9) + gollum-lib (~> 4.2, >= 4.2.10) kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) useragent (~> 0.16.2) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.2.9) + gollum-lib (4.2.10) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (>= 1.6.1, < 2.0) rouge (~> 2.1) - sanitize (~> 2.1) + sanitize (~> 2.1.1, >= 2.1.1) stringex (~> 2.6) twitter-text (= 1.14.7) json (2.1.0) @@ -43,7 +43,7 @@ GEM rack-protection (1.5.5) rack rouge (2.2.1) - sanitize (2.1.0) + sanitize (2.1.1) nokogiri (>= 1.4.4) sinatra (1.4.8) rack (~> 1.5) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 1b3cda168ac2..3413b6ba6310 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -45,10 +45,10 @@ dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6"; + sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.4"; }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; @@ -63,10 +63,10 @@ dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj"; + sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.10"; }; json = { source = { @@ -163,10 +163,10 @@ dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index ca6ccdcdb2ae..45b4ad88cff3 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.6"; + version = "3.7"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6"; + sha256 = "0dxg849ckyy181zlrb57hd959cgvx105c35ksmvi4wl285sh5kpj"; }; propagatedBuildInputs = [ python ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 33ffb6b5acb3..2f61ba683f3f 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "5.17"; + version = "5.18"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0fr835glvwnpq6sy181z0gskvwfrmvh7115r3d92xy71v8b1l5ib"; + sha256 = "0dl10fr881b8fwf2yj14bd6gagb8hm0s46q18y2y56rw98nk4vrq"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 58fcd59a2b2f..b5fa9143ddbb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; }; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 53b965a1bb70..b954d2d3cdb8 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.39.1"; + version = "2.40"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00"; + sha256 = "1gldl74wz2lvsci6rn71d6q1zmnhr52z6fjib9nsragsazq5byz9"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 3c5184d54632..8ec4e7f06d16 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -40,6 +40,10 @@ in with python.pkgs; buildPythonApplication rec { unidecode ]; + postInstall = '' + install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard + ''; + # Fails; but there are no tests anyway. doCheck = false; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 70b580cd0f8a..4febac10806f 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.12.0"; + version = "0.12.3"; name = "kitty-${version}"; format = "other"; @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm"; + sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c"; }; buildInputs = [ @@ -33,8 +33,8 @@ buildPythonApplication rec { --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'" substituteInPlace docs/Makefile \ - --replace 'python3 .. +launch $(shell which sphinx-build)' \ - 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)' + --replace 'python3 .. +launch :sphinx-build' \ + 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere sphinx-build' ''; buildPhase = '' diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index b16507c8b7bd..314f8bcece10 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -2,14 +2,14 @@ , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: -let version = "0.3.1"; in +let version = "0.3.2"; in stdenv.mkDerivation rec { name = "lxterminal-${version}"; src = fetchurl { url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; - sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c"; + sha256 = "1iafqmccsm3nnzwp6pb2c04iniqqnscj83bq1rvf58ppzk0bvih3"; }; configureFlags = [ diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch new file mode 100644 index 000000000000..80b9ebf4d571 --- /dev/null +++ b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch @@ -0,0 +1,43 @@ +From 81cf57e4653360af7f1718391e424fa05d8ea000 Mon Sep 17 00:00:00 2001 +From: Keshav Kini <keshav.kini@gmail.com> +Date: Thu, 9 Aug 2018 18:36:15 -0700 +Subject: [PATCH] Use `rm` from PATH + +On NixOS (a Linux distribution), there is no `/bin/rm`, but an `rm` +command will generally be available in one's path when running shell +scripts. Here, I change a couple of invocations of `/bin/rm` into +invocations of `rm` to deal with this issue. + +Since `rm` is already called elsewhere in the script without an +absolute path, I assume this change will not cause any +regressions. Still, I've tested this on a CentOS machine and a NixOS +machine, though not other platforms. +--- + makeself-header.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/makeself-header.sh b/makeself-header.sh +index 4d2c005..2babf34 100755 +--- a/makeself-header.sh ++++ b/makeself-header.sh +@@ -515,7 +515,7 @@ if test x"\$quiet" = xn; then + fi + res=3 + if test x"\$keep" = xn; then +- trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 ++ trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 + fi + + if test x"\$nodiskspace" = xn; then +@@ -581,7 +581,7 @@ if test x"\$script" != x; then + fi + if test x"\$keep" = xn; then + cd "\$TMPROOT" +- /bin/rm -rf "\$tmpdir" ++ rm -rf "\$tmpdir" + fi + eval \$finish; exit \$res + EOF +-- +2.14.1 + diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index a9ec2760e8ad..a6af1762e289 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; }; - patchPhase = '' + # backported from https://github.com/megastep/makeself/commit/77156e28ff21231c400423facc7049d9c60fd1bd + patches = [ ./Use-rm-from-PATH.patch ]; + + postPatch = '' sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh ''; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 3ff07ba20084..185cd82435b2 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "18.08"; + version = "18.08.1"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; + sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix new file mode 100644 index 000000000000..56854e7863fe --- /dev/null +++ b/pkgs/applications/misc/menumaker/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "menumaker-${version}"; + version = "0.99.10"; + + src = fetchurl { + url = "mirror://sourceforge/menumaker/${name}.tar.gz"; + sha256 = "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky"; + }; + + format = "other"; + + meta = with stdenv.lib; { + description = "Heuristics-driven menu generator for several window managers"; + homepage = http://menumaker.sourceforge.net; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix new file mode 100644 index 000000000000..21a5ab0cd0f6 --- /dev/null +++ b/pkgs/applications/misc/neap/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +stdenv.mkDerivation rec { + name = "neap-${version}"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "vzxwco"; + repo = "neap"; + rev = "v${version}"; + sha256 = "04da8rq23rl1qcvrdm5m3l90xbwyli7x601sckv7hmkip2q3g1kz"; + }; + + nativeBuildInputs = [ + python2Packages.wrapPython + ]; + + buildInputs = [ + python2Packages.python + ]; + + pythonPath = [ + python2Packages.xlib + python2Packages.pygtk + ]; + + installPhase = '' + install -D -t $out/bin neap + install -D -t $out/share/man/man1 neap.1 + install -D -t $out/share/applications neap.desktop + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Systray workspace pager"; + homepage = https://github.com/vzxwco/neap; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index f25180505e87..882bb75219d6 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "netsurf-buildsystem-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; - sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x"; + sha256 = "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw"; }; makeFlags = [ diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 199fa3e9bfe9..0dfc4b2bc58e 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, fetchurl, buildPythonApplication +{ stdenv, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook, gobjectIntrospection , intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll @@ -7,7 +7,6 @@ , speechd, brltty, setproctitle, gst_all_1, gst-python }: -with lib; let pname = "orca"; version = "3.28.2"; @@ -17,7 +16,7 @@ in buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q"; }; @@ -54,7 +53,7 @@ in buildPythonApplication rec { }; }; - meta = { + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Orca; description = "Screen reader"; longDescription = '' diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch new file mode 100644 index 000000000000..b33a3e174bc4 --- /dev/null +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch @@ -0,0 +1,20 @@ +diff -Naur org.kde.plasma.volumewin7mixer/CMakeLists.txt org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt +--- org.kde.plasma.volumewin7mixer/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt 2016-04-19 11:23:35.137866949 +0200 +@@ -0,0 +1,15 @@ ++# Set minimum CMake version (required for CMake 3.0 or later) ++cmake_minimum_required(VERSION 2.8.12) ++ ++# Use Extra CMake Modules (ECM) for common functionality. ++# See http://api.kde.org/ecm/manual/ecm.7.html ++# and http://api.kde.org/ecm/manual/ecm-kde-modules.7.html ++find_package(ECM REQUIRED NO_MODULE) ++# Needed by find_package(KF5Plasma) below. ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}) ++ ++# Locate plasma_install_package macro. ++find_package(KF5Plasma REQUIRED) ++ ++# Add installatation target ("make install"). ++plasma_install_package(package org.kde.plasma.volumewin7mixer) + diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix new file mode 100644 index 000000000000..6c23d160f47c --- /dev/null +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "plasma-applet-volumewin7mixer-${version}"; + version = "23"; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "plasma-applet-volumewin7mixer"; + rev = "v${version}"; + sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc"; + }; + + patches = [ ./cmake.patch ]; + postPatch = '' rm build ''; + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; + + meta = with stdenv.lib; { + description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)."; + homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mdevlamynck ]; + }; +} diff --git a/pkgs/applications/misc/qradiolink/default.nix b/pkgs/applications/misc/qradiolink/default.nix index 4029bd80b88b..63906d996ba6 100644 --- a/pkgs/applications/misc/qradiolink/default.nix +++ b/pkgs/applications/misc/qradiolink/default.nix @@ -47,6 +47,8 @@ in stdenv.mkDerivation { qwt ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "SDR transceiver application for analog and digital modes"; homepage = http://qradiolink.org/; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 6d883d89de31..5417a135dda4 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, file, less +{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; @@ -24,6 +24,11 @@ python3Packages.buildPythonApplication rec { ''; preConfigure = '' + ${lib.optionalString (highlight != null) '' + sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ + ranger/data/scope.sh + ''} + substituteInPlace ranger/data/scope.sh \ --replace "/bin/echo" "echo" @@ -36,7 +41,7 @@ python3Packages.buildPythonApplication rec { # give file previews out of the box substituteInPlace ranger/config/rc.conf \ - --replace "set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" + --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" '' + optionalString imagePreviewSupport '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m @@ -46,7 +51,7 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = http://ranger.github.io/; license = licenses.gpl3; diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index bedfc563b1c0..ef9f9d09ac26 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rtl-sdr-${version}"; - version = "0.5.4"; + version = "0.6.0"; src = fetchgit { url = "git://git.osmocom.org/rtl-sdr.git"; - rev = "refs/tags/v${version}"; - sha256 = "0c56a9dhlqgs6y15ns0mn4r5giz0x6y7x151jcq755f711pc3y01"; + rev = "refs/tags/${version}"; + sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index efaf986a9e54..f8340b1bd227 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext -, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}: +{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses +, libXft, conf ? null, patches ? [], extraLibs ? []}: with stdenv.lib; @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; + nativeBuildInputs = [ pkgconfig ncurses ]; + buildInputs = [ libX11 libXft ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out - wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin" ''; meta = { diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index f6286bfece3d..483fb9cf95a0 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: stdenv.mkDerivation rec { - name = "stupidterm-2018-03-10"; + name = "stupidterm-2018-09-25"; nativeBuildInputs = [ pkgconfig ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esmil"; repo = "stupidterm"; - rev = "0463519a96c9e4f9ce9fdc99d8e776499346ccba"; - sha256 = "1vbk53xyjn33myb3fix6y7sxb1x3rndrkk5l9qa60qaw2ivkr965"; + rev = "d1bc020797330df83d427e361d3620e346a4e792"; + sha256 = "1yh2vhq3d0qbh0dh2h9yc7s9gkffgkb987vvwz2bdnvlskrjmmdj"; }; makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 6e92e98481ea..4a16793b1c65 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.20"; + version = "1.10.21"; src = let in fetchFromGitHub { - sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"; + sha256 = "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"; rev = with stdenv.lib; "v" + concatStringsSep "_" (splitString "." version); repo = "workrave"; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 292e4e5ba38b..4306c4fe9559 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-335"; + name = "xterm-337"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0"; + sha256 = "19ygmswikbwa633bxf24cvk7qdxjz2nq3cv9zdgqvrs7sgg7gb6c"; }; buildInputs = |