Unverified Commit 7796d958 authored by Donovan Glover's avatar Donovan Glover Committed by GitHub
Browse files

davinci-resolve: migrate to by-name & 19.1 -> 19.1.1 (#362268)

parents 634fd468 7e90bfdb

pkgs/applications/video/davinci-resolve/default.nix→pkgs/by-name/da/davinci-resolve/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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)"

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -970,9 +970,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;