Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix-direnv: use nix (2.4) and remove enableFlakes #145236

Merged
merged 1 commit into from
Nov 10, 2021
Merged

nix-direnv: use nix (2.4) and remove enableFlakes #145236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pkgs/tools/misc/nix-direnv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@
, stdenv
, fetchFromGitHub
, gnugrep
, nixStable
, nixUnstable
, enableFlakes ? false
lovesegfault marked this conversation as resolved.
Show resolved Hide resolved
, nix
, enableFlakes ? null # deprecated
}:

let
nix = if enableFlakes then nixUnstable else nixStable;
in
stdenv.mkDerivation rec {
pname = "nix-direnv";
version = "1.5.0";
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ mapAliases ({
nfsUtils = nfs-utils; # added 2014-12-06
nginxUnstable = nginxMainline; # added 2018-04-25
nilfs_utils = nilfs-utils; # added 2018-04-25
nix-direnv-flakes = nix-direnv;
nix-review = nixpkgs-review; # added 2019-12-22
nixFlakes = nixStable; # added 2021-05-21
nmap_graphical = nmap-graphical; # added 2017-01-19
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3336,7 +3336,6 @@ with pkgs;
nfstrace = callPackage ../tools/networking/nfstrace { };

nix-direnv = callPackage ../tools/misc/nix-direnv { };
nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; };

nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);

Expand Down