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

Jump to bottom

Reintroduce pijul (at 0.3.0) #24113

Merged
merged 2 commits into from Mar 20, 2017
Merged

Reintroduce pijul (at 0.3.0) #24113

merged 2 commits into from Mar 20, 2017

Conversation

FlorentBecker
Copy link
Contributor

Motivation for this change

pijul has just had its first public release

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@FlorentBecker, thanks for your PR! By analyzing the history of the files in this pull request, we identified @wizeman, @madjar and @the-kenny to be potential reviewers.

@FlorentBecker FlorentBecker changed the title The return of pijul Reintroduce pijul (at 0.3.0) Mar 20, 2017
Mic92
Mic92 reviewed Mar 20, 2017
View reviewed changes
pkgs/applications/version-management/pijul/default.nix Outdated
version = "0.3.0";

src = fetchurl {
url = https://pijul.org/releases/pijul-0.3.tar.gz;
Copy link
Member

Choose a reason for hiding this comment

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

url = "https://pijul.org/releases/pijul-${version}.tar.gz";

Copy link
Member

Choose a reason for hiding this comment

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

Then version should be 0.3 (without ending zero)

@vbgl
Copy link
Contributor

vbgl commented Mar 20, 2017

On Darwin, the Security framework is needed:

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 1b1a54da00..cef0f23f91 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rustPlatform, perl }:
+{ stdenv, darwin, fetchurl, rustPlatform, perl }:
 
 with rustPlatform;
 
@@ -13,7 +13,10 @@ buildRustPackage rec {
 
   sourceRoot = "pijul/pijul";
 
-  buildInputs = [ perl ];
+  buildInputs = [ perl ]
+  ++ stdenv.lib.optionals stdenv.isDarwin
+  (with darwin.apple_sdk.frameworks; [ Security ])
+  ;
 
   doCheck = false;

@domenkozar domenkozar merged commit f5581d0 into NixOS:master Mar 20, 2017
@copumpkin
Copy link
Member

PIJUL RETURNS!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@domenkozar domenkozar domenkozar left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@FlorentBecker @mention-bot @vbgl @copumpkin @Mic92 @domenkozar