pijul/pijul - Change 2IDNT6MOJ6YUKHMRE65IPBJYPH7R43T56CW6LOX3GTW7INZJKE3AC

Update nix flake layout

Created by HZVQFtjbhnRsZNcTqNkbgkDT47NMwiGoHjvCqCkuekqp on October 18, 2021

2IDNT6MOJ6YUKHMRE65IPBJYPH7R43T56CW6LOX3GTW7INZJKE3AC

Dependencies

In discussions

#552 Alternative nix build with naersk

Change contents

Replacement in flake.nix at line 5 [5.1023754]

∅:D[3.59] → [4.0:79]

B:BD[6.246088] → [4.0:79]

B:BD[4.79] → [2.189:236]

  inputs.mozilla = { url = "github:mozilla/nixpkgs-mozilla"; flake = false; };
  # inputs.naersk.url = github:nmatina/naersk;

[3.59]

[2.236]

  inputs.naersk.url = github:nix-community/naersk;

Replacement in flake.nix at line 7 [5.1023754]

B:BD[2.286] → [2.286:332]

  # inputs.fenix.url = github:nmatina/naersk;

[2.286]

[5.1023891]

  inputs.flake-utils.url = github:numtide/flake-utils;

Deletion in flake.nix at line 12 [5.1023754]
B:BD[4.117] → [4.117:131]
```
    , mozilla
```
Insertion in flake.nix at line 13 [5.1023754]
[2.345]
[4.131]
```
    , flake-utils
```

Replacement in flake.nix at line 21 [5.1023754]

B:BD[5.1024164] → [4.158:248]

B:BD[4.248] → [7.0:108]

∅:D[8.76] → [4.357:505]

∅:D[7.108] → [4.357:505]

∅:D[3.168] → [4.357:505]

∅:D[9.67749] → [4.357:505]

B:BD[4.357] → [4.357:505]

      rustOverlay = final: prev:
        let
          rustChannel = prev.rustChannelOf {
            channel = "1.54.0";
            sha256 = "sha256-2NfCJiH3wk7sR1XlRf8+IZfY3S9sYKdL8TpMqk82Bq0=";
          };
        in
        {
          inherit rustChannel;
          rustc = rustChannel.rust;
          cargo = rustChannel.rust;
        };

[5.1024164]

[4.505]

      # rustOverlay = final: prev:
      #   let
      #     rustChannel = prev.rustChannelOf {
      #       channel = "1.54.0";
      #       sha256 = "sha256-2NfCJiH3wk7sR1XlRf8+IZfY3S9sYKdL8TpMqk82Bq0=";
      #     };
      #   in
      #   {
      #     inherit rustChannel;
      #     rustc = rustChannel.rust;
      #     cargo = rustChannel.rust;
      #   };

Replacement in flake.nix at line 34 [5.1023754]

∅:D[4.506] → [5.1024164:1024246]

B:BD[5.1024164] → [5.1024164:1024246]

B:BD[5.1024246] → [4.507:687]

∅:D[4.687] → [5.1024297:1024307]

B:BD[5.1024297] → [5.1024297:1024307]

      forAllSystems = f: genAttrs allSystems (system: f {
        inherit system;
        pkgs = import nixpkgs {
          inherit system;
          overlays = [
            (import "${mozilla}/rust-overlay.nix")
            rustOverlay
          ];
        };
      });

[4.506]

[5.1024682]

      # forAllSystems = f: genAttrs allSystems (system: f {
      #   inherit system;
      #   pkgs = import nixpkgs {
      #     inherit system;
      #     overlays = [
      #       (import "${mozilla}/rust-overlay.nix")
      #       rustOverlay
      #     ];
      #   };
      # });
    in
    flake-utils.lib.eachSystem allSystems (system:
    let
      pkgs = import nixpkgs { inherit system; };
      inherit (pkgs) stdenv;
      lib = utils.lib.${system} // pkgs.lib;
      inherit (lib) buildRustProject getRust;
      rustNightly = getRust { date = "2021-08-24"; sha256 = "30dHH53OlZt6h2OJxeVJ8IokaQrSaV7aGfhUiv2HU0Q="; };
      pijul = buildRustProject {
        buildInputs = with pkgs; [
          zstd
          libsodium
          libiconv
          pkg-config
          openssl
          xxHash
        ] ++ lib.optionals stdenv.isDarwin (
          (with darwin.apple_sdk.frameworks; [
            CoreServices
            Security
            SystemConfiguration
          ])
        );
        root = ./.;
      };
      pijul-git = pijul.override { features = [ "git" ]; };

Replacement in flake.nix at line 73 [5.1023754]

B:BD[5.1024695] → [5.1024695:1024750]

B:BD[5.1024750] → [2.346:427]

      devShell = forAllSystems ({ system, pkgs, ... }:
        let
          inherit (utils.lib.${system}) buildRustProject;
        in

[5.1024695]

[5.1024750]

      devShell =

Replacement in flake.nix at line 88 [5.1023754]

B:BD[4.809] → [10.0:73]

            (rustChannel.rust.override { extensions = [ "rust-src" ]; })

[4.809]

[11.0]

            # (rustChannel.rust.override { extensions = [ "rust-src" ]; })
            rustNightly

Replacement in flake.nix at line 95 [5.1023754]

B:BD[5.1025107] → [5.1025107:1025119]

});

[5.1025107]

[5.1025119]

        };
      packages = {
        # let
        #   cargoNix = import ./Cargo.nix {
        #     inherit pkgs;
        #     defaultCrateOverrides = pkgs.defaultCrateOverrides // {
        #       zstd-seekable = { ... }: {
        #         nativeBuildInputs = [ pkgs.clang ]
        #           ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.xcbuild ];
        #         LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib";
        #       };

Replacement in flake.nix at line 109 [5.1023754]

B:BD[5.1025120] → [5.1025120:1025197]

B:BD[5.1025197] → [2.472:1035]

      packages = forAllSystems
        ({ system, pkgs, ... }:
          let
            inherit (utils.lib.${system}) buildRustProject;
            pijul = buildRustProject {
              buildInputs = with pkgs; [
                zstd
                libsodium
                libiconv
                pkg-config
                openssl
                xxHash
              ] ++ lib.optionals stdenv.isDarwin (
                (with darwin.apple_sdk.frameworks; [
                  CoreServices
                  Security
                  SystemConfiguration
                ])
              );
              root = ./.;
            };

[5.1025120]

[12.166]

        #       blake3 = attr: {
        #         nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.xcbuild ];
        #       };

Replacement in flake.nix at line 113 [5.1023754]

B:BD[12.167] → [2.1036:1495]

            # let
            #   cargoNix = import ./Cargo.nix {
            #     inherit pkgs;
            #     defaultCrateOverrides = pkgs.defaultCrateOverrides // {
            #       zstd-seekable = { ... }: {
            #         nativeBuildInputs = [ pkgs.clang ]
            #           ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.xcbuild ];
            #         LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib";
            #       };

[12.167]

[5.1025490]

        #       pijul = { ... }: {
        #         buildInputs = with pkgs; [
        #           zstd
        #           libsodium
        #           libiconv
        #         ] ++ lib.optionals stdenv.isDarwin (
        #           [ openssl ]
        #           ++ (with darwin.apple_sdk.frameworks; [
        #             CoreServices
        #             Security
        #             SystemConfiguration
        #         ]));
        #       };
        #     };
        #   };
        # in
        # cargoNix.workspaceMembers.pijul.build;
        inherit pijul pijul-git;
      };

Replacement in flake.nix at line 133 [5.1023754]

B:BD[5.1025491] → [2.1496:1656]

            #       blake3 = attr: {
            #         nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.xcbuild ];
            #       };

[5.1025491]

[2.1656]

      defaultPackage = self.packages.${system}.pijul;
      apps =
        {
          pijul = flake-utils.lib.mkApp {
            drv = pijul;
          };
          pijul-git = flake-utils.lib.mkApp {
            drv = pijul-git;
          };
        };

Replacement in flake.nix at line 144 [5.1023754]

B:BD[2.1657] → [2.1657:2280]

∅:D[2.2280] → [5.1025999:1026024]

∅:D[6.247493] → [5.1025999:1026024]

B:BD[5.1025999] → [5.1025999:1026024]

B:BD[5.1026024] → [6.247494:247587]

∅:D[6.247587] → [5.1026112:1026126]

B:BD[5.1026112] → [5.1026112:1026126]

            #       pijul = { ... }: {
            #         buildInputs = with pkgs; [
            #           zstd
            #           libsodium
            #           libiconv
            #         ] ++ lib.optionals stdenv.isDarwin (
            #           [ openssl ]
            #           ++ (with darwin.apple_sdk.frameworks; [
            #             CoreServices
            #             Security
            #             SystemConfiguration
            #         ]));
            #       };
            #     };
            #   };
            # in
            # cargoNix.workspaceMembers.pijul.build;
          in
          {
            inherit pijul;
            pijul-git = pijul.override { features = [ "git" ]; };
          });

[2.1657]

[5.1026126]

      defaultApp = self.apps.${system}.pijul-git;

Replacement in flake.nix at line 146 [5.1023754]

B:BD[5.1026127] → [5.1026127:1026221]

      defaultPackage = forAllSystems ({ system, ... }: self.packages.${system}.pijul);
    };

[5.1026127]

[5.1026221]

});

Replacement in flake.lock at line 18 [5.1026237]
∅:D[2.2701] → [4.839:878]
B:BD[6.248048] → [4.839:878]
```
    "mozilla": {
      "flake": false,
```
[2.2701]
[4.878]
```
    "flake-utils_2": {
```

Replacement in flake.lock at line 20 [5.1026237]

B:BD[4.896] → [2.2702:2812]

∅:D[3.279] → [4.1006:1069]

∅:D[2.2812] → [4.1006:1069]

B:BD[4.1006] → [4.1006:1069]

B:BD[4.1069] → [2.2813:2872]

        "lastModified": 1629225446,
        "narHash": "sha256-HJX4Pc5ZUAg4apxB/XHuJ+6ukzvRQqeZMjscOBst2bA=",
        "owner": "mozilla",
        "repo": "nixpkgs-mozilla",
        "rev": "0510159186dd2ef46e5464484fbdf119393afa58",

[4.896]

[4.1128]

        "lastModified": 1631561581,
        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",

Replacement in flake.lock at line 28 [5.1026237]

B:BD[4.1182] → [4.1182:1245]

        "owner": "mozilla",
        "repo": "nixpkgs-mozilla",

[4.1182]

[4.1245]

        "owner": "numtide",
        "repo": "flake-utils",

Insertion in flake.lock at line 34 [5.1026237]

[2.2889]

      "inputs": {
        "nixpkgs": "nixpkgs"
      },
      "locked": {
        "lastModified": 1632266297,
        "narHash": "sha256-J1yeJk6Gud9ef2pEf6aKQemrfg1pVngYDSh+SAY94xk=",
        "owner": "nix-community",
        "repo": "naersk",
        "rev": "ee7edec50b49ab6d69b06d62f1de554efccb1ccd",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "naersk",
        "type": "github"
      }
    },
    "naersk_2": {

Insertion in flake.lock at line 74 [5.1026237]

[5.1026288]

[2.3382]

        "lastModified": 1634594364,
        "narHash": "sha256-4abUCFZVxR7p3JCtOzKIcp8R+p3dpxDmk6d9Bz2ry+Y=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "c033ff53bbf6d02fe6d5863260a752892c2f6216",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
        "type": "indirect"
      }
    },
    "nixpkgs_2": {
      "locked": {

Replacement in flake.lock at line 102 [5.1026237]
B:BD[2.3620] → [2.3620:3639]
```
    "nixpkgs_2": {
```
[2.3620]
[2.3639]
```
    "nixpkgs_3": {
```

Replacement in flake.lock at line 119 [5.1026237]

B:BD[6.248285] → [4.1286:1316]

B:BD[4.1316] → [2.3962:3992]

        "mozilla": "mozilla",
        "nixpkgs": "nixpkgs",

[5.1026722]

[2.3992]

        "flake-utils": "flake-utils",
        "naersk": "naersk",
        "nixpkgs": "nixpkgs_2",

Replacement in flake.lock at line 127 [5.1026237]

B:BD[2.4065] → [2.4065:4162]

        "flake-utils": "flake-utils",
        "naersk": "naersk",
        "nixpkgs": "nixpkgs_2"

[2.4065]

[2.4162]

        "flake-utils": "flake-utils_2",
        "naersk": "naersk_2",
        "nixpkgs": "nixpkgs_3"

Replacement in flake.lock at line 132 [5.1026237]

B:BD[2.4189] → [2.4189:4299]

        "lastModified": 1634244664,
        "narHash": "sha256-bP7roUc+B432SNTpsUDfQw/PY8uHhg5O2j65pD0DT0Y=",

[2.4189]

[2.4299]

        "lastModified": 1634593669,
        "narHash": "sha256-o4sD0wDsZFORCTOAZBWWj1DthiBHA5kH7CHh98s9mi0=",

Replacement in flake.lock at line 136 [5.1026237]

B:BD[2.4359] → [2.4359:4418]

        "rev": "2b7c7826c6e14559f487d8999f2571bbeed91959",

[2.4359]

[2.4418]

        "rev": "32b2f24bf8868c30d50055124ed69baee45224be",