diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/cherrytree/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/hugo/default.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/misc/kord/Cargo.lock | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/kord/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/snagboot/default.nix | 8 |
6 files changed, 33 insertions, 18 deletions
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index c591c65e92f29..4cf0d0336662b 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -14,17 +14,19 @@ , curl , libuchardet , spdlog +, fribidi +, vte }: stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.49"; + version = "0.99.55"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-p7kiOxy4o0RwmN3LFfLSpkz08KcYYMVxVAEUvAX1KEA="; + hash = "sha256-1ytph2HTwIqVTD6+a5P1gvFG+2xsfZWRkmn7RpwuwKY="; }; nativeBuildInputs = [ @@ -44,6 +46,8 @@ stdenv.mkDerivation rec { curl libuchardet spdlog + fribidi + vte ]; meta = with lib; { diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index a42fb298df010..488b64185b6ed 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -16,7 +16,6 @@ , maven , webkitgtk_4_1 , glib-networking -, javaPackages }: let @@ -24,9 +23,7 @@ let jdk = jdk17; }; in -(javaPackages.mavenfod.override { - maven = mavenJdk17; -}) rec { +mavenJdk17.buildMavenPackage rec { pname = "dbeaver"; version = "22.2.2"; # When updating also update mvnHash @@ -37,7 +34,7 @@ in hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI="; }; - mvnHash = "sha256-87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ="; + mvnHash = "sha256-ERZYDsPxp1YXteSmunFIgTGZUYqjZJhqrNytLnIUNBQ="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 5523b1277dffd..c30ac28863f4d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,17 +1,25 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, buildPackages }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, buildPackages +, testers +, hugo +}: buildGoModule rec { pname = "hugo"; - version = "0.113.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-oKGRbgr4jaau6wfo6Q/yhYgambGa+wb3ENtk6wrb0J0="; + hash = "sha256-ofHBpRXgfT8nadAtW0RWbuHhjtANX7gXqZoLLBrRarU="; }; - vendorHash = "sha256-+eVaV6iGsubMt6cq0lKP0i69BlYW8jwx6lT6rwhZAoA="; + vendorHash = "sha256-sogMGgBXB1cHbDbapbX/PvvOHRgzzT8s4h2xsX4irpM="; doCheck = false; @@ -34,6 +42,12 @@ buildGoModule rec { --zsh <(${emulator} $out/bin/hugo completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = hugo; + command = "hugo version"; + version = "v${version}"; + }; + meta = with lib; { description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; diff --git a/pkgs/applications/misc/kord/Cargo.lock b/pkgs/applications/misc/kord/Cargo.lock index 13161c2b397a5..1d2a4d61c1409 100644 --- a/pkgs/applications/misc/kord/Cargo.lock +++ b/pkgs/applications/misc/kord/Cargo.lock @@ -1528,7 +1528,7 @@ dependencies = [ [[package]] name = "kord" -version = "0.5.16" +version = "0.6.1" dependencies = [ "anyhow", "async-trait", diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index b7d2b434d62ed..e49a9c2176c29 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { pname = "kord"; - version = "0.5.16"; + version = "0.6.1"; # kord depends on nightly features RUSTC_BOOTSTRAP = 1; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { owner = "twitchax"; repo = "kord"; rev = "v${version}"; - sha256 = "sha256-gI88fweOT2t+4cj58/mLygtTnue2Ai1QSC5oZf7Xv/g="; + sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84="; }; cargoLock = { diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 5618078d419c5..35ac8b28aa994 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snagboot"; - version = "1.0"; + version = "1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "bootlin"; repo = "snagboot"; rev = "v${version}"; - hash = "sha256-QqGeELm2seX3tIKQvuXp9VsNDah+m9FNcaEVk6TMP0U="; + hash = "sha256-MU6LzjH6s2MS7T3u1OUeJ5ZmWgL0otA/q0ylwTNH4fA="; }; passthru = { @@ -56,14 +56,14 @@ python3.pkgs.buildPythonApplication rec { ]; postInstall = lib.optionalString stdenv.isLinux '' - rules="src/snagrecover/80-snagboot.rules" + rules="src/snagrecover/50-snagboot.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." exit 1 fi mkdir -p "$out/lib/udev/rules.d" - cp "$rules" "$out/lib/udev/rules.d/80-snagboot.rules" + cp "$rules" "$out/lib/udev/rules.d/50-snagboot.rules" ''; # There are no tests |