diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-09 09:18:17 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-09 09:18:17 +0100 |
| commit | 8847d57763ec4bdb71264fc0f19b24901a345705 (patch) | |
| tree | 0ea56699f0a4ebca6309a2dd5e4804a7eb28260f /pkgs/development/tools/misc | |
| parent | 60a479d91dfbffcbe650b38efbadc83b1ccbbf91 (diff) | |
| parent | 03755ed59a34197c0d54552bf42d95e66931376b (diff) | |
| download | nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.tar nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.tar.gz nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.tar.bz2 nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.tar.lz nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.tar.xz nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.tar.zst nixlib-8847d57763ec4bdb71264fc0f19b24901a345705.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/clojure-lsp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/tinyprog/default.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index f2bb771f217c..53c2bf9a6bcf 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200117T215443"; + version = "20200121T234305"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "0ccn3700lam5m5yh5hdcm6wkazyr3dhvhyc9bc08basjwk09lfkp"; + sha256 = "04598vxay85q2blr49xh4pb58i4rsgjbznnn2cszcqgyzh05fs4y"; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 3e5c12e183aa..e66341b5f8cd 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -72,15 +72,15 @@ let }; in stdenv.mkDerivation rec { pname = "hydra"; - version = "2019-11-13"; + version = "2020-02-06"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = pname; - rev = "20dd0bbe6a90d9066e635ee82e98efec23b17e51"; - sha256 = "06chiaa7p54zxngmy2q3ps7bbiqpdv9h2rfmprh83qz36xps9rs2"; + rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; + sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; }; buildInputs = diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 10d067e2c618..580414f4d9d9 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -6,13 +6,13 @@ with python3Packages; buildPythonApplication rec { pname = "tinyprog"; # `python setup.py --version` from repo checkout - version = "1.0.24.dev99+ga77f828"; + version = "1.0.24.dev114+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "tinyfpga"; repo = "TinyFPGA-Bootloader"; - rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7"; - sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q"; + rev = "97f6353540bf7c0d27f5612f202b48f41da75299"; + sha256 = "0zbrvvb957z2lwbfd39ixqdsnd2w4wfjirwkqdrqm27bjz308731"; }; sourceRoot = "source/programmer"; |