fiddlerwoaroof/dotfiles - Change YTCAGLMETYZOR3KTLNMA2EKQBQRBBD7JYAU3TAWZVROCTJEH7ZZAC

refactor(nix): move packages to their own place

Created by Edward Langley on March 8, 2025

YTCAGLMETYZOR3KTLNMA2EKQBQRBBD7JYAU3TAWZVROCTJEH7ZZAC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

File deletion: iterm.nix

BF:BFD[5.7682] → [6.2635:2668]

BF:BFD[6.2668] → [6.1254:1254]

∅:D[7.1461] → [6.1606:1797]

B:BD[6.1606] → [6.1606:1797]

∅:D[2.209] → [6.1863:2455]

B:BD[6.1863] → [6.1863:2455]

∅:D[7.1628] → [6.2627:2634]

B:BD[6.2627] → [6.2627:2634]

B:BD[6.2455] → [7.1462:1628]

B:BD[6.1797] → [2.191:209]

B:BD[6.1254] → [7.1111:1157]

∅:D[2.190] → [7.1157:1461]

B:BD[7.1157] → [7.1157:1461]

B:BD[7.1157] → [2.183:190]

stdenvNoCC.mkDerivation rec {
  pname = "iterm2";
  inherit version;
  src = fetchzip {
    url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
  };
  dontFixup = true;
  installPhase = ''
    runHook preInstall
    APP_DIR="$out/Applications/iTerm2.app"
    mkdir -p "$APP_DIR"
    cp -r . "$APP_DIR"
    mkdir -p "$out/bin"
    cat << EOF > "$out/bin/iterm2"
    #!${stdenvNoCC.shell}
    open -na "$APP_DIR" --args "$@"
    EOF
    chmod +x "$out/bin/iterm2"
    runHook postInstall
  '';
  meta = with lib; {
    description = "Replacement for Terminal and the successor to iTerm";
    homepage = "https://www.iterm2.com/";
    hydraPlatforms = []; # The build is little more than copying the binary
    license = licenses.gpl2;
  };
}
    maintainers = with maintainers; [steinybot tricktron];
    platforms = ["x86_64-darwin" "aarch64-darwin"];
    sourceProvenance = [sourceTypes.binaryNativeCode];
    inherit hash;
{
  fetchzip,
  lib,
  stdenvNoCC,
  version,
}:
/*
This cannot be built from source as it requires entitlements and
for that it needs to be code signed. Automatic updates will have
to be disabled via preferences instead of at build time. To do
that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist
and add:
SUEnableAutomaticChecks = 0;
*/
  hash

File deletion: prefixed-gnused
BF:BFD[5.7682] → [5.11929:11955]
BF:BFD[5.11955] → [5.11928:11928]
File deletion: .gitignore
BF:BFD[5.11928] → [5.27778:27812]
BF:BFD[5.27812] → [5.27769:27769]
B:BD[5.27769] → [5.27770:27777]
```
result
```

File deletion: default.nix

BF:BFD[5.11928] → [5.27732:27767]

BF:BFD[5.27767] → [5.26334:26334]

B:BD[5.26334] → [5.26335:27731]

{
  pkgs ? import <nixpkgs> {},
  lib ? pkgs.lib,
  stdenv ? pkgs.stdenv,
  fetchurl ? pkgs.fetchurl,
  perl ? pkgs.perl,
}:
stdenv.mkDerivation rec {
  pname = "gnused-prefixed";
  version = "4.8";
  src = fetchurl {
    url = "mirror://gnu/sed/sed-${version}.tar.xz";
    sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp";
  };
  outputs = ["out" "info"];
  configureFlags = ["--program-prefix=g"];
  nativeBuildInputs = [perl];
  preConfigure = "patchShebangs ./build-aux/help2man";
  # Prevents attempts of running 'help2man' on cross-built binaries.
  PERL =
    if stdenv.hostPlatform == stdenv.buildPlatform
    then null
    else "missing";
  meta = {
    homepage = "https://www.gnu.org/software/sed/";
    description = "GNU sed, a batch stream editor";
    longDescription = ''
      Sed (stream editor) isn't really a true text editor or text
      processor.  Instead, it is used to filter text, i.e., it takes
      text input and performs some operation (or set of operations) on
      it and outputs the modified text.  Sed is typically used for
      extracting part of a file using pattern matching or substituting
      multiple occurrences of a string within a file. This version installs sed
      with a `g` program prefix, for use on macOS.
    '';
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.unix;
    maintainers = [];
  };
}

File deletion: .gitignore
BF:BFD[5.11928] → [5.13401:13435]
BF:BFD[5.13435] → [5.13392:13392]
B:BD[5.13392] → [5.13393:13400]
```
result
```

File deletion: default.nix

BF:BFD[5.11928] → [5.13355:13390]

BF:BFD[5.13390] → [5.11957:11957]

B:BD[5.11957] → [5.11958:12138]

∅:D[8.199] → [5.12157:12229]

B:BD[5.12157] → [5.12157:12229]

∅:D[8.261] → [5.12298:13354]

B:BD[5.12298] → [5.12298:13354]

B:BD[5.12229] → [8.200:261]

B:BD[5.12138] → [8.180:199]

{
  pkgs ? import <nixpkgs> {},
  lib ? pkgs.lib,
  stdenv ? pkgs.stdenv,
  fetchurl ? pkgs.fetchurl,
  perl ? pkgs.perl,
}:
stdenv.mkDerivation rec {
  pname = "gnused-prefixed";
  src = fetchurl {
    url = "mirror://gnu/sed/sed-${version}.tar.xz";
  };
  outputs = ["out" "info"];
  configureFlags = ["--program-prefix=g"];
  nativeBuildInputs = [perl];
  preConfigure = "patchShebangs ./build-aux/help2man";
  # Prevents attempts of running 'help2man' on cross-built binaries.
  PERL =
    if stdenv.hostPlatform == stdenv.buildPlatform
    then null
    else "missing";
  meta = {
    homepage = "https://www.gnu.org/software/sed/";
    description = "GNU sed, a batch stream editor";
    longDescription = ''
      Sed (stream editor) isn't really a true text editor or text
      processor.  Instead, it is used to filter text, i.e., it takes
      text input and performs some operation (or set of operations) on
      it and outputs the modified text.  Sed is typically used for
      extracting part of a file using pattern matching or substituting
      multiple occurrences of a string within a file. This version installs sed
      with a `g` program prefix, for use on macOS.
    '';
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.unix;
    maintainers = [];
  };
}
    sha256 = "biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE=";
  version = "4.9";

File addition: packages (d--x------)
[9.152]
File addition: prefixed-gnused (d--x------)
[0.182]

File addition: default.nix (----------)

[0.204]

{
  pkgs ? import <nixpkgs> {},
  lib ? pkgs.lib,
  stdenv ? pkgs.stdenv,
  fetchurl ? pkgs.fetchurl,
  perl ? pkgs.perl,
}:
stdenv.mkDerivation rec {
  pname = "gnused-prefixed";
  version = "4.9";
  src = fetchurl {
    url = "mirror://gnu/sed/sed-${version}.tar.xz";
    sha256 = "biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE=";
  };
  outputs = ["out" "info"];
  configureFlags = ["--program-prefix=g"];
  nativeBuildInputs = [perl];
  preConfigure = "patchShebangs ./build-aux/help2man";
  # Prevents attempts of running 'help2man' on cross-built binaries.
  PERL =
    if stdenv.hostPlatform == stdenv.buildPlatform
    then null
    else "missing";
  meta = {
    homepage = "https://www.gnu.org/software/sed/";
    description = "GNU sed, a batch stream editor";
    longDescription = ''
      Sed (stream editor) isn't really a true text editor or text
      processor.  Instead, it is used to filter text, i.e., it takes
      text input and performs some operation (or set of operations) on
      it and outputs the modified text.  Sed is typically used for
      extracting part of a file using pattern matching or substituting
      multiple occurrences of a string within a file. This version installs sed
      with a `g` program prefix, for use on macOS.
    '';
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.unix;
    maintainers = [];
  };
}

File addition: .gitignore (----------)
[0.204]
```
result
```

File addition: iterm.nix (----------)

[0.182]

{
  fetchzip,
  lib,
  stdenvNoCC,
  version,
  hash
}:
/*
This cannot be built from source as it requires entitlements and
for that it needs to be code signed. Automatic updates will have
to be disabled via preferences instead of at build time. To do
that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist
and add:
SUEnableAutomaticChecks = 0;
*/
stdenvNoCC.mkDerivation rec {
  pname = "iterm2";
  inherit version;
  src = fetchzip {
    url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
    inherit hash;
  };
  dontFixup = true;
  installPhase = ''
    runHook preInstall
    APP_DIR="$out/Applications/iTerm2.app"
    mkdir -p "$APP_DIR"
    cp -r . "$APP_DIR"
    mkdir -p "$out/bin"
    cat << EOF > "$out/bin/iterm2"
    #!${stdenvNoCC.shell}
    open -na "$APP_DIR" --args "$@"
    EOF
    chmod +x "$out/bin/iterm2"
    runHook postInstall
  '';
  meta = with lib; {
    description = "Replacement for Terminal and the successor to iTerm";
    homepage = "https://www.iterm2.com/";
    hydraPlatforms = []; # The build is little more than copying the binary
    license = licenses.gpl2;
    maintainers = with maintainers; [steinybot tricktron];
    platforms = ["x86_64-darwin" "aarch64-darwin"];
    sourceProvenance = [sourceTypes.binaryNativeCode];
  };
}

Deletion in flake.nix at line 29 [12.3405]

∅:D[10.2462] → [11.256:318]

B:BD[12.3593] → [11.256:318]

∅:D[11.318] → [12.3624:3671]

B:BD[12.3624] → [12.3624:3671]

B:BD[12.3671] → [11.319:365]

B:BD[11.365] → [13.256:557]

∅:D[13.557] → [11.426:659]

B:BD[11.426] → [11.426:659]

B:BD[11.659] → [14.660:942]

∅:D[14.942] → [11.659:675]

B:BD[11.659] → [11.659:675]

B:BD[11.675] → [15.2772:2950]

B:BD[15.2950] → [16.1009:1291]

∅:D[16.1291] → [11.675:686]

∅:D[15.2950] → [11.675:686]

B:BD[11.675] → [11.675:686]

∅:D[11.686] → [12.4302:4309]

B:BD[12.4302] → [12.4302:4309]

B:BD[12.4309] → [2.345:512]

∅:D[2.512] → [10.2463:2639]

B:BD[12.4309] → [10.2463:2639]

∅:D[10.2639] → [17.256:314]

B:BD[12.4309] → [17.256:314]

B:BD[17.314] → [14.943:969]

B:BD[14.969] → [15.2951:2997]

B:BD[15.2997] → [16.1292:1339]

∅:D[16.1339] → [10.2640:2670]

B:BD[15.2997] → [10.2640:2670]

B:BD[10.2670] → [2.513:548]

∅:D[2.548] → [17.314:321]

∅:D[14.969] → [17.314:321]

∅:D[10.2670] → [17.314:321]

∅:D[15.2997] → [17.314:321]

B:BD[17.314] → [17.314:321]

    mkTool = {
      name,
      lispDeps,
    }: system: let
      pkgs = nixpkgs.legacyPackages.${system};
      sbcl = pkgs.sbcl.withPackages lispDeps;
    in
      pkgs.stdenv.mkDerivation {
        inherit system name;
        src = ./tools;
        builder = ./build.sh;
        dontStrip = true;
        buildInputs = [
          pkgs.makeWrapper
          pkgs.openssl.dev
          sbcl
          pkgs.which
          pkgs.zsh
        ];
      };
    mkZenburn = mkTool {
      name = "zenburn";
      lispDeps = ps:
        with ps; [
          alexandria
          dufy
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          serapeum
          #uiop
        ];
    };
    mkCls = mkTool {
      name = "cls";
      lispDeps = ps:
        with ps; [
          alexandria
          data-lens
          local-time
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          yason
          #uiop
        ];
    };
    mkGitPickPatch = mkTool {
      name = "git-pick-patch";
      lispDeps = ps:
        with ps; [
          alexandria
          serapeum
          cl-ppcre
        ];
    };
    mkJsonFormatter = mkTool {
      name = "json-formatter";
      lispDeps = ps:
        with ps; [
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          alexandria
          serapeum
          com_dot_inuoe_dot_jzon
        ];
    };
    mkPrefixedSed = system: let
      pkgs = nixpkgs.legacyPackages.${system};
    in
      pkgs.callPackage ./nix/personal-flake/elangley-overlay/prefixed-gnused {};
    mkCurl = system: let
      pkgs = nixpkgs.legacyPackages.${system};
    in
      pkgs.curl.override {
        openssl = pkgs.quictls;
        http3Support = true;
      };
    mkTools = system: {
      zenburn = mkZenburn system;
      cls = mkCls system;
      git-pick-patch = mkGitPickPatch system;
      json-formatter = mkJsonFormatter system;
      mycurl = mkCurl system;
      gsed = mkPrefixedSed system;
    };

Deletion in flake.nix at line 32 [12.3405]

B:BD[18.4398] → [2.549:900]

    darwinPackages = system:
      (mkTools system)
      // {
        iterm2 = let
          pkgs = nixpkgs.legacyPackages.${system};
        in
          pkgs.callPackage ./nix/personal-flake/elangley-overlay/iterm.nix {
            version = "3.5.11";
            hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI=";
          };
      };

Replacement in flake.nix at line 33 [12.3405]
B:BD[12.4316] → [11.687:744]
B:BD[11.744] → [2.901:942]
∅:D[2.942] → [17.356:421]
B:BD[17.356] → [17.356:421]
∅:D[17.421] → [11.849:856]
B:BD[11.849] → [11.849:856]
B:BD[11.856] → [10.2788:2789]
```
    packages = builtins.mapAttrs (system: f: f system) {
      "aarch64-darwin" = darwinPackages;
      "aarch64-linux" = mkTools;
      "x86_64-linux" = mkTools;
    };
```
[12.4316]
[10.2789]
```
    packages = import ./nix/packages inputs;
```

File addition: default.nix (----------)

[0.204]

{
  pkgs ? import <nixpkgs> {},
  lib ? pkgs.lib,
  stdenv ? pkgs.stdenv,
  fetchurl ? pkgs.fetchurl,
  perl ? pkgs.perl,
}:
stdenv.mkDerivation rec {
  pname = "gnused-prefixed";
  version = "4.9";
  src = fetchurl {
    url = "mirror://gnu/sed/sed-${version}.tar.xz";
    sha256 = "biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE=";
  };
  outputs = ["out" "info"];
  configureFlags = ["--program-prefix=g"];
  nativeBuildInputs = [perl];
  preConfigure = "patchShebangs ./build-aux/help2man";
  # Prevents attempts of running 'help2man' on cross-built binaries.
  PERL =
    if stdenv.hostPlatform == stdenv.buildPlatform
    then null
    else "missing";
  meta = {
    homepage = "https://www.gnu.org/software/sed/";
    description = "GNU sed, a batch stream editor";
    longDescription = ''
      Sed (stream editor) isn't really a true text editor or text
      processor.  Instead, it is used to filter text, i.e., it takes
      text input and performs some operation (or set of operations) on
      it and outputs the modified text.  Sed is typically used for
      extracting part of a file using pattern matching or substituting
      multiple occurrences of a string within a file. This version installs sed
      with a `g` program prefix, for use on macOS.
    '';
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.unix;
    maintainers = [];
  };
}

File addition: .gitignore (----------)
[0.204]
```
result
```

File addition: iterm.nix (----------)

[0.182]

{
  fetchzip,
  lib,
  stdenvNoCC,
  version,
  hash
}:
/*
This cannot be built from source as it requires entitlements and
for that it needs to be code signed. Automatic updates will have
to be disabled via preferences instead of at build time. To do
that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist
and add:
SUEnableAutomaticChecks = 0;
*/
stdenvNoCC.mkDerivation rec {
  pname = "iterm2";
  inherit version;
  src = fetchzip {
    url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
    inherit hash;
  };
  dontFixup = true;
  installPhase = ''
    runHook preInstall
    APP_DIR="$out/Applications/iTerm2.app"
    mkdir -p "$APP_DIR"
    cp -r . "$APP_DIR"
    mkdir -p "$out/bin"
    cat << EOF > "$out/bin/iterm2"
    #!${stdenvNoCC.shell}
    open -na "$APP_DIR" --args "$@"
    EOF
    chmod +x "$out/bin/iterm2"
    runHook postInstall
  '';
  meta = with lib; {
    description = "Replacement for Terminal and the successor to iTerm";
    homepage = "https://www.iterm2.com/";
    hydraPlatforms = []; # The build is little more than copying the binary
    license = licenses.gpl2;
    maintainers = with maintainers; [steinybot tricktron];
    platforms = ["x86_64-darwin" "aarch64-darwin"];
    sourceProvenance = [sourceTypes.binaryNativeCode];
  };
}

refactor(nix): move packages to their own place

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

File deletion: iterm.nix

File deletion: prefixed-gnused

File deletion: .gitignore

File deletion: default.nix

File deletion: .gitignore

File deletion: default.nix

File addition: packages (d--x------)

File addition: prefixed-gnused (d--x------)

File addition: default.nix (----------)

File addition: .gitignore (----------)

File addition: iterm.nix (----------)

Deletion in flake.nix at line 29 [12.3405]

Deletion in flake.nix at line 32 [12.3405]

Replacement in flake.nix at line 33 [12.3405]

File addition: default.nix (----------)

File addition: .gitignore (----------)

File addition: iterm.nix (----------)