commit 6317a19147f759a91e0cc37a236f1a070357a966 · pyrox.dev/nixpkgs

-1

nixos/tests/all-tests.nix

···

       157
       157
        
         gobgpd = handleTest ./gobgpd.nix {};

     

       158
       158
        
         gocd-agent = handleTest ./gocd-agent.nix {};

     

       159
       159
        
         gocd-server = handleTest ./gocd-server.nix {};

     

       160
       160
       -
         google-cloud-sdk = handleTest ./google-cloud-sdk.nix {};

     

       161
       160
        
         google-oslogin = handleTest ./google-oslogin {};

     

       162
       161
        
         gotify-server = handleTest ./gotify-server.nix {};

     

       163
       162
        
         grafana = handleTest ./grafana.nix {};

-13

nixos/tests/google-cloud-sdk.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       2
       2
       -
         name = "google-cloud-sdk";

     

       3
       3
       -
         meta = with pkgs.lib.maintainers; { maintainers = [ iammrinal0 ]; };

     

       4
       4
       -
       

     

       5
       5
       -
         machine = { pkgs, ... }: {

     

       6
       6
       -
           environment.systemPackages = [ pkgs.google-cloud-sdk ];

     

       7
       7
       -
         };

     

       8
       8
       -
       

     

       9
       9
       -
         testScript = ''

     

       10
       10
       -
           import json

     

       11
       11
       -
           assert "${pkgs.google-cloud-sdk.version}" in json.loads(machine.succeed("gcloud version --format json"))["Google Cloud SDK"]

     

       12
       12
       -
         '';

     

       13
       13
       -
       })

+5 -5

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

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.

     

       4
       4
       -
       let rev = "981a3ffd4368600eb1a5bca3f12a251e80895d37";

     

       4
       4
       +
       let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3";

     

       5
       5
        
       in

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "sonobuoy";

     

       8
       8
       -
         version = "0.53.2"; # Do not forget to update `rev` above

     

       8
       8
       +
         version = "0.54.0"; # Do not forget to update `rev` above

     

       9
       9
        
       

     

       10
       10
        
         ldflags =

     

       11
       11
        
           let t = "github.com/vmware-tanzu/sonobuoy";

     
···

       17
       17
        
           ];

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
       -
           sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY=";

     

       21
       21
       -
           rev = "v${version}";

     

       22
       22
       -
           repo = "sonobuoy";

     

       23
       20
        
           owner = "vmware-tanzu";

     

       21
       21
       +
           repo = "sonobuoy";

     

       22
       22
       +
           rev = "v${version}";

     

       23
       23
       +
           sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24=";

+3 -5

pkgs/applications/office/khronos/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "khronos";

     

       21
       21
       -
         version = "3.6.0";

     

       21
       21
       +
         version = "3.6.1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "lainsce";

     

       25
       25
        
           repo = pname;

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE=";

     

       27
       27
       +
           sha256 = "sha256-+gZy8cdekM26J1ujqFmfBXTctXc9E//EY42ZoLq9rBs=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

     
···

       48
       48
        
         postPatch = ''

     

       49
       49
        
           chmod +x build-aux/post_install.py

     

       50
       50
        
           patchShebangs build-aux/post_install.py

     

       51
       51
       -
           # https://github.com/lainsce/khronos/pull/75

     

       52
       52
       -
           substituteInPlace build-aux/post_install.py \

     

       53
       53
       -
             --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache'

     

       54
       51
        
         '';

     

       55
       52
        
       

     

       56
       53
        
         passthru = {

     
···

       65
       62
        
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       66
       63
        
           platforms = platforms.linux;

     

       67
       64
        
           license = licenses.gpl3Plus;

     

       65
       65
       +
           mainProgram = "io.github.lainsce.Khronos";

     

       68
       66
        
         };

     

       69
       67
        
       }

+3 -5

pkgs/applications/office/libreoffice/default.nix

···

       2
       2
        
       , IOCompress, zlib, libjpeg, expat, freetype, libwpd

     

       3
       3
        
       , libxml2, db, curl, fontconfig, libsndfile, neon

     

       4
       4
        
       , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which

     

       5
       5
       -
       , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge

     

       5
       5
       +
       , icu, boost, jdk, ant, cups, xorg, fontforge

     

       6
       6
        
       , openssl, gperf, cppunit, poppler, util-linux

     

       7
       7
        
       , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient

     

       8
       8
        
       , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr

     
···

       310
       310
        
           "--with-boost-libdir=${boost.out}/lib"

     

       311
       311
        
           "--with-beanshell-jar=${bsh}"

     

       312
       312
        
           "--with-vendor=NixOS"

     

       313
       313
       -
           "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"

     

       314
       313
        
           "--disable-report-builder"

     

       315
       314
        
           "--disable-online-update"

     

       316
       315
        
           "--enable-python=system"

     
···

       324
       323
        
           "--with-system-headers"

     

       325
       324
        
           "--with-system-openssl"

     

       326
       325
        
           "--with-system-libabw"

     

       327
       327
       -
           "--with-system-libcmis"

     

       326
       326
       +
           "--without-system-libcmis"

     

       328
       327
        
           "--with-system-libwps"

     

       329
       328
        
           "--with-system-openldap"

     

       330
       329
        
           "--with-system-coinmp"

     
···

       365
       364
        
           "--without-system-mdds" # we have mdds but our version is too new

     

       366
       365
        
           # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f

     

       367
       366
        
           "--without-system-orcus"

     

       368
       368
       -
           "--without-system-qrcodegen"

     

       369
       367
        
           "--without-system-xmlsec"

     

       370
       368
        
         ] ++ lib.optionals kdeIntegration [

     

       371
       369
        
           "--enable-kf5"

     
···

       394
       392
        
             glib libmysqlclient

     

       395
       393
        
             neon nspr nss openldap openssl pam perl pkg-config poppler

     

       396
       394
        
             python3 sane-backends unzip which zip zlib

     

       397
       397
       -
             mdds bluez5 libcmis libwps libabw libzmf

     

       395
       395
       +
             mdds bluez5 libwps libabw libzmf

     

       398
       396
        
             libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux

     

       399
       397
        
             librevenge libe-book libmwaw glm ncurses epoxy

     

       400
       398
        
             libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext

+90 -97

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

···

       7
       7
        
           md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";

     

       8
       8
        
         }

     

       9
       9
        
         {

     

       10
       10
       -
           name = "commons-logging-1.2-src.tar.gz";

     

       11
       11
       -
           url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";

     

       12
       12
       -
           sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81";

     

       13
       13
       -
           md5 = "";

     

       14
       14
       -
           md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz";

     

       15
       15
       -
         }

     

       16
       16
       -
         {

     

       17
       10
        
           name = "apr-1.5.2.tar.gz";

     

       18
       11
        
           url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";

     

       19
       12
        
           sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";

     
···

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

     

       29
       22
        
         }

     

       30
       23
        
         {

     

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

     

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

     

       33
       33
       -
           sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543";

     

       24
       24
       +
           name = "boost_1_75_0.tar.xz";

     

       25
       25
       +
           url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz";

     

       26
       26
       +
           sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b";

     

       34
       27
        
           md5 = "";

     

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

     

       28
       28
       +
           md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz";

     

       36
       29
        
         }

     

       37
       30
        
         {

     

       38
       31
        
           name = "box2d-2.3.1.tar.gz";

     
···

       42
       35
        
           md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz";

     

       43
       36
        
         }

     

       44
       37
        
         {

     

       45
       45
       -
           name = "breakpad.zip";

     

       46
       46
       -
           url = "https://dev-www.libreoffice.org/src/breakpad.zip";

     

       47
       47
       -
           sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";

     

       38
       38
       +
           name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";

     

       39
       39
       +
           url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";

     

       40
       40
       +
           sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91";

     

       48
       41
        
           md5 = "";

     

       49
       49
       -
           md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip";

     

       42
       42
       +
           md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";

     

       50
       43
        
         }

     

       51
       44
        
         {

     

       52
       45
        
           name = "bsh-2.0b6-src.zip";

     
···

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

     

       71
       64
        
         }

     

       72
       65
        
         {

     

       73
       73
       -
           name = "libcdr-0.1.6.tar.xz";

     

       74
       74
       -
           url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz";

     

       75
       75
       -
           sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861";

     

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

     

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

     

       68
       68
       +
           sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4";

     

       76
       69
        
           md5 = "";

     

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

     

       70
       70
       +
           md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz";

     

       78
       71
        
         }

     

       79
       72
        
         {

     

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

     
···

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

     

       120
       113
        
         }

     

       121
       114
        
         {

     

       122
       122
       -
           name = "curl-7.71.0.tar.xz";

     

       123
       123
       -
           url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz";

     

       124
       124
       -
           sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772";

     

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

     

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

     

       117
       117
       +
           sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";

     

       125
       118
        
           md5 = "";

     

       126
       126
       -
           md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz";

     

       119
       119
       +
           md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";

     

       127
       120
        
         }

     

       128
       121
        
         {

     

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

     
···

       154
       147
        
           md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";

     

       155
       148
        
         }

     

       156
       149
        
         {

     

       157
       157
       -
           name = "libetonyek-0.1.9.tar.xz";

     

       158
       158
       -
           url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz";

     

       159
       159
       -
           sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a";

     

       150
       150
       +
           name = "libetonyek-0.1.10.tar.xz";

     

       151
       151
       +
           url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz";

     

       152
       152
       +
           sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a";

     

       160
       153
        
           md5 = "";

     

       161
       161
       -
           md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";

     

       154
       154
       +
           md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";

     

       162
       155
        
         }

     

       163
       156
        
         {

     

       164
       157
        
           name = "expat-2.4.1.tar.bz2";

     
···

       168
       161
        
           md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";

     

       169
       162
        
         }

     

       170
       163
        
         {

     

       171
       171
       -
           name = "Firebird-3.0.0.32483-0.tar.bz2";

     

       172
       172
       -
           url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";

     

       173
       173
       -
           sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";

     

       164
       164
       +
           name = "Firebird-3.0.7.33374-0.tar.bz2";

     

       165
       165
       +
           url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2";

     

       166
       166
       +
           sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76";

     

       174
       167
        
           md5 = "";

     

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

     

       168
       168
       +
           md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";

     

       176
       169
        
         }

     

       177
       170
        
         {

     

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

     
···

       217
       210
        
           md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz";

     

       218
       211
        
         }

     

       219
       212
        
         {

     

       220
       220
       -
           name = "liberation-fonts-ttf-2.00.4.tar.gz";

     

       221
       221
       -
           url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz";

     

       222
       222
       -
           sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45";

     

       213
       213
       +
           name = "liberation-fonts-ttf-2.1.4.tar.gz";

     

       214
       214
       +
           url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz";

     

       215
       215
       +
           sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef";

     

       223
       216
        
           md5 = "";

     

       224
       224
       -
           md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz";

     

       217
       217
       +
           md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz";

     

       225
       218
        
         }

     

       226
       219
        
         {

     

       227
       220
        
           name = "LinLibertineG-20120116.zip";

     
···

       266
       259
        
           md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";

     

       267
       260
        
         }

     

       268
       261
        
         {

     

       269
       269
       -
           name = "culmus-0.131.tar.gz";

     

       270
       270
       -
           url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";

     

       271
       271
       -
           sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";

     

       262
       262
       +
           name = "culmus-0.133.tar.gz";

     

       263
       263
       +
           url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz";

     

       264
       264
       +
           sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05";

     

       272
       265
        
           md5 = "";

     

       273
       273
       -
           md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";

     

       266
       266
       +
           md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz";

     

       274
       267
        
         }

     

       275
       268
        
         {

     

       276
       269
        
           name = "libre-hebrew-1.0.tar.gz";

     
···

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

     

       379
       372
        
         }

     

       380
       373
        
         {

     

       381
       381
       -
           name = "icu4c-68_1-src.tgz";

     

       382
       382
       -
           url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz";

     

       383
       383
       -
           sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d";

     

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

     

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

     

       376
       376
       +
           sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745";

     

       384
       377
        
           md5 = "";

     

       385
       385
       -
           md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz";

     

       378
       378
       +
           md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz";

     

       386
       379
        
         }

     

       387
       380
        
         {

     

       388
       388
       -
           name = "icu4c-68_1-data.zip";

     

       389
       389
       -
           url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip";

     

       390
       390
       -
           sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510";

     

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

     

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

     

       383
       383
       +
           sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf";

     

       391
       384
        
           md5 = "";

     

       392
       392
       -
           md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip";

     

       385
       385
       +
           md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip";

     

       393
       386
        
         }

     

       394
       387
        
         {

     

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

     
···

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

     

       477
       470
        
         }

     

       478
       471
        
         {

     

       479
       479
       -
           name = "language-subtag-registry-2021-03-05.tar.bz2";

     

       480
       480
       -
           url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2";

     

       481
       481
       -
           sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a";

     

       472
       472
       +
           name = "language-subtag-registry-2021-08-06.tar.bz2";

     

       473
       473
       +
           url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2";

     

       474
       474
       +
           sha256 = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b";

     

       482
       475
        
           md5 = "";

     

       483
       483
       -
           md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2";

     

       476
       476
       +
           md5name = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b-language-subtag-registry-2021-08-06.tar.bz2";

     

       484
       477
        
         }

     

       485
       478
        
         {

     

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

     
···

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

     

       561
       554
        
         }

     

       562
       555
        
         {

     

       563
       563
       -
           name = "xmlsec1-1.2.30.tar.gz";

     

       564
       564
       -
           url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz";

     

       565
       565
       -
           sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8";

     

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

     

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

     

       558
       558
       +
           sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043";

     

       566
       559
        
           md5 = "";

     

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

     

       560
       560
       +
           md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz";

     

       568
       561
        
         }

     

       569
       562
        
         {

     

       570
       563
        
           name = "libxml2-2.9.12.tar.gz";

     
···

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

     

       624
       617
        
         }

     

       625
       618
        
         {

     

       626
       626
       -
           name = "libmwaw-0.3.17.tar.xz";

     

       627
       627
       -
           url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz";

     

       628
       628
       -
           sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c";

     

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

     

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

     

       621
       621
       +
           sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af";

     

       629
       622
        
           md5 = "";

     

       630
       630
       -
           md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz";

     

       623
       623
       +
           md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz";

     

       631
       624
        
         }

     

       632
       625
        
         {

     

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

     
···

       651
       644
        
           md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz";

     

       652
       645
        
         }

     

       653
       646
        
         {

     

       654
       654
       -
           name = "libodfgen-0.1.6.tar.bz2";

     

       655
       655
       -
           url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";

     

       656
       656
       -
           sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2";

     

       647
       647
       +
           name = "libodfgen-0.1.8.tar.xz";

     

       648
       648
       +
           url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz";

     

       649
       649
       +
           sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625";

     

       657
       650
        
           md5 = "";

     

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

     

       651
       651
       +
           md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz";

     

       659
       652
        
         }

     

       660
       653
        
         {

     

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

     
···

       679
       672
        
           md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";

     

       680
       673
        
         }

     

       681
       674
        
         {

     

       682
       682
       -
           name = "openssl-1.1.1i.tar.gz";

     

       683
       683
       -
           url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz";

     

       684
       684
       -
           sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242";

     

       675
       675
       +
           name = "openssl-1.1.1l.tar.gz";

     

       676
       676
       +
           url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz";

     

       677
       677
       +
           sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1";

     

       685
       678
        
           md5 = "";

     

       686
       686
       -
           md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz";

     

       679
       679
       +
           md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz";

     

       687
       680
        
         }

     

       688
       681
        
         {

     

       689
       682
        
           name = "liborcus-0.16.1.tar.bz2";

     
···

       693
       686
        
           md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2";

     

       694
       687
        
         }

     

       695
       688
        
         {

     

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

     

       697
       697
       -
           url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";

     

       698
       698
       -
           sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb";

     

       699
       699
       -
           md5 = "";

     

       700
       700
       -
           md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";

     

       701
       701
       -
         }

     

       702
       702
       -
         {

     

       703
       689
        
           name = "libpagemaker-0.0.4.tar.xz";

     

       704
       690
        
           url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";

     

       705
       691
        
           sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d";

     
···

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

     

       708
       694
        
         }

     

       709
       695
        
         {

     

       710
       710
       -
           name = "pdfium-4306.tar.bz2";

     

       711
       711
       -
           url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2";

     

       712
       712
       -
           sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8";

     

       696
       696
       +
           name = "pdfium-4500.tar.bz2";

     

       697
       697
       +
           url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2";

     

       698
       698
       +
           sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304";

     

       713
       699
        
           md5 = "";

     

       714
       714
       -
           md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2";

     

       700
       700
       +
           md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2";

     

       715
       701
        
         }

     

       716
       702
        
         {

     

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

     
···

       735
       721
        
           md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";

     

       736
       722
        
         }

     

       737
       723
        
         {

     

       724
       724
       +
           name = "poppler-data-0.4.10.tar.gz";

     

       725
       725
       +
           url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz";

     

       726
       726
       +
           sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30";

     

       727
       727
       +
           md5 = "";

     

       728
       728
       +
           md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";

     

       729
       729
       +
         }

     

       730
       730
       +
         {

     

       738
       731
        
           name = "postgresql-13.1.tar.bz2";

     

       739
       732
        
           url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";

     

       740
       733
        
           sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";

     
···

       742
       735
        
           md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";

     

       743
       736
        
         }

     

       744
       737
        
         {

     

       745
       745
       -
           name = "Python-3.8.8rc1.tar.xz";

     

       746
       746
       -
           url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz";

     

       747
       747
       -
           sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6";

     

       748
       748
       -
           md5 = "";

     

       749
       749
       -
           md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz";

     

       750
       750
       -
         }

     

       751
       751
       -
         {

     

       752
       752
       -
           name = "QR-Code-generator-1.4.0.tar.gz";

     

       753
       753
       -
           url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";

     

       754
       754
       -
           sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a";

     

       738
       738
       +
           name = "Python-3.8.10.tar.xz";

     

       739
       739
       +
           url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz";

     

       740
       740
       +
           sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9";

     

       755
       741
        
           md5 = "";

     

       756
       756
       -
           md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz";

     

       742
       742
       +
           md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz";

     

       757
       743
        
         }

     

       758
       744
        
         {

     

       759
       745
        
           name = "libqxp-0.0.2.tar.xz";

     
···

       798
       784
        
           md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";

     

       799
       785
        
         }

     

       800
       786
        
         {

     

       801
       801
       -
           name = "serf-1.2.1.tar.bz2";

     

       802
       802
       -
           url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";

     

       803
       803
       -
           sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700";

     

       787
       787
       +
           name = "serf-1.3.9.tar.bz2";

     

       788
       788
       +
           url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2";

     

       789
       789
       +
           sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc";

     

       804
       790
        
           md5 = "";

     

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

     

       791
       791
       +
           md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2";

     

       806
       792
        
         }

     

       807
       793
        
         {

     

       808
       808
       -
           name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";

     

       809
       809
       -
           url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";

     

       810
       810
       -
           sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301";

     

       794
       794
       +
           name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";

     

       795
       795
       +
           url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";

     

       796
       796
       +
           sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d";

     

       811
       797
        
           md5 = "";

     

       812
       812
       -
           md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";

     

       798
       798
       +
           md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";

     

       813
       799
        
         }

     

       814
       800
        
         {

     

       815
       801
        
           name = "libstaroffice-0.0.7.tar.xz";

     
···

       887
       873
        
           sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";

     

       888
       874
        
           md5 = "";

     

       889
       875
        
           md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";

     

       876
       876
       +
         }

     

       877
       877
       +
         {

     

       878
       878
       +
           name = "zxing-cpp-1.1.1.tar.gz";

     

       879
       879
       +
           url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz";

     

       880
       880
       +
           sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86";

     

       881
       881
       +
           md5 = "";

     

       882
       882
       +
           md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz";

     

       890
       883
        
         }

     

       891
       884
        
       ]

+1 -1

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

···

       6
       6
        
         '';

     

       7
       7
        
         configureFlags = attrs.configureFlags ++ [

     

       8
       8
        
           (lib.enableFeature kdeIntegration "kf5")

     

       9
       9
       +
           "--without-system-zxing"

     

       9
       10
        
         ];

     

       10
       10
       -
         patches = [ ../xdg-open-brief.patch ]; # drop this when switching fresh to 7.2.0

     

       11
       11
        
       }

+5 -5

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

···

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         major = "7";

     

       10
       10
       -
         minor = "1";

     

       11
       11
       -
         patch = "5";

     

       10
       10
       +
         minor = "2";

     

       11
       11
       +
         patch = "2";

     

       12
       12
        
         tweak = "2";

     

       13
       13
        
       

     

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

     
···

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

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

     

       20
       20
       -
           sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf";

     

       20
       20
       +
           sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # FIXME rename

     

       24
       24
        
         translations = fetchSrc {

     

       25
       25
        
           name = "translations";

     

       26
       26
       -
           sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq";

     

       26
       26
       +
           sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq";

     

       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 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a";

     

       34
       34
       +
           sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883";

     

       35
       35
        
         };

     

       36
       36
        
       }

+83 -76

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

···

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

     

       36
       36
        
         }

     

       37
       37
        
         {

     

       38
       38
       +
           name = "box2d-2.3.1.tar.gz";

     

       39
       39
       +
           url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz";

     

       40
       40
       +
           sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c";

     

       41
       41
       +
           md5 = "";

     

       42
       42
       +
           md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz";

     

       43
       43
       +
         }

     

       44
       44
       +
         {

     

       38
       45
        
           name = "breakpad.zip";

     

       39
       46
        
           url = "https://dev-www.libreoffice.org/src/breakpad.zip";

     

       40
       47
        
           sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";

     
···

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

     

       113
       120
        
         }

     

       114
       121
        
         {

     

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

     

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

     

       117
       117
       -
           sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772";

     

       122
       122
       +
           name = "curl-7.78.0.tar.xz";

     

       123
       123
       +
           url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz";

     

       124
       124
       +
           sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";

     

       118
       125
        
           md5 = "";

     

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

     

       126
       126
       +
           md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";

     

       120
       127
        
         }

     

       121
       128
        
         {

     

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

     
···

       154
       161
        
           md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";

     

       155
       162
        
         }

     

       156
       163
        
         {

     

       157
       157
       -
           name = "expat-2.2.8.tar.bz2";

     

       158
       158
       -
           url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";

     

       159
       159
       -
           sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";

     

       164
       164
       +
           name = "expat-2.4.1.tar.bz2";

     

       165
       165
       +
           url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2";

     

       166
       166
       +
           sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40";

     

       160
       167
        
           md5 = "";

     

       161
       161
       -
           md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";

     

       168
       168
       +
           md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";

     

       162
       169
        
         }

     

       163
       170
        
         {

     

       164
       171
        
           name = "Firebird-3.0.0.32483-0.tar.bz2";

     
···

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

     

       330
       337
        
         }

     

       331
       338
        
         {

     

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

     

       333
       333
       -
           url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";

     

       334
       334
       -
           sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";

     

       339
       339
       +
           name = "gpgme-1.13.1.tar.bz2";

     

       340
       340
       +
           url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2";

     

       341
       341
       +
           sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46";

     

       335
       342
        
           md5 = "";

     

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

     

       343
       343
       +
           md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2";

     

       337
       344
        
         }

     

       338
       345
        
         {

     

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

     
···

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

     

       372
       379
        
         }

     

       373
       380
        
         {

     

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

     

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

     

       376
       376
       -
           sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc";

     

       381
       381
       +
           name = "icu4c-68_1-src.tgz";

     

       382
       382
       +
           url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz";

     

       383
       383
       +
           sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d";

     

       377
       384
        
           md5 = "";

     

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

     

       385
       385
       +
           md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz";

     

       379
       386
        
         }

     

       380
       387
        
         {

     

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

     

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

     

       383
       383
       -
           sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e";

     

       388
       388
       +
           name = "icu4c-68_1-data.zip";

     

       389
       389
       +
           url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip";

     

       390
       390
       +
           sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510";

     

       384
       391
        
           md5 = "";

     

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

     

       392
       392
       +
           md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip";

     

       386
       393
        
         }

     

       387
       394
        
         {

     

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

     
···

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

     

       470
       477
        
         }

     

       471
       478
        
         {

     

       472
       472
       -
           name = "language-subtag-registry-2020-09-29.tar.bz2";

     

       473
       473
       -
           url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";

     

       474
       474
       -
           sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f";

     

       479
       479
       +
           name = "language-subtag-registry-2021-03-05.tar.bz2";

     

       480
       480
       +
           url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2";

     

       481
       481
       +
           sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a";

     

       475
       482
        
           md5 = "";

     

       476
       476
       -
           md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2";

     

       483
       483
       +
           md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2";

     

       477
       484
        
         }

     

       478
       485
        
         {

     

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

     
···

       483
       490
        
           md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";

     

       484
       491
        
         }

     

       485
       492
        
         {

     

       486
       486
       -
           name = "lcms2-2.9.tar.gz";

     

       487
       487
       -
           url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz";

     

       488
       488
       -
           sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20";

     

       493
       493
       +
           name = "lcms2-2.11.tar.gz";

     

       494
       494
       +
           url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz";

     

       495
       495
       +
           sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e";

     

       489
       496
        
           md5 = "";

     

       490
       490
       -
           md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz";

     

       497
       497
       +
           md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz";

     

       491
       498
        
         }

     

       492
       499
        
         {

     

       493
       493
       -
           name = "libassuan-2.5.1.tar.bz2";

     

       494
       494
       -
           url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";

     

       495
       495
       -
           sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449";

     

       500
       500
       +
           name = "libassuan-2.5.3.tar.bz2";

     

       501
       501
       +
           url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2";

     

       502
       502
       +
           sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702";

     

       496
       503
        
           md5 = "";

     

       497
       497
       -
           md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2";

     

       504
       504
       +
           md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2";

     

       498
       505
        
         }

     

       499
       506
        
         {

     

       500
       507
        
           name = "libatomic_ops-7.6.8.tar.gz";

     
···

       525
       532
        
           md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";

     

       526
       533
        
         }

     

       527
       534
        
         {

     

       528
       528
       -
           name = "libgpg-error-1.27.tar.bz2";

     

       529
       529
       -
           url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";

     

       530
       530
       -
           sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";

     

       535
       535
       +
           name = "libgpg-error-1.37.tar.bz2";

     

       536
       536
       +
           url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2";

     

       537
       537
       +
           sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763";

     

       531
       538
        
           md5 = "";

     

       532
       532
       -
           md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";

     

       539
       539
       +
           md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2";

     

       533
       540
        
         }

     

       534
       541
        
         {

     

       535
       542
        
           name = "liblangtag-0.6.2.tar.bz2";

     
···

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

     

       540
       547
        
         }

     

       541
       548
        
         {

     

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

     

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

     

       544
       544
       -
           sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57";

     

       549
       549
       +
           name = "libnumbertext-1.0.7.tar.xz";

     

       550
       550
       +
           url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz";

     

       551
       551
       +
           sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc";

     

       545
       552
        
           md5 = "";

     

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

     

       553
       553
       +
           md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz";

     

       547
       554
        
         }

     

       548
       555
        
         {

     

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

     
···

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

     

       561
       568
        
         }

     

       562
       569
        
         {

     

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

     

       564
       564
       -
           url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";

     

       565
       565
       -
           sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";

     

       570
       570
       +
           name = "libxml2-2.9.12.tar.gz";

     

       571
       571
       +
           url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz";

     

       572
       572
       +
           sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92";

     

       566
       573
        
           md5 = "";

     

       567
       567
       -
           md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";

     

       574
       574
       +
           md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz";

     

       568
       575
        
         }

     

       569
       576
        
         {

     

       570
       577
        
           name = "libxslt-1.1.34.tar.gz";

     
···

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

     

       596
       603
        
         }

     

       597
       604
        
         {

     

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

     

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

     

       600
       600
       -
           sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d";

     

       605
       605
       +
           name = "mdds-1.7.0.tar.bz2";

     

       606
       606
       +
           url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2";

     

       607
       607
       +
           sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf";

     

       601
       608
        
           md5 = "";

     

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

     

       609
       609
       +
           md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2";

     

       603
       610
        
         }

     

       604
       611
        
         {

     

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

     
···

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

     

       617
       624
        
         }

     

       618
       625
        
         {

     

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

     

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

     

       621
       621
       -
           sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868";

     

       626
       626
       +
           name = "libmwaw-0.3.17.tar.xz";

     

       627
       627
       +
           url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz";

     

       628
       628
       +
           sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c";

     

       622
       629
        
           md5 = "";

     

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

     

       630
       630
       +
           md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz";

     

       624
       631
        
         }

     

       625
       632
        
         {

     

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

     
···

       630
       637
        
           md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";

     

       631
       638
        
         }

     

       632
       639
        
         {

     

       633
       633
       -
           name = "neon-0.30.2.tar.gz";

     

       634
       634
       -
           url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";

     

       635
       635
       -
           sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";

     

       640
       640
       +
           name = "neon-0.31.2.tar.gz";

     

       641
       641
       +
           url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz";

     

       642
       642
       +
           sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678";

     

       636
       643
        
           md5 = "";

     

       637
       637
       -
           md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";

     

       644
       644
       +
           md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";

     

       638
       645
        
         }

     

       639
       646
        
         {

     

       640
       647
        
           name = "nss-3.55-with-nspr-4.27.tar.gz";

     
···

       672
       679
        
           md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";

     

       673
       680
        
         }

     

       674
       681
        
         {

     

       675
       675
       -
           name = "openssl-1.0.2t.tar.gz";

     

       676
       676
       -
           url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";

     

       677
       677
       -
           sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";

     

       682
       682
       +
           name = "openssl-1.1.1l.tar.gz";

     

       683
       683
       +
           url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz";

     

       684
       684
       +
           sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1";

     

       678
       685
        
           md5 = "";

     

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

     

       686
       686
       +
           md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz";

     

       680
       687
        
         }

     

       681
       688
        
         {

     

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

     

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

     

       684
       684
       -
           sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61";

     

       689
       689
       +
           name = "liborcus-0.16.1.tar.bz2";

     

       690
       690
       +
           url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2";

     

       691
       691
       +
           sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4";

     

       685
       692
        
           md5 = "";

     

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

     

       693
       693
       +
           md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2";

     

       687
       694
        
         }

     

       688
       695
        
         {

     

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

     
···

       735
       742
        
           md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";

     

       736
       743
        
         }

     

       737
       744
        
         {

     

       738
       738
       -
           name = "Python-3.7.10.tar.xz";

     

       739
       739
       -
           url = "https://dev-www.libreoffice.org/src/Python-3.7.10.tar.xz";

     

       740
       740
       -
           sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b";

     

       745
       745
       +
           name = "Python-3.8.8rc1.tar.xz";

     

       746
       746
       +
           url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz";

     

       747
       747
       +
           sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6";

     

       741
       748
        
           md5 = "";

     

       742
       742
       -
           md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz";

     

       749
       749
       +
           md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz";

     

       743
       750
        
         }

     

       744
       751
        
         {

     

       745
       752
        
           name = "QR-Code-generator-1.4.0.tar.gz";

     
···

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

     

       799
       806
        
         }

     

       800
       807
        
         {

     

       801
       801
       -
           name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";

     

       802
       802
       -
           url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";

     

       803
       803
       -
           sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760";

     

       808
       808
       +
           name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";

     

       809
       809
       +
           url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";

     

       810
       810
       +
           sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301";

     

       804
       811
        
           md5 = "";

     

       805
       805
       -
           md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";

     

       812
       812
       +
           md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";

     

       806
       813
        
         }

     

       807
       814
        
         {

     

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

     
···

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

     

       855
       862
        
         }

     

       856
       863
        
         {

     

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

     

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

     

       859
       859
       -
           sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1";

     

       864
       864
       +
           name = "libwps-0.4.12.tar.xz";

     

       865
       865
       +
           url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz";

     

       866
       866
       +
           sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb";

     

       860
       867
        
           md5 = "";

     

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

     

       868
       868
       +
           md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz";

     

       862
       869
        
         }

     

       863
       870
        
         {

     

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

+4 -2

pkgs/applications/office/libreoffice/src-still/override.nix

···

       1
       1
       -
       { lib, kdeIntegration, ... }:

     

       1
       1
       +
       { lib, kdeIntegration, commonsLogging, ... }:

     

       2
       2
        
       attrs:

     

       3
       3
        
       {

     

       4
       4
        
         postConfigure = attrs.postConfigure + ''

     
···

       6
       6
        
         '';

     

       7
       7
        
         configureFlags = attrs.configureFlags ++ [

     

       8
       8
        
           (lib.enableFeature kdeIntegration "kf5")

     

       9
       9
       +
           "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"

     

       10
       10
       +
           "--without-system-qrcodegen"

     

       9
       11
        
         ];

     

       10
       10
       -
         patches = [ ../xdg-open-brief.patch ];

     

       12
       12
       +
         patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2

     

       11
       13
        
       }

+4 -4

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

···

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         major = "7";

     

       10
       10
       -
         minor = "0";

     

       10
       10
       +
         minor = "1";

     

       11
       11
        
         patch = "6";

     

       12
       12
        
         tweak = "2";

     

       13
       13
        
       

     
···

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

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

     

       20
       20
       -
           sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn";

     

       20
       20
       +
           sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # FIXME rename

     

       24
       24
        
         translations = fetchSrc {

     

       25
       25
        
           name = "translations";

     

       26
       26
       -
           sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj";

     

       26
       26
       +
           sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3";

     

       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 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d";

     

       34
       34
       +
           sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31";

     

       35
       35
        
         };

     

       36
       36
        
       }

+5 -5

pkgs/applications/version-management/gitlab/data.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "14.4.0",

     

       3
       3
       -
         "repo_hash": "1hkx30abwbhwrlwr4sykpjgsk8k2k375d9xl1pxjhg3n8vwqncs8",

     

       2
       2
       +
         "version": "14.4.1",

     

       3
       3
       +
         "repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm",

     

       4
       4
        
         "yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw",

     

       5
       5
        
         "owner": "gitlab-org",

     

       6
       6
        
         "repo": "gitlab",

     

       7
       7
       -
         "rev": "v14.4.0-ee",

     

       7
       7
       +
         "rev": "v14.4.1-ee",

     

       8
       8
        
         "passthru": {

     

       9
       9
       -
           "GITALY_SERVER_VERSION": "14.4.0",

     

       9
       9
       +
           "GITALY_SERVER_VERSION": "14.4.1",

     

       10
       10
        
           "GITLAB_PAGES_VERSION": "1.46.0",

     

       11
       11
        
           "GITLAB_SHELL_VERSION": "13.21.1",

     

       12
       12
       -
           "GITLAB_WORKHORSE_VERSION": "14.4.0"

     

       12
       12
       +
           "GITLAB_WORKHORSE_VERSION": "14.4.1"

     

       13
       13
        
         }

     

       14
       14
        
       }

+9 -2

pkgs/applications/version-management/gitlab/default.nix

···

       36
       36
        
                 buildInputs = [ file ];

     

       37
       37
        
                 buildFlags = [ "--enable-system-libraries" ];

     

       38
       38
        
               };

     

       39
       39
       +
               # the included yarn rake task attaches the yarn:install task

     

       40
       40
       +
               # to assets:precompile, which is both unnecessary (since we

     

       41
       41
       +
               # run `yarn install` ourselves) and undoes the shebang patches

     

       42
       42
       +
               # in node_modules

     

       43
       43
       +
               railties = x.railties // {

     

       44
       44
       +
                 dontBuild = false;

     

       45
       45
       +
                 patches = [ ./railties-remove-yarn-install-enhancement.patch ];

     

       46
       46
       +
                 patchFlags = "-p2";

     

       47
       47
       +
               };

     

       39
       48
        
             };

     

       40
       49
        
           groups = [

     

       41
       50
        
             "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"

     
···

       95
       104
        
       

     

       96
       105
        
             bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production

     

       97
       106
        
             bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production

     

       98
       98
       -
             # hack: rake gettext:po_to_json breaks the node_modules folder. We repair it by patching the shebangs again.

     

       99
       99
       -
             patchShebangs node_modules/

     

       100
       107
        
             bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production

     

       101
       108
        
             bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production

     

       102
       109
        
             bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production

+2 -2

pkgs/applications/version-management/gitlab/gitaly/default.nix

···

       20
       20
        
               };

     

       21
       21
        
             };

     

       22
       22
        
         };

     

       23
       23
       -
         version = "14.4.0";

     

       23
       23
       +
         version = "14.4.1";

     

       24
       24
        
         gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";

     

       25
       25
        
       in

     

       26
       26
        
       

     
···

       32
       32
        
           owner = "gitlab-org";

     

       33
       33
        
           repo = "gitaly";

     

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

     

       35
       35
       -
           sha256 = "sha256-GnjG/LuHvulNrwj1/4r07snue7rysZ74cWpf60w48cc=";

     

       35
       35
       +
           sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";

+1 -1

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

···

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "gitlab-workhorse";

     

       7
       7
        
       

     

       8
       8
       -
         version = "14.4.0";

     

       8
       8
       +
         version = "14.4.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitLab {

     

       11
       11
        
           owner = data.owner;

+13

pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch

···

       1
       1
       +
       diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake

     

       2
       2
       +
       index 0226da721a..365cdeb0f9 100644

     

       3
       3
       +
       --- a/railties/lib/rails/tasks/yarn.rake

     

       4
       4
       +
       +++ b/railties/lib/rails/tasks/yarn.rake

     

       5
       5
       +
       @@ -27,8 +27,3 @@ namespace :yarn do

     

       6
       6
       +
            exit 1

     

       7
       7
       +
          end

     

       8
       8
       +
        end

     

       9
       9
       +
       -

     

       10
       10
       +
       -# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.

     

       11
       11
       +
       -if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))

     

       12
       12
       +
       -  Rake::Task["assets:precompile"].enhance [ "yarn:install" ]

     

       13
       13
       +
       -end

+3 -4

pkgs/applications/video/molotov/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         pname = "molotov";

     

       5
       5
        
         version = "4.4.0";

     

       6
       6
       -
         name = "${pname}-${version}";

     

       7
       6
        
         src = fetchurl {

     

       8
       7
        
           url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage";

     

       9
       8
        
           sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc=";

     

       10
       9
        
         };

     

       11
       11
       -
         appimageContents = appimageTools.extractType2 { inherit name src; };

     

       10
       10
       +
         appimageContents = appimageTools.extractType2 { inherit pname version src; };

     

       12
       11
        
       in

     

       13
       12
        
       appimageTools.wrapType2 {

     

       14
       14
       -
         inherit name src;

     

       13
       13
       +
         inherit pname version src;

     

       15
       14
        
         extraInstallCommands = ''

     

       16
       16
       -
           mv $out/bin/${name} $out/bin/${pname}

     

       15
       15
       +
           mv $out/bin/${pname}-${version} $out/bin/${pname}

     

       17
       16
        
           install -m 444 -D \

     

       18
       17
        
             ${appimageContents}/@molotovdesktop-wrapper.desktop \

     

       19
       18
        
             $out/share/applications/${pname}.desktop

+4 -5

pkgs/build-support/appimage/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       

     

       3
       2
        
       , bash

     

       4
       3
        
       , binutils-unwrapped

     

       5
       4
        
       , coreutils

     
···

       27
       26
        
           ];

     

       28
       27
        
         };

     

       29
       28
        
       

     

       30
       30
       -
         extract = { name, src }: pkgs.runCommand "${name}-extracted" {

     

       29
       29
       +
         extract = args@{ name ? "${args.pname}-${args.version}", src, ... }: pkgs.runCommand "${name}-extracted" {

     

       31
       30
        
             buildInputs = [ appimage-exec ];

     

       32
       31
        
           } ''

     

       33
       32
        
             appimage-exec.sh -x $out ${src}

     
···

       38
       37
        
         extractType2 = extract;

     

       39
       38
        
         wrapType1 = wrapType2;

     

       40
       39
        
       

     

       41
       41
       -
         wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv

     

       40
       40
       +
         wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv

     

       42
       41
        
           (defaultFhsEnvArgs // {

     

       43
       42
        
             inherit name;

     

       44
       43
        
       

     
···

       46
       45
        
               ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;

     

       47
       46
        
       

     

       48
       47
        
             runScript = "appimage-exec.sh -w ${src} --";

     

       49
       49
       -
           } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));

     

       48
       48
       +
           } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage)))));

     

       50
       49
        
       

     

       51
       51
       -
         wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage

     

       50
       50
       +
         wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage

     

       52
       51
        
           (args // {

     

       53
       52
        
             inherit name extraPkgs;

     

       54
       53
        
             src = extract { inherit name src; };

+29 -11

pkgs/build-support/build-dotnet-module/default.nix

···

       1
       1
       -
       { lib, stdenv, makeWrapper, dotnetCorePackages, dotnetPackages, cacert, linkFarmFromDrvs, fetchurl }:

     

       1
       1
       +
       { lib, stdenvNoCC, linkFarmFromDrvs, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }:

     

       2
       2
        
       

     

       3
       3
        
       { name ? "${args.pname}-${args.version}"

     

       4
       4
        
       , enableParallelBuilding ? true

     
···

       50
       50
        
           };

     

       51
       51
        
         });

     

       52
       52
        
       

     

       53
       53
       -
         package = stdenv.mkDerivation (args // {

     

       53
       53
       +
         nuget-source = stdenvNoCC.mkDerivation rec {

     

       54
       54
       +
           name = "${args.pname}-nuget-source";

     

       55
       55
       +
           meta.description = "A Nuget source with the dependencies for ${args.pname}";

     

       56
       56
       +
       

     

       57
       57
       +
           nativeBuildInputs = [ dotnetPackages.Nuget xml2 ];

     

       58
       58
       +
           buildCommand = ''

     

       59
       59
       +
             export HOME=$(mktemp -d)

     

       60
       60
       +
             mkdir -p $out/{lib,share}

     

       61
       61
       +
       

     

       62
       62
       +
             nuget sources Add -Name nixos -Source "$out/lib"

     

       63
       63
       +
             nuget init "${_nugetDeps}" "$out/lib"

     

       64
       64
       +
       

     

       65
       65
       +
             # Generates a list of all unique licenses' spdx ids.

     

       66
       66
       +
             find "$out/lib" -name "*.nuspec" -exec sh -c \

     

       67
       67
       +
               "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses

     

       68
       68
       +
           '';

     

       69
       69
       +
         } // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion.

     

       70
       70
       +
           meta.licence = let

     

       71
       71
       +
             depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses");

     

       72
       72
       +
             getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses);

     

       73
       73
       +
           in (lib.flatten (lib.forEach depLicenses (spdx:

     

       74
       74
       +
             if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx

     

       75
       75
       +
           )));

     

       76
       76
       +
         };

     

       77
       77
       +
       

     

       78
       78
       +
         package = stdenvNoCC.mkDerivation (args // {

     

       54
       79
        
           inherit buildType;

     

       55
       80
        
       

     

       56
       56
       -
           nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk dotnetPackages.Nuget cacert makeWrapper ];

     

       81
       81
       +
           nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk cacert makeWrapper ];

     

       57
       82
        
       

     

       58
       83
        
           # Stripping breaks the executable

     

       59
       84
        
           dontStrip = true;

     
···

       66
       91
        
       

     

       67
       92
        
             export HOME=$(mktemp -d)

     

       68
       93
        
       

     

       69
       69
       -
             nuget sources Add -Name nixos -Source "$PWD/nixos"

     

       70
       70
       -
             nuget init "${_nugetDeps}" "$PWD/nixos"

     

       71
       71
       -
       

     

       72
       72
       -
             # This is required due to https://github.com/NuGet/Home/issues/4413.

     

       73
       73
       -
             mkdir -p $HOME/.nuget/NuGet

     

       74
       74
       -
             cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet

     

       75
       75
       -
       

     

       76
       94
        
             dotnet restore "$projectFile" \

     

       77
       95
        
               ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \

     

       78
       96
        
               -p:ContinuousIntegrationBuild=true \

     

       79
       97
        
               -p:Deterministic=true \

     

       80
       80
       -
               --source "$PWD/nixos" \

     

       98
       98
       +
               --source "${nuget-source}/lib" \

     

       81
       99
        
               "''${dotnetRestoreFlags[@]}" \

     

       82
       100
        
               "''${dotnetFlags[@]}"

     

       83
       101

+1 -1

pkgs/development/compilers/scala-runners/default.nix

···

       14
       14
        
         dontBuild = true;

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           mkdir -p $out/bin $out/lib

     

       17
       17
       -
           sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner

     

       17
       17
       +
           sed -ie "s| cs | ${coursier}/bin/cs |" scala-runner

     

       18
       18
        
           cp scala-runner $out/lib

     

       19
       19
        
           ln -s $out/lib/scala-runner $out/bin/scala

     

       20
       20
        
           ln -s $out/lib/scala-runner $out/bin/scalac

+2 -1

pkgs/development/embedded/openocd/default.nix

···

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkg-config ];

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ hidapi libftdi1 libusb1 libgpiod ];

     

       21
       21
       +
         buildInputs = [ hidapi libftdi1 libusb1 ]

     

       22
       22
       +
           ++ lib.optional stdenv.isLinux libgpiod;

     

       22
       23
        
       

     

       23
       24
        
         configureFlags = [

     

       24
       25
        
           "--enable-jtag_vpi"

+2 -2

pkgs/development/libraries/cpp-utilities/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "cpp-utilities";

     

       10
       10
       -
         version = "5.11.1";

     

       10
       10
       +
         version = "5.11.2";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "Martchus";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "sha256-H8BDuoSF5XkWgahGj7LCSsdXBbgcSjPLTmgUgamCij8=";

     

       16
       16
       +
           sha256 = "sha256-my4799a9XFXWl9Xyq6gRfw4YTOCEWJgTvRKz0mVqrkQ=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ cmake ];

+4 -4

pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch

···

       1
       1
        
       diff -ruN cfitsio/configure cfitsio-rpath-universal/configure

     

       2
       2
        
       --- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200

     

       3
       3
       -
       +++ cfitsio-rpath-universal/configure	2018-05-31 12:02:25.000000000 +0200

     

       4
       4
       -
       @@ -4727,16 +4727,7 @@

     

       3
       3
       +
       +++ cfitsio-rpath-universal/configure	2021-10-27 12:02:25.000000000 +0200

     

       4
       4
       +
       @@ -4829,16 +4829,7 @@

     

       5
       5
        
            SHLIB_SUFFIX=".dylib"

     

       6
       6
        
            CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"

     

       7
       7
        
            CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"

     

       8
       8
        
       -    case $host in

     

       9
       9
        
       -        *darwin[56789]*)

     

       10
       10
       -
       -            SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"

     

       10
       10
       +
       -            SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"

     

       11
       11
        
       -            ;;

     

       12
       12
        
       -        *)

     

       13
       13
        
       -            # Build 'Universal' binaries (i386 & x86_64 architectures) and

     

       14
       14
        
       -            # use rpath token on Darwin 10.x or newer:

     

       15
       15
       -
       -            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"

     

       15
       15
       +
       -            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"

     

       16
       16
        
       -            ;;

     

       17
       17
        
       -    esac

     

       18
       18
        
       +    SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"

+6 -4

pkgs/development/libraries/science/astronomy/cfitsio/default.nix

···

       1
       1
       -
       { fetchurl, lib, stdenv, bzip2 }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, bzip2, zlib }:

     

       2
       2
       +
       

     

       2
       3
        
       stdenv.mkDerivation rec {

     

       3
       4
        
         pname = "cfitsio";

     

       4
       4
       -
         version = "3.49";

     

       5
       5
       +
         version = "4.0.0";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz";

     

       8
       8
       -
           sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav";

     

       9
       9
       +
           sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4=";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       11
       -
         buildInputs = [ bzip2 ];

     

       12
       12
       +
         buildInputs = [ bzip2 zlib ];

     

       12
       13
        
       

     

       13
       14
        
         patches = [ ./darwin-rpath-universal.patch ];

     

       14
       15
        
       

     
···

       33
       34
        
                advanced features for manipulating and filtering the information in

     

       34
       35
        
                FITS files.

     

       35
       36
        
             '';

     

       37
       37
       +
           changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt";

     

       36
       38
        
           license = licenses.mit;

     

       37
       39
        
           maintainers = [ maintainers.xbreak ];

     

       38
       40
        
           platforms = with platforms; linux ++ darwin;

+22 -4

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

···

       1
       1
       -
       { lib, fetchFromGitHub, buildPythonApplication, python, graphviz }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , buildPythonApplication

     

       4
       4
       +
       , python

     

       5
       5
       +
       , graphviz

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       buildPythonApplication rec {

     

       4
       9
        
         pname = "gprof2dot";

     

       5
       5
       -
         version = "2019.11.30";

     

       10
       10
       +
         version = "2021.02.21";

     

       6
       11
        
       

     

       7
       12
        
         src = fetchFromGitHub {

     

       8
       13
        
           owner = "jrfonseca";

     

       9
       14
        
           repo = "gprof2dot";

     

       10
       15
        
           rev = version;

     

       11
       11
       -
           sha256 = "1nw4cfwimd0djarw4wc756q095xir78js8flmycg6g7sl3l6p27s";

     

       16
       16
       +
           sha256 = "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic";

     

       12
       17
        
         };

     

       13
       18
        
       

     

       19
       19
       +
         makeWrapperArgs = [

     

       20
       20
       +
           "--prefix PATH : ${lib.makeBinPath [ graphviz ]}"

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         # Needed so dot is on path of the test script

     

       14
       24
        
         checkInputs = [ graphviz ];

     

       15
       15
       -
         checkPhase = "${python.interpreter} tests/test.py";

     

       25
       25
       +
       

     

       26
       26
       +
         checkPhase = ''

     

       27
       27
       +
           runHook preCheck

     

       28
       28
       +
       

     

       29
       29
       +
           # if options not specified, will use unwrapped gprof2dot from original source

     

       30
       30
       +
           ${python.interpreter} tests/test.py --python bash --gprof2dot $out/bin/gprof2dot

     

       31
       31
       +
       

     

       32
       32
       +
           runHook postCheck

     

       33
       33
       +
         '';

     

       16
       34
        
       

     

       17
       35
        
         meta = with lib; {

     

       18
       36
        
           homepage = "https://github.com/jrfonseca/gprof2dot";

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "murmurhash";

     

       9
       9
       -
         version = "1.0.5";

     

       9
       9
       +
         version = "1.0.6";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "98ec9d727bd998a35385abd56b062cf0cca216725ea7ec5068604ab566f7e97f";

     

       13
       13
       +
           sha256 = "00a5252b569d3f914b5bd0bce72d2efe9c0fb91a9703556ea1b608b141c68f2d";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         postPatch = ''

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "mwdblib";

     

       16
       16
       -
         version = "3.4.0";

     

       16
       16
       +
         version = "3.4.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "CERT-Polska";

     

       20
       20
        
           repo = pname;

     

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

     

       22
       22
       -
           sha256 = "0dbdmps4a3mav02m4h37bj2bw8pg6h52yf3gpdkhi3k9hl9f942h";

     

       22
       22
       +
           sha256 = "sha256-jCtK3Fk725EaA26GG6j6xqEMFH4Qq92QWrJ7sxcWRaY=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "pyramid_multiauth";

     

       9
       9
       -
         version = "0.9.0";

     

       9
       9
       +
         version = "1.0.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy";

     

       13
       13
       +
           sha256 = "6d8785558e1d0bbe0d0da43e296efc0fbe0de5071d1f9b1091e891f0e4ec9682";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ pyramid ];

+1 -1

pkgs/development/tools/build-managers/bloop/default.nix

···

       46
       46
        
       

     

       47
       47
        
             mkdir channel

     

       48
       48
        
             ln -s ${bloop-coursier-channel} channel/bloop.json

     

       49
       49
       -
             ${coursier}/bin/coursier install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop

     

       49
       49
       +
             ${coursier}/bin/cs install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop

     

       50
       50
        
       

     

       51
       51
        
             # Remove binary part of the coursier launcher script to make derivation output hash stable

     

       52
       52
        
             sed -i '5,$ d' $out/bloop

+2 -2

pkgs/development/tools/cloud-nuke/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "cloud-nuke";

     

       5
       5
       -
         version = "0.5.0";

     

       5
       5
       +
         version = "0.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gruntwork-io";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-PVVnls4i19Xc5KXM1AQTHLkxLgmJpIDBFkRW0EGXOUA=";

     

       11
       11
       +
           sha256 = "sha256-f93zpTA3FWfqmPVnhnvGBJSqQ2OEHMxnI6MUN74LmAk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80=";

+2 -2

pkgs/development/tools/continuous-integration/buildkite-agent/default.nix

···

       3
       3
        
         nixosTests }:

     

       4
       4
        
       buildGoModule rec {

     

       5
       5
        
         name = "buildkite-agent-${version}";

     

       6
       6
       -
         version = "3.32.3";

     

       6
       6
       +
         version = "3.33.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "buildkite";

     

       10
       10
        
           repo = "agent";

     

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

     

       12
       12
       -
           sha256 = "sha256-uckFsM8UWkiDmTpLRu34qKdjgEQrbsa+K8QtVS2PJ7A=";

     

       12
       12
       +
           sha256 = "sha256-RCKHVFYYcWraUwsGuD/anmWpNwc7cHc9jm0LwR9WRzA=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";

+3 -3

pkgs/development/tools/ddosify/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "ddosify";

     

       5
       5
       -
         version = "0.4.1";

     

       5
       5
       +
         version = "0.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-z7jYnEZSHh/Omg5DMNFzuPhV1d8lZSy8I+8tM86O43s=";

     

       11
       11
       +
           sha256 = "sha256-kccn6tnJfy4mx0hyBi2ggPvNPu/iQgGBMxQ6hsYy7So=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-VWWik7oovVJq0J/tj/2Mm5QtvRkJLtMROJhRC2JFZdw=";

     

       14
       14
       +
         vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg=";

     

       15
       15
        
       

     

       16
       16
        
         # triggers a different set of tests that seems to be interactive and fail (no url target defined)

     

       17
       17
        
         ldflags = [

+25 -4

pkgs/development/tools/dyff/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub}:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, installShellFiles }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "dyff";

     

       5
       5
       -
         version = "1.4.3";

     

       5
       5
       +
         version = "1.4.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "homeport";

     

       9
       9
        
           repo = "dyff";

     

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

     

       11
       11
       -
           sha256 = "0r1nfwglyw8b46n17bpmgscfmjhjsbk83lgkpm63ysy0h5r84dq8";

     

       11
       11
       +
           sha256 = "sha256-TaGtl5TBQMHjY4/HmDUghyhrsc5fjSMmY+oqO+rKGo4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "12mirnw229x5jkzda0c45vnjnv7fjvzf0rm3fcy5f3wza6hkx6q7";

     

       14
       14
       +
         vendorSha256 = "sha256-3L3FtL/P+Jyvv0WESBvfSxJOl99v5QDyyzIqottB2EI=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [

     

       17
       17
        
           "cmd/dyff"

     

       18
       18
        
           "pkg/dyff"

     

       19
       19
        
           "internal/cmd"

     

       20
       20
        
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [ installShellFiles ];

     

       23
       23
       +
       

     

       24
       24
       +
         # test fails with the injected version

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           substituteInPlace internal/cmd/cmds_test.go \

     

       27
       27
       +
             --replace "version (development)" ${version}

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         ldflags = [

     

       31
       31
       +
           "-s"

     

       32
       32
       +
           "-w"

     

       33
       33
       +
           "-X=github.com/homeport/dyff/internal/cmd.version=${version}"

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         postInstall = ''

     

       37
       37
       +
           installShellCompletion --cmd dyff \

     

       38
       38
       +
             --bash <($out/bin/dyff completion bash) \

     

       39
       39
       +
             --fish <($out/bin/dyff completion fish) \

     

       40
       40
       +
             --zsh <($out/bin/dyff completion zsh)

     

       41
       41
       +
         '';

     

       21
       42
        
       

     

       22
       43
        
         meta = with lib; {

     

       23
       44
        
           description = "A diff tool for YAML files, and sometimes JSON";

+2 -2

pkgs/development/tools/esbuild/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "esbuild";

     

       5
       5
       -
         version = "0.13.0";

     

       5
       5
       +
         version = "0.13.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "evanw";

     

       9
       9
        
           repo = "esbuild";

     

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

     

       11
       11
       -
           sha256 = "sha256-NPpWK99P4p8GM4MNaIT8MLPzRNHiRh2yrwqG1A0KluM=";

     

       11
       11
       +
           sha256 = "sha256-RWt8PevKpn/HUX7FUsIxLwmkSyvtVCTyGEWxci7ZVMY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

+1 -1

pkgs/development/tools/metals/default.nix

···

       8
       8
        
           name = "${pname}-deps-${version}";

     

       9
       9
        
           buildCommand = ''

     

       10
       10
        
             export COURSIER_CACHE=$(pwd)

     

       11
       11
       -
             ${coursier}/bin/coursier fetch org.scalameta:metals_2.12:${version} \

     

       11
       11
       +
             ${coursier}/bin/cs fetch org.scalameta:metals_2.12:${version} \

     

       12
       12
        
               -r bintray:scalacenter/releases \

     

       13
       13
        
               -r sonatype:snapshots > deps

     

       14
       14
        
             mkdir -p $out/share/java

+3 -3

pkgs/development/tools/misc/circleci-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "circleci-cli";

     

       5
       5
       -
         version = "0.1.15848";

     

       5
       5
       +
         version = "0.1.16122";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "CircleCI-Public";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-JybhHglqMgQzsmloUhVgIcSMPinE9XaUljvcpdQTSx4=";

     

       11
       11
       +
           sha256 = "sha256-zIBEKGp9icdBLwZBMf30d8JxmJwwWrO/arh8ZvMHTSI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ=";

     

       14
       14
       +
         vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+36

pkgs/development/tools/pylint-exit/default.nix

···

       1
       1
       +
       { lib, fetchFromGitHub, python3Packages }:

     

       2
       2
       +
       

     

       3
       3
       +
       with python3Packages; buildPythonApplication rec {

     

       4
       4
       +
         pname = "pylint-exit";

     

       5
       5
       +
         version = "1.2.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "jongracecox";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "0hwfny48g394visa3xd15425fsw596r3lhkfhswpjrdk2mnk3cny";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # Converting the shebang manually as it is not picked up by patchShebangs

     

       15
       15
       +
         postPatch = ''

     

       16
       16
       +
           substituteInPlace pylint_exit.py \

     

       17
       17
       +
             --replace "#!/usr/local/bin/python" "#!${python.interpreter}"

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         # See https://github.com/jongracecox/pylint-exit/pull/7

     

       21
       21
       +
         buildInputs = [ m2r ];

     

       22
       22
       +
       

     

       23
       23
       +
         # setup.py reads its version from the TRAVIS_TAG environment variable

     

       24
       24
       +
         TRAVIS_TAG = version;

     

       25
       25
       +
       

     

       26
       26
       +
         checkPhase = ''

     

       27
       27
       +
           ${python.interpreter} -m doctest pylint_exit.py

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           description = "Utility to handle pylint exit codes in an OS-friendly way";

     

       32
       32
       +
           license = licenses.mit;

     

       33
       33
       +
           homepage = "https://github.com/jongracecox/pylint-exit";

     

       34
       34
       +
           maintainers = [ maintainers.fabiangd ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+3 -3

pkgs/development/tools/rust/cargo-msrv/default.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "cargo-msrv";

     

       14
       14
       -
         version = "0.10.0";

     

       14
       14
       +
         version = "0.11.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "foresterre";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           sha256 = "sha256-Op800CGzbSGwYvd18ba7Gvw2bVHeBHCQq1pmAMW9CUs=";

     

       20
       20
       +
           sha256 = "sha256-7GixO9aoHx07wQHTEtbEDQ52Dr3MZ0p4Xq0Ol7E/swI=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoSha256 = "sha256-vguDrmNYtHHR8kA6GElEx8+jVj/V853o0uW6hfg/tlI=";

     

       23
       23
       +
         cargoSha256 = "sha256-cxbsTRANX1WA0Lf6CHcJoxSKrGHtBfjInSKhFJmTDnE=";

     

       24
       24
        
       

     

       25
       25
        
         passthru = {

     

       26
       26
        
           updateScript = nix-update-script {

+3 -3

pkgs/development/tools/rust/rusty-man/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "rusty-man";

     

       5
       5
       -
         version = "0.4.3";

     

       5
       5
       +
         version = "0.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromSourcehut {

     

       8
       8
        
           owner = "~ireas";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1yp1clmf4hpvqbvn055hiq52584kbrz5b3cjzw8bgkw51nwxr2yx";

     

       11
       11
       +
           sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-mIM97YraTiDAowqlB4kAE4PdtWHgvw0UI6Nqoe1EBns=";

     

       14
       14
       +
         cargoSha256 = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "A command-line viewer for documentation generated by rustdoc";

+1 -1

pkgs/development/tools/scalafix/default.nix

···

       7
       7
        
           name = "${baseName}-deps-${version}";

     

       8
       8
        
           buildCommand = ''

     

       9
       9
        
             export COURSIER_CACHE=$(pwd)

     

       10
       10
       -
             ${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps

     

       10
       10
       +
             ${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps

     

       11
       11
        
             mkdir -p $out/share/java

     

       12
       12
        
             cp $(< deps) $out/share/java/

     

       13
       13
        
           '';

+1 -1

pkgs/development/tools/scalafmt/default.nix

···

       7
       7
        
           name = "${baseName}-deps-${version}";

     

       8
       8
        
           buildCommand = ''

     

       9
       9
        
             export COURSIER_CACHE=$(pwd)

     

       10
       10
       -
             ${coursier}/bin/coursier fetch org.scalameta:scalafmt-cli_2.13:${version} > deps

     

       10
       10
       +
             ${coursier}/bin/cs fetch org.scalameta:scalafmt-cli_2.13:${version} > deps

     

       11
       11
        
             mkdir -p $out/share/java

     

       12
       12
        
             cp $(< deps) $out/share/java/

     

       13
       13
        
           '';

+3 -3

pkgs/os-specific/linux/rtw89/default.nix

···

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         pname = "rtw89";

     

       8
       8
       -
         version = "unstable-2021-07-03";

     

       8
       8
       +
         version = "unstable-2021-10-21";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "lwfinger";

     

       12
       12
        
           repo = "rtw89";

     

       13
       13
       -
           rev = "cebafc6dc839e66c725b92c0fabf131bc908f607";

     

       14
       14
       -
           sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af";

     

       13
       13
       +
           rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";

     

       14
       14
       +
           sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

+2 -2

pkgs/servers/heisenbridge/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonPackage rec {

     

       4
       4
        
         pname = "heisenbridge";

     

       5
       5
       -
         version = "1.3.0";

     

       5
       5
       +
         version = "1.4.0";

     

       6
       6
        
       

     

       7
       7
        
         # Use the release tarball because it has the version set correctly using the

     

       8
       8
        
         # version.txt file.

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "sha256-fj0eJS7c1zSrzHfnlEhJICVDZ+Mo9hKgxwaZ2gn5CsY=";

     

       11
       11
       +
           sha256 = "sha256-Br+7ykTtVYC7KIhikmgS9wbQdJFHFezlVre8cUBzAx8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3Packages; [

+2 -2

pkgs/servers/mail/dovecot/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "dovecot";

     

       14
       14
       -
         version = "2.3.16";

     

       14
       14
       +
         version = "2.3.17";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ perl pkg-config ];

     

       17
       17
        
         buildInputs =

     
···

       24
       24
        
       

     

       25
       25
        
         src = fetchurl {

     

       26
       26
        
           url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";

     

       27
       27
       -
           sha256 = "04ngqv5mml5z0i4p7fkchp4xw2awy7x7mq2mim9frnav0m9iv9q3";

     

       27
       27
       +
           sha256 = "1y9dpn4jgzrfjibp5zrc11bdk0q843d998kxhpxkyfm2fz6i4i12";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         enableParallelBuilding = true;

+2 -2

pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix

···

       3
       3
        
         dovecotMajorMinor = lib.versions.majorMinor dovecot.version;

     

       4
       4
        
       in stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "dovecot-pigeonhole";

     

       6
       6
       -
         version = "0.5.16";

     

       6
       6
       +
         version = "0.5.17";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0f79qsiqnhaxn7mrrfcrnsjyv6357kzb7wa0chhfd69vwa06g8sw";

     

       10
       10
       +
           sha256 = "0j6ng173hh5iiqxdkxfb5v9djpn39gxdrv5ki7i22cf5cqwq47h3";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ dovecot openssl ];

+2 -2

pkgs/servers/sql/postgresql/ext/repmgr.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "repmgr";

     

       11
       11
       -
         version = "5.2.1";

     

       11
       11
       +
         version = "5.3.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "2ndQuadrant";

     

       15
       15
        
           repo = "repmgr";

     

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

     

       17
       17
       -
           sha256 = "sha256-hIhVjSSJAgH/eXiuz0xlTFgp9q+Y41ICeCrRFGss3mk=";

     

       17
       17
       +
           sha256 = "sha256-hDBdtp6wPjvtc0MO8aG0Tdx5JiQJf8KS0f778R5xCZc=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ flex ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "exoscale-cli";

     

       5
       5
       -
         version = "1.44.0";

     

       5
       5
       +
         version = "1.45.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "exoscale";

     

       9
       9
        
           repo   = "cli";

     

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

     

       11
       11
       -
           sha256 = "sha256-1ntKm6OA20+/gMVufbmM6fZ2UIXG/0SzH9vZQUvsIUQ=";

     

       11
       11
       +
           sha256 = "sha256-bzm8UNFWAXHBdarovNMyARW2xA4tSXIgIHpxROx4nOI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         goPackagePath = "github.com/exoscale/cli";

+4 -3

pkgs/tools/admin/google-cloud-sdk/default.nix

···

       117
       117
        
           runHook postInstall

     

       118
       118
        
         '';

     

       119
       119
        
       

     

       120
       120
       -
         passthru = {

     

       121
       121
       -
           tests = { inherit (nixosTests) google-cloud-sdk; };

     

       122
       122
       -
         };

     

       120
       120
       +
         doInstallCheck = true;

     

       121
       121
       +
         installCheckPhase = ''

     

       122
       122
       +
           $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"

     

       123
       123
       +
         '';

     

       123
       124
        
       

     

       124
       125
        
         meta = with lib; {

     

       125
       126
        
           description = "Tools for the google cloud platform";

+3 -3

pkgs/tools/misc/dua/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "dua";

     

       5
       5
       -
         version = "2.14.7";

     

       5
       5
       +
         version = "2.14.11";

     

       6
       6
        
       

     

       7
       7
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

     

       8
       8
        
       

     
···

       10
       10
        
           owner = "Byron";

     

       11
       11
        
           repo = "dua-cli";

     

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

     

       13
       13
       -
           sha256 = "sha256-HkNWFWdyjpnJJANfnRDhmnhYbZIhrM9aIVN/Ov3/hK0=";

     

       13
       13
       +
           sha256 = "sha256-XMhgTJiP4whw1r+WtdG5CsQl/GIZPEg7/ElIEMZyWqM=";

     

       14
       14
        
           # Remove unicode file names which leads to different checksums on HFS+

     

       15
       15
        
           # vs. other filesystems because of unicode normalisation.

     

       16
       16
        
           extraPostFetch = ''

     
···

       18
       18
        
           '';

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoSha256 = "sha256-nfQGAjekd6cegvKPDxyOfcIhgagH61MT+2YVB2WppvQ=";

     

       21
       21
       +
         cargoSha256 = "sha256-B4e8wT/RhpwtCb11HqN8vksshBaF/CmpMPT62aBuFnw=";

     

       22
       22
        
       

     

       23
       23
        
         doCheck = false;

     

       24
       24

+3 -3

pkgs/tools/misc/topgrade/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "topgrade";

     

       5
       5
       -
         version = "8.0.0";

     

       5
       5
       +
         version = "8.0.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "r-darwish";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-af1W2Iu9K7epl8EdNkdyHyhNQfH3MaWcNfP5ukDriLE=";

     

       11
       11
       +
           sha256 = "sha256-yk8mW07VmABq4XSOcNKYSs04xpZQfzdDBeQFGFP6u/Y=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-HInvYDDqvkqewgIGd7nQYD+djH7lTc4vp3eVzg706+8=";

     

       14
       14
       +
         cargoSha256 = "sha256-rX4ZfcGlKe+v9UvvfWODaulAVkUbq2jvtuHP504uiX4=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optional stdenv.isDarwin Foundation;

     

       17
       17

+6 -4

pkgs/tools/networking/dnsproxy/default.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, buildGoModule }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "dnsproxy";

     

       5
       5
       -
         version = "0.39.7";

     

       5
       5
       +
         version = "0.39.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "AdguardTeam";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-jU5O+t8muaIM7JhuNhqfWh1pWezaFvdg+oRPYAQpIkk=";

     

       11
       11
       +
           sha256 = "sha256-HcyzrGtBktScTPch6rCKj5Hr7VS9kf3cCHhDVaZKxG0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

     

       15
       15
       +
       

     

       16
       16
       +
         ldflags = [ "-s" "-w" "-X" "main.VersionString=${version}" ];

     

       15
       17
        
       

     

       16
       18
        
         doCheck = false;

     

       17
       19
        
       

     

       18
       20
        
         meta = with lib; {

     

       19
       21
        
           description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";

     

       20
       22
        
           homepage = "https://github.com/AdguardTeam/dnsproxy";

     

       21
       21
       -
           license = licenses.gpl3;

     

       23
       23
       +
           license = licenses.asl20;

     

       22
       24
        
           maintainers = with maintainers; [ contrun ];

     

       23
       25
        
         };

     

       24
       26
        
       }

-37

pkgs/tools/networking/vtun/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "vtun";

     

       5
       5
       -
         version = "3.0.4";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         patches = [

     

       13
       13
       -
           (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch";

     

       14
       14
       -
                        sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1";

     

       15
       15
       -
                       })

     

       16
       16
       -
         ];

     

       17
       17
       -
       

     

       18
       18
       -
         postPatch = ''

     

       19
       19
       -
           sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in

     

       20
       20
       -
           sed -i '/strip/d' Makefile.in

     

       21
       21
       -
         '';

     

       22
       22
       -
         buildInputs = [ lzo openssl zlib bison flex ];

     

       23
       23
       -
       

     

       24
       24
       -
         configureFlags = [

     

       25
       25
       -
           "--with-lzo-headers=${lzo}/include/lzo"

     

       26
       26
       -
           "--with-ssl-headers=${openssl.dev}/include/openssl"

     

       27
       27
       -
           "--with-blowfish-headers=${openssl.dev}/include/openssl"

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         meta = with lib; {

     

       31
       31
       -
             description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";

     

       32
       32
       -
             homepage = "http://vtun.sourceforge.net/";

     

       33
       33
       -
             license = licenses.gpl2;

     

       34
       34
       -
             platforms = platforms.linux;

     

       35
       35
       -
             maintainers = with maintainers; [ pSub ];

     

       36
       36
       -
         };

     

       37
       37
       -
       }

+3 -3

pkgs/tools/text/tidy-viewer/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "tidy-viewer";

     

       5
       5
       -
         version = "0.0.22";

     

       5
       5
       +
         version = "1.4.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "alexhallam";

     

       9
       9
        
           repo = "tv";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-OuNpp9EKiU+fQSZZO7zpI36nCiZBXK6OznJGY4KMftU=";

     

       11
       11
       +
           sha256 = "sha256-YXYz+SvL6YRwnZ7frmmx4NevNTh0rJcW7e4jSuX3TNs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-LRoNGDOrbCjmZJRe+EUKxkDJjC92bQRRwP48jqDp9PU=";

     

       14
       14
       +
         cargoSha256 = "sha256-KwnnoVacTMw7kHLQynv9557zUq8aFZfzBD+Zc9Q6XBs=";

     

       15
       15
        
       

     

       16
       16
        
         # this test parses command line arguments

     

       17
       17
        
         # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context

+1

pkgs/top-level/aliases.nix

···

       967
       967
        
         virtmanager-qt = virt-manager-qt; # added 2019-10-29

     

       968
       968
        
         virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21

     

       969
       969
        
         vorbisTools = vorbis-tools; # added 2016-01-26

     

       970
       970
       +
         vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29

     

       970
       971
        
         way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13

     

       971
       972
        
         webkit = webkitgtk; # added 2019-03-05

     

       972
       973
        
         webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05

+2 -4

pkgs/top-level/all-packages.nix

···

       10395
       10395
        
       

     

       10396
       10396
        
         sentry-native = callPackage ../development/libraries/sentry-native { };

     

       10397
       10397
        
       

     

       10398
       10398
       -
         vtun = callPackage ../tools/networking/vtun {

     

       10399
       10399
       -
           openssl = openssl_1_0_2;

     

       10400
       10400
       -
         };

     

       10401
       10401
       -
       

     

       10402
       10398
        
         waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {

     

       10403
       10399
        
           inherit (darwin.apple_sdk.frameworks) OpenCL;

     

       10404
       10400
        
         };

     
···

       14981
       14977
        
         pyrseas = callPackage ../development/tools/database/pyrseas { };

     

       14982
       14978
        
       

     

       14983
       14979
        
         pycritty = with python3Packages; toPythonApplication pycritty;

     

       14980
       14980
       +
       

     

       14981
       14981
       +
         pylint-exit = callPackage ../development/tools/pylint-exit { };

     

       14984
       14982
        
       

     

       14985
       14983
        
         qtcreator = libsForQt5.callPackage ../development/tools/qtcreator {

     

       14986
       14984
        
           inherit (linuxPackages) perf;