commit d46e488795913c822d97628b4137da6727742e86 · pyrox.dev/nixpkgs

+3 -6

pkgs/applications/office/libreoffice/default.nix

···

       61
       61
        
         # of rasqal/rasqal.h

     

       62
       62
        
         NIX_CFLAGS_COMPILE = [

     

       63
       63
        
           "-I${librdf_rasqal}/include/rasqal"

     

       64
       64
       -
         ] ++ lib.optional stdenv.isx86_64 "-mno-fma";

     

       64
       64
       +
         ] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ]

     

       65
       65
       +
         # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10

     

       66
       66
       +
         ++ [ "-fno-visibility-inlines-hidden" ];

     

       65
       67
        
       

     

       66
       68
        
         patches = [

     

       67
       69
        
           ./xdg-open-brief.patch

     

       68
       68
       -
           (fetchpatch {

     

       69
       69
       -
             url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008";

     

       70
       70
       -
             name = "poppler-0.86.patch";

     

       71
       71
       -
             sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j";

     

       72
       72
       -
           })

     

       73
       70
        
         ];

     

       74
       71
        
       

     

       75
       72
        
         tarballPath = "external/tarballs";

+96 -82

pkgs/applications/office/libreoffice/src-fresh/download.nix

···

       28
       28
        
           md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";

     

       29
       29
        
         }

     

       30
       30
        
         {

     

       31
       31
       -
           name = "boost_1_69_0.tar.bz2";

     

       32
       32
       -
           url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2";

     

       33
       33
       -
           sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";

     

       31
       31
       +
           name = "boost_1_71_0.tar.xz";

     

       32
       32
       +
           url = "http://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz";

     

       33
       33
       +
           sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543";

     

       34
       34
        
           md5 = "";

     

       35
       35
       -
           md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2";

     

       35
       35
       +
           md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz";

     

       36
       36
        
         }

     

       37
       37
        
         {

     

       38
       38
        
           name = "breakpad.zip";

     
···

       63
       63
        
           md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz";

     

       64
       64
        
         }

     

       65
       65
        
         {

     

       66
       66
       -
           name = "libcdr-0.1.5.tar.xz";

     

       67
       67
       -
           url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz";

     

       68
       68
       -
           sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48";

     

       66
       66
       +
           name = "libcdr-0.1.6.tar.xz";

     

       67
       67
       +
           url = "http://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz";

     

       68
       68
       +
           sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861";

     

       69
       69
        
           md5 = "";

     

       70
       70
       -
           md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz";

     

       70
       70
       +
           md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz";

     

       71
       71
        
         }

     

       72
       72
        
         {

     

       73
       73
        
           name = "clucene-core-2.3.3.4.tar.gz";

     
···

       75
       75
        
           sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab";

     

       76
       76
        
           md5 = "48d647fbd8ef8889e5a7f422c1bfda94";

     

       77
       77
        
           md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";

     

       78
       78
       +
         }

     

       79
       79
       +
         {

     

       80
       80
       +
           name = "dtoa-20180411.tgz";

     

       81
       81
       +
           url = "http://dev-www.libreoffice.org/src/dtoa-20180411.tgz";

     

       82
       82
       +
           sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4";

     

       83
       83
       +
           md5 = "";

     

       84
       84
       +
           md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";

     

       78
       85
        
         }

     

       79
       86
        
         {

     

       80
       87
        
           name = "libcmis-0.5.2.tar.xz";

     
···

       91
       98
        
           md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";

     

       92
       99
        
         }

     

       93
       100
        
         {

     

       94
       94
       -
           name = "cppunit-1.14.0.tar.gz";

     

       95
       95
       -
           url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";

     

       96
       96
       -
           sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780";

     

       101
       101
       +
           name = "cppunit-1.15.1.tar.gz";

     

       102
       102
       +
           url = "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz";

     

       103
       103
       +
           sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7";

     

       97
       104
        
           md5 = "";

     

       98
       98
       -
           md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz";

     

       105
       105
       +
           md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";

     

       99
       106
        
         }

     

       100
       107
        
         {

     

       101
       108
        
           name = "converttexttonumber-1-5-0.oxt";

     
···

       105
       112
        
           md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";

     

       106
       113
        
         }

     

       107
       114
        
         {

     

       108
       108
       -
           name = "curl-7.65.0.tar.xz";

     

       109
       109
       -
           url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz";

     

       110
       110
       -
           sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd";

     

       115
       115
       +
           name = "curl-7.71.0.tar.xz";

     

       116
       116
       +
           url = "http://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz";

     

       117
       117
       +
           sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772";

     

       111
       118
        
           md5 = "";

     

       112
       112
       -
           md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz";

     

       119
       119
       +
           md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz";

     

       113
       120
        
         }

     

       114
       121
        
         {

     

       115
       122
        
           name = "libe-book-0.1.3.tar.xz";

     
···

       161
       168
        
           md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";

     

       162
       169
        
         }

     

       163
       170
        
         {

     

       164
       164
       -
           name = "fontconfig-2.12.6.tar.bz2";

     

       165
       165
       -
           url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2";

     

       166
       166
       -
           sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017";

     

       171
       171
       +
           name = "fontconfig-2.13.91.tar.gz";

     

       172
       172
       +
           url = "http://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz";

     

       173
       173
       +
           sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5";

     

       167
       174
        
           md5 = "";

     

       168
       168
       -
           md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2";

     

       175
       175
       +
           md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz";

     

       169
       176
        
         }

     

       170
       177
        
         {

     

       171
       178
        
           name = "crosextrafonts-20130214.tar.gz";

     
···

       315
       322
        
           md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2";

     

       316
       323
        
         }

     

       317
       324
        
         {

     

       318
       318
       -
           name = "glm-0.9.4.6-libreoffice.zip";

     

       319
       319
       -
           url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";

     

       320
       320
       -
           sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a";

     

       321
       321
       -
           md5 = "bae83fa5dc7f081768daace6e199adc3";

     

       322
       322
       -
           md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";

     

       325
       325
       +
           name = "glm-0.9.9.7.zip";

     

       326
       326
       +
           url = "http://dev-www.libreoffice.org/src/glm-0.9.9.7.zip";

     

       327
       327
       +
           sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95";

     

       328
       328
       +
           md5 = "";

     

       329
       329
       +
           md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip";

     

       323
       330
        
         }

     

       324
       331
        
         {

     

       325
       332
        
           name = "gpgme-1.9.0.tar.bz2";

     
···

       329
       336
        
           md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";

     

       330
       337
        
         }

     

       331
       338
        
         {

     

       332
       332
       -
           name = "graphite2-minimal-1.3.13.tgz";

     

       333
       333
       -
           url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz";

     

       334
       334
       -
           sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36";

     

       339
       339
       +
           name = "graphite2-minimal-1.3.14.tgz";

     

       340
       340
       +
           url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz";

     

       341
       341
       +
           sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc";

     

       335
       342
        
           md5 = "";

     

       336
       336
       -
           md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz";

     

       343
       343
       +
           md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";

     

       337
       344
        
         }

     

       338
       345
        
         {

     

       339
       346
        
           name = "harfbuzz-2.6.0.tar.xz";

     
···

       364
       371
        
           md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";

     

       365
       372
        
         }

     

       366
       373
        
         {

     

       367
       367
       -
           name = "icu4c-65_1-src.tgz";

     

       368
       368
       -
           url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz";

     

       369
       369
       -
           sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948";

     

       374
       374
       +
           name = "icu4c-67_1-src.tgz";

     

       375
       375
       +
           url = "http://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz";

     

       376
       376
       +
           sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc";

     

       370
       377
        
           md5 = "";

     

       371
       371
       -
           md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz";

     

       378
       378
       +
           md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz";

     

       372
       379
        
         }

     

       373
       380
        
         {

     

       374
       374
       -
           name = "icu4c-65_1-data.zip";

     

       375
       375
       -
           url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip";

     

       376
       376
       -
           sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6";

     

       381
       381
       +
           name = "icu4c-67_1-data.zip";

     

       382
       382
       +
           url = "http://dev-www.libreoffice.org/src/icu4c-67_1-data.zip";

     

       383
       383
       +
           sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e";

     

       377
       384
        
           md5 = "";

     

       378
       378
       -
           md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip";

     

       385
       385
       +
           md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip";

     

       379
       386
        
         }

     

       380
       387
        
         {

     

       381
       388
        
           name = "flow-engine-0.9.4.zip";

     
···

       462
       469
        
           md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";

     

       463
       470
        
         }

     

       464
       471
        
         {

     

       465
       465
       -
           name = "language-subtag-registry-2019-09-16.tar.bz2";

     

       466
       466
       -
           url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2";

     

       467
       467
       -
           sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a";

     

       472
       472
       +
           name = "language-subtag-registry-2020-04-01.tar.bz2";

     

       473
       473
       +
           url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";

     

       474
       474
       +
           sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da";

     

       468
       475
        
           md5 = "";

     

       469
       469
       -
           md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2";

     

       476
       476
       +
           md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2";

     

       470
       477
        
         }

     

       471
       478
        
         {

     

       472
       479
        
           name = "JLanguageTool-1.7.0.tar.bz2";

     
···

       532
       539
        
           md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";

     

       533
       540
        
         }

     

       534
       541
        
         {

     

       535
       535
       -
           name = "libnumbertext-1.0.5.tar.xz";

     

       536
       536
       -
           url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz";

     

       537
       537
       -
           sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7";

     

       542
       542
       +
           name = "libnumbertext-1.0.6.tar.xz";

     

       543
       543
       +
           url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz";

     

       544
       544
       +
           sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57";

     

       538
       545
        
           md5 = "";

     

       539
       539
       -
           md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz";

     

       546
       546
       +
           md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz";

     

       540
       547
        
         }

     

       541
       548
        
         {

     

       542
       549
        
           name = "ltm-1.0.zip";

     
···

       546
       553
        
           md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";

     

       547
       554
        
         }

     

       548
       555
        
         {

     

       549
       549
       -
           name = "xmlsec1-1.2.28.tar.gz";

     

       550
       550
       -
           url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz";

     

       551
       551
       -
           sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4";

     

       556
       556
       +
           name = "xmlsec1-1.2.30.tar.gz";

     

       557
       557
       +
           url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz";

     

       558
       558
       +
           sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8";

     

       552
       559
        
           md5 = "";

     

       553
       553
       -
           md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz";

     

       560
       560
       +
           md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";

     

       554
       561
        
         }

     

       555
       562
        
         {

     

       556
       563
        
           name = "libxml2-2.9.10.tar.gz";

     
···

       581
       588
        
           md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";

     

       582
       589
        
         }

     

       583
       590
        
         {

     

       584
       584
       -
           name = "mariadb_client-2.0.0-src.tar.gz";

     

       585
       585
       -
           url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";

     

       586
       586
       -
           sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60";

     

       587
       587
       -
           md5 = "a233181e03d3c307668b4c722d881661";

     

       588
       588
       -
           md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";

     

       591
       591
       +
           name = "mariadb-connector-c-3.1.8-src.tar.gz";

     

       592
       592
       +
           url = "http://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";

     

       593
       593
       +
           sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b";

     

       594
       594
       +
           md5 = "";

     

       595
       595
       +
           md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz";

     

       589
       596
        
         }

     

       590
       597
        
         {

     

       591
       591
       -
           name = "mdds-1.5.0.tar.bz2";

     

       592
       592
       -
           url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2";

     

       593
       593
       -
           sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d";

     

       598
       598
       +
           name = "mdds-1.6.0.tar.bz2";

     

       599
       599
       +
           url = "http://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";

     

       600
       600
       +
           sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d";

     

       594
       601
        
           md5 = "";

     

       595
       595
       -
           md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2";

     

       602
       602
       +
           md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2";

     

       596
       603
        
         }

     

       597
       604
        
         {

     

       598
       605
        
           name = "mDNSResponder-878.200.35.tar.gz";

     
···

       609
       616
        
           md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";

     

       610
       617
        
         }

     

       611
       618
        
         {

     

       612
       612
       -
           name = "libmwaw-0.3.15.tar.xz";

     

       613
       613
       -
           url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz";

     

       614
       614
       -
           sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1";

     

       619
       619
       +
           name = "libmwaw-0.3.16.tar.xz";

     

       620
       620
       +
           url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz";

     

       621
       621
       +
           sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868";

     

       615
       622
        
           md5 = "";

     

       616
       616
       -
           md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz";

     

       623
       623
       +
           md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz";

     

       617
       624
        
         }

     

       618
       625
        
         {

     

       619
       626
        
           name = "mythes-1.2.4.tar.gz";

     
···

       644
       651
        
           md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";

     

       645
       652
        
         }

     

       646
       653
        
         {

     

       647
       647
       -
           name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar";

     

       648
       648
       -
           url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar";

     

       649
       649
       -
           sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504";

     

       654
       654
       +
           name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";

     

       655
       655
       +
           url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";

     

       656
       656
       +
           sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0";

     

       650
       657
        
           md5 = "";

     

       651
       651
       -
           md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar";

     

       658
       658
       +
           md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";

     

       652
       659
        
         }

     

       653
       660
        
         {

     

       654
       661
        
           name = "officeotron-0.7.4-master.jar";

     
···

       672
       679
        
           md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";

     

       673
       680
        
         }

     

       674
       681
        
         {

     

       675
       675
       -
           name = "liborcus-0.15.3.tar.gz";

     

       676
       676
       -
           url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz";

     

       677
       677
       -
           sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2";

     

       682
       682
       +
           name = "liborcus-0.15.4.tar.bz2";

     

       683
       683
       +
           url = "http://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2";

     

       684
       684
       +
           sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61";

     

       678
       685
        
           md5 = "";

     

       679
       679
       -
           md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz";

     

       686
       686
       +
           md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2";

     

       680
       687
        
         }

     

       681
       688
        
         {

     

       682
       689
        
           name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";

     
···

       693
       700
        
           md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";

     

       694
       701
        
         }

     

       695
       702
        
         {

     

       696
       696
       -
           name = "pdfium-3963.tar.bz2";

     

       697
       697
       -
           url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2";

     

       698
       698
       -
           sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895";

     

       703
       703
       +
           name = "pdfium-4137.tar.bz2";

     

       704
       704
       +
           url = "http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2";

     

       705
       705
       +
           sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6";

     

       699
       706
        
           md5 = "";

     

       700
       700
       -
           md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2";

     

       707
       707
       +
           md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2";

     

       701
       708
        
         }

     

       702
       709
        
         {

     

       703
       710
        
           name = "pixman-0.34.0.tar.gz";

     
···

       791
       798
        
           md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";

     

       792
       799
        
         }

     

       793
       800
        
         {

     

       794
       794
       -
           name = "libstaroffice-0.0.6.tar.xz";

     

       795
       795
       -
           url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz";

     

       796
       796
       -
           sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4";

     

       801
       801
       +
           name = "skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz";

     

       802
       802
       +
           url = "http://dev-www.libreoffice.org/src/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz";

     

       803
       803
       +
           sha256 = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0";

     

       797
       804
        
           md5 = "";

     

       798
       798
       -
           md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz";

     

       805
       805
       +
           md5name = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0-skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz";

     

       806
       806
       +
         }

     

       807
       807
       +
         {

     

       808
       808
       +
           name = "libstaroffice-0.0.7.tar.xz";

     

       809
       809
       +
           url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz";

     

       810
       810
       +
           sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db";

     

       811
       811
       +
           md5 = "";

     

       812
       812
       +
           md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz";

     

       799
       813
        
         }

     

       800
       814
        
         {

     

       801
       815
        
           name = "swingExSrc.zip";

     
···

       840
       854
        
           md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz";

     

       841
       855
        
         }

     

       842
       856
        
         {

     

       843
       843
       -
           name = "libwps-0.4.10.tar.xz";

     

       844
       844
       -
           url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz";

     

       845
       845
       -
           sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca";

     

       857
       857
       +
           name = "libwps-0.4.11.tar.xz";

     

       858
       858
       +
           url = "http://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz";

     

       859
       859
       +
           sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1";

     

       846
       860
        
           md5 = "";

     

       847
       847
       -
           md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz";

     

       861
       861
       +
           md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz";

     

       848
       862
        
         }

     

       849
       863
        
         {

     

       850
       864
        
           name = "xsltml_2.1.2.zip";

+7 -7

pkgs/applications/office/libreoffice/src-fresh/primary.nix

···

       6
       6
        
           inherit sha256;

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
       -
         major = "6";

     

       10
       10
       -
         minor = "4";

     

       11
       11
       -
         patch = "3";

     

       12
       12
       -
         tweak = "2";

     

       9
       9
       +
         major = "7";

     

       10
       10
       +
         minor = "0";

     

       11
       11
       +
         patch = "0";

     

       12
       12
       +
         tweak = "3";

     

       13
       13
        
       

     

       14
       14
        
         subdir = "${major}.${minor}.${patch}";

     

       15
       15
        
       

     
···

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";

     

       20
       20
       -
           sha256 = "1cmbrhha7mlflnlbpla8fix07cxcgkdb7krnrgs1bylf31y5855w";

     

       20
       20
       +
           sha256 = "sha256-sl+vgnLGIWtyw8Y/ovVsxThdOMg2Gby4SRaiaqvZVB0=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # FIXME rename

     

       24
       24
        
         translations = fetchSrc {

     

       25
       25
        
           name = "translations";

     

       26
       26
       -
           sha256 = "06z9hz4m3kdcljjc6y5s18001axjibj9xiyakdndkl9pmnnhn9h3";

     

       26
       26
       +
           sha256 = "sha256-i3yfD5cmM6D9BctjablIFRqfibjrwLAaxxPIsQdk0sY=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from

     
···

       31
       31
        
       

     

       32
       32
        
         help = fetchSrc {

     

       33
       33
        
           name = "help";

     

       34
       34
       -
           sha256 = "0mpgrwg8z1q38j03l6m1sdpcplyjd5nz1nqaa13vfkryj2lflw45";

     

       34
       34
       +
           sha256 = "sha256-hYBEEPRmh16zgGZBUN20xfTY6qL07aKMC1lC/0ij9/0=";

     

       35
       35
        
         };

     

       36
       36
        
       }

+2 -2

pkgs/applications/office/wpsoffice/default.nix

···

       12
       12
        
       , cups

     

       13
       13
        
       , dbus

     

       14
       14
        
       , expat

     

       15
       15
       -
       , ffmpeg_3

     

       15
       15
       +
       , ffmpeg

     

       16
       16
        
       , fontconfig

     

       17
       17
        
       , freetype

     

       18
       18
        
       , gdk-pixbuf

     
···

       71
       71
        
           cairo

     

       72
       72
        
           dbus.lib

     

       73
       73
        
           expat

     

       74
       74
       -
           ffmpeg_3

     

       74
       74
       +
           ffmpeg

     

       75
       75
        
           fontconfig

     

       76
       76
        
           freetype

     

       77
       77
        
           gdk-pixbuf

pkgs/top-level/all-packages.nix

···

       21487
       21487
        
           libreoffice = callPackage ../applications/office/libreoffice

     

       21488
       21488
        
             (libreoffice-args // {

     

       21489
       21489
        
               variant = "fresh";

     

       21490
       21490
       +
               jdk = jdk11;

     

       21490
       21491
        
             });

     

       21491
       21492
        
         });

     

       21492
       21493
        
         libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;