From cf0f19b85b8336f741c9afe890ba647cd55ca9f4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:09:44 -0300 Subject: [PATCH 1/6] netsurf.libnsutils: fix URL --- pkgs/applications/networking/browsers/netsurf/libnsutils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index b0d954a00d4..bba457674c7 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + homepage = "https://www.netsurf-browser.org/"; description = "Generalised utility library for netsurf browser"; license = licenses.mit; maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; From 2d70de92f3a5ebbce784900cfa5c339c112e2838 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:10:33 -0300 Subject: [PATCH 2/6] netsurf.libutf8proc: fix URL --- .../networking/browsers/netsurf/libutf8proc.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index c7362b998be..47b53b4781b 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, pkg-config , buildsystem }: @@ -9,10 +12,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; + hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -21,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + homepage = "https://www.netsurf-browser.org/"; description = "UTF8 Processing library for netsurf browser"; license = licenses.mit; maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; From 86fd585091882c515119ad326133ee04ec10b614 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 16:06:34 -0300 Subject: [PATCH 3/6] glpng: reformat --- pkgs/development/libraries/glpng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glpng/default.nix b/pkgs/development/libraries/glpng/default.nix index 1194d988c07..34c58774fb2 100644 --- a/pkgs/development/libraries/glpng/default.nix +++ b/pkgs/development/libraries/glpng/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ libGL libpng @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm"; - description = "PNG loader for OpenGL"; + description = "PNG loader library for OpenGL"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; From 23fcb9a8e2935b18ccbebe4a5bf2f9d376354dc7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:10:52 -0300 Subject: [PATCH 4/6] oroborus: fix URL --- .../window-managers/oroborus/default.nix | 55 ++++++++++++++----- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d24abb68fb7..275db56dada 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,27 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config -, freetype, fribidi -, libSM, libICE, libXt, libXaw, libXmu -, libXext, libXft, libXpm, libXrandr -, libXrender, xorgproto, libXinerama }: +{ lib +, stdenv +, fetchurl +, freetype +, fribidi +, libICE +, libSM +, libXaw +, libXext +, libXft +, libXinerama +, libXmu +, libXpm +, libXrandr +, libXrender +, libXt +, pkg-config +, xorgproto +}: -with lib; stdenv.mkDerivation rec { - pname = "oroborus"; version = "2.0.20"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext - libXft libXpm libXrandr libXrender xorgproto libXinerama ]; - src = fetchurl { url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; - sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j"; + hash = "sha256-UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=a"; }; - meta = { + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + freetype + fribidi + libICE + libSM + libXaw + libXext + libXft + libXinerama + libXmu + libXpm + libXrandr + libXrender + libXt + xorgproto + ]; + + meta = with lib; { + homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; description = "A really minimalistic X window manager"; - homepage = "https://www.oroborus.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From d99becc89324623dd4fef80911343ea8ef024383 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 15:58:13 -0300 Subject: [PATCH 5/6] mksh: fix URL --- pkgs/shells/mksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 360380e19b3..8bdabd4d8c1 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" + "http://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" ]; hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "http://www.mirbsd.org/mksh.htm"; description = "MirBSD Korn Shell"; longDescription = '' The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI @@ -45,7 +46,6 @@ stdenv.mkDerivation rec { also to be readily available under other UNIX(R)-like operating systems. ''; - homepage = "https://www.mirbsd.org/mksh.htm"; license = with licenses; [ miros isc unicode-dfs-2016 ]; maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; From 71d8b8afd86a4c1abfb0edc06726b3f4ac04f4ec Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:18:40 -0300 Subject: [PATCH 6/6] rs: reformat --- pkgs/tools/text/rs/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/tools/text/rs/default.nix index 9aca92922a5..141d72dfe07 100644 --- a/pkgs/tools/text/rs/default.nix +++ b/pkgs/tools/text/rs/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, libbsd }: +{ lib +, stdenv +, fetchurl +, installShellFiles +, libbsd +}: stdenv.mkDerivation rec { pname = "rs"; @@ -9,18 +14,29 @@ stdenv.mkDerivation rec { sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libbsd ]; buildPhase = '' + runHook preBuild + ${stdenv.cc}/bin/cc utf8.c rs.c -o rs -lbsd + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -Dm 755 rs -t $out/bin - install -Dm 644 rs.1 -t $out/share/man/man1 + installManPage rs.1 + + runHook postInstall ''; meta = with lib; { + homepage = "http://www.mirbsd.org/htman/i386/man1/rs.htm"; description = "Reshape a data array from standard input"; longDescription = '' rs reads the standard input, interpreting each line as a row of blank- @@ -43,8 +59,6 @@ stdenv.mkDerivation rec { to control presentation of the output columns, including transposition of the rows and columns. ''; - - homepage = "https://www.mirbsd.org/htman/i386/man1/rs.htm"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix;