Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-02-09 09:18:17 +01:00
101 changed files with 2042 additions and 2433 deletions

View File

@@ -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;

View File

@@ -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 =

View File

@@ -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";