diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 05:00:43 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 05:02:00 +0200 |
commit | aa047fd2583780b330eeefaf3efd664b36c7cbd3 (patch) | |
tree | 5353d342dcdc2cac5d899f497237aa05d66cff9b /modules/user/aszlig | |
parent | 7abb9b349f70d8ce2ae4c7004e59ee9952623c17 (diff) |
profiles/base: Remove nix-repl from packages
Nix 1.12 already contains "nix repl" and as I'm using Nix 1.12 on all of my machines the nix-repl package is obsolete. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user/aszlig')
-rw-r--r-- | modules/user/aszlig/profiles/base.nix | 14 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/packages.nix | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix index 47a64eda..3f6ffca3 100644 --- a/modules/user/aszlig/profiles/base.nix +++ b/modules/user/aszlig/profiles/base.nix @@ -81,20 +81,6 @@ in { checksumType = "mhash"; }; nix = pkgs.nixUnstable; - # XXX: As of edolstra/nix-repl@8a2f5f0, this won't build with - # nixUnstable (version 1.12pre4509_69f28eb). - nix-repl = pkgs.nix-repl.overrideDerivation (drv: { - src = pkgs.fetchFromGitHub { - owner = "edolstra"; - repo = "nix-repl"; - rev = "0e49f941205769852846cb8afa228831cf6ae363"; - sha256 = "0zsxkxypnm8zzzslvcdqips7glbxw1riq9mxn9w23kayl8d1mfpx"; - }; - NIX_CFLAGS_COMPILE = "-std=c++1y"; - postPatch = (drv.postPatch or "") + '' - sed -i -e 's/pid\.wait(true)/pid.wait()/g' nix-repl.cc - ''; - }); uqm = pkgs.uqm.override { use3DOVideos = true; useRemixPacks = true; diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix index 5bb1f167..b72cc72e 100644 --- a/modules/user/aszlig/profiles/workstation/packages.nix +++ b/modules/user/aszlig/profiles/workstation/packages.nix @@ -36,7 +36,6 @@ pkgs: with pkgs; [ ncdu netrw nix-prefetch-scripts - nix-repl vuizvui.aszlig.nixops nmap openssh |