Merge tag '1.0.1' into develop
1.0.1
This commit is contained in:
commit
beb3325025
4 changed files with 14 additions and 21 deletions
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "polygon-art"
|
name = "polygon-art"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
authors = ["Ingolf Wagner <contact@ingolf-wagner.de>"]
|
authors = ["Ingolf Wagner <contact@ingolf-wagner.de>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
|
16
README.md
16
README.md
|
@ -36,11 +36,6 @@ cargo run --example clipping -- --help # run the examples/clipping
|
||||||
```shell
|
```shell
|
||||||
nix build
|
nix build
|
||||||
```
|
```
|
||||||
or (if you haven't enabled flakes yet)
|
|
||||||
|
|
||||||
``` shell
|
|
||||||
nix-shell -p nixFlake --run "nix build"
|
|
||||||
```
|
|
||||||
|
|
||||||
# How to us it (with flakes)
|
# How to us it (with flakes)
|
||||||
|
|
||||||
|
@ -68,3 +63,14 @@ nix-shell -p nixFlake --run "nix build"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
# How to update
|
||||||
|
|
||||||
|
``` shell
|
||||||
|
cargo update # to update Cargo.lock
|
||||||
|
```
|
||||||
|
and
|
||||||
|
|
||||||
|
``` shell
|
||||||
|
nix flake update # to update flake.lock
|
||||||
|
nix build # to verify if everything is ok
|
||||||
|
```
|
||||||
|
|
13
default.nix
13
default.nix
|
@ -1,5 +1,4 @@
|
||||||
{ rustPlatform,
|
{ rustPlatform,
|
||||||
fetchgit,
|
|
||||||
lib,
|
lib,
|
||||||
cairo,
|
cairo,
|
||||||
geos,
|
geos,
|
||||||
|
@ -14,18 +13,8 @@
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
|
|
||||||
pname = "polygon-art";
|
pname = "polygon-art";
|
||||||
|
version = "1.0.1";
|
||||||
version = "1.0.0";
|
|
||||||
|
|
||||||
# nix-prefetch-git-rendered --rev refs/heads/develop https://git.ingolf-wagner.de/palo/polygon-art.git
|
|
||||||
#src = fetchgit {
|
|
||||||
# url = "https://git.ingolf-wagner.de/palo/polygon-art.git";
|
|
||||||
# rev = "dfb6e0789ec67ee649050ad3b16d8b6a6b38955d";
|
|
||||||
# sha256 = "0iqmikvl93pazxfd120hcr0waxav7zy6px5kmdqxifrjgdbda9xx";
|
|
||||||
#};
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
#cargoSha256 = "05rkn8iihj4j9k179xx7wn2a07hxks050raj6fbxmj6gdx6aj170";
|
|
||||||
cargoSha256 = "0sgk4hw77cxqbqzd258fz67r7fpjblkm7cqh14n5f1c43y8vgxa0";
|
cargoSha256 = "0sgk4hw77cxqbqzd258fz67r7fpjblkm7cqh14n5f1c43y8vgxa0";
|
||||||
verifyCargoDeps = true;
|
verifyCargoDeps = true;
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
{
|
{
|
||||||
description = "Framework with examples to generate plotter friendly SVGs";
|
description = "Framework with examples to generate plotter friendly SVGs";
|
||||||
|
|
||||||
#inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
|
|
||||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
|
||||||
outputs = { self, nixpkgs, flake-utils , ... }:
|
outputs = { self, nixpkgs, flake-utils , ... }:
|
||||||
flake-utils.lib.eachDefaultSystem (system:
|
flake-utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
|
@ -12,6 +9,7 @@
|
||||||
in {
|
in {
|
||||||
packages.polygon-art = polygon-art;
|
packages.polygon-art = polygon-art;
|
||||||
defaultPackage = polygon-art;
|
defaultPackage = polygon-art;
|
||||||
|
devShell = import ./shell.nix { inherit pkgs; };
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue