Upgrade to nixpkgs 19.03

digital-asset · May 3, 2019 · 5d36995 · 5d36995
1 parent f4d8e13
commit 5d36995
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 25 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -37,8 +37,8 @@ nixpkgs_local_repository(
     name = "nixpkgs",
     nix_file = "//nix:nixpkgs.nix",
     nix_file_deps = [
-        "//nix:nixpkgs/nixos-18.09/default.nix",
-        "//nix:nixpkgs/nixos-18.09/default.src.json",
+        "//nix:nixpkgs/nixos-19.03/default.nix",
+        "//nix:nixpkgs/nixos-19.03/default.src.json",
     ],
 )
 
@@ -63,8 +63,8 @@ dev_env_nix_repos = {
 common_nix_file_deps = [
     "//nix:bazel.nix",
     "//nix:nixpkgs.nix",
-    "//nix:nixpkgs/nixos-18.09/default.nix",
-    "//nix:nixpkgs/nixos-18.09/default.src.json",
+    "//nix:nixpkgs/nixos-19.03/default.nix",
+    "//nix:nixpkgs/nixos-19.03/default.src.json",
 ]
 
 # Use Nix provisioned cc toolchain

diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
@@ -4,7 +4,7 @@
 
 let
   # See ./nixpkgs/README.md for upgrade instructions.
-  src = import ./nixpkgs/nixos-18.09;
+  src = import ./nixpkgs/nixos-19.03;
 
   # package overrides
   overrides = _: pkgs: rec {

diff --git a/nix/nixpkgs/README.md b/nix/nixpkgs/README.md
@@ -4,7 +4,7 @@ This folder contains the upstream Nix channels that are used for the dev-env.
 
 ## Channels
 
-- `nixos-18.03`
+- `nixos-19.03`
 
 ## Updating
 
@@ -17,6 +17,6 @@ $ nix-update-src-json [CHANNEL]
 Eg:
 
 ```
-nix-update-src-json ./nixos-18.03
+nix-update-src-json ./nixos-19.03
 ```
 
diff --git a/nix/nixpkgs/nixos-18.09/default.nix b/nix/nixpkgs/nixos-18.09/default.nix
diff --git a/nix/nixpkgs/nixos-18.09/default.src.json b/nix/nixpkgs/nixos-18.09/default.src.json
diff --git a/nix/nixpkgs/nixos-19.03/default.src.json b/nix/nixpkgs/nixos-19.03/default.src.json
@@ -2,6 +2,6 @@
   "owner": "NixOS",
   "repo": "nixpkgs-channels",
   "branch": "nixos-19.03",
-  "rev": "5c52b25283a6cccca443ffb7a358de6fe14b4a81",
-  "sha256": "0fhbl6bgabhi1sw1lrs64i0hibmmppy1bh256lq8hxy3a2p1haip"
+  "rev": "915ce0f1e1a75adec7079ddb6cd3ffba5036b3fc",
+  "sha256": "1kmx29i3xy4701z4lgmv5xxslb1djahrjxmrf83ig1whb4vgk4wm"
 }
diff --git a/nix/packages.nix b/nix/packages.nix
@@ -287,7 +287,6 @@ in rec {
     cacert = pkgs.cacert;
     cheat = pkgs.cheat;
     coreutils = pkgs.coreutils;
-    docker-compose  = pkgs.python36Packages.docker_compose;
     dockerd = pkgs.docker;
     findutils = pkgs.findutils;
     ftop = pkgs.ftop;