From cb895256331913419ee7d1bbbcc5199866705d40 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 1 Apr 2021 16:09:09 -0400
Subject: [PATCH] Take morph from our nixpkgs
---
nixpkgs.json | 4 ++--
shell.nix | 12 +-----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/nixpkgs.json b/nixpkgs.json
index 4221d232..eb12fb34 100644
--- a/nixpkgs.json
+++ b/nixpkgs.json
@@ -1,4 +1,4 @@
{ "name": "nixpkgs"
-, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/d1eecb8286a01aeaa07e78fdc6f4c5e2ba638629.tar.gz"
-, "sha256": "11h2w6aplyb50lsvdyzw6y6whbfqlsmyr6s3f8a8915142i9wh3b"
+, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/31c7a57bd9972979275fbfd9e490bfb502154c11.tar.gz"
+, "sha256": "0chvfxi2xcqhnabivjych8xdz7lm9svkvribjssyyaxc54xpql24"
}
diff --git a/shell.nix b/shell.nix
index 0c9c12f9..b15b7c66 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,19 +4,9 @@ let
nixpkgs = import nixpkgs-src { };
in
{ pkgs ? nixpkgs }:
-let
- # Get a version of Morph known to work with our version of NixOS.
- morph-src = pkgs.fetchFromGitHub {
- owner = "DBCDK";
- repo = "morph";
- rev = "3856a9c2f733192dee1600b8655715d760ba1803";
- hash = "sha256:0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf";
- };
- morph = pkgs.callPackage (morph-src + "/nix-packaging") { };
-in
pkgs.mkShell {
NIX_PATH = "nixpkgs=${nixpkgs.path}";
buildInputs = [
- morph
+ pkgs.morph
];
}
--
GitLab