diff options
Diffstat (limited to 'pkgs/development/tools')
5 files changed, 26 insertions, 18 deletions
diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix deleted file mode 100644 index b6098ca98bfe..000000000000 --- a/pkgs/development/tools/cachix/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ haskellPackages, haskell }: - -haskell.lib.justStaticExecutables (haskellPackages.extend (self: super: { - cachix = haskell.lib.doDistribute (self.cachix_0_2_1 or self.cachix); - cachix-api = self.cachix-api_0_2_1 or self.cachix-api; -})).cachix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0f4b6b73de31..1aa13a34d121 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -2,6 +2,16 @@ let version = "12.1.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}/helper-images/prebuilt-x86_64.tar.xz"; + sha256 = "1yx530h5rz7wmd012962f9dfj0hvj1m7zab5vchndna4svzzycch"; + }; + + docker_arm = fetchurl { + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; + sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk"; + }; in buildGoPackage rec { inherit version; @@ -24,6 +34,13 @@ buildGoPackage rec { patches = [ ./fix-shell-path.patch ]; + postInstall = '' + touch $bin/bin/hello + install -d $bin/bin/helper-images + ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 0d2e813071e6..0c994e88e23f 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,21 +1,18 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.9"; + version = "0.2.10"; name = "sccache-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "0glaaan6fh19a2d8grgsgnbgw5w53vjl0qmvvnq0ldp3hax90v46"; + sha256 = "13fiifv3bi9shzp30wd7k2nd2j43vzdhk6z5rnfn5a9hmijqpg9n"; }; - cargoSha256 = "0chfdyhj9lyxydbnmldc8rh2v9dda46sxhv35g34a5137sjrizfh"; + cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6"; + cargoBuildFlags = [ "--features=all" ]; - # see https://github.com/mozilla/sccache/issues/467 - postPatch = '' - sed -i 's/\(version = "0.2.9\)-alpha.0"/\1"/g' Cargo.lock - ''; nativeBuildInputs = [ pkgconfig cargo rustc ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index efd6e562c29a..19432843218c 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.07"; + name = "camlp5-7.08"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel707.tar.gz"; - sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"; + url = "https://github.com/camlp5/camlp5/archive/rel708.tar.gz"; + sha256 = "0b39bvr1aa7kzjhbyycmvcrwil2yjbxc84cb43zfzahx4p2aqr76"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 6b1918a5d982..8f711e14654d 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -6,8 +6,8 @@ let ## fetchgit info url = git://sourceware.org/git/systemtap.git; rev = "release-${version}"; - sha256 = "075p45ndr4pzrf5679hcsw1ws4x0xqvx3m037v04545762hki6la"; - version = "4.0"; + sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw"; + version = "4.1"; inherit (kernel) stdenv; inherit (stdenv) lib; |