From d17985f4e8acae94eb78435b43a877db65fa0247 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 17:39:12 -0300 Subject: [PATCH 1/5] so: migrate to by-name --- .../tools/so/default.nix => by-name/so/so/package.nix} | 5 ++++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{development/tools/so/default.nix => by-name/so/so/package.nix} (90%) diff --git a/pkgs/development/tools/so/default.nix b/pkgs/by-name/so/so/package.nix similarity index 90% rename from pkgs/development/tools/so/default.nix rename to pkgs/by-name/so/so/package.nix index 30563875a22c..1cdc4dc6efa9 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/by-name/so/so/package.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in rustPlatform.buildRustPackage rec { pname = "so"; version = "0.4.9"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 851354af31df..0d1461909ef6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12678,10 +12678,6 @@ with pkgs; snort = callPackage ../applications/networking/ids/snort { }; - so = callPackage ../development/tools/so { - inherit (darwin.apple_sdk.frameworks) Security; - }; - soapui = callPackage ../applications/networking/soapui { jdk = if stdenv.isDarwin then (jdk11.override { enableJavaFX = true; }) From 3fafb7e306415c69a92431ee50d6ef2dcf691c73 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 18:09:31 -0300 Subject: [PATCH 2/5] so: remove mredaelli from meta.maintainers Since theey is inactive. --- pkgs/by-name/so/so/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index 1cdc4dc6efa9..67eaaefdea97 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -22,10 +22,11 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { + meta = { description = "TUI interface to the StackExchange network"; mainProgram = "so"; homepage = "https://github.com/samtay/so"; - license = licenses.mit; - maintainers = with maintainers; [ mredaelli ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } From 0fde31852888cd24aaece756797cbe9b13f0c58f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 18:16:12 -0300 Subject: [PATCH 3/5] so: adopt and rework - get rid of rec - strictDeps - nixfmt-rfc-style - meta.changelog --- pkgs/by-name/so/so/package.nix | 42 +++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index 67eaaefdea97..30b769bae65f 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -1,32 +1,48 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, darwin }: +{ + lib, + darwin, + fetchFromGitHub, + libiconv, + openssl, + pkg-config, + rustPlatform, + stdenv, +}: let inherit (darwin.apple_sdk.frameworks) Security; -in -rustPlatform.buildRustPackage rec { - pname = "so"; version = "0.4.9"; +in +rustPlatform.buildRustPackage { + pname = "so"; + inherit version; src = fetchFromGitHub { owner = "samtay"; - repo = pname; + repo = "so"; rev = "v${version}"; - sha256 = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8="; + hash = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8="; }; cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - libiconv Security - ]; - meta = with lib; { + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; + + strictDeps = true; + meta = { - description = "TUI interface to the StackExchange network"; - mainProgram = "so"; homepage = "https://github.com/samtay/so"; + description = "TUI to StackExchange network"; + changelog = "https://github.com/samtay/so/blob/main/CHANGELOG.md"; + mainProgram = "so"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } From 59f7d71c0a3d84f16727e317597a60304431f7e4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 18:25:00 -0300 Subject: [PATCH 4/5] so: use self pattern So that we do not need to call itself as input parameter to testVersion. --- pkgs/by-name/so/so/package.nix | 81 ++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index 30b769bae65f..b6796c6e9493 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -7,42 +7,55 @@ pkg-config, rustPlatform, stdenv, + testers, }: let inherit (darwin.apple_sdk.frameworks) Security; - version = "0.4.9"; + self = rustPlatform.buildRustPackage { + pname = "so"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = "samtay"; + repo = "so"; + rev = "v${self.version}"; + hash = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8="; + }; + + cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; + + strictDeps = true; + + passthru = { + tests = { + version = testers.testVersion { + package = self; + command = '' + export HOME=$TMP + so --version + ''; + }; + }; + }; + + meta = { + homepage = "https://github.com/samtay/so"; + description = "TUI to StackExchange network"; + changelog = "https://github.com/samtay/so/blob/main/CHANGELOG.md"; + mainProgram = "so"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + }; in -rustPlatform.buildRustPackage { - pname = "so"; - inherit version; - - src = fetchFromGitHub { - owner = "samtay"; - repo = "so"; - rev = "v${version}"; - hash = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8="; - }; - - cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - libiconv - Security - ]; - - strictDeps = true; - - meta = { - homepage = "https://github.com/samtay/so"; - description = "TUI to StackExchange network"; - changelog = "https://github.com/samtay/so/blob/main/CHANGELOG.md"; - mainProgram = "so"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} +self From 77debe793e5ce257c309da0daaf2c67d3c04d687 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 18:29:40 -0300 Subject: [PATCH 5/5] so: 0.4.9 -> 0.4.10 --- pkgs/by-name/so/so/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index b6796c6e9493..ce5077932b05 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -14,16 +14,18 @@ let inherit (darwin.apple_sdk.frameworks) Security; self = rustPlatform.buildRustPackage { pname = "so"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { + pname = "so-source"; + inherit (self) version; owner = "samtay"; repo = "so"; rev = "v${self.version}"; - hash = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8="; + hash = "sha256-25jZEo1C9XF4m9YzDwtecQy468nHyv2wnRuK5oY2siU="; }; - cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o="; + cargoHash = "sha256-F9DNY0jKhH6aQRqlXq6MEMoFa1qtvAdL5lSEsql6gcI="; nativeBuildInputs = [ pkg-config ];