diff options
Diffstat (limited to 'pkgs/applications/misc')
28 files changed, 308 insertions, 83 deletions
diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index c479820ba08e..403973c46e7c 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.18.59"; + version = "0.18.68"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-HDhDd23kXhIFXg+QKPNpR2R6QC4oJCnut+gD//qMK1Y="; + sha256 = "sha256-VZYFMUgflc3LEk/nN7eoQbinGQS1AnPHmb8WgKzhGRM="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 3a0cc8ce44f6..176172236201 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "bibletime"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA="; + sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4="; }; nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7ba83e7923e6..0153d30a52fc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchurl -, fetchFromGitHub , poppler_utils , pkg-config , libpng @@ -101,6 +100,7 @@ mkDerivation rec { regex sip zeroconf + jeepney # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 96042c99b283..ba2e8819517a 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU="; + sha256 = "sha256-SJWIjizPf0bRwanpnLpuqsWKjaCwc1wBV2sCPSqGiOs="; }; - vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc="; + vendorSha256 = "sha256-u3KsMi63wOi1fCSLpGxATZNmbhoIAGeVpwcKh+nmi3k="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 94852aa13851..23aa5f9ba4f1 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.18.3"; + version = "1.18.4"; src = fetchPypi { inherit pname version; - sha256 = "6e058dd25a8a54ead41479579fd73de71472abb980a6254765c5e538b591d162"; + sha256 = "bdb84706fdde867fe2ee11c74c8c51af4e560399bd5fa562f19bfcaf8fc0dac9"; }; propagatedBuildInputs = [ requests ]; @@ -21,8 +21,8 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - license = licenses.gpl2; - maintainers = with maintainers; [ dawidsowa ]; - platforms = platforms.unix; + changelog = "https://github.com/mikf/gallery-dl/raw/v${version}/CHANGELOG.md"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dawidsowa marsam ]; }; } diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/applications/misc/gofu/default.nix new file mode 100644 index 000000000000..b951a3e48251 --- /dev/null +++ b/pkgs/applications/misc/gofu/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gofu"; + version = "unstable-2021-09-11"; + + src = fetchFromGitHub { + owner = "majewsky"; + repo = pname; + rev = "cb398f58a5cb4f3e858fe60e84debde6ab58f7c8"; + sha256 = "sha256-R8Pr8SyLeoTaYKKV+PzHDPi1/RY4j7pkUbW8kE4ydBU="; + }; + + vendorSha256 = null; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Multibinary containing several utilities"; + homepage = "https://github.com/majewsky/gofu"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 7aa844098e3f..7b3f6122a62b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.87.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc="; + sha256 = "sha256-6dJ8H9oJwIW7rY2NrYVKuWDjwrFc9C30Vb0i20+opM0="; }; - vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU="; + vendorSha256 = "sha256-VX+oIz5wAyEQ4nky3kXmJZbMF0MvfAKdEAMLnS0hXc8="; doCheck = false; diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix new file mode 100644 index 000000000000..89e5aea943a5 --- /dev/null +++ b/pkgs/applications/misc/joshuto/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub, lib, rustPlatform, stdenv, SystemConfiguration }: + +rustPlatform.buildRustPackage rec { + pname = "joshuto"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "kamiyaa"; + repo = pname; + rev = version; + sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl"; + # upstream includes an outdated Cargo.lock that stops cargo from compiling + postFetch = '' + mkdir -p $out + tar xf $downloadedFile --strip=1 -C $out + substituteInPlace $out/Cargo.lock \ + --replace 0.8.6 ${version} + ''; + }; + + cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm"; + + buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; + + meta = with lib; { + description = "Ranger-like terminal file manager written in Rust"; + homepage = "https://github.com/kamiyaa/joshuto"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 71d70774b11a..93e08b660787 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18118"; + version = "18193"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym"; + sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397"; + sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1"; + sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII="; }; }; in diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 467945af6ac8..e2e43ae09971 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -7,22 +7,30 @@ , kjobwidgets , kxmlgui , lib +, testVersion +, k4dirstat }: mkDerivation rec { pname = "k4dirstat"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "sha256-U5p/gW5GPxRoM9XknP8G7iVhLDoqmvgspeRsmCRdxDg="; + hash = "sha256-KLvWSDv4x0tMhAPqp8yNQed2i7R0MPbvadHddSJ1Nx4="; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kiconthemes kio kjobwidgets kxmlgui ]; + passthru.tests.version = + testVersion { + package = k4dirstat; + command = "k4dirstat -platform offscreen --version &>/dev/stdout"; + }; + meta = with lib; { homepage = "https://github.com/jeromerobert/k4dirstat"; description = "A small utility program that sums up disk usage for directory trees"; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 46e170f4db17..949eb48f392c 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "OweKV+vF8H1QMNhIs0Z9/uUAuu1cCTitH2P7barS0ao="; + sha256 = "ruJALAI0YQNwG8An5VzoJX06Qu/pXZ9zsrPZ7EH+5Pk="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 72028478e6ee..4f2f800ebd25 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.7.20"; + version = "5.7.90"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "0lyfss0r0dc6skhdlkslcdagdp9k1mi0w8n5pbrskwcd09c9mxym"; + sha256 = "sha256-wUHLesJ/YV3QyTJfGUr1lFD55JBnfSmjO2VvriaqlII="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; - broken = true; maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/pkgs/applications/misc/nhentai/default.nix b/pkgs/applications/misc/nhentai/default.nix new file mode 100644 index 000000000000..6357389776d9 --- /dev/null +++ b/pkgs/applications/misc/nhentai/default.nix @@ -0,0 +1,26 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "nhentai"; + version = "0.4.16"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M="; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + iso8601 + beautifulsoup4 + soupsieve + tabulate + future + ]; + + meta = with lib; { + homepage = "https://github.com/RicterZ/nhentai"; + description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>"; + license = licenses.mit; + maintainers = with maintainers; [ travisdavis-ops ]; + }; +} diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 213bb9a76b3a..952a7b00d087 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.1"; + version = "3.1.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-OmzEwShIpzIbonqwQmpdutd3tztm7Gmmo3qdt+DApWo="; + hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 510623433173..5b4444b19851 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron, makeDesktopItem, graphicsmagick +{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick , writeScript }: let + electron = electron_13; icon = fetchurl { url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; @@ -30,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.12.12"; + version = "0.12.15"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "sha256-zvWJvMmb0TlFYXrT2QUgMG6uleT42+y+F4bSZQ2ftnE="; + sha256 = "sha256-0pAwTkx89B6S0GPes2XXSRNdByIc+DwiI5HXoUqs/QE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 2bf28aa892f5..bc9b83178da0 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.3.56.5"; + version = "2.3.56.8"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -10,13 +10,15 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E="; + sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo="; rev = version; fetchSubmodules = true; }; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; + dontStrip = true; + separateDebugInfo = true; # See https://github.com/supermerill/SuperSlicer/issues/432 cmakeFlags = super.cmakeFlags ++ [ diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 23fddf3b7ed6..7bcf774b0116 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "reddsaver"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv"; + sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z"; + cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 73d8999be5b7..1d232d8a3fad 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "0knsvsdff2c7ww94120bq92735qrfriyd28mi0n72ccb2iikyi8b"; + sha256 = "01f9nw54mbwlj00mclf7qc2y95riaihzznbbmp0wc4c52pvxki4q"; }; patches = [ diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index d47d1fe26a61..12daea00cad3 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,16 +1,35 @@ -{ stdenv, lib, fetchurl -, autoreconfHook, pkg-config, libxkbcommon, pango, which, git -, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification -, bison, flex, librsvg, check +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libxkbcommon +, pango +, which +, git +, cairo +, libxcb +, xcbutil +, xcbutilwm +, xcbutilxrm +, xcb-util-cursor +, libstartup_notification +, bison +, flex +, librsvg +, check }: stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.6.1"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd"; + src = fetchFromGitHub { + owner = "davatorium"; + repo = "rofi"; + rev = version; + fetchSubmodules = true; + sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v"; }; preConfigure = '' @@ -20,8 +39,22 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check - libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which + buildInputs = [ + libxkbcommon + pango + cairo + git + bison + flex + librsvg + check + libstartup_notification + libxcb + xcbutil + xcbutilwm + xcbutilxrm + xcb-util-cursor + which ]; doCheck = false; @@ -30,7 +63,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix index 6df8dc781e70..86c896b12776 100644 --- a/pkgs/applications/misc/senv/default.nix +++ b/pkgs/applications/misc/senv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senv"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "SpectralOps"; repo = pname; rev = "v${version}"; - sha256 = "014422sdks2xlpsgvynwibz25jg1fj5s8dcf8b1j6djgq5glhfaf"; + sha256 = "sha256-TjlIX8FPNiPDQo41pIt04cki/orc+v30pV3o2bQQhAQ="; }; - vendorSha256 = "05n55yf75r7i9kl56kw9x6hgmyf5bva5dzp9ni2ws0lb1389grfc"; + vendorSha256 = "sha256-zOWX0AiLAs1FtOn+VtRexfn6oOmJT1PoTPHkcpwvxRY="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index d341c9821996..a242a520fc45 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr"; + sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p"; }; buildInputs = [ diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix new file mode 100644 index 000000000000..d3ecfcbde2b0 --- /dev/null +++ b/pkgs/applications/misc/sqls/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "sqls"; + version = "0.2.19"; + + src = fetchFromGitHub { + owner = "lighttiger2505"; + repo = pname; + rev = "v${version}"; + sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az"; + }; + + vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz"; + + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; + + meta = with lib; { + homepage = "https://github.com/lighttiger2505/sqls"; + description = "SQL language server written in Go"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 8933faf5fb01..88050d2f449d 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -1,20 +1,27 @@ -{ fetchurl, lib, stdenv, makeWrapper, which, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, which, perl, perlPackages }: -stdenv.mkDerivation { - name = "taskopen-1.1.4"; - src = fetchurl { - url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; - sha256 = "774dd89f5c92462098dd6227e181268e5ec9930bbc569f25784000df185c71ba"; - }; +stdenv.mkDerivation rec { + pname = "taskopen"; + version = "1.1.5"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which perl ] ++ (with perlPackages; [ JSON ]); + src = fetchFromGitHub { + owner = "ValiValpas"; + repo = "taskopen"; + rev = "v${version}"; + sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg="; + }; - installPhase = '' + postPatch = '' # We don't need a DESTDIR and an empty string results in an absolute path # (due to the trailing slash) which breaks the build. sed 's|$(DESTDIR)/||' -i Makefile + ''; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which ] + ++ (with perlPackages; [ JSON perl ]); + installPhase = '' make PREFIX=$out make PREFIX=$out install ''; @@ -28,7 +35,7 @@ stdenv.mkDerivation { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = lib.licenses.free ; + license = licenses.free; maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index f9bf70b661ce..0b7a766ba39d 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py --subst-var out + patchShebangs bin/ulauncher-toggle + substituteInPlace bin/ulauncher-toggle \ + --replace wmctrl ${wmctrl}/bin/wmctrl ''; # https://github.com/Ulauncher/Ulauncher/issues/390 @@ -99,8 +102,10 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + # do not double wrap + dontWrapGApps = true; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") ''; passthru = { diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix new file mode 100644 index 000000000000..fac8ac2886d3 --- /dev/null +++ b/pkgs/applications/misc/wike/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, python3 +, glib, appstream-glib , desktop-file-utils +, gobject-introspection, gtk3 +, wrapGAppsHook +, libhandy, webkitgtk, glib-networking +, gnome, dconf +}: +let + pythonEnv = python3.withPackages (p: with p; [ + pygobject3 + requests + ]); +in stdenv.mkDerivation rec { + pname = "wike"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "hugolabe"; + repo = "Wike"; + rev = version; + sha256 = "1qnxzxqjj0sn522k15plskwa7nlhhbcipfc3w17fbq3k2zhpr1yy"; + }; + |