Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab867cfbaec5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d39981eabc18
Choose a head ref
  • 2 commits
  • 2 files changed
  • 4 contributors

Commits on Nov 25, 2020

  1. envchain: init at 1.0.1 

    Co-authored-by: Jon <jonringer@users.noreply.github.com>
Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
    @bbigras @r-burns @SuperSandro2000
    4 people committed Nov 25, 2020
    Copy the full SHA
    dc83d21 View commit details

Commits on Nov 26, 2020

  1. Merge pull request #99978 from bbigras/envchain 

    envchain: init at 1.0.1
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020
    Copy the full SHA
    d39981e View commit details
Showing with 34 additions and 0 deletions.
  1. +32 −0 pkgs/tools/misc/envchain/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
32 changes: 32 additions & 0 deletions pkgs/tools/misc/envchain/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }:

stdenv.mkDerivation rec {
pname = "envchain";
version = "1.0.1";

src = fetchFromGitHub {
owner = "sorah";
repo = pname;
rev = "v${version}";
sha256 = "0qxwiqhb8cg0zbn5p0mvnbyxx1xwvgiricrkjlvxz13sf2ngq87p";
};

postPatch = ''
sed -i -e "s|-ltermcap|-lncurses|" Makefile
'';

nativeBuildInputs = [ pkg-config ];

buildInputs = [ libsecret readline ]
++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ];

makeFlags = [ "DESTDIR=$(out)" ];

meta = with stdenv.lib; {
description = "Set environment variables with macOS keychain or D-Bus secret service";
homepage = "https://github.com/sorah/envchain";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ bbigras ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3699,6 +3699,8 @@ in

entr = callPackage ../tools/misc/entr { };

envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; };

eot_utilities = callPackage ../tools/misc/eot-utilities { };

eplot = callPackage ../tools/graphics/eplot { };