diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
commit | 7319013ea14f94cb360c7bef9e403de7f1db83b0 (patch) | |
tree | cb6d4763cee2cc982648762c019b3b77b9ba18b2 /pkgs/applications/misc | |
parent | ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd (diff) | |
parent | 35378f014161c1d794dc89b6969275396cb601de (diff) | |
download | nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.gz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.bz2 nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.lz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.xz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.zst nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/misc/glava/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/misc/notejot/default.nix | 47 | ||||
-rw-r--r-- | pkgs/applications/misc/ranger/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/sequeler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/solaar/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/taskjuggler/Gemfile.lock | 14 | ||||
-rw-r--r-- | pkgs/applications/misc/taskjuggler/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/taskjuggler/gemset.nix | 60 | ||||
-rw-r--r-- | pkgs/applications/misc/tilix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/worker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xca/default.nix | 14 |
14 files changed, 147 insertions, 84 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d66a778c1cd9..1ad236f0d13f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.30.0"; + version = "3.31.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz"; + sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw"; }; patches = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 35698a323319..77cad142d41d 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.6"; + version = "5.2.0"; 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 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn"; + sha256 = "13j2qc4g24d2gmkxj9zpqrcbai9aq8rassrq3c9mp9ir6sf4q0jf"; }; installPhase = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ed2f0626e5d2..95754579c487 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,12 +1,24 @@ { stdenv, fetchurl, python3, python3Packages, zbar }: +let + qdarkstyle = python3Packages.buildPythonPackage rec { + pname = "QDarkStyle"; + version = "2.5.4"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1w715m1i5pycfqcpkrggpn0rs9cakx6cm5v8rggcxnf4p0i0kdiy"; + }; + doCheck = false; # no tests + }; +in + python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.1.3"; + version = "3.2.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy"; + sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1"; }; propagatedBuildInputs = with python3Packages; [ @@ -17,12 +29,14 @@ python3Packages.buildPythonApplication rec { pbkdf2 protobuf pyaes - pycrypto + pycryptodomex pyqt5 pysocks + qdarkstyle qrcode requests tlslite + typing # plugins keepkey @@ -35,10 +49,10 @@ python3Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' gui/qt/icons_rc.py - sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py + sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py + sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py ''; postInstall = '' diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index e0535eeca387..1eb0d0048f64 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -1,24 +1,14 @@ -{ stdenv, fetchurl, writeScript, fetchFromGitHub +{ stdenv, fetchgit, fetchurl, writeScript , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite , enableGlfw ? false, glfw }: let inherit (stdenv.lib) optional makeLibraryPath; - version = "1.4.5"; - gladVersion = "0.1.24"; - # glad - # https://github.com/wacossusca34/glava/issues/46#issuecomment-397816520 - glad = fetchFromGitHub { - owner = "Dav1dde"; - repo = "glad"; - rev = "v${gladVersion}"; - sha256 = "0s2c9w064kqa5i07w8zmvgpg1pa3wj86l1nhgw7w56cjhq7cf8h8"; - }; # gl.xml gl = fetchurl { - url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/a24f3f7a4c924fdbc666024f99c70e5b8e34c819/xml/gl.xml; - sha256 = "1mskxjmhb35m8qv255pibf633d8sn1w9rdsf0lj75bhlgy0zi5c7"; + url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/56312cfe680e4be5ae61bbf1c628e420f8731718/xml/gl.xml; + sha256 = "1c45bcgaxiic5gmb3gkrd9qcvascvij97vz5y6fc3a2y7x3gjc5l"; }; # EGL 1.5 egl = fetchurl { @@ -43,12 +33,12 @@ let in stdenv.mkDerivation rec { name = "glava-${version}"; + version = "1.5.1"; - src = fetchFromGitHub { - owner = "wacossusca34"; - repo = "glava"; + src = fetchgit { + url = "https://github.com/wacossusca34/glava.git"; rev = "v${version}"; - sha256 = "1zfw8samrzxxbny709rcdz1z77cw1cd46wlfnf7my02kipmqn0nr"; + sha256 = "1k8x0a0g2pm7ficsk4az9s7mjbm85a987apjg5c4y6iyldxgd6sb"; }; buildInputs = [ @@ -65,7 +55,6 @@ in ]; patchPhase = '' - cp -r --no-preserve=all ${glad}/* glad mkdir -p glad/include/KHR cp ${gl} glad/gl.xml diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix new file mode 100644 index 000000000000..59ba45e6f376 --- /dev/null +++ b/pkgs/applications/misc/notejot/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite +, gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "notejot"; + version = "1.4.5"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "lainsce"; + repo = pname; + rev = version; + sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.libgee + granite + gtk3 + gtksourceview + json-glib + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Stupidly-simple sticky notes applet"; + homepage = https://github.com/lainsce/notejot; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 33b8c33033ea..6d883d89de31 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null; python3Packages.buildPythonApplication rec { name = "ranger-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; rev = "v${version}"; - sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; + sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; checkInputs = with python3Packages; [ pytest ]; @@ -51,6 +51,6 @@ python3Packages.buildPythonApplication rec { homepage = http://ranger.github.io/; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.magnetophon ]; + maintainers = [ maintainers.toonn maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index cc676bb28e2e..89b4e33a927b 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -4,7 +4,7 @@ let - version = "0.6.0"; + version = "0.6.2"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; + sha256 = "0j5z3z34jc1acclmlkjpv7fcs4f2gf0bcfnvcpn3zdzw9fzj0sw7"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index afe944e868e7..e26071dd3612 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,5 +1,5 @@ -{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}: -python34Packages.buildPythonApplication rec { +{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}: +pythonPackages.buildPythonApplication rec { name = "solaar-unstable-${version}"; version = "2018-02-02"; namePrefix = ""; @@ -10,7 +10,7 @@ python34Packages.buildPythonApplication rec { sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; }; - propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3]; + propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3]; postInstall = '' wrapProgram "$out/bin/solaar" \ --prefix PYTHONPATH : "$PYTHONPATH" \ diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock index d1642e76fa65..ebd04c20ea6d 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -1,15 +1,15 @@ GEM remote: http://rubygems.org/ specs: - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - taskjuggler (3.5.0) + mail (2.7.0) + mini_mime (>= 0.1.1) + mini_mime (1.0.1) + taskjuggler (3.6.0) mail (>= 2.4.3) term-ansicolor (>= 1.0.7) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) - tins (1.6.0) + tins (1.16.3) PLATFORMS ruby @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.10.5 + 1.14.6 diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index c5429b6c8510..f3f9285b312d 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,16 +1,21 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp, ruby }: -bundlerEnv { - name = "taskjuggler-3.5.0"; +bundlerApp { + pname = "taskjuggler"; inherit ruby; gemdir = ./.; + exes = [ + "tj3" "tj3client" "tj3d" "tj3man" "tj3ss_receiver" "tj3ss_sender" + "tj3ts_receiver" "tj3ts_sender" "tj3ts_summary" "tj3webd" + ]; + meta = { - broken = true; # needs ruby 2.0 description = "A modern and powerful project management tool"; homepage = http://taskjuggler.org/; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.manveru ]; }; } diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix index e65ab3451a62..24c1e4311777 100644 --- a/pkgs/applications/misc/taskjuggler/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -1,47 +1,55 @@ { - "mail" = { - version = "2.6.3"; + mail = { + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; }; - dependencies = [ - "mime-types" - ]; + version = "2.7.0"; }; - "mime-types" = { - version = "2.6.1"; + mini_mime = { + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; - sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; }; + version = "1.0.1"; }; - "taskjuggler" = { - version = "3.5.0"; + taskjuggler = { + dependencies = ["mail" "term-ansicolor"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp"; type = "gem"; - sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2"; }; - dependencies = [ - "mail" - "term-ansicolor" - ]; + version = "3.6.0"; }; - "term-ansicolor" = { - version = "1.3.2"; + term-ansicolor = { + dependencies = ["tins"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1b1wq9ljh7v3qyxkk8vik2fqx2qzwh5lval5f92llmldkw7r7k7b"; type = "gem"; - sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys"; }; - dependencies = [ - "tins" - ]; - }; - "tins" = { version = "1.6.0"; + }; + tins = { + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "0g95xs4nvx5n62hb4fkbkd870l9q3y9adfc4h8j21phj9mxybkb8"; type = "gem"; - sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz"; }; + version = "1.16.3"; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index e101005e44ec..98e320b7aaf5 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.8.3"; + version = "1.8.5"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq"; + sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index bfb43d3e49d1..f9267411dda4 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi"; + sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index ee4300cde0f5..7b95cf002ca1 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,15 +1,15 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, which +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig , libtool, openssl, qtbase, qttools }: mkDerivation rec { name = "xca-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${version}"; - sha256 = "039qz6hh43hx8dcw2bq71mgy95zk09jyd3xxpldmxxd5d69zcr8m"; + sha256 = "1d09329a80axwqhxixwasd8scsmh23vsq1076amy5c8173s4ambi"; }; postPatch = '' @@ -17,15 +17,15 @@ mkDerivation rec { --replace /usr/bin/perl ${perl}/bin/perl ''; - buildInputs = [ libtool openssl qtbase qttools ]; + buildInputs = [ libtool openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + nativeBuildInputs = [ autoreconfHook pkgconfig qttools ]; enableParallelBuilding = true; meta = with lib; { - description = "Interface for managing asymetric keys like RSA or DSA"; - homepage = http://xca.sourceforge.net/; + description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; + homepage = https://hohnstaedt.de/xca/; license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; platforms = platforms.all; |