Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-09-04 20:03:30 +02:00
182 changed files with 4683 additions and 7025 deletions
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "asls";
version = "0.4.2";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz";
sha256 = "14dcms0xl6dncwf16vixvf7rq7g15iwq8h4vja0dsiisyfm08aks";
sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5";
};
buildInputs = [ erlangR22 ];
@@ -24,12 +24,12 @@
# so when having an older version, `pkgs.hydra-migration` should be deployed first.
hydra-unstable = callPackage ./common.nix {
version = "2020-08-04";
version = "2020-09-02";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "77c33c1d71a8c303f53ccad577eb0a3799e87bda";
sha256 = "10pwiww96dbbszzvnj7abn851h89n30ziahjj2zm3liyzyvbylyf";
rev = "e707990e2d6afab203c7ef1d769d49c564eff151";
sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa";
};
nix = nixFlakes;