From 42b0f1822847bbddaf4130bb9aff1db0f86ce6a5 Mon Sep 17 00:00:00 2001 From: Nikola Glumac Date: Mon, 4 Jan 2021 11:19:00 +0100 Subject: [PATCH 1/3] Bump nixkpkgs --- nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index d65b756e..9fed9766 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,10 +29,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "d105075a1fd870b1d1617a6008cb38b443e65433", - "sha256": "1jcs44wn0s6mlf2jps25bvcai1rij9b2dil6zcj8zqwf2i8xmqjh", + "rev": "c6b23ba64aea4b0e2163ff84990084a6bec455c5", + "sha256": "13hg91g46qg2bbpdzpnmzcrsayfbkcp0gx36n8lsb2v980vahvi3", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/d105075a1fd870b1d1617a6008cb38b443e65433.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/c6b23ba64aea4b0e2163ff84990084a6bec455c5.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-19.09": { From e5297f541eca0a12d0bff0d4e9cbee911bc796fe Mon Sep 17 00:00:00 2001 From: Nikola Glumac Date: Mon, 4 Jan 2021 12:06:56 +0100 Subject: [PATCH 2/3] Switch to nixos-unstable branch --- nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 9fed9766..8ff5df87 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-20.09", + "branch": "nixos-unstable", "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6b23ba64aea4b0e2163ff84990084a6bec455c5", - "sha256": "13hg91g46qg2bbpdzpnmzcrsayfbkcp0gx36n8lsb2v980vahvi3", + "rev": "68398d2dd50efc2d878bf0f83bbc8bc323b6b0e0", + "sha256": "1bivcxnajll53ixwyl304fq22w5dg97fqbwk8imp6ipwq84bq5ga", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/c6b23ba64aea4b0e2163ff84990084a6bec455c5.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/68398d2dd50efc2d878bf0f83bbc8bc323b6b0e0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-19.09": { From f0a0dfb6e014ae80b0bc570d23648bc722c3f5f6 Mon Sep 17 00:00:00 2001 From: Nikola Glumac Date: Mon, 4 Jan 2021 12:54:05 +0100 Subject: [PATCH 3/3] Adds CHANGELOG entry --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index e0b329a3..07b4a8f5 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,9 @@ Please read these notes when updating your project's `iohk-nix` version. There may have been changes which could break your build. +## 2021-01-04 + * Switch default nixpkgs to nixos-unstable + ## 2020-11-11 * Switch default nixpkgs to 20.09 * `commonLib.commitIdFromGitRepo` is deprecated in favour of nixpkgs `lib.commitIdFromGitRepo`.