diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-28 11:30:44 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-02-28 11:30:44 +0100 |
| commit | bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b (patch) | |
| tree | 35f89b8bc0e0d75a05d2ca446ff66bc0146bf0a5 /pkgs/development/tools/misc | |
| parent | 35f00b429b54b01a753a16339305d14a3d9d087e (diff) | |
| parent | f7d07d48513dd3bf8f84f347c3c0e1800207f01d (diff) | |
| download | nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.gz nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.bz2 nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.lz nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.xz nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.zst nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/stlink/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/ycmd/default.nix | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 98c400d52851..c59847b1e0f7 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -3,18 +3,15 @@ # IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix -let - version = "1.5.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "stlink"; - inherit version; + version = "1.6.0"; src = fetchFromGitHub { owner = "texane"; repo = "stlink"; - rev = "v1.5.1"; - sha256 = "1d5gxiqpsm8fc105cxlp27af9fk339fap5h6nay21x5a7n61jgyc"; + rev = "v${version}"; + sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; buildInputs = [ cmake libusb1 ]; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index eac81aa7f171..7befc0fef2d7 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -8,12 +8,13 @@ stdenv.mkDerivation { pname = "ycmd"; - version = "2019-09-19"; + version = "2020-02-22"; + disabled = !python.isPy3k; src = fetchgit { url = "https://github.com/Valloric/ycmd.git"; - rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702"; - sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd"; + rev = "9a6b86e3a156066335b678c328f226229746bae5"; + sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; }; nativeBuildInputs = [ cmake ]; |