commit 48ebff75fbdf2c98171ee5b3b0f3f838587a2cdf · pyrox.dev/nixpkgs

+1 -1

maintainers/maintainer-list.nix

···

       5322
       5322
        
         };

     

       5323
       5323
        
         danth = {

     

       5324
       5324
        
           name = "Daniel Thwaites";

     

       5325
       5325
       -
           email = "danthwaites30@btinternet.com";

     

       5325
       5325
       +
           email = "danth@danth.me";

     

       5326
       5326
        
           matrix = "@danth:danth.me";

     

       5327
       5327
        
           github = "danth";

     

       5328
       5328
        
           githubId = 28959268;

+2 -2

pkgs/applications/video/vdr/markad/default.nix

···

       7
       7
        
       }:

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "vdr-markad";

     

       10
       10
       -
         version = "4.2.8";

     

       10
       10
       +
         version = "4.2.10";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           repo = "vdr-plugin-markad";

     

       14
       14
        
           owner = "kfb77";

     

       15
       15
       -
           hash = "sha256-yv44hC1p56jRg3DRaeFWjnUHeooHhnZVXJPhVNy1mwQ=";

     

       15
       15
       +
           hash = "sha256-qnE/0gnuY982qYz3ouUKFPURNkxM0XKWqf3w5ZwczV0=";

     

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

     

       17
       17
        
         };

     

       18
       18

+2 -2

pkgs/applications/video/vdr/streamdev/default.nix

···

       6
       6
        
       }:

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "vdr-streamdev";

     

       9
       9
       -
         version = "0.6.3";

     

       9
       9
       +
         version = "0.6.4";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "vdr-projects";

     

       13
       13
        
           repo = "vdr-plugin-streamdev";

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           sha256 = "sha256-12sASyFAnSuP2xQzr1KL/Am52ez6hiOUH/0zFH2bxhc=";

     

       15
       15
       +
           sha256 = "sha256-fFnRDe3n/ltanRvLhrQDB6aV0UmyuEJgNUip0gKBrBA=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # configure don't accept argument --prefix

+3 -3

pkgs/by-name/ev/evcc/package.nix

···

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       let

     

       20
       20
       -
         version = "0.200.9";

     

       20
       20
       +
         version = "0.201.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "evcc-io";

     

       24
       24
        
           repo = "evcc";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-HIqehST3H4shxEdDyGYLkUXZVbHjHfdzyZ0vCGslozU=";

     

       26
       26
       +
           hash = "sha256-Hw2TIMcKkeSUEKtTwJezCRMUvicrZUjT9UmTvDgKy2s=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04=";

     
···

       52
       52
        
       

     

       53
       53
        
         npmDeps = fetchNpmDeps {

     

       54
       54
        
           inherit src;

     

       55
       55
       -
           hash = "sha256-VYAJO2HeswhBlCVKi08frkvhKc/AFepmrSGY4JccBZE=";

     

       55
       55
       +
           hash = "sha256-IOpT7YH85iHCK9UqKoomdKQBsPFm4MJ0bbEFbIIxVTc=";

     

       56
       56
        
         };

     

       57
       57
        
       

     

       58
       58
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/he/hexxy/package.nix

···

       6
       6
        
       }:

     

       7
       7
        
       buildGoModule {

     

       8
       8
        
         pname = "hexxy";

     

       9
       9
       -
         version = "0-unstable-2024-09-29";

     

       9
       9
       +
         version = "0-unstable-2025-03-16";

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "sweetbbak";

     

       12
       12
        
           repo = "hexxy";

     

       13
       13
        
           # upstream does not publish releases, i.e., there are no tags

     

       14
       14
       -
           rev = "36174e436f9d57421b9e9515db32ca1425c382bd";

     

       15
       15
       -
           hash = "sha256-5r8yaKlRkIcZXubHBMhdGV0u52rs2WnEaWatm+D56Fs=";

     

       14
       14
       +
           rev = "d90f345ba80078b18baf006b3a5aec92d2c330e1";

     

       15
       15
       +
           hash = "sha256-htTGdcJ3oMgfsJ3FH1aRnI2vxMNpBcLksABA75EQUFo=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         vendorHash = "sha256-qkBpSVLWZPRgS9bqOVUWHpyj8z/nheQJON3vJOwPUj4=";

+2 -2

pkgs/by-name/oi/oils-for-unix/package.nix

···

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "oils-for-unix";

     

       21
       21
       -
         version = "0.27.0";

     

       21
       21
       +
         version = "0.28.0";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz";

     

       25
       25
       -
           hash = "sha256-q1ORYt/8FpT9WuicAOQFzF97c2YBWexbJpvt6mMd8X0=";

     

       25
       25
       +
           hash = "sha256-Jm0UsW2Q1KB/53SIHq+g7Nu8hBHPHHX4tuJWNwtmjjU=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

+3 -3

pkgs/by-name/pi/pinact/package.nix

···

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
         pname = "pinact";

     

       11
       11
       -
         version = "1.2.1";

     

       11
       11
       +
         version = "1.2.2";

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "suzuki-shunsuke";

     

       14
       14
        
           repo = "pinact";

     

       15
       15
        
           tag = "v${version}";

     

       16
       16
       -
           hash = "sha256-WBKe398W9NXwZwiK6P5SDay45bFGkOf1+cmGlS+fWRc=";

     

       16
       16
       +
           hash = "sha256-p2kixWkJgQYanbsShMtDWoY6AT0WrTVLI+Borzm8XLA=";

     

       17
       17
        
         };

     

       18
       18
        
         mainProgram = "pinact";

     

       19
       19
        
       in

     

       20
       20
        
       buildGoModule {

     

       21
       21
        
         inherit pname version src;

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-Ix7C+Xs8Y4LoI06Xb5qVGwoJ+J87wTjYjmQp6aAeFhw=";

     

       23
       23
       +
         vendorHash = "sha256-EPQGozC2E+Q+12YBr2xXSzkI/X6bF6NX2kZ8UPh0BXs=";

     

       24
       24
        
       

     

       25
       25
        
         env.CGO_ENABLED = 0;

     

       26
       26

+3 -3

pkgs/by-name/su/supabase-cli/package.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "supabase-cli";

     

       13
       13
       -
         version = "2.17.0";

     

       13
       13
       +
         version = "2.20.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "supabase";

     

       17
       17
        
           repo = "cli";

     

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

     

       19
       19
       -
           hash = "sha256-NkXtpymrEBw5fMaRo1fvcoePuOw0sAROLL5NJsrHELE=";

     

       19
       19
       +
           hash = "sha256-AfRO1dFXy5uvMJR09OWc+TfK6PUQi+fC1ZC5FATKmoU=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-2r1dYUOEA7uj7ZyShz6cgL8Vc6TFKfPp4863i+7x7Ik=";

     

       22
       22
       +
         vendorHash = "sha256-3n2j8zGWudnYLOWn8p/vc4sD/WB7rQxNzZU6CY4Ybik=";

     

       23
       23
        
       

     

       24
       24
        
         ldflags = [

     

       25
       25
        
           "-s"

+5 -5

pkgs/development/compilers/arocc/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         fetchFromGitHub,

     

       4
       4
        
         callPackage,

     

       5
       5
       -
         zig_0_13,

     

       5
       5
       +
         zig_0_14,

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
        
         versions = [

     

       9
       9
        
           {

     

       10
       10
       -
             zig = zig_0_13;

     

       11
       11
       -
             version = "0-unstable-06-01";

     

       10
       10
       +
             zig = zig_0_14;

     

       11
       11
       +
             version = "0-unstable-2025-03-05";

     

       12
       12
        
             src = fetchFromGitHub {

     

       13
       13
        
               owner = "Vexu";

     

       14
       14
        
               repo = "arocc";

     

       15
       15
       -
               rev = "55cb6d1b682b83f75ad4f60e34c6fcd2336e8531";

     

       16
       16
       -
               hash = "sha256-xs3zNQIC5drrQYT4nxL7Q69xSEdbdMv5+3hQpsX3q5A=";

     

       15
       15
       +
               rev = "8c6bab43ba351fc045a1d262d8a8da4a11215e37";

     

       16
       16
       +
               hash = "sha256-J5Cj9UMwAMwH2JGby13FIKl5Qbj4N4XpSSY7zL21aoY=";

     

       17
       17
        
             };

     

       18
       18
        
           }

     

       19
       19
        
         ];

+2 -226

pkgs/development/compilers/llvm/common/default.nix

···

       27
       27
        
         officialRelease ? null,

     

       28
       28
        
         monorepoSrc ? null,

     

       29
       29
        
         version ? null,

     

       30
       30
       +
         patchesFn ? lib.id,

     

       30
       31
        
         # Allows passthrough to packages via newScope. This makes it possible to

     

       31
       32
        
         # do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get

     

       32
       33
        
         # an llvmPackages whose packages are overridden in an internally consistent way.

     
···

       80
       81
        
               name = builtins.baseNameOf p;

     

       81
       82
        
               path =

     

       82
       83
        
                 let

     

       83
       83
       -
                   patches = {

     

       84
       84
       -
                     "clang/gnu-install-dirs.patch" = [

     

       85
       85
       -
                       {

     

       86
       86
       -
                         before = "14";

     

       87
       87
       -
                         path = ../12;

     

       88
       88
       -
                       }

     

       89
       89
       -
                       {

     

       90
       90
       -
                         after = "19";

     

       91
       91
       -
                         path = ../19;

     

       92
       92
       -
                       }

     

       93
       93
       -
                     ];

     

       94
       94
       -
                     "clang/purity.patch" = [

     

       95
       95
       -
                       {

     

       96
       96
       -
                         after = "18";

     

       97
       97
       -
                         path = ../18;

     

       98
       98
       -
                       }

     

       99
       99
       -
                       {

     

       100
       100
       -
                         before = "17";

     

       101
       101
       -
                         after = "15";

     

       102
       102
       -
                         path = ../15;

     

       103
       103
       -
                       }

     

       104
       104
       -
                       {

     

       105
       105
       -
                         before = "16";

     

       106
       106
       -
                         path = ../12;

     

       107
       107
       -
                       }

     

       108
       108
       -
                     ];

     

       109
       109
       -
                     "clang/aarch64-tblgen.patch" = [

     

       110
       110
       -
                       {

     

       111
       111
       -
                         after = "17";

     

       112
       112
       -
                         before = "18";

     

       113
       113
       -
                         path = ../17;

     

       114
       114
       -
                       }

     

       115
       115
       -
                     ];

     

       116
       116
       -
                     "lld/add-table-base.patch" = [

     

       117
       117
       -
                       {

     

       118
       118
       -
                         after = "16";

     

       119
       119
       -
                         path = ../16;

     

       120
       120
       -
                       }

     

       121
       121
       -
                     ];

     

       122
       122
       -
                     "lld/gnu-install-dirs.patch" = [

     

       123
       123
       -
                       {

     

       124
       124
       -
                         after = "18";

     

       125
       125
       -
                         path = ../18;

     

       126
       126
       -
                       }

     

       127
       127
       -
                       {

     

       128
       128
       -
                         before = "14";

     

       129
       129
       -
                         path = ../12;

     

       130
       130
       -
                       }

     

       131
       131
       -
                     ];

     

       132
       132
       -
                     "llvm/gnu-install-dirs.patch" = [

     

       133
       133
       -
                       {

     

       134
       134
       -
                         after = "20";

     

       135
       135
       -
                         path = ../20;

     

       136
       136
       -
                       }

     

       137
       137
       -
                       {

     

       138
       138
       -
                         after = "18";

     

       139
       139
       -
                         before = "20";

     

       140
       140
       -
                         path = ../18;

     

       141
       141
       -
                       }

     

       142
       142
       -
                     ];

     

       143
       143
       -
                     "llvm/gnu-install-dirs-polly.patch" = [

     

       144
       144
       -
                       {

     

       145
       145
       -
                         after = "20";

     

       146
       146
       -
                         path = ../20;

     

       147
       147
       -
                       }

     

       148
       148
       -
                       {

     

       149
       149
       -
                         before = "20";

     

       150
       150
       -
                         after = "18";

     

       151
       151
       -
                         path = ../18;

     

       152
       152
       -
                       }

     

       153
       153
       -
                       {

     

       154
       154
       -
                         before = "18";

     

       155
       155
       -
                         after = "14";

     

       156
       156
       -
                         path = ../14;

     

       157
       157
       -
                       }

     

       158
       158
       -
                     ];

     

       159
       159
       -
                     "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       160
       160
       -
                       {

     

       161
       161
       -
                         before = "17";

     

       162
       162
       -
                         after = "15";

     

       163
       163
       -
                         path = ../15;

     

       164
       164
       -
                       }

     

       165
       165
       -
                       {

     

       166
       166
       -
                         after = "17";

     

       167
       167
       -
                         path = ../17;

     

       168
       168
       -
                       }

     

       169
       169
       -
                     ];

     

       170
       170
       -
                     "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [

     

       171
       171
       -
                       {

     

       172
       172
       -
                         after = "18";

     

       173
       173
       -
                         path = ../18;

     

       174
       174
       -
                       }

     

       175
       175
       -
                       {

     

       176
       176
       -
                         after = "16";

     

       177
       177
       -
                         before = "18";

     

       178
       178
       -
                         path = ../16;

     

       179
       179
       -
                       }

     

       180
       180
       -
                     ];

     

       181
       181
       -
                     "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       182
       182
       -
                       {

     

       183
       183
       -
                         after = "15";

     

       184
       184
       -
                         path = ../15;

     

       185
       185
       -
                       }

     

       186
       186
       -
                     ];

     

       187
       187
       -
                     "libunwind/gnu-install-dirs.patch" = [

     

       188
       188
       -
                       {

     

       189
       189
       -
                         before = "17";

     

       190
       190
       -
                         after = "15";

     

       191
       191
       -
                         path = ../15;

     

       192
       192
       -
                       }

     

       193
       193
       -
                     ];

     

       194
       194
       -
                     "compiler-rt/X86-support-extension.patch" = [

     

       195
       195
       -
                       {

     

       196
       196
       -
                         after = "15";

     

       197
       197
       -
                         path = ../15;

     

       198
       198
       -
                       }

     

       199
       199
       -
                       {

     

       200
       200
       -
                         before = "15";

     

       201
       201
       -
                         path = ../12;

     

       202
       202
       -
                       }

     

       203
       203
       -
                     ];

     

       204
       204
       -
                     "compiler-rt/armv6-scudo-libatomic.patch" = [

     

       205
       205
       -
                       {

     

       206
       206
       -
                         after = "19";

     

       207
       207
       -
                         path = ../19;

     

       208
       208
       -
                       }

     

       209
       209
       -
                       {

     

       210
       210
       -
                         after = "15";

     

       211
       211
       -
                         before = "19";

     

       212
       212
       -
                         path = ../15;

     

       213
       213
       -
                       }

     

       214
       214
       -
                       {

     

       215
       215
       -
                         before = "15";

     

       216
       216
       -
                         path = ../14;

     

       217
       217
       -
                       }

     

       218
       218
       -
                     ];

     

       219
       219
       -
                     "compiler-rt/armv7l.patch" = [

     

       220
       220
       -
                       {

     

       221
       221
       -
                         before = "15";

     

       222
       222
       -
                         after = "13";

     

       223
       223
       -
                         path = ../13;

     

       224
       224
       -
                       }

     

       225
       225
       -
                     ];

     

       226
       226
       -
                     "compiler-rt/gnu-install-dirs.patch" = [

     

       227
       227
       -
                       {

     

       228
       228
       -
                         before = "14";

     

       229
       229
       -
                         path = ../12;

     

       230
       230
       -
                       }

     

       231
       231
       -
                       {

     

       232
       232
       -
                         after = "13";

     

       233
       233
       -
                         before = "15";

     

       234
       234
       -
                         path = ../14;

     

       235
       235
       -
                       }

     

       236
       236
       -
                       {

     

       237
       237
       -
                         after = "15";

     

       238
       238
       -
                         before = "17";

     

       239
       239
       -
                         path = ../15;

     

       240
       240
       -
                       }

     

       241
       241
       -
                       {

     

       242
       242
       -
                         after = "16";

     

       243
       243
       -
                         path = ../17;

     

       244
       244
       -
                       }

     

       245
       245
       -
                     ];

     

       246
       246
       -
                     "compiler-rt/darwin-targetconditionals.patch" = [

     

       247
       247
       -
                       {

     

       248
       248
       -
                         after = "13";

     

       249
       249
       -
                         path = ../13;

     

       250
       250
       -
                       }

     

       251
       251
       -
                     ];

     

       252
       252
       -
                     "compiler-rt/codesign.patch" = [

     

       253
       253
       -
                       {

     

       254
       254
       -
                         after = "13";

     

       255
       255
       -
                         path = ../13;

     

       256
       256
       -
                       }

     

       257
       257
       -
                     ];

     

       258
       258
       -
                     "compiler-rt/normalize-var.patch" = [

     

       259
       259
       -
                       {

     

       260
       260
       -
                         after = "16";

     

       261
       261
       -
                         path = ../16;

     

       262
       262
       -
                       }

     

       263
       263
       -
                       {

     

       264
       264
       -
                         before = "16";

     

       265
       265
       -
                         path = ../12;

     

       266
       266
       -
                       }

     

       267
       267
       -
                     ];

     

       268
       268
       -
                     "lldb/procfs.patch" = [

     

       269
       269
       -
                       {

     

       270
       270
       -
                         after = "15";

     

       271
       271
       -
                         path = ../15;

     

       272
       272
       -
                       }

     

       273
       273
       -
                       {

     

       274
       274
       -
                         before = "15";

     

       275
       275
       -
                         path = ../12;

     

       276
       276
       -
                       }

     

       277
       277
       -
                     ];

     

       278
       278
       -
                     "lldb/resource-dir.patch" = [

     

       279
       279
       -
                       {

     

       280
       280
       -
                         before = "16";

     

       281
       281
       -
                         path = ../12;

     

       282
       282
       -
                       }

     

       283
       283
       -
                     ];

     

       284
       284
       -
                     "openmp/fix-find-tool.patch" = [

     

       285
       285
       -
                       {

     

       286
       286
       -
                         after = "17";

     

       287
       287
       -
                         before = "19";

     

       288
       288
       -
                         path = ../17;

     

       289
       289
       -
                       }

     

       290
       290
       -
                     ];

     

       291
       291
       -
                     "openmp/run-lit-directly.patch" = [

     

       292
       292
       -
                       {

     

       293
       293
       -
                         after = "16";

     

       294
       294
       -
                         path = ../16;

     

       295
       295
       -
                       }

     

       296
       296
       -
                       {

     

       297
       297
       -
                         after = "14";

     

       298
       298
       -
                         before = "16";

     

       299
       299
       -
                         path = ../14;

     

       300
       300
       -
                       }

     

       301
       301
       -
                     ];

     

       302
       302
       -
                     "libclc/use-default-paths.patch" = [

     

       303
       303
       -
                       {

     

       304
       304
       -
                         after = "19";

     

       305
       305
       -
                         path = ../19;

     

       306
       306
       -
                       }

     

       307
       307
       -
                     ];

     

       308
       308
       -
                   };

     

       84
       84
       +
                   patches = args.patchesFn (import ./patches.nix);

     

       309
       85
        
       

     

       310
       86
        
                   constraints = patches."${p}" or null;

     

       311
       87
        
                   matchConstraint =

+226

pkgs/development/compilers/llvm/common/patches.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         "clang/gnu-install-dirs.patch" = [

     

       3
       3
       +
           {

     

       4
       4
       +
             before = "14";

     

       5
       5
       +
             path = ../12;

     

       6
       6
       +
           }

     

       7
       7
       +
           {

     

       8
       8
       +
             after = "19";

     

       9
       9
       +
             path = ../19;

     

       10
       10
       +
           }

     

       11
       11
       +
         ];

     

       12
       12
       +
         "clang/purity.patch" = [

     

       13
       13
       +
           {

     

       14
       14
       +
             after = "18";

     

       15
       15
       +
             path = ../18;

     

       16
       16
       +
           }

     

       17
       17
       +
           {

     

       18
       18
       +
             before = "17";

     

       19
       19
       +
             after = "15";

     

       20
       20
       +
             path = ../15;

     

       21
       21
       +
           }

     

       22
       22
       +
           {

     

       23
       23
       +
             before = "16";

     

       24
       24
       +
             path = ../12;

     

       25
       25
       +
           }

     

       26
       26
       +
         ];

     

       27
       27
       +
         "clang/aarch64-tblgen.patch" = [

     

       28
       28
       +
           {

     

       29
       29
       +
             after = "17";

     

       30
       30
       +
             before = "18";

     

       31
       31
       +
             path = ../17;

     

       32
       32
       +
           }

     

       33
       33
       +
         ];

     

       34
       34
       +
         "lld/add-table-base.patch" = [

     

       35
       35
       +
           {

     

       36
       36
       +
             after = "16";

     

       37
       37
       +
             path = ../16;

     

       38
       38
       +
           }

     

       39
       39
       +
         ];

     

       40
       40
       +
         "lld/gnu-install-dirs.patch" = [

     

       41
       41
       +
           {

     

       42
       42
       +
             after = "18";

     

       43
       43
       +
             path = ../18;

     

       44
       44
       +
           }

     

       45
       45
       +
           {

     

       46
       46
       +
             before = "14";

     

       47
       47
       +
             path = ../12;

     

       48
       48
       +
           }

     

       49
       49
       +
         ];

     

       50
       50
       +
         "llvm/gnu-install-dirs.patch" = [

     

       51
       51
       +
           {

     

       52
       52
       +
             after = "20";

     

       53
       53
       +
             path = ../20;

     

       54
       54
       +
           }

     

       55
       55
       +
           {

     

       56
       56
       +
             after = "18";

     

       57
       57
       +
             before = "20";

     

       58
       58
       +
             path = ../18;

     

       59
       59
       +
           }

     

       60
       60
       +
         ];

     

       61
       61
       +
         "llvm/gnu-install-dirs-polly.patch" = [

     

       62
       62
       +
           {

     

       63
       63
       +
             after = "20";

     

       64
       64
       +
             path = ../20;

     

       65
       65
       +
           }

     

       66
       66
       +
           {

     

       67
       67
       +
             before = "20";

     

       68
       68
       +
             after = "18";

     

       69
       69
       +
             path = ../18;

     

       70
       70
       +
           }

     

       71
       71
       +
           {

     

       72
       72
       +
             before = "18";

     

       73
       73
       +
             after = "14";

     

       74
       74
       +
             path = ../14;

     

       75
       75
       +
           }

     

       76
       76
       +
         ];

     

       77
       77
       +
         "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       78
       78
       +
           {

     

       79
       79
       +
             before = "17";

     

       80
       80
       +
             after = "15";

     

       81
       81
       +
             path = ../15;

     

       82
       82
       +
           }

     

       83
       83
       +
           {

     

       84
       84
       +
             after = "17";

     

       85
       85
       +
             path = ../17;

     

       86
       86
       +
           }

     

       87
       87
       +
         ];

     

       88
       88
       +
         "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [

     

       89
       89
       +
           {

     

       90
       90
       +
             after = "18";

     

       91
       91
       +
             path = ../18;

     

       92
       92
       +
           }

     

       93
       93
       +
           {

     

       94
       94
       +
             after = "16";

     

       95
       95
       +
             before = "18";

     

       96
       96
       +
             path = ../16;

     

       97
       97
       +
           }

     

       98
       98
       +
         ];

     

       99
       99
       +
         "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       100
       100
       +
           {

     

       101
       101
       +
             after = "15";

     

       102
       102
       +
             path = ../15;

     

       103
       103
       +
           }

     

       104
       104
       +
         ];

     

       105
       105
       +
         "libunwind/gnu-install-dirs.patch" = [

     

       106
       106
       +
           {

     

       107
       107
       +
             before = "17";

     

       108
       108
       +
             after = "15";

     

       109
       109
       +
             path = ../15;

     

       110
       110
       +
           }

     

       111
       111
       +
         ];

     

       112
       112
       +
         "compiler-rt/X86-support-extension.patch" = [

     

       113
       113
       +
           {

     

       114
       114
       +
             after = "15";

     

       115
       115
       +
             path = ../15;

     

       116
       116
       +
           }

     

       117
       117
       +
           {

     

       118
       118
       +
             before = "15";

     

       119
       119
       +
             path = ../12;

     

       120
       120
       +
           }

     

       121
       121
       +
         ];

     

       122
       122
       +
         "compiler-rt/armv6-scudo-libatomic.patch" = [

     

       123
       123
       +
           {

     

       124
       124
       +
             after = "19";

     

       125
       125
       +
             path = ../19;

     

       126
       126
       +
           }

     

       127
       127
       +
           {

     

       128
       128
       +
             after = "15";

     

       129
       129
       +
             before = "19";

     

       130
       130
       +
             path = ../15;

     

       131
       131
       +
           }

     

       132
       132
       +
           {

     

       133
       133
       +
             before = "15";

     

       134
       134
       +
             path = ../14;

     

       135
       135
       +
           }

     

       136
       136
       +
         ];

     

       137
       137
       +
         "compiler-rt/armv7l.patch" = [

     

       138
       138
       +
           {

     

       139
       139
       +
             before = "15";

     

       140
       140
       +
             after = "13";

     

       141
       141
       +
             path = ../13;

     

       142
       142
       +
           }

     

       143
       143
       +
         ];

     

       144
       144
       +
         "compiler-rt/gnu-install-dirs.patch" = [

     

       145
       145
       +
           {

     

       146
       146
       +
             before = "14";

     

       147
       147
       +
             path = ../12;

     

       148
       148
       +
           }

     

       149
       149
       +
           {

     

       150
       150
       +
             after = "13";

     

       151
       151
       +
             before = "15";

     

       152
       152
       +
             path = ../14;

     

       153
       153
       +
           }

     

       154
       154
       +
           {

     

       155
       155
       +
             after = "15";

     

       156
       156
       +
             before = "17";

     

       157
       157
       +
             path = ../15;

     

       158
       158
       +
           }

     

       159
       159
       +
           {

     

       160
       160
       +
             after = "16";

     

       161
       161
       +
             path = ../17;

     

       162
       162
       +
           }

     

       163
       163
       +
         ];

     

       164
       164
       +
         "compiler-rt/darwin-targetconditionals.patch" = [

     

       165
       165
       +
           {

     

       166
       166
       +
             after = "13";

     

       167
       167
       +
             path = ../13;

     

       168
       168
       +
           }

     

       169
       169
       +
         ];

     

       170
       170
       +
         "compiler-rt/codesign.patch" = [

     

       171
       171
       +
           {

     

       172
       172
       +
             after = "13";

     

       173
       173
       +
             path = ../13;

     

       174
       174
       +
           }

     

       175
       175
       +
         ];

     

       176
       176
       +
         "compiler-rt/normalize-var.patch" = [

     

       177
       177
       +
           {

     

       178
       178
       +
             after = "16";

     

       179
       179
       +
             path = ../16;

     

       180
       180
       +
           }

     

       181
       181
       +
           {

     

       182
       182
       +
             before = "16";

     

       183
       183
       +
             path = ../12;

     

       184
       184
       +
           }

     

       185
       185
       +
         ];

     

       186
       186
       +
         "lldb/procfs.patch" = [

     

       187
       187
       +
           {

     

       188
       188
       +
             after = "15";

     

       189
       189
       +
             path = ../15;

     

       190
       190
       +
           }

     

       191
       191
       +
           {

     

       192
       192
       +
             before = "15";

     

       193
       193
       +
             path = ../12;

     

       194
       194
       +
           }

     

       195
       195
       +
         ];

     

       196
       196
       +
         "lldb/resource-dir.patch" = [

     

       197
       197
       +
           {

     

       198
       198
       +
             before = "16";

     

       199
       199
       +
             path = ../12;

     

       200
       200
       +
           }

     

       201
       201
       +
         ];

     

       202
       202
       +
         "openmp/fix-find-tool.patch" = [

     

       203
       203
       +
           {

     

       204
       204
       +
             after = "17";

     

       205
       205
       +
             before = "19";

     

       206
       206
       +
             path = ../17;

     

       207
       207
       +
           }

     

       208
       208
       +
         ];

     

       209
       209
       +
         "openmp/run-lit-directly.patch" = [

     

       210
       210
       +
           {

     

       211
       211
       +
             after = "16";

     

       212
       212
       +
             path = ../16;

     

       213
       213
       +
           }

     

       214
       214
       +
           {

     

       215
       215
       +
             after = "14";

     

       216
       216
       +
             before = "16";

     

       217
       217
       +
             path = ../14;

     

       218
       218
       +
           }

     

       219
       219
       +
         ];

     

       220
       220
       +
         "libclc/use-default-paths.patch" = [

     

       221
       221
       +
           {

     

       222
       222
       +
             after = "19";

     

       223
       223
       +
             path = ../19;

     

       224
       224
       +
           }

     

       225
       225
       +
         ];

     

       226
       226
       +
       }

pkgs/development/compilers/llvm/default.nix

···

       14
       14
        
         bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,

     

       15
       15
        
         bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,

     

       16
       16
        
         llvmVersions ? { },

     

       17
       17
       +
         patchesFn ? lib.id,

     

       17
       18
        
         # Allows passthrough to packages via newScope in ./common/default.nix.

     

       18
       19
        
         # This makes it possible to do

     

       19
       20
        
         # `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get

     
···

       74
       75
        
                     gitRelease

     

       75
       76
        
                     monorepoSrc

     

       76
       77
        
                     version

     

       78
       78
       +
                     patchesFn

     

       77
       79
        
                     ;

     

       78
       80
        
                 }

     

       79
       81
        
                 // packageSetArgs # Allow overrides.

+29 -37

pkgs/development/interpreters/lua-5/tests/default.nix

···

       10
       10
        
           lua:

     

       11
       11
        
           { name, command }:

     

       12
       12
        
           pkgs.runCommandLocal "test-${lua.name}-${name}"

     

       13
       13
       -
             ({

     

       13
       13
       +
             {

     

       14
       14
        
               nativeBuildInputs = [ lua ];

     

       15
       15
        
               meta.platforms = lua.meta.platforms;

     

       16
       16
       -
             })

     

       16
       16
       +
             }

     

       17
       17
        
             (

     

       18
       18
        
               ''

     

       19
       19
        
                 source ${./assert.sh}

     
···

       58
       58
        
             ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;";

     

       59
       59
        
         };

     

       60
       60
        
       in

     

       61
       61
       -
       pkgs.recurseIntoAttrs ({

     

       61
       61
       +
       pkgs.recurseIntoAttrs {

     

       62
       62
        
       

     

       63
       63
       -
         checkInterpreterPatch =

     

       63
       63
       +
         checkInterpreterPath =

     

       64
       64
        
           let

     

       65
       65
        
             golden_LUA_PATH = golden_LUA_PATHS.${lib.versions.majorMinor lua.version};

     

       66
       66
        
           in

     
···

       73
       73
        
             '';

     

       74
       74
        
           };

     

       75
       75
        
       

     

       76
       76
       -
         checkWrapping =

     

       77
       77
       -
           pkgs.runCommandLocal "test-${lua.name}-wrapping"

     

       78
       78
       -
             ({

     

       79
       79
       -
             })

     

       80
       80
       -
             (''

     

       81
       81
       -
               grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello

     

       82
       82
       -
               touch $out

     

       83
       83
       -
             '');

     

       76
       76
       +
         checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" { } ''

     

       77
       77
       +
           grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello

     

       78
       78
       +
           touch $out

     

       79
       79
       +
         '';

     

       84
       80
        
       

     

       85
       81
        
         # checks that lua's setup-hook adds dependencies to LUA_PATH

     

       86
       82
        
         # Prevents the following regressions

     
···

       90
       86
        
         # stdin:1: module 'http.request' not found:

     

       91
       87
        
         checkSetupHook =

     

       92
       88
        
           pkgs.runCommandLocal "test-${lua.name}-setup-hook"

     

       93
       93
       -
             ({

     

       89
       89
       +
             {

     

       94
       90
        
               nativeBuildInputs = [ lua ];

     

       95
       91
        
               buildInputs = [ lua.pkgs.http ];

     

       96
       92
        
               meta.platforms = lua.meta.platforms;

     

       97
       97
       -
             })

     

       98
       98
       -
             (''

     

       93
       93
       +
             }

     

       94
       94
       +
             ''

     

       99
       95
        
               ${lua}/bin/lua -e "require'http.request'"

     

       100
       96
        
               touch $out

     

       101
       101
       -
             '');

     

       97
       97
       +
             '';

     

       102
       98
        
       

     

       103
       103
       -
         checkRelativeImports =

     

       104
       104
       -
           pkgs.runCommandLocal "test-${lua.name}-relative-imports"

     

       105
       105
       -
             ({

     

       106
       106
       -
             })

     

       107
       107
       -
             (''

     

       108
       108
       -
               source ${./assert.sh}

     

       99
       99
       +
         checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" { } ''

     

       100
       100
       +
           source ${./assert.sh}

     

       109
       101
        
       

     

       110
       110
       -
               lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"

     

       111
       111
       -
               lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"

     

       102
       102
       +
           lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"

     

       103
       103
       +
           lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"

     

       112
       104
        
       

     

       113
       113
       -
               assertStringContains "$lua_vanilla_package_path" "./?.lua"

     

       114
       114
       -
               assertStringContains "$lua_vanilla_package_path" "./?/init.lua"

     

       105
       105
       +
           assertStringContains "$lua_vanilla_package_path" "./?.lua"

     

       106
       106
       +
           assertStringContains "$lua_vanilla_package_path" "./?/init.lua"

     

       115
       107
        
       

     

       116
       116
       -
               assertStringContains "$lua_with_module_package_path" "./?.lua"

     

       117
       117
       -
               assertStringContains "$lua_with_module_package_path" "./?/init.lua"

     

       108
       108
       +
           assertStringContains "$lua_with_module_package_path" "./?.lua"

     

       109
       109
       +
           assertStringContains "$lua_with_module_package_path" "./?/init.lua"

     

       118
       110
        
       

     

       119
       119
       -
               touch $out

     

       120
       120
       -
             '');

     

       111
       111
       +
           touch $out

     

       112
       112
       +
         '';

     

       121
       113
        
       

     

       122
       114
        
         # Check that a lua package's propagatedBuildInputs end up in LUA_PATH

     

       123
       115
        
         checkPropagatedBuildInputs =

     

       124
       116
        
           pkgs.runCommandLocal "test-${lua.name}-setup-hook"

     

       125
       125
       -
             ({

     

       126
       126
       -
               # lua-curl is a propagatedBuildInput of rest-nvim has

     

       117
       117
       +
             {

     

       127
       118
        
               buildInputs = [ lua.pkgs.rest-nvim ];

     

       128
       128
       -
             })

     

       129
       129
       -
             (''

     

       130
       130
       -
               ${lua}/bin/lua -e "require'cURL'"

     

       119
       119
       +
             }

     

       120
       120
       +
             # `xml2lua` is a propagatedBuildInput of rest-nvim

     

       121
       121
       +
             ''

     

       122
       122
       +
               ${lua}/bin/lua -e "require'xml2lua'"

     

       131
       123
        
               touch $out

     

       132
       132
       -
             '');

     

       124
       124
       +
             '';

     

       133
       125
        
       

     

       134
       134
       -
       })

     

       126
       126
       +
       }

+6 -6

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "ical";

     

       20
       20
       -
         version = "9.0.0";

     

       20
       20
       +
         version = "9.0.1";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
       -
         disabled = pythonOlder "3.10";

     

       23
       23
       +
         disabled = pythonOlder "3.11";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "allenporter";

     

       27
       27
        
           repo = "ical";

     

       28
       28
        
           tag = version;

     

       29
       29
       -
           hash = "sha256-uAk+VYrcifRkUBLcXjBPwxrOlo1EKQUnPjUmR7+9cVo=";

     

       29
       29
       +
           hash = "sha256-VaFzN/Yzo0Ad1vsuZJ4P8+WWH+GtPJGOz3PWum8rLww=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [ setuptools ];

     
···

       48
       48
        
       

     

       49
       49
        
         pythonImportsCheck = [ "ical" ];

     

       50
       50
        
       

     

       51
       51
       -
         meta = with lib; {

     

       51
       51
       +
         meta = {

     

       52
       52
        
           description = "Library for handling iCalendar";

     

       53
       53
        
           homepage = "https://github.com/allenporter/ical";

     

       54
       54
        
           changelog = "https://github.com/allenporter/ical/releases/tag/${src.tag}";

     

       55
       55
       -
           license = licenses.asl20;

     

       56
       56
       -
           maintainers = with maintainers; [ dotlambda ];

     

       55
       55
       +
           license = lib.licenses.asl20;

     

       56
       56
       +
           maintainers = with lib.maintainers; [ dotlambda ];

     

       57
       57
        
         };

     

       58
       58
        
       }

pkgs/kde/plasma/kinfocenter/default.nix

···

       60
       60
        
         extraNativeBuildInputs = [ pkg-config ];

     

       61
       61
        
         extraBuildInputs = [ libusb1 ];

     

       62
       62
        
       

     

       63
       63
       +
         qtWrapperArgs = [ "--inherit-argv0" ];

     

       64
       64
       +
       

     

       63
       65
        
         # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in

     

       64
       66
        
         # the same directory, while it is actually located in a completely different

     

       65
       67
        
         # store path

pkgs/top-level/all-packages.nix

···

       5742
       5742
        
             };

     

       5743
       5743
        
           }) else ccWrapper;

     

       5744
       5744
        
       

     

       5745
       5745
       +
         gnuStdenv =

     

       5746
       5746
       +
           if stdenv.cc.isGNU

     

       5747
       5747
       +
           then stdenv

     

       5748
       5748
       +
           else gccStdenv.override {

     

       5749
       5749
       +
             cc = gccStdenv.cc.override {

     

       5750
       5750
       +
               bintools = buildPackages.binutils;

     

       5751
       5751
       +
             };

     

       5752
       5752
       +
           };

     

       5753
       5753
       +
       

     

       5745
       5754
        
         gccStdenv =

     

       5746
       5755
        
           if stdenv.cc.isGNU

     

       5747
       5756
        
           then stdenv