Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-01-19 09:24:01 +01:00
107 changed files with 2541 additions and 1803 deletions
+2 -2
View File
@@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
name = "fasm-bin-${version}";
version = "1.73.05";
version = "1.73.06";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
sha256 = "0qpj6cs9rp1bg2rqxg1k8j71918rh86hplyw4n82n11ndwk23ni5";
sha256 = "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6";
};
installPhase = ''