commit 684991c6965ed6310b06cfabcd167525448c7cda · pyrox.dev/nixpkgs

+1 -1

nixos/tests/minecraft-server.nix

···

       24
       24
        
             };

     

       25
       25
        
           };

     

       26
       26
        
       

     

       27
       27
       -
           virtualisation.memorySize = 2048;

     

       27
       27
       +
           virtualisation.memorySize = 2047;

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         testScript = ''

+33 -18

pkgs/applications/accessibility/dasher/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub

     

       2
       2
       -
       , autoreconfHook, pkg-config, wrapGAppsHook

     

       3
       3
       -
       , glib, gtk3, expat, gnome-doc-utils, which

     

       4
       4
       -
       , at-spi2-core, dbus

     

       5
       5
       -
       , libxslt, libxml2

     

       6
       6
       -
       , speechSupport ? true, speechd ? null

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , wrapGAppsHook

     

       7
       7
       +
       , glib

     

       8
       8
       +
       , gtk3

     

       9
       9
       +
       , expat

     

       10
       10
       +
       , itstool

     

       11
       11
       +
       , gnome-doc-utils

     

       12
       12
       +
       , which

     

       13
       13
       +
       , at-spi2-core

     

       14
       14
       +
       , dbus

     

       15
       15
       +
       , libxslt

     

       16
       16
       +
       , libxml2

     

       17
       17
       +
       , speechSupport ? true

     

       18
       18
       +
       , speechd

     

       7
       19
        
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       assert speechSupport -> speechd != null;

     

       10
       20
        
       

     

       11
       21
        
       stdenv.mkDerivation {

     

       12
       22
        
         pname = "dasher";

     

       13
       13
       -
         version = "2018-04-03";

     

       23
       23
       +
         version = "unstable-2021-04-25";

     

       14
       24
        
       

     

       15
       15
       -
         src = fetchFromGitHub {

     

       16
       16
       -
           owner = "dasher-project";

     

       25
       25
       +
         src = fetchFromGitLab {

     

       26
       26
       +
           domain = "gitlab.gnome.org";

     

       27
       27
       +
           owner = "GNOME";

     

       17
       28
        
           repo = "dasher";

     

       18
       18
       -
           rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627";

     

       19
       19
       -
           sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s";

     

       29
       29
       +
           rev = "90c753b87564fa3f42cb2d04e1eb6662dc8e0f8f";

     

       30
       30
       +
           sha256 = "sha256-aM05CV68pCRlhfIPyhuHWeRL+tDroB3fVsoX08OU8hY=";

     

       20
       31
        
         };

     

       21
       32
        
       

     

       22
       33
        
         prePatch = ''

     
···

       33
       44
        
           # doc generation

     

       34
       45
        
           gnome-doc-utils

     

       35
       46
        
           which

     

       36
       36
       -
           libxslt libxml2

     

       47
       47
       +
           libxslt

     

       48
       48
       +
           libxml2

     

       37
       49
        
         ];

     

       38
       50
        
       

     

       39
       51
        
         buildInputs = [

     

       40
       52
        
           glib

     

       41
       53
        
           gtk3

     

       42
       54
        
           expat

     

       55
       55
       +
           itstool

     

       43
       56
        
           # at-spi2 needs dbus to be recognized by pkg-config

     

       44
       44
       -
           at-spi2-core dbus

     

       57
       57
       +
           at-spi2-core

     

       58
       58
       +
           dbus

     

       45
       59
        
         ] ++ lib.optional speechSupport speechd;

     

       46
       60
        
       

     

       61
       61
       +
         enableParallelBuilding = true;

     

       62
       62
       +
       

     

       47
       63
        
         meta = {

     

       48
       48
       -
           homepage = "http://www.inference.org.uk/dasher/";

     

       64
       64
       +
           homepage = "https://www.inference.org.uk/dasher/";

     

       49
       65
        
           description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures";

     

       50
       50
       -
           license = lib.licenses.gpl2;

     

       66
       66
       +
           license = lib.licenses.gpl2Only;

     

       51
       67
        
           maintainers = [ lib.maintainers.Profpatsch ];

     

       52
       68
        
           platforms = lib.platforms.all;

     

       53
       69
        
         };

     

       54
       54
       -
       

     

       55
       70
        
       }

+6 -3

pkgs/applications/misc/corectrl/default.nix

···

       5
       5
        
       , karchive

     

       6
       6
        
       , kauth

     

       7
       7
        
       , libdrm

     

       8
       8
       +
       , hwdata

     

       8
       9
        
       , mesa-demos

     

       9
       10
        
       , procps

     

       10
       11
        
       , util-linux

     
···

       20
       21
        
       

     

       21
       22
        
       stdenv.mkDerivation rec{

     

       22
       23
        
         pname = "corectrl";

     

       23
       23
       -
         version = "1.1.2";

     

       24
       24
       +
         version = "1.1.3";

     

       24
       25
        
       

     

       25
       26
        
         src = fetchFromGitLab {

     

       26
       27
        
           owner = "corectrl";

     

       27
       28
        
           repo = "corectrl";

     

       28
       29
        
           rev = "v${version}";

     

       29
       29
       -
           sha256 = "sha256-hKYZkKQOvNu2qDSOq1cjoiLwwOvEqdJfqGG5p3Vhkhs=";

     

       30
       30
       +
           sha256 = "sha256-xRyc7FYzG8MnhQ8DjIUHYLeUZCZQdi4j1v1fG7F0+G8=";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       32
       33
        
         nativeBuildInputs = [

     
···

       50
       51
        
           qtxmlpatterns

     

       51
       52
        
         ];

     

       52
       53
        
       

     

       53
       53
       -
         runtimeDeps = [ mesa-demos vulkan-tools ];

     

       54
       54
       +
         cmakeFlags = [ "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" ];

     

       55
       55
       +
       

     

       56
       56
       +
         runtimeDeps = [ hwdata mesa-demos vulkan-tools ];

     

       54
       57
        
         binPath = lib.makeBinPath runtimeDeps;

     

       55
       58
        
       

     

       56
       59
        
         dontWrapQtApps = true;

-184

pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix

···

       1
       1
       -
       # This pakcage is keeped until Thunderbird 78 supports OpenPGP.

     

       2
       2
       -
       # https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/

     

       3
       3
       -
       { lib, stdenv, fetchurl, config, makeWrapper

     

       4
       4
       -
       , alsaLib

     

       5
       5
       -
       , at-spi2-atk

     

       6
       6
       -
       , atk

     

       7
       7
       -
       , cairo

     

       8
       8
       -
       , cups

     

       9
       9
       -
       , curl

     

       10
       10
       -
       , dbus-glib

     

       11
       11
       -
       , dbus

     

       12
       12
       -
       , fontconfig

     

       13
       13
       -
       , freetype

     

       14
       14
       -
       , gdk-pixbuf

     

       15
       15
       -
       , glib

     

       16
       16
       -
       , glibc

     

       17
       17
       -
       , gtk2

     

       18
       18
       -
       , gtk3

     

       19
       19
       -
       , libkrb5

     

       20
       20
       -
       , libX11

     

       21
       21
       -
       , libXScrnSaver

     

       22
       22
       -
       , libXcomposite

     

       23
       23
       -
       , libXcursor

     

       24
       24
       -
       , libXdamage

     

       25
       25
       -
       , libXext

     

       26
       26
       -
       , libXfixes

     

       27
       27
       -
       , libXi

     

       28
       28
       -
       , libXinerama

     

       29
       29
       -
       , libXrender

     

       30
       30
       -
       , libXt

     

       31
       31
       -
       , libxcb

     

       32
       32
       -
       , libcanberra

     

       33
       33
       -
       , gnome

     

       34
       34
       -
       , libGLU, libGL

     

       35
       35
       -
       , nspr

     

       36
       36
       -
       , nss

     

       37
       37
       -
       , pango

     

       38
       38
       -
       , writeScript

     

       39
       39
       -
       , xidel

     

       40
       40
       -
       , coreutils

     

       41
       41
       -
       , gnused

     

       42
       42
       -
       , gnugrep

     

       43
       43
       -
       , gnupg

     

       44
       44
       -
       , runtimeShell

     

       45
       45
       -
       }:

     

       46
       46
       -
       

     

       47
       47
       -
       # imports `version` and `sources`

     

       48
       48
       -
       with (import ./68_sources.nix);

     

       49
       49
       -
       

     

       50
       50
       -
       let

     

       51
       51
       -
         arch = if stdenv.hostPlatform.system == "i686-linux"

     

       52
       52
       -
           then "linux-i686"

     

       53
       53
       -
           else "linux-x86_64";

     

       54
       54
       -
       

     

       55
       55
       -
         isPrefixOf = prefix: string:

     

       56
       56
       -
           builtins.substring 0 (builtins.stringLength prefix) string == prefix;

     

       57
       57
       -
       

     

       58
       58
       -
         sourceMatches = locale: source:

     

       59
       59
       -
             (isPrefixOf source.locale locale) && source.arch == arch;

     

       60
       60
       -
       

     

       61
       61
       -
         systemLocale = config.i18n.defaultLocale or "en-US";

     

       62
       62
       -
       

     

       63
       63
       -
         defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;

     

       64
       64
       -
       

     

       65
       65
       -
         source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;

     

       66
       66
       -
       

     

       67
       67
       -
         name = "thunderbird-bin-${version}";

     

       68
       68
       -
       in

     

       69
       69
       -
       

     

       70
       70
       -
       stdenv.mkDerivation {

     

       71
       71
       -
         inherit name;

     

       72
       72
       -
       

     

       73
       73
       -
         src = fetchurl {

     

       74
       74
       -
           url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";

     

       75
       75
       -
           inherit (source) sha256;

     

       76
       76
       -
         };

     

       77
       77
       -
       

     

       78
       78
       -
         phases = "unpackPhase installPhase";

     

       79
       79
       -
       

     

       80
       80
       -
         libPath = lib.makeLibraryPath

     

       81
       81
       -
           [ stdenv.cc.cc

     

       82
       82
       -
             alsaLib

     

       83
       83
       -
             at-spi2-atk

     

       84
       84
       -
             atk

     

       85
       85
       -
             cairo

     

       86
       86
       -
             cups

     

       87
       87
       -
             curl

     

       88
       88
       -
             dbus-glib

     

       89
       89
       -
             dbus

     

       90
       90
       -
             fontconfig

     

       91
       91
       -
             freetype

     

       92
       92
       -
             gdk-pixbuf

     

       93
       93
       -
             glib

     

       94
       94
       -
             glibc

     

       95
       95
       -
             gtk2

     

       96
       96
       -
             gtk3

     

       97
       97
       -
             libkrb5

     

       98
       98
       -
             libX11

     

       99
       99
       -
             libXScrnSaver

     

       100
       100
       -
             libXcomposite

     

       101
       101
       -
             libXcursor

     

       102
       102
       -
             libXdamage

     

       103
       103
       -
             libXext

     

       104
       104
       -
             libXfixes

     

       105
       105
       -
             libXi

     

       106
       106
       -
             libXinerama

     

       107
       107
       -
             libXrender

     

       108
       108
       -
             libXt

     

       109
       109
       -
             libxcb

     

       110
       110
       -
             libcanberra

     

       111
       111
       -
             libGLU libGL

     

       112
       112
       -
             nspr

     

       113
       113
       -
             nss

     

       114
       114
       -
             pango

     

       115
       115
       -
           ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [

     

       116
       116
       -
             stdenv.cc.cc

     

       117
       117
       -
           ];

     

       118
       118
       -
       

     

       119
       119
       -
         buildInputs = [ gtk3 gnome.adwaita-icon-theme ];

     

       120
       120
       -
       

     

       121
       121
       -
         nativeBuildInputs = [ makeWrapper ];

     

       122
       122
       -
       

     

       123
       123
       -
         installPhase =

     

       124
       124
       -
           ''

     

       125
       125
       -
             mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"

     

       126
       126
       -
             cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"

     

       127
       127
       -
       

     

       128
       128
       -
             mkdir -p "$out/bin"

     

       129
       129
       -
             ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"

     

       130
       130
       -
       

     

       131
       131
       -
             for executable in \

     

       132
       132
       -
               thunderbird crashreporter thunderbird-bin plugin-container updater

     

       133
       133
       -
             do

     

       134
       134
       -
               patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       135
       135
       -
                 "$out/usr/lib/thunderbird-bin-${version}/$executable"

     

       136
       136
       -
             done

     

       137
       137
       -
       

     

       138
       138
       -
             find . -executable -type f -exec \

     

       139
       139
       -
               patchelf --set-rpath "$libPath" \

     

       140
       140
       -
                 "$out/usr/lib/thunderbird-bin-${version}/{}" \;

     

       141
       141
       -
       

     

       142
       142
       -
             # Create a desktop item.

     

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

     

       144
       144
       -
             cat > $out/share/applications/thunderbird.desktop <<EOF

     

       145
       145
       -
             [Desktop Entry]

     

       146
       146
       -
             Type=Application

     

       147
       147
       -
             Exec=$out/bin/thunderbird

     

       148
       148
       -
             Icon=$out/usr/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png

     

       149
       149
       -
             Name=Thunderbird

     

       150
       150
       -
             GenericName=Mail Reader

     

       151
       151
       -
             Categories=Application;Network;

     

       152
       152
       -
             EOF

     

       153
       153
       -
       

     

       154
       154
       -
             # SNAP_NAME: https://github.com/NixOS/nixpkgs/pull/61980

     

       155
       155
       -
             # MOZ_LEGACY_PROFILES and MOZ_ALLOW_DOWNGRADE:

     

       156
       156
       -
             #   commit 87e261843c4236c541ee0113988286f77d2fa1ee

     

       157
       157
       -
             wrapProgram "$out/bin/thunderbird" \

     

       158
       158
       -
               --argv0 "$out/bin/.thunderbird-wrapped" \

     

       159
       159
       -
               --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \

     

       160
       160
       -
               --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \

     

       161
       161
       -
               --set SNAP_NAME "thunderbird" \

     

       162
       162
       -
               --set MOZ_LEGACY_PROFILES 1 \

     

       163
       163
       -
               --set MOZ_ALLOW_DOWNGRADE 1

     

       164
       164
       -
           '';

     

       165
       165
       -
       

     

       166
       166
       -
         passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {

     

       167
       167
       -
           inherit name writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;

     

       168
       168
       -
           baseName = "thunderbird";

     

       169
       169
       -
           channel = "release";

     

       170
       170
       -
           basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

     

       171
       171
       -
           baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";

     

       172
       172
       -
         };

     

       173
       173
       -
         meta = with lib; {

     

       174
       174
       -
           description = "Mozilla Thunderbird, a full-featured email client (binary package)";

     

       175
       175
       -
           homepage = "http://www.mozilla.org/thunderbird/";

     

       176
       176
       -
           license = {

     

       177
       177
       -
             free = false;

     

       178
       178
       -
             url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/";

     

       179
       179
       -
           };

     

       180
       180
       -
           maintainers = with lib.maintainers; [ ];

     

       181
       181
       -
           platforms = platforms.linux;

     

       182
       182
       -
           knownVulnerabilities = [ "Support ended around Semptember 2020." ];

     

       183
       183
       -
         };

     

       184
       184
       -
       }

-615

pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         version = "68.12.0";

     

       3
       3
       -
         sources = [

     

       4
       4
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2";

     

       5
       5
       -
             locale = "ar";

     

       6
       6
       -
             arch = "linux-x86_64";

     

       7
       7
       -
             sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400";

     

       8
       8
       -
           }

     

       9
       9
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2";

     

       10
       10
       -
             locale = "ast";

     

       11
       11
       -
             arch = "linux-x86_64";

     

       12
       12
       -
             sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490";

     

       13
       13
       -
           }

     

       14
       14
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2";

     

       15
       15
       -
             locale = "be";

     

       16
       16
       -
             arch = "linux-x86_64";

     

       17
       17
       -
             sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd";

     

       18
       18
       -
           }

     

       19
       19
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2";

     

       20
       20
       -
             locale = "bg";

     

       21
       21
       -
             arch = "linux-x86_64";

     

       22
       22
       -
             sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c";

     

       23
       23
       -
           }

     

       24
       24
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2";

     

       25
       25
       -
             locale = "br";

     

       26
       26
       -
             arch = "linux-x86_64";

     

       27
       27
       -
             sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345";

     

       28
       28
       -
           }

     

       29
       29
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2";

     

       30
       30
       -
             locale = "ca";

     

       31
       31
       -
             arch = "linux-x86_64";

     

       32
       32
       -
             sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54";

     

       33
       33
       -
           }

     

       34
       34
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2";

     

       35
       35
       -
             locale = "cak";

     

       36
       36
       -
             arch = "linux-x86_64";

     

       37
       37
       -
             sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b";

     

       38
       38
       -
           }

     

       39
       39
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2";

     

       40
       40
       -
             locale = "cs";

     

       41
       41
       -
             arch = "linux-x86_64";

     

       42
       42
       -
             sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41";

     

       43
       43
       -
           }

     

       44
       44
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2";

     

       45
       45
       -
             locale = "cy";

     

       46
       46
       -
             arch = "linux-x86_64";

     

       47
       47
       -
             sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8";

     

       48
       48
       -
           }

     

       49
       49
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2";

     

       50
       50
       -
             locale = "da";

     

       51
       51
       -
             arch = "linux-x86_64";

     

       52
       52
       -
             sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24";

     

       53
       53
       -
           }

     

       54
       54
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2";

     

       55
       55
       -
             locale = "de";

     

       56
       56
       -
             arch = "linux-x86_64";

     

       57
       57
       -
             sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4";

     

       58
       58
       -
           }

     

       59
       59
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2";

     

       60
       60
       -
             locale = "dsb";

     

       61
       61
       -
             arch = "linux-x86_64";

     

       62
       62
       -
             sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121";

     

       63
       63
       -
           }

     

       64
       64
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2";

     

       65
       65
       -
             locale = "el";

     

       66
       66
       -
             arch = "linux-x86_64";

     

       67
       67
       -
             sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e";

     

       68
       68
       -
           }

     

       69
       69
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2";

     

       70
       70
       -
             locale = "en-GB";

     

       71
       71
       -
             arch = "linux-x86_64";

     

       72
       72
       -
             sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e";

     

       73
       73
       -
           }

     

       74
       74
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2";

     

       75
       75
       -
             locale = "en-US";

     

       76
       76
       -
             arch = "linux-x86_64";

     

       77
       77
       -
             sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24";

     

       78
       78
       -
           }

     

       79
       79
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2";

     

       80
       80
       -
             locale = "es-AR";

     

       81
       81
       -
             arch = "linux-x86_64";

     

       82
       82
       -
             sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d";

     

       83
       83
       -
           }

     

       84
       84
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2";

     

       85
       85
       -
             locale = "es-ES";

     

       86
       86
       -
             arch = "linux-x86_64";

     

       87
       87
       -
             sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a";

     

       88
       88
       -
           }

     

       89
       89
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2";

     

       90
       90
       -
             locale = "et";

     

       91
       91
       -
             arch = "linux-x86_64";

     

       92
       92
       -
             sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf";

     

       93
       93
       -
           }

     

       94
       94
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2";

     

       95
       95
       -
             locale = "eu";

     

       96
       96
       -
             arch = "linux-x86_64";

     

       97
       97
       -
             sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f";

     

       98
       98
       -
           }

     

       99
       99
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2";

     

       100
       100
       -
             locale = "fi";

     

       101
       101
       -
             arch = "linux-x86_64";

     

       102
       102
       -
             sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b";

     

       103
       103
       -
           }

     

       104
       104
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2";

     

       105
       105
       -
             locale = "fr";

     

       106
       106
       -
             arch = "linux-x86_64";

     

       107
       107
       -
             sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea";

     

       108
       108
       -
           }

     

       109
       109
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2";

     

       110
       110
       -
             locale = "fy-NL";

     

       111
       111
       -
             arch = "linux-x86_64";

     

       112
       112
       -
             sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906";

     

       113
       113
       -
           }

     

       114
       114
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2";

     

       115
       115
       -
             locale = "ga-IE";

     

       116
       116
       -
             arch = "linux-x86_64";

     

       117
       117
       -
             sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad";

     

       118
       118
       -
           }

     

       119
       119
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2";

     

       120
       120
       -
             locale = "gd";

     

       121
       121
       -
             arch = "linux-x86_64";

     

       122
       122
       -
             sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf";

     

       123
       123
       -
           }

     

       124
       124
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2";

     

       125
       125
       -
             locale = "gl";

     

       126
       126
       -
             arch = "linux-x86_64";

     

       127
       127
       -
             sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8";

     

       128
       128
       -
           }

     

       129
       129
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2";

     

       130
       130
       -
             locale = "he";

     

       131
       131
       -
             arch = "linux-x86_64";

     

       132
       132
       -
             sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae";

     

       133
       133
       -
           }

     

       134
       134
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2";

     

       135
       135
       -
             locale = "hr";

     

       136
       136
       -
             arch = "linux-x86_64";

     

       137
       137
       -
             sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee";

     

       138
       138
       -
           }

     

       139
       139
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2";

     

       140
       140
       -
             locale = "hsb";

     

       141
       141
       -
             arch = "linux-x86_64";

     

       142
       142
       -
             sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b";

     

       143
       143
       -
           }

     

       144
       144
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2";

     

       145
       145
       -
             locale = "hu";

     

       146
       146
       -
             arch = "linux-x86_64";

     

       147
       147
       -
             sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39";

     

       148
       148
       -
           }

     

       149
       149
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2";

     

       150
       150
       -
             locale = "hy-AM";

     

       151
       151
       -
             arch = "linux-x86_64";

     

       152
       152
       -
             sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30";

     

       153
       153
       -
           }

     

       154
       154
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2";

     

       155
       155
       -
             locale = "id";

     

       156
       156
       -
             arch = "linux-x86_64";

     

       157
       157
       -
             sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3";

     

       158
       158
       -
           }

     

       159
       159
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2";

     

       160
       160
       -
             locale = "is";

     

       161
       161
       -
             arch = "linux-x86_64";

     

       162
       162
       -
             sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67";

     

       163
       163
       -
           }

     

       164
       164
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2";

     

       165
       165
       -
             locale = "it";

     

       166
       166
       -
             arch = "linux-x86_64";

     

       167
       167
       -
             sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c";

     

       168
       168
       -
           }

     

       169
       169
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2";

     

       170
       170
       -
             locale = "ja";

     

       171
       171
       -
             arch = "linux-x86_64";

     

       172
       172
       -
             sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4";

     

       173
       173
       -
           }

     

       174
       174
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2";

     

       175
       175
       -
             locale = "ka";

     

       176
       176
       -
             arch = "linux-x86_64";

     

       177
       177
       -
             sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63";

     

       178
       178
       -
           }

     

       179
       179
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2";

     

       180
       180
       -
             locale = "kab";

     

       181
       181
       -
             arch = "linux-x86_64";

     

       182
       182
       -
             sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8";

     

       183
       183
       -
           }

     

       184
       184
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2";

     

       185
       185
       -
             locale = "kk";

     

       186
       186
       -
             arch = "linux-x86_64";

     

       187
       187
       -
             sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284";

     

       188
       188
       -
           }

     

       189
       189
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2";

     

       190
       190
       -
             locale = "ko";

     

       191
       191
       -
             arch = "linux-x86_64";

     

       192
       192
       -
             sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe";

     

       193
       193
       -
           }

     

       194
       194
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2";

     

       195
       195
       -
             locale = "lt";

     

       196
       196
       -
             arch = "linux-x86_64";

     

       197
       197
       -
             sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76";

     

       198
       198
       -
           }

     

       199
       199
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2";

     

       200
       200
       -
             locale = "ms";

     

       201
       201
       -
             arch = "linux-x86_64";

     

       202
       202
       -
             sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee";

     

       203
       203
       -
           }

     

       204
       204
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2";

     

       205
       205
       -
             locale = "nb-NO";

     

       206
       206
       -
             arch = "linux-x86_64";

     

       207
       207
       -
             sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90";

     

       208
       208
       -
           }

     

       209
       209
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2";

     

       210
       210
       -
             locale = "nl";

     

       211
       211
       -
             arch = "linux-x86_64";

     

       212
       212
       -
             sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8";

     

       213
       213
       -
           }

     

       214
       214
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2";

     

       215
       215
       -
             locale = "nn-NO";

     

       216
       216
       -
             arch = "linux-x86_64";

     

       217
       217
       -
             sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125";

     

       218
       218
       -
           }

     

       219
       219
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2";

     

       220
       220
       -
             locale = "pl";

     

       221
       221
       -
             arch = "linux-x86_64";

     

       222
       222
       -
             sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7";

     

       223
       223
       -
           }

     

       224
       224
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2";

     

       225
       225
       -
             locale = "pt-BR";

     

       226
       226
       -
             arch = "linux-x86_64";

     

       227
       227
       -
             sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203";

     

       228
       228
       -
           }

     

       229
       229
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2";

     

       230
       230
       -
             locale = "pt-PT";

     

       231
       231
       -
             arch = "linux-x86_64";

     

       232
       232
       -
             sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825";

     

       233
       233
       -
           }

     

       234
       234
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2";

     

       235
       235
       -
             locale = "rm";

     

       236
       236
       -
             arch = "linux-x86_64";

     

       237
       237
       -
             sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734";

     

       238
       238
       -
           }

     

       239
       239
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2";

     

       240
       240
       -
             locale = "ro";

     

       241
       241
       -
             arch = "linux-x86_64";

     

       242
       242
       -
             sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad";

     

       243
       243
       -
           }

     

       244
       244
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2";

     

       245
       245
       -
             locale = "ru";

     

       246
       246
       -
             arch = "linux-x86_64";

     

       247
       247
       -
             sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026";

     

       248
       248
       -
           }

     

       249
       249
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2";

     

       250
       250
       -
             locale = "si";

     

       251
       251
       -
             arch = "linux-x86_64";

     

       252
       252
       -
             sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a";

     

       253
       253
       -
           }

     

       254
       254
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2";

     

       255
       255
       -
             locale = "sk";

     

       256
       256
       -
             arch = "linux-x86_64";

     

       257
       257
       -
             sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0";

     

       258
       258
       -
           }

     

       259
       259
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2";

     

       260
       260
       -
             locale = "sl";

     

       261
       261
       -
             arch = "linux-x86_64";

     

       262
       262
       -
             sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84";

     

       263
       263
       -
           }

     

       264
       264
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2";

     

       265
       265
       -
             locale = "sq";

     

       266
       266
       -
             arch = "linux-x86_64";

     

       267
       267
       -
             sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238";

     

       268
       268
       -
           }

     

       269
       269
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2";

     

       270
       270
       -
             locale = "sr";

     

       271
       271
       -
             arch = "linux-x86_64";

     

       272
       272
       -
             sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377";

     

       273
       273
       -
           }

     

       274
       274
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2";

     

       275
       275
       -
             locale = "sv-SE";

     

       276
       276
       -
             arch = "linux-x86_64";

     

       277
       277
       -
             sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9";

     

       278
       278
       -
           }

     

       279
       279
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2";

     

       280
       280
       -
             locale = "tr";

     

       281
       281
       -
             arch = "linux-x86_64";

     

       282
       282
       -
             sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c";

     

       283
       283
       -
           }

     

       284
       284
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2";

     

       285
       285
       -
             locale = "uk";

     

       286
       286
       -
             arch = "linux-x86_64";

     

       287
       287
       -
             sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96";

     

       288
       288
       -
           }

     

       289
       289
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2";

     

       290
       290
       -
             locale = "uz";

     

       291
       291
       -
             arch = "linux-x86_64";

     

       292
       292
       -
             sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1";

     

       293
       293
       -
           }

     

       294
       294
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2";

     

       295
       295
       -
             locale = "vi";

     

       296
       296
       -
             arch = "linux-x86_64";

     

       297
       297
       -
             sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de";

     

       298
       298
       -
           }

     

       299
       299
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2";

     

       300
       300
       -
             locale = "zh-CN";

     

       301
       301
       -
             arch = "linux-x86_64";

     

       302
       302
       -
             sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e";

     

       303
       303
       -
           }

     

       304
       304
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2";

     

       305
       305
       -
             locale = "zh-TW";

     

       306
       306
       -
             arch = "linux-x86_64";

     

       307
       307
       -
             sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9";

     

       308
       308
       -
           }

     

       309
       309
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2";

     

       310
       310
       -
             locale = "ar";

     

       311
       311
       -
             arch = "linux-i686";

     

       312
       312
       -
             sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be";

     

       313
       313
       -
           }

     

       314
       314
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2";

     

       315
       315
       -
             locale = "ast";

     

       316
       316
       -
             arch = "linux-i686";

     

       317
       317
       -
             sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721";

     

       318
       318
       -
           }

     

       319
       319
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2";

     

       320
       320
       -
             locale = "be";

     

       321
       321
       -
             arch = "linux-i686";

     

       322
       322
       -
             sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e";

     

       323
       323
       -
           }

     

       324
       324
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2";

     

       325
       325
       -
             locale = "bg";

     

       326
       326
       -
             arch = "linux-i686";

     

       327
       327
       -
             sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b";

     

       328
       328
       -
           }

     

       329
       329
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2";

     

       330
       330
       -
             locale = "br";

     

       331
       331
       -
             arch = "linux-i686";

     

       332
       332
       -
             sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea";

     

       333
       333
       -
           }

     

       334
       334
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2";

     

       335
       335
       -
             locale = "ca";

     

       336
       336
       -
             arch = "linux-i686";

     

       337
       337
       -
             sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f";

     

       338
       338
       -
           }

     

       339
       339
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2";

     

       340
       340
       -
             locale = "cak";

     

       341
       341
       -
             arch = "linux-i686";

     

       342
       342
       -
             sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8";

     

       343
       343
       -
           }

     

       344
       344
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2";

     

       345
       345
       -
             locale = "cs";

     

       346
       346
       -
             arch = "linux-i686";

     

       347
       347
       -
             sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9";

     

       348
       348
       -
           }

     

       349
       349
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2";

     

       350
       350
       -
             locale = "cy";

     

       351
       351
       -
             arch = "linux-i686";

     

       352
       352
       -
             sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4";

     

       353
       353
       -
           }

     

       354
       354
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2";

     

       355
       355
       -
             locale = "da";

     

       356
       356
       -
             arch = "linux-i686";

     

       357
       357
       -
             sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0";

     

       358
       358
       -
           }

     

       359
       359
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2";

     

       360
       360
       -
             locale = "de";

     

       361
       361
       -
             arch = "linux-i686";

     

       362
       362
       -
             sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0";

     

       363
       363
       -
           }

     

       364
       364
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2";

     

       365
       365
       -
             locale = "dsb";

     

       366
       366
       -
             arch = "linux-i686";

     

       367
       367
       -
             sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18";

     

       368
       368
       -
           }

     

       369
       369
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2";

     

       370
       370
       -
             locale = "el";

     

       371
       371
       -
             arch = "linux-i686";

     

       372
       372
       -
             sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18";

     

       373
       373
       -
           }

     

       374
       374
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2";

     

       375
       375
       -
             locale = "en-GB";

     

       376
       376
       -
             arch = "linux-i686";

     

       377
       377
       -
             sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4";

     

       378
       378
       -
           }

     

       379
       379
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2";

     

       380
       380
       -
             locale = "en-US";

     

       381
       381
       -
             arch = "linux-i686";

     

       382
       382
       -
             sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5";

     

       383
       383
       -
           }

     

       384
       384
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2";

     

       385
       385
       -
             locale = "es-AR";

     

       386
       386
       -
             arch = "linux-i686";

     

       387
       387
       -
             sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d";

     

       388
       388
       -
           }

     

       389
       389
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2";

     

       390
       390
       -
             locale = "es-ES";

     

       391
       391
       -
             arch = "linux-i686";

     

       392
       392
       -
             sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f";

     

       393
       393
       -
           }

     

       394
       394
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2";

     

       395
       395
       -
             locale = "et";

     

       396
       396
       -
             arch = "linux-i686";

     

       397
       397
       -
             sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2";

     

       398
       398
       -
           }

     

       399
       399
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2";

     

       400
       400
       -
             locale = "eu";

     

       401
       401
       -
             arch = "linux-i686";

     

       402
       402
       -
             sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679";

     

       403
       403
       -
           }

     

       404
       404
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2";

     

       405
       405
       -
             locale = "fi";

     

       406
       406
       -
             arch = "linux-i686";

     

       407
       407
       -
             sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a";

     

       408
       408
       -
           }

     

       409
       409
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2";

     

       410
       410
       -
             locale = "fr";

     

       411
       411
       -
             arch = "linux-i686";

     

       412
       412
       -
             sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7";

     

       413
       413
       -
           }

     

       414
       414
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2";

     

       415
       415
       -
             locale = "fy-NL";

     

       416
       416
       -
             arch = "linux-i686";

     

       417
       417
       -
             sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e";

     

       418
       418
       -
           }

     

       419
       419
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2";

     

       420
       420
       -
             locale = "ga-IE";

     

       421
       421
       -
             arch = "linux-i686";

     

       422
       422
       -
             sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e";

     

       423
       423
       -
           }

     

       424
       424
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2";

     

       425
       425
       -
             locale = "gd";

     

       426
       426
       -
             arch = "linux-i686";

     

       427
       427
       -
             sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f";

     

       428
       428
       -
           }

     

       429
       429
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2";

     

       430
       430
       -
             locale = "gl";

     

       431
       431
       -
             arch = "linux-i686";

     

       432
       432
       -
             sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd";

     

       433
       433
       -
           }

     

       434
       434
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2";

     

       435
       435
       -
             locale = "he";

     

       436
       436
       -
             arch = "linux-i686";

     

       437
       437
       -
             sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37";

     

       438
       438
       -
           }

     

       439
       439
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2";

     

       440
       440
       -
             locale = "hr";

     

       441
       441
       -
             arch = "linux-i686";

     

       442
       442
       -
             sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f";

     

       443
       443
       -
           }

     

       444
       444
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2";

     

       445
       445
       -
             locale = "hsb";

     

       446
       446
       -
             arch = "linux-i686";

     

       447
       447
       -
             sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693";

     

       448
       448
       -
           }

     

       449
       449
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2";

     

       450
       450
       -
             locale = "hu";

     

       451
       451
       -
             arch = "linux-i686";

     

       452
       452
       -
             sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0";

     

       453
       453
       -
           }

     

       454
       454
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2";

     

       455
       455
       -
             locale = "hy-AM";

     

       456
       456
       -
             arch = "linux-i686";

     

       457
       457
       -
             sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0";

     

       458
       458
       -
           }

     

       459
       459
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2";

     

       460
       460
       -
             locale = "id";

     

       461
       461
       -
             arch = "linux-i686";

     

       462
       462
       -
             sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0";

     

       463
       463
       -
           }

     

       464
       464
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2";

     

       465
       465
       -
             locale = "is";

     

       466
       466
       -
             arch = "linux-i686";

     

       467
       467
       -
             sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306";

     

       468
       468
       -
           }

     

       469
       469
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2";

     

       470
       470
       -
             locale = "it";

     

       471
       471
       -
             arch = "linux-i686";

     

       472
       472
       -
             sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da";

     

       473
       473
       -
           }

     

       474
       474
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2";

     

       475
       475
       -
             locale = "ja";

     

       476
       476
       -
             arch = "linux-i686";

     

       477
       477
       -
             sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6";

     

       478
       478
       -
           }

     

       479
       479
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2";

     

       480
       480
       -
             locale = "ka";

     

       481
       481
       -
             arch = "linux-i686";

     

       482
       482
       -
             sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10";

     

       483
       483
       -
           }

     

       484
       484
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2";

     

       485
       485
       -
             locale = "kab";

     

       486
       486
       -
             arch = "linux-i686";

     

       487
       487
       -
             sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef";

     

       488
       488
       -
           }

     

       489
       489
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2";

     

       490
       490
       -
             locale = "kk";

     

       491
       491
       -
             arch = "linux-i686";

     

       492
       492
       -
             sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4";

     

       493
       493
       -
           }

     

       494
       494
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2";

     

       495
       495
       -
             locale = "ko";

     

       496
       496
       -
             arch = "linux-i686";

     

       497
       497
       -
             sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400";

     

       498
       498
       -
           }

     

       499
       499
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2";

     

       500
       500
       -
             locale = "lt";

     

       501
       501
       -
             arch = "linux-i686";

     

       502
       502
       -
             sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461";

     

       503
       503
       -
           }

     

       504
       504
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2";

     

       505
       505
       -
             locale = "ms";

     

       506
       506
       -
             arch = "linux-i686";

     

       507
       507
       -
             sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc";

     

       508
       508
       -
           }

     

       509
       509
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2";

     

       510
       510
       -
             locale = "nb-NO";

     

       511
       511
       -
             arch = "linux-i686";

     

       512
       512
       -
             sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761";

     

       513
       513
       -
           }

     

       514
       514
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2";

     

       515
       515
       -
             locale = "nl";

     

       516
       516
       -
             arch = "linux-i686";

     

       517
       517
       -
             sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f";

     

       518
       518
       -
           }

     

       519
       519
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2";

     

       520
       520
       -
             locale = "nn-NO";

     

       521
       521
       -
             arch = "linux-i686";

     

       522
       522
       -
             sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805";

     

       523
       523
       -
           }

     

       524
       524
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2";

     

       525
       525
       -
             locale = "pl";

     

       526
       526
       -
             arch = "linux-i686";

     

       527
       527
       -
             sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618";

     

       528
       528
       -
           }

     

       529
       529
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2";

     

       530
       530
       -
             locale = "pt-BR";

     

       531
       531
       -
             arch = "linux-i686";

     

       532
       532
       -
             sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2";

     

       533
       533
       -
           }

     

       534
       534
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2";

     

       535
       535
       -
             locale = "pt-PT";

     

       536
       536
       -
             arch = "linux-i686";

     

       537
       537
       -
             sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4";

     

       538
       538
       -
           }

     

       539
       539
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2";

     

       540
       540
       -
             locale = "rm";

     

       541
       541
       -
             arch = "linux-i686";

     

       542
       542
       -
             sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7";

     

       543
       543
       -
           }

     

       544
       544
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2";

     

       545
       545
       -
             locale = "ro";

     

       546
       546
       -
             arch = "linux-i686";

     

       547
       547
       -
             sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12";

     

       548
       548
       -
           }

     

       549
       549
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2";

     

       550
       550
       -
             locale = "ru";

     

       551
       551
       -
             arch = "linux-i686";

     

       552
       552
       -
             sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b";

     

       553
       553
       -
           }

     

       554
       554
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2";

     

       555
       555
       -
             locale = "si";

     

       556
       556
       -
             arch = "linux-i686";

     

       557
       557
       -
             sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6";

     

       558
       558
       -
           }

     

       559
       559
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2";

     

       560
       560
       -
             locale = "sk";

     

       561
       561
       -
             arch = "linux-i686";

     

       562
       562
       -
             sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff";

     

       563
       563
       -
           }

     

       564
       564
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2";

     

       565
       565
       -
             locale = "sl";

     

       566
       566
       -
             arch = "linux-i686";

     

       567
       567
       -
             sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b";

     

       568
       568
       -
           }

     

       569
       569
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2";

     

       570
       570
       -
             locale = "sq";

     

       571
       571
       -
             arch = "linux-i686";

     

       572
       572
       -
             sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b";

     

       573
       573
       -
           }

     

       574
       574
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2";

     

       575
       575
       -
             locale = "sr";

     

       576
       576
       -
             arch = "linux-i686";

     

       577
       577
       -
             sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7";

     

       578
       578
       -
           }

     

       579
       579
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2";

     

       580
       580
       -
             locale = "sv-SE";

     

       581
       581
       -
             arch = "linux-i686";

     

       582
       582
       -
             sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e";

     

       583
       583
       -
           }

     

       584
       584
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2";

     

       585
       585
       -
             locale = "tr";

     

       586
       586
       -
             arch = "linux-i686";

     

       587
       587
       -
             sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b";

     

       588
       588
       -
           }

     

       589
       589
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2";

     

       590
       590
       -
             locale = "uk";

     

       591
       591
       -
             arch = "linux-i686";

     

       592
       592
       -
             sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767";

     

       593
       593
       -
           }

     

       594
       594
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2";

     

       595
       595
       -
             locale = "uz";

     

       596
       596
       -
             arch = "linux-i686";

     

       597
       597
       -
             sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99";

     

       598
       598
       -
           }

     

       599
       599
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2";

     

       600
       600
       -
             locale = "vi";

     

       601
       601
       -
             arch = "linux-i686";

     

       602
       602
       -
             sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0";

     

       603
       603
       -
           }

     

       604
       604
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2";

     

       605
       605
       -
             locale = "zh-CN";

     

       606
       606
       -
             arch = "linux-i686";

     

       607
       607
       -
             sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c";

     

       608
       608
       -
           }

     

       609
       609
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2";

     

       610
       610
       -
             locale = "zh-TW";

     

       611
       611
       -
             arch = "linux-i686";

     

       612
       612
       -
             sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515";

     

       613
       613
       -
           }

     

       614
       614
       -
           ];

     

       615
       615
       -
       }

-343

pkgs/applications/networking/mailreaders/thunderbird/68.nix

···

       1
       1
       -
       # This pakcage is keeped until Thunderbird 78 supports OpenPGP.

     

       2
       2
       -
       # https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/

     

       3
       3
       -
       { autoconf213

     

       4
       4
       -
       , bzip2

     

       5
       5
       -
       , cargo

     

       6
       6
       -
       , common-updater-scripts

     

       7
       7
       -
       , copyDesktopItems

     

       8
       8
       -
       , coreutils

     

       9
       9
       -
       , curl

     

       10
       10
       -
       , dbus

     

       11
       11
       -
       , dbus-glib

     

       12
       12
       -
       , fetchurl

     

       13
       13
       -
       , file

     

       14
       14
       -
       , fontconfig

     

       15
       15
       -
       , freetype

     

       16
       16
       -
       , glib

     

       17
       17
       -
       , gnugrep

     

       18
       18
       -
       , gnused

     

       19
       19
       -
       , icu

     

       20
       20
       -
       , jemalloc

     

       21
       21
       -
       , lib

     

       22
       22
       -
       , libGL

     

       23
       23
       -
       , libGLU

     

       24
       24
       -
       , libevent

     

       25
       25
       -
       , libjpeg

     

       26
       26
       -
       , libnotify

     

       27
       27
       -
       , libpng

     

       28
       28
       -
       , libstartup_notification

     

       29
       29
       -
       , libvpx

     

       30
       30
       -
       , libwebp

     

       31
       31
       -
       , llvmPackages

     

       32
       32
       -
       , m4

     

       33
       33
       -
       , makeDesktopItem

     

       34
       34
       -
       , nasm

     

       35
       35
       -
       , nodejs

     

       36
       36
       -
       , nspr

     

       37
       37
       -
       , nss

     

       38
       38
       -
       , pango

     

       39
       39
       -
       , perl

     

       40
       40
       -
       , pkg-config

     

       41
       41
       -
       , python2

     

       42
       42
       -
       , python3

     

       43
       43
       -
       , runtimeShell

     

       44
       44
       -
       , rust-cbindgen

     

       45
       45
       -
       , rustc

     

       46
       46
       -
       , sqlite

     

       47
       47
       -
       , stdenv

     

       48
       48
       -
       , systemd

     

       49
       49
       -
       , unzip

     

       50
       50
       -
       , which

     

       51
       51
       -
       , writeScript

     

       52
       52
       -
       , xidel

     

       53
       53
       -
       , xorg

     

       54
       54
       -
       , yasm

     

       55
       55
       -
       , zip

     

       56
       56
       -
       , zlib

     

       57
       57
       -
       

     

       58
       58
       -
       , debugBuild ? false

     

       59
       59
       -
       

     

       60
       60
       -
       , alsaSupport ? stdenv.isLinux, alsaLib

     

       61
       61
       -
       , pulseaudioSupport ? stdenv.isLinux, libpulseaudio

     

       62
       62
       -
       , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook

     

       63
       63
       -
       , waylandSupport ? true

     

       64
       64
       -
       , libxkbcommon, calendarSupport ? true

     

       65
       65
       -
       

     

       66
       66
       -
       # Use official trademarked branding.  Permission obtained at:

     

       67
       67
       -
       # https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971

     

       68
       68
       -
       , enableOfficialBranding ? true

     

       69
       69
       -
       }:

     

       70
       70
       -
       

     

       71
       71
       -
       assert waylandSupport -> gtk3Support == true;

     

       72
       72
       -
       

     

       73
       73
       -
       stdenv.mkDerivation rec {

     

       74
       74
       -
         pname = "thunderbird";

     

       75
       75
       -
         version = "68.12.0";

     

       76
       76
       -
       

     

       77
       77
       -
         src = fetchurl {

     

       78
       78
       -
           url =

     

       79
       79
       -
             "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

     

       80
       80
       -
           sha512 =

     

       81
       81
       -
             "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7";

     

       82
       82
       -
         };

     

       83
       83
       -
       

     

       84
       84
       -
         nativeBuildInputs = [

     

       85
       85
       -
           autoconf213

     

       86
       86
       -
           cargo

     

       87
       87
       -
           copyDesktopItems

     

       88
       88
       -
           gnused

     

       89
       89
       -
           llvmPackages.llvm

     

       90
       90
       -
           m4

     

       91
       91
       -
           nasm

     

       92
       92
       -
           nodejs

     

       93
       93
       -
           perl

     

       94
       94
       -
           pkg-config

     

       95
       95
       -
           python2

     

       96
       96
       -
           python3

     

       97
       97
       -
           rust-cbindgen

     

       98
       98
       -
           rustc

     

       99
       99
       -
           which

     

       100
       100
       -
           yasm

     

       101
       101
       -
           unzip

     

       102
       102
       -
         ] ++ lib.optional gtk3Support wrapGAppsHook;

     

       103
       103
       -
       

     

       104
       104
       -
         buildInputs = [

     

       105
       105
       -
           bzip2

     

       106
       106
       -
           dbus

     

       107
       107
       -
           dbus-glib

     

       108
       108
       -
           file

     

       109
       109
       -
           fontconfig

     

       110
       110
       -
           freetype

     

       111
       111
       -
           glib

     

       112
       112
       -
           gtk2

     

       113
       113
       -
           icu

     

       114
       114
       -
           jemalloc

     

       115
       115
       -
           libGL

     

       116
       116
       -
           libGLU

     

       117
       117
       -
           libevent

     

       118
       118
       -
           libjpeg

     

       119
       119
       -
           libnotify

     

       120
       120
       -
           libpng

     

       121
       121
       -
           libstartup_notification

     

       122
       122
       -
           libvpx

     

       123
       123
       -
           libwebp

     

       124
       124
       -
           nspr

     

       125
       125
       -
           nss

     

       126
       126
       -
           pango

     

       127
       127
       -
           perl

     

       128
       128
       -
           sqlite

     

       129
       129
       -
           xorg.libX11

     

       130
       130
       -
           xorg.libXScrnSaver

     

       131
       131
       -
           xorg.libXcursor

     

       132
       132
       -
           xorg.libXext

     

       133
       133
       -
           xorg.libXft

     

       134
       134
       -
           xorg.libXi

     

       135
       135
       -
           xorg.libXrender

     

       136
       136
       -
           xorg.libXt

     

       137
       137
       -
           xorg.pixman

     

       138
       138
       -
           xorg.xorgproto

     

       139
       139
       -
           zip

     

       140
       140
       -
           zlib

     

       141
       141
       -
         ] ++ lib.optional alsaSupport alsaLib

     

       142
       142
       -
           ++ lib.optional gtk3Support gtk3

     

       143
       143
       -
           ++ lib.optional pulseaudioSupport libpulseaudio

     

       144
       144
       -
           ++ lib.optional waylandSupport libxkbcommon;

     

       145
       145
       -
       

     

       146
       146
       -
         NIX_CFLAGS_COMPILE =[

     

       147
       147
       -
           "-I${glib.dev}/include/gio-unix-2.0"

     

       148
       148
       -
           "-I${nss.dev}/include/nss"

     

       149
       149
       -
         ];

     

       150
       150
       -
       

     

       151
       151
       -
         patches = [

     

       152
       152
       -
           ./no-buildconfig-68.patch

     

       153
       153
       -
         ];

     

       154
       154
       -
       

     

       155
       155
       -
         postPatch = ''

     

       156
       156
       -
           rm -rf obj-x86_64-pc-linux-gnu

     

       157
       157
       -
         '';

     

       158
       158
       -
       

     

       159
       159
       -
         hardeningDisable = [ "format" ];

     

       160
       160
       -
       

     

       161
       161
       -
         preConfigure = ''

     

       162
       162
       -
           # remove distributed configuration files

     

       163
       163
       -
           rm -f configure

     

       164
       164
       -
           rm -f js/src/configure

     

       165
       165
       -
           rm -f .mozconfig*

     

       166
       166
       -
       

     

       167
       167
       -
           configureScript="$(realpath ./mach) configure"

     

       168
       168
       -
           # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286

     

       169
       169
       -
           unset AS

     

       170
       170
       -
       

     

       171
       171
       -
           export MOZCONFIG=$(pwd)/mozconfig

     

       172
       172
       -
       

     

       173
       173
       -
           # Set C flags for Rust's bindgen program. Unlike ordinary C

     

       174
       174
       -
           # compilation, bindgen does not invoke $CC directly. Instead it

     

       175
       175
       -
           # uses LLVM's libclang. To make sure all necessary flags are

     

       176
       176
       -
           # included we need to look in a few places.

     

       177
       177
       -
           # TODO: generalize this process for other use-cases.

     

       178
       178
       -
       

     

       179
       179
       -
           BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \

     

       180
       180
       -
             $(< ${stdenv.cc}/nix-support/cc-cflags) \

     

       181
       181
       -
             $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \

     

       182
       182
       -
             ${

     

       183
       183
       -
               lib.optionalString stdenv.cc.isClang

     

       184
       184
       -
               "-idirafter ${stdenv.cc.cc}/lib/clang/${

     

       185
       185
       -
                 lib.getVersion stdenv.cc.cc

     

       186
       186
       -
               }/include"

     

       187
       187
       -
             } \

     

       188
       188
       -
             ${

     

       189
       189
       -
               lib.optionalString stdenv.cc.isGNU

     

       190
       190
       -
               "-isystem ${stdenv.cc.cc}/include/c++/${

     

       191
       191
       -
                 lib.getVersion stdenv.cc.cc

     

       192
       192
       -
               } -isystem ${stdenv.cc.cc}/include/c++/${

     

       193
       193
       -
                 lib.getVersion stdenv.cc.cc

     

       194
       194
       -
               }/${stdenv.hostPlatform.config}"

     

       195
       195
       -
             } \

     

       196
       196
       -
             $NIX_CFLAGS_COMPILE"

     

       197
       197
       -
       

     

       198
       198
       -
           echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG

     

       199
       199
       -
         '';

     

       200
       200
       -
       

     

       201
       201
       -
         configureFlags = let

     

       202
       202
       -
           toolkitSlug = if gtk3Support then

     

       203
       203
       -
             "3${lib.optionalString waylandSupport "-wayland"}"

     

       204
       204
       -
           else

     

       205
       205
       -
             "2";

     

       206
       206
       -
           toolkitValue = "cairo-gtk${toolkitSlug}";

     

       207
       207
       -
         in [

     

       208
       208
       -
           "--enable-application=comm/mail"

     

       209
       209
       -
       

     

       210
       210
       -
           "--with-system-bz2"

     

       211
       211
       -
           "--with-system-icu"

     

       212
       212
       -
           "--with-system-jpeg"

     

       213
       213
       -
           "--with-system-libevent"

     

       214
       214
       -
           "--with-system-nspr"

     

       215
       215
       -
           "--with-system-nss"

     

       216
       216
       -
           "--with-system-png" # needs APNG support

     

       217
       217
       -
           "--with-system-icu"

     

       218
       218
       -
           "--with-system-zlib"

     

       219
       219
       -
           "--with-system-webp"

     

       220
       220
       -
           "--with-system-libvpx"

     

       221
       221
       -
       

     

       222
       222
       -
           "--enable-rust-simd"

     

       223
       223
       -
           "--enable-crashreporter"

     

       224
       224
       -
           "--enable-default-toolkit=${toolkitValue}"

     

       225
       225
       -
           "--enable-js-shell"

     

       226
       226
       -
           "--enable-necko-wifi"

     

       227
       227
       -
           "--enable-startup-notification"

     

       228
       228
       -
           "--enable-system-ffi"

     

       229
       229
       -
           "--enable-system-pixman"

     

       230
       230
       -
           "--enable-system-sqlite"

     

       231
       231
       -
       

     

       232
       232
       -
           "--disable-gconf"

     

       233
       233
       -
           "--disable-tests"

     

       234
       234
       -
           "--disable-updater"

     

       235
       235
       -
           "--enable-jemalloc"

     

       236
       236
       -
         ] ++ (if debugBuild then [

     

       237
       237
       -
           "--enable-debug"

     

       238
       238
       -
           "--enable-profiling"

     

       239
       239
       -
         ] else [

     

       240
       240
       -
           "--disable-debug"

     

       241
       241
       -
           "--enable-release"

     

       242
       242
       -
           "--disable-debug-symbols"

     

       243
       243
       -
           "--enable-optimize"

     

       244
       244
       -
           "--enable-strip"

     

       245
       245
       -
         ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [

     

       246
       246
       -
           # on i686-linux: --with-libclang-path is not available in this configuration

     

       247
       247
       -
           "--with-libclang-path=${llvmPackages.libclang.lib}/lib"

     

       248
       248
       -
           "--with-clang-path=${llvmPackages.clang}/bin/clang"

     

       249
       249
       -
         ] ++ lib.optional alsaSupport "--enable-alsa"

     

       250
       250
       -
         ++ lib.optional calendarSupport "--enable-calendar"

     

       251
       251
       -
         ++ lib.optional enableOfficialBranding "--enable-official-branding"

     

       252
       252
       -
         ++ lib.optional pulseaudioSupport "--enable-pulseaudio";

     

       253
       253
       -
       

     

       254
       254
       -
         enableParallelBuilding = true;

     

       255
       255
       -
       

     

       256
       256
       -
         postConfigure = ''

     

       257
       257
       -
           cd obj-*

     

       258
       258
       -
         '';

     

       259
       259
       -
       

     

       260
       260
       -
         makeFlags = lib.optionals enableOfficialBranding [

     

       261
       261
       -
           "MOZILLA_OFFICIAL=1"

     

       262
       262
       -
           "BUILD_OFFICIAL=1"

     

       263
       263
       -
         ];

     

       264
       264
       -
       

     

       265
       265
       -
         doCheck = false;

     

       266
       266
       -
       

     

       267
       267
       -
         desktopItems = [

     

       268
       268
       -
           (makeDesktopItem {

     

       269
       269
       -
             categories = lib.concatStringsSep ";" [ "Application" "Network" ];

     

       270
       270
       -
             desktopName = "Thunderbird";

     

       271
       271
       -
             genericName = "Mail Reader";

     

       272
       272
       -
             name = "thunderbird";

     

       273
       273
       -
             exec = "thunderbird %U";

     

       274
       274
       -
             icon = "$out/lib/thunderbird/chrome/icons/default/default256.png";

     

       275
       275
       -
             mimeType = lib.concatStringsSep ";" [

     

       276
       276
       -
               # Email

     

       277
       277
       -
               "x-scheme-handler/mailto"

     

       278
       278
       -
               "message/rfc822"

     

       279
       279
       -
               # Feeds

     

       280
       280
       -
               "x-scheme-handler/feed"

     

       281
       281
       -
               "application/rss+xml"

     

       282
       282
       -
               "application/x-extension-rss"

     

       283
       283
       -
               # Newsgroups

     

       284
       284
       -
               "x-scheme-handler/news"

     

       285
       285
       -
               "x-scheme-handler/snews"

     

       286
       286
       -
               "x-scheme-handler/nntp"

     

       287
       287
       -
             ];

     

       288
       288
       -
           })

     

       289
       289
       -
         ];

     

       290
       290
       -
         postInstall = ''

     

       291
       291
       -
           # TODO: Move to a dev output?

     

       292
       292
       -
           rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl

     

       293
       293
       -
         '';

     

       294
       294
       -
       

     

       295
       295
       -
         preFixup = ''

     

       296
       296
       -
           # Needed to find Mozilla runtime

     

       297
       297
       -
           gappsWrapperArgs+=(

     

       298
       298
       -
             --argv0 "$out/bin/thunderbird"

     

       299
       299
       -
             --set MOZ_APP_LAUNCHER thunderbird

     

       300
       300
       -
             # https://github.com/NixOS/nixpkgs/pull/61980

     

       301
       301
       -
             --set SNAP_NAME "thunderbird"

     

       302
       302
       -
             --set MOZ_LEGACY_PROFILES 1

     

       303
       303
       -
             --set MOZ_ALLOW_DOWNGRADE 1

     

       304
       304
       -
           )

     

       305
       305
       -
         '';

     

       306
       306
       -
       

     

       307
       307
       -
         # FIXME: The XUL portion of this can probably be removed as soon as we

     

       308
       308
       -
         # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?

     

       309
       309
       -
         postFixup = ''

     

       310
       310
       -
           local xul="$out/lib/thunderbird/libxul.so"

     

       311
       311
       -
           patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul

     

       312
       312
       -
         '';

     

       313
       313
       -
       

     

       314
       314
       -
         doInstallCheck = true;

     

       315
       315
       -
         installCheckPhase = ''

     

       316
       316
       -
           "$out/bin/thunderbird" --version

     

       317
       317
       -
         '';

     

       318
       318
       -
       

     

       319
       319
       -
         disallowedRequisites = [

     

       320
       320
       -
           stdenv.cc

     

       321
       321
       -
         ];

     

       322
       322
       -
       

     

       323
       323
       -
         passthru.updateScript = import ./../../browsers/firefox/update.nix {

     

       324
       324
       -
           attrPath = "thunderbird";

     

       325
       325
       -
           baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";

     

       326
       326
       -
           inherit writeScript lib common-updater-scripts xidel coreutils gnused

     

       327
       327
       -
             gnugrep curl runtimeShell;

     

       328
       328
       -
         };

     

       329
       329
       -
       

     

       330
       330
       -
         meta = with lib; {

     

       331
       331
       -
           description = "A full-featured e-mail client";

     

       332
       332
       -
           homepage = "https://www.thunderbird.net";

     

       333
       333
       -
           maintainers = with maintainers; [

     

       334
       334
       -
             eelco

     

       335
       335
       -
             lovesegfault

     

       336
       336
       -
             pierron

     

       337
       337
       -
             vcunat

     

       338
       338
       -
           ];

     

       339
       339
       -
           platforms = platforms.linux;

     

       340
       340
       -
           license = licenses.mpl20;

     

       341
       341
       -
           knownVulnerabilities = [ "Support ended around Semptember 2020." ];

     

       342
       342
       -
         };

     

       343
       343
       -
       }

-36

pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch

···

       1
       1
       -
       Remove about:buildconfig.  If used as-is, it would add unnecessary runtime dependencies.

     

       2
       2
       -
       diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp

     

       3
       3
       -
       --- a/docshell/base/nsAboutRedirector.cpp	2017-07-31 18:20:51.000000000 +0200

     

       4
       4
       -
       +++ b/docshell/base/nsAboutRedirector.cpp	2017-09-26 22:02:00.814151731 +0200

     

       5
       5
       -
       @@ -32,8 +32,6 @@

     

       6
       6
       -
            {"about", "chrome://global/content/aboutAbout.xhtml", 0},

     

       7
       7
       -
            {"addons", "chrome://mozapps/content/extensions/extensions.xul",

     

       8
       8
       -
             nsIAboutModule::ALLOW_SCRIPT},

     

       9
       9
       -
       -    {"buildconfig", "chrome://global/content/buildconfig.html",

     

       10
       10
       -
       -     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},

     

       11
       11
       -
            {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",

     

       12
       12
       -
             nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

     

       13
       13
       -
                 nsIAboutModule::ALLOW_SCRIPT},

     

       14
       14
       -
       diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn

     

       15
       15
       -
       --- a/toolkit/content/jar.mn	2017-07-31 18:20:52.000000000 +0200

     

       16
       16
       -
       +++ b/toolkit/content/jar.mn	2017-09-26 22:01:42.383350314 +0200

     

       17
       17
       -
       @@ -39,7 +39,6 @@

     

       18
       18
       -
           content/global/plugins.css

     

       19
       19
       -
           content/global/browser-child.js

     

       20
       20
       -
           content/global/browser-content.js

     

       21
       21
       -
       -*   content/global/buildconfig.html

     

       22
       22
       -
           content/global/buildconfig.css

     

       23
       23
       -
           content/global/contentAreaUtils.js

     

       24
       24
       -
           content/global/datepicker.xhtml

     

       25
       25
       -
       --- a/comm/mail/base/jar.mn

     

       26
       26
       -
       +++ b/comm/mail/base/jar.mn

     

       27
       27
       -
       @@ -117,9 +117,7 @@

     

       28
       28
       -
        % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js

     

       29
       29
       -
        % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul

     

       30
       30
       -
        

     

       31
       31
       -
       -*   content/messenger/buildconfig.html              (content/buildconfig.html)

     

       32
       32
       -
            content/messenger/buildconfig.css               (content/buildconfig.css)

     

       33
       33
       -
       -% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html

     

       34
       34
       -
        % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css

     

       35
       35
       -
        

     

       36
       36
       -
        # L10n resources and overrides.

+2 -2

pkgs/applications/science/biology/bowtie2/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "bowtie2";

     

       5
       5
       -
         version = "2.4.2";

     

       5
       5
       +
         version = "2.4.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "BenLangmead";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "11apzq7l1lk3yxw97g9dfr0gwnvfh58x6apifcblgd66gbip3y1y";

     

       11
       11
       +
           sha256 = "sha256-uEKTB8935YY6lpXv2tJBQ1hrRk63vALLQb6SUXsVyhQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

+10 -1

pkgs/applications/science/electronics/pulseview/default.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok

     

       1
       1
       +
       { mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok

     

       2
       2
        
       , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm

     

       3
       3
        
       , pcre, librevisa, python3, qtbase, qtsvg

     

       4
       4
        
       }:

     
···

       18
       18
        
           glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm

     

       19
       19
        
           pcre librevisa python3

     

       20
       20
        
           qtbase qtsvg

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           # Allow building with glib 2.68

     

       25
       25
       +
           # PR at https://github.com/sigrokproject/pulseview/pull/39

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch";

     

       28
       28
       +
             sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh";

     

       29
       29
       +
           })

     

       21
       30
        
         ];

     

       22
       31
        
       

     

       23
       32
        
         meta = with lib; {

+40 -12

pkgs/applications/science/math/eukleides/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, bison, flex, texinfo, readline, texLive }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         name    = "eukleides";

     

       3
       3
       +
       lib.fix (eukleides: stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "eukleides";

     

       5
       5
        
         version = "1.5.4";

     

       6
       6
       -
       in

     

       7
       7
       -
       stdenv.mkDerivation {

     

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

     

       9
       6
        
       

     

       10
       7
        
         src = fetchurl {

     

       11
       11
       -
           url = "http://www.eukleides.org/files/${name}-${version}.tar.bz2";

     

       8
       8
       +
           url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2";

     

       12
       9
        
           sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";

     

       13
       10
        
         };

     

       14
       11
        
       

     

       15
       15
       -
         buildInputs = [bison flex texinfo readline texLive];

     

       12
       12
       +
         nativeBuildInputs = [ bison flex texinfo makeWrapper ];

     

       16
       13
        
       

     

       17
       17
       -
         preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile";

     

       18
       18
       -
         installPhase = "mkdir -p $out/bin ; make PREFIX=$out install";

     

       14
       14
       +
         buildInputs = [ readline texLive ];

     

       15
       15
       +
       

     

       16
       16
       +
         preConfigure = ''

     

       17
       17
       +
           substituteInPlace Makefile \

     

       18
       18
       +
             --replace mktexlsr true

     

       19
       19
       +
       

     

       20
       20
       +
           substituteInPlace doc/Makefile \

     

       21
       21
       +
             --replace ginstall-info install-info

     

       22
       22
       +
       

     

       23
       23
       +
           substituteInPlace Config \

     

       24
       24
       +
             --replace '/usr/local' "$out" \

     

       25
       25
       +
             --replace '$(SHARE_DIR)/texmf' "$tex"

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         preInstall = ''

     

       29
       29
       +
           mkdir -p $out/bin

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         postInstall = ''

     

       33
       33
       +
           wrapProgram $out/bin/euktoeps \

     

       34
       34
       +
             --set-default TEXINPUTS : \

     

       35
       35
       +
             --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \

     

       36
       36
       +
             --prefix PATH : "${texLive}/bin"

     

       37
       37
       +
           wrapProgram $out/bin/euktopdf \

     

       38
       38
       +
             --set-default TEXINPUTS : \

     

       39
       39
       +
             --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \

     

       40
       40
       +
             --prefix PATH : "${texLive}/bin"

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         outputs = [ "out" "doc" "tex" ];

     

       44
       44
       +
       

     

       45
       45
       +
         passthru.tlType = "run";

     

       46
       46
       +
         passthru.pkgs = [ eukleides.tex ];

     

       19
       47
        
       

     

       20
       48
        
         meta = {

     

       21
       49
        
           description = "Geometry Drawing Language";

     

       22
       50
        
           homepage = "http://www.eukleides.org/";

     

       23
       23
       -
           license = lib.licenses.gpl2;

     

       51
       51
       +
           license = lib.licenses.gpl3Plus;

     

       24
       52
        
       

     

       25
       53
        
           longDescription = ''

     

       26
       54
        
             Eukleides is a computer language devoted to elementary plane

     
···

       34
       62
        
           platforms = lib.platforms.linux;

     

       35
       63
        
           maintainers = [ lib.maintainers.peti ];

     

       36
       64
        
         };

     

       37
       37
       -
       }

     

       65
       65
       +
       })

+3 -3

pkgs/applications/version-management/git-and-tools/lefthook/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "lefthook";

     

       5
       5
       -
         version = "0.7.4";

     

       5
       5
       +
         version = "0.7.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

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

     

       9
       9
        
           owner = "evilmartians";

     

       10
       10
        
           repo = "lefthook";

     

       11
       11
       -
           sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE=";

     

       11
       11
       +
           sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";

     

       14
       14
       +
         vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+3 -3

pkgs/applications/video/hdhomerun-config-gui/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, libhdhomerun, pkg-config, gtk2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "hdhomerun-config-gui";

     

       5
       5
       -
         version = "20200907";

     

       5
       5
       +
         version = "20210224";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz";

     

       9
       9
       -
           sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz";

     

       9
       9
       +
           sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkg-config ];

pkgs/applications/window-managers/wio/default.nix

···

       25
       25
        
           sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       +
         patches = [

     

       29
       29
       +
           # To fix the build with wlroots 0.13:

     

       30
       30
       +
           ./wlroots-0.13.patch

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       28
       33
        
         nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];

     

       29
       34
        
         buildInputs = [

     

       30
       35
        
           cairo

+254

pkgs/applications/window-managers/wio/wlroots-0.13.patch

···

       1
       1
       +
       commit 8a3f903b20d646ebb2472c4f094ca1bf225a96c7

     

       2
       2
       +
       Author: Michael Weiss <dev.primeos@gmail.com>

     

       3
       3
       +
       Date:   Fri May 14 19:19:05 2021 +0200

     

       4
       4
       +
       

     

       5
       5
       +
           Fix the build with wlroots 0.13

     

       6
       6
       +
       

     

       7
       7
       +
       diff --git a/main.c b/main.c

     

       8
       8
       +
       index 5d7dcda..870fdb0 100644

     

       9
       9
       +
       --- a/main.c

     

       10
       10
       +
       +++ b/main.c

     

       11
       11
       +
       @@ -1,6 +1,7 @@

     

       12
       12
       +
        #define _POSIX_C_SOURCE 200809L

     

       13
       13
       +
        #include <assert.h>

     

       14
       14
       +
        #include <cairo/cairo.h>

     

       15
       15
       +
       +#include <libdrm/drm_fourcc.h>

     

       16
       16
       +
        #include <getopt.h>

     

       17
       17
       +
        #include <stdlib.h>

     

       18
       18
       +
        #include <string.h>

     

       19
       19
       +
       @@ -49,7 +50,7 @@ static void gen_menu_textures(struct wio_server *server) {

     

       20
       20
       +
        		cairo_surface_flush(surf);

     

       21
       21
       +
        		unsigned char *data = cairo_image_surface_get_data(surf);

     

       22
       22
       +
        		server->menu.inactive_textures[i] = wlr_texture_from_pixels(renderer,

     

       23
       23
       +
       -				WL_SHM_FORMAT_ARGB8888,

     

       24
       24
       +
       +				DRM_FORMAT_ARGB8888,

     

       25
       25
       +
        				cairo_image_surface_get_stride(surf),

     

       26
       26
       +
        				extents.width + 2, extents.height + 2, data);

     

       27
       27
       +
        	}

     

       28
       28
       +
       @@ -66,7 +67,7 @@ static void gen_menu_textures(struct wio_server *server) {

     

       29
       29
       +
        		cairo_surface_flush(surf);

     

       30
       30
       +
        		unsigned char *data = cairo_image_surface_get_data(surf);

     

       31
       31
       +
        		server->menu.active_textures[i] = wlr_texture_from_pixels(renderer,

     

       32
       32
       +
       -				WL_SHM_FORMAT_ARGB8888,

     

       33
       33
       +
       +				DRM_FORMAT_ARGB8888,

     

       34
       34
       +
        				cairo_image_surface_get_stride(surf),

     

       35
       35
       +
        				extents.width + 2, extents.height + 2, data);

     

       36
       36
       +
        	}

     

       37
       37
       +
       @@ -152,7 +153,7 @@ int main(int argc, char **argv) {

     

       38
       38
       +
        	}

     

       39
       39
       +
        

     

       40
       40
       +
        	server.wl_display = wl_display_create();

     

       41
       41
       +
       -	server.backend = wlr_backend_autocreate(server.wl_display, NULL);

     

       42
       42
       +
       +	server.backend = wlr_backend_autocreate(server.wl_display);

     

       43
       43
       +
        	server.renderer = wlr_backend_get_renderer(server.backend);

     

       44
       44
       +
        	wlr_renderer_init_wl_display(server.renderer, server.wl_display);

     

       45
       45
       +
        

     

       46
       46
       +
       diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml

     

       47
       47
       +
       index 90b8bc8..d62fd51 100644

     

       48
       48
       +
       --- a/protocols/wlr-layer-shell-unstable-v1.xml

     

       49
       49
       +
       +++ b/protocols/wlr-layer-shell-unstable-v1.xml

     

       50
       50
       +
       @@ -25,7 +25,7 @@

     

       51
       51
       +
            THIS SOFTWARE.

     

       52
       52
       +
          </copyright>

     

       53
       53
       +
        

     

       54
       54
       +
       -  <interface name="zwlr_layer_shell_v1" version="1">

     

       55
       55
       +
       +  <interface name="zwlr_layer_shell_v1" version="4">

     

       56
       56
       +
            <description summary="create surfaces that are layers of the desktop">

     

       57
       57
       +
              Clients can use this interface to assign the surface_layer role to

     

       58
       58
       +
              wl_surfaces. Such surfaces are assigned to a "layer" of the output and

     

       59
       59
       +
       @@ -47,6 +47,12 @@

     

       60
       60
       +
                or manipulate a buffer prior to the first layer_surface.configure call

     

       61
       61
       +
                must also be treated as errors.

     

       62
       62
       +
        

     

       63
       63
       +
       +        After creating a layer_surface object and setting it up, the client

     

       64
       64
       +
       +        must perform an initial commit without any buffer attached.

     

       65
       65
       +
       +        The compositor will reply with a layer_surface.configure event.

     

       66
       66
       +
       +        The client must acknowledge it and is then allowed to attach a buffer

     

       67
       67
       +
       +        to map the surface.

     

       68
       68
       +
       +

     

       69
       69
       +
                You may pass NULL for output to allow the compositor to decide which

     

       70
       70
       +
                output to use. Generally this will be the one that the user most

     

       71
       71
       +
                recently interacted with.

     

       72
       72
       +
       @@ -82,17 +88,35 @@

     

       73
       73
       +
              <entry name="top" value="2"/>

     

       74
       74
       +
              <entry name="overlay" value="3"/>

     

       75
       75
       +
            </enum>

     

       76
       76
       +
       +

     

       77
       77
       +
       +    <!-- Version 3 additions -->

     

       78
       78
       +
       +

     

       79
       79
       +
       +    <request name="destroy" type="destructor" since="3">

     

       80
       80
       +
       +      <description summary="destroy the layer_shell object">

     

       81
       81
       +
       +        This request indicates that the client will not use the layer_shell

     

       82
       82
       +
       +        object any more. Objects that have been created through this instance

     

       83
       83
       +
       +        are not affected.

     

       84
       84
       +
       +      </description>

     

       85
       85
       +
       +    </request>

     

       86
       86
       +
          </interface>

     

       87
       87
       +
        

     

       88
       88
       +
       -  <interface name="zwlr_layer_surface_v1" version="1">

     

       89
       89
       +
       +  <interface name="zwlr_layer_surface_v1" version="4">

     

       90
       90
       +
            <description summary="layer metadata interface">

     

       91
       91
       +
              An interface that may be implemented by a wl_surface, for surfaces that

     

       92
       92
       +
              are designed to be rendered as a layer of a stacked desktop-like

     

       93
       93
       +
              environment.

     

       94
       94
       +
        

     

       95
       95
       +
       -      Layer surface state (size, anchor, exclusive zone, margin, interactivity)

     

       96
       96
       +
       -      is double-buffered, and will be applied at the time wl_surface.commit of

     

       97
       97
       +
       -      the corresponding wl_surface is called.

     

       98
       98
       +
       +      Layer surface state (layer, size, anchor, exclusive zone,

     

       99
       99
       +
       +      margin, interactivity) is double-buffered, and will be applied at the

     

       100
       100
       +
       +      time wl_surface.commit of the corresponding wl_surface is called.

     

       101
       101
       +
       +

     

       102
       102
       +
       +      Attaching a null buffer to a layer surface unmaps it.

     

       103
       103
       +
       +

     

       104
       104
       +
       +      Unmapping a layer_surface means that the surface cannot be shown by the

     

       105
       105
       +
       +      compositor until it is explicitly mapped again. The layer_surface

     

       106
       106
       +
       +      returns to the state it had right after layer_shell.get_layer_surface.

     

       107
       107
       +
       +      The client can re-map the surface by performing a commit without any

     

       108
       108
       +
       +      buffer attached, waiting for a configure event and handling it as usual.

     

       109
       109
       +
            </description>

     

       110
       110
       +
        

     

       111
       111
       +
            <request name="set_size">

     

       112
       112
       +
       @@ -127,14 +151,19 @@

     

       113
       113
       +
        

     

       114
       114
       +
            <request name="set_exclusive_zone">

     

       115
       115
       +
              <description summary="configures the exclusive geometry of this surface">

     

       116
       116
       +
       -        Requests that the compositor avoids occluding an area of the surface

     

       117
       117
       +
       -        with other surfaces. The compositor's use of this information is

     

       118
       118
       +
       +        Requests that the compositor avoids occluding an area with other

     

       119
       119
       +
       +        surfaces. The compositor's use of this information is

     

       120
       120
       +
                implementation-dependent - do not assume that this region will not

     

       121
       121
       +
                actually be occluded.

     

       122
       122
       +
        

     

       123
       123
       +
       -        A positive value is only meaningful if the surface is anchored to an

     

       124
       124
       +
       -        edge, rather than a corner. The zone is the number of surface-local

     

       125
       125
       +
       -        coordinates from the edge that is considered exclusive.

     

       126
       126
       +
       +        A positive value is only meaningful if the surface is anchored to one

     

       127
       127
       +
       +        edge or an edge and both perpendicular edges. If the surface is not

     

       128
       128
       +
       +        anchored, anchored to only two perpendicular edges (a corner), anchored

     

       129
       129
       +
       +        to only two parallel edges or anchored to all edges, a positive value

     

       130
       130
       +
       +        will be treated the same as zero.

     

       131
       131
       +
       +

     

       132
       132
       +
       +        A positive zone is the distance from the edge in surface-local

     

       133
       133
       +
       +        coordinates to consider exclusive.

     

       134
       134
       +
        

     

       135
       135
       +
                Surfaces that do not wish to have an exclusive zone may instead specify

     

       136
       136
       +
                how they should interact with surfaces that do. If set to zero, the

     

       137
       137
       +
       @@ -174,21 +203,85 @@

     

       138
       138
       +
              <arg name="left" type="int"/>

     

       139
       139
       +
            </request>

     

       140
       140
       +
        

     

       141
       141
       +
       +    <enum name="keyboard_interactivity">

     

       142
       142
       +
       +      <description summary="types of keyboard interaction possible for a layer shell surface">

     

       143
       143
       +
       +        Types of keyboard interaction possible for layer shell surfaces. The

     

       144
       144
       +
       +        rationale for this is twofold: (1) some applications are not interested

     

       145
       145
       +
       +        in keyboard events and not allowing them to be focused can improve the

     

       146
       146
       +
       +        desktop experience; (2) some applications will want to take exclusive

     

       147
       147
       +
       +        keyboard focus.

     

       148
       148
       +
       +      </description>

     

       149
       149
       +
       +

     

       150
       150
       +
       +      <entry name="none" value="0">

     

       151
       151
       +
       +        <description summary="no keyboard focus is possible">

     

       152
       152
       +
       +          This value indicates that this surface is not interested in keyboard

     

       153
       153
       +
       +          events and the compositor should never assign it the keyboard focus.

     

       154
       154
       +
       +

     

       155
       155
       +
       +          This is the default value, set for newly created layer shell surfaces.

     

       156
       156
       +
       +

     

       157
       157
       +
       +          This is useful for e.g. desktop widgets that display information or

     

       158
       158
       +
       +          only have interaction with non-keyboard input devices.

     

       159
       159
       +
       +        </description>

     

       160
       160
       +
       +      </entry>

     

       161
       161
       +
       +      <entry name="exclusive" value="1">

     

       162
       162
       +
       +        <description summary="request exclusive keyboard focus">

     

       163
       163
       +
       +          Request exclusive keyboard focus if this surface is above the shell surface layer.

     

       164
       164
       +
       +

     

       165
       165
       +
       +          For the top and overlay layers, the seat will always give

     

       166
       166
       +
       +          exclusive keyboard focus to the top-most layer which has keyboard

     

       167
       167
       +
       +          interactivity set to exclusive. If this layer contains multiple

     

       168
       168
       +
       +          surfaces with keyboard interactivity set to exclusive, the compositor

     

       169
       169
       +
       +          determines the one receiving keyboard events in an implementation-

     

       170
       170
       +
       +          defined manner. In this case, no guarantee is made when this surface

     

       171
       171
       +
       +          will receive keyboard focus (if ever).

     

       172
       172
       +
       +

     

       173
       173
       +
       +          For the bottom and background layers, the compositor is allowed to use

     

       174
       174
       +
       +          normal focus semantics.

     

       175
       175
       +
       +

     

       176
       176
       +
       +          This setting is mainly intended for applications that need to ensure

     

       177
       177
       +
       +          they receive all keyboard events, such as a lock screen or a password

     

       178
       178
       +
       +          prompt.

     

       179
       179
       +
       +        </description>

     

       180
       180
       +
       +      </entry>

     

       181
       181
       +
       +      <entry name="on_demand" value="2" since="4">

     

       182
       182
       +
       +        <description summary="request regular keyboard focus semantics">

     

       183
       183
       +
       +          This requests the compositor to allow this surface to be focused and

     

       184
       184
       +
       +          unfocused by the user in an implementation-defined manner. The user

     

       185
       185
       +
       +          should be able to unfocus this surface even regardless of the layer

     

       186
       186
       +
       +          it is on.

     

       187
       187
       +
       +

     

       188
       188
       +
       +          Typically, the compositor will want to use its normal mechanism to

     

       189
       189
       +
       +          manage keyboard focus between layer shell surfaces with this setting

     

       190
       190
       +
       +          and regular toplevels on the desktop layer (e.g. click to focus).

     

       191
       191
       +
       +          Nevertheless, it is possible for a compositor to require a special

     

       192
       192
       +
       +          interaction to focus or unfocus layer shell surfaces (e.g. requiring

     

       193
       193
       +
       +          a click even if focus follows the mouse normally, or providing a

     

       194
       194
       +
       +          keybinding to switch focus between layers).

     

       195
       195
       +
       +

     

       196
       196
       +
       +          This setting is mainly intended for desktop shell components (e.g.

     

       197
       197
       +
       +          panels) that allow keyboard interaction. Using this option can allow

     

       198
       198
       +
       +          implementing a desktop shell that can be fully usable without the

     

       199
       199
       +
       +          mouse.

     

       200
       200
       +
       +        </description>

     

       201
       201
       +
       +      </entry>

     

       202
       202
       +
       +    </enum>

     

       203
       203
       +
       +

     

       204
       204
       +
            <request name="set_keyboard_interactivity">

     

       205
       205
       +
              <description summary="requests keyboard events">

     

       206
       206
       +
       -        Set to 1 to request that the seat send keyboard events to this layer

     

       207
       207
       +
       -        surface. For layers below the shell surface layer, the seat will use

     

       208
       208
       +
       -        normal focus semantics. For layers above the shell surface layers, the

     

       209
       209
       +
       -        seat will always give exclusive keyboard focus to the top-most layer

     

       210
       210
       +
       -        which has keyboard interactivity set to true.

     

       211
       211
       +
       +        Set how keyboard events are delivered to this surface. By default,

     

       212
       212
       +
       +        layer shell surfaces do not receive keyboard events; this request can

     

       213
       213
       +
       +        be used to change this.

     

       214
       214
       +
       +

     

       215
       215
       +
       +        This setting is inherited by child surfaces set by the get_popup

     

       216
       216
       +
       +        request.

     

       217
       217
       +
        

     

       218
       218
       +
                Layer surfaces receive pointer, touch, and tablet events normally. If

     

       219
       219
       +
                you do not want to receive them, set the input region on your surface

     

       220
       220
       +
                to an empty region.

     

       221
       221
       +
        

     

       222
       222
       +
       -        Events is double-buffered, see wl_surface.commit.

     

       223
       223
       +
       +        Keyboard interactivity is double-buffered, see wl_surface.commit.

     

       224
       224
       +
              </description>

     

       225
       225
       +
       -      <arg name="keyboard_interactivity" type="uint"/>

     

       226
       226
       +
       +      <arg name="keyboard_interactivity" type="uint" enum="keyboard_interactivity"/>

     

       227
       227
       +
            </request>

     

       228
       228
       +
        

     

       229
       229
       +
            <request name="get_popup">

     

       230
       230
       +
       @@ -273,6 +366,7 @@

     

       231
       231
       +
              <entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>

     

       232
       232
       +
              <entry name="invalid_size" value="1" summary="size is invalid"/>

     

       233
       233
       +
              <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>

     

       234
       234
       +
       +      <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>

     

       235
       235
       +
            </enum>

     

       236
       236
       +
        

     

       237
       237
       +
            <enum name="anchor" bitfield="true">

     

       238
       238
       +
       @@ -281,5 +375,16 @@

     

       239
       239
       +
              <entry name="left" value="4" summary="the left edge of the anchor rectangle"/>

     

       240
       240
       +
              <entry name="right" value="8" summary="the right edge of the anchor rectangle"/>

     

       241
       241
       +
            </enum>

     

       242
       242
       +
       +

     

       243
       243
       +
       +    <!-- Version 2 additions -->

     

       244
       244
       +
       +

     

       245
       245
       +
       +    <request name="set_layer" since="2">

     

       246
       246
       +
       +      <description summary="change the layer of the surface">

     

       247
       247
       +
       +        Change the layer that the surface is rendered on.

     

       248
       248
       +
       +

     

       249
       249
       +
       +        Layer is double-buffered, see wl_surface.commit.

     

       250
       250
       +
       +      </description>

     

       251
       251
       +
       +      <arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>

     

       252
       252
       +
       +    </request>

     

       253
       253
       +
          </interface>

     

       254
       254
       +
        </protocol>

+4 -3

pkgs/data/themes/marwaita/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       4
        
       , gdk-pixbuf

     

       4
       5
        
       , gtk-engine-murrine

     
···

       8
       9
        
       

     

       9
       10
        
       stdenv.mkDerivation rec {

     

       10
       11
        
         pname = "marwaita";

     

       11
       11
       -
         version = "9.1";

     

       12
       12
       +
         version = "9.2.1";

     

       12
       13
        
       

     

       13
       14
        
         src = fetchFromGitHub {

     

       14
       15
        
           owner = "darkomarko42";

     

       15
       16
        
           repo = pname;

     

       16
       17
        
           rev = version;

     

       17
       17
       -
           sha256 = "0974pfcdbhajxvd6fnp2kix963s28n2il9w879h5zm1f6ayglsfz";

     

       18
       18
       +
           sha256 = "08392ybpxnbq3wswa7bvz8nnxryjg9aczvw3arnhfvmbigwq5q0s";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         buildInputs = [

+2 -2

pkgs/development/libraries/bctoolbox/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "bctoolbox";

     

       10
       10
       -
         version = "4.5.7";

     

       10
       10
       +
         version = "4.5.15";

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ cmake bcunit ];

     

       13
       13
        
         buildInputs = [ mbedtls ];

     
···

       18
       18
        
           group = "BC";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-JQ2HgFVqgO+LLXmN95ZTHyT+htCFUC3VRreKLwPYo9Y=";

     

       21
       21
       +
           sha256 = "sha256-yN9dfeJBuUxXfG7zDoawn2nKGsrhetBcXpGDmcekU20=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         # Do not build static libraries

+2 -2

pkgs/development/libraries/hunspell/dictionaries.nix

···

       761
       761
        
         da_DK = da-dk;

     

       762
       762
        
         da-dk = mkDict rec {

     

       763
       763
        
           name = "hunspell-dict-da-dk-${version}";

     

       764
       764
       -
           version = "2.5.137";

     

       764
       764
       +
           version = "2.5.189";

     

       765
       765
        
       

     

       766
       766
        
           src = fetchurl {

     

       767
       767
        
             url = "https://stavekontrolden.dk/dictionaries/da_DK/da_DK-${version}.oxt";

     

       768
       768
       -
             sha256 = "16y0smkg1mq0133r1fbw5ak6s2xw39281knk5ivhanakayq789qx";

     

       768
       768
       +
             sha256 = "sha256:0i1cw0nfg24b0sg2yc3q7315ng5vc5245nvh0l1cndkn2c9z4978";

     

       769
       769
        
           };

     

       770
       770
        
       

     

       771
       771
        
           shortName = "da-dk";

+4 -4

pkgs/development/libraries/libmwaw/default.nix

···

       3
       3
        
         s = # Generated upstream information

     

       4
       4
        
         rec {

     

       5
       5
        
           baseName="libmwaw";

     

       6
       6
       -
           version="0.3.18";

     

       6
       6
       +
           version="0.3.19";

     

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

     

       8
       8
       -
           hash="sha256-/F0FFoD4AAvmT/68CwxYcWscm/BgA+w5k4exCdHtHg8=";

     

       9
       9
       -
           url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.18/libmwaw-0.3.18.tar.xz";

     

       10
       10
       -
           sha256="sha256-/F0FFoD4AAvmT/68CwxYcWscm/BgA+w5k4exCdHtHg8=";

     

       8
       8
       +
           hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";

     

       9
       9
       +
           url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz";

     

       10
       10
       +
           sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkg-config ];

+2 -2

pkgs/development/libraries/lime/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "lime";

     

       13
       13
       -
         version = "4.5.1";

     

       13
       13
       +
         version = "4.5.14";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitLab {

     

       16
       16
        
           domain = "gitlab.linphone.org";

     
···

       18
       18
        
           group = "BC";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "1fsldk7gxagxkbkzksz6dz8a8dmix1lxfy8nvvp0m355pzgqj6lb";

     

       21
       21
       +
           sha256 = "sha256-ixqJ37+ljAru3hZ512nosTak0G/m6/nnmv2p/s5sVLs=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ bctoolbox soci belle-sip sqlite ];

-144

pkgs/development/libraries/nss/3.44.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         nssPEM = fetchurl {

     

       5
       5
       -
           url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";

     

       6
       6
       -
           sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";

     

       7
       7
       -
         };

     

       8
       8
       -
         version = "3.44.4";

     

       9
       9
       -
         underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

     

       10
       10
       -
       

     

       11
       11
       -
       in stdenv.mkDerivation rec {

     

       12
       12
       -
         pname = "nss";

     

       13
       13
       -
         inherit version;

     

       14
       14
       -
       

     

       15
       15
       -
         src = fetchurl {

     

       16
       16
       -
           url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";

     

       17
       17
       -
           sha256 = "7ec1a52e20fd9a23e1907eeba8f4f2ecd619dac5d20fa023ec5b4faa1843e847";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       21
       21
       -
       

     

       22
       22
       -
         nativeBuildInputs = [ perl ]

     

       23
       23
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       24
       24
       -
       

     

       25
       25
       -
         buildInputs = [ zlib sqlite ];

     

       26
       26
       -
       

     

       27
       27
       -
         propagatedBuildInputs = [ nspr ];

     

       28
       28
       -
       

     

       29
       29
       -
         prePatch = ''

     

       30
       30
       -
           xz -d < ${nssPEM} | patch -p1

     

       31
       31
       -
         '';

     

       32
       32
       -
       

     

       33
       33
       -
         patches =

     

       34
       34
       -
           [

     

       35
       35
       -
             # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch

     

       36
       36
       -
             ./85_security_load-3.44.patch

     

       37
       37
       -
             ./ckpem.patch

     

       38
       38
       -
           ];

     

       39
       39
       -
       

     

       40
       40
       -
         patchFlags = [ "-p0" ];

     

       41
       41
       -
       

     

       42
       42
       -
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       43
       43
       -
           substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       46
       -
         outputs = [ "out" "dev" "tools" ];

     

       47
       47
       -
       

     

       48
       48
       -
         preConfigure = "cd nss";

     

       49
       49
       -
       

     

       50
       50
       -
         makeFlags = let

     

       51
       51
       -
           # NSS's build systems expects aarch32 to be called arm; if we pass in armv6l/armv7l, it

     

       52
       52
       -
           # fails with a linker error

     

       53
       53
       -
           cpu = if stdenv.hostPlatform.isAarch32 then "arm" else stdenv.hostPlatform.parsed.cpu.name;

     

       54
       54
       -
         in [

     

       55
       55
       -
           "NSPR_INCLUDE_DIR=${nspr.dev}/include"

     

       56
       56
       -
           "NSPR_LIB_DIR=${nspr.out}/lib"

     

       57
       57
       -
           "NSDISTMODE=copy"

     

       58
       58
       -
           "BUILD_OPT=1"

     

       59
       59
       -
           "SOURCE_PREFIX=\$(out)"

     

       60
       60
       -
           "NSS_ENABLE_ECC=1"

     

       61
       61
       -
           "USE_SYSTEM_ZLIB=1"

     

       62
       62
       -
           "NSS_USE_SYSTEM_SQLITE=1"

     

       63
       63
       -
           "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"

     

       64
       64
       -
         ] ++ lib.optionals (!stdenv.isDarwin) [

     

       65
       65
       -
           # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with

     

       66
       66
       -
           # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64

     

       67
       67
       -
           "OS_TEST=${cpu}"

     

       68
       68
       -
           "CPU_ARCH=${cpu}"

     

       69
       69
       -
         ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       70
       70
       -
           "CROSS_COMPILE=1"

     

       71
       71
       -
           "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling

     

       72
       72
       -
         ] ++ lib.optional stdenv.is64bit "USE_64=1"

     

       73
       73
       -
           ++ lib.optional stdenv.isDarwin "CCC=clang++";

     

       74
       74
       -
       

     

       75
       75
       -
         NIX_CFLAGS_COMPILE = "-Wno-error";

     

       76
       76
       -
       

     

       77
       77
       -
         # TODO(@oxij): investigate this: `make -n check` works but `make

     

       78
       78
       -
         # check` fails with "no rule", same for "installcheck".

     

       79
       79
       -
         doCheck = false;

     

       80
       80
       -
         doInstallCheck = false;

     

       81
       81
       -
       

     

       82
       82
       -
         postInstall = ''

     

       83
       83
       -
           rm -rf $out/private

     

       84
       84
       -
           mv $out/public $out/include

     

       85
       85
       -
           mv $out/*.OBJ/* $out/

     

       86
       86
       -
           rmdir $out/*.OBJ

     

       87
       87
       -
       

     

       88
       88
       -
           ln -s lib $out/lib64

     

       89
       89
       -
       

     

       90
       90
       -
           # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672

     

       91
       91
       -
           # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a

     

       92
       92
       -
           NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`

     

       93
       93
       -
           NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`

     

       94
       94
       -
           NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`

     

       95
       95
       -
           PREFIX="$out"

     

       96
       96
       -
       

     

       97
       97
       -
           mkdir -p $out/lib/pkgconfig

     

       98
       98
       -
           sed -e "s,%prefix%,$PREFIX," \

     

       99
       99
       -
               -e "s,%exec_prefix%,$PREFIX," \

     

       100
       100
       -
               -e "s,%libdir%,$PREFIX/lib64," \

     

       101
       101
       -
               -e "s,%includedir%,$dev/include/nss," \

     

       102
       102
       -
               -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \

     

       103
       103
       -
               -e "s,%NSPR_VERSION%,4.16,g" \

     

       104
       104
       -
               pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc

     

       105
       105
       -
           chmod 0644 $out/lib/pkgconfig/nss.pc

     

       106
       106
       -
       

     

       107
       107
       -
           sed -e "s,@prefix@,$PREFIX," \

     

       108
       108
       -
               -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \

     

       109
       109
       -
               -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \

     

       110
       110
       -
               -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \

     

       111
       111
       -
               pkg/pkg-config/nss-config.in > $out/bin/nss-config

     

       112
       112
       -
           chmod 0755 $out/bin/nss-config

     

       113
       113
       -
         '';

     

       114
       114
       -
       

     

       115
       115
       -
         postFixup = let

     

       116
       116
       -
           isCross = stdenv.hostPlatform != stdenv.buildPlatform;

     

       117
       117
       -
           nss = if isCross then buildPackages.nss.tools else "$out";

     

       118
       118
       -
         in ''

     

       119
       119
       -
           for libname in freebl3 nssdbm3 softokn3

     

       120
       120
       -
           do '' +

     

       121
       121
       -
           (if stdenv.isDarwin

     

       122
       122
       -
            then ''

     

       123
       123
       -
              libfile="$out/lib/lib$libname.dylib"

     

       124
       124
       -
              DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \

     

       125
       125
       -
            '' else ''

     

       126
       126
       -
              libfile="$out/lib/lib$libname.so"

     

       127
       127
       -
              LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \

     

       128
       128
       -
            '') + ''

     

       129
       129
       -
               ${nss}/bin/shlibsign -v -i "$libfile"

     

       130
       130
       -
           done

     

       131
       131
       -
       

     

       132
       132
       -
           moveToOutput bin "$tools"

     

       133
       133
       -
           moveToOutput bin/nss-config "$dev"

     

       134
       134
       -
           moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example

     

       135
       135
       -
           rm -f "$out"/lib/*.a

     

       136
       136
       -
         '';

     

       137
       137
       -
       

     

       138
       138
       -
         meta = with lib; {

     

       139
       139
       -
           homepage = "https://developer.mozilla.org/en-US/docs/NSS";

     

       140
       140
       -
           description = "A set of libraries for development of security-enabled client and server applications";

     

       141
       141
       -
           license = licenses.mpl20;

     

       142
       142
       -
           platforms = platforms.all;

     

       143
       143
       -
         };

     

       144
       144
       -
       }

-81

pkgs/development/libraries/nss/85_security_load-3.44.patch

···

       1
       1
       -
       diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c

     

       2
       2
       -
       --- nss/cmd/shlibsign/shlibsign.c	2017-01-04 15:24:24.000000000 +0100

     

       3
       3
       -
       +++ nss/cmd/shlibsign/shlibsign.c	2017-01-24 14:43:31.030420852 +0100

     

       4
       4
       -
       @@ -875,6 +875,8 @@

     

       5
       5
       -
                goto cleanup;

     

       6
       6
       -
            }

     

       7
       7
       -
            lib = PR_LoadLibrary(libname);

     

       8
       8
       -
       +    if (!lib)

     

       9
       9
       -
       +        lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");

     

       10
       10
       -
            assert(lib != NULL);

     

       11
       11
       -
            if (!lib) {

     

       12
       12
       -
                PR_fprintf(PR_STDERR, "loading softokn3 failed");

     

       13
       13
       -
       diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk

     

       14
       14
       -
       --- nss/coreconf/config.mk	2017-01-04 15:24:24.000000000 +0100

     

       15
       15
       -
       +++ nss/coreconf/config.mk	2017-01-24 14:43:47.989432372 +0100

     

       16
       16
       -
       @@ -202,3 +202,6 @@

     

       17
       17
       -
        

     

       18
       18
       -
        # Hide old, deprecated, TLS cipher suite names when building NSS

     

       19
       19
       -
        DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES

     

       20
       20
       -
       +

     

       21
       21
       -
       +# Nix specific stuff.

     

       22
       22
       -
       +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"

     

       23
       23
       -
       diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c

     

       24
       24
       -
       --- nss/lib/pk11wrap/pk11load.c	2017-01-04 15:24:24.000000000 +0100

     

       25
       25
       -
       +++ nss/lib/pk11wrap/pk11load.c	2017-01-24 14:45:06.883485652 +0100

     

       26
       26
       -
       @@ -440,6 +440,13 @@

     

       27
       27
       -
                 * unload the library if anything goes wrong from here on out...

     

       28
       28
       -
                 */

     

       29
       29
       -
                library = PR_LoadLibrary(mod->dllName);

     

       30
       30
       -
       +        if ((library == NULL) &&

     

       31
       31
       -
       +            !rindex(mod->dllName, PR_GetDirectorySeparator())) {

     

       32
       32
       -
       +            library = PORT_LoadLibraryFromOrigin(my_shlib_name,

     

       33
       33
       -
       +                (PRFuncPtr) &softoken_LoadDSO,

     

       34
       34
       -
       +                mod->dllName);

     

       35
       35
       -
       +        }

     

       36
       36
       -
       +

     

       37
       37
       -
                mod->library = (void *)library;

     

       38
       38
       -
        

     

       39
       39
       -
                if (library == NULL) {

     

       40
       40
       -
       diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c

     

       41
       41
       -
       --- nss/lib/util/secload.c	2017-01-04 15:24:24.000000000 +0100

     

       42
       42
       -
       +++ nss/lib/util/secload.c	2017-01-24 14:43:31.030420852 +0100

     

       43
       43
       -
       @@ -70,9 +70,14 @@

     

       44
       44
       -
        

     

       45
       45
       -
            /* Remove the trailing filename from referencePath and add the new one */

     

       46
       46
       -
            c = strrchr(referencePath, PR_GetDirectorySeparator());

     

       47
       47
       -
       +    if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]

     

       48
       48
       -
       +               * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */

     

       49
       49
       -
       +        referencePath = NIX_NSS_LIBDIR;

     

       50
       50
       -
       +        c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */

     

       51
       51
       -
       +    }

     

       52
       52
       -
            if (c) {

     

       53
       53
       -
                size_t referencePathSize = 1 + c - referencePath;

     

       54
       54
       -
       -        fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);

     

       55
       55
       -
       +        fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);

     

       56
       56
       -
                if (fullName) {

     

       57
       57
       -
                    memcpy(fullName, referencePath, referencePathSize);

     

       58
       58
       -
                    strcpy(fullName + referencePathSize, name);

     

       59
       59
       -
       @@ -82,6 +87,11 @@

     

       60
       60
       -
        #endif

     

       61
       61
       -
                    libSpec.type = PR_LibSpec_Pathname;

     

       62
       62
       -
                    libSpec.value.pathname = fullName;

     

       63
       63
       -
       +            if ((referencePathSize >= 4) &&

     

       64
       64
       -
       +                (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {

     

       65
       65
       -
       +                memcpy(fullName + referencePathSize -4, "lib", 3);

     

       66
       66
       -
       +            }

     

       67
       67
       -
       +            strcpy(fullName + referencePathSize, name);

     

       68
       68
       -
                    dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL

     

       69
       69
       -
        #ifdef PR_LD_ALT_SEARCH_PATH

     

       70
       70
       -
                                                               /* allow library's dependencies to be found in the same directory

     

       71
       71
       -
       @@ -89,6 +99,10 @@

     

       72
       72
       -
                                                               | PR_LD_ALT_SEARCH_PATH

     

       73
       73
       -
        #endif

     

       74
       74
       -
                                                  );

     

       75
       75
       -
       +            if (! dlh) {

     

       76
       76
       -
       +                strcpy(fullName + referencePathSize, name);

     

       77
       77
       -
       +                dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);

     

       78
       78
       -
       +            }

     

       79
       79
       -
                    PORT_Free(fullName);

     

       80
       80
       -
                }

     

       81
       81
       -
            }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "awkward";

     

       13
       13
       -
         version = "1.2.2";

     

       13
       13
       +
         version = "1.2.3";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b";

     

       17
       17
       +
           sha256 = "7d727542927a926f488fa62d04e2c5728c72660f17f822e627f349285f295063";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ cmake ];

+18 -10

pkgs/development/python-modules/flask-appbuilder/default.nix

···

       6
       6
        
       , colorama

     

       7
       7
        
       , click

     

       8
       8
        
       , email_validator

     

       9
       9
       +
       , fetchpatch

     

       9
       10
        
       , flask

     

       10
       11
        
       , flask-babel

     

       11
       12
        
       , flask_login

     
···

       20
       21
        
       , python-dateutil

     

       21
       22
        
       , prison

     

       22
       23
        
       , pyjwt

     

       24
       24
       +
       , pyyaml

     

       23
       25
        
       , sqlalchemy-utils

     

       24
       26
        
       }:

     

       25
       27
        
       

     

       26
       28
        
       buildPythonPackage rec {

     

       27
       29
        
         pname = "flask-appbuilder";

     

       28
       28
       -
         version = "3.1.1";

     

       30
       30
       +
         version = "3.2.3";

     

       29
       31
        
       

     

       30
       32
        
         src = fetchPypi {

     

       31
       33
        
           pname = "Flask-AppBuilder";

     

       32
       34
        
           inherit version;

     

       33
       33
       -
           sha256 = "076b020b0ba125339a2e710e74eab52648cde2b18599f7cb0fa1eada9bbb648c";

     

       35
       35
       +
           sha256 = "sha256-+ZYrn2LnVORyYsnZtsH3JX+4XbGgAZZ/Eh6O5gUP+y4=";

     

       34
       36
        
         };

     

       35
       37
        
       

     

       36
       36
       -
         checkInputs = [

     

       37
       37
       -
           nose

     

       38
       38
       +
         patches = [

     

       39
       39
       +
           (fetchpatch {

     

       40
       40
       +
             name = "flask_jwt_extended-and-pyjwt-patch";

     

       41
       41
       +
             url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch";

     

       42
       42
       +
             sha256 = "sha256-ZpY8+2Hoz3z01GVtw2OIbQcsmAwa7iwilFWzgcGhY1w=";

     

       43
       43
       +
             includes = [ "flask_appbuilder/security/manager.py" "setup.py" ];

     

       44
       44
       +
           })

     

       38
       45
        
         ];

     

       39
       46
        
       

     

       40
       47
        
         propagatedBuildInputs = [

     
···

       56
       63
        
           python-dateutil

     

       57
       64
        
           prison

     

       58
       65
        
           pyjwt

     

       66
       66
       +
           pyyaml

     

       59
       67
        
           sqlalchemy-utils

     

       60
       68
        
         ];

     

       61
       69
        
       

     

       62
       70
        
         postPatch = ''

     

       63
       71
        
           substituteInPlace setup.py \

     

       64
       64
       -
             --replace "apispec[yaml]>=3.3, <4" "apispec" \

     

       65
       65
       -
             --replace "Flask-Login>=0.3, <0.5" "Flask-Login" \

     

       66
       66
       -
             --replace "Flask-Babel>=1, <2" "Flask-Babel" \

     

       67
       67
       -
             --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \

     

       68
       68
       -
             --replace "prison>=0.1.3, <1.0.0" "prison"

     

       72
       72
       +
             --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3, <5" \

     

       73
       73
       +
             --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \

     

       74
       74
       +
             --replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \

     

       75
       75
       +
             --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy >=0.22.0, <0.25.0"

     

       69
       76
        
         '';

     

       70
       77
        
       

     

       71
       71
       -
       

     

       72
       78
        
         # majority of tests require network access or mongo

     

       73
       79
        
         doCheck = false;

     

       80
       80
       +
       

     

       81
       81
       +
         pythonImportsCheck = [ "flask_appbuilder" ];

     

       74
       82
        
       

     

       75
       83
        
         meta = with lib; {

     

       76
       84
        
           description = "Simple and rapid application development framework, built on top of Flask";

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "prison";

     

       10
       10
       -
         version = "0.1.2";

     

       10
       10
       +
         version = "0.1.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "betodealmeida";

     

       14
       14
        
           repo = "python-rison";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           sha256 = "14vb468iznf9416z993bbqihywp9ibyslw5vp67wfr200zyxjwak";

     

       16
       16
       +
           sha256 = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

pkgs/development/python-modules/python-engineio/3.nix

···

       13
       13
        
       , websocket_client

     

       14
       14
        
       , websockets

     

       15
       15
        
       , pytestCheckHook

     

       16
       16
       +
       , pythonAtLeast

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       buildPythonPackage rec {

     
···

       63
       64
        
           homepage = "https://github.com/miguelgrinberg/python-engineio/";

     

       64
       65
        
           license = with licenses; [ mit ];

     

       65
       66
        
           maintainers = with maintainers; [ graham33 ];

     

       67
       67
       +
           broken = stdenv.isDarwin && (pythonAtLeast "3.9");  # See https://github.com/miguelgrinberg/python-socketio/issues/567

     

       66
       68
        
         };

     

       67
       69
        
       }

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPyPy

     

       5
       5
       +
       , fetchpatch

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       buildPythonPackage rec {

     
···

       14
       15
        
           extension = "zip";

     

       15
       16
        
           sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";

     

       16
       17
        
         };

     

       18
       18
       +
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           # Patch test suite for python >= 3.9

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = "https://github.com/strichter/random2/pull/3/commits/1bac6355d9c65de847cc445d782c466778b94fbd.patch";

     

       23
       23
       +
             sha256 = "064137pg1ilv3f9r10123lqbqz45070jca8pjjyp6gpfd0yk74pi";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       17
       26
        
       

     

       18
       27
        
         meta = with lib; {

     

       19
       28
        
           homepage = "http://pypi.python.org/pypi/random2";

+11 -1

pkgs/development/tools/boomerang/default.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitHub, cmake, qtbase, capstone, bison, flex }:

     

       1
       1
       +
       { mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, qtbase, capstone, bison, flex }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "boomerang";

     

       5
       5
        
         version = "0.5.2";

     

       6
       6
       +
         # NOTE: When bumping version beyond 0.5.2, you likely need to remove

     

       7
       7
       +
         #       the cstdint.patch below. The patch does a fix that has already

     

       8
       8
       +
         #       been done upstream but is not yet part of a release

     

       6
       9
        
       

     

       7
       10
        
         src = fetchFromGitHub {

     

       8
       11
        
           owner = "BoomerangDecompiler";

     
···

       13
       16
        
       

     

       14
       17
        
         nativeBuildInputs = [ cmake bison flex ];

     

       15
       18
        
         buildInputs = [ qtbase capstone ];

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             name = "include-missing-cstdint.patch";

     

       22
       22
       +
             url = "https://github.com/BoomerangDecompiler/boomerang/commit/3342b0eac6b7617d9913226c06c1470820593e74.patch";

     

       23
       23
       +
             sha256 = "sha256-941IydcV3mqj7AWvXTM6GePW5VgawEcL0wrBCXqeWvc=";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       16
       26
        
       

     

       17
       27
        
         meta = with lib; {

     

       18
       28
        
           homepage = "https://github.com/BoomerangDecompiler/boomerang";

+2 -2

pkgs/development/tools/doctl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "doctl";

     

       5
       5
       -
         version = "1.60.0";

     

       5
       5
       +
         version = "1.61.0";

     

       6
       6
        
       

     

       7
       7
        
         vendorSha256 = null;

     

       8
       8
        
       

     
···

       32
       32
        
           owner = "digitalocean";

     

       33
       33
        
           repo = "doctl";

     

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

     

       35
       35
       -
           sha256 = "sha256-HhJOjTuPuQT8CYRf4yaR+d/MyTWlM1y+FiEU7S5rEs0=";

     

       35
       35
       +
           sha256 = "sha256-Z6G80Xg2DSoUj8vhxkDr3W/wh3fecRwxm0oly2GYDdg=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         meta = with lib; {

pkgs/misc/emulators/caprice32/default.nix

···

       5
       5
        
       

     

       6
       6
        
         pname = "caprice32";

     

       7
       7
        
         version = "4.6.0";

     

       8
       8
       +
         # NOTE: When bumping version beyond 4.6.0, you likely need to remove

     

       9
       9
       +
         #       string.patch below. The fix of this patch has already been

     

       10
       10
       +
         #       done upstream but is not yet part of a release

     

       8
       11
        
       

     

       9
       12
        
         src = fetchFromGitHub {

     

       10
       13
        
           repo = "caprice32";

     
···

       15
       18
        
       

     

       16
       19
        
         nativeBuildInputs = [ desktop-file-utils pkg-config ];

     

       17
       20
        
         buildInputs = [ libpng SDL freetype zlib ];

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [ ./string.patch ];

     

       18
       23
        
       

     

       19
       24
        
         makeFlags = [

     

       20
       25
        
           "APP_PATH=${placeholder "out"}/share/caprice32"

+12

pkgs/misc/emulators/caprice32/string.patch

···

       1
       1
       +
       diff --git a/src/configuration.h b/src/configuration.h

     

       2
       2
       +
       index 34fd690..97fb0e5 100644

     

       3
       3
       +
       --- a/src/configuration.h

     

       4
       4
       +
       +++ b/src/configuration.h

     

       5
       5
       +
       @@ -2,6 +2,7 @@

     

       6
       6
       +
        #define CONFIGURATION_H

     

       7
       7
       +
        

     

       8
       8
       +
        #include <map>

     

       9
       9
       +
       +#include <string>

     

       10
       10
       +
        

     

       11
       11
       +
        namespace config

     

       12
       12
       +
        {

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "fatrace";

     

       9
       9
       -
         version = "0.16.2";

     

       9
       9
       +
         version = "0.16.3";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "martinpitt";

     

       13
       13
        
           repo = pname;

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           sha256 = "sha256-1daYCVGz8Zd42j2QMFL5EAULKkmBnbE828i5NV9Kcb8=";

     

       15
       15
       +
           sha256 = "sha256-w7leZPdmiTc+avihP203e6GLvbRzbCtNOJdF8MM2v68=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [ python3 which ];

+4 -3

pkgs/servers/mbtileserver/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mbtileserver";

     

       5
       5
       -
         version = "0.6.1";

     

       5
       5
       +
         version = "0.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "consbio";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "0b0982rn5jsv8zxfkrcmhys764nim6136hafc8ccj0mwdyvwafxd";

     

       11
       11
       +
           sha256 = "sha256-QdirExVv7p7Mnhp8EGdTVRlmEiYpzoXVQbtO8aS9Kas=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = null;

     

       14
       14
       +
         vendorSha256 = "sha256-mUUxUZn8out6WNvKJKHoz+R44RDB0oWJb+57w72+E5w=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "A simple Go-based server for map tiles stored in mbtiles format";

     

       18
       18
        
           homepage = "https://github.com/consbio/mbtileserver";

     

       19
       19
       +
           changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md";

     

       19
       20
        
           license = licenses.isc;

     

       20
       21
        
           maintainers = with maintainers; [ sikmir ];

     

       21
       22
        
           platforms = platforms.unix;

+10 -17

pkgs/servers/minio/default.nix

···

       15
       15
        
       in

     

       16
       16
        
       buildGoModule rec {

     

       17
       17
        
         pname = "minio";

     

       18
       18
       -
         version = "2021-05-11T23-27-41Z";

     

       18
       18
       +
         version = "2021-05-16T05-32-34Z";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "minio";

     

       22
       22
        
           repo = "minio";

     

       23
       23
        
           rev = "RELEASE.${version}";

     

       24
       24
       -
           sha256 = "0yljq4lm9maz73ha9m38ljv977999p57rfkzybgzbjjrijgszm2b";

     

       24
       24
       +
           sha256 = "sha256-+zanqJMYNg/1c20cMm+bqVsW8VquucxEK5NiFAqOmS0=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         vendorSha256 = "1dm8nbg86zvxakc7h4dafqb035sc5x6viz8p409l22l695qrp6bi";

     

       27
       27
       +
         vendorSha256 = "sha256-5aDD68nugFyWsySLEj7LXAdtFXFKWnqfz+5zF5wC2qw=";

     

       28
       28
        
       

     

       29
       29
        
         doCheck = false;

     

       30
       30
        
       

     

       31
       31
        
         subPackages = [ "." ];

     

       32
       32
        
       

     

       33
       33
       -
         postPatch = ''

     

       34
       34
       -
           sed -i "s/Version.*/Version = \"${versionToTimestamp version}\"/g" cmd/build-constants.go

     

       35
       35
       -
           sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go

     

       36
       36
       -
           sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go

     

       37
       37
       -
         '';

     

       38
       38
       -
       

     

       39
       39
       -
         postConfigure = ''

     

       40
       40
       -
           export CGO_ENABLED=0

     

       41
       41
       -
         '';

     

       42
       42
       -
       

     

       43
       43
       -
         buildFlagsArray = [

     

       44
       44
       -
           "-tags=kqueue"

     

       45
       45
       -
         ];

     

       33
       33
       +
         preBuild = let t = "github.com/minio/minio/cmd"; in

     

       34
       34
       +
           ''

     

       35
       35
       +
             export CGO_ENABLED=0

     

       36
       36
       +
             buildFlagsArray+=("-tags" "kqueue" "-ldflags" "-s -w -X ${t}.Version=${versionToTimestamp version} -X ${t}.ReleaseTag=RELEASE.${version} -X ${t}.CommitID=${src.rev}")

     

       37
       37
       +
           '';

     

       46
       38
        
       

     

       47
       39
        
         passthru.tests.minio = nixosTests.minio;

     

       48
       40
        
       

     

       49
       41
        
         meta = with lib; {

     

       50
       42
        
           homepage = "https://www.minio.io/";

     

       51
       43
        
           description = "An S3-compatible object storage server";

     

       44
       44
       +
           changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";

     

       52
       45
        
           maintainers = with maintainers; [ eelco bachp ];

     

       53
       46
        
           platforms = platforms.unix;

     

       54
       54
       -
           license = licenses.asl20;

     

       47
       47
       +
           license = licenses.agpl3Plus;

     

       55
       48
        
         };

     

       56
       49
        
       }

+3 -3

pkgs/tools/networking/findomain/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "findomain";

     

       13
       13
       -
         version = "4.2.0";

     

       13
       13
       +
         version = "4.2.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "Edu4rdSHL";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-bNvgENyBa+BOY7QVPbBGKFKqYd9JNek+fyPnCT9+PUs=";

     

       19
       19
       +
           sha256 = "sha256-yVjxwgReZhdArTXr1rUsU+pKIlxCVVf3NfR0znqzfxA=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "sha256-FDiIM1LlWEFmiIvebdCsznkB7egspNKhY6xUXB838g8=";

     

       22
       22
       +
         cargoSha256 = "sha256-t1/BQD8ostyMJh/HoZ7n3bKw5LfDZQeq03AO7JY0G8E=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ installShellFiles perl ];

     

       25
       25
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

pkgs/top-level/aliases.nix

···

       674
       674
        
         rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02

     

       675
       675
        
         rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02

     

       676
       676
        
         subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31

     

       677
       677
       +
         thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";

     

       678
       678
       +
         thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";

     

       677
       679
        
         togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained";

     

       678
       680
        
         urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02

     

       679
       681
        
         urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02

+145 -159

pkgs/top-level/all-packages.nix

···

       457
       457
        
       

     

       458
       458
        
         # `fetchurl' downloads a file from the network.

     

       459
       459
        
         fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform

     

       460
       460
       -
          then buildPackages.fetchurl # No need to do special overrides twice,

     

       461
       461
       -
          else makeOverridable (import ../build-support/fetchurl) {

     

       462
       462
       -
           inherit lib stdenvNoCC buildPackages;

     

       463
       463
       -
           inherit cacert;

     

       464
       464
       -
           curl = buildPackages.curlMinimal.override (old: rec {

     

       465
       465
       -
             # break dependency cycles

     

       466
       466
       -
             fetchurl = stdenv.fetchurlBoot;

     

       467
       467
       -
             zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };

     

       468
       468
       -
             pkg-config = buildPackages.pkg-config.override (old: {

     

       469
       469
       -
               pkg-config = old.pkg-config.override {

     

       470
       470
       -
                 fetchurl = stdenv.fetchurlBoot;

     

       471
       471
       -
               };

     

       472
       472
       -
             });

     

       473
       473
       -
             perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };

     

       474
       474
       -
             openssl = buildPackages.openssl.override {

     

       460
       460
       +
           then buildPackages.fetchurl # No need to do special overrides twice,

     

       461
       461
       +
           else makeOverridable (import ../build-support/fetchurl) {

     

       462
       462
       +
             inherit lib stdenvNoCC buildPackages;

     

       463
       463
       +
             inherit cacert;

     

       464
       464
       +
             curl = buildPackages.curlMinimal.override (old: rec {

     

       465
       465
       +
               # break dependency cycles

     

       475
       466
        
               fetchurl = stdenv.fetchurlBoot;

     

       476
       476
       -
               buildPackages = {

     

       477
       477
       -
                 coreutils = buildPackages.coreutils.override {

     

       467
       467
       +
               zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };

     

       468
       468
       +
               pkg-config = buildPackages.pkg-config.override (old: {

     

       469
       469
       +
                 pkg-config = old.pkg-config.override {

     

       478
       470
        
                   fetchurl = stdenv.fetchurlBoot;

     

       471
       471
       +
                 };

     

       472
       472
       +
               });

     

       473
       473
       +
               perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };

     

       474
       474
       +
               openssl = buildPackages.openssl.override {

     

       475
       475
       +
                 fetchurl = stdenv.fetchurlBoot;

     

       476
       476
       +
                 buildPackages = {

     

       477
       477
       +
                   coreutils = buildPackages.coreutils.override {

     

       478
       478
       +
                     fetchurl = stdenv.fetchurlBoot;

     

       479
       479
       +
                     inherit perl;

     

       480
       480
       +
                     xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };

     

       481
       481
       +
                     gmp = null;

     

       482
       482
       +
                     aclSupport = false;

     

       483
       483
       +
                     attrSupport = false;

     

       484
       484
       +
                   };

     

       479
       485
        
                   inherit perl;

     

       480
       480
       -
                   xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };

     

       481
       481
       -
                   gmp = null;

     

       482
       482
       -
                   aclSupport = false;

     

       483
       483
       -
                   attrSupport = false;

     

       484
       486
        
                 };

     

       485
       487
        
                 inherit perl;

     

       486
       488
        
               };

     

       487
       487
       -
               inherit perl;

     

       488
       488
       -
             };

     

       489
       489
       -
             libssh2 = buildPackages.libssh2.override {

     

       490
       490
       -
               fetchurl = stdenv.fetchurlBoot;

     

       491
       491
       -
               inherit zlib openssl;

     

       492
       492
       -
             };

     

       493
       493
       -
             # On darwin, libkrb5 needs bootstrap_cmds which would require

     

       494
       494
       -
             # converting many packages to fetchurl_boot to avoid evaluation cycles.

     

       495
       495
       -
             # So turn gssSupport off there, and on Windows.

     

       496
       496
       -
             # On other platforms, keep the previous value.

     

       497
       497
       -
             gssSupport =

     

       498
       498
       -
               if stdenv.isDarwin || stdenv.hostPlatform.isWindows

     

       499
       499
       -
                 then false

     

       500
       500
       -
                 else old.gssSupport or true; # `? true` is the default

     

       501
       501
       -
             libkrb5 = buildPackages.libkrb5.override {

     

       502
       502
       -
               fetchurl = stdenv.fetchurlBoot;

     

       503
       503
       -
               inherit pkg-config perl openssl;

     

       504
       504
       -
               keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };

     

       505
       505
       -
             };

     

       506
       506
       -
             nghttp2 = buildPackages.nghttp2.override {

     

       507
       507
       -
               fetchurl = stdenv.fetchurlBoot;

     

       508
       508
       -
               inherit zlib pkg-config openssl;

     

       509
       509
       -
               c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };

     

       510
       510
       -
               libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };

     

       511
       511
       -
             };

     

       512
       512
       -
           });

     

       513
       513
       -
         };

     

       489
       489
       +
               libssh2 = buildPackages.libssh2.override {

     

       490
       490
       +
                 fetchurl = stdenv.fetchurlBoot;

     

       491
       491
       +
                 inherit zlib openssl;

     

       492
       492
       +
               };

     

       493
       493
       +
               # On darwin, libkrb5 needs bootstrap_cmds which would require

     

       494
       494
       +
               # converting many packages to fetchurl_boot to avoid evaluation cycles.

     

       495
       495
       +
               # So turn gssSupport off there, and on Windows.

     

       496
       496
       +
               # On other platforms, keep the previous value.

     

       497
       497
       +
               gssSupport =

     

       498
       498
       +
                 if stdenv.isDarwin || stdenv.hostPlatform.isWindows

     

       499
       499
       +
                   then false

     

       500
       500
       +
                   else old.gssSupport or true; # `? true` is the default

     

       501
       501
       +
               libkrb5 = buildPackages.libkrb5.override {

     

       502
       502
       +
                 fetchurl = stdenv.fetchurlBoot;

     

       503
       503
       +
                 inherit pkg-config perl openssl;

     

       504
       504
       +
                 keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };

     

       505
       505
       +
               };

     

       506
       506
       +
               nghttp2 = buildPackages.nghttp2.override {

     

       507
       507
       +
                 fetchurl = stdenv.fetchurlBoot;

     

       508
       508
       +
                 inherit zlib pkg-config openssl;

     

       509
       509
       +
                 c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };

     

       510
       510
       +
                 libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };

     

       511
       511
       +
               };

     

       512
       512
       +
             });

     

       513
       513
       +
           };

     

       514
       514
        
       

     

       515
       515
        
         fetchRepoProject = callPackage ../build-support/fetchrepoproject { };

     

       516
       516
        
       

     
···

       1470
       1470
        
         grc = python3Packages.callPackage ../tools/misc/grc { };

     

       1471
       1471
        
       

     

       1472
       1472
        
         green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {

     

       1473
       1473
       -
          SDL = SDL_sixel;

     

       1473
       1473
       +
           SDL = SDL_sixel;

     

       1474
       1474
        
         };

     

       1475
       1475
        
       

     

       1476
       1476
        
         gremlin-console = callPackage ../applications/misc/gremlin-console {

     
···

       4229
       4229
        
         wallutils = callPackage ../tools/graphics/wallutils { };

     

       4230
       4230
        
       

     

       4231
       4231
        
         wrangler = callPackage ../development/tools/wrangler {

     

       4232
       4232
       -
          inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;

     

       4232
       4232
       +
           inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;

     

       4233
       4233
        
         };

     

       4234
       4234
        
       

     

       4235
       4235
        
         wsl-open = callPackage ../tools/misc/wsl-open { };

     
···

       5134
       5134
        
       

     

       5135
       5135
        
         gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };

     

       5136
       5136
        
       

     

       5137
       5137
       -
         gnused = if !stdenv.hostPlatform.isWindows then

     

       5138
       5138
       -
                    callPackage ../tools/text/gnused { } # broken on Windows

     

       5139
       5139
       -
                  else

     

       5140
       5140
       -
                    gnused_422;

     

       5137
       5137
       +
         gnused = if !stdenv.hostPlatform.isWindows

     

       5138
       5138
       +
           then callPackage ../tools/text/gnused { } # broken on Windows

     

       5139
       5139
       +
           else gnused_422;

     

       5141
       5140
        
         # This is an easy work-around for [:space:] problems.

     

       5142
       5141
        
         gnused_422 = callPackage ../tools/text/gnused/422.nix { };

     

       5143
       5142
        
       

     
···

       11281
       11280
        
         mint = callPackage ../development/compilers/mint { };

     

       11282
       11281
        
       

     

       11283
       11282
        
         mitscheme = callPackage ../development/compilers/mit-scheme {

     

       11284
       11284
       -
          texLive = texlive.combine { inherit (texlive) scheme-small; };

     

       11285
       11285
       -
          texinfo = texinfo5;

     

       11286
       11286
       -
          xlibsWrapper = null;

     

       11283
       11283
       +
           texLive = texlive.combine { inherit (texlive) scheme-small; };

     

       11284
       11284
       +
           texinfo = texinfo5;

     

       11285
       11285
       +
           xlibsWrapper = null;

     

       11287
       11286
        
         };

     

       11288
       11287
        
       

     

       11289
       11288
        
         mitschemeX11 = mitscheme.override {

     

       11290
       11290
       -
          texLive = texlive.combine { inherit (texlive) scheme-small; };

     

       11291
       11291
       -
          texinfo = texinfo5;

     

       11292
       11292
       -
          enableX11 = true;

     

       11289
       11289
       +
           texLive = texlive.combine { inherit (texlive) scheme-small; };

     

       11290
       11290
       +
           texinfo = texinfo5;

     

       11291
       11291
       +
           enableX11 = true;

     

       11293
       11292
        
         };

     

       11294
       11293
        
       

     

       11295
       11294
        
         miranda = callPackage ../development/compilers/miranda {};

     
···

       12925
       12924
        
         #     };

     

       12926
       12925
        
         #

     

       12927
       12926
        
         distccWrapper = makeOverridable ({ extraConfig ? "" }:

     

       12928
       12928
       -
            wrapCC (distcc.links extraConfig)) {};

     

       12927
       12927
       +
           wrapCC (distcc.links extraConfig)) {};

     

       12929
       12928
        
         distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper);

     

       12930
       12929
        
       

     

       12931
       12930
        
         distccMasquerade = if stdenv.isDarwin

     
···

       16077
       16076
        
         libiconv =

     

       16078
       16077
        
           if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"]

     

       16079
       16078
        
             then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform

     

       16080
       16080
       -
                              then libcCross

     

       16081
       16081
       -
                              else stdenv.cc.libc)

     

       16079
       16079
       +
               then libcCross

     

       16080
       16080
       +
               else stdenv.cc.libc)

     

       16082
       16081
        
           else if stdenv.hostPlatform.isDarwin

     

       16083
       16082
        
             then darwin.libiconv

     

       16084
       16083
        
           else libiconvReal;

     
···

       16941
       16940
        
         };

     

       16942
       16941
        
       

     

       16943
       16942
        
         nss = lowPrio (callPackage ../development/libraries/nss { });

     

       16944
       16944
       -
         nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });

     

       16945
       16943
        
         nssTools = nss.tools;

     

       16946
       16944
        
       

     

       16947
       16945
        
         # required for stable thunderbird and firefox-esr-78

     
···

       17534
       17532
        
       

     

       17535
       17533
        
         s2geometry = callPackage ../development/libraries/s2geometry { };

     

       17536
       17534
        
       

     

       17537
       17537
       -
         /* This package references ghc844, which we no longer have. Unfortunately, I

     

       17538
       17538
       -
            have been unable to mark it as "broken" in a way that the ofBorg bot

     

       17539
       17539
       -
            recognizes. Since I don't want to merge code into master that generates

     

       17540
       17540
       -
            evaluation errors, I have no other idea but to comment it out entirely.

     

       17535
       17535
       +
         /*  This package references ghc844, which we no longer have. Unfortunately, I

     

       17536
       17536
       +
             have been unable to mark it as "broken" in a way that the ofBorg bot

     

       17537
       17537
       +
             recognizes. Since I don't want to merge code into master that generates

     

       17538
       17538
       +
             evaluation errors, I have no other idea but to comment it out entirely.

     

       17541
       17539
        
       

     

       17542
       17540
        
         sad = callPackage ../applications/science/logic/sad { };

     

       17543
       17543
       -
          */

     

       17541
       17541
       +
         */

     

       17544
       17542
        
       

     

       17545
       17543
        
         safefile = callPackage ../development/libraries/safefile {};

     

       17546
       17544
        
       

     
···

       20265
       20263
        
           ];

     

       20266
       20264
        
         };

     

       20267
       20265
        
       

     

       20268
       20268
       -
         /* Linux kernel modules are inherently tied to a specific kernel.  So

     

       20269
       20269
       -
            rather than provide specific instances of those packages for a

     

       20270
       20270
       -
            specific kernel, we have a function that builds those packages

     

       20271
       20271
       -
            for a specific kernel.  This function can then be called for

     

       20272
       20272
       -
            whatever kernel you're using. */

     

       20266
       20266
       +
         /*  Linux kernel modules are inherently tied to a specific kernel.  So

     

       20267
       20267
       +
             rather than provide specific instances of those packages for a

     

       20268
       20268
       +
             specific kernel, we have a function that builds those packages

     

       20269
       20269
       +
             for a specific kernel.  This function can then be called for

     

       20270
       20270
       +
             whatever kernel you're using. */

     

       20273
       20271
        
       

     

       20274
       20272
        
         linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; {

     

       20275
       20273
        
           callPackage = newScope self;

     
···

       20409
       20407
        
       

     

       20410
       20408
        
           mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };

     

       20411
       20409
        
       

     

       20412
       20412
       -
           /* compiles but has to be integrated into the kernel somehow

     

       20413
       20413
       -
              Let's have it uncommented and finish it..

     

       20414
       20414
       -
           */

     

       20410
       20410
       +
           # compiles but has to be integrated into the kernel somehow

     

       20411
       20411
       +
           # Let's have it uncommented and finish it..

     

       20415
       20412
        
           ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };

     

       20416
       20413
        
       

     

       20417
       20414
        
           netatop = callPackage ../os-specific/linux/netatop { };

     
···

       20470
       20467
        
           zenpower = callPackage ../os-specific/linux/zenpower { };

     

       20471
       20468
        
       

     

       20472
       20469
        
           inherit (callPackages ../os-specific/linux/zfs {

     

       20473
       20473
       -
             configFile = "kernel";

     

       20474
       20474
       -
             inherit kernel;

     

       20475
       20475
       -
            }) zfsStable zfsUnstable;

     

       20476
       20476
       -
       

     

       20477
       20477
       -
            zfs = zfsStable;

     

       20470
       20470
       +
               configFile = "kernel";

     

       20471
       20471
       +
               inherit kernel;

     

       20472
       20472
       +
             }) zfsStable zfsUnstable;

     

       20473
       20473
       +
           zfs = zfsStable;

     

       20478
       20474
        
       

     

       20479
       20479
       -
            can-isotp = callPackage ../os-specific/linux/can-isotp { };

     

       20475
       20475
       +
           can-isotp = callPackage ../os-specific/linux/can-isotp { };

     

       20480
       20476
        
         });

     

       20481
       20477
        
       

     

       20482
       20478
        
         # The current default kernel / kernel modules.

     
···

       20721
       20717
        
           inherit (darwin.apple_sdk.frameworks) AppKit Security;

     

       20722
       20718
        
         };

     

       20723
       20719
        
       

     

       20724
       20724
       -
         nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }

     

       20725
       20725
       -
                    else unixtools.nettools;

     

       20720
       20720
       +
         nettools = if stdenv.isLinux

     

       20721
       20721
       +
           then callPackage ../os-specific/linux/net-tools { }

     

       20722
       20722
       +
           else unixtools.nettools;

     

       20726
       20723
        
       

     

       20727
       20724
        
         nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };

     

       20728
       20725
        
       

     
···

       20921
       20918
        
       

     

       20922
       20919
        
         prayer = callPackage ../servers/prayer { };

     

       20923
       20920
        
       

     

       20924
       20924
       -
         procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }

     

       20925
       20925
       -
                  else unixtools.procps;

     

       20921
       20921
       +
         procps = if stdenv.isLinux

     

       20922
       20922
       +
           then callPackage ../os-specific/linux/procps-ng { }

     

       20923
       20923
       +
           else unixtools.procps;

     

       20926
       20924
        
       

     

       20927
       20925
        
         procdump = callPackage ../os-specific/linux/procdump { };

     

       20928
       20926
        
       

     
···

       22072
       22070
        
         ucs-fonts = callPackage ../data/fonts/ucs-fonts

     

       22073
       22071
        
           { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };

     

       22074
       22072
        
       

     

       22075
       22075
       -
       

     

       22076
       22073
        
         ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };

     

       22077
       22074
        
       

     

       22078
       22075
        
         ultralist = callPackage ../applications/misc/ultralist { };

     
···

       22080
       22077
        
         undefined-medium = callPackage ../data/fonts/undefined-medium { };

     

       22081
       22078
        
       

     

       22082
       22079
        
         uni-vga = callPackage ../data/fonts/uni-vga

     

       22083
       22083
       -
            { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };

     

       22080
       22080
       +
           { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };

     

       22084
       22081
        
       

     

       22085
       22082
        
         unicode-character-database = callPackage ../data/misc/unicode-character-database { };

     

       22086
       22083
        
       

     
···

       22089
       22086
        
         unihan-database = callPackage ../data/misc/unihan-database { };

     

       22090
       22087
        
       

     

       22091
       22088
        
         unifont = callPackage ../data/fonts/unifont

     

       22092
       22092
       -
            { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };

     

       22089
       22089
       +
           { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };

     

       22093
       22090
        
       

     

       22094
       22091
        
         unifont_upper = callPackage ../data/fonts/unifont_upper { };

     

       22095
       22092
        
       

     
···

       23120
       23117
        
         flwrap = callPackage ../applications/radio/flwrap { };

     

       23121
       23118
        
       

     

       23122
       23119
        
         fluidsynth = callPackage ../applications/audio/fluidsynth {

     

       23123
       23123
       -
            inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;

     

       23120
       23120
       +
           inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;

     

       23124
       23121
        
         };

     

       23125
       23122
        
         fluidsynth_1 = fluidsynth.override { version = "1"; };

     

       23126
       23123
        
       

     
···

       25117
       25114
        
       

     

       25118
       25115
        
         plank = callPackage ../applications/misc/plank { };

     

       25119
       25116
        
       

     

       25120
       25120
       -
         playonlinux = callPackage ../applications/misc/playonlinux {

     

       25121
       25121
       -
            stdenv = stdenv_32bit;

     

       25122
       25122
       -
         };

     

       25117
       25117
       +
         playonlinux = callPackage ../applications/misc/playonlinux

     

       25118
       25118
       +
           { stdenv = stdenv_32bit; };

     

       25123
       25119
        
       

     

       25124
       25120
        
         pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };

     

       25125
       25121
        
       

     
···

       26499
       26495
        
           gtk3Support = true;

     

       26500
       26496
        
         };

     

       26501
       26497
        
       

     

       26502
       26502
       -
         thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {

     

       26503
       26503
       -
           inherit (rustPackages) cargo rustc;

     

       26504
       26504
       -
           libpng = libpng_apng;

     

       26505
       26505
       -
           nss = nss_3_44;

     

       26506
       26506
       -
           gtk3Support = true;

     

       26507
       26507
       -
         };

     

       26508
       26508
       -
       

     

       26509
       26498
        
         thunderbolt = callPackage ../os-specific/linux/thunderbolt {};

     

       26510
       26499
        
       

     

       26511
       26500
        
         thunderbird-bin = thunderbird-bin-78;

     

       26512
       26501
        
         thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { };

     

       26513
       26513
       -
       

     

       26514
       26514
       -
         thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { };

     

       26515
       26502
        
       

     

       26516
       26503
        
         ticpp = callPackage ../development/libraries/ticpp { };

     

       26517
       26504
        
       

     
···

       27037
       27024
        
       

     

       27038
       27025
        
         weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };

     

       27039
       27026
        
       

     

       27040
       27040
       -
         wio = callPackage ../applications/window-managers/wio {

     

       27041
       27041
       -
           wlroots = wlroots_0_12;

     

       27042
       27042
       -
         };

     

       27027
       27027
       +
         wio = callPackage ../applications/window-managers/wio { };

     

       27043
       27028
        
       

     

       27044
       27029
        
         whitebox-tools = callPackage ../applications/gis/whitebox-tools {

     

       27045
       27030
        
           inherit (darwin.apple_sdk.frameworks) Security;

     
···

       27531
       27516
        
         zgrviewer = callPackage ../applications/graphics/zgrviewer { };

     

       27532
       27517
        
       

     

       27533
       27518
        
         zgv = callPackage ../applications/graphics/zgv {

     

       27534
       27534
       -
          # Enable the below line for terminal display. Note

     

       27535
       27535
       -
          # that it requires sixel graphics compatible terminals like mlterm

     

       27536
       27536
       -
          # or xterm -ti 340

     

       27537
       27537
       -
          SDL = SDL_sixel;

     

       27519
       27519
       +
           # Enable the below line for terminal display. Note

     

       27520
       27520
       +
           # that it requires sixel graphics compatible terminals like mlterm

     

       27521
       27521
       +
           # or xterm -ti 340

     

       27522
       27522
       +
           SDL = SDL_sixel;

     

       27538
       27523
        
         };

     

       27539
       27524
        
       

     

       27540
       27525
        
         zim = callPackage ../applications/office/zim { };

     
···

       29465
       29450
        
         elan = callPackage ../applications/science/logic/elan {};

     

       29466
       29451
        
         mathlibtools = with python3Packages; toPythonApplication mathlibtools;

     

       29467
       29452
        
       

     

       29468
       29468
       -
         leo2 = callPackage ../applications/science/logic/leo2 {

     

       29469
       29469
       -
            ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;};

     

       29453
       29453
       +
         leo2 = callPackage ../applications/science/logic/leo2

     

       29454
       29454
       +
           { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; };

     

       29470
       29455
        
       

     

       29471
       29456
        
         leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};

     

       29472
       29457
        
       

     
···

       30262
       30247
        
       

     

       30263
       30248
        
         nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };

     

       30264
       30249
        
       

     

       30265
       30265
       -
         /* Evaluate a NixOS configuration using this evaluation of Nixpkgs.

     

       30250
       30250
       +
         /*

     

       30251
       30251
       +
           Evaluate a NixOS configuration using this evaluation of Nixpkgs.

     

       30266
       30252
        
       

     

       30267
       30267
       -
            With this function you can write, for example, a package that

     

       30268
       30268
       -
            depends on a custom virtual machine image.

     

       30253
       30253
       +
           With this function you can write, for example, a package that

     

       30254
       30254
       +
           depends on a custom virtual machine image.

     

       30269
       30255
        
       

     

       30270
       30270
       -
            Parameter: A module, path or list of those that represent the

     

       30256
       30256
       +
           Parameter:  A module, path or list of those that represent the

     

       30271
       30257
        
                       configuration of the NixOS system to be constructed.

     

       30272
       30258
        
       

     

       30273
       30273
       -
            Result:    An attribute set containing packages produced by this

     

       30274
       30274
       -
                       evaluation of NixOS, such as toplevel, kernel and

     

       30275
       30275
       -
                       initialRamdisk.

     

       30276
       30276
       -
                       The result can be extended in the modules by defining

     

       30277
       30277
       -
                       extra attributes in system.build.

     

       30278
       30278
       -
                       Alternatively, you may use the result's config and

     

       30279
       30279
       -
                       options attributes to query any option.

     

       30259
       30259
       +
           Result: An attribute set containing packages produced by this

     

       30260
       30260
       +
                   evaluation of NixOS, such as toplevel, kernel and

     

       30261
       30261
       +
                   initialRamdisk.

     

       30262
       30262
       +
                   The result can be extended in the modules by defining

     

       30263
       30263
       +
                   extra attributes in system.build.

     

       30264
       30264
       +
                   Alternatively, you may use the result's config and

     

       30265
       30265
       +
                   options attributes to query any option.

     

       30280
       30266
        
       

     

       30281
       30281
       -
            Example:

     

       30267
       30267
       +
           Example:

     

       30282
       30268
        
       

     

       30283
       30283
       -
                let

     

       30284
       30284
       -
                  myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {

     

       30269
       30269
       +
               let

     

       30270
       30270
       +
                 myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {

     

       30285
       30271
        
       

     

       30286
       30286
       -
                    config.services.nginx = {

     

       30287
       30287
       -
                      enable = true;

     

       30288
       30288
       -
                      # ...

     

       30289
       30289
       -
                    };

     

       30272
       30272
       +
                   config.services.nginx = {

     

       30273
       30273
       +
                     enable = true;

     

       30274
       30274
       +
                     # ...

     

       30275
       30275
       +
                   };

     

       30290
       30276
        
       

     

       30291
       30291
       -
                    # Use config.system.build to exports relevant parts of a

     

       30292
       30292
       -
                    # configuration. The runner attribute should not be

     

       30293
       30293
       -
                    # considered a fully general replacement for systemd

     

       30294
       30294
       -
                    # functionality.

     

       30295
       30295
       -
                    config.system.build.run-nginx = config.systemd.services.nginx.runner;

     

       30296
       30296
       -
                  });

     

       30297
       30297
       -
                in

     

       30298
       30298
       -
                  myOS.run-nginx

     

       30277
       30277
       +
                   # Use config.system.build to exports relevant parts of a

     

       30278
       30278
       +
                   # configuration. The runner attribute should not be

     

       30279
       30279
       +
                   # considered a fully general replacement for systemd

     

       30280
       30280
       +
                   # functionality.

     

       30281
       30281
       +
                   config.system.build.run-nginx = config.systemd.services.nginx.runner;

     

       30282
       30282
       +
                 });

     

       30283
       30283
       +
               in

     

       30284
       30284
       +
                 myOS.run-nginx

     

       30299
       30285
        
       

     

       30300
       30300
       -
            Unlike in plain NixOS, the nixpkgs.config and

     

       30301
       30301
       -
            nixpkgs.system options will be ignored by default. Instead,

     

       30302
       30302
       -
            nixpkgs.pkgs will have the default value of pkgs as it was

     

       30303
       30303
       -
            constructed right after invoking the nixpkgs function (e.g. the

     

       30304
       30304
       -
            value of import <nixpkgs> { overlays = [./my-overlay.nix]; }

     

       30305
       30305
       -
            but not the value of (import <nixpkgs> {} // { extra = ...; }).

     

       30286
       30286
       +
           Unlike in plain NixOS, the nixpkgs.config and

     

       30287
       30287
       +
           nixpkgs.system options will be ignored by default. Instead,

     

       30288
       30288
       +
           nixpkgs.pkgs will have the default value of pkgs as it was

     

       30289
       30289
       +
           constructed right after invoking the nixpkgs function (e.g. the

     

       30290
       30290
       +
           value of import <nixpkgs> { overlays = [./my-overlay.nix]; }

     

       30291
       30291
       +
           but not the value of (import <nixpkgs> {} // { extra = ...; }).

     

       30306
       30292
        
       

     

       30307
       30307
       -
            If you do want to use the config.nixpkgs options, you are

     

       30308
       30308
       -
            probably better off by calling nixos/lib/eval-config.nix

     

       30309
       30309
       -
            directly, even though it is possible to set config.nixpkgs.pkgs.

     

       30293
       30293
       +
           If you do want to use the config.nixpkgs options, you are

     

       30294
       30294
       +
           probably better off by calling nixos/lib/eval-config.nix

     

       30295
       30295
       +
           directly, even though it is possible to set config.nixpkgs.pkgs.

     

       30310
       30296
        
       

     

       30311
       30311
       -
            For more information about writing NixOS modules, see

     

       30312
       30312
       -
            https://nixos.org/nixos/manual/index.html#sec-writing-modules

     

       30297
       30297
       +
           For more information about writing NixOS modules, see

     

       30298
       30298
       +
           https://nixos.org/nixos/manual/index.html#sec-writing-modules

     

       30313
       30299
        
       

     

       30314
       30314
       -
            Note that you will need to have called Nixpkgs with the system

     

       30315
       30315
       -
            parameter set to the right value for your deployment target.

     

       30300
       30300
       +
           Note that you will need to have called Nixpkgs with the system

     

       30301
       30301
       +
           parameter set to the right value for your deployment target.

     

       30316
       30302
        
         */

     

       30317
       30303
        
         nixos =

     

       30318
       30304
        
           configuration:

     
···

       30380
       30366
        
             test:

     

       30381
       30367
        
               let

     

       30382
       30368
        
                 loadedTest = if builtins.typeOf test == "path"

     

       30383
       30383
       -
                              then import test

     

       30384
       30384
       -
                              else test;

     

       30369
       30369
       +
                   then import test

     

       30370
       30370
       +
                   else test;

     

       30385
       30371
        
                 calledTest = if pkgs.lib.isFunction loadedTest

     

       30386
       30386
       -
                              then callPackage loadedTest {}

     

       30387
       30387
       -
                              else loadedTest;

     

       30372
       30372
       +
                   then callPackage loadedTest {}

     

       30373
       30373
       +
                   else loadedTest;

     

       30388
       30374
        
               in

     

       30389
       30375
        
                 nixosTesting.makeTest calledTest;

     

       30390
       30376
        
       

     
···

       31042
       31028
        
         };

     

       31043
       31029
        
       

     

       31044
       31030
        
         xsw = callPackage ../applications/misc/xsw {

     

       31045
       31045
       -
          # Enable the next line to use this in terminal.

     

       31046
       31046
       -
          # Note that it requires sixel capable terminals such as mlterm

     

       31047
       31047
       -
          # or xterm -ti 340

     

       31048
       31048
       -
          SDL = SDL_sixel;

     

       31031
       31031
       +
           # Enable the next line to use this in terminal.

     

       31032
       31032
       +
           # Note that it requires sixel capable terminals such as mlterm

     

       31033
       31033
       +
           # or xterm -ti 340

     

       31034
       31034
       +
           SDL = SDL_sixel;

     

       31049
       31035
        
         };

     

       31050
       31036
        
       

     

       31051
       31037
        
         xteddy = callPackage ../applications/misc/xteddy { };