DGNum/colmena
13
0
Fork 1
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity

default.nix: Switch to flake-compat

Browse source 
`package.nix` is kept in sync with the expression in upstream Nixpkgs.
This commit is contained in:
Zhaofeng Li 2022-01-21 00:45:12 -08:00
parent abb74b9f49
commit 7e15450fd2
4 changed files with 45 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
default.nix
View file

@ -1,46 +1,3 @@
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
lockedPkgs = import (fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs.locked.narHash;
}) {};
in {
pkgs ? lockedPkgs,
}: let
inherit (pkgs) lib stdenv rustPlatform installShellFiles;
in rustPlatform.buildRustPackage rec {
pname = "colmena";
version = "0.3.0-pre";
src = lib.cleanSourceWith {
filter = name: type: !(type == "directory" && builtins.elem (baseNameOf name) [ "target" "manual" "integration-tests" ]);
src = lib.cleanSource ./.;
};
cargoSha256 = "sha256-UUDKAY5zOm/okdRN9Bh+1OgPJFnd1Gw5VMd/+/P46jQ=";
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
installShellCompletion --cmd colmena \
--bash <($out/bin/colmena gen-completions bash) \
--zsh <($out/bin/colmena gen-completions zsh) \
--fish <($out/bin/colmena gen-completions fish)
'';
# Recursive Nix is not stable yet
doCheck = false;
passthru = {
# We guarantee CLI and Nix API stability for the same minor version
apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version));
};
meta = with lib; {
description = "A simple, stateless NixOS deployment tool";
homepage = "https://zhaofengli.github.io/colmena/${passthru.apiVersion}";
license = licenses.mit;
maintainers = with maintainers; [ zhaofengli ];
platforms = platforms.linux ++ platforms.darwin;
};
}
flake = import ./flake-compat.nix;
in flake.defaultNix

6
flake.nix
View file

@ -19,7 +19,7 @@
# We still maintain the expression in a Nixpkgs-acceptable form
defaultPackage = self.packages.${system}.colmena;
packages = rec {
colmena = import ./default.nix { inherit pkgs; };
colmena = pkgs.callPackage ./package.nix { };
# Full user manual
manual = let
@ -59,9 +59,7 @@
};
}) // {
overlay = final: prev: {
colmena = import ./default.nix {
pkgs = final;
};
colmena = final.callPackage ./package.nix { };
};
};
}

12
integration-tests/nixpkgs.nix
View file

@ -1,13 +1,7 @@
let
lock = builtins.fromJSON (builtins.readFile ../flake.lock);
pinned = fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs.locked.narHash;
};
in import pinned {
flake = (import ../flake-compat.nix).defaultNix;
in import flake.inputs.nixpkgs.outPath {
overlays = [
(final: prev: {
colmena = final.callPackage ../default.nix { };
})
flake.overlay
];
}

38
package.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib, stdenv, rustPlatform, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "colmena";
version = "0.3.0-pre";
src = lib.cleanSourceWith {
filter = name: type: !(type == "directory" && builtins.elem (baseNameOf name) [ "target" "manual" "integration-tests" ]);
src = lib.cleanSource ./.;
};
cargoSha256 = "sha256-UUDKAY5zOm/okdRN9Bh+1OgPJFnd1Gw5VMd/+/P46jQ=";
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
installShellCompletion --cmd colmena \
--bash <($out/bin/colmena gen-completions bash) \
--zsh <($out/bin/colmena gen-completions zsh) \
--fish <($out/bin/colmena gen-completions fish)
'';
# Recursive Nix is not stable yet
doCheck = false;
passthru = {
# We guarantee CLI and Nix API stability for the same minor version
apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version));
};
meta = with lib; {
description = "A simple, stateless NixOS deployment tool";
homepage = "https://zhaofengli.github.io/colmena/${passthru.apiVersion}";
license = licenses.mit;
maintainers = with maintainers; [ zhaofengli ];
platforms = platforms.linux ++ platforms.darwin;
};
}