git.iko.soy/obelisk
on master help sign in
Merge branch 'develop' into mb-fixed-ghcid-for-563
commit5c7ef4af9dfab99eab403d3586509a9fe15cf0e7 authorAli Abrar <aliabrar@gmail.com> dateFri 29 Nov 2019, 20:57 (7 years ago) parent5b8da3d81c31de
4 files changed+19−9
compare with master
unifiedsplit
default.nix+4−8 dep/nixpkgs-19.09/default.nix+7 dep/nixpkgs-19.09/github.json+7 scripts/ghcid-this-lib+1−1
default.nix+4−8
@@ -1,9 +1,3 @@
1−let
2− nixos1909 = import (builtins.fetchTarball {
3− url = https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.09.tar.gz;
4− sha256 = "0ysb2017n8g0bpkxy3lsnlf6mcya5gqwggmwdjxlfnj1ilj3lnqz";
5− }) {};
6−in
71{ system ? builtins.currentSystem
82, profiling ? false
93, iosSdkVersion ? "10.2"
@@ -251,8 +245,10 @@ in rec {
251245 (pkgs.path + /nixos/modules/security/acme.nix)
252246 ];
253247 nixpkgs.overlays = [
254− (self: super: {
255− simp_le = nixos1909.simp_le;
248+ (self: super: let
249+ nixos1909 = import (hackGet ./dep/nixpkgs-19.09) {};
250+ in {
251+ inherit (nixos1909) simp_le;
256252 })
257253 ];
258254 };
dep/nixpkgs-19.09/default.nixnew file+7
@@ -0,0 +1,7 @@
1+# DO NOT HAND-EDIT THIS FILE
2+import ((import <nixpkgs> {}).fetchFromGitHub (
3+ let json = builtins.fromJSON (builtins.readFile ./github.json);
4+ in { inherit (json) owner repo rev sha256;
5+ private = json.private or false;
6+ }
7+))
dep/nixpkgs-19.09/github.jsonnew file+7
@@ -0,0 +1,7 @@
1+{
2+ "owner": "nixos",
3+ "repo": "nixpkgs-channels",
4+ "branch": "nixos-19.09",
5+ "rev": "ca9f709fd0b8535261234e6eb5d2020aaf1a2c61",
6+ "sha256": "0z1qgmzx9dwbvwxf16f9m30y8lqy4zv4phl0mcyv7grfhj3s1abw"
7+}
scripts/ghcid-this-lib+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
22set -euo pipefail
33
4−nix-shell -E "with (import ../.. {}); reflex-platform.workOn haskellPackageSets.ghc haskellPackageSets.ghc.obelisk-$(basename $PWD)" --run "cabal configure ; ghcid -c'cabal repl'"
4+nix-shell -E "with (import ../.. {}); reflex-platform.workOn haskellPackageSets.ghc haskellPackageSets.ghc.obelisk-$(basename $PWD)" --run "ghcid -c 'cabal new-repl'"