From 7ea21afb360b0839058be4a0649b43acfaf0b9df Mon Sep 17 00:00:00 2001
From: tdro <tdro@users.noreply.github.com>
Date: Wed, 4 Jan 2023 23:12:49 -0500
Subject: .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
---
 .config/nixpkgs/packages/edl/default.nix           | 21 +++++++-----
 .../nixpkgs/packages/ruamel.yaml.cmd/default.nix   |  5 +--
 .config/nixpkgs/packages/rufo/default.nix          | 33 -------------------
 .config/nixpkgs/packages/stylelint/default.nix     | 38 ----------------------
 .config/nixpkgs/packages/systemd2nix/default.nix   |  5 ++-
 5 files changed, 19 insertions(+), 83 deletions(-)
 delete mode 100644 .config/nixpkgs/packages/rufo/default.nix
 delete mode 100644 .config/nixpkgs/packages/stylelint/default.nix

(limited to '.config/nixpkgs/packages')

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; {
-- 
cgit v1.2.3