From 2b78c641a5114d79ff627ffb34adaa6b060a6bb4 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 22 Dec 2021 09:58:14 -0500
Subject: [PATCH] fix typo in the name of our nixpkgs source
It was consistent so it worked fine but it was misleading since it points at
21.05, not the non-existent 20.15.
---
CONTRIBUTING.rst | 2 +-
default.nix | 2 +-
nix/sources.json | 2 +-
shell.nix | 2 +-
tests.nix | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 467ebe7..3c8030a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -71,5 +71,5 @@ nixpkgs
We pin to a nixos channel release, which isn't directly supported by niv (`issue <https://github.com/nmattia/niv/issues/225>`_).
Thus, the pin needs to be update manually.
-To do this, copy the ``url`` and ``sha256`` values from PrivateStorageio's `nixpkgs-2105.json <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/blob/develop/nixpkgs-2105.json>`_ into the ``release2015`` entry in ``nix/sources.json``.
+To do this, copy the ``url`` and ``sha256`` values from PrivateStorageio's `nixpkgs-2105.json <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/blob/develop/nixpkgs-2105.json>`_ into the ``release2105`` entry in ``nix/sources.json``.
When this is deployed as part of Privatestorageio, we use the value pinned there, rather than the pin in this repository.
diff --git a/default.nix b/default.nix
index 7f9b277..0e68b63 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,7 @@
let
sources = import nix/sources.nix;
in
-{ pkgs ? import sources.release2015 {}
+{ pkgs ? import sources.release2105 {}
, pypiData ? sources.pypi-deps-db
, mach-nix ? import sources.mach-nix { inherit pkgs pypiData; }
, tahoe-lafs-source ? "tahoe-lafs"
diff --git a/nix/sources.json b/nix/sources.json
index 9ce1d8e..b294dc6 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -35,7 +35,7 @@
"url": "https://github.com/DavHau/pypi-deps-db/archive/96d01556b4597c022647acbf8c3b58d2a99bc963.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "release2015": {
+ "release2105": {
"sha256": "112drvixj81vscj8cncmks311rk2ik5gydpd03d3r0yc939zjskg",
"type": "tarball",
"url": "https://releases.nixos.org/nixos/21.05/nixos-21.05.3740.ce7a1190a0f/nixexprs.tar.xz",
diff --git a/shell.nix b/shell.nix
index f34fcf9..0f661eb 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,7 @@
let
sources = import nix/sources.nix;
in
-{ pkgs ? import sources.release2015 {}
+{ pkgs ? import sources.release2105 {}
, tahoe-lafs-source ? "tahoe-lafs"
}:
let
diff --git a/tests.nix b/tests.nix
index 7023c06..e69b4e7 100644
--- a/tests.nix
+++ b/tests.nix
@@ -1,7 +1,7 @@
let
sources = import nix/sources.nix;
in
-{ pkgs ? import sources.release2015 {}
+{ pkgs ? import sources.release2105 {}
, pypiData ? sources.pypi-deps-db
, mach-nix ? import sources.mach-nix { inherit pkgs pypiData; }
, tahoe-lafs-source ? "tahoe-lafs"
--
GitLab