Merge master into staging-next

2021-05-17 06:22:23 +00:00
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, perl, unzip }:
+{ lib, stdenv, fetchFromGitHub, perl }:

 stdenv.mkDerivation rec {
  pname = "zpaq";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
  };

-  nativeBuildInputs = [ perl /* for pod2man */ unzip ];
+  nativeBuildInputs = [ perl /* for pod2man */ ];

  preBuild = let
    CPPFLAGS = with stdenv; ""
@@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication {
    description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI";
    homepage = "http://das.nasophon.de/mididings";
    license = licenses.gpl2;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = platforms.linux;
  };
 }
@@ -22,6 +22,6 @@ mkDerivation rec {
    homepage = src.meta.homepage;
    license = licenses.gpl3;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ gnidorah ];
+    maintainers = with maintainers; [ ];
  };
 }
@@ -29,7 +29,7 @@ in pythonPackages.buildPythonApplication rec {
    description = "Youtube synthesia video to midi conversion tool";
    homepage = src.meta.homepage;
    license = licenses.gpl3;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = platforms.linux;
  };
 }
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Cosmic recursive fractal flames";
    homepage = "https://flam3.com/";
-    maintainers = [ maintainers.nand0p ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
    license = licenses.gpl3Plus;
  };
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "GL Easy Extension Library";
    homepage = "https://sourceforge.net/p/glee/glee/";
-    maintainers = with maintainers; [ nand0p ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
    license = licenses.gpl3;
  };
@@ -25,6 +25,6 @@ in stdenv.mkDerivation rec {
    homepage = src.meta.homepage;
    license = licenses.mit;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ gnidorah ];
+    maintainers = with maintainers; [ ];
  };
 }
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, unzip, xz, dpkg
+{lib, stdenv, fetchurl, xz, dpkg
 , libxslt, docbook_xsl, makeWrapper
 , python3Packages
 , perlPackages, curl, gnupg, diffutils
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
    sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
  };

-  nativeBuildInputs = [ makeWrapper unzip ];
+  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
    (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);

@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
    description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support";
    homepage = "https://github.com/ethereum-mining/ethminer";
    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ nand0p atemu ];
+    maintainers = with maintainers; [ atemu ];
    license = licenses.gpl3Only;
    broken = cudaSupport;
  };
@@ -19,6 +19,6 @@ buildPythonPackage rec {
      with the final purpose of reducing its ability to interact with the system.
    '';
    license = licenses.gpl3;
-    maintainers = with maintainers; [ gnidorah ];
+    maintainers = with maintainers; [ ];
  };
 }
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }:
+{ lib, stdenv, fetchurl, libogg, libvorbis }:

 stdenv.mkDerivation rec {
  name = "vorbisgain-0.37";
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {

  hardeningDisable = [ "format" ];

-  nativeBuildInputs = [ unzip ];
  buildInputs = [ libogg libvorbis ];

  patchPhase = ''
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    description = "Create bootable USB disks from Windows ISO images";
    homepage = "https://github.com/slacka/WoeUSB";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ bjornfor gnidorah ];
+    maintainers = with maintainers; [ bjornfor ];
    platforms = platforms.linux;
  };
 }
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "The httperf HTTP load generator";
    homepage = "https://github.com/httperf/httperf";
-    maintainers = with maintainers; [ nand0p ];
+    maintainers = with maintainers; [ ];
    license = licenses.gpl2;
    platforms = platforms.all;
  };
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
    description = "WebDav server implementation and library using libsoup";
    homepage = "https://wiki.gnome.org/phodav";
    license = licenses.lgpl21;
-    maintainers = with maintainers; [ gnidorah ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
@@ -20,7 +20,7 @@ buildGoPackage rec {
  meta = with lib; {
    homepage = "https://github.com/AdRoll/hologram/";
    description = "Easy, painless AWS credentials on developer laptops";
-    maintainers = with maintainers; [ nand0p ];
+    maintainers = with maintainers; [ ];
    license = licenses.asl20;
  };
 }
@@ -0,0 +1,47 @@
+{ stdenv, lib, fetchFromGitHub, bc, curl, figlet, fortune, gawk, iproute2, procps }:
+
+stdenv.mkDerivation rec {
+  pname = "fancy-motd";
+  version = "unstable-2021-05-15";
+
+  src = fetchFromGitHub {
+    owner = "bcyran";
+    repo = pname;
+    rev = "b25c1e7d76927d7f947a048d844dad4400de3598";
+    sha256 = "05jazmijk3im1wl4nprkwmrq6bxhb3ah8syyqym109blajy72841";
+  };
+
+  buildInputs = [ bc curl figlet fortune gawk iproute2 ];
+
+  postPatch = ''
+    substituteInPlace motd.sh \
+      --replace 'BASE_DIR="$(dirname "$(readlink -f "$0")")"' "BASE_DIR=\"$out/lib\""
+
+    substituteInPlace modules/20-uptime \
+      --replace "uptime -p" "${procps}/bin/uptime -p"
+
+    # does not work on nixos
+    rm modules/41-updates
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D motd.sh $out/bin/motd
+
+    install -D framework.sh $out/lib/framework.sh
+    install -D config.sh.example $out/lib/config.sh
+    find modules -type f -exec install -D {} $out/lib/{} \;
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Fancy, colorful MOTD written in bash. Server status at a glance.";
+    homepage = "https://github.com/bcyran/fancy-motd";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rhoriguchi ];
+    platforms = platforms.linux;
+    mainProgram = "motd";
+  };
+}
@@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication {
    description = "A utility to accurately report the in core memory usage for a program";
    homepage = "https://github.com/pixelb/ps_mem";
    license = licenses.lgpl21;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = platforms.linux;
  };
 }