Merge branch 'staging-next' into staging

2021-01-24 20:43:48 +01:00
parent 8f2c39bfec cc8fd11ffb
commit 3c5dff210a
631 changed files with 2683 additions and 2201 deletions
@@ -237,7 +237,7 @@ let
    name = "apparmor-kernel-patches-${apparmor-version}";
    src = apparmor-sources;

-    phases = ''unpackPhase installPhase'';
+    phases = "unpackPhase installPhase";

    installPhase = ''
      mkdir "$out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    platforms = platforms.linux;
    maintainers = with maintainers; [ raskin ];
-    description = ''Console system performance monitor'';
+    description = "Console system performance monitor";

    longDescription = ''
      Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code.
@@ -49,12 +49,12 @@ stdenv.mkDerivation {
  enableParallelBuilding = true;
  meta = {
    inherit (s) version;
-    description = ''An udev fork by Gentoo'';
+    description = "An udev fork by Gentoo";
    license = lib.licenses.gpl2Plus ;
    maintainers = [lib.maintainers.raskin];
    platforms = lib.platforms.linux;
-    homepage = ''https://www.gentoo.org/proj/en/eudev/'';
-    downloadPage = ''http://dev.gentoo.org/~blueness/eudev/'';
+    homepage = "https://www.gentoo.org/proj/en/eudev/";
+    downloadPage = "http://dev.gentoo.org/~blueness/eudev/";
    updateWalker = true;
  };
 }
@@ -80,7 +80,7 @@ stdenv.mkDerivation {

  meta = {
    inherit (s) version;
-    description = ''Namespace-based sandboxing tool for Linux'';
+    description = "Namespace-based sandboxing tool for Linux";
    license = lib.licenses.gpl2Plus ;
    maintainers = [lib.maintainers.raskin];
    platforms = lib.platforms.linux;
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
  makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ];
  meta = {
    inherit (s) version;
-    description = ''Tool to detach from controlling TTY and attach to another'';
+    description = "Tool to detach from controlling TTY and attach to another";
    license = lib.licenses.gpl2 ;
    maintainers = [lib.maintainers.raskin];
    platforms = lib.platforms.linux;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    sha256 = "1i2m98yypfa9phshlmvjlgw7axfisxmldzrvnbzm5spvv5s4kvvb";
  };

-  preBuild = ''cd driver-uinput'';
+  preBuild = "cd driver-uinput";

  installPhase = ''
    mkdir -p "$out/bin"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  '';

  meta = {
-    description = ''Uinput driver for Android GfxTablet tablet-as-input-device app'';
+    description = "Uinput driver for Android GfxTablet tablet-as-input-device app";
    license = lib.licenses.mit ;
    maintainers = [lib.maintainers.raskin];
    platforms = lib.platforms.linux;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
    mkdir -p "$out/etc/udev/rules.d"
  '';

-  postInstall = ''rmdir $out/dev'';
+  postInstall = "rmdir $out/dev";

  meta = with lib; {
    description = "grsecurity RBAC administration and policy analysis utility";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  '';

  makeFlags = [
-    "prefix=${placeholder ''out''}"
+    "prefix=${placeholder "out"}"
  ];

  hardeningDisable = lib.optional (stdenv.isi686) "stackprotector";
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
    " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */
  ''
  + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "")
-  + (if configOpts == null then "" else ''
-    ln -sf ${configOpts} ./config/config.opts'')
+  + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts")
  ;

  makeFlags = [ "LEX=flex" ];