uutils-coreutils: 0.1.0 -> 0.2.0
Diff: https://github.com/uutils/coreutils/compare/0.1.0...0.2.0 Changelog: https://github.com/uutils/coreutils/releases/tag/0.2.0
This commit is contained in:
@@ -21,19 +21,19 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nKKjc6Bui7k50SR7BY09dRGt3Za1Ch/E+3KiCO5KtOg=";
|
||||
hash = "sha256-jxjg2RIZaemA6jgfdE1KX8G6c/NWumecoJMFx7dspz8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
name = "uutils-coreutils-${finalAttrs.version}";
|
||||
hash = "sha256-PTIypl9uqFkp6GrF7Pp40AItbWFlXT2V2x/C8L2J8S0=";
|
||||
hash = "sha256-SFuAWzmYd1N7czUyC/7CYrCObYfoKrC5oORFxXtbwhE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
diff --git a/GNUmakefile b/GNUmakefile
|
||||
index f46126a82..44be8f13b 100644
|
||||
index 20dc731d3..400e5b84f 100644
|
||||
--- a/GNUmakefile
|
||||
+++ b/GNUmakefile
|
||||
@@ -57,20 +57,6 @@ TOYBOX_ROOT := $(BASEDIR)/tmp
|
||||
TOYBOX_VER := 0.8.12
|
||||
TOYBOX_SRC := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
|
||||
@@ -69,19 +69,6 @@ TOYBOX_SRC := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
|
||||
#------------------------------------------------------------------------
|
||||
OS ?= $(shell uname -s)
|
||||
|
||||
-
|
||||
-ifdef SELINUX_ENABLED
|
||||
- override SELINUX_ENABLED := 0
|
||||
-# Now check if we should enable it (only on non-Windows)
|
||||
@@ -23,7 +22,7 @@ index f46126a82..44be8f13b 100644
|
||||
# Possible programs
|
||||
PROGS := \
|
||||
base32 \
|
||||
@@ -181,8 +167,10 @@ SELINUX_PROGS := \
|
||||
@@ -200,8 +187,10 @@ endif
|
||||
|
||||
ifneq ($(OS),Windows_NT)
|
||||
PROGS := $(PROGS) $(UNIX_PROGS)
|
||||
@@ -32,6 +31,6 @@ index f46126a82..44be8f13b 100644
|
||||
- PROGS := $(PROGS) $(SELINUX_PROGS)
|
||||
+ PROGS := $(PROGS) $(SELINUX_PROGS)
|
||||
+ endif
|
||||
# Always use external libstdbuf when building with make (Unix only)
|
||||
CARGOFLAGS += --features feat_external_libstdbuf
|
||||
endif
|
||||
|
||||
UTILS ?= $(PROGS)
|
||||
|
||||
Reference in New Issue
Block a user