Merge pull request #2240 from wireapp/fix-niv

nix: fix niv

.gitignore

@@ -106,3 +106,7 @@ telepresence.log
 # local config
 .envrc.local
 cabal.project.local
+
+# Nix output symlinks
+result
+result-*

dev-packages.nix

@@ -141,7 +141,6 @@ let
       pkgs.libsodium.dev
       pkgs.libxml2.dev
       pkgs.ncurses.dev
-      pkgs.niv.out
       pkgs.openssl.dev
       pkgs.pcre.dev
       pkgs.snappy.dev
@@ -178,6 +177,7 @@ in
   pkgs.gnumake
   (pkgs.haskell-language-server.override { supportedGhcVersions = [ "8107" ]; })
   pkgs.jq
+  pkgs.niv
   pkgs.ormolu
   pkgs.telepresence
   pkgs.wget

nix/default.nix

@@ -3,8 +3,6 @@ let
   pkgs = import sources.nixpkgs {
     config.allowUnfree = true;
     overlays = [
-      # the tool we use for versioning (The thing that generates sources.json)
-      (_: _: { niv = (import sources.niv { }).niv; })
       # All wire-server specific packages
       (import ./overlay.nix)
 

nix/sources.json

@@ -1,16 +1,4 @@
 {
-    "niv": {
-        "branch": "master",
-        "description": "Easy dependency management for Nix projects",
-        "homepage": "https://github.com/nmattia/niv",
-        "owner": "nmattia",
-        "repo": "niv",
-        "rev": "5830a4dd348d77e39a0f3c4c762ff2663b602d4c",
-        "sha256": "1d3lsrqvci4qz2hwjrcnd8h5vfkg8aypq3sjd4g3izbc8frwz5sm",
-        "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/5830a4dd348d77e39a0f3c4c762ff2663b602d4c.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "nixpkgs": {
         "branch": "nixpkgs-unstable",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",