veracrypt: 1.26.7 -> 1.26.14, move to pkgs/by-name

+11 -15
+11 -11
pkgs/applications/misc/veracrypt/default.nix pkgs/by-name/ve/veracrypt/package.nix
··· 5 5 , makeself 6 6 , yasm 7 7 , fuse 8 - , wxGTK 8 + , wxGTK32 9 9 , lvm2 10 10 , substituteAll 11 11 , e2fsprogs ··· 16 16 , wrapGAppsHook3 17 17 }: 18 18 19 - stdenv.mkDerivation rec { 19 + stdenv.mkDerivation (finalAttrs: { 20 20 pname = "veracrypt"; 21 - version = "1.26.7"; 21 + version = "1.26.14"; 22 22 23 23 src = fetchurl { 24 - url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; 25 - sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; 24 + url = "https://launchpad.net/veracrypt/trunk/${lib.toLower finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; 25 + hash = "sha256-2oetZxTXF+vdwlJww4txiVAcKvlxjupkp64bwKPMruE="; 26 26 }; 27 27 28 28 patches = [ ··· 40 40 sourceRoot = "src"; 41 41 42 42 nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; 43 - buildInputs = [ fuse lvm2 wxGTK pcsclite ]; 43 + buildInputs = [ fuse lvm2 wxGTK32 pcsclite ]; 44 44 45 45 enableParallelBuilding = true; 46 46 47 47 installPhase = '' 48 - install -Dm 755 Main/${pname} "$out/bin/${pname}" 49 - install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" 50 - install -Dm 444 License.txt -t "$out/share/doc/${pname}/" 48 + install -Dm 755 Main/veracrypt "$out/bin/veracrypt" 49 + install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/veracrypt.xpm" 50 + install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" 51 51 install -d $out/share/applications 52 - substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \ 52 + substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ 53 53 --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ 54 54 --replace "Icon=veracrypt" "Icon=veracrypt.xpm" 55 55 ''; ··· 61 61 maintainers = with maintainers; [ dsferruzza ]; 62 62 platforms = platforms.linux; 63 63 }; 64 - } 64 + })
pkgs/applications/misc/veracrypt/fix-paths.patch pkgs/by-name/ve/veracrypt/fix-paths.patch
-4
pkgs/top-level/all-packages.nix
··· 13885 13885 13886 13886 hitch = callPackage ../servers/hitch { }; 13887 13887 13888 - veracrypt = callPackage ../applications/misc/veracrypt { 13889 - wxGTK = wxGTK32; 13890 - }; 13891 - 13892 13888 veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; 13893 13889 13894 13890 viceroy = callPackage ../development/tools/viceroy {