mirror of
https://github.com/nmattia/niv.git
synced 2024-10-06 12:27:35 +03:00
Fix Nix setup to use aeson 2.
This also bumps the Nixpkgs snapshot. Hopefully all the gross overrides will go away once aeson 2 becomes the default in Nixpkgs.
This commit is contained in:
parent
9d09779ad1
commit
533d1ba912
48
default.nix
48
default.nix
@ -44,14 +44,58 @@ let
|
||||
];
|
||||
|
||||
haskellPackages = pkgs.haskellPackages.override {
|
||||
overrides = _: haskellPackages: {
|
||||
overrides = self: super: rec {
|
||||
aeson =
|
||||
super.aeson_2_0_3_0;
|
||||
|
||||
attoparsec =
|
||||
super.attoparsec_0_14_4;
|
||||
|
||||
semialign =
|
||||
super.semialign_1_2_0_1;
|
||||
|
||||
time-compat =
|
||||
super.time-compat_1_9_6_1;
|
||||
|
||||
# Need to disable the test suite as otherwise we have a
|
||||
# circular dependency with quickcheck-instances.
|
||||
text-short =
|
||||
pkgs.haskell.lib.dontCheck super.text-short_0_1_5;
|
||||
|
||||
quickcheck-instances =
|
||||
super.quickcheck-instances_0_3_27;
|
||||
|
||||
hashable =
|
||||
super.hashable_1_4_0_2;
|
||||
|
||||
OneTuple =
|
||||
super.OneTuple_0_3_1;
|
||||
|
||||
path =
|
||||
super.path_0_9_2;
|
||||
|
||||
genvalidity =
|
||||
super.genvalidity_1_0_0_1;
|
||||
|
||||
validity =
|
||||
super.validity_0_12_0_0;
|
||||
|
||||
http2 =
|
||||
super.http2_3_0_3;
|
||||
|
||||
genvalidity-property =
|
||||
super.genvalidity-property_1_0_0_0;
|
||||
|
||||
genvalidity-hspec =
|
||||
super.genvalidity-hspec_1_0_0_0;
|
||||
|
||||
niv =
|
||||
pkgs.haskell.lib.justStaticExecutables (
|
||||
pkgs.haskell.lib.failOnAllWarnings (
|
||||
pkgs.haskell.lib.disableExecutableProfiling (
|
||||
pkgs.haskell.lib.disableLibraryProfiling (
|
||||
pkgs.haskell.lib.generateOptparseApplicativeCompletion "niv" (
|
||||
(pkgs.callPackage ./foo {}).buildPackage { root = ./.; src = niv-source; }
|
||||
(pkgs.callPackage ./foo {haskellPackages=self;}).buildPackage { root = ./.; src = niv-source; }
|
||||
)
|
||||
)
|
||||
)
|
||||
|
@ -5,10 +5,10 @@
|
||||
"homepage": null,
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "65938173c243e0268f9ba01642fa5a69f3857fd1",
|
||||
"sha256": "1r7jlkzlbsyw2jhgk1nmwiph988pi9qvr98fcpf4m5904jay1mxx",
|
||||
"rev": "ddd637d4e817e42e00c5d0ea70c38270d8f4f953",
|
||||
"sha256": "16jmbmkhqkkjxx3pd73wk56yhzwfbsjnm28ljby5mwik5rxx6yc6",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/65938173c243e0268f9ba01642fa5a69f3857fd1.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/ddd637d4e817e42e00c5d0ea70c38270d8f4f953.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-fmt": {
|
||||
|
Loading…
Reference in New Issue
Block a user