Skip to content

Commit

Permalink
Revert "floxify take 2 (#12)" (#15)
Browse files Browse the repository at this point in the history
This reverts commit 95a30d6.
  • Loading branch information
aakropotkin authored Jul 5, 2023
1 parent 95a30d6 commit 363488f
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 1,409 deletions.
24 changes: 3 additions & 21 deletions .github/workflows/compare-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ jobs:
echo "selfURI: $selfURI" >&2;
echo "Installing deps" >&2;
nix profile install 'nixpkgs#krb5^out,dev' -L;
nix profile install 'nixpkgs#pkg-config' -L;
nix profile install "$selfURI#etc-profiles" -L;
nix profile install "nixpkgs#nodejs" -L;
nix profile install 'nixpkgs#krb5^out,dev' -L;
nix profile install 'nixpkgs#pkg-config' -L;
nix profile install "$selfURI#etc-profiles" -L;
echo "Activating env" >&2;
export FLOX_ENV="$HOME/.nix-profile";
Expand All @@ -85,20 +84,3 @@ jobs:
echo "---" >&2;
exit 1;
fi
- name: Node.js KRB5 Test
shell: bash
run: |
export FLOX_ENV="$HOME/.nix-profile";
. "$FLOX_ENV/etc/profile";
mkdir ./node-krb5;
cd ./node-krb5;
# Install `krb5' module with `npm'.
npm i krb5;
if [[ -x "$PWD/node_modules/krb5/build/Release/krb5.node" ]]; then
echo "PASS: npm" >&2;
exit 0;
else
echo "FAIL: npm" >&2;
exit 1;
fi
17 changes: 0 additions & 17 deletions .github/workflows/trivial-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
echo "Creating flox.nix" >&2;
cat <<EOF > ./flox.nix
{
packages.nixpkgs-flox.nodejs = {};
packages.nixpkgs-flox.krb5 = {
meta.outputsToInstall = ["out" "dev"];
};
Expand Down Expand Up @@ -96,19 +95,3 @@ jobs:
echo "---" >&2;
exit 1;
fi
- name: Node.js KRB5 Test
shell: bash
run: |
runEnv() { flox activate -e krb5-dev -- "$@"; }
mkdir ./node-krb5;
cd ./node-krb5;
# Install `krb5' module with `npm'.
runEnv npm i krb5;
if [[ -x "$PWD/node_modules/krb5/build/Release/krb5.node" ]]; then
echo "PASS: npm" >&2;
exit 0;
else
echo "FAIL: npm" >&2;
exit 1;
fi
Loading

0 comments on commit 363488f

Please sign in to comment.