diff options
| author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2024-01-26 08:33:08 +0530 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-01-27 21:18:48 +0000 |
| commit | f4e49e60defd1e1b83d8ad74e4d41a76c7e5182f (patch) | |
| tree | 86bbec37bccbcf127434149289e340edf057cdba /pkgs/tools/misc | |
| parent | a93f891e7511780bd9172e69db574242acc79043 (diff) | |
most: 5.1.0 -> 5.2.0
Drop already upstreamed patch & switch to hash instead of sha256 Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 72dc2e661c1164b0750f56291edb992315b610fd)
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/most/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/most/parallel-make.patch | 18 |
2 files changed, 2 insertions, 25 deletions
diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 2ec394cd250d1..87280b9f295ef 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { pname = "most"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v"; + hash = "sha256-lFWuuPgm+oOFyFDcIr8PIs+QabPDQj+6S/LG9iJtmQM="; }; - patches = [ - # Upstream patch to fix parallel build failure - ./parallel-make.patch - ]; - outputs = [ "out" "doc" ]; makeFlags = [ diff --git a/pkgs/tools/misc/most/parallel-make.patch b/pkgs/tools/misc/most/parallel-make.patch deleted file mode 100644 index 07c2e47c673e3..0000000000000 --- a/pkgs/tools/misc/most/parallel-make.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition -when performing a parallel build") - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"' - all: $(EXEC) - $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC) - @echo $(EXEC) created in $(OBJDIR) -+ -+# C source files include autogenrated "config.h". Make sure -+# it's available before the compilation. Pessimistically assume -+# any source file can depend on "config.h". -+$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H) -+ - $(OBJDIR)/$(EXEC): $(OBJS) - cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS) - # |