commit dd4ce550b3e0195e16b4b93e096e3d4b3a6af425 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       845
       845
        
               ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''

     

       846
       846
        
             ])

     

       847
       847
        
             (mkIf cfg.useEFIBoot [

     

       848
       848
       -
               "-drive if=pflash,format=raw,unit=0,readonly,file=${efiFirmware}"

     

       848
       848
       +
               "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"

     

       849
       849
        
               "-drive if=pflash,format=raw,unit=1,file=$NIX_EFI_VARS"

     

       850
       850
        
             ])

     

       851
       851
        
             (mkIf (cfg.bios != null) [

+18 -18

pkgs/os-specific/linux/crda/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "crda";

     

       5
       5
       -
         version = "3.18";

     

       5
       5
       +
         version = "4.14";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           sha256 = "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23";

     

       9
       9
       -
           url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz";

     

       8
       8
       +
           url = "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "sha256-Wo81u4snR09Gaw511FG6kXQz2KqxiJZ4pk2cTnKouMI=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = [

     

       13
       13
       -
           # Switch to Python 3

     

       14
       14
       -
           # https://lore.kernel.org/linux-wireless/1437542484-23409-1-git-send-email-ahmed.taahir@gmail.com/

     

       13
       13
       +
           # Fix python 3 build: except ImportError, e: SyntaxError: invalid syntax

     

       15
       14
        
           (fetchpatch {

     

       16
       16
       -
             url = "https://lore.kernel.org/linux-wireless/1437542484-23409-2-git-send-email-ahmed.taahir@gmail.com/raw";

     

       17
       17
       -
             sha256 = "0s2n340cgaasvg1k8g9v8xjrbh4y2mcgrhdmv97ja2fs8xjcjbf1";

     

       15
       15
       +
             url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d234fddf451fab0f4fc412e2769f54e11f10d7d8/trunk/crda-4.14-python-3.patch";

     

       16
       16
       +
             sha256 = "sha256-KEezEKrfizq9k4ZiE2mf3Nl4JiBayhXeVnFl7wYh28Y=";

     

       18
       17
        
           })

     

       18
       18
       +
       

     

       19
       19
        
           (fetchpatch {

     

       20
       20
       -
             url = "https://lore.kernel.org/linux-wireless/1437542484-23409-3-git-send-email-ahmed.taahir@gmail.com/raw";

     

       21
       21
       -
             sha256 = "01dlfw7kqhyx025jxq2l75950b181p9r7i9zkflcwvbzzdmx59md";

     

       20
       20
       +
             url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d48ec843222b0d74c85bce86fa6f087c7dfdf952/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch";

     

       21
       21
       +
             sha256 = "sha256-j93oydi209f22OF8aXZ/NczuUOnlhkdSeYvy2WRRvm0=";

     

       22
       22
        
           })

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ libgcrypt libnl ];

     

       25
       25
       +
         strictDeps = true;

     

       26
       26
       +
       

     

       26
       27
        
         nativeBuildInputs = [

     

       27
       28
        
           pkg-config

     

       28
       28
       -
           python3Packages.pycrypto

     

       29
       29
       +
           python3Packages.m2crypto # only used for a build time script

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = [

     

       33
       33
       +
           libgcrypt

     

       34
       34
       +
           libnl

     

       29
       35
        
         ];

     

       30
       36
        
       

     

       31
       37
        
         postPatch = ''

     

       32
       38
        
           patchShebangs utils/

     

       33
       39
        
           substituteInPlace Makefile \

     

       40
       40
       +
             --replace 'gzip' 'gzip -n' \

     

       34
       41
        
             --replace ldconfig true \

     

       35
       42
        
             --replace pkg-config $PKG_CONFIG

     

       36
       43
        
           sed -i crda.c \

     
···

       45
       52
        
           "REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin"

     

       46
       53
        
         ];

     

       47
       54
        
       

     

       48
       48
       -
         NIX_CFLAGS_COMPILE = "-Wno-error=unused-const-variable";

     

       49
       49
       -
       

     

       50
       55
        
         buildFlags = [ "all_noverify" ];

     

       51
       56
        
         enableParallelBuilding = true;

     

       52
       57
        
       

     

       53
       58
        
         doCheck = true;

     

       54
       59
        
         checkTarget = "verify";

     

       55
       55
       -
       

     

       56
       56
       -
         postInstall = ''

     

       57
       57
       -
           # The patch installs build header

     

       58
       58
       -
           rm $out/include/reglib/keys-gcrypt.h

     

       59
       59
       -
         '';

     

       60
       60
        
       

     

       61
       61
        
         meta = with lib; {

     

       62
       62
        
           description = "Linux wireless Central Regulatory Domain Agent";

+3 -3

pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, gnugrep, findutils }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "22-1.1ubuntu1"; # Zesty

     

       4
       4
       +
         version = "28-1ubuntu4"; # impish 2021-06-24

     

       5
       5
        
       

     

       6
       6
        
       in stdenv.mkDerivation {

     

       7
       7
        
         pname = "kmod-blacklist";

     
···

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";

     

       12
       12
       -
           sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";

     

       12
       12
       +
           sha256 = "sha256-K8tWpaLmCm3Jcxw3OZ+D7Koiug7epooRn1YMfqjGAiw=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''

     
···

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
        
         meta = with lib; {

     

       34
       34
       -
           homepage = "https://packages.ubuntu.com/source/zesty/kmod";

     

       34
       34
       +
           homepage = "https://launchpad.net/ubuntu/+source/kmod";

     

       35
       35
        
           description = "Linux kernel module blacklists from Ubuntu";

     

       36
       36
        
           platforms = platforms.linux;

     

       37
       37
        
           license = with licenses; [ gpl2Plus lgpl21Plus ];

+2

pkgs/tools/admin/google-cloud-sdk/default.nix

···

       103
       103
        
           mkdir -p $out/share/zsh/site-functions

     

       104
       104
        
           mv $out/google-cloud-sdk/completion.zsh.inc $out/share/zsh/site-functions/_gcloud

     

       105
       105
        
           ln -s $out/share/zsh/site-functions/_gcloud $out/share/zsh/site-functions/_gsutil

     

       106
       106
       +
           # zsh doesn't load completions from $FPATH without #compdef as the first line

     

       107
       107
       +
           sed -i '1 i #compdef gcloud' $out/share/zsh/site-functions/_gcloud

     

       106
       108
        
       

     

       107
       109
        
           # This directory contains compiled mac binaries. We used crcmod from

     

       108
       110
        
           # nixpkgs instead.