diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
14 files changed, 75 insertions, 47 deletions
diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 1a0e90546bec..049f4e90b29b 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -76,7 +76,6 @@ buildDotnetModule rec { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "ArchiSteamFarm"; maintainers = with maintainers; [ SuperSandro2000 lom ]; }; diff --git a/nixpkgs/pkgs/applications/misc/albert/default.nix b/nixpkgs/pkgs/applications/misc/albert/default.nix index ceb74f7b0a32..d76231ee8c16 100644 --- a/nixpkgs/pkgs/applications/misc/albert/default.nix +++ b/nixpkgs/pkgs/applications/misc/albert/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.13"; + version = "0.22.14"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-IZpIgU/cf25XxH8J0xQJLASu0YmTmcHY5RxUcbKrtvA="; + sha256 = "sha256-cAxdCjaCqEkwjL+OXW7ONkS7OpKfey3bUYmGzJyV+g8="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index 8e7fde6d9c29..7a6db59bf66d 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -18,10 +18,13 @@ , openpgl , mesa , runCommand +, callPackage }: let - python = python310Packages.python; + pythonPackages = python310Packages; + inherit (pythonPackages) python; + buildEnv = callPackage ./wrapper.nix {}; optix = fetchzip { # url taken from the archlinux blender PKGBUILD url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; @@ -189,7 +192,9 @@ stdenv.mkDerivation (finalAttrs: rec { ''; passthru = { - inherit python; + inherit python pythonPackages; + + withPackages = f: let packages = f pythonPackages; in buildEnv.override { blender = finalAttrs.finalPackage; extraModules = packages; }; tests = { render = runCommand "${pname}-test" { } '' diff --git a/nixpkgs/pkgs/applications/misc/blender/wrapper.nix b/nixpkgs/pkgs/applications/misc/blender/wrapper.nix index 3828d61a8645..7450827a8fa9 100644 --- a/nixpkgs/pkgs/applications/misc/blender/wrapper.nix +++ b/nixpkgs/pkgs/applications/misc/blender/wrapper.nix @@ -2,32 +2,28 @@ , lib , blender , makeWrapper -, python3Packages +, extraModules ? [] }: -{ name ? "wrapped" -, packages ? [] -}: -stdenv.mkDerivation { - pname = "blender-${name}"; - inherit (blender) version; +stdenv.mkDerivation (finalAttrs: { + pname = blender.pname + "-wrapped"; src = blender; - nativeBuildInputs = [ python3Packages.wrapPython makeWrapper ]; + inherit (blender) version meta; + + nativeBuildInputs = [ blender.pythonPackages.wrapPython makeWrapper ]; installPhase = '' mkdir $out/{share/applications,bin} -p - sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop + sed 's/Exec=blender/Exec=${finalAttrs.finalPackage.pname}/g' $src/share/applications/blender.desktop > $out/share/applications/${finalAttrs.finalPackage.pname}.desktop cp -r $src/share/blender $out/share cp -r $src/share/doc $out/share cp -r $src/share/icons $out/share buildPythonPath "$pythonPath" - makeWrapper ${blender}/bin/blender $out/bin/blender-${name} \ + makeWrapper ${blender}/bin/blender $out/bin/${finalAttrs.finalPackage.pname} \ --prefix PATH : $program_PATH \ --prefix PYTHONPATH : $program_PYTHONPATH ''; - pythonPath = packages; - - meta = blender.meta; -} + pythonPath = extraModules; +}) diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 8ee00acc7536..ef9be284b59d 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.120.2"; + version = "0.120.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hCcutRfx0GtnYJYoQ/2S8Y+OmxLCtHWzTCdozWUatXY="; + hash = "sha256-96ikGGKw9IN/ch199oFcucp8aVR+fEiAWBeu39J2Osw="; }; - vendorHash = "sha256-59Q7IN7VK7tQv5w7qyxSz16G+Kmsrslu8we9S3aJeAg="; + vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/keepass/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix index d9f6e5913ff4..b16ff896b6fa 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.54"; + version = "2.55"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg="; + hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/applications/misc/keepassxc/default.nix b/nixpkgs/pkgs/applications/misc/keepassxc/default.nix index ef1baa1e853c..ed7884ad2562 100644 --- a/nixpkgs/pkgs/applications/misc/keepassxc/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepassxc/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato srapenne blankparticle ]; + maintainers = with maintainers; [ jonafato blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index 4dffe9e08eb6..ad694c01cdcb 100644 --- a/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; description = "A simple GOG client for Linux"; license = licenses.gpl3; - maintainers = with maintainers; [ srapenne ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 810b13afbf2a..e7daa60198d1 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -3,6 +3,7 @@ , callPackage , lib , fetchFromGitHub +, fetchPypi , python3 , substituteAll , nix-update-script @@ -16,6 +17,30 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # Due to flask > 2.3 the login will not work + self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = fetchPypi { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + }; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + }); + } + ) + # Built-in dependency ( self: super: { diff --git a/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/nixpkgs/pkgs/applications/misc/otpclient/default.nix index b313ab2fa1a2..04794635cdfb 100644 --- a/nixpkgs/pkgs/applications/misc/otpclient/default.nix +++ b/nixpkgs/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.1.9"; + version = "3.2.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg="; + hash = "sha256-3ypEP5HQYXOyB2euvDDpKjpbCD67oE19wkmzQbyKxiI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/slstatus/default.nix b/nixpkgs/pkgs/applications/misc/slstatus/default.nix index 4f022d81f62c..83407f94fcb6 100644 --- a/nixpkgs/pkgs/applications/misc/slstatus/default.nix +++ b/nixpkgs/pkgs/applications/misc/slstatus/default.nix @@ -7,29 +7,32 @@ , libXau , libXdmcp , conf ? null -, patches ? [] +, patches ? [ ] }: stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2022-12-19"; + version = "1.0"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; - hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; + rev = version; + hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4="; }; - configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = '' - ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} - makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) - ''; + preBuild = + let + configFile = if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; + in + '' + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} + makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) + ''; inherit patches; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXdmcp]; + buildInputs = [ libX11 libXau libXdmcp ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix index d2e49ee8fb90..e82e7a266fb7 100644 --- a/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -68,24 +68,24 @@ let libcava.src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; - rev = "0.8.5"; - hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo="; + rev = "0.9.1"; + hash = "sha256-FnRJJV0poRmw+y4nt1X7Z0ipX86LRK1TJhNKHFk0rTw="; }; in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.9.22"; + version = "0.9.24"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-9LJDA+zrHF9Mn8+W9iUw50LvO+xdT7/l80KdltPrnDo="; + hash = "sha256-JhLKGzqZ8akWcyHTav2TGcGmXk9dy9Xj4+/oFCPeNU0="; }; postUnpack = lib.optional cavaSupport '' pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5 + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.9.1 patchShebangs . popd ''; diff --git a/nixpkgs/pkgs/applications/misc/xastir/default.nix b/nixpkgs/pkgs/applications/misc/xastir/default.nix index abb5d0b96096..21990075183d 100644 --- a/nixpkgs/pkgs/applications/misc/xastir/default.nix +++ b/nixpkgs/pkgs/applications/misc/xastir/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.8"; + version = "2.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - hash = "sha256-hRe0KO1lWOv3hNNDMS70t+X1rxuhNlNKykmo4LEU+U0="; + hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/ydict/default.nix b/nixpkgs/pkgs/applications/misc/ydict/default.nix index 93b06323e0f4..1c57456f4a19 100644 --- a/nixpkgs/pkgs/applications/misc/ydict/default.nix +++ b/nixpkgs/pkgs/applications/misc/ydict/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ydict"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "ydict"; rev = "v${version}"; - sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; + sha256 = "sha256-FcrkfWE1m5OveK4YPgVmUbL/jkh2NEs9bfeCHm2H9P8="; }; vendorHash = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; |