diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-04 11:43:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-04 11:43:54 +0200 |
commit | 699e0e50b7be0e5be1b146c2eecfc7d88882bd7e (patch) | |
tree | 533b79ffec3a67a11f0f08e9b4b79c1c8ec9d1fc /pkgs/development/tools | |
parent | e7702dc7b797c64697df48649a3f1bde12b782cd (diff) | |
parent | 82f80f4cfa8eb8cf2c6098415839abe96b793874 (diff) | |
download | nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.tar nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.tar.gz nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.tar.bz2 nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.tar.lz nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.tar.xz nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.tar.zst nixpkgs-699e0e50b7be0e5be1b146c2eecfc7d88882bd7e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/brakeman/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/tools/continuous-integration/jenkins/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/easyjson/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/tools/icestorm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/jq/darwin-strptime-test.patch | 16 | ||||
-rw-r--r-- | pkgs/development/tools/jq/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/pwndbg/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/mustache-go/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/camlp4/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/antlr/2.7.7.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/quicktemplate/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/tools/rust/cargo-asm/default.nix | 27 | ||||
-rw-r--r-- | pkgs/development/tools/trellis/default.nix | 49 | ||||
-rw-r--r-- | pkgs/development/tools/yarn/default.nix | 7 |
14 files changed, 169 insertions, 32 deletions
diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix new file mode 100644 index 00000000000..542f53473c1 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -0,0 +1,17 @@ +{ lib, ruby, buildRubyGem }: + +buildRubyGem rec { + inherit ruby; + name = "${gemName}-${version}"; + gemName = "brakeman"; + version = "4.3.1"; + source.sha256 = "1y4i4vw7hawypvgg04s544fqx52ml67h9zxsaqm8w5hvxmb20wkh"; + + meta = with lib; { + description = "Static analysis security scanner for Ruby on Rails"; + homepage = https://brakemanscanner.org/; + license = [ licenses.cc-by-nc-sa-40 licenses.mit ]; + platforms = ruby.meta.platforms; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index ebbf5023374..c6fcaa0a44a 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.107.3"; + version = "2.121.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1f4sz1dqcfypdywdwcz4byjmir7ismcpzg2hbgg6pcf5pq4yba8p"; + sha256 = "00ln31ahhsihnxba2hldrjxdpyxl7xw731493a24cqlkdq89s3ys"; }; buildCommand = '' diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index de9fb82f66f..3ae17221363 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,20 +1,19 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-06-06"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - + version = "2018-07-30"; goPackagePath = "github.com/mailru/easyjson"; + goDeps = ./deps.nix; - src = fetchgit { - inherit rev; - url = "https://github.com/mailru/easyjson"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + src = fetchFromGitHub { + owner = "mailru"; + repo = "easyjson"; + rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; + sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; }; - goDeps = ./deps.nix; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://github.com/mailru/easyjson"; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index cb203a431d4..5826dfc2a03 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2018.05.03"; + version = "2018.08.01"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "237280ce44f72c7b2e1ca671d5113dba34cc4fca"; - sha256 = "0r9xh024snaf1g2r5k524yl6lvf5rkfhqwjzcixh1m12012i5hrh"; + rev = "8cac6c584044034210fe0ba1e6b930ff1cc59465"; + sha256 = "01cnmk4khbbgzc308qj04sfwg0r8b9nh3s7xjsxdjcb3h1m9w88c"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/jq/darwin-strptime-test.patch b/pkgs/development/tools/jq/darwin-strptime-test.patch new file mode 100644 index 00000000000..4ea83fc164a --- /dev/null +++ b/pkgs/development/tools/jq/darwin-strptime-test.patch @@ -0,0 +1,16 @@ +diff --git a/tests/jq.test b/tests/jq.test +index 4a4018b..f5aa7d5 100644 +--- a/src/tests/jq.test ++++ b/src/tests/jq.test +@@ -1144,9 +1144,9 @@ bsearch(4) + [1,2,3] + -4 + +-[strptime("%Y-%m-%dT%H:%M:%SZ")|(.,mktime)] ++[strptime("%Y-%m-%dT%H:%M:%SZ")|mktime] + "2015-03-05T23:51:47Z" +-[[2015,2,5,23,51,47,4,63],1425599507] ++[1425599507] + + strftime("%Y-%m-%dT%H:%M:%SZ") + [2015,2,5,23,51,47,4,63] diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 93c465ce844..712ec64bd41 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { url = https://patch-diff.githubusercontent.com/raw/stedolan/jq/pull/1214.diff; sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9"; }) - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-strptime-test.patch; + patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released configureFlags = diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index df4b91a79b0..257e822edd9 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }: stdenv.mkDerivation rec { - name = "pwndbg-2018-04-06"; + name = "pwndbg-${version}"; + version = "2018.07.29"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; - rev = "e225ba9f647ab8f7f4871075529c0ec239f43300"; - sha256 = "1s6m93qi3baclgqqii4fnmzjmg0c6ipkscg7xiljaj5z4bs371j4"; + rev = version; + sha256 = "1illk1smknaaa0ck8mwvig15c8al5w7fdp42a748xvm8wvxqxdsc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix new file mode 100644 index 00000000000..0b060624de3 --- /dev/null +++ b/pkgs/development/tools/mustache-go/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "mustache-go-${version}"; + version = "1.0.1"; + + goPackagePath = "github.com/cbroglie/mustache"; + + src = fetchFromGitHub { + owner = "cbroglie"; + repo = "mustache"; + rev = "v${version}"; + sha256 = "1aywj4fijsv66n6gjiz3l8g1vg0fqzwbf8dcdcgfsvsdb056p90v"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/cbroglie/mustache; + description = "The mustache template language in Go"; + license = [ licenses.mit ]; + maintainers = [ maintainers.Zimmi48 ]; + }; +} diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 99bf7400088..2974ca965fd 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -16,6 +16,9 @@ let param = { "4.06" = { version = "4.06+1"; sha256 = "0fazfw2l7wdmbwnqc22xby5n4ri1wz27lw9pfzhsbcdrighykysf"; }; + "4.07" = { + version = "4.07+1"; + sha256 = "0cxl4hkqcvspvkx4f2k83217rh6051fll9i2yz7cw6m3bq57mdvl"; }; }."${ocaml.meta.branch}"; in diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index cafb076aa81..519540ef52a 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk, python}: +{ stdenv, fetchurl, jdk, python2 }: stdenv.mkDerivation { name = "antlr-2.7.7"; @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5"; }; patches = [ ./2.7.7-fixes.patch ]; - buildInputs = [jdk python]; + buildInputs = [ jdk ]; + nativeBuildInputs = [ python2 ]; meta = with stdenv.lib; { description = "Powerful parser generator"; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 624866ea9e3..e66500ac833 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,20 +1,19 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "quicktemplate-unstable-${version}"; version = "2018-04-30"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - goPackagePath = "github.com/valyala/quicktemplate"; + goDeps = ./deps.nix; - src = fetchgit { - inherit rev; - url = "https://github.com/valyala/quicktemplate"; + src = fetchFromGitHub { + owner = "valyala"; + repo = "quicktemplate"; + rev = "a91e0946457b6583004fbfc159339b8171423aed"; sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; }; - goDeps = ./deps.nix; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://github.com/valyala/quicktemplate"; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix new file mode 100644 index 00000000000..ca793bf4908 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "cargo-asm-${version}"; + version = "0.1.16"; + + src = fetchFromGitHub { + owner = "gnzlbg"; + repo = "cargo-asm"; + rev = "7d0ece74657edb002bd8530227b829b31fd19dcd"; + sha256 = "0mzbh5zw5imlaagm5zjbjk9kqdnglm398rxkqisd22h6569ppqpc"; + }; + + cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b"; + + # Test checks against machine code output, which fails with some + # LLVM/compiler versions. + doCheck = false; + + meta = with stdenv.lib; { + description = "Display the assembly or LLVM-IR generated for Rust source code"; + homepage = https://github.com/gnzlbg/cargo-asm; + license = licenses.mit; + maintainers = [ maintainers.danieldk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix new file mode 100644 index 00000000000..892552559aa --- /dev/null +++ b/pkgs/development/tools/trellis/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, python3, cmake, boost }: + +let + trellisdb = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "prjtrellis-db"; + rev = "06b429ddb7fd8ec1e3f2b35de2e94b4853cf2835"; + sha256 = "07bsgw5x3gq0jcn9j4g7q9xvibvz6j2arjnvgyrxnrg30ri9q173"; + }; +in +stdenv.mkDerivation rec { + name = "trellis-${version}"; + version = "2018.08.01"; + + buildInputs = [ + (boost.override { python = python3; enablePython = true; }) + ]; + + nativeBuildInputs = [ + cmake python3 + ]; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "prjtrellis"; + rev = "fff9532fe59bf9e38b44f029ce4a06c607a9ee78"; + sha256 = "0ycw9fjf6428sf5x8x5szn8fha79610nf7nn8kmibgmz9868yv30"; + }; + + preConfigure = '' + source environment.sh + cp -RT "${trellisdb}" database + cd libtrellis + ''; + + meta = { + description = "Documentation and tools for Lattice ECP5 FPGAs"; + longDescription = '' + Project Trellis documents the Lattice ECP5 architecture + to enable development of open-source tools. Its goal is + to provide sufficient information to develop a free and + open Verilog to bitstream toolchain for these devices. + ''; + homepage = https://github.com/SymbiFlow/prjtrellis; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ q3k ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index f1336b89194..bf8dbf671c0 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nodejs, fetchzip, makeWrapper }: +{ stdenv, nodejs, fetchzip }: stdenv.mkDerivation rec { name = "yarn-${version}"; @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0bk006zs1bk6nwj9x07ry314fgxi21sk79h1paljbs6yzrv62h4g"; }; - buildInputs = [ makeWrapper nodejs ]; + buildInputs = [ nodejs ]; installPhase = '' mkdir -p $out/{bin,libexec/yarn/} cp -R . $out/libexec/yarn - makeWrapper $out/libexec/yarn/bin/yarn.js $out/bin/yarn + ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarn + ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg ''; meta = with stdenv.lib; { |