pijul/pijul - Change 7GVHKOLT4RH2LXZKIYWU2MCFMQEF5BGPE7VIMADDXFALWIL6RKLQC

Move package definition out of flake.nix

Created by dblsaiko on March 31, 2024

7GVHKOLT4RH2LXZKIYWU2MCFMQEF5BGPE7VIMADDXFALWIL6RKLQC

Dependencies

In discussions

#920 Move package definition out of flake.nix

Change contents

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

[3.2]

{
  lib,
  clangStdenv,
  cargo,
  darwin,
  libiconv,
  libsodium,
  openssl,
  pkg-config,
  rustPlatform,
  rustc,
}: let
  cargoMeta = builtins.fromTOML (builtins.readFile ./pijul/Cargo.toml);
in
  clangStdenv.mkDerivation (self: {
    pname = cargoMeta.package.name;
    version = cargoMeta.package.version;
    src = ./.;
    buildAndTestSubdir = "pijul";
    doCheck = true;
    cargoBuildType = "release";
    cargoDeps = rustPlatform.importCargoLock {
      lockFile = ./Cargo.lock;
    };
    nativeBuildInputs = [
      cargo
      libiconv
      pkg-config
      rustc
    ];
    buildInputs =
      [
        libsodium
        openssl
        rustPlatform.cargoBuildHook
        rustPlatform.cargoInstallHook
        rustPlatform.cargoSetupHook
      ]
      ++ lib.optionals clangStdenv.isDarwin [
        darwin.apple_sdk.frameworks.SystemConfiguration
      ];
  })

Deletion in flake.nix at line 19 [5.1023754]
∅:D[2.101] → [4.160:236]
B:BD[5.1024164] → [4.160:236]
```
      cargoMeta = builtins.fromTOML (builtins.readFile ./pijul/Cargo.toml);
```

Deletion in flake.nix at line 41 [5.1023754]

∅:D[6.20] → [7.246504:246505]

∅:D[4.714] → [7.246504:246505]

B:BD[7.246504] → [7.246504:246505]

B:BD[7.246505] → [4.715:931]


          pijul = pkgs.clangStdenv.mkDerivation (self: {
            pname = cargoMeta.package.name;
            version = cargoMeta.package.version;
            src = ./.;
            buildAndTestSubdir = "pijul";

Replacement in flake.nix at line 42 [5.1023754]

B:BD[4.932] → [4.932:1000]

            doCheck = true;
            cargoBuildType = "release";

[4.932]

[5.1025043]

          pijul = pkgs.callPackage ./package.nix {};

Deletion in flake.nix at line 44 [5.1023754]

B:BD[5.1025044] → [4.1001:1115]

∅:D[4.1115] → [5.1025119:1025120]

B:BD[5.1025119] → [5.1025119:1025120]

B:BD[5.1025120] → [4.1116:1313]

∅:D[4.1313] → [8.1200:1215]

B:BD[8.1200] → [8.1200:1215]

B:BD[9.166] → [9.166:167]

B:BD[9.167] → [4.1314:1483]

∅:D[4.1483] → [5.1025490:1025491]

∅:D[7.246947] → [5.1025490:1025491]

B:BD[5.1025490] → [5.1025490:1025491]

B:BD[5.1025491] → [4.1484:1881]

∅:D[4.1881] → [5.1026112:1026127]

∅:D[7.247587] → [5.1026112:1026127]

B:BD[5.1026112] → [5.1026112:1026127]

            cargoDeps = pkgs.rustPlatform.importCargoLock {
              lockFile = ./Cargo.lock;
            };
            nativeBuildInputs = builtins.attrValues {
              inherit (pkgs)
                cargo
                libiconv
                pkg-config
                rustc
                ;
            };
            buildInputs = builtins.attrValues (
              {
                inherit (pkgs)
                  libsodium
                  openssl
                  ;
                inherit (pkgs.rustPlatform)
                  cargoBuildHook
                  cargoInstallHook
                  cargoSetupHook
                  ;
              }
              // nixpkgs.lib.optionalAttrs (pkgs.stdenv.isDarwin) {
                inherit (pkgs.darwin.apple_sdk.frameworks)
                  SystemConfiguration
                  ;
              }
            );
          });