diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f01e02146b9a..bd906c481c0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8387,6 +8387,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hogcycle = { + email = "nate@gysli.ng"; + github = "hogcycle"; + githubId = 57007241; + name = "hogcycle"; + }; holgerpeters = { name = "Holger Peters"; email = "holger.peters@posteo.de"; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 3966ef036bec..f320e78a9106 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -110,7 +110,7 @@ in users.groups."${cfg.group}" = { }; systemd.tmpfiles.rules = [ - "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -" + "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" ]; systemd.services.gollum = { diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 4e8ed9bd0c6c..a27296711906 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { name = "Session"; desktopName = "Session"; comment = "Onion routing based messenger"; - exec = "${appimage}/bin/session-desktop-${version}"; + exec = "session-desktop"; icon = "${appimage-contents}/session-desktop.png"; terminal = false; type = "Application"; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index fb0ba1595526..69a94efbbd8a 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,22 +1,39 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib -, defusedxml, future, ujson, packaging, psutil, setuptools -# Optional dependencies: -, bottle, pysnmp -, hddtemp -, netifaces # IP module -, py-cpuinfo +{ + stdenv, + buildPythonApplication, + fetchFromGitHub, + isPyPy, + lib, + defusedxml, + future, + ujson, + packaging, + psutil, + setuptools, + pydantic, + # Optional dependencies: + fastapi, + jinja2, + orjson, + pysnmp, + hddtemp, + netifaces, # IP module + py-cpuinfo, + uvicorn, + requests, + prometheus-client, }: buildPythonApplication rec { pname = "glances"; - version = "4.0.6"; + version = "4.0.7"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - hash = "sha256-FkAMsfr/bO7Chemw4hhVt2SKkSyPLECNVuOsOxKWsGE="; + hash = "sha256-Vfsco8Wno57aPM7PtwCc/gI+6FnAG3H/t5OAUngDU5o="; }; # On Darwin this package segfaults due to mismatch of pure and impure @@ -24,7 +41,9 @@ buildPythonApplication rec { # scripts a workaround below is still required. # Relevant: https://github.com/NixOS/nixpkgs/issues/24693 makeWrapperArgs = lib.optionals stdenv.isDarwin [ - "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks" + "--set" + "DYLD_FRAMEWORK_PATH" + "/System/Library/Frameworks" ]; doCheck = true; @@ -33,7 +52,6 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - bottle defusedxml future ujson @@ -43,14 +61,25 @@ buildPythonApplication rec { pysnmp setuptools py-cpuinfo + pydantic + fastapi + uvicorn + requests + jinja2 + orjson + prometheus-client ] ++ lib.optional stdenv.isLinux hddtemp; - meta = with lib; { + meta = { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; mainProgram = "glances"; changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ jonringer primeos koral ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ + jonringer + primeos + koral + ]; }; } diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index e20797546f1a..209f700a376a 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.15"; + version = "3.5.16"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-1mE4ZXGAMZl2Mufr47y+2UMDHBelqsvChaCsQDK3m70="; + hash = "sha256-uAoD6tW1lSMt5X6hzouZ1qWzImmg4VAMy663BLcOALs="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-5BazSJGsafSl0eE7GOWw2SrVgC3k1tlrLiIFIpC51/o="; + cargoHash = "sha256-610gS1T7i5rBEWeWzolRz/mUTGw5EJf1B68CWc4gkm4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/yo/yoink/package.nix b/pkgs/by-name/yo/yoink/package.nix new file mode 100644 index 000000000000..83c767fe0c17 --- /dev/null +++ b/pkgs/by-name/yo/yoink/package.nix @@ -0,0 +1,28 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +let + version = "0.5.0"; +in +buildGoModule { + pname = "yoink"; + inherit version; + + src = fetchFromGitHub { + owner = "MrMarble"; + repo = "yoink"; + rev = "v${version}"; + hash = "sha256-9ftlAECywF4khH279h2qcSvKRDQX2I7GDQ7EYcEybL0="; + }; + + vendorHash = "sha256-cnfh2D/k4JP9BNlI+6FVLBFyk5XMIYG/DotUdAZaY0Q="; + + meta = { + homepage = "https://github.com/MrMarble/yoink"; + description = "Automatically download freeleech torrents"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hogcycle ]; + }; +} diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 20f4f5855a35..8ed49e7c2203 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -2,10 +2,10 @@ let - major = "2023"; - minor = "06"; - patch.seriousproton = "17"; - patch.emptyepsilon = "17"; + major = "2024"; + minor = "05"; + patch.seriousproton = "16"; + patch.emptyepsilon = "16"; version.seriousproton = "${major}.${minor}.${patch.seriousproton}"; version.emptyepsilon = "${major}.${minor}.${patch.emptyepsilon}"; @@ -26,7 +26,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version.seriousproton}"; - sha256 = "sha256-5ifYb5dX8ihQmJB1RHyzMsZJeXZ+m27JmA+W+XA/XwI="; + sha256 = "sha256-0gCwWvx7ceJG3VmVVufRkwreuHn41pl7jHsJXzNwqaE="; }; nativeBuildInputs = [ cmake ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version.emptyepsilon}"; - sha256 = "sha256-zuXbCBlv6URndbB0aA+3bli0cSeUBf3LT/7/jcPITnc="; + sha256 = "sha256-pLnyzahGEPb2cEwH89RE5Jq8UHIoDWXatmDWdeZ+rqo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index 619a891ea38f..784d32b20c45 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, callPackage, ejson2env }: buildGoModule rec { pname = "ejson2env"; @@ -19,7 +19,13 @@ buildGoModule rec { "-X main.version=${version}" ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { package = ejson2env; }; + decryption = callPackage ./test-decryption.nix {}; + }; + }; meta = with lib; { description = "Decrypt EJSON secrets and export them as environment variables"; diff --git a/pkgs/tools/admin/ejson2env/test-decryption.nix b/pkgs/tools/admin/ejson2env/test-decryption.nix new file mode 100644 index 000000000000..d4402a68f9d6 --- /dev/null +++ b/pkgs/tools/admin/ejson2env/test-decryption.nix @@ -0,0 +1,19 @@ +{ ejson2env, runCommand }: +runCommand "check-ejson2env.sh" { + nativeBuildInputs = [ ejson2env ]; +} '' + cat > $TMP/abc.ejson <