ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #145236 from lovesegfault/nix-direnv-stable-nix

Browse Source
This commit is contained in:
Bernardo Meurer 2021-11-09 22:44:39 -08:00 committed by GitHub
commit 754e2a598c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/nix-direnv/default.nix
View File

@ -2,14 +2,9 @@
, stdenv
, fetchFromGitHub
, gnugrep
, nixStable
, nixUnstable
, enableFlakes ? false
, nix
, enableFlakes ? null # deprecated
}:
let
nix = if enableFlakes then nixUnstable else nixStable;
in
stdenv.mkDerivation rec {
pname = "nix-direnv";
version = "1.5.0";

1
pkgs/top-level/aliases.nix
View File

@ -590,6 +590,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

1
pkgs/top-level/all-packages.nix
View File

@ -3338,7 +3338,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);