commit 09a970dcd2135b27c74e0d5709ed0cd49d8b723b · pyrox.dev/nixpkgs

+1

nixos/modules/hardware/all-firmware.nix

···

       48
       48
        
               rtl8192su-firmware

     

       49
       49
        
               rt5677-firmware

     

       50
       50
        
               rtl8723bs-firmware

     

       51
       51
       +
               rtl8761b-firmware

     

       51
       52
        
               rtlwifi_new-firmware

     

       52
       53
        
               zd1211fw

     

       53
       54
        
               alsa-firmware

+2

nixos/modules/services/networking/kresd.nix

···

       135
       135
        
             CacheDirectory = "knot-resolver";

     

       136
       136
        
             CacheDirectoryMode = "0770";

     

       137
       137
        
           };

     

       138
       138
       +
           # We don't mind running stop phase from wrong version.  It seems less racy.

     

       139
       139
       +
           systemd.services."kresd@".stopIfChanged = false;

     

       138
       140
        
       

     

       139
       141
        
           # Try cleaning up the previously default location of cache file.

     

       140
       142
        
           # Note that /var/cache/* should always be safe to remove.

+5 -4

pkgs/applications/audio/ncmpcpp/default.nix

···

       12
       12
        
       with stdenv.lib;

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "ncmpcpp";

     

       15
       15
       -
         version = "0.8.2";

     

       15
       15
       +
         version = "0.9.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
       -
           url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2";

     

       19
       19
       -
           sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5";

     

       18
       18
       +
           url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2";

     

       19
       19
       +
           sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         configureFlags = [ "BOOST_LIB_SUFFIX=" ]

     
···

       33
       33
        
       

     

       34
       34
        
         meta = {

     

       35
       35
        
           description = "A featureful ncurses based MPD client inspired by ncmpc";

     

       36
       36
       -
           homepage    = "https://ncmpcpp.rybczak.net/";

     

       36
       36
       +
           homepage    = "https://rybczak.net/ncmpcpp/";

     

       37
       37
       +
           changelog   = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md";

     

       37
       38
        
           license     = licenses.gpl2Plus;

     

       38
       39
        
           maintainers = with maintainers; [ jfrankenau koral lovek323 ];

     

       39
       40
        
           platforms   = platforms.all;

+2 -2

pkgs/applications/networking/browsers/chromium/common.nix

···

       13
       13
        
       , bison, gperf

     

       14
       14
        
       , glib, gtk3, dbus-glib

     

       15
       15
        
       , glibc

     

       16
       16
       -
       , libXScrnSaver, libXcursor, libXtst, libGLU, libGL

     

       16
       16
       +
       , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL

     

       17
       17
        
       , protobuf, speechd, libXdamage, cups

     

       18
       18
        
       , ffmpeg, libxslt, libxml2, at-spi2-core

     

       19
       19
        
       , jre8

     
···

       136
       136
        
             util-linux alsaLib

     

       137
       137
        
             bison gperf kerberos

     

       138
       138
        
             glib gtk3 dbus-glib

     

       139
       139
       -
             libXScrnSaver libXcursor libXtst libGLU libGL

     

       139
       139
       +
             libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL

     

       140
       140
        
             pciutils protobuf speechd libXdamage at-spi2-core

     

       141
       141
        
             jre

     

       142
       142
        
             pipewire_0_2

+15 -5

pkgs/build-support/setup-hooks/auto-patchelf.sh

···

       1
       1
       +
       #!/usr/bin/env bash

     

       2
       2
       +
       

     

       1
       3
        
       declare -a autoPatchelfLibs

     

       2
       4
        
       declare -Ag autoPatchelfFailedDeps

     

       3
       5
        
       

     
···

       11
       13
        
         patchelf "$@" || (echo "Command failed: patchelf $*" && exit 1)

     

       12
       14
        
       }

     

       13
       15
        
       

     

       16
       16
       +
       # shellcheck disable=SC2154

     

       17
       17
       +
       # (targetOffset is referenced but not assigned.)

     

       14
       18
        
       addEnvHooks "$targetOffset" gatherLibraries

     

       15
       19
        
       

     

       16
       20
        
       isExecutable() {

     
···

       116
       120
        
           interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")"

     

       117
       121
        
           if isExecutable "$toPatch"; then

     

       118
       122
        
               runPatchelf --set-interpreter "$interpreter" "$toPatch"

     

       123
       123
       +
               # shellcheck disable=SC2154

     

       124
       124
       +
               # (runtimeDependencies is referenced but not assigned.)

     

       119
       125
        
               if [ -n "$runtimeDependencies" ]; then

     

       120
       126
        
                   for dep in $runtimeDependencies; do

     

       121
       127
        
                       rpath="$rpath${rpath:+:}$dep/lib"

     
···

       129
       135
        
           # clear the RPATH first.

     

       130
       136
        
           runPatchelf --remove-rpath "$toPatch"

     

       131
       137
        
       

     

       138
       138
       +
           # If the file is not a dynamic executable, ldd/sed will fail,

     

       139
       139
       +
           # in which case we return, since there is nothing left to do.

     

       132
       140
        
           local missing

     

       133
       141
        
           missing="$(

     

       134
       142
        
               ldd "$toPatch" 2> /dev/null | \

     

       135
       143
        
                   sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p'

     

       136
       136
       -
           )"

     

       144
       144
       +
           )" || return 0

     

       137
       145
        
       

     

       138
       146
        
           # This ensures that we get the output of all missing dependencies instead

     

       139
       147
        
           # of failing at the first one, because it's more useful when working on a

     
···

       175
       183
        
               esac

     

       176
       184
        
           done

     

       177
       185
        
       

     

       178
       178
       -
           for file in \

     

       179
       179
       -
             $(find "$@" "${findOpts[@]}" \! -type d \

     

       180
       180
       -
                 \( -name '*.so' -o -name '*.so.*' \))

     

       181
       181
       -
           do addToDepCache "$file"; done

     

       186
       186
       +
           while IFS= read -r -d '' file; do

     

       187
       187
       +
           addToDepCache "$file"

     

       188
       188
       +
           done <  <(find "$@" "${findOpts[@]}" \! -type d \

     

       189
       189
       +
                   \( -name '*.so' -o -name '*.so.*' \) -print0)

     

       182
       190
        
       }

     

       183
       191
        
       

     

       184
       192
        
       autoPatchelf() {

     
···

       231
       239
        
             echo "autoPatchelfHook could not satisfy dependency $failedDep wanted by ${autoPatchelfFailedDeps[$failedDep]}"

     

       232
       240
        
             depsMissing=1

     

       233
       241
        
           done

     

       242
       242
       +
           # shellcheck disable=SC2154

     

       243
       243
       +
           # (autoPatchelfIgnoreMissingDeps is referenced but not assigned.)

     

       234
       244
        
           if [[ $depsMissing == 1 && -z "$autoPatchelfIgnoreMissingDeps" ]]; then

     

       235
       245
        
             echo "Add the missing dependencies to the build inputs or set autoPatchelfIgnoreMissingDeps=true"

     

       236
       246
        
             exit 1

+18 -16

pkgs/development/arduino/arduino-core/default.nix

···

       11
       11
        
       , ncurses

     

       12
       12
        
       , readline

     

       13
       13
        
       , withGui ? false

     

       14
       14
       -
       , gtk2 ? null

     

       14
       14
       +
       , gtk3 ? null

     

       15
       15
       +
       , wrapGAppsHook

     

       15
       16
        
       , withTeensyduino ? false

     

       16
       17
        
         /* Packages needed for Teensyduino */

     

       17
       18
        
       , upx

     
···

       29
       30
        
       , udev

     

       30
       31
        
       }:

     

       31
       32
        
       

     

       32
       32
       -
       assert withGui -> gtk2 != null;

     

       33
       33
       +
       assert withGui -> gtk3 != null && wrapGAppsHook != null;

     

       33
       34
        
       assert withTeensyduino -> withGui;

     

       34
       35
        
       let

     

       35
       36
        
         externalDownloads = import ./downloads.nix {

     
···

       55
       56
        
           gcc.cc.lib

     

       56
       57
        
           gdk-pixbuf

     

       57
       58
        
           glib

     

       58
       58
       -
           gtk2

     

       59
       59
       +
           gtk3

     

       59
       60
        
           libpng12

     

       60
       61
        
           libusb-compat-0_1

     

       61
       62
        
           pango

     
···

       78
       79
        
                    + stdenv.lib.optionalString (!withGui) "-core";

     

       79
       80
        
       in

     

       80
       81
        
       stdenv.mkDerivation rec {

     

       81
       81
       -
         version = "1.8.12";

     

       82
       82
       +
         version = "1.8.13";

     

       82
       83
        
         name = "${flavor}-${version}";

     

       83
       84
        
       

     

       84
       85
        
         src = fetchFromGitHub {

     

       85
       86
        
           owner = "arduino";

     

       86
       87
        
           repo = "Arduino";

     

       87
       88
        
           rev = version;

     

       88
       88
       -
           sha256 = "0lxkyvsh55biz2q20ba4qabraind5cpxznl41zfq027vl22j6kd2";

     

       89
       89
       +
           sha256 = "0qg3qyj1b7wbaw2rsfly7nf3115h26nskl4ggrn6plhx272ni84p";

     

       89
       90
        
         };

     

       90
       91
        
       

     

       91
       91
       -
         teensyduino_version = "151";

     

       92
       92
       +
         teensyduino_version = "153";

     

       92
       93
        
         teensyduino_src = fetchurl {

     

       93
       94
        
           url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}";

     

       94
       95
        
           sha256 = {

     

       95
       95
       -
             linux64 = "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0";

     

       96
       96
       -
             linux32 = "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m";

     

       97
       97
       -
             linuxarm = "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip";

     

       98
       98
       -
             linuxaarch64 = "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x";

     

       96
       96
       +
             linux64 = "02qgsj4h4zrjxkcclx7clsqbqd699kg0dq1xxa9hbj3vfnddjv1f";

     

       97
       97
       +
             linux32 = "14xaff8xj176ih8ifdvxsly5xgjjm82dqbn7lqq81a43i0svjjyn";

     

       98
       98
       +
             linuxarm = "0xpg9axa6dqyhccm9cpvsv2al7rgwy4gv2l8b2kffvn974dl5759";

     

       99
       99
       +
             linuxaarch64 = "1lyn4zy4l5mml3c19fw6i2pk1ypnq6mgjmxmzk9d54wpf6n3j5dk";

     

       99
       100
        
           }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");

     

       100
       101
        
         };

     

       101
       102
        
         # Used because teensyduino requires jars be a specific size

     

       102
       103
        
         arduino_dist_src = fetchurl {

     

       103
       103
       -
           url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";

     

       104
       104
       +
           url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";

     

       104
       105
        
           sha256 =

     

       105
       106
        
             {

     

       106
       106
       -
               linux64 = "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9";

     

       107
       107
       -
               linux32 = "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi";

     

       108
       108
       -
               linuxarm = "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx";

     

       109
       109
       -
               linuxaarch64 = "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa";

     

       107
       107
       +
               linux64 = "1bdlk51dqiyg5pw23hs8rfv8nrjqy0jqfl89h1466ahahpnd080v";

     

       108
       108
       +
               linux32 = "0mgsw9wpwv1pgs2jslzflh7zf4ggqjgcd55hmdzrj0dvgkyw4cr2";

     

       109
       109
       +
               linuxarm = "08n4lpak3i7yfyi0085j4nq14gb2n7zx85wl9drp8gaavxnfbp5f";

     

       110
       110
       +
               linuxaarch64 = "0m4nhykzknm2hdpz1fhr2hbpncry53kvzs9y5lgj7rx3sy6ygbh7";

     

       110
       111
        
             }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");

     

       111
       112
        
         };

     

       112
       113
        
       

     

       113
       114
        
       

     

       115
       115
       +
         nativeBuildInputs = [ wrapGAppsHook ];

     

       114
       116
        
         buildInputs = [

     

       115
       117
        
           jdk

     

       116
       118
        
           ant

     
···

       149
       151
        
       

     

       150
       152
        
         # This will be patched into `arduino` wrapper script

     

       151
       153
        
         # Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH

     

       152
       152
       -
         dynamicLibraryPath = lib.makeLibraryPath [ gtk2 ];

     

       154
       154
       +
         dynamicLibraryPath = lib.makeLibraryPath [ gtk3 ];

     

       153
       155
        
         javaPath = lib.makeBinPath [ jdk ];

     

       154
       156
        
       

     

       155
       157
        
         # Everything else will be patched into rpath

+9 -9

pkgs/development/arduino/arduino-core/downloads.nix

···

       107
       107
        
           url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip";

     

       108
       108
        
           sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d";

     

       109
       109
        
         };

     

       110
       110
       -
         "build/avr-1.8.2.tar.bz2" = fetchurl {

     

       111
       111
       -
           url = "https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2";

     

       112
       112
       -
           sha256 = "06zl8fwphknd0qdx87fcr1003gid1yqsazaj674mm9widqfd84v2";

     

       110
       110
       +
         "build/avr-1.8.3.tar.bz2" = fetchurl {

     

       111
       111
       +
           url = "https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2";

     

       112
       112
       +
           sha256 = "051wnc0nmsmxvvs4c79zvjag33yx5il2pz2j7qyjsxkp4jc9p2ny";

     

       113
       113
        
         };

     

       114
       114
        
       }

     

       115
       115
        
       

     

       116
       116
        
       // optionalAttrs (system == "x86_64-linux") {

     

       117
       117
       -
         "build/arduino-builder-linux64-1.5.2.tar.bz2" = fetchurl {

     

       118
       118
       -
           url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.2.tar.bz2";

     

       119
       119
       -
           sha256 = "0wypr9a2cbv9r0ignsr13raw09i3vfc5zvkjxp2xwb7mv35y77z3";

     

       117
       117
       +
         "build/arduino-builder-linux64-1.5.4.tar.bz2" = fetchurl {

     

       118
       118
       +
           url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.4.tar.bz2";

     

       119
       119
       +
           sha256 = "1cgvwlvxzzpjaj4njz1mrsif27l26dwkz9c7gbhdj0lvlk3xsa7s";

     

       120
       120
        
         };

     

       121
       121
       -
         "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {

     

       122
       122
       -
           url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2";

     

       123
       123
       -
           sha256 = "1yq6a811dabrkcgzfi3jsys41r19qsna46kglkjbcy0rza7yvzry";

     

       121
       121
       +
         "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {

     

       122
       122
       +
           url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2";

     

       123
       123
       +
           sha256 = "07nrzv7gsq7bi7ichlw3xsdvgzk0lvv56b73ksn3089ajpv3g35x";

     

       124
       124
        
         };

     

       125
       125
        
         "build/linux/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {

     

       126
       126
        
           url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2";

+64

pkgs/games/anki/bin.nix

···

       1
       1
       +
       { fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         pname = "anki-bin";

     

       5
       5
       +
         # Update hashes for both Linux and Darwin!

     

       6
       6
       +
         version = "2.1.36";

     

       7
       7
       +
       

     

       8
       8
       +
         unpacked = stdenv.mkDerivation {

     

       9
       9
       +
           inherit pname version;

     

       10
       10
       +
       

     

       11
       11
       +
           src = fetchurl {

     

       12
       12
       +
             url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";

     

       13
       13
       +
             sha256 = "01xcjnfs5pfh7v0nkffw2wpl19l6pj9k3kxrcawv3cm42asy0mfz";

     

       14
       14
       +
           };

     

       15
       15
       +
       

     

       16
       16
       +
           installPhase = ''

     

       17
       17
       +
             runHook preInstall

     

       18
       18
       +
       

     

       19
       19
       +
             xdg-mime () {

     

       20
       20
       +
               echo Stubbed!

     

       21
       21
       +
             }

     

       22
       22
       +
             export -f xdg-mime

     

       23
       23
       +
       

     

       24
       24
       +
             PREFIX=$out bash install.sh

     

       25
       25
       +
       

     

       26
       26
       +
             runHook postInstall

     

       27
       27
       +
           '';

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           inherit (anki.meta) license homepage description longDescription;

     

       32
       32
       +
           platforms = [ "x86_64-linux" "x86_64-darwin" ];

     

       33
       33
       +
           maintainers = with maintainers; [ atemu ];

     

       34
       34
       +
         };

     

       35
       35
       +
       in

     

       36
       36
       +
       

     

       37
       37
       +
       if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {

     

       38
       38
       +
         name = "anki";

     

       39
       39
       +
       

     

       40
       40
       +
         runScript = writeShellScript "anki-wrapper.sh" ''

     

       41
       41
       +
           # Wayland support is broken, disable via ENV variable

     

       42
       42
       +
           export QT_QPA_PLATFORM=xcb

     

       43
       43
       +
           exec ${unpacked}/bin/anki

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         inherit meta;

     

       47
       47
       +
       }) else stdenv.mkDerivation {

     

       48
       48
       +
         inherit pname version;

     

       49
       49
       +
       

     

       50
       50
       +
         src = fetchurl {

     

       51
       51
       +
           url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";

     

       52
       52
       +
           sha256 = "1i6iidm5h8r9g801mvqxi2av03qdw3lr28056fv5ixnb5dq2wqim";

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
         nativeBuildInputs = [ undmg ];

     

       56
       56
       +
         sourceRoot = ".";

     

       57
       57
       +
       

     

       58
       58
       +
         installPhase = ''

     

       59
       59
       +
           mkdir -p $out/Applications/

     

       60
       60
       +
           cp -a Anki.app $out/Applications/

     

       61
       61
       +
         '';

     

       62
       62
       +
       

     

       63
       63
       +
         inherit meta;

     

       64
       64
       +
       }

+29

pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "rtl8761b-firmware";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchFromGitHub {

     

       7
       7
       +
           owner = "Realtek-OpenSource";

     

       8
       8
       +
           repo = "android_hardware_realtek";

     

       9
       9
       +
           rev = "rtk1395";

     

       10
       10
       +
           sha256 = "sha256-vd9sZP7PGY+cmnqVty3sZibg01w8+UNinv8X85B+dzc=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         installPhase = ''

     

       14
       14
       +
           install -D -pm644 \

     

       15
       15
       +
             bt/rtkbt/Firmware/BT/rtl8761b_fw \

     

       16
       16
       +
             $out/lib/firmware/rtl_bt/rtl8761b_fw.bin

     

       17
       17
       +
       

     

       18
       18
       +
           install -D -pm644 \

     

       19
       19
       +
             bt/rtkbt/Firmware/BT/rtl8761b_config \

     

       20
       20
       +
             $out/lib/firmware/rtl_bt/rtl8761b_config.bin

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "Firmware for Realtek RTL8761b";

     

       25
       25
       +
           license = licenses.unfreeRedistributableFirmware;

     

       26
       26
       +
           maintainers = with maintainers; [ edibopp ];

     

       27
       27
       +
           platforms = with platforms; linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+7

pkgs/os-specific/linux/kernel/patches.nix

···

       76
       76
        
           };

     

       77
       77
        
         };

     

       78
       78
        
       

     

       79
       79
       +
         # Adapted for Linux 5.4 from:

     

       80
       80
       +
         # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45

     

       81
       81
       +
         rtl8761b_support =

     

       82
       82
       +
           { name = "rtl8761b-support";

     

       83
       83
       +
             patch = ./rtl8761b-support.patch;

     

       84
       84
       +
           };

     

       85
       85
       +
       

     

       79
       86
        
         export_kernel_fpu_functions = {

     

       80
       87
        
           "4.14" = {

     

       81
       88
        
             name = "export_kernel_fpu_functions";

+33

pkgs/os-specific/linux/kernel/rtl8761b-support.patch

···

       1
       1
       +
       diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c

     

       2
       2
       +
       index 67f4bc21e7c5..3a9afc905f24 100644

     

       3
       3
       +
       --- a/drivers/bluetooth/btrtl.c

     

       4
       4
       +
       +++ b/drivers/bluetooth/btrtl.c

     

       5
       5
       +
       @@ -130,12 +130,19 @@  static const struct id_table ic_id_table[] = {

     

       6
       6
       +
        	  .cfg_name = "rtl_bt/rtl8821c_config" },

     

       7
       7
       +
       

     

       8
       8
       +
        	/* 8761A */

     

       9
       9
       +
       -	{ IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0,

     

       10
       10
       +
       +	{ IC_INFO(RTL_ROM_LMP_8761A, 0xa),

     

       11
       11
       +
        	  .config_needed = false,

     

       12
       12
       +
        	  .has_rom_version = true,

     

       13
       13
       +
        	  .fw_name  = "rtl_bt/rtl8761a_fw.bin",

     

       14
       14
       +
        	  .cfg_name = "rtl_bt/rtl8761a_config" },

     

       15
       15
       +
       

     

       16
       16
       +
       +	/* 8761B */

     

       17
       17
       +
       +	{ IC_INFO(RTL_ROM_LMP_8761A, 0xb),

     

       18
       18
       +
       +	  .config_needed = false,

     

       19
       19
       +
       +	  .has_rom_version = true,

     

       20
       20
       +
       +	  .fw_name  = "rtl_bt/rtl8761b_fw.bin",

     

       21
       21
       +
       +	  .cfg_name = "rtl_bt/rtl8761b_config" },

     

       22
       22
       +
       +

     

       23
       23
       +
       	/* 8822C with USB interface */

     

       24
       24
       +
       	{ IC_INFO(RTL_ROM_LMP_8822B, 0xc),

     

       25
       25
       +
       	  .config_needed = false,

     

       26
       26
       +
       @@ -251,6 +258,7 @@  static int rtlbt_parse_firmware(struct hci_dev *hdev,

     

       27
       27
       +
        		{ RTL_ROM_LMP_8723B, 9 },	/* 8723D */

     

       28
       28
       +
        		{ RTL_ROM_LMP_8821A, 10 },	/* 8821C */

     

       29
       29
       +
        		{ RTL_ROM_LMP_8822B, 13 },	/* 8822C */

     

       30
       30
       +
       +		{ RTL_ROM_LMP_8761A, 14 },	/* 8761B */

     

       31
       31
       +
        	};

     

       32
       32
       +
       

     

       33
       33
       +
        	min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;

+33

pkgs/tools/misc/fbcat/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub } :

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "fbcat";

     

       5
       5
       +
         version = "0.5.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "jwilk";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "08y79br4a4cgkjnslw0hw57441ybsapaw7wjdbak19mv9lnl5ll9";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # hardcoded because makefile target "install" depends on libxslt dependencies from network

     

       15
       15
       +
         # that are just too hard to monkeypatch here

     

       16
       16
       +
         # so this is the simple fix.

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
           mkdir -p $out

     

       19
       19
       +
           install -d $out/bin

     

       20
       20
       +
           install -m755 fbcat $out/bin/

     

       21
       21
       +
           install -m755 fbgrab $out/bin/

     

       22
       22
       +
           install -d $out/share/man/man1

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with stdenv.lib; {

     

       26
       26
       +
           homepage = "http://jwilk.net/software/fbcat";

     

       27
       27
       +
           description = "Framebuffer screenshot tool";

     

       28
       28
       +
           license = licenses.gpl2Plus;

     

       29
       29
       +
           maintainers = [ maintainers.matthiasbeyer ];

     

       30
       30
       +
           platforms = platforms.linux;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

     

       33
       33
       +

+2

pkgs/tools/misc/toybox/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         stdenv, lib, fetchFromGitHub, which,

     

       3
       3
       +
         buildPackages,

     

       3
       4
        
         enableStatic ? false,

     

       4
       5
        
         enableMinimal ? false,

     

       5
       6
        
         extraConfig ? ""

     
···

       16
       17
        
           sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       20
       20
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross

     

       19
       21
        
         buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ];

     

       20
       22
        
       

     

       21
       23
        
         postPatch = "patchShebangs .";

+5 -1

pkgs/tools/networking/libreswan/default.nix

···

       29
       29
        
           "-Wno-error=format-truncation"

     

       30
       30
        
           "-Wno-error=pointer-compare"

     

       31
       31
        
           "-Wno-error=stringop-truncation"

     

       32
       32
       +
           # The following flag allows libreswan v3.32 to work with NSS 3.22, see

     

       33
       33
       +
           # https://github.com/libreswan/libreswan/issues/334.

     

       34
       34
       +
           # This flag should not be needed for libreswan v3.33 (which is not yet released).

     

       35
       35
       +
           "-DNSS_PKCS11_2_0_COMPAT=1"

     

       32
       36
        
         ];

     

       33
       37
        
       

     

       34
       38
        
         nativeBuildInputs = [ makeWrapper pkgconfig ];

     
···

       82
       86
        
         meta = with stdenv.lib; {

     

       83
       87
        
           homepage = "https://libreswan.org";

     

       84
       88
        
           description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";

     

       85
       85
       -
           platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;

     

       89
       89
       +
           platforms = platforms.linux ++ platforms.freebsd;

     

       86
       90
        
           license = licenses.gpl2;

     

       87
       91
        
           maintainers = [ maintainers.afranchuk ];

     

       88
       92
        
         };

+6

pkgs/top-level/all-packages.nix

···

       3999
       3999
        
       

     

       4000
       4000
        
         feedgnuplot = callPackage ../tools/graphics/feedgnuplot { };

     

       4001
       4001
        
       

     

       4002
       4002
       +
         fbcat = callPackage ../tools/misc/fbcat { };

     

       4003
       4003
       +
       

     

       4002
       4004
        
         fbv = callPackage ../tools/graphics/fbv { };

     

       4003
       4005
        
       

     

       4004
       4006
        
         fbvnc = callPackage ../tools/admin/fbvnc {};

     
···

       18456
       18458
        
           kernelPatches = [

     

       18457
       18459
        
             kernelPatches.bridge_stp_helper

     

       18458
       18460
        
             kernelPatches.request_key_helper

     

       18461
       18461
       +
             kernelPatches.rtl8761b_support

     

       18459
       18462
        
             kernelPatches.export_kernel_fpu_functions."5.3"

     

       18460
       18463
        
           ];

     

       18461
       18464
        
         };

     
···

       19211
       19214
        
         rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };

     

       19212
       19215
        
       

     

       19213
       19216
        
         rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { };

     

       19217
       19217
       +
       

     

       19218
       19218
       +
         rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };

     

       19214
       19219
        
       

     

       19215
       19220
        
         rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { };

     

       19216
       19221
        
       

     
···

       25591
       25596
        
         anki = python3Packages.callPackage ../games/anki {

     

       25592
       25597
        
           inherit (darwin.apple_sdk.frameworks) CoreAudio;

     

       25593
       25598
        
         };

     

       25599
       25599
       +
         anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; };

     

       25594
       25600
        
       

     

       25595
       25601
        
         armagetronad = callPackage ../games/armagetronad { };

     

       25596
       25602