diff options
Diffstat (limited to 'pkgs/applications/misc')
31 files changed, 232 insertions, 176 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 17f0ffdb92c..718765e6efe 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -9,7 +9,7 @@ , colladaSupport ? true, opencollada , makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL -, embree +, embree, gmp }: with lib; @@ -18,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.90.1"; + version = "2.91.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7"; + sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { tbb makeWrapper embree + gmp ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 0799226866e..becbbda8acf 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "0wsh83kchqakvx7kgs2s31rzsvnfr47jk6pbmqzjv1kqmnlhc3rh"; + sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k"; }; - vendorSha256 = "1lg4bbdzgnw50v6m6p7clibwm8m82kdr1jizgbmhfmzy15d5sfll"; + vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; doCheck = false; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index c06d00ebb52..e1f019ffa45 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , dbus, cmake, pkgconfig , glib, udev, polkit, libmodule -, pcre, libXdmcp, utillinux, libpthreadstubs +, pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext , enableGamma ? true, libXrandr @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pcre libXdmcp - utillinux + util-linux libpthreadstubs ] ++ optional enableDdc ddcutil ++ optional enableDpms libXext diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 54c2ab48f65..3227792d6a2 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,6 +1,6 @@ -{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: +{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ]; in stdenv.mkDerivation rec { pname = "clipmenu"; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index cee390d064d..090a63a32e4 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -7,7 +7,7 @@ , libdrm , mesa-demos , procps -, utillinux +, util-linux , vulkan-tools , qtbase , qtcharts @@ -40,7 +40,7 @@ stdenv.mkDerivation rec{ libdrm mesa-demos procps - utillinux + util-linux vulkan-tools qtbase qtcharts diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index e4d0c82c417..f83c5fc7f01 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }: +{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-4.9"; + name = "dmenu-5.0"; src = fetchurl { url = "https://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"; + sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/dmenu/xim.patch b/pkgs/applications/misc/dmenu/xim.patch deleted file mode 100644 index f77d48324da..00000000000 --- a/pkgs/applications/misc/dmenu/xim.patch +++ /dev/null @@ -1,31 +0,0 @@ -Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html - -Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html ---- a/dmenu.c -+++ b/dmenu.c -@@ -552,7 +552,7 @@ run(void) - XEvent ev; - - while (!XNextEvent(dpy, &ev)) { -- if (XFilterEvent(&ev, None)) -+ if (XFilterEvent(&ev, win)) - continue; - switch(ev.type) { - case Expose: -@@ -664,7 +664,6 @@ setup(void) - XNClientWindow, win, XNFocusWindow, win, NULL); - - XMapRaised(dpy, win); -- XSetInputFocus(dpy, win, RevertToParent, CurrentTime); - if (embed) { - XSelectInput(dpy, parentwin, FocusChangeMask); - if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { -@@ -730,8 +729,6 @@ main(int argc, char *argv[]) - - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); -- if (!XSetLocaleModifiers("")) -- fputs("warning: no locale modifiers support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index d72aeb629c3..7cee0487ea8 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ neonfuz ]; }; } diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 91096ddc917..7b1b20a1b78 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,14 +1,13 @@ GEM remote: https://rubygems.org/ specs: - backports (3.18.1) concurrent-ruby (1.1.7) crass (1.0.6) execjs (2.7.0) ffi (1.13.1) gemojione (4.3.3) json - github-markup (3.0.4) + github-markup (3.0.5) gollum (5.1.1) gemojione (~> 4.1) gollum-lib (~> 5.0) @@ -25,7 +24,7 @@ GEM therubyrhino (~> 2.1.0) uglifier (~> 3.2) useragent (~> 0.16.2) - gollum-lib (5.0.5) + gollum-lib (5.0.6) gemojione (~> 4.1) github-markup (~> 3.0) gollum-rugged_adapter (~> 1.0) @@ -42,12 +41,12 @@ GEM rexml kramdown-parser-gfm (1.0.1) kramdown (~> 2.0) - loofah (2.6.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_portile2 (2.4.0) multi_json (1.15.0) mustache (0.99.8) @@ -58,13 +57,13 @@ GEM octicons (8.5.0) nokogiri (>= 1.6.3.1) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.22.0) + rouge (3.25.0) rss (0.2.9) rexml ruby2_keywords (0.0.2) @@ -74,22 +73,21 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) - sinatra-contrib (2.0.8.1) - backports (>= 2.8.2) + sinatra-contrib (2.1.0) multi_json mustermann (~> 1.0) - rack-protection (= 2.0.8.1) - sinatra (= 2.0.8.1) + rack-protection (= 2.1.0) + sinatra (= 2.1.0) tilt (~> 2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.3.0) + sprockets-helpers (1.4.0) sprockets (>= 2.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 45bf0e04d07..7d7c0ef3d5f 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,14 +1,4 @@ { - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qagwshq7zyjgm6k53hbrf4gfrwn6qz5d6rrc83cl59q37v68zsc"; - type = "gem"; - }; - version = "3.18.1"; - }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -65,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14991x92v8s60hfqv7162jfmdqa20fifn2bz0km3k5cgi01pf9rs"; + sha256 = "0rlq9hnvhhndqskl087xwabbvfbfnrvx8ac79iin35wmzpyagl96"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; gollum = { dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"]; @@ -87,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18f3g5px9zznyh6ppqlnjdp1ia8awgrix9lhbfh64rpgxg0b9xlr"; + sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -141,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s9hq8bpn6g5vqr3nzyirn3agn7x8agan6151zvq5vmkf6rvmyb2"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -162,10 +152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; @@ -246,10 +236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi"; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; rb-fsevent = { groups = ["default"]; @@ -287,10 +277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m"; + sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; type = "gem"; }; - version = "3.22.0"; + version = "3.25.0"; }; rss = { dependencies = ["rexml"]; @@ -351,21 +341,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q"; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; sinatra-contrib = { - dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mmrfm4pqh98f3irjpkvfpazhcx6q42bnx6bbms9dqvmck3mid28"; + sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -384,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14iq8v16l31bfq7pikfmgcv5x6pkc5lbdmwwg6zlzcy1bibcliar"; + sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; therubyrhino = { dependencies = ["therubyrhino_jar"]; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 07918d3d599..42f522175b0 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 -, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }: +, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpscorrelate"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt pkgconfig + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 2a443303e20..444ee7ab523 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "01pgmwq539a0z7xsgx60vz6hmnr0c72xp6apx75qkvjsqbwmzhjh"; + sha256 = "03q3jn0j0cydw2mxfv7236lv4w9fh9slha0mphj33mk2f97b9hl6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index f00433a658f..f3d4e156d6c 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -7,7 +7,7 @@ , installShellFiles , Security , gitMinimal -, utillinuxMinimal +, util-linuxMinimal }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - checkInputs = [ gitMinimal utillinuxMinimal ]; + checkInputs = [ gitMinimal util-linuxMinimal ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch new file mode 100644 index 00000000000..34e4e6f0e7f --- /dev/null +++ b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch @@ -0,0 +1,85 @@ +From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001 +From: Arnout Engelen <arnout@bzzt.net> +Date: Tue, 24 Nov 2020 15:34:40 +0100 +Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself + +Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer +start since it'd try to invoke the inkcut.py from the extension +instead of the main application +--- + plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +- + plugins/inkscape/inkcut_cut.inx | 2 +- + plugins/inkscape/inkcut_cut.py | 2 +- + plugins/inkscape/inkcut_open.inx | 2 +- + plugins/inkscape/inkcut_open.py | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%) + +diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py +similarity index 98% +rename from plugins/inkscape/inkcut.py +rename to plugins/inkscape/inkcut4inkscape.py +index 5b90475..7dc8d86 100644 +--- a/plugins/inkscape/inkcut.py ++++ b/plugins/inkscape/inkcut4inkscape.py +@@ -2,7 +2,7 @@ + # -*- coding: utf-8 -*- + """ + Inkcut, Plot HPGL directly from Inkscape. +- inkcut.py ++ inkcut4inkscape.py + + Copyright 2018 The Inkcut Team + +diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx +index 4b44ae5..3db8721 100644 +--- a/plugins/inkscape/inkcut_cut.inx ++++ b/plugins/inkscape/inkcut_cut.inx +@@ -2,7 +2,7 @@ + <_name>Cut selection...</_name> + <id>org.ekips.filter.inkcut.cut</id> + <dependency type="executable" location="extensions">inkcut_cut.py</dependency> +- <dependency type="executable" location="extensions">inkcut.py</dependency> ++ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + <effect> + <object-type>all</object-type> +diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py +index acaf812..777629a 100644 +--- a/plugins/inkscape/inkcut_cut.py ++++ b/plugins/inkscape/inkcut_cut.py +@@ -37,7 +37,7 @@ + else: + inkex.localize() + import subprocess +-from inkcut import contains_text, convert_objects_to_paths ++from inkcut4inkscape import contains_text, convert_objects_to_paths + + + +diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx +index 45ee585..2dcd38e 100644 +--- a/plugins/inkscape/inkcut_open.inx ++++ b/plugins/inkscape/inkcut_open.inx +@@ -2,7 +2,7 @@ + <_name>Open current document...</_name> + <id>org.ekips.filter.inkcut.open</id> + <dependency type="executable" location="extensions">inkcut_open.py</dependency> +- <dependency type="executable" location="extensions">inkcut.py</dependency> ++ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + <effect> + <object-type>all</object-type> +diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py +index b4652eb..e4c2d62 100644 +--- a/plugins/inkscape/inkcut_open.py ++++ b/plugins/inkscape/inkcut_open.py +@@ -38,7 +38,7 @@ + inkex.localize() + import subprocess + +-from inkcut import convert_objects_to_paths ++from inkcut4inkscape import convert_objects_to_paths + + DEBUG = False + try: diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index cfb10cfbe2f..481069feac0 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -17,6 +17,12 @@ buildPythonApplication rec { sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; }; + patches = [ + # https://github.com/inkcut/inkcut/pull/292 but downloaded + # because of https://github.com/NixOS/nixpkgs/issues/32084 + ./avoid-name-clash-between-inkcut-and-extension.patch + ]; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ @@ -49,6 +55,15 @@ buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + postInstall = '' + mkdir -p $out/share/inkscape/extensions + + cp plugins/inkscape/* $out/share/inkscape/extensions + + sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_cut.py + sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_open.py + ''; + meta = with lib; { homepage = "https://www.codelv.com/projects/inkcut/"; description = "Control 2D plotters, cutters, engravers, and CNC machines"; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index 3d41c45f6dc..b28914a44a8 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -1,13 +1,13 @@ { stdenv, buildEnv, fetchurl, mono }: let - version = "1.8.0"; + version = "1.14.0"; drv = stdenv.mkDerivation { pname = "keepassrpc"; inherit version; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; - sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; + sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 335279c7084..b30d652584f 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8"; + sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi"; }; nativeBuildInputs = [ cmake ]; @@ -19,8 +19,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; installPhase = '' - install -Dm755 console/lsd2dsl $out/bin/lsd2dsl - install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin '' + lib.optionalString stdenv.isDarwin '' wrapQtApp $out/bin/lsd2dsl wrapQtApp $out/bin/lsd2dsl-qtgui diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 2b656775ab5..d7eabae0e8e 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -103,7 +103,7 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap - ocl-icd utillinux libkrb5 + ocl-icd util-linux libkrb5 # Proton libselinux diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix index ddee1939b02..eacd1971610 100644 --- a/pkgs/applications/misc/mu-repo/default.nix +++ b/pkgs/applications/misc/mu-repo/default.nix @@ -1,20 +1,19 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pytest, git }: +{ lib, fetchFromGitHub, buildPythonApplication, pytestCheckHook, git }: buildPythonApplication rec { pname = "mu-repo"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "fabioz"; repo = pname; - rev = with lib; - "mu_repo_" + concatStringsSep "_" (splitVersion version); - sha256 = "1dxfggzbhiips0ww2s93yba9842ycp0i3x2i8vvcx0vgicv3rv6f"; + rev = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "0mmjdkvmdlsndi2q56ybxyz2988ppxsbbr1g54nzzkkvab2bc2na"; }; - checkInputs = [ pytest git ]; - # disable test which assumes it's a git repo - checkPhase = "py.test mu_repo --ignore=mu_repo/tests/test_checkout.py"; + propagatedBuildInputs = [ git ]; + + checkInputs = [ pytestCheckHook git ]; meta = with lib; { description = "Tool to help in dealing with multiple git repositories"; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 8f90c7a581d..c1c7b5a2706 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, stdenv, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -30,7 +30,7 @@ python36Packages.buildPythonApplication rec { gnugrep which parted - utillinux + util-linux qemu p7zip gnused diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index d8e55e113b2..039967f4182 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g"; + sha256 = "0d7pvl87ybkvcxk69fr35fz0w447hy2pm65bhvlril16ljm2izja"; }; unpackPhase = '' diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix index 344c3d7168a..2a7a82bc74a 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.projectlibre.com/"; + homepage = "https://www.projectlibre.com/"; description = "Project-Management Software similar to MS-Project"; maintainers = [ maintainers.Mogria ]; license = licenses.cpal10; diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix deleted file mode 100644 index 1a8758955ce..00000000000 --- a/pkgs/applications/misc/qmapshack/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, qtscript, qtwebengine, gdal, proj, routino, quazip }: - -mkDerivation rec { - pname = "qmapshack"; - version = "1.15.0"; - - src = fetchFromGitHub { - owner = "Maproom"; - repo = pname; - rev = "V_${version}"; - sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; - - cmakeFlags = [ - "-DROUTINO_XML_PATH=${routino}/share/routino" - "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5" - "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" - ]; - - enableParallelBuilding = true; - - patches = [ - "${src}/FindPROJ4.patch" - "${src}/FindQuaZip5.patch" - ]; - - qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}" - ]; - - meta = with lib; { - homepage = "https://github.com/Maproom/qmapshack"; - description = "Consumer grade GIS software"; - license = licenses.gpl3; - maintainers = with maintainers; [ dotlambda sikmir ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 3b989a75c9b..fcdab3ddbc4 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript }: let version = "2.16.4.2"; @@ -34,6 +34,15 @@ in mkDerivation { --set-rpath "${lib.makeLibraryPath [ qt5.qtbase libXtst libXext libX11 libXScrnSaver ]}" \ $out/bin/rescuetime ''; + + passthru.updateScript = writeScript "rescuetime-updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pup common-updater-scripts + set -eu -o pipefail + latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" + update-source-version rescuetime "$latestVersion" + ''; + meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index d565e1874cd..6ee2cb8c349 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "sha256-BS/ypMS/MfaiUizWVov8yYgGJjgwMWvz0PiH3sYYn50="; + sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd"; }; preConfigure = '' diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 455c08fb295..9aaeca14a20 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "2.0.0"; + version = "2.1.0"; sha256 = { - x86_64-linux = "18alzsl1y9pvd5rs6gfnzv0py8ha0im33ylg7h6dicil5vii4l05"; + x86_64-linux = "0lg48nq493anpnm20vw72y242nxa1g903bxzp4pngzxyi986jddz"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e1d578edb0f..cdcb54cbc6c 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,19 +1,21 @@ { stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf , gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat -, udev, libpulseaudio, utillinux, makeWrapper }: +, udev, libpulseaudio, util-linux, makeWrapper }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; - sha256 = "1yxa0fdc3fnffny6jf1hm7545792pw7828mc27il17l4kn346g98"; + sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s"; }; desktopItem = makeDesktopItem { name = "Todoist"; - exec = "todoist"; + exec = "todoist %U"; + icon = "todoist"; + comment = "Todoist for Linux"; desktopName = "Todoist"; categories = "Utility"; }; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { installPhase = let libPath = lib.makeLibraryPath ([ stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - nss nspr alsaLib libpulseaudio cups expat udev utillinux + nss nspr alsaLib libpulseaudio cups expat udev util-linux ] ++ (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver @@ -35,6 +37,7 @@ stdenv.mkDerivation rec { in '' mkdir -p "$out/bin" mv opt "$out/" + mv usr/share "$out/share" # Patch binary patchelf \ @@ -48,14 +51,15 @@ stdenv.mkDerivation rec { # Desktop item mkdir -p "$out/share" - ln -s "${desktopItem}/share/applications" "$out/share/applications" + rm -r "$out/share/applications" + cp -r "${desktopItem}/share/applications" "$out/share/applications" ''; meta = with lib; { homepage = "https://github.com/KryDos/todoist-linux"; description = "The Linux wrapper for Todoist web version"; platforms = [ "x86_64-linux" ]; - license = licenses.isc; + license = licenses.mit; maintainers = with maintainers; [ i077 ]; }; } diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index dbf721888df..8e01f73f967 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }: +{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { @@ -13,9 +13,9 @@ stdenv.mkDerivation { substituteInPlace src/Makefile.in --replace 4755 0755 ./configure \ --prefix=$out \ - --with-mount-prog=${utillinux}/bin/mount \ - --with-umount-prog=${utillinux}/bin/umount \ - --with-losetup-prog=${utillinux}/bin/losetup \ + --with-mount-prog=${util-linux}/bin/mount \ + --with-umount-prog=${util-linux}/bin/umount \ + --with-losetup-prog=${util-linux}/bin/losetup \ --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index b014543e8ce..2c388e58fe1 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper , pkgconfig , ncurses, libX11 -, utillinux, file, which, groff +, util-linux, file, which, groff # adds support for handling removable media (vifm-media). Linux only! , mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ ncurses libX11 utillinux file which groff ]; + buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let path = lib.makeBinPath diff --git a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch new file mode 100644 index 00000000000..d56a6cfab07 --- /dev/null +++ b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch @@ -0,0 +1,24 @@ +From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Wed, 25 Nov 2020 11:26:49 +0100 +Subject: [PATCH] replace git with normal python package +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index ef25aad..b4246a4 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,2 +1,2 @@ +-git+https://github.com/Yubico/yubikey-manager.git ++yubikey-manager + ./py/qr +-- +2.29.2 + diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index c6a1022288f..460b34416ff 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -19,6 +19,10 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; + patches = [ + ./0001-replace-git-with-normal-python-package.patch + ]; + postPatch = '' substituteInPlace deployment.pri \ --replace '/usr/bin' "$out/bin" |