Merge pull request #144507 from AndersonTorres/new-misc

Misc modifications

2 files changed, 55 insertions, 20 deletions

diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
index 6eee4adf1d427..a32f788bf4dca 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -1,4 +1,13 @@
-{ stdenv, lib, fetchFromGitHub, nix, makeWrapper, coreutils, gnutar, gzip, bzip2 }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, bzip2
+, coreutils
+, gnutar
+, gzip
+, makeWrapper
+, nix
+}:
 
 stdenv.mkDerivation rec {
   pname = "nix-bundle";
@@ -13,25 +22,40 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  # coreutils, gnutar is actually needed by nix for bootstrap
-  buildInputs = [ nix coreutils gnutar gzip bzip2 ];
-
-  binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ];
+  # coreutils, gnutar are needed by nix for bootstrap
+  buildInputs = [
+    bzip2
+    coreutils
+    gnutar
+    gzip
+    nix
+  ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
   postInstall = ''
     mkdir -p $out/bin
     makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \
-      --prefix PATH : ${binPath}
-    cp $out/share/nix-bundle/nix-run.sh $out/bin/nix-run
+      --prefix PATH : ${lib.makeBinPath buildInputs}
+    ln -s $out/share/nix-bundle/nix-run.sh $out/bin/nix-run
   '';
 
   meta = with lib; {
-    maintainers = [ maintainers.matthewbauer ];
-    platforms = platforms.all;
+    homepage = "https://github.com/matthewbauer/nix-bundle";
     description = "Create bundles from Nixpkgs attributes";
+    longDescription = ''
+      nix-bundle is a way to package Nix attributes into single-file
+      executables.
+
+      Benefits:
+      - Single-file output
+      - Can be run by non-root users
+      - No runtime
+      - Distro agnostic
+      - No installation
+    '';
     license = licenses.mit;
-    homepage = "https://github.com/matthewbauer/nix-bundle";
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index a735e35624f7c..7e4ce71ec547d 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,23 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, which
+{ lib
+, stdenv
+, fetchFromGitHub
 , darwin ? null
-, xorgproto ? null
+, fontconfig ? null
+, freetype ? null
 , libX11
 , libXext ? null
 , libXt ? null
-, fontconfig ? null
-, freetype ? null
 , perl ? null  # For building web manuals
+, which
+, xorgproto ? null
 }:
 
 stdenv.mkDerivation {
   pname = "plan9port";
-  version = "2021-04-22";
+  version = "0.pre+date=2021-10-19";
 
   src =  fetchFromGitHub {
     owner = "9fans";
     repo = "plan9port";
-    rev = "70cc6e5ba7798b315c3fb3aae19620a01604a459";
-    hash = "sha256-HCn8R9YSocHrpw/xK5n8gsCLSAbAQgw0NtjO9vYIbKo=";
+    rev = "d0d440860f2000a1560abb3f593cdc325fcead4c";
+    hash = "sha256-2aYXqPGwrReyFPrLDtEjgQd/RJjpOfI3ge/tDocYpRQ=";
   };
 
   postPatch = ''
@@ -44,10 +47,18 @@ stdenv.mkDerivation {
   buildInputs = [
     perl
   ] ++ lib.optionals (!stdenv.isDarwin) [
-    xorgproto libX11 libXext libXt fontconfig
-    freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
+    fontconfig
+    freetype # fontsrv wants ft2build.h provides system fonts for acme and sam
+    libX11
+    libXext
+    libXt
+    xorgproto
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    Carbon Cocoa IOKit Metal QuartzCore
+    Carbon
+    Cocoa
+    IOKit
+    Metal
+    QuartzCore
   ]);
 
   builder = ./builder.sh;