Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5695c0f9d7a3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7788e523f4cd
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 11, 2020

  1. linuxPackages.wireguard: fix the build on linux 5.4.76 

    Patch copied from https://github.com/archlinux/svntogit-packages/blob/packages/wireguard-dkms/trunk/lts.diff

This fixes:

```
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
   44 | #define SYM_FUNC_START ENTRY
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:218: note: this is the location of the previous definition
  218 | #define SYM_FUNC_START(name)    \
      |
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
   45 | #define SYM_FUNC_END ENDPROC
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:265: note: this is the location of the previous definition
  265 | #define SYM_FUNC_END(name)    \
      |
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S: Assembler messages:
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:50: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:176: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:180: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:257: Error: invalid character '(' in mnemonic
make[3]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/scripts/Makefile.build:348: /build/source/src/crypto/zinc/blake2s/blake2s-x86_64.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
   44 | #define SYM_FUNC_START ENTRY
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:218: note: this is the location of the previous definition
  218 | #define SYM_FUNC_START(name)    \
      |
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
   45 | #define SYM_FUNC_END ENDPROC
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:265: note: this is the location of the previous definition
  265 | #define SYM_FUNC_END(name)    \
      |
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S: Assembler messages:
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:123: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:185: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:187: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:319: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1016: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1616: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1620: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1810: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1812: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1959: Error: invalid character '(' in mnemonic
make[3]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/scripts/Makefile.build:348: /build/source/src/crypto/zinc/chacha20/chacha20-x86_64.o] Error 1
make[2]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/Makefile:1729: /build/source/src] Error 2
make[1]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/Makefile:179: sub-make] Error 2
make: *** [Makefile:26: module] Error 2
builder for '/nix/store/hll3sjyrwa55arzlsxnbacqdd8s842l1-wireguard-1.0.20200908.drv' failed with exit code 2
```

(cherry picked from commit c945b47)
    @ivan @erictapen
    ivan authored and erictapen committed Nov 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7788e52 View commit details
Showing with 16 additions and 0 deletions.
  1. +4 −0 pkgs/os-specific/linux/wireguard/default.nix
  2. +12 −0 pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
4 changes: 4 additions & 0 deletions pkgs/os-specific/linux/wireguard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg";
};

patches = [
./linux-5.4.76-fix.patch
];

hardeningDisable = [ "pic" ];

KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
12 changes: 12 additions & 0 deletions pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h
--- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h 2020-09-08 16:22:40.000000000 +0000
+++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h 2020-11-10 15:05:43.720093522 +0000
@@ -40,7 +40,7 @@
#undef pull
#endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
#define SYM_FUNC_START ENTRY
#define SYM_FUNC_END ENDPROC
#endif