Merge pull request #145236 from lovesegfault/nix-direnv-stable-nix
commit754e2a598ca71384bd1ec6ef63407393878ff74a
authorBernardo Meurer <bernardo@meurer.org>
dateTue 9 Nov 2021, 22:44 (5 years ago)
parent7a8d1c2c03040c
pkgs/tools/misc/nix-direnv/default.nix+2−7
@@ -2,14 +2,9 @@
22, stdenv
33, fetchFromGitHub
44, gnugrep
5−, nixStable
6−, nixUnstable
7−, enableFlakes ? false
5+, nix
6+, enableFlakes ? null # deprecated
87}:
9−
10−let
11− nix = if enableFlakes then nixUnstable else nixStable;
12−in
138stdenv.mkDerivation rec {
149 pname = "nix-direnv";
1510 version = "1.5.0";
pkgs/top-level/aliases.nix+1
@@ -590,6 +590,7 @@ mapAliases ({
590590 nfsUtils = nfs-utils; # added 2014-12-06
591591 nginxUnstable = nginxMainline; # added 2018-04-25
592592 nilfs_utils = nilfs-utils; # added 2018-04-25
593+ nix-direnv-flakes = nix-direnv;
593594 nix-review = nixpkgs-review; # added 2019-12-22
594595 nixFlakes = nixStable; # added 2021-05-21
595596 nmap_graphical = nmap-graphical; # added 2017-01-19
pkgs/top-level/all-packages.nix−1
@@ -3338,7 +3338,6 @@ with pkgs;
33383338 nfstrace = callPackage ../tools/networking/nfstrace { };
33393339
33403340 nix-direnv = callPackage ../tools/misc/nix-direnv { };
3341− nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; };
33423341
33433342 nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);
33443343