nmattia/niv
1
1
Fork 0
mirror of https://github.com/nmattia/niv.git synced 2024-11-07 22:36:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #174 from nmattia/nm-custom-pkgs

Browse Source 
Allow setting custom pkgs
This commit is contained in:
Nicolas Mattia 2020-01-07 15:38:55 +01:00 committed by GitHub
commit c20455616d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog
## [0.2.11] 2020-01-07
## Changed
* Users can set custom `pkgs` when `import`ing `sources.nix`
## [0.2.10] 2020-01-06
## Changed
* The bundled `nix/sources.nix` is formatted with `nixpkgs-fmt`

2
README.md
View File

@ -199,7 +199,7 @@ $ niv update ghc -v 8.6.2
```
niv - dependency manager for Nix projects
version: 0.2.10
version: 0.2.11
Usage: niv [-s|--sources-file FILE] COMMAND

7
nix/sources.nix
View File

@ -125,11 +125,14 @@ let
# The "config" used by the fetchers
mkConfig =
{ sourcesFile ? ./sources.json
, sources ? builtins.fromJSON (builtins.readFile sourcesFile)
, pkgs ? mkPkgs sources
}: rec {
# The sources, i.e. the attribute set of spec name to spec
sources = builtins.fromJSON (builtins.readFile sourcesFile);
inherit sources;
# The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
pkgs = mkPkgs sources;
inherit pkgs;
};
in
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

2
package.yaml
View File

@ -1,5 +1,5 @@
name: niv
version: 0.2.10
version: 0.2.11
license: MIT
author: Nicolas Mattia <nicolas@nmattia.com>
maintainer: Nicolas Mattia <nicolas@nmattia.com>

4
script/gen
View File

@ -3,10 +3,6 @@
#!nix-shell -I nixpkgs=./nix
#!nix-shell -p nix
#!nix-shell --keep GITHUB_TOKEN
#!nix-shell --pure
unset NIX_SSL_CERT_FILE
unset SSL_CERT_FILE
set -euo pipefail

4
script/test
View File

@ -3,10 +3,6 @@
#!nix-shell -I nixpkgs=./nix
#!nix-shell -p nix
#!nix-shell -p nixpkgs-fmt
#!nix-shell --pure
unset NIX_SSL_CERT_FILE
unset SSL_CERT_FILE
set -euo pipefail

3
src/Niv/Sources.hs
View File

@ -145,6 +145,7 @@ data SourcesNixVersion
| V12
| V13
| V14
| V15
deriving stock (Bounded, Enum, Eq)
-- | A user friendly version
@ -164,6 +165,7 @@ sourcesVersionToText = \case
V12 -> "12"
V13 -> "13"
V14 -> "14"
V15 -> "15"
latestVersionMD5 :: T.Text
latestVersionMD5 = sourcesVersionToMD5 maxBound
@ -190,6 +192,7 @@ sourcesVersionToMD5 = \case
V12 -> "2f9629ad9a8f181ed71d2a59b454970c"
V13 -> "5e23c56b92eaade4e664cb16dcac1e0a"
V14 -> "b470e235e7bcbf106d243fea90b6cfc9"
V15 -> "dc11af910773ec9b4e505e0f49ebcfd2"
-- | The MD5 sum of ./nix/sources.nix
sourcesNixMD5 :: IO T.Text