fiddlerwoaroof/dotfiles - Change 6C7VS6EJHONLCEMARQBXVI5VJYH37QBYEQDBSGS4OCYKMNRAYSNAC

chore: update personal flake to use fixed sbcl

Created by Edward Langley on October 11, 2023

6C7VS6EJHONLCEMARQBXVI5VJYH37QBYEQDBSGS4OCYKMNRAYSNAC

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 addition: sbcl.nix (----------)
[5.165]
Insertion in nix/personal-flake/home.nix at line 21 [5.337]
[5.754]
[5.754]
```
  sbcl = pkgs.fwoar.sbcl_master;
```
Insertion in nix/personal-flake/home.nix at line 35 [5.337]
[6.187]
[5.1021]
```
    pkgs.gnumake
    #pkgs.gnumake.info
```
Insertion in nix/personal-flake/home.nix at line 40 [5.337]
[7.183]
[5.1056]
```
    pkgs.texinfoInteractive
```
Replacement in nix/personal-flake/home.nix at line 54 [5.337]
B:BD[5.1273] → [5.1273:1287]
```
    pkgs.sbcl
```
[5.1273]
[5.1287]
```
    sbcl
```

Replacement in nix/personal-flake/flake.lock at line 33 [5.4147]

B:BD[8.488] → [8.488:598]

        "lastModified": 1687200309,
        "narHash": "sha256-SeQZk8b7ISz/u163O0tMdypESpepg8D5B9QMmh7caZw=",

[8.488]

[8.598]

        "lastModified": 1696822054,
        "narHash": "sha256-M4nxMYXqcj9iDoMeBtsm8bsj0eIKc/XKdDJwGRZxkN4=",

Replacement in nix/personal-flake/flake.lock at line 37 [5.4147]

B:BD[8.665] → [8.665:724]

        "rev": "f8f1aacce3de2db735520e71fde8fbab4c9dbbfc",

[8.665]

[8.724]

        "rev": "b383ed4c8436167c24289af1d034ef76130f2bfc",

Replacement in nix/personal-flake/flake.lock at line 73 [5.4147]

B:BD[8.1021] → [8.1021:1131]

        "lastModified": 1687171271,
        "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",

[8.1021]

[8.1131]

        "lastModified": 1694529238,
        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",

Replacement in nix/personal-flake/flake.lock at line 77 [5.4147]

B:BD[8.1190] → [8.1190:1249]

        "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",

[8.1190]

[8.1249]

        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",

Replacement in nix/personal-flake/flake.lock at line 109 [5.4147]

B:BD[5.5880] → [8.1363:1473]

        "lastModified": 1687204608,
        "narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=",

[5.5880]

[5.5990]

        "lastModified": 1696737557,
        "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=",

Replacement in nix/personal-flake/flake.lock at line 113 [5.4147]

B:BD[5.6056] → [8.1474:1533]

        "rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122",

[5.6056]

[5.6115]

        "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d",

Replacement in nix/personal-flake/flake.lock at line 124 [5.4147]

B:BD[5.6310] → [8.1534:1644]

        "lastModified": 1686960236,
        "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",

[5.6310]

[8.1644]

        "lastModified": 1696604326,
        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",

Replacement in nix/personal-flake/flake.lock at line 128 [5.4147]

B:BD[8.1697] → [8.1697:1756]

        "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",

[8.1697]

[8.1756]

        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",

Replacement in nix/personal-flake/flake.lock at line 140 [5.4147]

B:BD[8.1978] → [8.1978:2088]

        "lastModified": 1687017257,
        "narHash": "sha256-jbk0Szj1DPe9KwySeMr3KzYqW1JaUKJ6lYwSLMvc1n0=",

[8.1978]

[8.2088]

        "lastModified": 1696697597,
        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",

Replacement in nix/personal-flake/flake.lock at line 144 [5.4147]

B:BD[8.2141] → [8.2141:2200]

        "rev": "aaef163eac75c2ac7f882c1fae4e0c08aa18d186",

[8.2141]

[8.2200]

        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",

Replacement in nix/personal-flake/flake.lock at line 156 [5.4147]

B:BD[8.2414] → [8.2414:2524]

        "lastModified": 1686960236,
        "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",

[8.2414]

[5.6420]

        "lastModified": 1696604326,
        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",

Replacement in nix/personal-flake/flake.lock at line 160 [5.4147]

B:BD[5.6473] → [8.2525:2584]

        "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",

[5.6473]

[5.6532]

        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",

File addition: sbcl-master.nix (----------)

[5.7682]

{
  lib,
  stdenv,
  src,
  writeText,
  sbclBootstrap,
  zstd,
  sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit",
  texinfo,
}: let
  version = builtins.substring 0 7 src.rev;
in
  stdenv.mkDerivation rec {
    pname = "sbcl";
    inherit version;
    inherit src;
    nativeBuildInputs = [texinfo];
    buildInputs = [zstd];
    # There are no patches necessary for the currently enabled versions, but this
    # code is left in place for the next potential patch.
    postPatch = ''
      echo '"${version}.nixos"' > version.lisp-expr
      # SBCL checks whether files are up-to-date in many places..
      # Unfortunately, same timestamp is not good enough
      sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
      #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
      sed -i src/cold/slam.lisp -e \
        '/file-write-date input/a)'
      sed -i src/cold/slam.lisp -e \
        '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
      sed -i src/code/target-load.lisp -e \
        '/date defaulted-fasl/a)'
      sed -i src/code/target-load.lisp -e \
        '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
      # Fix the tests
      sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
      sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
          sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \
            src/code/run-program.lisp
    '';
    preBuild = ''
      export INSTALL_ROOT=$out
      mkdir -p test-home
      export HOME=$PWD/test-home
    '';
    enableFeatures = ["sb-thread" "sb-core-compression"];
    # Fails to find `O_LARGEFILE` otherwise.
    env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
    buildPhase = ''
      runHook preBuild
      sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" --fancy ${lib.optionalString (stdenv.hostPlatform.system == "aarch64-darwin") "--arch=arm64"}
      (cd doc/manual ; make info)
      runHook postBuild
    '';
    installPhase = ''
      runHook preInstall
      INSTALL_ROOT=$out sh install.sh
      runHook postInstall
    '';
    meta = sbclBootstrap.meta;
  }

Insertion in nix/personal-flake/elangley-overlay/default.nix at line 4 [5.13437]

[5.13516]

    sbcl_master = super.callPackage ./sbcl-master.nix {
      src = super.fetchFromGitHub {
        owner = "sbcl";
        repo = "sbcl";
        rev = "860d5e8234321f3f40369c18dc83335d30d2deea";
        sha256 = "ARkunrw7e8xau0ReEWm2gkri7EgN9br28qeReoPkGC4=";
      };
    };

File addition: sbcl.nix (----------)
[5.165]

File addition: sbcl-master.nix (----------)

[5.7682]

{
  lib,
  stdenv,
  src,
  writeText,
  sbclBootstrap,
  zstd,
  sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit",
  texinfo,
}: let
  version = builtins.substring 0 7 src.rev;
in
  stdenv.mkDerivation rec {
    pname = "sbcl";
    inherit version;
    inherit src;
    nativeBuildInputs = [texinfo];
    buildInputs = [zstd];
    # There are no patches necessary for the currently enabled versions, but this
    # code is left in place for the next potential patch.
    postPatch = ''
      echo '"${version}.nixos"' > version.lisp-expr
      # SBCL checks whether files are up-to-date in many places..
      # Unfortunately, same timestamp is not good enough
      sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
      #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
      sed -i src/cold/slam.lisp -e \
        '/file-write-date input/a)'
      sed -i src/cold/slam.lisp -e \
        '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
      sed -i src/code/target-load.lisp -e \
        '/date defaulted-fasl/a)'
      sed -i src/code/target-load.lisp -e \
        '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
      # Fix the tests
      sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
      sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
          sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \
            src/code/run-program.lisp
    '';
    preBuild = ''
      export INSTALL_ROOT=$out
      mkdir -p test-home
      export HOME=$PWD/test-home
    '';
    enableFeatures = ["sb-thread" "sb-core-compression"];
    # Fails to find `O_LARGEFILE` otherwise.
    env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
    buildPhase = ''
      runHook preBuild
      sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" --fancy ${lib.optionalString (stdenv.hostPlatform.system == "aarch64-darwin") "--arch=arm64"}
      (cd doc/manual ; make info)
      runHook postBuild
    '';
    installPhase = ''
      runHook preInstall
      INSTALL_ROOT=$out sh install.sh
      runHook postInstall
    '';
    meta = sbclBootstrap.meta;
  }

chore: update personal flake to use fixed sbcl

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

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

Insertion in nix/personal-flake/home.nix at line 21 [5.337]

Insertion in nix/personal-flake/home.nix at line 35 [5.337]

Insertion in nix/personal-flake/home.nix at line 40 [5.337]

Replacement in nix/personal-flake/home.nix at line 54 [5.337]

Replacement in nix/personal-flake/flake.lock at line 33 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 37 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 73 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 77 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 109 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 113 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 124 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 128 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 140 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 144 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 156 [5.4147]

Replacement in nix/personal-flake/flake.lock at line 160 [5.4147]

File addition: sbcl-master.nix (----------)

Insertion in nix/personal-flake/elangley-overlay/default.nix at line 4 [5.13437]

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

File addition: sbcl-master.nix (----------)