From 051f75f1a9de50a16c2c26e62fb6edc2511ddbfe Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 25 Sep 2024 11:38:22 -0600 Subject: [PATCH 1/4] veracrypt: 1.26.7 -> 1.26.14, move to pkgs/by-name --- .../ve}/veracrypt/fix-paths.patch | 0 .../ve/veracrypt/package.nix} | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 11 insertions(+), 15 deletions(-) rename pkgs/{applications/misc => by-name/ve}/veracrypt/fix-paths.patch (100%) rename pkgs/{applications/misc/veracrypt/default.nix => by-name/ve/veracrypt/package.nix} (68%) diff --git a/pkgs/applications/misc/veracrypt/fix-paths.patch b/pkgs/by-name/ve/veracrypt/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/veracrypt/fix-paths.patch rename to pkgs/by-name/ve/veracrypt/fix-paths.patch diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/by-name/ve/veracrypt/package.nix similarity index 68% rename from pkgs/applications/misc/veracrypt/default.nix rename to pkgs/by-name/ve/veracrypt/package.nix index a7b0eed9037b..8e54871fbef1 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -5,7 +5,7 @@ , makeself , yasm , fuse -, wxGTK +, wxGTK32 , lvm2 , substituteAll , e2fsprogs @@ -16,13 +16,13 @@ , wrapGAppsHook3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.7"; + version = "1.26.14"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; + url = "https://launchpad.net/veracrypt/trunk/${lib.toLower finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; + hash = "sha256-2oetZxTXF+vdwlJww4txiVAcKvlxjupkp64bwKPMruE="; }; patches = [ @@ -40,16 +40,16 @@ stdenv.mkDerivation rec { sourceRoot = "src"; nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK pcsclite ]; + buildInputs = [ fuse lvm2 wxGTK32 pcsclite ]; enableParallelBuilding = true; installPhase = '' - install -Dm 755 Main/${pname} "$out/bin/${pname}" - install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" - install -Dm 444 License.txt -t "$out/share/doc/${pname}/" + install -Dm 755 Main/veracrypt "$out/bin/veracrypt" + install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/veracrypt.xpm" + install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" install -d $out/share/applications - substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \ + substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca02a560764..5fe67c47924e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13885,10 +13885,6 @@ with pkgs; hitch = callPackage ../servers/hitch { }; - veracrypt = callPackage ../applications/misc/veracrypt { - wxGTK = wxGTK32; - }; - veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; viceroy = callPackage ../development/tools/viceroy { From 202021faf6417a8da47b534538e9e753ddbdd8ac Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 25 Sep 2024 11:41:20 -0600 Subject: [PATCH 2/4] veracrypt: format using nixfmt-rfc-style --- pkgs/by-name/ve/veracrypt/package.nix | 52 +++++++++++++++++---------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 8e54871fbef1..87b1d5a9025e 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, makeself -, yasm -, fuse -, wxGTK32 -, lvm2 -, substituteAll -, e2fsprogs -, exfat -, ntfs3g -, btrfs-progs -, pcsclite -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchurl, + pkg-config, + makeself, + yasm, + fuse, + wxGTK32, + lvm2, + substituteAll, + e2fsprogs, + exfat, + ntfs3g, + btrfs-progs, + pcsclite, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -39,8 +40,18 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK32 pcsclite ]; + nativeBuildInputs = [ + makeself + pkg-config + yasm + wrapGAppsHook3 + ]; + buildInputs = [ + fuse + lvm2 + wxGTK32 + pcsclite + ]; enableParallelBuilding = true; @@ -57,7 +68,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; + license = with licenses; [ + asl20 # and + unfree # TrueCrypt License version 3.0 + ]; maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; }; From ef7956291fd5ca30f7d5fdf66c1012e7ff1efb4b Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 25 Sep 2024 11:42:24 -0600 Subject: [PATCH 3/4] veracrypt: remove `with lib;`, add myself as maintainer --- pkgs/by-name/ve/veracrypt/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 87b1d5a9025e..192ef1832726 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -65,14 +65,17 @@ stdenv.mkDerivation (finalAttrs: { --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; - meta = with lib; { + meta = { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # and unfree # TrueCrypt License version 3.0 ]; - maintainers = with maintainers; [ dsferruzza ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + dsferruzza + ryand56 + ]; + platforms = lib.platforms.linux; }; }) From 3f03d48cd36cbfe568ad408bbd3ab4a0ce86c916 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sat, 28 Sep 2024 16:03:34 -0600 Subject: [PATCH 4/4] veracrypt: 1.26.14 -> 1.26.15 --- pkgs/by-name/ve/veracrypt/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 192ef1832726..fc41522a4b20 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.14"; + version = "1.26.15"; src = fetchurl { - url = "https://launchpad.net/veracrypt/trunk/${lib.toLower finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; - hash = "sha256-2oetZxTXF+vdwlJww4txiVAcKvlxjupkp64bwKPMruE="; + url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; + hash = "sha256-upcCUDDiG5sjMbfrCJcBFjwyr0t+BFNfM1uvjXSnSRY="; }; patches = [ @@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: { install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" install -d $out/share/applications substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ - --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ - --replace "Icon=veracrypt" "Icon=veracrypt.xpm" + --replace-fail "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ + --replace-fail "Icon=veracrypt" "Icon=veracrypt.xpm" ''; meta = {