diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-27 09:14:22 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-27 09:14:22 +0100 |
commit | 2d2dbe083f0df9dbde5643234cb2b067653739fa (patch) | |
tree | 66195da25376f3bb7bed16d469d85fcaffe0f13b /pkgs/development/tools | |
parent | ef60e411455c9d7ef16069df63daf2c9fbd66ec6 (diff) | |
parent | 9c95eb828ab6cc7b022197f68e1e0a8ce4241d89 (diff) | |
download | nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.gz nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.bz2 nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.lz nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.xz nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.zst nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.zip |
Merge branch 'master' into staging
Hydra: ?compare=1429281
Diffstat (limited to 'pkgs/development/tools')
4 files changed, 6 insertions, 76 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index cf4d5bcaa40c..e7c2509ce771 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.3.0"; + version = "10.4.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0nhxxx2wxnli5nfz8vxqc0mwdjzj836zx3zmywnfyy1k2zybjijv"; + sha256 = "0fcddi1mwgj831abn628zcpwsah3mmvrbdi851pjf8vraynwr2xa"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0jacimz4p9k5s9j510g3vn7gg8pybpa20j4cvz4pffrcwl1lgk4i"; + sha256 = "1zlk3i9jzmsqz5r3kzg08z9hyhidw9dpv5ji46bnbjis8q3dlw54"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0wjy5bbz6bw0na57vglcwzn17q980x6j24qkschqx49rjyk3fz2i"; + sha256 = "0kp6h53d1q652i4wp94hydy1ixlgmqh92sjsc6pqicnfc7nvwgfq"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index e22be524f021..477c874af011 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "dep-${version}"; - version = "0.3.1"; + version = "0.4.1"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90"; + sha256 = "0183xq5l4sinnclynv6xi85vmk69mqpy5wjfsgh8bxwziq3vkd7y"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); diff --git a/pkgs/development/tools/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix deleted file mode 100644 index 379d6b7e472d..000000000000 --- a/pkgs/development/tools/haskell/intero-nix-shim/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ mkDerivation, base, cabal-install, directory, fetchFromGitHub -, filepath, intero, optparse-applicative, posix-escape, split -, stdenv, unix -}: -mkDerivation { - pname = "intero-nix-shim"; - version = "0.1.2"; - src = fetchFromGitHub { - owner = "michalrus"; - repo = "intero-nix-shim"; - rev = "0.1.2"; - sha256 = "0p1h3w15bgvsbzi7f1n2dxxxz9yq7vmbxmww5igc5d3dm76skgzg"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath optparse-applicative posix-escape split - unix - ]; - postInstall = '' - mkdir -p $out/libexec - ln -s ${cabal-install}/bin/cabal $out/libexec - ln -s ${intero }/bin/intero $out/libexec - ''; - homepage = https://github.com/michalrus/intero-nix-shim; - license = stdenv.lib.licenses.asl20; - broken = true; # https://hydra.nixos.org/build/66703340 -} diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix deleted file mode 100644 index 5a69b8875883..000000000000 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ mkDerivation, aeson, base, bytestring, Cabal, containers -, directory, exceptions, filelock, filepath, gitrev, graph-wrapper -, hpack, hspec, HUnit, language-dot, mockery, parsec, process -, QuickCheck, safe, stdenv, temporary, time, transformers, unix -, unix-compat, with-location, yaml, fetchFromGitHub -, cabal2nix, cabal-install, makeWrapper -}: -mkDerivation { - pname = "tinc"; - version = "20170624"; - src = fetchFromGitHub { - owner = "sol"; - repo = "tinc"; - rev = "70881515693fd83d381fe045ae76d5257774f5e3"; - sha256 = "0c6sx3vbcnq69dhqhpi01a4p4qss24rwxiz6jmw65rj73adhj4mw"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filelock filepath gitrev graph-wrapper hpack language-dot parsec - process temporary time transformers unix-compat with-location yaml - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filelock filepath gitrev graph-wrapper hpack hspec HUnit - language-dot mockery parsec process QuickCheck safe temporary time - transformers unix unix-compat with-location yaml - ]; - postInstall = '' - source ${makeWrapper}/nix-support/setup-hook - wrapProgram $out/bin/tinc \ - --prefix PATH : '${cabal2nix}/bin' \ - --prefix PATH : '${cabal-install}/bin' - ''; - description = "A dependency manager for Haskell"; - homepage = "https://github.com/sol/tinc#readme"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.robbinch ]; - broken = true; -} |