# HG changeset patch # User Robin Stumm # Date 1490442922 -3600 # Sat Mar 25 12:55:22 2017 +0100 # Node ID 04c003d6935df75be44df9098bfd10454553a441 # Parent a753c754174399407dfc5d8d85f2f120a0dbd9cc hydra support diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -2,13 +2,14 @@ , buildRustPackage ? (import (pkgs.fetchFromBitbucket { owner = "dermetfan"; repo = "nixpkgs-extras"; - rev = "89ff12eeae4d9f38a3231c2cc1986f7157d374d8"; - sha256 = "15n3919hfs76lqn5gdcfa8plba1di777s23x6yv5a03cjkbnswcw"; + rev = "62a7153cd94fbd23e9f0693ee3ea8072053b388c"; + sha256 = "1sjym83jcwvsnrzf0sc291dywcihgc83fd23c66pbsdflgh85q4d"; })).buildRustPackage { inherit pkgs; - } }: + } +, ... } @ args: -buildRustPackage { +buildRustPackage ({ name = "cursedlife"; src = ./.; @@ -20,4 +21,7 @@ doCheck = true; meta.maintainers = [ "serverkorken@gmail.com" ]; -} +} // builtins.removeAttrs args [ + "pkgs" + "buildRustPackage" +]) diff --git a/release.nix b/release.nix --- a/release.nix +++ b/release.nix @@ -1,7 +1,10 @@ -{ nixpkgs, system }: +{ nixpkgs, system +, doHydra ? true }: let pkgs = import nixpkgs { inherit system; }; in { - build = import ./default.nix { inherit pkgs; }; + build = import ./default.nix { + inherit pkgs doHydra; + }; }