Skip to content
This repository was archived by the owner on Oct 7, 2022. It is now read-only.

combine requirements.nix and requirements_generated.nix into one #108

Merged
merged 1 commit into from
Feb 25, 2017

Conversation

seppeljordan
Copy link
Contributor

@seppeljordan seppeljordan commented Feb 24, 2017

This closes #62

This patch should get rid of somthing_genrated.nix


This change is Reviewable

@@ -0,0 +1,3 @@
#!/usr/bin/env sh
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to create a bash script that checks if a string is in file because I could't figure out make and the previous make file rule just didn't work anymore. I really don't know why.

@@ -283,10 +272,7 @@ mercurial: mercurial.nix
nix-build mercurial.nix -o mercurial -A interpreter --show-trace -j 1
./mercurial/bin/python -c 'import flake8'
nix-shell mercurial.nix -A interpreter --run "python -c 'import flake8'"
if [ `cat mercurial_generated.nix | grep "a209fb6" | wc -l` != "1" ]; then \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old version of this just did't work for some reason, so I had to hack in a bash script

@seppeljordan seppeljordan merged commit e5a4407 into nix-community:master Feb 25, 2017
@mfine
Copy link

mfine commented Feb 25, 2017

Thanks!

@seppeljordan seppeljordan deleted the merge-generated-nix branch February 25, 2017 20:07
@garbas garbas modified the milestone: 1.8.0 Apr 11, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

combine requirements.nix and requirements_generated.nix into one
4 participants