commit e9ddb8ca47c1f01011579f4d609001d7657de701 · pyrox.dev/nixpkgs

doc/release-notes/rl-2511.section.md

···

       57
        
       

     

       58
        
       - Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequisites`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`.

     

       59
        
       

     

       0
        
       
     

       0
        
       
     

       60
        
       - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.

     

       61
        
       

     

       62
        
       - `mx-puppet-discord` was removed from Nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.

···

       57
        
       

     

       58
        
       - Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequisites`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`.

     

       59
        
       

     

       60
       +
       - `k2pdfopt` has been removed, as it's broken.

     

       61
       +
       

     

       62
        
       - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.

     

       63
        
       

     

       64
        
       - `mx-puppet-discord` was removed from Nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.

-37

pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch

···

       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       -
       index 365b835..4341de9 100644

     

       3
       -
       --- a/CMakeLists.txt

     

       4
       -
       +++ b/CMakeLists.txt

     

       5
       -
       @@ -57,6 +57,7 @@ endif(JPEG_FOUND)

     

       6
       -
        include(FindJasper)

     

       7
       -
        if(JASPER_FOUND)

     

       8
       -
          set(HAVE_JASPER_LIB 1)

     

       9
       -
       +  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})

     

       10
       -
        endif(JASPER_FOUND)

     

       11
       -
        

     

       12
       -
        # paths from willuslib/wgs.c

     

       13
       -
       @@ -71,9 +72,12 @@ else()

     

       14
       -
          message(STATUS "Could NOT find ghostscript executable")

     

       15
       -
        endif(GHOSTSCRIPT_EXECUTABLE)

     

       16
       -
        

     

       17
       -
       -# willus.h

     

       18
       -
       -# HAVE_GSL_LIB

     

       19
       -
       -

     

       20
       -
       +pkg_check_modules(GSL gsl)

     

       21
       -
       +if(GSL_FOUND)

     

       22
       -
       +  set(HAVE_GSL_LIB 1)

     

       23
       -
       +  include_directories(SYSTEM ${GSL_INCLUDEDIR})

     

       24
       -
       +  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})

     

       25
       -
       +endif(GSL_FOUND)

     

       26
       -
        

     

       27
       -
        # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)

     

       28
       -
        # MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ...

     

       29
       -
       @@ -85,7 +89,7 @@ if(MUPDF_FOUND)

     

       30
       -
          include_directories(SYSTEM ${MUPDF_INCLUDEDIR})

     

       31
       -
          message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")

     

       32
       -
          set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 

     

       33
       -
       -    -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -llcms -lgumbo

     

       34
       -
       +

     

       35
       -
          )

     

       36
       -
        endif(MUPDF_FOUND)

     

       37
       -

-288

pkgs/by-name/k2/k2pdfopt/package.nix

···

       1
       -
       {

     

       2
       -
         lib,

     

       3
       -
         stdenv,

     

       4
       -
         runCommand,

     

       5
       -
         fetchzip,

     

       6
       -
         fetchurl,

     

       7
       -
         fetchpatch,

     

       8
       -
         fetchFromGitHub,

     

       9
       -
         cmake,

     

       10
       -
         jbig2dec,

     

       11
       -
         libjpeg_turbo,

     

       12
       -
         libpng,

     

       13
       -
         makeWrapper,

     

       14
       -
         pkg-config,

     

       15
       -
         zlib,

     

       16
       -
         enableGSL ? true,

     

       17
       -
         gsl,

     

       18
       -
         enableGhostScript ? true,

     

       19
       -
         ghostscript,

     

       20
       -
         enableMuPDF ? true,

     

       21
       -
         mupdf,

     

       22
       -
         enableDJVU ? true,

     

       23
       -
         djvulibre,

     

       24
       -
         enableGOCR ? false, # Disabled by default due to crashes

     

       25
       -
         gocr,

     

       26
       -
         # Tesseract support is currently broken

     

       27
       -
         # See: https://github.com/NixOS/nixpkgs/issues/368349

     

       28
       -
         enableTesseract ? false,

     

       29
       -
         tesseract5,

     

       30
       -
         enableLeptonica ? true,

     

       31
       -
         leptonica,

     

       32
       -
         opencl-headers,

     

       33
       -
         fetchDebianPatch,

     

       34
       -
       }:

     

       35
       -
       

     

       36
       -
       # k2pdfopt is a pain to package. It requires modified versions of mupdf,

     

       37
       -
       # leptonica, and tesseract.  Instead of shipping patches for these upstream

     

       38
       -
       # packages, k2pdfopt includes just the modified source files for these

     

       39
       -
       # packages.  The individual files from the {mupdf,leptonica,tesseract}_mod/

     

       40
       -
       # directories are intended to replace the corresponding source files in the

     

       41
       -
       # upstream packages, for a particular version of that upstream package.

     

       42
       -
       #

     

       43
       -
       # There are a few ways we could approach packaging these modified versions of

     

       44
       -
       # mupdf, leptonica, and mupdf:

     

       45
       -
       # 1) Override the upstream source with a new derivation that involves copying

     

       46
       -
       # the modified source files from k2pdfopt and replacing the corresponding

     

       47
       -
       # source files in the upstream packages. Since the files are intended for a

     

       48
       -
       # particular version of the upstream package, this would not allow us to easily

     

       49
       -
       # use updates to those packages in nixpkgs.

     

       50
       -
       # 2) Manually produce patches which can be applied against the upstream

     

       51
       -
       # project, and have the same effect as replacing those files.  This is what I

     

       52
       -
       # believe k2pdfopt should do this for us anyway.  The benefit of creating and

     

       53
       -
       # applying patches in this way is that minor updates (esp. security fixes) to

     

       54
       -
       # upstream packages might still allow these patches to apply successfully.

     

       55
       -
       # 3) Automatically produce these patches inside a nix derivation. This is the

     

       56
       -
       # approach taken here, using the "mkPatch" provided below.  This has the

     

       57
       -
       # benefit of easier review and should hopefully be simpler to update in the

     

       58
       -
       # future.

     

       59
       -
       

     

       60
       -
       let

     

       61
       -
         # Create a patch against src based on changes applied in patchCommands

     

       62
       -
         mkPatch =

     

       63
       -
           {

     

       64
       -
             name,

     

       65
       -
             src,

     

       66
       -
             patchCommands,

     

       67
       -
           }:

     

       68
       -
           runCommand "${name}-k2pdfopt.patch" { inherit src; } ''

     

       69
       -
             unpackPhase

     

       70
       -
       

     

       71
       -
             orig=$sourceRoot

     

       72
       -
             new=$sourceRoot-modded

     

       73
       -
             cp -r $orig/. $new/

     

       74
       -
       

     

       75
       -
             pushd $new >/dev/null

     

       76
       -
             ${patchCommands}

     

       77
       -
             popd >/dev/null

     

       78
       -
       

     

       79
       -
             diff -Naur $orig $new > $out || true

     

       80
       -
           '';

     

       81
       -
       

     

       82
       -
         pname = "k2pdfopt";

     

       83
       -
         version = "2.55";

     

       84
       -
         k2pdfopt_src = fetchzip {

     

       85
       -
           url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip";

     

       86
       -
           hash = "sha256-orQNDXQkkcCtlA8wndss6SiJk4+ImiFCG8XRLEg963k=";

     

       87
       -
         };

     

       88
       -
       in

     

       89
       -
       stdenv.mkDerivation rec {

     

       90
       -
         inherit pname version;

     

       91
       -
         src = k2pdfopt_src;

     

       92
       -
       

     

       93
       -
         patches = [

     

       94
       -
           ./0001-Fix-CMakeLists.patch

     

       95
       -
           (fetchDebianPatch {

     

       96
       -
             inherit pname;

     

       97
       -
             version = "${version}+ds";

     

       98
       -
             debianRevision = "3.1";

     

       99
       -
             patch = "0007-k2pdfoptlib-k2ocr.c-conditionally-enable-tesseract-r.patch";

     

       100
       -
             hash = "sha256-uJ9Gpyq64n/HKqo0hkQ2dnkSLCKNN4DedItPGzHfqR8=";

     

       101
       -
           })

     

       102
       -
           (fetchDebianPatch {

     

       103
       -
             inherit pname;

     

       104
       -
             version = "${version}+ds";

     

       105
       -
             debianRevision = "3.1";

     

       106
       -
             patch = "0009-willuslib-CMakeLists.txt-conditionally-add-source-fi.patch";

     

       107
       -
             hash = "sha256-cBSlcuhsw4YgAJtBJkKLW6u8tK5gFwWw7pZEJzVMJDE=";

     

       108
       -
           })

     

       109
       -
         ];

     

       110
       -
       

     

       111
       -
         postPatch = ''

     

       112
       -
           substituteInPlace willuslib/bmpdjvu.c \

     

       113
       -
             --replace "<djvu.h>" "<libdjvu/ddjvuapi.h>"

     

       114
       -
         '';

     

       115
       -
       

     

       116
       -
         nativeBuildInputs = [

     

       117
       -
           cmake

     

       118
       -
           pkg-config

     

       119
       -
           makeWrapper

     

       120
       -
         ];

     

       121
       -
       

     

       122
       -
         buildInputs =

     

       123
       -
           let

     

       124
       -
             # We use specific versions of these sources below to match the versions

     

       125
       -
             # used in the k2pdfopt source. Note that this does _not_ need to match the

     

       126
       -
             # version used elsewhere in nixpkgs, since it is only used to create the

     

       127
       -
             # patch that can then be applied to the version in nixpkgs.

     

       128
       -
             mupdf_patch = mkPatch {

     

       129
       -
               name = "mupdf";

     

       130
       -
               src = fetchurl {

     

       131
       -
                 url = "https://mupdf.com/downloads/archive/mupdf-1.23.7-source.tar.gz";

     

       132
       -
                 hash = "sha256-NaVJM/QA6JZnoImkJfHGXNadRiOU/tnAZ558Uu+6pWg=";

     

       133
       -
               };

     

       134
       -
               patchCommands = ''

     

       135
       -
                 cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/

     

       136
       -
                 cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/

     

       137
       -
               '';

     

       138
       -
             };

     

       139
       -
             # mupdf_patch no longer applies cleanly against mupdf 1.25.0 or later, due to a conflicting

     

       140
       -
             # hunk (mupdf_conflict) introduced in commit bd8d337939f36f55b96cb6984f5c7bbf2f488ce0 of mupdf.

     

       141
       -
             # This merge conflict can be resolved as desired by reverting mupdf_conflict, applying mupdf_patch,

     

       142
       -
             # and finally reapplying mupdf_conflict, with an increased fuzz factor (see mupdf_modded below).

     

       143
       -
             # TODO: remove workaround with conflicting hunk when mupdf in k2pdfopt is updated to 1.25.0 or later

     

       144
       -
             mupdf_conflict =

     

       145
       -
               hash: revert:

     

       146
       -
               fetchpatch {

     

       147
       -
                 name = "mupdf-conflicting-hunk" + (lib.optionalString revert "-reverted") + ".patch";

     

       148
       -
                 url = "https://github.com/ArtifexSoftware/mupdf/commit/bd8d337939f36f55b96cb6984f5c7bbf2f488ce0.patch";

     

       149
       -
                 inherit hash revert;

     

       150
       -
                 includes = [ "source/fitz/stext-device.c" ];

     

       151
       -
                 postFetch = ''

     

       152
       -
                   filterdiff -#6 "$out" > "$tmpfile"

     

       153
       -
                   mv "$tmpfile" "$out"

     

       154
       -
                 '';

     

       155
       -
               };

     

       156
       -
             mupdf_modded = mupdf.overrideAttrs (

     

       157
       -
               {

     

       158
       -
                 patches ? [ ],

     

       159
       -
                 ...

     

       160
       -
               }:

     

       161
       -
               {

     

       162
       -
                 # The fuzz factor is increased to automatically resolve the merge conflict.

     

       163
       -
                 patchFlags = [

     

       164
       -
                   "-p1"

     

       165
       -
                   "-F3"

     

       166
       -
                 ];

     

       167
       -
                 # Reverting and reapplying the conflicting hunk is necessary, otherwise the result will be faulty.

     

       168
       -
                 patches = patches ++ [

     

       169
       -
                   # revert conflicting hunk

     

       170
       -
                   (mupdf_conflict "sha256-24tl9YBuZBYhb12yY3T0lKsA7NswfK0QcMYhb2IpepA=" true)

     

       171
       -
                   # apply modifications

     

       172
       -
                   mupdf_patch

     

       173
       -
                   # reapply conflicting hunk

     

       174
       -
                   (mupdf_conflict "sha256-bnBV7LyX1w/BXxBFF1bkA8x+/0I9Am33o8GiAeEKHYQ=" false)

     

       175
       -
                 ];

     

       176
       -
                 # This function is missing in font.c, see font-win32.c

     

       177
       -
                 postPatch = ''

     

       178
       -
                   echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c

     

       179
       -
                 '';

     

       180
       -
               }

     

       181
       -
             );

     

       182
       -
       

     

       183
       -
             leptonica_patch = mkPatch {

     

       184
       -
               name = "leptonica";

     

       185
       -
               src = fetchurl {

     

       186
       -
                 url = "http://www.leptonica.org/source/leptonica-1.83.0.tar.gz";

     

       187
       -
                 hash = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4=";

     

       188
       -
               };

     

       189
       -
               patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/";

     

       190
       -
             };

     

       191
       -
             leptonica_modded = leptonica.overrideAttrs (

     

       192
       -
               {

     

       193
       -
                 patches ? [ ],

     

       194
       -
                 ...

     

       195
       -
               }:

     

       196
       -
               {

     

       197
       -
                 patches = patches ++ [ leptonica_patch ];

     

       198
       -
               }

     

       199
       -
             );

     

       200
       -
       

     

       201
       -
             tesseract_patch = mkPatch {

     

       202
       -
               name = "tesseract";

     

       203
       -
               src = fetchFromGitHub {

     

       204
       -
                 owner = "tesseract-ocr";

     

       205
       -
                 repo = "tesseract";

     

       206
       -
                 rev = "5.3.3";

     

       207
       -
                 hash = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos=";

     

       208
       -
               };

     

       209
       -
               patchCommands = ''

     

       210
       -
                 cp ${k2pdfopt_src}/tesseract_mod/tesseract.* include/tesseract/

     

       211
       -
                 cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h include/tesseract/

     

       212
       -
                 cp ${k2pdfopt_src}/tesseract_mod/{baseapi,config_auto,tesscapi,tesseract}.* src/api/

     

       213
       -
                 cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/api/

     

       214
       -
                 cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/

     

       215
       -
                 cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/ccmain/

     

       216
       -
                 cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/

     

       217
       -
                 cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/

     

       218
       -
                 cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/

     

       219
       -
                 cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/

     

       220
       -
                 cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/

     

       221
       -
               '';

     

       222
       -
             };

     

       223
       -
             tesseract_modded = tesseract5.override {

     

       224
       -
               tesseractBase = tesseract5.tesseractBase.overrideAttrs (

     

       225
       -
                 {

     

       226
       -
                   patches ? [ ],

     

       227
       -
                   buildInputs ? [ ],

     

       228
       -
                   ...

     

       229
       -
                 }:

     

       230
       -
                 {

     

       231
       -
                   pname = "tesseract-k2pdfopt";

     

       232
       -
                   version = tesseract_patch.src.rev;

     

       233
       -
                   src = tesseract_patch.src;

     

       234
       -
                   # opencl-headers were removed from tesseract in Version 5.4

     

       235
       -
                   buildInputs = buildInputs ++ [ opencl-headers ];

     

       236
       -
                   patches = patches ++ [ tesseract_patch ];

     

       237
       -
                   # Additional compilation fixes

     

       238
       -
                   postPatch = ''

     

       239
       -
                     echo libtesseract_la_SOURCES += src/api/tesscapi.cpp >> Makefile.am

     

       240
       -
                     substituteInPlace src/api/tesseract.h \

     

       241
       -
                       --replace "#include <leptonica.h>" "//#include <leptonica.h>"

     

       242
       -
                     substituteInPlace include/tesseract/tesseract.h \

     

       243
       -
                       --replace "#include <leptonica.h>" "//#include <leptonica.h>"

     

       244
       -
                   '';

     

       245
       -
                 }

     

       246
       -
               );

     

       247
       -
             };

     

       248
       -
           in

     

       249
       -
           [

     

       250
       -
             jbig2dec

     

       251
       -
             libjpeg_turbo

     

       252
       -
             libpng

     

       253
       -
             zlib

     

       254
       -
           ]

     

       255
       -
           ++ lib.optional enableGSL gsl

     

       256
       -
           ++ lib.optional enableGhostScript ghostscript

     

       257
       -
           ++ lib.optional enableMuPDF mupdf_modded

     

       258
       -
           ++ lib.optional enableDJVU djvulibre

     

       259
       -
           ++ lib.optional enableGOCR gocr

     

       260
       -
           ++ lib.optional enableTesseract tesseract_modded

     

       261
       -
           ++ lib.optional (enableLeptonica || enableTesseract) leptonica_modded;

     

       262
       -
       

     

       263
       -
         dontUseCmakeBuildDir = true;

     

       264
       -
       

     

       265
       -
         cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ];

     

       266
       -
       

     

       267
       -
         NIX_LDFLAGS = "-lpthread";

     

       268
       -
       

     

       269
       -
         installPhase = ''

     

       270
       -
           install -D -m 755 k2pdfopt $out/bin/k2pdfopt

     

       271
       -
         '';

     

       272
       -
       

     

       273
       -
         preFixup = lib.optionalString enableTesseract ''

     

       274
       -
           wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract5}/share/tessdata

     

       275
       -
         '';

     

       276
       -
       

     

       277
       -
         meta = with lib; {

     

       278
       -
           description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones";

     

       279
       -
           homepage = "http://www.willus.com/k2pdfopt";

     

       280
       -
           changelog = "https://www.willus.com/k2pdfopt/k2pdfopt_version.txt";

     

       281
       -
           license = licenses.gpl3;

     

       282
       -
           platforms = platforms.linux;

     

       283
       -
           maintainers = with maintainers; [

     

       284
       -
             bosu

     

       285
       -
             danielfullmer

     

       286
       -
           ];

     

       287
       -
         };

     

       288
       -
       }

pkgs/top-level/aliases.nix

···

       1226
        
       

     

       1227
        
         ### K ###

     

       1228
        
       

     

       0
        
       
     

       1229
        
         k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20

     

       1230
        
         k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01

     

       1231
        
         k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15

···

       1226
        
       

     

       1227
        
         ### K ###

     

       1228
        
       

     

       1229
       +
         k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27

     

       1230
        
         k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20

     

       1231
        
         k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01

     

       1232
        
         k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15