From ab8f8ca927c4ff6d4c27ad9ff5cfaf5b0aa33288 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 29 Jul 2019 21:42:21 +0200
Subject: [PATCH] Move default.nix to shell.nix

---
 default.nix => shell.nix |  0
 upstream.nix             | 15 +++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 rename default.nix => shell.nix (100%)

diff --git a/default.nix b/shell.nix
similarity index 100%
rename from default.nix
rename to shell.nix
diff --git a/upstream.nix b/upstream.nix
index 0a2236d93..f528ff3af 100644
--- a/upstream.nix
+++ b/upstream.nix
@@ -1,14 +1,21 @@
 { nixpkgs ? import <nixpkgs> {} }:
 
 let
-  inherit (nixpkgs) stdenv git tup pkg-config;
-  toolchain = import ./tool/toolchain.nix { inherit nixpkgs; };
+  inherit (nixpkgs) stdenv fetchgit git tup pkg-config;
+
+  toolchain = import ./toolchain.nix { inherit nixpkgs; };
+  version = "19.07-322-gfe24051cd";
 in
 stdenv.mkDerivation {
   name = "genode";
   outputs = [ "out" "dev" ];
+  inherit version;
 
-  src = ./../genode;
+  src = fetchgit {
+    url = "git://depot.h4ck.me/srv/git/genode";
+    rev = "fe24051cd811d5e769104ffd7228d35a72a3d93c";
+    sha256 = "09wl7q1xc7fvnj8zcb4ix1ipqzxrgp6sbdsqp92r2gxqkadyrpxc";
+  };
 
   nativeBuildInputs =
     [ toolchain
@@ -27,7 +34,7 @@ stdenv.mkDerivation {
       # Use specialized build configuration
       substitute configs/nix-x86_64.config tup.config \
         --replace @NIX_DEV_OUTPUT@ $dev \
-        --replace @NIX_DEPOT_VERSION@ `git describe` \
+        --replace @NIX_DEPOT_VERSION@ ${version} \
 
       # Scan repository and generate script
       mkdir lib