diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics')
8 files changed, 14 insertions, 83 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 6350cec90e95..81a34579c5b0 100644 --- a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz"; - sha256 = "sha256-Qh4ANf5bOwVKCGXcgjW+P55uLepUGQ2Sa4gKTOBbANg="; + sha256 = "sha256-29GETcRD/l4Q0+mohxROX7ciOFL/8ZHPte963qsOCGs="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/nixpkgs/pkgs/applications/graphics/krita/default.nix b/nixpkgs/pkgs/applications/graphics/krita/default.nix index e8e6a2cc9f86..67d9774a35a9 100644 --- a/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }: -callPackage ./generic.nix (args // { +callPackage ./generic.nix { version = "5.1.5"; kde-channel = "stable"; sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; -}) +} diff --git a/nixpkgs/pkgs/applications/graphics/krita/generic.nix b/nixpkgs/pkgs/applications/graphics/krita/generic.nix index ba53a94f7107..8bf6e26ab9d2 100644 --- a/nixpkgs/pkgs/applications/graphics/krita/generic.nix +++ b/nixpkgs/pkgs/applications/graphics/krita/generic.nix @@ -9,7 +9,6 @@ , version , kde-channel , sha256 -, callPackage }: mkDerivation rec { @@ -17,7 +16,7 @@ mkDerivation rec { inherit version; src = fetchurl { - url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; + url = "mirror://kde/${kde-channel}/krita/${version}/krita-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/applications/graphics/monado/default.nix b/nixpkgs/pkgs/applications/graphics/monado/default.nix index c8c5e5abb37d..d6109079f2ae 100644 --- a/nixpkgs/pkgs/applications/graphics/monado/default.nix +++ b/nixpkgs/pkgs/applications/graphics/monado/default.nix @@ -48,16 +48,16 @@ , serviceSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "monado"; - version = "unstable-2023-08-22"; + version = "unstable-2023-11-09"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6"; - sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8="; + rev = "e983eecd73b1b91d2dfb356e1bc054e9202b2a7f"; + hash = "sha256-a4ukfmJbDkhr7P3NMTfbuhXjyOta3WCc5gswX7KUAw0="; }; nativeBuildInputs = [ @@ -135,16 +135,13 @@ stdenv.mkDerivation rec { patches = [ # We don't have $HOME/.steam when building ./force-enable-steamvr_lh.patch - - # A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado - ./steamvr_lh-use-old-interface.patch ]; meta = with lib; { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ expipiplus1 prusnak ]; + maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; platforms = platforms.linux; mainProgram = "monado-cli"; }; diff --git a/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch b/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch deleted file mode 100644 index d5194956e114..000000000000 --- a/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp -index 24b69fd..5b3a5ca 100644 ---- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp -+++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp -@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver) - vr::EVRInitError err = driver->Activate(0); - VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str()); - -- auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent(vr::IVRDisplayComponent_Version)); -+ auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent("IVRDisplayComponent_003")); - VERIFY(display, "IVRDisplayComponent is null"); - #undef VERIFY - diff --git a/nixpkgs/pkgs/applications/graphics/normcap/default.nix b/nixpkgs/pkgs/applications/graphics/normcap/default.nix deleted file mode 100644 index 820ca9903394..000000000000 --- a/nixpkgs/pkgs/applications/graphics/normcap/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -# From NUR https://github.com/nix-community/nur-combined/blob/6bddae47680482383b5769dd3aa7d82b88e6cbc8/repos/renesat/pkgs/normcap/default.nix - -{ - lib, - stdenv, - python3, - fetchFromGitHub, - tesseract4, - leptonica, - wl-clipboard -}: -python3.pkgs.buildPythonApplication rec { - pname = "normcap"; - version = "0.4.4"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "dynobo"; - repo = "normcap"; - rev = "v${version}"; - hash = "sha256-dShtmoqS9TC3PHuwq24OEOhYfBHGhDCma8Du8QCkFuI="; - }; - - buildInputs = [ - wl-clipboard - ]; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - tesseract4 - leptonica - pyside6 - - # Test - toml - pytest-qt - ]; - - postPatch = '' - substituteInPlace pyproject.toml --replace 'PySide6-Essentials = "6.5.1"' "" - ''; - - meta = with lib; { - description = "OCR powered screen-capture tool to capture information instead of images"; - homepage = "https://dynobo.github.io/normcap/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ cafkafk ]; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix b/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix index 00d41bf9b293..51c0f306f92d 100644 --- a/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix +++ b/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fftw +{ stdenv, lib, fetchFromGitHub, fftw , qtbase, qmake, wrapQtAppsHook }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/graphics/upscayl/default.nix b/nixpkgs/pkgs/applications/graphics/upscayl/default.nix index a892a0263a1e..1b6ea4857791 100644 --- a/nixpkgs/pkgs/applications/graphics/upscayl/default.nix +++ b/nixpkgs/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.9.1"; + version = "2.9.4"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-x7tNGWXrg4hkr4d5QK4Z/cOmGGdbWLJ/GIASZjmiL4w="; + hash = "sha256-H9/z0NIqGGJPipioWvv67vIFQ46RZr5+ycm3NQrO9ZE="; }; appimageContents = appimageTools.extractType2 { |