nix-direnv: use nix (2.4) and remove enableFlakes
Follow-up to #144197 since nixUnstable is no longer needed for flake
support.
commitc03040cfd5fef7dc99a7663c30e33df5ebec6984
authorBernardo Meurer <bernardo@meurer.org>
dateTue 9 Nov 2021, 11:31 (5 years ago)
parenta658747
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
@@ -589,6 +589,7 @@ mapAliases ({
589589 nfsUtils = nfs-utils; # added 2014-12-06
590590 nginxUnstable = nginxMainline; # added 2018-04-25
591591 nilfs_utils = nilfs-utils; # added 2018-04-25
592+ nix-direnv-flakes = nix-direnv;
592593 nix-review = nixpkgs-review; # added 2019-12-22
593594 nixFlakes = nixStable; # added 2021-05-21
594595 nmap_graphical = nmap-graphical; # added 2017-01-19
pkgs/top-level/all-packages.nix−1
@@ -3336,7 +3336,6 @@ with pkgs;
33363336 nfstrace = callPackage ../tools/networking/nfstrace { };
33373337
33383338 nix-direnv = callPackage ../tools/misc/nix-direnv { };
3339− nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; };
33403339
33413340 nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);
33423341