diff options
Diffstat (limited to 'pkgs/applications')
15 files changed, 185 insertions, 132 deletions
diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index 88e8ba6d0bc..0322459685f 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "betta-cyber"; repo = "netease-music-tui"; - rev = "${version}"; + rev = version; sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f"; }; diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index b4b9adfa619..e29a19713bd 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "798542b34dc8d7f5c110119350bd9bafef9f8439"; - sha256 = "1lna9z90sxjnanggjh2si018cfzp60xsrissnv9bbkc8wish1537"; + rev = "b815a9323c1f58f6c163a1f968939c57a8b6cfa0"; + sha256 = "183xlmhjmj4z2zssc0pw990h7bf3bam8zqswnf1zcsyp8z7yrl5g"; }; in pkgs.mkShell { diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 4e928ff34f0..a41ee209a0b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.3.0"; + version = "7.3.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,10 +30,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; + sha256 = "sha256-4UVC5lBoGsW99L6AgM+1Rs07LCrvp2qVevBrooTbee4="; }; installPhase = '' + # remove bundled jre + rm -rf jre + mkdir -p $out/ cp -r . $out/dbeaver diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 2fd29444dad..9b0ffe67f0c 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh", - "version": "1.5.2-bead991b", - "sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh", + "version": "1.5.15-28673d1c", + "sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2" } 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 deleted file mode 100644 index 34e4e6f0e7f..00000000000 --- a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 481069feac0..4ca373ee275 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -8,21 +8,15 @@ with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; + sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; }; - 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 = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b33c091a581..3379e2e9b9d 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.22"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ="; + sha256 = "wnCgW4EAcg0Oc1fqOZBYKN2g8N27riL+yonoIy0AfxA="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0596cd350df..f7b1b990acb 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw"; + sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index c2e51ee743b..47693cc97f1 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; }; - buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; + buildInputs = stdenv.lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.mmlb ]; }; } diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix new file mode 100644 index 00000000000..b8ee60e5713 --- /dev/null +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "shellhub-agent"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "shellhub-io"; + repo = "shellhub"; + rev = "v${version}"; + sha256 = "0cd41ing1pcf1bdaaq00w5h7lih5j2kcaa0m41g3ikm3vd1w5qna"; + }; + + modRoot = "./agent"; + + vendorSha256 = "19gsfhh6idqysdxhpq45sq35gw19adz9lp83krjlhzj1vqm59qma"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; + + meta = with stdenv.lib; { + description = + "Enables easy access any Linux device behind firewall and NAT"; + longDescription = '' + ShellHub is a modern SSH server for remotely accessing Linux devices via + command line (using any SSH client) or web-based user interface, designed + as an alternative to _sshd_. Think ShellHub as centralized SSH for the the + edge and cloud computing. + ''; + homepage = "https://shellhub.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 3197a7d0cc4..96f6df2744b 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -32,13 +32,13 @@ uhd mkDerivation rec { pname = "sdrangel"; - version = "4.21.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U="; + sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4="; fetchSubmodules = false; }; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 5411571113d..3a51f77d7bd 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1pcyj1vzv51j8rgi0hh9chw3vfkfi03bg1rg7gs4nk95ffmwx4pd"; + sha256 = "0s8zlq2bx6hp8c522rkxj9kbkf3a0qj6iyg7q9dcxmcl3q2sanq9"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 3d95f7c5772..2b79c5362de 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -1,35 +1,142 @@ -{ stdenv, fetchgit -, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland -, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config +{ stdenv +, lib +, fetchzip +, fetchurl +, runCommandNoCC +, fcft +, freetype +, pixman +, libxkbcommon +, fontconfig +, wayland +, meson +, ninja +, ncurses +, scdoc +, tllist +, wayland-protocols +, pkg-config +, allowPgo ? true +, python3 # for PGO }: +let + version = "1.6.2"; + + # build stimuli file for PGO build and the script to generate it + # independently of the foot's build, so we can cache the result + # and avoid unnecessary rebuilds as it can take relatively long + # to generate + stimulusGenerator = stdenv.mkDerivation { + pname = "foot-generate-alt-random-writes"; + inherit version; + + src = fetchurl { + url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; + sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz"; + }; + + dontUnpack = true; + + buildInputs = [ python3 ]; + + installPhase = '' + install -Dm755 $src $out + ''; + }; + + stimuliFile = runCommandNoCC "pgo-stimulus-file" { } '' + ${stimulusGenerator} \ + --rows=67 --cols=135 \ + --scroll --scroll-region \ + --colors-regular --colors-bright --colors-256 --colors-rgb \ + --attr-bold --attr-italic --attr-underline \ + --sixel \ + --seed=2305843009213693951 \ + $out + ''; + + compilerName = + if stdenv.cc.isClang + then "clang" + else if stdenv.cc.isGNU + then "gcc" + else "unknown"; + + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#performance-optimized-pgo + pgoCflags = { + "clang" = "-O3 -Wno-ignored-optimization-argument -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled"; + "gcc" = "-O3 -Wno-missing-profile"; + }."${compilerName}"; + + # ar with lto support + ar = { + "clang" = "llvm-ar"; + "gcc" = "gcc-ar"; + "unknown" = "ar"; + }."${compilerName}"; + + # PGO only makes sense if we are not cross compiling and + # using a compiler which foot's PGO build supports (clang or gcc) + doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform) + && compilerName != "unknown"; +in stdenv.mkDerivation rec { pname = "foot"; - version = "1.5.1"; + inherit version; - src = fetchgit { - url = "https://codeberg.org/dnkl/foot.git"; - rev = version; - sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc="; + src = fetchzip { + url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; + sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812"; }; nativeBuildInputs = [ - meson ninja ncurses scdoc tllist wayland-protocols pkg-config - ]; + meson + ninja + ncurses + scdoc + tllist + wayland-protocols + pkg-config + ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm; + buildInputs = [ - fontconfig freetype pixman wayland libxkbcommon fcft + fontconfig + freetype + pixman + wayland + libxkbcommon + fcft ]; - # recommended build flags for foot as per INSTALL.md - # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build + # recommended build flags for performance optimized foot builds + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#release-build + CFLAGS = + if !doPgo + then "-O3 -fno-plt" + else pgoCflags; + + # ar with gcc plugins for lto objects preConfigure = '' - export CFLAGS+="-O3 -fno-plt" + export AR="${ar}" ''; mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; - meta = with stdenv.lib; { + # build and run binary generating PGO profiles, + # then reconfigure to build the normal foot binary utilizing PGO + preBuild = lib.optionalString doPgo '' + meson configure -Db_pgo=generate + ninja + ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} + meson configure -Db_pgo=use + '' + lib.optionalString (doPgo && stdenv.cc.cc.pname == "clang") '' + llvm-profdata merge default_*profraw --output=default.profdata + ''; + + meta = with lib; { homepage = "https://codeberg.org/dnkl/foot/"; + changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; description = "A fast, lightweight and minimalistic Wayland terminal emulator"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 0fa30651170..f44987037aa 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "0rh902h76pn7ja5zizlfklmwcyyki4b0v4irw1j40cjjnah75ljp"; + sha256 = "134dhkk6ckhk6pb2hmfy1q2hkb8d1fkhbshw9qzbnp0qwbv3wgqj"; }; - cargoSha256 = "1rniihx1rb18n2bp4b2yhn4ayih5cbcyqmiv6jckas7jwrgk6wra"; + cargoSha256 = "0633g8jyhmhs33cdspa46gvmnzl2jfwxylmjfhsvbxznzygb4dw3"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index bc3d54f3b5b..16aa2a3e6a5 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.4"; + version = "2.4.6"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; - rev = "V20404"; - sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa"; + rev = "V20406"; + sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco="; }; enableParallelBuilding = true; |