From 029e80a90b09454033f284658f5998500177dd83 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 24 Jan 2018 22:32:22 +0100 Subject: gitlab-runner: 10.3.0 -> 10.4.0 --- .../tools/continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/tools') 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 ]; -- cgit 1.4.1 From 39676b5b01bdb28d32b1d8ef35bc82faccd49ee0 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 24 Jan 2018 15:48:55 -0800 Subject: dep: 0.3.1 -> 0.4.0 Signed-off-by: Vincent Demeester --- pkgs/development/tools/dep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index e22be524f021..630b1396944d 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.0"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90"; + sha256 = "1m325p1brzhqkabibc1ifvrsa589m0077z33l3hzq6ml88qm6nyp"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); -- cgit 1.4.1 From 89f73ceda58a9614187e1f1deef0f99000e091af Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 25 Jan 2018 08:52:10 -0800 Subject: dep: 0.4.0 -> 0.4.1 Signed-off-by: Vincent Demeester --- pkgs/development/tools/dep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index 630b1396944d..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.4.0"; + 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 = "1m325p1brzhqkabibc1ifvrsa589m0077z33l3hzq6ml88qm6nyp"; + sha256 = "0183xq5l4sinnclynv6xi85vmk69mqpy5wjfsgh8bxwziq3vkd7y"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); -- cgit 1.4.1 From c83b455c7db6d7327d6ab511dd9376c0a3ca3b6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jan 2018 10:49:28 +0100 Subject: haskell-intero-nix-shim: drop broken non-Hackage package --- .../haskell-modules/configuration-common.nix | 3 --- .../tools/haskell/intero-nix-shim/default.nix | 28 ---------------------- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/tools/haskell/intero-nix-shim/default.nix (limited to 'pkgs/development/tools') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 229cf6c38fbf..d5fa3a9d9ea8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -648,9 +648,6 @@ self: super: { then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk; - # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only. - intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {}; - # vaultenv is not available from Hackage. vaultenv = self.callPackage ../tools/haskell/vaultenv { }; 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 -} -- cgit 1.4.1 From 03ef28473dbac4a99797750c5cc236c32b62b45e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jan 2018 10:50:54 +0100 Subject: haskell-tinc: drop broken non-Hackage package --- .../haskell-modules/configuration-common.nix | 3 -- pkgs/development/tools/haskell/tinc/default.nix | 42 ---------------------- 2 files changed, 45 deletions(-) delete mode 100644 pkgs/development/tools/haskell/tinc/default.nix (limited to 'pkgs/development/tools') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d5fa3a9d9ea8..0323356d2101 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -637,9 +637,6 @@ self: super: { # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle; - # tinc is a new build driver a la Stack that's not yet available from Hackage. - tinc = self.callPackage ../tools/haskell/tinc { inherit (pkgs) cabal-install cabal2nix; }; - # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; 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; -} -- cgit 1.4.1