GTrunSec · dependabot · May 23, 2020 · May 24, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "dotfiles/wallpaper"]
 	path = dotfiles/wallpaper
 	url = https://github.com/GTrunSec/wallpaper.git
-[submodule "channel/nixpkgs"]
+[submodule "nixos/channel/nixpkgs"]
 	path = channel/nixpkgs
 	url = git@github.com:GTrunSec/nixpkgs.git
-[submodule "channel/ghcide-nix"]
+[submodule "nixos/channel/ghcide-nix"]
 	path = channel/ghcide-nix
 	url = https://github.com/cachix/ghcide-nix.git
diff --git a/channel/ghcide-nix b/channel/ghcide-nix
diff --git a/channel/nixpkgs b/channel/nixpkgs
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
@@ -51,7 +51,7 @@ function pet-select() {
 
 function jupyter-env() {
   cd ~/data/Jupyter-data-science-environment
-  nix-shell my-default.nix --option build-use-sandbox false --command "jupyter lab --ip $1"
+  nix-shell my-default.nix --option build-use-sandbox false --command "jupyter lab --ip $1 --app-dir=./jupyterlab"
 }
 
 zle -N pet-select

diff --git a/nixos/cachix/default.nix b/nixos/cachix/default.nix
@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [ ./ghcide-nix.nix ];
+}
diff --git a/nixos/cachix/ghcide-nix.nix b/nixos/cachix/ghcide-nix.nix
@@ -0,0 +1,12 @@
+
+{
+  nix = {
+    binaryCaches = [
+      "https://ghcide-nix.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "ghcide-nix.cachix.org-1:ibAY5FD+XWLzbLr8fxK6n8fL9zZe7jS+gYeyxyWYK5c="
+    ];
+  };
+}
+
diff --git a/nixos/channel/ghcide-nix/.github/workflows/ci.yaml b/nixos/channel/ghcide-nix/.github/workflows/ci.yaml
@@ -0,0 +1,17 @@
+name: "Build"
+on:
+  pull_request:
+  push:
+jobs:
+  tests:
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cachix/install-nix-action@v8
+    - uses: cachix/cachix-action@v5
+      with:
+        name: ghcide-nix
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
diff --git a/nixos/channel/ghcide-nix/.gitignore b/nixos/channel/ghcide-nix/.gitignore
@@ -0,0 +1,2 @@
+result
+result-*
diff --git a/nixos/channel/ghcide-nix/README.md b/nixos/channel/ghcide-nix/README.md
@@ -0,0 +1,28 @@
+# Getting started
+
+## 1. Use Cachix to avoid compilation (optional if you like compiling for 2h)
+
+    $ nix-env -iA cachix -f https://cachix.org/api/v1/install
+    $ cachix use ghcide-nix
+
+## 2. Install ghcide
+
+Currently available for `ghc865`, `ghc864` and `ghc844`:
+
+### On NixOS
+
+```nix
+environment.systemPackages = [
+  (import (builtins.fetchTarball "https://github.com/cachix/ghcide-nix/tarball/master") {}).ghcide-ghc865
+];
+```
+
+### With Nix
+
+    $ nix-env -iA ghcide-ghc865 -f https://github.com/cachix/ghcide-nix/tarball/master
+
+## 3. [Continue by following upstream instructions](https://github.com/digital-asset/ghcide#test-ghcide)
+
+# Updating
+
+    ./update
diff --git a/nixos/channel/ghcide-nix/bors.toml b/nixos/channel/ghcide-nix/bors.toml
@@ -0,0 +1,5 @@
+status = [
+  "ci/hercules/derivations",
+  "ci/hercules/evaluation",
+]
+delete_merged_branches = true
diff --git a/nixos/channel/ghcide-nix/default.nix b/nixos/channel/ghcide-nix/default.nix
@@ -0,0 +1,2 @@
+{ pkgs ? import ./nix {} }:
+pkgs.export
diff --git a/nixos/channel/ghcide-nix/nix/cabal.patch b/nixos/channel/ghcide-nix/nix/cabal.patch
@@ -0,0 +1,20 @@
+diff --git a/Distribution/Simple/Build/PathsModule.hs b/Distribution/Simple/Build/PathsModule.hs
+index f6a203874..2aa406f74 100644
+--- a/Distribution/Simple/Build/PathsModule.hs
++++ b/Distribution/Simple/Build/PathsModule.hs
+@@ -192,10 +192,14 @@ generate pkg_descr lbi clbi =
+           bindir     = flat_bindir,
+           libdir     = flat_libdir,
+           dynlibdir  = flat_dynlibdir,
+-          datadir    = flat_datadir,
+           libexecdir = flat_libexecdir,
+           sysconfdir = flat_sysconfdir
+         } = absoluteComponentInstallDirs pkg_descr lbi cid NoCopyDest
++
++        InstallDirs {
++          datadir    = flat_datadir
++        } = absoluteInstallDirs pkg_descr lbi NoCopyDest
++
+         InstallDirs {
+           bindir     = flat_bindirrel,
+           libdir     = flat_libdirrel,
diff --git a/nixos/channel/ghcide-nix/nix/ci.nix b/nixos/channel/ghcide-nix/nix/ci.nix
@@ -0,0 +1,17 @@
+let
+  sources = import ./sources.nix;
+  inherit (import ./dimension.nix { lib = import (sources.nixpkgs + "/lib"); })
+    dimension
+    ;
+
+in
+  dimension "System" {
+    "x86_64-linux" = {};
+    "x86_64-darwin" = {};
+  } (system: {}:
+
+    import ../default.nix {
+      pkgs = import ./default.nix { inherit system; };
+    }
+
+  )
diff --git a/nixos/channel/ghcide-nix/nix/default.nix b/nixos/channel/ghcide-nix/nix/default.nix
@@ -0,0 +1,45 @@
+{ sources ? import ./sources.nix
+, system ? builtins.currentSystem
+}:
+let
+  haskellnix = import sources."haskell.nix";
+  overlay = _: pkgs:
+    let
+      mkPackages = { ghc, stackYaml }:
+        pkgs.haskell-nix.stackProject {
+            src = sources.ghcide;
+            inherit stackYaml;
+            modules = [({config, ...}: {
+              ghc.package = ghc;
+              compiler.version = pkgs.lib.mkForce ghc.version;
+              reinstallableLibGhc = true;
+              packages.ghc.flags.ghci = pkgs.lib.mkForce true;
+              packages.ghci.flags.ghci = pkgs.lib.mkForce true;
+              # This fixes a performance issue, probably https://gitlab.haskell.org/ghc/ghc/issues/15524
+              packages.ghcide.configureFlags = [ "--enable-executable-dynamic" ];
+              packages.haskell-lsp.components.library.doHaddock = pkgs.lib.mkForce false;
+              packages.ghcide.components.library.doHaddock = pkgs.lib.mkForce false;
+            })];
+          };
+      mkGhcide = args@{...}:
+        let packages = mkPackages ({ghc = pkgs.haskell-nix.compiler.ghc865; stackYaml = "stack.yaml"; } // args);
+        in packages.ghcide.components.exes.ghcide // { inherit packages; };
+    in { export = {
+          # ghcide-ghc881 = mkHieCore { ghc = pkgs.haskell-nix.compiler.ghc881; stackYaml = "stack88.yaml"; };
+          ghcide-ghc865 = mkGhcide { ghc = pkgs.haskell-nix.compiler.ghc865; stackYaml = "stack.yaml"; };
+          ghcide-ghc864 = mkGhcide { ghc = pkgs.haskell-nix.compiler.ghc864; stackYaml = "stack.yaml"; };
+          ghcide-ghc844 = mkGhcide { ghc = pkgs.haskell-nix.compiler.ghc844; stackYaml = "stack84.yaml"; };
+          hie-bios = (mkPackages { ghc = pkgs.haskell-nix.compiler.ghc865; stackYaml = "stack.yaml"; }).hie-bios.components.exes.hie-bios;
+          inherit mkGhcide;
+         };
+
+         devTools = {
+           inherit (import sources.niv {}) niv;
+         };
+      };
+in
+import sources.nixpkgs {
+  overlays = haskellnix.overlays ++ [ overlay ];
+  config = haskellnix.config // {};
+  inherit system;
+}
diff --git a/nixos/channel/ghcide-nix/nix/dimension.nix b/nixos/channel/ghcide-nix/nix/dimension.nix
@@ -0,0 +1,115 @@
+{ lib }:
+{
+  /*
+    dimension: name -> attrs -> function -> attrs
+    where
+      function: keyText -> value -> attrsOf package
+
+    WARNING: Attribute names must not contain periods ("."). 
+             See https://github.com/NixOS/nix/issues/3088
+
+    NOTE: The dimension name will be picked up by agent and web ui soon.
+
+    Specifies a dimension of the build matrix. For example
+
+        dimension "Example" {
+          withP = { p = true; }
+          withoutP = { p = false; }
+        } (key:      # either "withP" or "withoutP"
+          { p }:     # either p = true or p = false
+          myProject p
+        )
+
+    evaluates roughly to
+
+        { 
+          withP = myProject true;
+          withoutP = myProject false;
+        }
+
+    Use nested calls for multiple dimensions.
+
+    Example:
+
+        dimension "System" {
+          "x86_64-linux" = {};
+          # ...
+          }: (system: {}:
+
+          dimension "Nixpkgs release" (
+            {
+              "nixpkgs-19_03".nixpkgs = someSource
+            } // optionalAttrs (system != "...") {
+              "nixpkgs-unstable".nixpkgs = someOtherSource
+            }
+            ) (_key: { nixpkgs }:
+
+            myProject system nixpkgs
+
+          )
+        )
+
+    evaluates roughly to
+
+        {
+          x86_64-linux.nixpkgs-19_03 = myProject "x86_64-linux" someSource;
+          x86_64-linux.nixpkgs-unstable = myProject "x86_64-linux" someOtherSource;
+          ...
+        }
+
+    If you need to make references across attributes, you can do so by binding
+    the result. Wherever you write
+
+        dimension "My dimension" {} (key: value: f1 key value)
+
+    You can also write
+
+        let 
+          myDimension = dimension "My dimension" {} (key: value: f2 key value myDimension)
+        in
+          myDimension
+
+    This example builds a single test runner to reuse across releases:
+
+        let
+          overlay =
+            testRunnerPkgs: self: super: {
+              # ...
+            };
+          myProject =
+            { nixpkgs,
+              pkgs ? import nixpkgs { overlays = [ overlay ]; },
+              testRunnerPkgs ? pkgs
+            }: pkgs;
+        in
+
+        let
+          latest = "nixpkgs-19_03";
+          releases =
+            dimension "Nixpkgs release"
+              {
+                nixpkgs-18_09.nixpkgs = someSource
+                nixpkgs-19_03.nixpkgs = someOtherSource
+              }
+              (_key: { nixpkgs }:
+
+                myProject {
+                  inherit nixpkgs;
+                  testRunnerPkgs = releases."${latest}";
+                }
+
+              );
+        in releases;
+
+   */
+  dimension = name: attrs: f:
+    lib.mapAttrs
+      (k: v:
+       let o = f k v;
+       in o // { recurseForDerivations = o.recurseForDerivations or true; }
+      )
+      attrs
+    // { meta.dimension.name = name; };
+
+  # TODO: move this file somewhere (a flake?)
+}
diff --git a/nixos/channel/ghcide-nix/nix/sources.json b/nixos/channel/ghcide-nix/nix/sources.json
@@ -0,0 +1,50 @@
+{
+    "ghcide": {
+        "branch": "master",
+        "description": "A library for building Haskell IDE tooling",
+        "homepage": "",
+        "owner": "digital-asset",
+        "repo": "ghcide",
+        "rev": "c74e9b51f131df446c8e011ae79f3370c683f12b",
+        "sha256": "19m8jgqqgcarr991adxz5cnd2zixvy14v0ima5950jrd8h73nzcm",
+        "type": "tarball",
+        "url": "https://github.com/digital-asset/ghcide/archive/c74e9b51f131df446c8e011ae79f3370c683f12b.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "haskell.nix": {
+        "branch": "master",
+        "description": "Alternative Haskell Infrastructure for Nixpkgs",
+        "homepage": "https://input-output-hk.github.io/haskell.nix",
+        "owner": "input-output-hk",
+        "repo": "haskell.nix",
+        "rev": "642636b47b9bce32d68554e9a935eff120fd95a1",
+        "sha256": "14vlfvzm5rb8flacs1dngq52cim23jlj4cdk5sn511b6ybx93p06",
+        "type": "tarball",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/642636b47b9bce32d68554e9a935eff120fd95a1.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "niv": {
+        "branch": "master",
+        "description": "Easy dependency management for Nix projects",
+        "homepage": "https://github.com/nmattia/niv",
+        "owner": "nmattia",
+        "repo": "niv",
+        "rev": "5e9671a9a87c240b1c6ce981d04ad23ba4291451",
+        "sha256": "08j7msxkv452pyxnh0sgn6h9930i5mk9mszba49bj5401gzmfb8a",
+        "type": "tarball",
+        "url": "https://github.com/nmattia/niv/archive/5e9671a9a87c240b1c6ce981d04ad23ba4291451.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs": {
+        "branch": "release-20.03",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2d149fcaf3b794947eeb3899859a371d10d38f9f",
+        "sha256": "1fd8c7zaklc1ww4ddayb9s676cf71nj9xgszkq4hr981gkiajnsv",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/2d149fcaf3b794947eeb3899859a371d10d38f9f.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}
diff --git a/nixos/channel/ghcide-nix/nix/sources.nix b/nixos/channel/ghcide-nix/nix/sources.nix
@@ -0,0 +1,26 @@
+# A record, from name to path, of the third-party packages
+with
+{
+  versions = builtins.fromJSON (builtins.readFile ./sources.json);
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  fetchTarball =
+    { url, sha256 }:
+      if builtins.lessThan builtins.nixVersion "1.12" then
+        builtins.fetchTarball { inherit url; }
+      else
+        builtins.fetchTarball { inherit url sha256; };
+};
+
+# NOTE: spec must _not_ have an "outPath" attribute
+builtins.mapAttrs (_: spec:
+  if builtins.hasAttr "outPath" spec
+  then abort
+    "The values in versions.json should not have an 'outPath' attribute"
+  else
+    if builtins.hasAttr "url" spec && builtins.hasAttr "sha256" spec
+    then
+      spec //
+    { outPath = fetchTarball { inherit (spec) url sha256; } ; }
+    else spec
+  ) versions
diff --git a/nixos/channel/ghcide-nix/shell.nix b/nixos/channel/ghcide-nix/shell.nix
@@ -0,0 +1,4 @@
+{ pkgs ? import ./nix {} }:
+pkgs.mkShell
+  { buildInputs = pkgs.lib.attrValues pkgs.devTools;
+  }
diff --git a/nixos/channel/ghcide-nix/update b/nixos/channel/ghcide-nix/update
@@ -0,0 +1 @@
+nix-shell --run "niv update ghcide"