From 8eccea34c487c66c1f3be8d27e760fc35eb50664 Mon Sep 17 00:00:00 2001 From: Nicolas Mattia Date: Mon, 11 Feb 2019 21:22:10 +0100 Subject: [PATCH 1/2] Don't fail on cache failure --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9453b8..264f68a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: echo "Cache size:" du -h ~/.niv-cache.gz echo "Loading cache..." - zcat ~/.niv-cache.gz | nix-store --import + zcat ~/.niv-cache.gz | nix-store --import || true echo "Deleting cache file..." rm ~/.niv-cache.gz echo "done" @@ -53,7 +53,7 @@ jobs: echo "Cache size:" du -h ~/.niv-cache-branch.gz echo "Loading cache..." - zcat ~/.niv-cache-branch.gz | nix-store --import + zcat ~/.niv-cache-branch.gz | nix-store --import || true echo "Deleting cache file..." rm ~/.niv-cache-branch.gz echo "done" From 4ff7a37f1214f386a7fc487a5b8ef5e8fb662d22 Mon Sep 17 00:00:00 2001 From: Nicolas Mattia Date: Mon, 11 Feb 2019 21:23:39 +0100 Subject: [PATCH 2/2] README fixup --- README.md | 22 +++++++++++----------- README.tpl.md | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 46f0514..7c3a696 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ description](#commands). This section covers common use cases: * [Bootstrapping a Nix project](#bootstrapping-a-nix-project). -* [Tracking a different a different nixpkgs branch](#tracking-a-nixpkgs-branch). +* [Tracking a different nixpkgs branch](#tracking-a-nixpkgs-branch). * [Importing packages from GitHub](#importing-packages-from-github). * [Fetching packages from custom URLs](#using-custom-urls). @@ -78,25 +78,25 @@ initialized with niv and nixpkgs: ``` json { "nixpkgs": { - "url": "https://github.com/NixOS/nixpkgs-channels/archive/....tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/109a28ab954a0ad129f7621d468f829981b8b96c.tar.gz", "owner": "NixOS", "branch": "nixos-18.09", "url_template": "https://github.com///archive/.tar.gz", "repo": "nixpkgs-channels", - "sha256": "...", + "sha256": "12wnxla7ld4cgpdndaipdh3j4zdalifk287ihxhnmrzrghjahs3q", "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", - "rev": "..." + "rev": "109a28ab954a0ad129f7621d468f829981b8b96c" }, "niv": { "homepage": "https://github.com/nmattia/niv", - "url": "https://github.com/nmattia/niv/archive/....tar.gz", + "url": "https://github.com/nmattia/niv/archive/72e77204544527279e8f1e2d982d29503482b8f4.tar.gz", "owner": "nmattia", "branch": "master", "url_template": "https://github.com///archive/.tar.gz", "repo": "niv", - "sha256": "...", - "description": "Manager for third-party packages in Nix", - "rev": "..." + "sha256": "1zjcyzxhq9iwxh58j5d7sx1vz5s3r1f6gpmnfgj2a3rxmclwvn3c", + "description": "Easy dependency management for Nix projects", + "rev": "72e77204544527279e8f1e2d982d29503482b8f4" } } ``` @@ -151,14 +151,14 @@ The following data was added in `nix/sources.json` for `jq`: ``` json { "homepage": "http://stedolan.github.io/jq/", - "url": "https://github.com/stedolan/jq/archive/....tar.gz", + "url": "https://github.com/stedolan/jq/archive/9fa2e51099c55af56e3e541dc4b399f11de74abe.tar.gz", "owner": "stedolan", "branch": "master", "url_template": "https://github.com///archive/.tar.gz", "repo": "jq", - "sha256": "...", + "sha256": "0819rvk8057qgcqvgn7fpldvly2pfdw9fxcjrlqa8gr59p8a1cic", "description": "Command-line JSON processor", - "rev": "..." + "rev": "9fa2e51099c55af56e3e541dc4b399f11de74abe" } ``` diff --git a/README.tpl.md b/README.tpl.md index d99bd84..dae9e5e 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -47,7 +47,7 @@ description](#commands). This section covers common use cases: * [Bootstrapping a Nix project](#bootstrapping-a-nix-project). -* [Tracking a different a different nixpkgs branch](#tracking-a-nixpkgs-branch). +* [Tracking a different nixpkgs branch](#tracking-a-nixpkgs-branch). * [Importing packages from GitHub](#importing-packages-from-github). * [Fetching packages from custom URLs](#using-custom-urls). @@ -78,25 +78,25 @@ initialized with niv and nixpkgs: ``` json { "nixpkgs": { - "url": "https://github.com/NixOS/nixpkgs-channels/archive/....tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/109a28ab954a0ad129f7621d468f829981b8b96c.tar.gz", "owner": "NixOS", "branch": "nixos-18.09", "url_template": "https://github.com///archive/.tar.gz", "repo": "nixpkgs-channels", - "sha256": "...", + "sha256": "12wnxla7ld4cgpdndaipdh3j4zdalifk287ihxhnmrzrghjahs3q", "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", - "rev": "..." + "rev": "109a28ab954a0ad129f7621d468f829981b8b96c" }, "niv": { "homepage": "https://github.com/nmattia/niv", - "url": "https://github.com/nmattia/niv/archive/....tar.gz", + "url": "https://github.com/nmattia/niv/archive/72e77204544527279e8f1e2d982d29503482b8f4.tar.gz", "owner": "nmattia", "branch": "master", "url_template": "https://github.com///archive/.tar.gz", "repo": "niv", - "sha256": "...", - "description": "Manager for third-party packages in Nix", - "rev": "..." + "sha256": "1zjcyzxhq9iwxh58j5d7sx1vz5s3r1f6gpmnfgj2a3rxmclwvn3c", + "description": "Easy dependency management for Nix projects", + "rev": "72e77204544527279e8f1e2d982d29503482b8f4" } } ``` @@ -151,14 +151,14 @@ The following data was added in `nix/sources.json` for `jq`: ``` json { "homepage": "http://stedolan.github.io/jq/", - "url": "https://github.com/stedolan/jq/archive/....tar.gz", + "url": "https://github.com/stedolan/jq/archive/9fa2e51099c55af56e3e541dc4b399f11de74abe.tar.gz", "owner": "stedolan", "branch": "master", "url_template": "https://github.com///archive/.tar.gz", "repo": "jq", - "sha256": "...", + "sha256": "0819rvk8057qgcqvgn7fpldvly2pfdw9fxcjrlqa8gr59p8a1cic", "description": "Command-line JSON processor", - "rev": "..." + "rev": "9fa2e51099c55af56e3e541dc4b399f11de74abe" } ```