From e8b1bb78c5abcc8737ee3f3a4ee449a9eca8ee9a Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Thu, 5 Dec 2024 17:05:32 -0800 Subject: [PATCH 1/2] davinci-resolve: migrate to by-name --- .../default.nix => by-name/da/davinci-resolve/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{applications/video/davinci-resolve/default.nix => by-name/da/davinci-resolve/package.nix} (99%) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/by-name/da/davinci-resolve/package.nix similarity index 99% rename from pkgs/applications/video/davinci-resolve/default.nix rename to pkgs/by-name/da/davinci-resolve/package.nix index d98b2c8cd3224..3be3e518ed118 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -278,7 +278,7 @@ buildFHSEnv { ]; text = '' set -o errexit - drv=pkgs/applications/video/davinci-resolve/default.nix + drv=pkgs/by-name/da/davinci-resolve/package.nix currentVersion=${lib.escapeShellArg davinci.version} downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d706ce16a6f..b91e7c9127dc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -972,9 +972,7 @@ with pkgs; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; - davinci-resolve = callPackage ../applications/video/davinci-resolve { }; - - davinci-resolve-studio = callPackage ../applications/video/davinci-resolve { studioVariant = true; }; + davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix { studioVariant = true; }; dehinter = with python3Packages; toPythonApplication dehinter; From 7e90bfdbcbcfeb0c98c7d4ee59ac6d316a79e029 Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Thu, 5 Dec 2024 17:25:25 -0800 Subject: [PATCH 2/2] davinci-resolve: 19.1 -> 19.1.1 --- pkgs/by-name/da/davinci-resolve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 3be3e518ed118..15e7d60255866 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -35,7 +35,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.1"; + version = "19.1.1"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; }) @@ -57,9 +57,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-uEUZt0TQ4XrAag6NoCPUtYSnkwpwh3BNlol1z/EmP9E=" + "sha256-yDkw7L9iTzE5g2XAw910nqtTyXcgcb6u+kP2sKtNcJ8=" else - "sha256-3VVyfXT/mZFuf2GGkNS47ErSdAGpdUUwwwKY19zBBZo="; + "sha256-8oq5Nj8GrdHAmbM6Z5q98a0Lazjymk3dOCITkKiTJvQ="; impureEnvVars = lib.fetchers.proxyImpureEnvVars;