marijan/pijul - Change ZZEEGHFT2VI4UBDWNI7U2AQDYITHU2Q5MDYC5JCETMMLQFGDO5OQC

Nix code refactor to support standard Nix and best practices

Created by marijan on March 12, 2025

ZZEEGHFT2VI4UBDWNI7U2AQDYITHU2Q5MDYC5JCETMMLQFGDO5OQC

Dependencies

In channels

main

Change contents

Replacement in shell.nix at line 1 [4.12]

B:BD[4.12] → [5.0:341]

(import
  (
    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
    fetchTarball {
      url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
      sha256 = lock.nodes.flake-compat.locked.narHash;
    }
  )
  { src = ./.; }
).shellNix

[4.12]

(import ./release.nix).pijulGitDevShell

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

[6.2]

let
  flakeLock = builtins.fromJSON (builtins.readFile ./flake.lock);
  pkgsSrc = fetchTarball {
    url =
      flakeLock.nodes.nixpkgs.locked.url
        or "https://github.com/NixOS/nixpkgs/archive/${flakeLock.nodes.nixpkgs.locked.rev}.tar.gz";
    sha256 = flakeLock.nodes.nixpkgs.locked.narHash;
  };
  pkgs = import pkgsSrc {
    overlays = [
      (import ./nix/overlays/default.nix)
      (import ./nix/overlays/devshells.nix)
    ];
  };
in
{
  inherit (pkgs) pijul pijul-git pijulGitDevShell;
}

Replacement in oldshell.nix at line 1 [7.37]
B:BD[7.37] → [7.38:64]
```
with import <nixpkgs> {};
```
[7.37]
[8.87]
```
with import <nixpkgs> { };
```

Replacement in oldshell.nix at line 5 [7.37]

B:BD[7.104] → [7.104:133]

B:BD[7.133] → [9.212:221]

∅:D[9.221] → [7.142:168]

∅:D[8.806] → [7.142:168]

B:BD[7.142] → [7.142:168]

B:BD[7.168] → [10.115:130]

∅:D[10.130] → [7.182:195]

B:BD[7.182] → [7.182:195]

B:BD[7.195] → [2.0:11]

∅:D[2.11] → [7.195:341]

B:BD[7.195] → [7.195:341]

  buildInputs = with pkgs; [
    zstd
    libsodium
    openssl
    pkg-config
    libiconv
    xxHash
  ] ++ lib.optionals stdenv.isDarwin
    (with darwin.apple_sdk.frameworks; [
      CoreServices
      Security
      SystemConfiguration
    ]);

[7.104]

[7.341]

  buildInputs =
    with pkgs;
    [
      zstd
      libsodium
      openssl
      pkg-config
      libiconv
      xxHash
    ]
    ++ lib.optionals stdenv.isDarwin (
      with darwin.apple_sdk.frameworks;
      [
        CoreServices
        Security
        SystemConfiguration
      ]
    );

File addition: nix (d--x------)
[6.2]

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

[0.925]

{
  stdenv,
  lib,
  darwin,
  rustPlatform,
  cargo,
  libiconv,
  pkg-config,
  rustc,
  openssl,
  libsodium,
  ...
}:
let
  cargoMeta = builtins.fromTOML (builtins.readFile ../pijul/Cargo.toml);
  inherit (rustPlatform) cargoBuildHook cargoInstallHook cargoSetupHook;
in
stdenv.mkDerivation {
  pname = cargoMeta.package.name;
  version = cargoMeta.package.version;
  src =
    let
      fs = lib.fileset;
    in
    fs.toSource {
      root = ../.;
      fileset = fs.unions [
        ../Cargo.toml
        ../Cargo.lock
        ../pijul-macros
        ../pijul
        ../libpijul
        ../pijul-interaction
        ../pijul-config
        ../pijul-repository
        ../pijul-identity
        ../pijul-remote
      ];
    };
  buildAndTestSubdir = "pijul";
  doCheck = true;
  cargoBuildType = "release";
  cargoDeps = rustPlatform.importCargoLock { lockFile = ../Cargo.lock; };
  nativeBuildInputs = [
    cargo
    libiconv
    pkg-config
    rustc
  ];
  buildInputs = [
    libsodium
    openssl.dev
    cargoBuildHook
    cargoInstallHook
    cargoSetupHook
  ] ++ lib.optionals (stdenv.isDarwin) [ darwin.apple_sdk.frameworks.SystemConfiguration ];
}

File addition: overlays (d--x------)
[0.925]

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

[0.2157]

final: prev: {
  pijulGitDevShell = (final.mkShell.override { stdenv = final.clangStdenv; }) {
    name = "pijul";
    inputsFrom = [ final.pijul-git ];
    packages = with final; [
      rust-analyzer
      rustfmt
    ];
    LIBCLANG_PATH = "${final.llvmPackages.libclang}/lib";
  };
}

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

[0.2157]

final: prev: {
  pijul = final.callPackage ../package.nix { stdenv = final.clangStdenv; };
  pijul-git = final.pijul.overrideAttrs (
    oldAttrs: { cargoBuildFeatures = oldAttrs.cargoBuildFeatures or [ ] ++ [ "git" ]; }
  );
}

Deletion in flake.nix at line 6 [4.1023754]

B:BD[11.59] → [5.342:422]

    flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";

Replacement in flake.nix at line 9 [4.1023754]
B:BD[12.92] → [12.92:117]
∅:D[13.146] → [12.131:141]
B:BD[12.131] → [12.131:141]
B:BD[12.141] → [11.60:67]
```
    { self
    , nixpkgs
    , ...
    }:
```
[12.92]
[4.1023923]
```
    { self, nixpkgs, ... }:
```

Replacement in flake.nix at line 11 [4.1023754]

B:BD[4.1023931] → [4.1023931:1024079]

B:BD[4.1024799] → [4.1024799:1024800]

B:BD[4.1024800] → [11.546:623]

      nameValuePair = name: value: { inherit name value; };
      genAttrs = names: f: builtins.listToAttrs (map (n: nameValuePair n (f n)) names);
            LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib";
          }

[4.1023931]

[11.623]

      # there is also nixpkgs.lib.systems.flakeExposed
      allSystems = [
        "x86_64-linux"
        "aarch64-linux"
        "i686-linux"
        "x86_64-darwin"
        "aarch64-darwin"
      ];
      withPkgs =
        pkgsCallback:
        nixpkgs.lib.genAttrs allSystems (
          system:
          let
            pkgs = import nixpkgs {
              inherit system;
              overlays = [
                (import ./nix/overlays/default.nix)
                (import ./nix/overlays/devshells.nix)
              ];
            };
          in
          pkgsCallback { inherit pkgs system; }

Replacement in flake.nix at line 34 [4.1023754]

∅:D[11.634] → [4.1024849:1024850]

∅:D[14.246298] → [4.1024849:1024850]

B:BD[4.1024849] → [4.1024849:1024850]

B:BD[4.1024850] → [11.635:714]

∅:D[15.20] → [14.246504:246505]

∅:D[11.714] → [14.246504:246505]

B:BD[14.246504] → [14.246504:246505]

B:BD[14.246505] → [11.715:1000]

∅:D[11.1000] → [4.1025043:1025044]

∅:D[14.246551] → [4.1025043:1025044]

B:BD[4.1025043] → [4.1025043:1025044]

B:BD[4.1025044] → [11.1001:1115]

∅:D[11.1115] → [4.1025119:1025120]

B:BD[4.1025119] → [4.1025119:1025120]

B:BD[16.166] → [16.166:167]

B:BD[16.167] → [11.1314:1483]


      packages = forAllSystems
        (pkgs: rec {
          default = pijul;
          pijul = pkgs.clangStdenv.mkDerivation (self: {
            pname = cargoMeta.package.name;
            version = cargoMeta.package.version;
            src = ./.;
            buildAndTestSubdir = "pijul";
            doCheck = true;
            cargoBuildType = "release";
            cargoDeps = pkgs.rustPlatform.importCargoLock {
              lockFile = ./Cargo.lock;
            };
            buildInputs = builtins.attrValues (
              {
                inherit (pkgs)
                  libsodium
                  openssl
                  ;

[11.634]

[4.1025490]

    in
    {
      overlays = {
        default = import ./nix/overlay.nix { };
        devShells = import ./nix/devshells-overlay.nix { };
      };
      devShells = withPkgs (
        { pkgs, ... }:
        {
          default = pkgs.pijulGitDevShell;
        }
      );

Replacement in flake.nix at line 47 [4.1023754]

B:BD[4.1025491] → [11.1484:1881]

∅:D[11.1881] → [4.1026112:1026126]

∅:D[14.247587] → [4.1026112:1026126]

B:BD[4.1026112] → [4.1026112:1026126]

                inherit (pkgs.rustPlatform)
                  cargoBuildHook
                  cargoInstallHook
                  cargoSetupHook
                  ;
              }
              // nixpkgs.lib.optionalAttrs (pkgs.stdenv.isDarwin) {
                inherit (pkgs.darwin.apple_sdk.frameworks)
                  SystemConfiguration
                  ;
              }
            );
          });

[4.1025491]

[4.1026126]

      formatter = withPkgs ({ pkgs, ... }: pkgs.nixfmt-rfc-style);

Replacement in flake.nix at line 49 [4.1023754]

B:BD[4.1026127] → [11.1882:2003]

          pijul-git = pijul.overrideAttrs (self: {
            cargoBuildFeatures = [ "git" ];
          });
        });

[4.1026127]

[4.1026214]

      packages = withPkgs (
        { pkgs, ... }:
        {
          inherit (pkgs) pijul pijul-git;
          default = self.packages.${pkgs.system}.pijul;
        }
      );

Deletion in flake.nix at line 58 [4.1023754]

B:BD[4.1026223] → [3.0:0]

B:BD[4.1025120] → [11.1116:1313]

∅:D[11.1313] → [17.1200:1215]

B:BD[17.1200] → [17.1200:1215]

∅:D[18.101] → [11.68:159]

B:BD[4.1024163] → [11.68:159]

B:BD[11.159] → [20.0:101]

∅:D[20.101] → [11.160:236]

B:BD[4.1024164] → [11.160:236]

∅:D[21.216] → [17.165:174]

∅:D[11.236] → [17.165:174]

B:BD[17.165] → [17.165:174]

B:BD[17.174] → [11.237:545]

∅:D[11.545] → [21.591:606]

B:BD[21.591] → [21.591:606]

            nativeBuildInputs = builtins.attrValues {
              inherit (pkgs)
                cargo
                libiconv
                pkg-config
                rustc
                ;
            };
      forAllSystems = f: genAttrs allSystems (system: f nixpkgs.legacyPackages.${system});
      allSystems = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
      cargoMeta = builtins.fromTOML (builtins.readFile ./pijul/Cargo.toml);
    in {
      devShell = forAllSystems
        (pkgs:
          (pkgs.mkShell.override { stdenv = pkgs.clangStdenv; })
          {
            name = "pijul";
            inputsFrom = [ self.packages.${pkgs.system}.pijul-git ];
            packages = with pkgs; [
              rust-analyzer
              rustfmt
            ];

Solving an order conflict in flake.nix at line 58 [4.1023754]
[4.1026223]

Deletion in flake.lock at line 3 [4.1026237]

B:BD[4.1026253] → [5.423:955]

    "flake-compat": {
      "locked": {
        "lastModified": 1696426674,
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "revCount": 57,
        "type": "tarball",
        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
      },
      "original": {
        "type": "tarball",
        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
      }
    },

Deletion in flake.lock at line 21 [4.1026237]
B:BD[4.1026722] → [5.1127:1167]
```
        "flake-compat": "flake-compat",
```

Replacement in default.nix at line 3 [14.248538]

B:BD[5.1172] → [5.1172:1242]

    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in

[5.1172]

[5.1242]

    let
      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
    in

Replacement in default.nix at line 7 [14.248538]

B:BD[5.1261] → [5.1261:1408]

      url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";

[5.1261]

[5.1408]

      url =
        lock.nodes.flake-compat.locked.url
          or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";