From 71e1a286e5f87091619ad06d5faefe5818f726f8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 29 Jan 2020 16:26:43 +0100 Subject: [PATCH] Nix: update flake --- Tuprules.gcc | 2 +- flake.lock | 10 +++++----- flake.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Tuprules.gcc b/Tuprules.gcc index 66db68bdb..b4201661d 100644 --- a/Tuprules.gcc +++ b/Tuprules.gcc @@ -42,5 +42,5 @@ LIBGCC = `$(CXX) $(CC_MARCH) -print-libgcc-file-name` !incbin = |> ^ incbin %f^ \ export SYM=_binary_`echo %b | sed 's/\./_/g'`; \ echo ".global ${SYM}_start, ${SYM}_end; .data; .align 4; ${SYM}_start:; .incbin \"%f\"; ${SYM}_end:" \ - | as $(AS_MARCH) -o %o - \ + | x86_64-unknown-genode-as $(AS_MARCH) -o %o - \ |> binary_%b.o diff --git a/flake.lock b/flake.lock index b90b34e16..cb2f200e8 100644 --- a/flake.lock +++ b/flake.lock @@ -30,9 +30,9 @@ "url": "github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9" } }, - "narHash": "sha256-72QPBUP9EaIPGneWDLYIb6Wo5XR/lmijobDlaX8iKHA=", + "narHash": "sha256-7eL2MfGgeEaIwJXPc4LQ7pBa4JeGicm9th7onjKgzsE=", "originalUrl": "git+https://gitea.c3d2.de/ehmry/genode-depot.git", - "url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=4e85cc4dd28d868d28815be4c925b1bb64d19939" + "url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=8c2aafed45b4075e37f1cd93de0ebf93f38c83c3" }, "nixpkgs": { "inputs": {}, @@ -41,9 +41,9 @@ "url": "github:ehmry/nixpkgs/cf50f3b8bdc28832249afab6bca68acad832e011" } }, - "narHash": "sha256-uVUZZTXUDZqOtoSee0YpJ8WIgIOaP9yv3lN127sr3h8=", - "originalUrl": "git+https://git.sr.ht/~ehmry/genodepkgs?ref=staging", - "url": "git+https://git.sr.ht/~ehmry/genodepkgs?ref=staging&rev=45df037912a53c035909a932802bad5e56921f78" + "narHash": "sha256-78eloDNkEjWAckNLbfNait0zb6QBG4QxltX6FyV1vAk=", + "originalUrl": "git+https://git.sr.ht/~ehmry/genodepkgs", + "url": "git+https://git.sr.ht/~ehmry/genodepkgs?ref=master&rev=dad28cc17b17542ada59ba2005fbf1af5d5f8209" }, "nixpkgs": { "inputs": {}, diff --git a/flake.nix b/flake.nix index 3cb9f3946..2f16a9401 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ edition = 201909; - inputs.genodepkgs.uri = "git+https://git.sr.ht/~ehmry/genodepkgs?ref=staging"; + inputs.genodepkgs.uri = "git+https://git.sr.ht/~ehmry/genodepkgs"; outputs = { self, nixpkgs, genodepkgs }: {