chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Don't use nixpkgs-master anymore

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-02-22 16:11:48 +01:00
parent 664af405d0
commit 9d82e6dcdd
5 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shells/accentor-api.nix
View file

@ -1,6 +1,5 @@
let
pkgs = import <nixpkgs> {};
nixpkgs-master = import <nixpkgs-master> {};
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
in
pkgs.mkShell {
@ -10,7 +9,7 @@ in
ruby_2_7
taglib
zlib
(nixpkgs-master.neovim.override {
(neovim.override {
configure = {
customRC = baseVimConfig.customRC + ''
" Required for operations modifying multiple buffers like rename

3
shells/dodona.nix
View file

@ -1,6 +1,5 @@
let
pkgs = import <nixpkgs> {};
nixpkgs-master = import <nixpkgs-master> {};
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
nodePackages = import ../packages/node/default.nix { inherit pkgs; };
in
@ -20,7 +19,7 @@ in
child=$!
wait $child
'')
(nixpkgs-master.neovim.override {
(neovim.override {
configure = {
customRC = baseVimConfig.customRC + ''
" Required for operations modifying multiple buffers like rename

3
shells/ledger.nix
View file

@ -1,10 +1,9 @@
let
pkgs = import <nixpkgs> {};
nixpkgs-master = import <nixpkgs-master> {};
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
in
pkgs.mkShell {
buildInputs = with nixpkgs-master; [
buildInputs = with pkgs; [
(neovim.override {
configure = {
customRC = baseVimConfig.customRC;