commit b7d8867fd1dcd8916b3d9ff0661562890cd8f57b · pyrox.dev/nixpkgs

+47 -19

nixos/modules/hardware/device-tree.nix

···

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
        
         filterDTBs = src: if cfg.filter == null

     

       69
       69
       -
           then "${src}/dtbs"

     

       69
       69
       +
           then src

     

       70
       70
        
           else

     

       71
       71
        
             pkgs.runCommand "dtbs-filtered" {} ''

     

       72
       72
        
               mkdir -p $out

     

       73
       73
       -
               cd ${src}/dtbs

     

       73
       73
       +
               cd ${src}

     

       74
       74
        
               find . -type f -name '${cfg.filter}' -print0 \

     

       75
       75
        
                 | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents

     

       76
       76
        
             '';

     

       77
       77
        
       

     

       78
       78
       -
         filteredDTBs = filterDTBs cfg.kernelPackage;

     

       79
       79
       -
       

     

       80
       80
       -
         # Compile single Device Tree overlay source

     

       81
       81
       -
         # file (.dts) into its compiled variant (.dtbo)

     

       82
       82
       -
         compileDTS = name: f: pkgs.callPackage({ stdenv, dtc }: stdenv.mkDerivation {

     

       83
       83
       -
           name = "${name}-dtbo";

     

       84
       84
       -
       

     

       85
       85
       -
           nativeBuildInputs = [ dtc ];

     

       86
       86
       -
       

     

       87
       87
       -
           buildCommand = ''

     

       88
       88
       -
             $CC -E -nostdinc -I${getDev cfg.kernelPackage}/lib/modules/${cfg.kernelPackage.modDirVersion}/source/scripts/dtc/include-prefixes -undef -D__DTS__ -x assembler-with-cpp ${f} | \

     

       89
       89
       -
               dtc -I dts -O dtb -@ -o $out

     

       90
       90
       -
           '';

     

       91
       91
       -
         }) {};

     

       78
       78
       +
         filteredDTBs = filterDTBs cfg.dtbSource;

     

       92
       79
        
       

     

       93
       80
        
         # Fill in `dtboFile` for each overlay if not set already.

     

       94
       81
        
         # Existence of one of these is guarded by assertion below

     

       95
       82
        
         withDTBOs = xs: flip map xs (o: o // { dtboFile =

     

       83
       83
       +
           let

     

       84
       84
       +
             includePaths = ["${getDev cfg.kernelPackage}/lib/modules/${cfg.kernelPackage.modDirVersion}/source/scripts/dtc/include-prefixes"] ++ cfg.dtboBuildExtraIncludePaths;

     

       85
       85
       +
             extraPreprocessorFlags = cfg.dtboBuildExtraPreprocessorFlags;

     

       86
       86
       +
           in

     

       96
       87
        
           if o.dtboFile == null then

     

       97
       97
       -
             if o.dtsFile != null then compileDTS o.name o.dtsFile

     

       98
       98
       -
             else compileDTS o.name (pkgs.writeText "dts" o.dtsText)

     

       88
       88
       +
             let

     

       89
       89
       +
               dtsFile = if o.dtsFile == null then (pkgs.writeText "dts" o.dtsText) else o.dtsFile;

     

       90
       90
       +
             in

     

       91
       91
       +
             pkgs.deviceTree.compileDTS {

     

       92
       92
       +
               name = "${o.name}-dtbo";

     

       93
       93
       +
               inherit includePaths extraPreprocessorFlags dtsFile;

     

       94
       94
       +
             }

     

       99
       95
        
           else o.dtboFile; } );

     

       100
       96
        
       

     

       101
       97
        
       in

     
···

       121
       117
        
                 example = literalExpression "pkgs.linux_latest";

     

       122
       118
        
                 type = types.path;

     

       123
       119
        
                 description = lib.mdDoc ''

     

       124
       124
       -
                   Kernel package containing the base device-tree (.dtb) to boot. Uses

     

       120
       120
       +
                   Kernel package where device tree include directory is from. Also used as default source of dtb package to apply overlays to

     

       121
       121
       +
                 '';

     

       122
       122
       +
               };

     

       123
       123
       +
       

     

       124
       124
       +
               dtboBuildExtraPreprocessorFlags = mkOption {

     

       125
       125
       +
                 default = [];

     

       126
       126
       +
                 example = literalExpression "[ \"-DMY_DTB_DEFINE\" ]";

     

       127
       127
       +
                 type = types.listOf types.str;

     

       128
       128
       +
                 description = lib.mdDoc ''

     

       129
       129
       +
                   Additional flags to pass to the preprocessor during dtbo compilations

     

       130
       130
       +
                 '';

     

       131
       131
       +
               };

     

       132
       132
       +
       

     

       133
       133
       +
               dtboBuildExtraIncludePaths = mkOption {

     

       134
       134
       +
                 default = [];

     

       135
       135
       +
                 example = literalExpression ''

     

       136
       136
       +
                   [

     

       137
       137
       +
                     ./my_custom_include_dir_1

     

       138
       138
       +
                     ./custom_include_dir_2

     

       139
       139
       +
                   ]

     

       140
       140
       +
                 '';

     

       141
       141
       +
                 type = types.listOf types.path;

     

       142
       142
       +
                 description = lib.mdDoc ''

     

       143
       143
       +
                   Additional include paths that will be passed to the preprocessor when creating the final .dts to compile into .dtbo

     

       144
       144
       +
                 '';

     

       145
       145
       +
               };

     

       146
       146
       +
       

     

       147
       147
       +
               dtbSource = mkOption {

     

       148
       148
       +
                 default = "${cfg.kernelPackage}/dtbs";

     

       149
       149
       +
                 defaultText = literalExpression "\${cfg.kernelPackage}/dtbs";

     

       150
       150
       +
                 type = types.path;

     

       151
       151
       +
                 description = lib.mdDoc ''

     

       152
       152
       +
                   Path to dtb directory that overlays and other processing will be applied to. Uses

     

       125
       153
        
                   device trees bundled with the Linux kernel by default.

     

       126
       154
        
                 '';

     

       127
       155
        
               };

-1

nixos/tests/kernel-generic.nix

···

       31
       31
        
             linux_5_10_hardened

     

       32
       32
        
             linux_5_15_hardened

     

       33
       33
        
             linux_6_1_hardened

     

       34
       34
       -
             linux_6_4_hardened

     

       35
       34
        
             linux_6_5_hardened

     

       36
       35
        
             linux_rt_5_4

     

       37
       36
        
             linux_rt_5_10

+2 -2

pkgs/applications/editors/orbiton/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "orbiton";

     

       7
       7
       -
         version = "2.65.0";

     

       7
       7
       +
         version = "2.65.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "xyproto";

     

       11
       11
        
           repo = "orbiton";

     

       12
       12
        
           rev = "v${version}";

     

       13
       13
       -
           hash = "sha256-ul5E5xOtH5qh5tNE+S/VhUOr079wHwgtXF7ZIAwGzgU=";

     

       13
       13
       +
           hash = "sha256-ebtzhir6nBnIawkJJq+BgXv/5CbXtbhujXkMBzQEsNY=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         vendorHash = null;

+3 -3

pkgs/applications/editors/pulsar/default.nix

···

       33
       33
        
       

     

       34
       34
        
       let

     

       35
       35
        
         pname = "pulsar";

     

       36
       36
       -
         version = "1.108.0";

     

       36
       36
       +
         version = "1.109.0";

     

       37
       37
        
       

     

       38
       38
        
         sourcesPath = {

     

       39
       39
        
           x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";

     

       40
       40
       -
           x86_64-linux.hash = "sha256-9wxMKekowNkFX+m3h2ZeTXu/uMLyPi6IIbseJ16shG4=";

     

       40
       40
       +
           x86_64-linux.hash = "sha256-pIm3mI1YdfapxXgIciSHtI4LeqMw5RdYTnH+eHUQ4Yo=";

     

       41
       41
        
           aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";

     

       42
       42
       -
           aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U=";

     

       42
       42
       +
           aarch64-linux.hash = "sha256-KIY/qzfl7CU0YwIgQlNHoAMhLfrTbQe7ZZvzdkUVw+M=";

     

       43
       43
        
         }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       44
       44
        
       

     

       45
       45
        
         newLibpath = lib.makeLibraryPath [

+15 -113

pkgs/applications/emulators/vice/default.nix

···

       6
       6
        
       , perl

     

       7
       7
        
       , libpng

     

       8
       8
        
       , giflib

     

       9
       9
       -
       , libjpeg

     

       10
       9
        
       , alsa-lib

     

       11
       10
        
       , readline

     

       12
       11
        
       , libGLU

     

       13
       12
        
       , libGL

     

       14
       14
       -
       , libXaw

     

       15
       13
        
       , pkg-config

     

       16
       16
       -
       , gtk2

     

       14
       14
       +
       , gtk3

     

       15
       15
       +
       , glew

     

       17
       16
        
       , SDL

     

       18
       17
        
       , SDL_image

     

       19
       19
       -
       , autoreconfHook

     

       20
       20
       -
       , makeDesktopItem

     

       21
       18
        
       , dos2unix

     

       19
       19
       +
       , runtimeShell

     

       22
       20
        
       , xa

     

       23
       21
        
       , file

     

       22
       22
       +
       , wrapGAppsHook

     

       23
       23
       +
       , xdg-utils

     

       24
       24
        
       }:

     

       25
       25
        
       

     

       26
       26
       -
       let

     

       27
       27
       -
         desktopItems = [

     

       28
       28
       -
           (makeDesktopItem {

     

       29
       29
       -
             name = "x128";

     

       30
       30
       -
             exec = "x128";

     

       31
       31
       -
             comment = "VICE: C128 Emulator";

     

       32
       32
       -
             desktopName = "VICE: C128 Emulator";

     

       33
       33
       -
             genericName = "Commodore 128 emulator";

     

       34
       34
       -
             categories = [ "System" ];

     

       35
       35
       -
           })

     

       36
       36
       -
       

     

       37
       37
       -
           (makeDesktopItem {

     

       38
       38
       -
             name = "x64dtv";

     

       39
       39
       -
             exec = "x64dtv";

     

       40
       40
       -
             comment = "VICE: C64 DTV Emulator";

     

       41
       41
       -
             desktopName = "VICE: C64 DTV Emulator";

     

       42
       42
       -
             genericName = "Commodore 64 DTV emulator";

     

       43
       43
       -
             categories = [ "System" ];

     

       44
       44
       -
           })

     

       45
       45
       -
       

     

       46
       46
       -
           (makeDesktopItem {

     

       47
       47
       -
             name = "x64sc";

     

       48
       48
       -
             exec = "x64sc";

     

       49
       49
       -
             comment = "VICE: C64 Emulator";

     

       50
       50
       -
             desktopName = "VICE: C64 Emulator";

     

       51
       51
       -
             genericName = "Commodore 64 SC emulator";

     

       52
       52
       -
             categories = [ "System" ];

     

       53
       53
       -
           })

     

       54
       54
       -
       

     

       55
       55
       -
           (makeDesktopItem {

     

       56
       56
       -
             name = "xcbm2";

     

       57
       57
       -
             exec = "xcbm2";

     

       58
       58
       -
             comment = "VICE: CBM-II B-Model Emulator";

     

       59
       59
       -
             desktopName = "VICE: CBM-II B-Model Emulator";

     

       60
       60
       -
             genericName = "CBM-II B-Model Emulator";

     

       61
       61
       -
             categories = [ "System" ];

     

       62
       62
       -
           })

     

       63
       63
       -
       

     

       64
       64
       -
           (makeDesktopItem {

     

       65
       65
       -
             name = "xcbm5x0";

     

       66
       66
       -
             exec = "xcbm5x0";

     

       67
       67
       -
             comment = "VICE: CBM-II P-Model Emulator";

     

       68
       68
       -
             desktopName = "VICE: CBM-II P-Model Emulator";

     

       69
       69
       -
             genericName = "CBM-II P-Model Emulator";

     

       70
       70
       -
             categories = [ "System" ];

     

       71
       71
       -
           })

     

       72
       72
       -
       

     

       73
       73
       -
           (makeDesktopItem {

     

       74
       74
       -
             name = "xpet";

     

       75
       75
       -
             exec = "xpet";

     

       76
       76
       -
             comment = "VICE: PET Emulator";

     

       77
       77
       -
             desktopName = "VICE: PET Emulator";

     

       78
       78
       -
             genericName = "Commodore PET Emulator";

     

       79
       79
       -
             categories = [ "System" ];

     

       80
       80
       -
           })

     

       81
       81
       -
       

     

       82
       82
       -
           (makeDesktopItem {

     

       83
       83
       -
             name = "xplus4";

     

       84
       84
       -
             exec = "xplus4";

     

       85
       85
       -
             comment = "VICE: PLUS4 Emulator";

     

       86
       86
       -
             desktopName = "VICE: PLUS4 Emulator";

     

       87
       87
       -
             genericName = "Commodore PLUS4 Emulator";

     

       88
       88
       -
             categories = [ "System" ];

     

       89
       89
       -
           })

     

       90
       90
       -
       

     

       91
       91
       -
           (makeDesktopItem {

     

       92
       92
       -
             name = "xscpu64";

     

       93
       93
       -
             exec = "xscpu64";

     

       94
       94
       -
             comment = "VICE: SCPU64 Emulator";

     

       95
       95
       -
             desktopName = "VICE: SCPU64 Emulator";

     

       96
       96
       -
             genericName = "Commodore SCPU64 Emulator";

     

       97
       97
       -
             categories = [ "System" ];

     

       98
       98
       -
           })

     

       99
       99
       -
       

     

       100
       100
       -
           (makeDesktopItem {

     

       101
       101
       -
             name = "xvic";

     

       102
       102
       -
             exec = "xvic";

     

       103
       103
       -
             comment = "VICE: VIC-20 Emulator";

     

       104
       104
       -
             desktopName = "VICE: VIC-20 Emulator";

     

       105
       105
       -
             genericName = "Commodore VIC-20 Emulator";

     

       106
       106
       -
             categories = [ "System" ];

     

       107
       107
       -
           })

     

       108
       108
       -
       

     

       109
       109
       -
           (makeDesktopItem {

     

       110
       110
       -
             name = "vsid";

     

       111
       111
       -
             exec = "vsid";

     

       112
       112
       -
             comment = "VSID: The SID Emulator";

     

       113
       113
       -
             desktopName = "VSID: The SID Emulator";

     

       114
       114
       -
             genericName = "SID Emulator";

     

       115
       115
       -
             categories = [ "System" ];

     

       116
       116
       -
           })

     

       117
       117
       -
         ];

     

       118
       118
       -
       in

     

       119
       26
        
       stdenv.mkDerivation rec {

     

       120
       27
        
         pname = "vice";

     

       121
       28
        
         version = "3.7.1";

     
···

       126
       33
        
         };

     

       127
       34
        
       

     

       128
       35
        
         nativeBuildInputs = [

     

       129
       129
       -
           autoreconfHook

     

       130
       36
        
           bison

     

       131
       37
        
           dos2unix

     

       132
       38
        
           file

     

       133
       39
        
           flex

     

       134
       40
        
           pkg-config

     

       41
       41
       +
           wrapGAppsHook

     

       135
       42
        
         ];

     

       136
       43
        
       

     

       137
       44
        
         buildInputs = [

     

       138
       45
        
           alsa-lib

     

       139
       46
        
           giflib

     

       140
       140
       -
           gtk2

     

       47
       47
       +
           gtk3

     

       48
       48
       +
           glew

     

       141
       49
        
           libGL

     

       142
       50
        
           libGLU

     

       143
       143
       -
           libXaw

     

       144
       144
       -
           libjpeg

     

       145
       51
        
           libpng

     

       146
       52
        
           perl

     

       147
       53
        
           readline

     

       148
       54
        
           SDL

     

       149
       55
        
           SDL_image

     

       150
       56
        
           xa

     

       57
       57
       +
           xdg-utils

     

       151
       58
        
         ];

     

       152
       59
        
         dontDisableStatic = true;

     

       153
       153
       -
         configureFlags = [ "--enable-fullscreen" "--enable-gnomeui" "--disable-pdf-docs" ];

     

       60
       60
       +
         configureFlags = [ "--enable-sdl2ui" "--enable-gtk3ui" "--enable-desktop-files" "--disable-pdf-docs" "--with-gif" ];

     

       61
       61
       +
       

     

       62
       62
       +
         LIBS = "-lGL";

     

       154
       63
        
       

     

       155
       64
        
         preBuild = ''

     

       156
       156
       -
           for i in src/resid src/resid-dtv

     

       157
       157
       -
           do

     

       158
       158
       -
             mkdir -pv $i/src

     

       159
       159
       -
             ln -sv ../../wrap-u-ar.sh $i/src

     

       160
       160
       -
           done

     

       65
       65
       +
           sed -i -e 's|#!/usr/bin/env bash|${runtimeShell}/bin/bash|' src/arch/gtk3/novte/box_drawing_generate.sh

     

       161
       66
        
         '';

     

       162
       67
        
       

     

       163
       68
        
         postInstall = ''

     

       164
       164
       -
           for app in ${toString desktopItems}

     

       165
       165
       -
           do

     

       166
       166
       -
               mkdir -p $out/share/applications

     

       167
       167
       -
               cp $app/share/applications/* $out/share/applications

     

       168
       168
       -
           done

     

       69
       69
       +
           mkdir -p $out/share/applications

     

       70
       70
       +
           cp src/arch/gtk3/data/unix/vice-org-*.desktop $out/share/applications

     

       169
       71
        
         '';

     

       170
       72
        
       

     

       171
       73
        
         meta = {

+2 -2

pkgs/applications/networking/cluster/tilt/default.nix

···

       8
       8
        
         /* Do not use "dev" as a version. If you do, Tilt will consider itself

     

       9
       9
        
           running in development environment and try to serve assets from the

     

       10
       10
        
           source tree, which is not there once build completes.  */

     

       11
       11
       -
         version = "0.33.5";

     

       11
       11
       +
         version = "0.33.6";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "tilt-dev";

     

       15
       15
        
           repo = "tilt";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-o78PoIKj+0FvZRpm0AqtUq3N9a9/LDYc7DIPZgSZe4s=";

     

       17
       17
       +
           hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         vendorHash = null;

+2 -2

pkgs/applications/networking/instant-messengers/signal-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "signal-cli";

     

       5
       5
       -
         version = "0.12.1";

     

       5
       5
       +
         version = "0.12.2";

     

       6
       6
        
       

     

       7
       7
        
         # Building from source would be preferred, but is much more involved.

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";

     

       10
       10
       -
           hash = "sha256-pxDSAVh/zg3hCuTlSuilgD4VKe1CPSG/ZLl0TF1nc1I=";

     

       10
       10
       +
           hash = "sha256-XhLTovymqjbc19X717WyNIi4jdpwnyttXGqkkHBFwQA=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

+3 -3

pkgs/applications/networking/juju/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "juju";

     

       5
       5
       -
         version = "3.2.2";

     

       5
       5
       +
         version = "3.2.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "juju";

     

       9
       9
        
           repo = "juju";

     

       10
       10
        
           rev = "juju-${version}";

     

       11
       11
       -
           sha256 = "sha256-ZmMOQCKQWtzB2O6CNZTRhhj7gkpRRXY9ILN2KdSQoWk=";

     

       11
       11
       +
           sha256 = "sha256-sUlM4bLy/kluZmGOzMACz92GG46XYKicNPP5k2FPSGA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-rqf5nAXwcW6lm7sidEcxMqatT4KPju4Seo1/Awse5Zs=";

     

       14
       14
       +
         vendorHash = "sha256-mPEixXVuxAqgkBoNqIYnZaFJynHJsnmamaHqyh/svwQ=";

     

       15
       15
        
       

     

       16
       16
        
         # Disable tests because it attempts to use a mongodb instance

     

       17
       17
        
         doCheck = false;

+2 -2

pkgs/applications/radio/gqrx/default.nix

···

       27
       27
        
       

     

       28
       28
        
       gnuradioMinimal.pkgs.mkDerivation rec {

     

       29
       29
        
         pname = "gqrx";

     

       30
       30
       -
         version = "2.16";

     

       30
       30
       +
         version = "2.17";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "gqrx-sdr";

     

       34
       34
        
           repo = "gqrx";

     

       35
       35
        
           rev = "v${version}";

     

       36
       36
       -
           hash = "sha256-14MVimOxM7upq6vpEhvVRnrverBuFToE2ktNhG59LKE=";

     

       36
       36
       +
           hash = "sha256-QnwkiH8KqoHa2Q3knh0OAyGBySAArEtdpO+lTzqJ4j0=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         nativeBuildInputs = [

+4 -7

pkgs/development/libraries/webkitgtk/default.nix

···

       27
       27
        
       , libxkbcommon

     

       28
       28
        
       , libavif

     

       29
       29
        
       , libepoxy

     

       30
       30
       +
       , libjxl

     

       30
       31
        
       , at-spi2-core

     

       31
       32
        
       , libxml2

     

       32
       33
        
       , libsoup

     
···

       34
       35
        
       , libxslt

     

       35
       36
        
       , harfbuzz

     

       36
       37
        
       , libpthreadstubs

     

       37
       37
       -
       , pcre

     

       38
       38
        
       , nettle

     

       39
       39
        
       , libtasn1

     

       40
       40
        
       , p11-kit

     
···

       51
       51
        
       , openjpeg

     

       52
       52
        
       , geoclue2

     

       53
       53
        
       , sqlite

     

       54
       54
       -
       , enableGLES ? true

     

       55
       54
        
       , gst-plugins-base

     

       56
       55
        
       , gst-plugins-bad

     

       57
       56
        
       , woff2

     
···

       71
       70
        
       

     

       72
       71
        
       stdenv.mkDerivation (finalAttrs: {

     

       73
       72
        
         pname = "webkitgtk";

     

       74
       74
       -
         version = "2.40.5";

     

       73
       73
       +
         version = "2.42.1";

     

       75
       74
        
         name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";

     

       76
       75
        
       

     

       77
       76
        
         outputs = [ "out" "dev" "devdoc" ];

     
···

       82
       81
        
       

     

       83
       82
        
         src = fetchurl {

     

       84
       83
        
           url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";

     

       85
       85
       -
           hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38=";

     

       84
       84
       +
           hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk=";

     

       86
       85
        
         };

     

       87
       86
        
       

     

       88
       87
        
         patches = lib.optionals stdenv.isLinux [

     
···

       132
       131
        
           enchant2

     

       133
       132
        
           libavif

     

       134
       133
        
           libepoxy

     

       134
       134
       +
           libjxl

     

       135
       135
        
           gnutls

     

       136
       136
        
           gst-plugins-bad

     

       137
       137
        
           gst-plugins-base

     
···

       153
       153
        
           nettle

     

       154
       154
        
           openjpeg

     

       155
       155
        
           p11-kit

     

       156
       156
       -
           pcre

     

       157
       156
        
           sqlite

     

       158
       157
        
           woff2

     

       159
       158
        
         ] ++ (with xorg; [

     
···

       219
       218
        
           "-DUSE_GTK4=ON"

     

       220
       219
        
         ] ++ lib.optionals (!systemdSupport) [

     

       221
       220
        
           "-DENABLE_JOURNALD_LOG=OFF"

     

       222
       222
       -
         ] ++ lib.optionals (stdenv.isLinux && enableGLES) [

     

       223
       223
       -
           "-DENABLE_GLES2=ON"

     

       224
       221
        
         ];

     

       225
       222
        
       

     

       226
       223
        
         postPatch = ''

+1 -1

pkgs/development/libraries/webkitgtk/fdo-backend-path.patch

···

       3
       3
        
       @@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process

     

       4
       4
        
        

     

       5
       5
        
        #if PLATFORM(WAYLAND)

     

       6
       6
       -
            if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) {

     

       6
       6
       +
            if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland && parameters.dmaBufRendererBufferMode.isEmpty()) {

     

       7
       7
        
       -        wpe_loader_init("libWPEBackend-fdo-1.0.so.1");

     

       8
       8
        
       +        wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1");

     

       9
       9
        
                if (AcceleratedBackingStoreWayland::checkRequirements()) {

+2 -9

pkgs/development/python-modules/azure-storage-blob/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , azure-common

     

       3
       2
        
       , azure-core

     

       4
       4
       -
       , azure-storage-common

     

       5
       3
        
       , buildPythonPackage

     

       6
       4
        
       , cryptography

     

       7
       5
        
       , fetchPypi

     

       8
       6
        
       , isodate

     

       9
       9
       -
       , msrest

     

       10
       7
        
       , pythonOlder

     

       11
       8
        
       , typing-extensions

     

       12
       9
        
       }:

     

       13
       10
        
       

     

       14
       11
        
       buildPythonPackage rec {

     

       15
       12
        
         pname = "azure-storage-blob";

     

       16
       16
       -
         version = "12.17.0";

     

       13
       13
       +
         version = "12.18.2";

     

       17
       14
        
         format = "setuptools";

     

       18
       15
        
       

     

       19
       16
        
         disabled = pythonOlder "3.7";

     

       20
       17
        
       

     

       21
       18
        
         src = fetchPypi {

     

       22
       19
        
           inherit pname version;

     

       23
       23
       -
           extension = "zip";

     

       24
       24
       -
           hash = "sha256-wUt4WhcFCzD8MmoxW9rmvEoHiFX0+UpMMDrXSkjcjGM=";

     

       20
       20
       +
           hash = "sha256-4Rk1NImB/8AFuEi1XbJcBPLR+Q4e4zAAZZkGt2PPFMg=";

     

       25
       21
        
         };

     

       26
       22
        
       

     

       27
       23
        
         propagatedBuildInputs = [

     

       28
       28
       -
           azure-common

     

       29
       24
        
           azure-core

     

       30
       30
       -
           azure-storage-common

     

       31
       25
        
           cryptography

     

       32
       26
        
           isodate

     

       33
       33
       -
           msrest

     

       34
       27
        
           typing-extensions

     

       35
       28
        
         ];

     

       36
       29

+2 -2

pkgs/development/python-modules/hap-python/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "hap-python";

     

       20
       20
       -
         version = "4.7.1";

     

       20
       20
       +
         version = "4.8.0";

     

       21
       21
        
         format = "setuptools";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.6";

     
···

       26
       26
        
           owner = "ikalchev";

     

       27
       27
        
           repo = "HAP-python";

     

       28
       28
        
           rev = "refs/tags/${version}";

     

       29
       29
       -
           hash = "sha256-M/STfco+Bx+KxBT1lUIrYyGSjBcPw2UVX02gNOROke4=";

     

       29
       29
       +
           hash = "sha256-1NLLNE4LgV0r45nc21xCAAaKuH6bQm2YQWlxzhgajSI=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/localstack/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "localstack";

     

       23
       23
       -
         version = "2.2.0";

     

       23
       23
       +
         version = "2.3.0";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "localstack";

     

       27
       27
        
           repo = "localstack";

     

       28
       28
        
           rev = "refs/tags/v${version}";

     

       29
       29
       -
           hash = "sha256-hlK3pltajFRAtiwLOJQNmxRfoRAX5Jccygglbhb45O8=";

     

       29
       29
       +
           hash = "sha256-Sdyl/ccyhKRP5eb866ly1ZJrrFSQMLdX22R7UNRfDCA=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/losant-rest/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "losant-rest";

     

       12
       12
       -
         version = "1.19.0";

     

       12
       12
       +
         version = "1.19.1";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
           owner = "Losant";

     

       19
       19
        
           repo = "losant-rest-python";

     

       20
       20
        
           rev = "v${version}";

     

       21
       21
       -
           hash = "sha256-Kr+L8zHcutpxzqvwQ10iebHiwBIT+sZiiT38G6O/joY=";

     

       21
       21
       +
           hash = "sha256-xCC0AEiHrulxNdBf59ap9oKh/mF1u9IzZsPYFJeHNR0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/pydrawise/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "pydrawise";

     

       20
       20
       -
         version = "2023.9.4";

     

       20
       20
       +
         version = "2023.10.0";

     

       21
       21
        
         format = "pyproject";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.10";

     
···

       26
       26
        
           owner = "dknowles2";

     

       27
       27
        
           repo = "pydrawise";

     

       28
       28
        
           rev = "refs/tags/${version}";

     

       29
       29
       -
           hash = "sha256-e6S5osxNh61KSLEq8NWZadXEcZT8DCKBavuIQjyJgAA=";

     

       29
       29
       +
           hash = "sha256-CSjYLiOvnm1kFp4DL3w/YmAsDcbaCfLfGT0xUZy+GZ0=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+17 -4

pkgs/development/python-modules/rjsmin/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       2
       7
        
       buildPythonPackage rec {

     

       3
       8
        
         pname = "rjsmin";

     

       4
       4
       -
         version = "1.2.1";

     

       9
       9
       +
         version = "1.2.2";

     

       10
       10
       +
         format = "setuptools";

     

       11
       11
       +
       

     

       12
       12
       +
         disabled = pythonOlder "3.7";

     

       5
       13
        
       

     

       6
       14
        
         src = fetchPypi {

     

       7
       15
        
           inherit pname version;

     

       8
       8
       -
           hash = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE=";

     

       16
       16
       +
           hash = "sha256-jBvNghFD/s8jJCAStV4TYQhAqDnNRns1jxY1kBDWLa4=";

     

       9
       17
        
         };

     

       10
       18
        
       

     

       11
       19
        
         # The package does not ship tests, and the setup machinary confuses

     

       12
       20
        
         # tests auto-discovery

     

       13
       21
        
         doCheck = false;

     

       14
       22
        
       

     

       23
       23
       +
         pythonImportsCheck = [

     

       24
       24
       +
           "rjsmin"

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       15
       27
        
         meta = with lib; {

     

       28
       28
       +
           description = "Module to minify Javascript";

     

       16
       29
        
           homepage = "http://opensource.perlig.de/rjsmin/";

     

       17
       30
        
           license = licenses.asl20;

     

       18
       18
       -
           description = "Javascript minifier written in python";

     

       31
       31
       +
           maintainers = with maintainers; [ ];

     

       19
       32
        
         };

     

       20
       33
        
       }

+2 -2

pkgs/development/python-modules/simple-websocket/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "simple-websocket";

     

       12
       12
       -
         version = "0.10.1";

     

       12
       12
       +
         version = "1.0.0";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "miguelgrinberg";

     

       17
       17
        
           repo = "simple-websocket";

     

       18
       18
        
           rev = "refs/tags/v${version}";

     

       19
       19
       -
           hash = "sha256-OdgMYi2UobIlE4cDl5aNtVaFiHPTpf5TcuohG+TCSpg=";

     

       19
       19
       +
           hash = "sha256-5dUZnbjHzH1sQ93CbFdEoW9j2zY4Z+8wNsYfmOrgC8E=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/twilio/default.nix

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "twilio";

     

       21
       21
       -
         version = "8.9.0";

     

       21
       21
       +
         version = "8.9.1";

     

       22
       22
        
         format = "setuptools";

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.7";

     
···

       27
       27
        
           owner = "twilio";

     

       28
       28
        
           repo = "twilio-python";

     

       29
       29
        
           rev = "refs/tags/${version}";

     

       30
       30
       -
           hash = "sha256-apdLWv4UV4MTAx+kyi/MaOibmBYjwMamaI9b6IGKIl0=";

     

       30
       30
       +
           hash = "sha256-F+0nYZIvZVH0QuEkuiV2lwA62r6T/amWFWg7rfBqddU=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

+3 -3

pkgs/development/tools/goa/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "goa";

     

       8
       8
       -
         version = "3.13.0";

     

       8
       8
       +
         version = "3.13.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "goadesign";

     

       12
       12
        
           repo = "goa";

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-iGp3Nkew1Xrvq9Hvhu645e4oguZaHxCXi+mJkdS1mp8=";

     

       14
       14
       +
           sha256 = "sha256-TGTFfwkRvrE2sbqPqx1YKR2w9vZ5veYEV+8CRZPWT5Y=";

     

       15
       15
        
         };

     

       16
       16
       -
         vendorHash = "sha256-QtMBJk0T8+ExX5S/DvltHQfxET5bo563pJoalBx4SAs=";

     

       16
       16
       +
         vendorHash = "sha256-Twoafjo1ZBzrXZFPZn5uz+khZ3nNTbMVaqxdNIRXRQ4=";

     

       17
       17
        
       

     

       18
       18
        
         subPackages = [ "cmd/goa" ];

     

       19
       19

+3 -3

pkgs/development/tools/misc/pest-ide-tools/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "pest-ide-tools";

     

       11
       11
       -
         version = "0.3.3";

     

       12
       12
       -
         cargoSha256 = "sha256-TXsRGkhswxxLCPOk1qMTvDjs4de1sClRJMr/0o6u4Pg=";

     

       11
       11
       +
         version = "0.3.6";

     

       12
       12
       +
         cargoSha256 = "sha256-uFcEE5Hlb0fhOH0birqeH+hOuAyZVjQOYFhoMdR8czM=";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "pest-parser";

     

       16
       16
        
           repo = "pest-ide-tools";

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-XAdQQFU8ZF0zarqCB6WlhpZVNqNyX6e4np4Wjalhobo=";

     

       18
       18
       +
           sha256 = "sha256-SymtMdj7QVOEiSeTjmVidejFeGK8swnM6nfT7u18URs=";

     

       19
       19
        
         };

     

       20
       20
        
         nativeBuildInputs = [ pkg-config ];

     

       21
       21
        
         buildInputs = [ openssl ];

+2 -2

pkgs/development/tools/zprint/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGraalvmNativeImage rec {

     

       4
       4
        
         pname = "zprint";

     

       5
       5
       -
         version = "1.2.7";

     

       5
       5
       +
         version = "1.2.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";

     

       9
       9
       -
           sha256 = "sha256-C2WEzF7Xl37/LDlk6f77/WcWNadE0zAfzxEw+RTRGto=";

     

       9
       9
       +
           sha256 = "sha256-o0yoW45a5r+sTGvjEqr5VZgQKm72qsPH/kbLTbMTgEM=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         extraNativeImageBuildArgs = [

+24 -1

pkgs/os-specific/linux/device-tree/default.nix

···

       1
       1
       -
       { lib, stdenvNoCC, dtc }:

     

       1
       1
       +
       { lib, stdenv, stdenvNoCC, dtc }:

     

       2
       2
        
       

     

       3
       3
        
       with lib; {

     

       4
       4
       +
         # Compile single Device Tree overlay source

     

       5
       5
       +
         # file (.dts) into its compiled variant (.dtb)

     

       6
       6
       +
         compileDTS = ({

     

       7
       7
       +
           name,

     

       8
       8
       +
           dtsFile,

     

       9
       9
       +
           includePaths ? [],

     

       10
       10
       +
           extraPreprocessorFlags ? []

     

       11
       11
       +
         }: stdenv.mkDerivation {

     

       12
       12
       +
           inherit name;

     

       13
       13
       +
       

     

       14
       14
       +
           nativeBuildInputs = [ dtc ];

     

       15
       15
       +
       

     

       16
       16
       +
           buildCommand =

     

       17
       17
       +
             let

     

       18
       18
       +
               includeFlagsStr = lib.concatMapStringsSep " " (includePath: "-I${includePath}") includePaths;

     

       19
       19
       +
               extraPreprocessorFlagsStr = lib.concatStringsSep " " extraPreprocessorFlags;

     

       20
       20
       +
             in

     

       21
       21
       +
             ''

     

       22
       22
       +
               $CC -E -nostdinc ${includeFlagsStr} -undef -D__DTS__ -x assembler-with-cpp ${extraPreprocessorFlagsStr} ${dtsFile} | \

     

       23
       23
       +
               dtc -I dts -O dtb -@ -o $out

     

       24
       24
       +
             '';

     

       25
       25
       +
         });

     

       26
       26
       +
       

     

       4
       27
        
         applyOverlays = (base: overlays': stdenvNoCC.mkDerivation {

     

       5
       28
        
           name = "device-tree-overlays";

     

       6
       29
        
           nativeBuildInputs = [ dtc ];

-10

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       59
       59
        
               "sha256": "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653",

     

       60
       60
        
               "version": "6.1.54"

     

       61
       61
        
           },

     

       62
       62
       -
           "6.4": {

     

       63
       63
       -
               "patch": {

     

       64
       64
       -
                   "extra": "-hardened1",

     

       65
       65
       -
                   "name": "linux-hardened-6.4.16-hardened1.patch",

     

       66
       66
       -
                   "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9",

     

       67
       67
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch"

     

       68
       68
       -
               },

     

       69
       69
       -
               "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln",

     

       70
       70
       -
               "version": "6.4.16"

     

       71
       71
       -
           },

     

       72
       62
        
           "6.5": {

     

       73
       63
        
               "patch": {

     

       74
       64
        
                   "extra": "-hardened1",

+1 -3

pkgs/os-specific/linux/zfs/unstable.nix

···

       15
       15
        
           then kernel.kernelOlder "6.5"

     

       16
       16
        
           else kernel.kernelOlder "6.2";

     

       17
       17
        
       

     

       18
       18
       -
         latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM

     

       19
       19
       -
         then linuxKernel.packages.linux_6_4

     

       20
       20
       -
         else linuxKernel.packages.linux_6_1;

     

       18
       18
       +
         latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;

     

       21
       19
        
       

     

       22
       20
        
         # this package should point to a version / git revision compatible with the latest kernel release

     

       23
       21
        
         # IMPORTANT: Always use a tagged release candidate or commits from the

+3 -1

pkgs/servers/frr/default.nix

···

       102
       102
        
           pkg-config

     

       103
       103
        
           python3.pkgs.sphinx

     

       104
       104
        
           texinfo

     

       105
       105
       +
           protobufc

     

       105
       106
        
         ];

     

       106
       107
        
       

     

       107
       108
        
         buildInputs = [

     
···

       227
       228
        
           '';

     

       228
       229
        
           license = with licenses; [ gpl2Plus lgpl21Plus ];

     

       229
       230
        
           maintainers = with maintainers; [ woffs thillux ];

     

       230
       230
       -
           platforms = platforms.unix;

     

       231
       231
       +
           # adapt to platforms stated in http://docs.frrouting.org/en/latest/overview.html#supported-platforms

     

       232
       232
       +
           platforms = (platforms.linux ++ platforms.freebsd ++ platforms.netbsd ++ platforms.openbsd);

     

       231
       233
        
         };

     

       232
       234
        
       

     

       233
       235
        
         passthru.tests = { inherit (nixosTests) frr; };

+3 -3

pkgs/servers/monitoring/prometheus/default.nix

···

       31
       31
        
       }:

     

       32
       32
        
       

     

       33
       33
        
       let

     

       34
       34
       -
         version = "2.47.0";

     

       34
       34
       +
         version = "2.47.1";

     

       35
       35
        
         webUiStatic = fetchurl {

     

       36
       36
        
           url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";

     

       37
       37
       -
           hash = "sha256-MjnTFDHMLDML8crhtCfAv3aK67vwLEUVglIzXgc5mBU=";

     

       37
       37
       +
           hash = "sha256-NgVwxKhag/acE5sdP3910CuGWVWfmTSnXSSztEjLobs=";

     

       38
       38
        
         };

     

       39
       39
        
       in

     

       40
       40
        
       buildGoModule rec {

     
···

       47
       47
        
           owner = "prometheus";

     

       48
       48
        
           repo = "prometheus";

     

       49
       49
        
           rev = "v${version}";

     

       50
       50
       -
           hash = "sha256-I0tl7DlZ1Yp5nHm3JK1hP+u+yLGBjwubfaTxUvXSDUE=";

     

       50
       50
       +
           hash = "sha256-AK2DLFDWrpnkvOUb9dFYjdAa6+Vm6ftZQpexy/FULrs=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         vendorHash = "sha256-qFp+tMHhXmJGY9MSukVRjBVzaIBgfxB0BorWiuInMwk=";

+2 -2

pkgs/servers/shairport-sync/default.nix

···

       40
       40
        
       

     

       41
       41
        
       stdenv.mkDerivation rec {

     

       42
       42
        
         pname = "shairport-sync";

     

       43
       43
       -
         version = "4.2";

     

       43
       43
       +
         version = "4.3.1";

     

       44
       44
        
       

     

       45
       45
        
         src = fetchFromGitHub {

     

       46
       46
        
           repo = "shairport-sync";

     

       47
       47
        
           owner = "mikebrady";

     

       48
       48
        
           rev = "refs/tags/${version}";

     

       49
       49
       -
           hash = "sha256-ru2iaXSgS+w2ktqGLGC9SiYztkmmOQVzHaeLwMqvMzk=";

     

       49
       49
       +
           hash = "sha256-Yj0SKMKACj2B/ADPkUzO4EvaYZX39erKmjaTsr5UN0s=";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
        
         nativeBuildInputs = [

+2 -2

pkgs/servers/sickbeard/sickgear.nix

···

       4
       4
        
         pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);

     

       5
       5
        
       in stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "sickgear";

     

       7
       7
       -
         version = "3.29.3";

     

       7
       7
       +
         version = "3.30.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "SickGear";

     

       11
       11
        
           repo = "SickGear";

     

       12
       12
        
           rev = "release_${version}";

     

       13
       13
       -
           hash = "sha256-aPpzWGVQS7waPJXHSdL/6cBhARgpE7/uIdvSadvsB0A=";

     

       13
       13
       +
           hash = "sha256-Y9FXaDODeuMaXeqmfBCd96JgwrqDe5k6RCtGKvTOMKw=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         patches = [

+2 -2

pkgs/servers/web-apps/sogo/default.nix

···

       5
       5
        
       , libwbxml }:

     

       6
       6
        
       gnustep.stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "SOGo";

     

       8
       8
       -
         version = "5.8.0";

     

       8
       8
       +
         version = "5.9.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "inverse-inc";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "SOGo-${version}";

     

       14
       14
       -
           hash = "sha256-lHUEV5yYLs3oc8Arl3KX8G/OEAoLmS7pRLCGsRAJAr4=";

     

       14
       14
       +
           hash = "sha256-Jv+gOWNcjdXk51I22+znYLTUWDEdAOAmRJql9P+/OuQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];

+13 -7

pkgs/tools/admin/azure-cli/default.nix

···

       1
       1
       -
       { stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , python3

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , installShellFiles

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       let

     

       4
       4
       -
         version = "2.52.0";

     

       10
       10
       +
         version = "2.53.0";

     

       5
       11
        
       

     

       6
       12
        
         src = fetchFromGitHub {

     

       7
       13
        
           name = "azure-cli-${version}-src";

     

       8
       14
        
           owner = "Azure";

     

       9
       15
        
           repo = "azure-cli";

     

       10
       16
        
           rev = "azure-cli-${version}";

     

       11
       11
       -
           hash = "sha256-wa0LmBMv3eQIsWEKMAHks+TvBZmTdFepPGG5XQRvZXk=";

     

       17
       17
       +
           hash = "sha256-5c2Z0EJnKyLqWiz8/BEFAdy5A0+sBbai7UQ2KPL1jr8=";

     

       12
       18
        
         };

     

       13
       19
        
       

     

       14
       20
        
         # put packages that needs to be overridden in the py package scope

     
···

       28
       34
        
             --replace "chardet~=3.0.4" "chardet" \

     

       29
       35
        
             --replace "javaproperties~=0.5.1" "javaproperties" \

     

       30
       36
        
             --replace "scp~=0.13.2" "scp" \

     

       31
       31
       -
             --replace "packaging>=20.9,<22.0" "packaging" \

     

       32
       37
        
             --replace "fabric~=2.4" "fabric"

     

       33
       38
        
       

     

       34
       39
        
           # remove namespace hacks

     

       35
       40
        
           # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well

     

       36
       41
        
           sed -i setup.py \

     

       37
       37
       -
             -e '/azure-cli-command_modules-nspkg/d' \

     

       38
       38
       -
             -e '/azure-cli-nspkg/d' \

     

       39
       42
        
             -e '/urllib3/d'

     

       40
       43
        
         '';

     

       41
       44
        
       

     

       42
       42
       -
         nativeBuildInputs = [ installShellFiles ];

     

       45
       45
       +
         nativeBuildInputs = [

     

       46
       46
       +
           installShellFiles

     

       47
       47
       +
         ];

     

       43
       48
        
       

     

       44
       49
        
         propagatedBuildInputs = with py.pkgs; [

     

       45
       50
        
           azure-appconfiguration

     
···

       128
       133
        
           azure-mgmt-web

     

       129
       134
        
           azure-multiapi-storage

     

       130
       135
        
           azure-storage-blob

     

       136
       136
       +
           azure-storage-common

     

       131
       137
        
           azure-synapse-accesscontrol

     

       132
       138
        
           azure-synapse-artifacts

     

       133
       139
        
           azure-synapse-managedprivateendpoints

+10 -20

pkgs/tools/admin/azure-cli/python-packages.nix

···

       1
       1
       -
       { stdenv, python3, fetchPypi, src, version }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , python3

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , src

     

       5
       5
       +
       , version

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       let

     

       4
       9
        
         buildAzureCliPackage = with py.pkgs; buildPythonPackage;

     
···

       60
       65
        
                 tabulate

     

       61
       66
        
               ];

     

       62
       67
        
       

     

       63
       63
       -
               postPatch = ''

     

       64
       64
       -
                 substituteInPlace setup.py \

     

       65
       65
       -
                   --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \

     

       66
       66
       -
                   --replace "cryptography>=3.2,<3.4" "cryptography" \

     

       67
       67
       -
                   --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" \

     

       68
       68
       -
                   --replace "msal[broker]==1.24.0b1" "msal[broker]" \

     

       69
       69
       -
                   --replace "packaging>=20.9,<22.0" "packaging"

     

       70
       70
       -
               '';

     

       71
       68
        
               nativeCheckInputs = with self; [ pytest ];

     

       69
       69
       +
       

     

       72
       70
        
               doCheck = stdenv.isLinux;

     

       71
       71
       +
       

     

       73
       72
        
               # ignore tests that does network call, or assume powershell

     

       74
       73
        
               checkPhase = ''

     

       75
       74
        
                 rm azure/{,cli/}__init__.py

     
···

       205
       204
        
             azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"

     

       206
       205
        
               "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r";

     

       207
       206
        
       

     

       208
       208
       -
             azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.0.0" "zip"

     

       209
       209
       -
               "sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE=";

     

       207
       207
       +
             azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip"

     

       208
       208
       +
               "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM=";

     

       210
       209
        
       

     

       211
       210
        
             azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"

     

       212
       211
        
               "sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg=";

     
···

       348
       347
        
                 inherit version;

     

       349
       348
        
                 hash = "sha256-0Lti2L+OGWuQPzlxukr6RI5P4U6DlOv83ZQdhNYuyv4=";

     

       350
       349
        
                 extension = "zip";

     

       351
       351
       -
               };

     

       352
       352
       -
             });

     

       353
       353
       -
       

     

       354
       354
       -
             azure-storage-blob = super.azure-storage-blob.overrideAttrs (oldAttrs: rec {

     

       355
       355
       -
               version = "1.5.0";

     

       356
       356
       -
               src = fetchPypi {

     

       357
       357
       -
                 inherit (oldAttrs) pname;

     

       358
       358
       -
                 inherit version;

     

       359
       359
       -
                 hash = "sha256-8YeoeOehkfTgmBWZBPcrQUbPcOGquvZISrS6cvxvJSw=";

     

       360
       350
        
               };

     

       361
       351
        
             });

     

       362
       352

+2 -2

pkgs/tools/audio/audiowaveform/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "audiowaveform";

     

       5
       5
       -
         version = "1.8.1";

     

       5
       5
       +
         version = "1.9.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bbc";

     

       9
       9
        
           repo = "audiowaveform";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-MbOQY1Yvtwuy6IPV1BfwwRBhEQIzQ7mPzedE74xsQSk=";

     

       11
       11
       +
           sha256 = "sha256-qnidR+V2CwDnztUv73k72lVyH+B1yfb3c7BLus4P6Wk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake gtest ];

+2 -2

pkgs/tools/misc/calamares-nixos-extensions/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "calamares-nixos-extensions";

     

       5
       5
       -
         version = "0.3.13";

     

       5
       5
       +
         version = "0.3.14";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "NixOS";

     

       9
       9
        
           repo = "calamares-nixos-extensions";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "YCtm7OzPdhtV7/fQijJfZvZyX7oEk92F34CK2lnRHnI=";

     

       11
       11
       +
           hash = "sha256-wRKZ80yU3WsUkGn5/ft4wDR22s39/WTxTrjFE0/9mlc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

+6 -6

pkgs/tools/typesetting/scdoc/default.nix pkgs/by-name/sc/scdoc/package.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation (finalAttrs: {

     

       8
       8
        
         pname = "scdoc";

     

       9
       9
       -
         version = "1.11.2";

     

       9
       9
       +
         version = "1.11.2-unstable-2023-03-08";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromSourcehut {

     

       12
       12
        
           owner = "~sircmpwn";

     

       13
       13
        
           repo = "scdoc";

     

       14
       14
       -
           rev = finalAttrs.version;

     

       15
       15
       -
           hash = "sha256-2NVC+1in1Yt6/XGcHXP+V4AAz8xW/hSq9ctF/Frdgh0=";

     

       14
       14
       +
           rev = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61";

     

       15
       15
       +
           hash = "sha256-jIYygjUXP/6o5d9drlZjdr25KjEQx8oy4TaQwQEu8fM=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         outputs = [ "out" "man" "dev" ];

     

       19
       19
        
       

     

       20
       20
        
         postPatch = ''

     

       21
       21
        
           substituteInPlace Makefile \

     

       22
       22
       -
             --replace "-static" ""

     

       22
       22
       +
             --replace "LDFLAGS+=-static" "LDFLAGS+="

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         makeFlags = [

     
···

       33
       33
        
         meta = {

     

       34
       34
        
           description = "A simple man page generator written in C99 for POSIX systems";

     

       35
       35
        
           homepage = "https://git.sr.ht/~sircmpwn/scdoc";

     

       36
       36
       -
           changelog = "https://git.sr.ht/~sircmpwn/scdoc/refs/${finalAttrs.version}";

     

       36
       36
       +
           changelog = "https://git.sr.ht/~sircmpwn/scdoc/refs/${finalAttrs.src.rev}";

     

       37
       37
        
           license = lib.licenses.mit;

     

       38
       38
       +
           mainProgram = "scdoc";

     

       38
       39
        
           maintainers = with lib.maintainers; [ primeos AndersonTorres ];

     

       39
       40
        
           platforms = lib.platforms.unix;

     

       40
       40
       -
           mainProgram = "scdoc";

     

       41
       41
        
         };

     

       42
       42
        
       })

-4

pkgs/top-level/all-packages.nix

···

       12992
       12992
        
       

     

       12993
       12993
        
         scdl = callPackage ../tools/misc/scdl { };

     

       12994
       12994
        
       

     

       12995
       12995
       -
         scdoc = callPackage ../tools/typesetting/scdoc { };

     

       12996
       12996
       -
       

     

       12997
       12995
        
         scorecard = callPackage ../tools/security/scorecard { };

     

       12998
       12996
        
       

     

       12999
       12997
        
         scream = callPackage ../applications/audio/scream { };

     
···

       28336
       28334
        
         linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;

     

       28337
       28335
        
         linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened;

     

       28338
       28336
        
         linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;

     

       28339
       28339
       -
         linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened;

     

       28340
       28340
       -
         linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened;

     

       28341
       28337
        
         linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened;

     

       28342
       28338
        
         linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened;

     

       28343
       28339

+11 -15

pkgs/top-level/linux-kernels.nix

···

       183
       183
        
             ];

     

       184
       184
        
           };

     

       185
       185
        
       

     

       186
       186
       -
           linux_6_4 = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       187
       187
       -
             branch = "6.4";

     

       188
       188
       -
             kernelPatches = [

     

       189
       189
       -
               kernelPatches.bridge_stp_helper

     

       190
       190
       -
               kernelPatches.request_key_helper

     

       191
       191
       -
               kernelPatches.dell_xps_regression

     

       192
       192
       -
             ];

     

       193
       193
       -
           };

     

       194
       194
       -
       

     

       195
       186
        
           linux_6_5 = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       196
       187
        
             branch = "6.5";

     

       197
       188
        
             kernelPatches = [

     
···

       218
       209
        
       

     

       219
       210
        
           linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {

     

       220
       211
        
             # Pinned on the last version which Kent's commits can be cleany rebased up.

     

       221
       221
       -
             kernel = linux_6_4;

     

       222
       222
       -
             kernelPatches = linux_6_4.kernelPatches;

     

       223
       223
       -
          };

     

       212
       212
       +
             kernel = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       213
       213
       +
               branch = "6.4";

     

       214
       214
       +
             };

     

       215
       215
       +
             kernelPatches = [

     

       216
       216
       +
               kernelPatches.bridge_stp_helper

     

       217
       217
       +
               kernelPatches.request_key_helper

     

       218
       218
       +
               kernelPatches.dell_xps_regression

     

       219
       219
       +
             ];

     

       220
       220
       +
           };

     

       224
       221
        
       

     

       225
       222
        
           linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {

     

       226
       223
        
             kernelPatches = [

     
···

       281
       278
        
           linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };

     

       282
       279
        
           linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

     

       283
       280
        
           linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };

     

       284
       284
       -
           linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { };

     

       285
       281
        
           linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { };

     

       286
       282
        
       

     

       287
       283
        
         } // lib.optionalAttrs config.allowAliases {

     
···

       291
       287
        
           linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";

     

       292
       288
        
           linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream";

     

       293
       289
        
           linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream";

     

       290
       290
       +
           linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream";

     

       294
       291
        
       

     

       295
       292
        
           linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";

     

       296
       293
        
       

     
···

       601
       598
        
           linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

     

       602
       599
        
           linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);

     

       603
       600
        
           linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

     

       604
       604
       -
           linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4);

     

       605
       601
        
           linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5);

     

       606
       602
        
         } // lib.optionalAttrs config.allowAliases {

     

       607
       603
        
           linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08

     
···

       610
       606
        
           linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20

     

       611
       607
        
           linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26

     

       612
       608
        
           linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22

     

       609
       609
       +
           linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02

     

       613
       610
        
         };

     

       614
       611
        
       

     

       615
       612
        
         rtPackages = {

     
···

       641
       638
        
           linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);

     

       642
       639
        
           linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);

     

       643
       640
        
           linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);

     

       644
       644
       -
           linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened);

     

       645
       641
        
           linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened);

     

       646
       642
        
       

     

       647
       643
        
           linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);