From d23b60093f7e976dd445ce59c0fb93f3f32a7233 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 20:40:32 +0100 Subject: [PATCH 1/6] tinyssh: use finalAttrs pattern --- pkgs/by-name/ti/tinyssh/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix index c0c36934616f..8a3efbd50d53 100644 --- a/pkgs/by-name/ti/tinyssh/package.nix +++ b/pkgs/by-name/ti/tinyssh/package.nix @@ -3,14 +3,14 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinyssh"; version = "20241201"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bcQDKDpd7HFnmJAyqcO+BQMGV1pCHuS+OhFPJSOMInI="; }; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Minimalistic SSH server"; homepage = "https://tinyssh.org"; - changelog = "https://github.com/janmojzis/tinyssh/releases/tag/${version}"; + changelog = "https://github.com/janmojzis/tinyssh/releases/tag/${finalAttrs.version}"; license = licenses.cc0; platforms = platforms.unix; maintainers = with maintainers; [ kaction ]; }; -} +}) From 8605917fd3186aac9461b3f4b3b204f47a8fd0d3 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 20:41:44 +0100 Subject: [PATCH 2/6] tinyssh: remove use of with lib; --- pkgs/by-name/ti/tinyssh/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix index 8a3efbd50d53..32f6d9bbc9d2 100644 --- a/pkgs/by-name/ti/tinyssh/package.nix +++ b/pkgs/by-name/ti/tinyssh/package.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: { DESTDIR = placeholder "out"; - meta = with lib; { + meta = { description = "Minimalistic SSH server"; homepage = "https://tinyssh.org"; changelog = "https://github.com/janmojzis/tinyssh/releases/tag/${finalAttrs.version}"; - license = licenses.cc0; - platforms = platforms.unix; - maintainers = with maintainers; [ kaction ]; + license = lib.licenses.cc0; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ kaction ]; }; }) From 483867f4ddc9cb3c1801868b60eb083bb79f17e4 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 20:42:17 +0100 Subject: [PATCH 3/6] =?UTF-8?q?tinyssh:=20re=E2=80=90format=20according=20?= =?UTF-8?q?to=20RFC=20166?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ti/tinyssh/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix index 32f6d9bbc9d2..a48838218a2f 100644 --- a/pkgs/by-name/ti/tinyssh/package.nix +++ b/pkgs/by-name/ti/tinyssh/package.nix @@ -1,6 +1,7 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { From ab59e23be5d357173a69b646bb5d9f176eec1eec Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 20:42:54 +0100 Subject: [PATCH 4/6] tinyssh: provide update script --- pkgs/by-name/ti/tinyssh/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix index a48838218a2f..0b5f8c56a5de 100644 --- a/pkgs/by-name/ti/tinyssh/package.nix +++ b/pkgs/by-name/ti/tinyssh/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: { DESTDIR = placeholder "out"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Minimalistic SSH server"; homepage = "https://tinyssh.org"; From 78fc3ac69446f584c924e7b84b8b6d4ff104894a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 23:36:39 +0100 Subject: [PATCH 5/6] tinyssh: correct installation path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With version 20241201 the Makefile was completely re‐written so that the previous path configuration through the conf-bin and conf-man files would not have any effect. The binaries and man pages would be installed with a default prefix of /usr/local. The installation prefix is now supplied through a PREFIX make variable. --- pkgs/by-name/ti/tinyssh/package.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix index 0b5f8c56a5de..f0d0b8141b6b 100644 --- a/pkgs/by-name/ti/tinyssh/package.nix +++ b/pkgs/by-name/ti/tinyssh/package.nix @@ -16,14 +16,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-bcQDKDpd7HFnmJAyqcO+BQMGV1pCHuS+OhFPJSOMInI="; }; - preConfigure = '' - echo /bin > conf-bin - echo /share/man > conf-man - ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; - DESTDIR = placeholder "out"; + installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = nix-update-script { }; From b0fcfd46b5343a4e9e40dd0c0975715981980f40 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 20:48:27 +0100 Subject: [PATCH 6/6] tinyssh: 20241201 -> 20250201 --- pkgs/by-name/ti/tinyssh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix index f0d0b8141b6b..1599baf96d33 100644 --- a/pkgs/by-name/ti/tinyssh/package.nix +++ b/pkgs/by-name/ti/tinyssh/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyssh"; - version = "20241201"; + version = "20250201"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; tag = finalAttrs.version; - hash = "sha256-bcQDKDpd7HFnmJAyqcO+BQMGV1pCHuS+OhFPJSOMInI="; + hash = "sha256-HX531QjRrDG4dshqzR03naZptUYnoZLEdv/CGpKOaD0="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";