mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix): Remove overridden GHC

Browse source 
We're not going down the Bazel route here, so this is not going to be
necessary.
This commit is contained in:
Vincent Ambo 2019-08-15 16:07:28 +01:00
parent 77f0b5021d
commit a20daf8726
1 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
default.nix
View file

@ -1,40 +1,25 @@
# This file sets up the top-level package set by merging all local # This file sets up the top-level package set by merging all local packages into
# packages into the nixpkgs top-level. # the nixpkgs top-level.
#
# This makes packages accessible via the Nixery instance that is configured to
# use this repository as its nixpkgs source.
let let
localPkgs = super: pkgs: { localPkgs = super: pkgs: {
# Local projects should be added here: # Local projects should be added here:
tazjin.tazblog = import ./services/tazblog { inherit pkgs; }; tazblog = import ./services/tazblog { inherit pkgs; };
tazjin.gemma = import ./services/gemma { inherit pkgs; }; gemma = import ./services/gemma { inherit pkgs; };
# Third-party projects (either vendored or modified from nixpkgs) # Third-party projects (either vendored or modified from nixpkgs) go here:
# should be added here: gitAppraise = pkgs.callPackage ./third_party/go/git-appraise/git-appraise {};
thirdParty.gitAppraise = pkgs.callPackage ./third_party/go/git-appraise/git-appraise {};
thirdParty.ghc = pkgs.haskell.packages.ghc865.ghcWithPackages(p: with p; [
acid-state
base64-bytestring
blaze-html
containers
cryptohash
hamlet
happstack-server
ixset
markdown
mtl
network
network-uri
options
rss
safecopy
]);
}; };
# TODO(tazjin): It might be preferable to pin a specific commit of # The pinned commit here is identical to the public nixery.dev
# nixpkgs, but for now the assumption will be that a single release # version, since popularity data has been generated for that.
# channel is reasonably stable. nixpkgsVersion = "88d9f776091896cfe57dc6fbdf246e7d27d5f105";
nixpkgsVersion = "nixos-19.03";
nixpkgs = "https://github.com/NixOS/nixpkgs-channels/archive/${nixpkgsVersion}.tar.gz"; nixpkgs = "https://github.com/NixOS/nixpkgs-channels/archive/${nixpkgsVersion}.tar.gz";
in { ... } @ args: import (builtins.fetchTarball nixpkgs) (args // { in { ... } @ args: import (builtins.fetchTarball nixpkgs) (args // {
overlays = [ localPkgs ]; overlays = [ localPkgs ];
config.allowUnfree = true;
}) })