From e08f1da4a653b69b42e3dd80362a6748e1d1538c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 19:29:24 -0600 Subject: [PATCH 1/4] asleap: format --- pkgs/tools/networking/asleap/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/asleap/default.nix b/pkgs/tools/networking/asleap/default.nix index 64494ede9c59..fc7dbb54ace5 100644 --- a/pkgs/tools/networking/asleap/default.nix +++ b/pkgs/tools/networking/asleap/default.nix @@ -1,4 +1,11 @@ -{lib, stdenv, fetchFromGitHub, openssl, libpcap, libxcrypt}: +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + libpcap, + libxcrypt, +}: stdenv.mkDerivation rec { pname = "asleap"; @@ -11,7 +18,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8="; }; - buildInputs = [ openssl libpcap libxcrypt ]; + buildInputs = [ + openssl + libpcap + libxcrypt + ]; installPhase = '' install -Dm755 asleap $out/bin/asleap From 7c1cc43d50ec4d51004ffa815341ab4a33010730 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 19:30:13 -0600 Subject: [PATCH 2/4] asleap: modernize --- pkgs/tools/networking/asleap/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/asleap/default.nix b/pkgs/tools/networking/asleap/default.nix index fc7dbb54ace5..a090dc97eece 100644 --- a/pkgs/tools/networking/asleap/default.nix +++ b/pkgs/tools/networking/asleap/default.nix @@ -7,13 +7,13 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "asleap"; version = "unstable-2021-06-20"; src = fetchFromGitHub { owner = "zackw"; - repo = pname; + repo = "asleap"; rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f"; sha256 = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8="; }; @@ -25,14 +25,18 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + install -Dm755 asleap $out/bin/asleap install -Dm755 genkeys $out/bin/genkeys + + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/zackw/asleap"; description = "Recovers weak LEAP and PPTP passwords"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ pyrox0 ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } From 29145be6a7900733f43b8dc219f4b755603a1018 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 19:32:44 -0600 Subject: [PATCH 3/4] asleap: add meta.platforms Has linux only headers, marking that as the only platform. --- pkgs/tools/networking/asleap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/asleap/default.nix b/pkgs/tools/networking/asleap/default.nix index a090dc97eece..d488537665b6 100644 --- a/pkgs/tools/networking/asleap/default.nix +++ b/pkgs/tools/networking/asleap/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { description = "Recovers weak LEAP and PPTP passwords"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ pyrox0 ]; + platforms = lib.platforms.linux; }; } From 67c5af53ba46f760b42bd25eeec7e512e1420b0e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 19:33:27 -0600 Subject: [PATCH 4/4] asleap: move to by-name --- .../asleap/default.nix => by-name/as/asleap/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/asleap/default.nix => by-name/as/asleap/package.nix} (100%) diff --git a/pkgs/tools/networking/asleap/default.nix b/pkgs/by-name/as/asleap/package.nix similarity index 100% rename from pkgs/tools/networking/asleap/default.nix rename to pkgs/by-name/as/asleap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 324161235eb4..a35335737183 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1634,8 +1634,6 @@ with pkgs; askalono = callPackage ../tools/misc/askalono { }; - asleap = callPackage ../tools/networking/asleap { }; - awsbck = callPackage ../tools/backup/awsbck { inherit (darwin.apple_sdk.frameworks) Security; };