From ae6be3e77a9404ab4ed2e44d8f225098f128fae7 Mon Sep 17 00:00:00 2001 From: Krzysztof Janosz Date: Mon, 27 Mar 2017 17:22:35 +0200 Subject: [PATCH 1/4] Add nix-shell derivation for highlander repo --- default.nix | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000000..113f41e889 --- /dev/null +++ b/default.nix @@ -0,0 +1,80 @@ +with import {}; { + main = let + dnsimple = python27Packages.buildPythonPackage rec { + name = "dnsimple-${version}"; + version = "0.3.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/dnsimple/${name}.tar.gz"; + sha256 = "0cc7v6wn246n3gjpzy8aq8v3xbrxl9a423b84i2z2cjjbq8b7fvf"; + }; + + propagatedBuildInputs = [ python27Packages.requests ]; + }; + in (buildFHSUserEnv { + name = "main"; + targetPkgs = pkgs: (with pkgs; [ ansible2 curl dnsimple docker gnumake git google-cloud-sdk openssh python27Full python27Packages.libcloud python27Packages.pycrypto python27Packages.requests rsync ] ++ python27Packages.libcloud.propagatedBuildInputs ++ dnsimple.propagatedBuildInputs); + profile = '' + source .env.local; + export PYTHONPATH="/usr/lib/python2.7/site-packages" + ''; + }).env; + + api-docs = stdenv.mkDerivation { + name = "api-docs"; + buildInputs = [ gcc pkgconfig nodejs-6_x ]; + shellHook = '' + source .env.local + cd api-docs + ''; + }; + + ashes = let + flow25 = stdenv.lib.overrideDerivation flow (oldAttrs : rec { + name = "flow-${version}"; + version = "0.25.0"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "flow"; + rev = "v${version}"; + sha256 = "1v82phl1cb10p0ggjq9w6a0bcysjxwgmlqsp9263n3j52dl74yi8"; + }; + }); + in stdenv.mkDerivation { + name = "ashes"; + buildInputs = [ gcc pkgconfig fontconfig cairo libpng pixman nodejs-6_x flow25 ]; + shellHook = '' + source .env.local + cd ashes + ln -sf `readlink -f $(which flow)` node_modules/flow-bin/vendor/flow + ''; + }; + + green-river = stdenv.mkDerivation { + name = "green-river"; + buildInputs = [ openjdk sbt ]; + shellHook = '' + source .env.local + cd green-river + ''; + }; + + middlewarehouse = stdenv.mkDerivation { + name = "middlewarehouse"; + buildInputs = [ go glide ]; + shellHook = '' + source .env.local + cd middlewarehouse + ''; + }; + + phoenix = stdenv.mkDerivation { + name = "phoenix"; + buildInputs = [ openjdk sbt ]; + shellHook = '' + source .env.local + cd phoenix-scala + ''; + }; +} From 4489b0182fe5fd03e858d448b4d005c38e2bc045 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 28 Apr 2017 14:21:55 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Pin=20nixpkgs=20to=2016.09=E2=80=99s=20SHA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 113f41e889..fd2d0c8d75 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,12 @@ -with import {}; { +let + + nixpkgs = (import {}).pkgs.fetchFromGitHub { + owner = "NixOS"; repo = "nixpkgs"; + rev = "0ff8fc1d83f85dbde91a3ce65111141c9014114e"; # 16.09 + sha256 = "0llha8bhvwvf2pij1vik693181gxgwhyzldfc1pa31jxqajxxjlz"; + }; + +in with import nixpkgs {}; { main = let dnsimple = python27Packages.buildPythonPackage rec { name = "dnsimple-${version}"; @@ -33,7 +41,7 @@ with import {}; { flow25 = stdenv.lib.overrideDerivation flow (oldAttrs : rec { name = "flow-${version}"; version = "0.25.0"; - + src = fetchFromGitHub { owner = "facebook"; repo = "flow"; @@ -47,7 +55,7 @@ with import {}; { shellHook = '' source .env.local cd ashes - ln -sf `readlink -f $(which flow)` node_modules/flow-bin/vendor/flow + ln -sf `readlink -f $(which flow)` node_modules/flow-bin/vendor/flow ''; }; @@ -59,7 +67,7 @@ with import {}; { cd green-river ''; }; - + middlewarehouse = stdenv.mkDerivation { name = "middlewarehouse"; buildInputs = [ go glide ]; From 8eda1421a6d941eb2e355be67cea2408ab07b580 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 16 Jun 2017 11:53:19 +0200 Subject: [PATCH 3/4] Bump Nixpkgs version & fix PyCrypto --- default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index fd2d0c8d75..bc3dd134aa 100644 --- a/default.nix +++ b/default.nix @@ -2,8 +2,8 @@ let nixpkgs = (import {}).pkgs.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - rev = "0ff8fc1d83f85dbde91a3ce65111141c9014114e"; # 16.09 - sha256 = "0llha8bhvwvf2pij1vik693181gxgwhyzldfc1pa31jxqajxxjlz"; + rev = "0011f9065a1ad1da4db67bec8d535d91b0a78fba"; # nixos-unstable + sha256 = "0m662mibyxqmp83zdhsi084p2h90268h3i8bfk3b2q8pbjz89yx2"; }; in with import nixpkgs {}; { @@ -21,7 +21,7 @@ in with import nixpkgs {}; { }; in (buildFHSUserEnv { name = "main"; - targetPkgs = pkgs: (with pkgs; [ ansible2 curl dnsimple docker gnumake git google-cloud-sdk openssh python27Full python27Packages.libcloud python27Packages.pycrypto python27Packages.requests rsync ] ++ python27Packages.libcloud.propagatedBuildInputs ++ dnsimple.propagatedBuildInputs); + targetPkgs = pkgs: (with pkgs; [ ansible2 curl dnsimple docker gnumake git google-cloud-sdk openssh python27Full python27Packages.libcloud python27Packages.pycrypto python27Packages.requests rsync ] ++ python27Packages.libcloud.propagatedBuildInputs ++ python27Packages.pycrypto.propagatedBuildInputs ++ dnsimple.propagatedBuildInputs); profile = '' source .env.local; export PYTHONPATH="/usr/lib/python2.7/site-packages" From 5e0d81cbd150296783889774d6fc17303ed41287 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 19 Jun 2017 13:53:20 +0200 Subject: [PATCH 4/4] Add yarn for building Ashes --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index bc3dd134aa..afc67a8cc2 100644 --- a/default.nix +++ b/default.nix @@ -51,7 +51,7 @@ in with import nixpkgs {}; { }); in stdenv.mkDerivation { name = "ashes"; - buildInputs = [ gcc pkgconfig fontconfig cairo libpng pixman nodejs-6_x flow25 ]; + buildInputs = [ gcc pkgconfig fontconfig yarn cairo libpng pixman nodejs-6_x flow25 ]; shellHook = '' source .env.local cd ashes