.config/nixpkgs: Cleanup and bring playground to 22.11

Add new magic format = "other"; to python package definitions.
Add inline locks for failed compiled programs.. don't have the time to figure
those out

6 files changed, 67 insertions, 122 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index ab8f8eb..83105ea 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -3,8 +3,8 @@ let
   pkgs = import <nixpkgs> { };
 
   stable = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz";
-    sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj"; }) { };
+    url = "https://releases.nixos.org/nixos/22.11/nixos-22.11.466.596a8e828c5/nixexprs.tar.xz";
+    sha256 = "1367bad5zz0mfm4czb6p0s0ni38f0x1ffh02z76rx4nranipqbgg"; }) { };
 
   unstable = import (builtins.fetchTarball {
     url = "https://releases.nixos.org/nixos/unstable/nixos-23.05pre431956.14ddeaebcbe/nixexprs.tar.xz";
@@ -64,15 +64,14 @@ in
     Terminal = pkgs.buildEnv {
       name = "terminal";
       paths = [
-        (unstable.callPackage ./packages/hugo/default.nix {})
-        (callPackage ./packages/chromexup/default.nix {})
-        (callPackage ./packages/pdf2htmlex/default.nix {})
-        (callPackage ./packages/rxvt-unicode/default.nix {})
-        (callPackage ./packages/systemd2nix/default.nix {})
-        (callPackage ./packages/validatornu/default.nix {})
-        (callPackage ./packages/youtube-dl/default.nix {})
-        (unstable.pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ]))
-        unstable.quickemu
+        (callPackage ./packages/hugo/default.nix { })
+        (callPackage ./packages/chromexup/default.nix { })
+        (callPackage ./packages/pdf2htmlex/default.nix { })
+        (callPackage ./packages/rxvt-unicode/default.nix { })
+        (callPackage ./packages/systemd2nix/default.nix { })
+        (callPackage ./packages/validatornu/default.nix { })
+        (callPackage ./packages/youtube-dl/default.nix { })
+        (pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ]))
         aerc
         alacritty
         alsaUtils
@@ -135,6 +134,7 @@ in
         pngquant
         poppler_utils
         pssh
+        quickemu
         ranger
         rclone
         ripgrep
@@ -168,18 +168,24 @@ in
     Graphical = pkgs.buildEnv {
       name = "graphical";
       paths = [
-        (callPackage ./packages/beaker-browser/default.nix {})
-        (callPackage ./packages/dmenu/default.nix {})
-        (callPackage ./packages/gnaural/default.nix {})
-        (callPackage ./packages/ntrviewer/default.nix {})
-        (callPackage ./packages/planner/default.nix {})
-        (callPackage ./packages/scribus/default.nix {})
-        (callPackage ./packages/sowon/default.nix {})
-        (callPackage ./packages/tilp2/default.nix {})
-        (unstable.callPackage ./packages/boomer/default.nix {})
+        ((import (builtins.fetchTarball {
+          url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz";
+          sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj";
+        }) { }).callPackage ./packages/planner/default.nix { })
+        ((import (builtins.fetchTarball {
+          url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz";
+          sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj";
+        }) { }).callPackage ./packages/scribus/default.nix { })
+        ((import (builtins.fetchTarball {
+          url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz";
+          sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj";
+        }) { }).callPackage ./packages/tilp2/default.nix { })
+        (callPackage ./packages/beaker-browser/default.nix { })
+        (callPackage ./packages/dmenu/default.nix { })
+        (callPackage ./packages/ntrviewer/default.nix { })
+        (callPackage ./packages/sowon/default.nix { })
+        (callPackage ./packages/boomer/default.nix { })
         (mplayer.override { v4lSupport = true; })
-        unstable.blender
-        unstable.claws-mail
         unstable.firefox
         unstable.google-chrome
         unstable.nyxt
@@ -188,6 +194,8 @@ in
         unstable.vimb
         aegisub
         anki
+        blender
+        claws-mail
         code-server
         corrscope
         dconf
@@ -202,6 +210,7 @@ in
         gImageReader
         gcolor2
         gimp
+        gnaural
         gparted
         gromit-mpx
         i3lock-fancy
@@ -251,7 +260,7 @@ in
     Emulators = pkgs.buildEnv {
       name = "emulators";
       paths = [
-        (callPackage ./packages/tiemu/default.nix {})
+        (callPackage ./packages/tiemu/default.nix { })
         desmume
         mgba
       ];
@@ -260,8 +269,8 @@ in
     Xorg = pkgs.buildEnv {
       name = "xorg";
       paths = [
-        (callPackage ./packages/x11vnc/default.nix {})
-        (callPackage ./packages/xprintidle/default.nix {})
+        (callPackage ./packages/x11vnc/default.nix { })
+        (callPackage ./packages/xprintidle/default.nix { })
         autocutsel
         glxinfo
         unclutter-xfixes
@@ -324,7 +333,7 @@ in
     Fonts = pkgs.buildEnv {
       name = "fonts";
       paths = [
-        (callPackage ./packages/nerdfonts-dejavu-sans-mono/default.nix {})
+        (callPackage ./packages/nerdfonts-dejavu-sans-mono/default.nix { })
         cm_unicode
         cooper-hewitt
         corefonts
@@ -390,9 +399,9 @@ in
     Android = pkgs.buildEnv {
       name = "android";
       paths = [
-        (callPackage ./packages/edl/default.nix {})
-        (callPackage ./packages/mkbootfs/default.nix {})
-        (callPackage ./packages/mkbootimg/default.nix {})
+        (callPackage ./packages/edl/default.nix { })
+        (callPackage ./packages/mkbootfs/default.nix { })
+        (callPackage ./packages/mkbootimg/default.nix { })
         abootimg
       ];
     };
@@ -452,7 +461,7 @@ in
     Lua = pkgs.buildEnv {
       name = "lua";
       paths = [
-        (callPackage ./packages/redbean/default.nix {})
+        (callPackage ./packages/redbean/default.nix { })
         lua
         luaPackages.luacheck
         luaformatter
@@ -502,7 +511,7 @@ in
 
     Ruby = pkgs.buildEnv {
       name = "ruby";
-      paths = [ (callPackage ./packages/rufo/default.nix {}) rubocop ruby ];
+      paths = [ rufo rubocop ruby ];
     };
 
     C = pkgs.buildEnv {
@@ -528,8 +537,8 @@ in
     CSS = pkgs.buildEnv {
       name = "css";
       paths = [
-        (callPackage ./packages/csstidy/default.nix {})
-        (callPackage ./packages/stylelint/default.nix {})
+        (callPackage ./packages/csstidy/default.nix { })
+        nodePackages.stylelint
         csslint
         sassc
       ];
@@ -538,9 +547,9 @@ in
     SQL = pkgs.buildEnv {
       name = "sql";
       paths = [
-        (callPackage ./packages/skeema/default.nix {})
-        (callPackage ./packages/sqldef/default.nix {})
+        (callPackage ./packages/sqldef/default.nix { })
         pgformatter
+        skeema
         sqlfluff
         sqlint
         sqlite
@@ -551,8 +560,8 @@ in
     YAML = pkgs.buildEnv {
       name = "yaml";
       paths = [
-        (callPackage ./packages/ruamel.yaml.cmd/default.nix {})
-        (callPackage ./packages/yaml2nix/default.nix {})
+        (callPackage ./packages/ruamel.yaml.cmd/default.nix { })
+        (callPackage ./packages/yaml2nix/default.nix { })
         python39Packages.yamllint
         yj
       ];
@@ -561,8 +570,8 @@ in
     Xorg-Aarch64 = pkgs.buildEnv {
       name = "xorg-aarch64";
       paths = [
-        (callPackage ./packages/x11vnc/default.nix {})
-        (callPackage ./packages/xprintidle/default.nix {})
+        (callPackage ./packages/x11vnc/default.nix { })
+        (callPackage ./packages/xprintidle/default.nix { })
         glxinfo
         unclutter-xfixes
         wmctrl
diff --git a/.config/nixpkgs/packages/edl/default.nix b/.config/nixpkgs/packages/edl/default.nix
index a9dba83..a04ac61 100644
--- a/.config/nixpkgs/packages/edl/default.nix
+++ b/.config/nixpkgs/packages/edl/default.nix
@@ -14,24 +14,27 @@ python38.pkgs.buildPythonApplication rec {
 
   doCheck = false;
   dontBuild = true;
-
-  propagatedBuildInputs = with python38.pkgs; [
-    pyusb
-    pyserial
-    docopt
-    pycryptodome
-    qrcode
+  format = "other";
+
+  propagatedBuildInputs = [
+    python38.pkgs.pyusb
+    python38.pkgs.pyserial
+    python38.pkgs.docopt
+    python38.pkgs.pycryptodome
+    python38.pkgs.qrcode
   ];
 
   pythonEnv = python38.withPackages (ps: with ps; propagatedBuildInputs);
 
   installPhase = ''
-    mkdir -p $out/share/edl
-    cp -rT ${src} $out/share/edl
+    runHook preInstall
+    mkdir --parents $out/share/edl
+    cp --recursive --no-target-directory ${src} $out/share/edl
     makeWrapper ${pythonEnv}/bin/python $out/bin/edl --add-flags $out/share/edl/edl.py
     makeWrapper ${pythonEnv}/bin/python $out/bin/edl-diag --add-flags $out/share/edl/diag.py
     makeWrapper ${pythonEnv}/bin/python $out/bin/edl-tcpclient --add-flags $out/share/edl/tcpclient.py
     makeWrapper ${pythonEnv}/bin/python $out/bin/edl-fhloaderparse --add-flags $out/share/edl/fhloaderparse.py
+    runHook postInstall
   '';
 
   meta = with lib; {
diff --git a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix b/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
index 6f6bacc..362b4bd 100644
--- a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
+++ b/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
@@ -71,14 +71,15 @@ in python39.pkgs.buildPythonApplication rec {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/bin
+    mkdir --parents $out/bin
     cp ${ruamel.yaml.cmd}/bin/yaml $out/bin
-    sed -i 's|^#!.*$|#!${pythonEnvironment}/bin/python|' $out/bin/yaml
+    sed --in-place 's|^#!.*$|#!${pythonEnvironment}/bin/python|' $out/bin/yaml
     runHook postInstall
   '';
 
   dontUnpack = true;
   dontBuild = true;
   doCheck = false;
+  format = "other";
   inherit meta;
 }
diff --git a/.config/nixpkgs/packages/rufo/default.nix b/.config/nixpkgs/packages/rufo/default.nix
deleted file mode 100644
index 7d0a539..0000000
--- a/.config/nixpkgs/packages/rufo/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ buildRubyGem, fetchgit, lib, ruby, git }:
-
-buildRubyGem rec {
-
-  inherit ruby;
-  gemName = "rufo";
-  name = "${gemName}-${version}";
-  version = "b3f3aedf759d792761ad52e6bddb9ed51ffc6731";
-
-  src = fetchgit {
-    rev = version;
-    url = "https://github.com/ruby-formatter/rufo.git";
-    sha256 = "1z87ivd8xpm3ggbcv3sjr4c0ws6733yfh8l6xg5f0km6ax7s8h1j";
-  };
-
-  buildInputs = [ git ruby ];
-
-  preBuild = ''
-    rm spec/fixtures/file_finder/only_gemfiles/a.gemspec
-  '';
-
-  preFixup = ''
-    cp exe/rufo $out/bin/rufo
-    cp -rT lib $out/lib
-  '';
-
-  meta = with lib; {
-    inherit version;
-    license = licenses.mit;
-    description = "The Ruby Formatter";
-    homepage = "https://github.com/ruby-formatter/rufo";
-  };
-}
diff --git a/.config/nixpkgs/packages/stylelint/default.nix b/.config/nixpkgs/packages/stylelint/default.nix
deleted file mode 100644
index 1c00b8f..0000000
--- a/.config/nixpkgs/packages/stylelint/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchgit, yarn, mkYarnPackage }:
-
-mkYarnPackage rec {
-
-  pname = "stylelint";
-  url = "https://github.com/stylelint/stylelint.git";
-  version = "b01ed25dfa3e8231a976eef76bd5e81fb535b1e9";
-  sha256 = "18v71nxxbfwqz5by9nq9921bdar3ww0z5z7h0y6rgnpi6iy5ck4x";
-  rev = version;
-  src = fetchgit { inherit url rev sha256; };
-  packageJSON = "${src}/package.json";
-  yarnLock = "${yarn-lock}/yarn.lock";
-  defaultYarnFlags = [ "--offline" "--frozen-lockfile" "--ignore-engines" "--ignore-scripts" ];
-
-  yarn-lock = stdenv.mkDerivation {
-    inherit src;
-    name = "${pname}-yarn.lock";
-    buildInputs = [ yarn ];
-    installPhase = ''
-      runHook preInstall
-      export HOME=.
-      mkdir -p $out
-      yarn import --ignore-engines --ignore-scripts
-      cp yarn.lock $out
-      runHook postInstall
-    '';
-    dontBuild = true;
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-ER+AkEQTIDL0oE1CQEMpXdGbZtcz2KUYkP2mw3eDKHU=";
-  };
-
-  meta = with lib; {
-    homepage = url;
-    license = licenses.mit;
-    description = "A mighty, modern linter that helps you avoid errors and enforce conventions in your styles.";
-  };
-}
diff --git a/.config/nixpkgs/packages/systemd2nix/default.nix b/.config/nixpkgs/packages/systemd2nix/default.nix
index 4953183..b4c6103 100644
--- a/.config/nixpkgs/packages/systemd2nix/default.nix
+++ b/.config/nixpkgs/packages/systemd2nix/default.nix
@@ -14,11 +14,14 @@ python38.pkgs.buildPythonApplication rec {
 
   doCheck = false;
   dontBuild = true;
+  format = "other";
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${pname}
+    runHook preInstall
+    mkdir --parents $out/bin $out/share/${pname}
     cp ${src}/${pname}.py $out/share/${pname}
     makeWrapper ${python38}/bin/python $out/bin/${pname} --add-flags $out/share/${pname}/${pname}.py
+    runHook postInstall
   '';
 
   meta = with lib; {