Unverified Commit 3b8cf433 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Merge remote-tracking branch 'origin/master' into staging-next 

Conflicts:
- pkgs/development/python-modules/imageio/default.nix
- pkgs/development/python-modules/pytest-order/default.nix
parents 231c1145 1c03223e

pkgs/applications/networking/mullvad/mullvad.nix

+3 −3
Original line number Diff line number Diff line
@@ -19,16 +19,16 @@ 
}:

rustPlatform.buildRustPackage rec {

  pname = "mullvad";

  version = "2023.1";

  version = "2023.2";



  src = fetchFromGitHub {

    owner = "mullvad";

    repo = "mullvadvpn-app";

    rev = version;

    hash = "sha256-BoduliiDOpzEPYHAjr636e7DbrhFnC/v9au6Mp9T/Qs=";

    hash = "sha256-UozgUsew6MRplahTW/y688R2VetO50UGQevmVo8/QNs=";

  };



  cargoHash = "sha256-5kK2IA0Z1dQbHlnGXNZHD+BycurshfpqrwcIEveWKT0=";

  cargoHash = "sha256-/DYEG/8FlDbyWsvnxM+0tbKG4/DbwEnNX2KiC3ryyGI=";



  patches = [

    # https://github.com/mullvad/mullvadvpn-app/pull/4389

pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
tools/python/install-wrap script brakes shebangs patching, disable



diff --git a/tools/Rules.mk b/tools/Rules.mk

index 87a56dc..a7da869 100644

--- a/tools/Rules.mk

+++ b/tools/Rules.mk

@@ -90,8 +90,7 @@ CFLAGS += $(CFLAGS-y)

 

 CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS)

 

-INSTALL_PYTHON_PROG = \

-	$(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)

+INSTALL_PYTHON_PROG = $(INSTALL_PROG)

 

 %.opic: %.c

 	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS)

pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
hack to make etherboot use prefetched ipxe



diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile

index a0578d2..64428a0 100644

--- a/tools/firmware/etherboot/Makefile

+++ b/tools/firmware/etherboot/Makefile

@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz

 

 D=ipxe

 T=ipxe.tar.gz

+G=ipxe.git

 

 ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))

 

@@ -36,9 +37,9 @@ $T:

 	fi

 	mv _$T $T

 

-$D/src/arch/i386/Makefile: $T Config

-	rm -rf $D

-	gzip -dc $T | tar xf -

+$D/src/arch/i386/Makefile: $G Config

+	mkdir $D

+	cp -a $G/* $D

 	for i in $$(cat patches/series) ; do                 \

 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \

 	done

pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.10.patch

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
diff -Naur xen-4.10.4-orig/xen/arch/x86/Makefile xen-4.10.4-patched/xen/arch/x86/Makefile

--- xen-4.10.4-orig/xen/arch/x86/Makefile	2019-07-04 01:28:50.000000000 +1000

+++ xen-4.10.4-patched/xen/arch/x86/Makefile	2020-03-03 13:32:34.607951507 +1100

@@ -166,7 +166,7 @@

 # Check if the compiler supports the MS ABI.

 export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y)

 # Check if the linker supports PE.

-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y))

+XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y))

 CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI

 

 $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p')

@@ -188,20 +188,20 @@

 

 $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc

 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \

-	          $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \

+	          $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \

 	                $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :

 	$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S

 	$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \

 		| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S

 	$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o

 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \

-	          $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \

+	          $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \

 	                $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :

 	$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S

 	$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \

 		| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S

 	$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o

-	$(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \

+	$(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \

 	                $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@

 	if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \

 	else $(NM) -pa --format=sysv $(@D)/$(@F) \

pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something

like that, and (on my machine) has directories within that called

{Boot, nixos, gummiboot}.



This patch does two things:



1) Xen apparently wants to put files in

$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name

because I can't see why we have it



2) Ensures the said directory exists





--- a/xen/Makefile	2016-01-08 01:50:58.028045657 +0000

+++ b/xen/Makefile	2016-01-08 01:51:33.560268718 +0000

@@ -49,7 +49,9 @@

 		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \

 		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \

 		if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \

-			$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \

+			[ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \

+			  $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\

+			$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \

 		elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \

 			echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \

 		fi; \

@@ -69,7 +69,7 @@

 	rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi

 	rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi

 	rm -f $(D)$(EFI_DIR)/$(T).efi

-	rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi

+	rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi

 

 .PHONY: _debug

 _debug: