commit 203846b9de3bc67e77c93be9d111408286a17d5d · pyrox.dev/nixpkgs

+13 -7

.travis.yml

···

       1
       1
       +
       language: nix

     

       1
       2
        
       matrix:

     

       2
       2
       -
           allow_failures:

     

       3
       3
       -
               - os: osx

     

       4
       3
        
           include:

     

       5
       4
        
               - os: linux

     

       6
       6
       -
                 language: generic

     

       5
       5
       +
                 sudo: false

     

       6
       6
       +
                 script:

     

       7
       7
       +
                     - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball

     

       8
       8
       +
                     - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual

     

       9
       9
       +
               - os: linux

     

       7
       10
        
                 sudo: required

     

       8
       11
        
                 dist: trusty

     

       12
       12
       +
                 script: ./maintainers/scripts/travis-nox-review-pr.sh pr

     

       9
       13
        
               - os: osx

     

       10
       10
       -
                 language: generic

     

       11
       14
        
                 osx_image: xcode7.3

     

       12
       12
       -
       before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix

     

       13
       13
       -
       install: ./maintainers/scripts/travis-nox-review-pr.sh nox

     

       14
       14
       -
       script: ./maintainers/scripts/travis-nox-review-pr.sh build

     

       15
       15
       +
                 script: ./maintainers/scripts/travis-nox-review-pr.sh pr

     

       16
       16
       +
       git:

     

       17
       17
       +
           depth: 1

     

       18
       18
       +
       env:

     

       19
       19
       +
           global:

     

       20
       20
       +
               - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f

+1 -1

README.md

···

       31
       31
        
       * [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language)

     

       32
       32
        
       * [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)

     

       33
       33
        
       * [Manual (NixOS)](https://nixos.org/nixos/manual/)

     

       34
       34
       -
       * [Nix Wiki](https://nixos.org/wiki/)

     

       34
       34
       +
       * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))

     

       35
       35
        
       * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)

     

       36
       36
        
       * [Continuous package builds for 16.03 release](https://hydra.nixos.org/jobset/nixos/release-16.03)

     

       37
       37
        
       * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)

+1 -1

default.nix

···

       6
       6
        
       

     

       7
       7
        
       else

     

       8
       8
        
       

     

       9
       9
       -
         import ./pkgs/top-level

     

       9
       9
       +
         import ./pkgs/top-level/impure.nix

lib/maintainers.nix

···

       163
       163
        
         guibert = "David Guibert <david.guibert@gmail.com>";

     

       164
       164
        
         havvy = "Ryan Scheel <ryan.havvy@gmail.com>";

     

       165
       165
        
         hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";

     

       166
       166
       +
         hce = "Hans-Christian Esperer <hc@hcesperer.org>";

     

       166
       167
        
         henrytill = "Henry Till <henrytill@gmail.com>";

     

       167
       168
        
         hiberno = "Christian Lask <hiberno@hiberno.net>";

     

       168
       169
        
         hinton = "Tom Hinton <t@larkery.com>";

     
···

       356
       357
        
         sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";

     

       357
       358
        
         shell = "Shell Turner <cam.turn@gmail.com>";

     

       358
       359
        
         shlevy = "Shea Levy <shea@shealevy.com>";

     

       360
       360
       +
         siddharthist = "Langston Barrett <langston.barrett@gmail.com>";

     

       359
       361
        
         simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";

     

       360
       362
        
         sjagoe = "Simon Jagoe <simon@simonjagoe.com>";

     

       361
       363
        
         sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";

+57 -46

maintainers/scripts/travis-nox-review-pr.sh

···

       1
       1
        
       #! /usr/bin/env bash

     

       2
       2
        
       set -e

     

       3
       3
        
       

     

       4
       4
       -
       export NIX_CURL_FLAGS=-sS

     

       4
       4
       +
       while test -n "$1"; do

     

       5
       5
        
       

     

       6
       6
       -
       if [[ $1 == nix ]]; then

     

       7
       7
       -
           echo "=== Installing Nix..."

     

       8
       8
       -
           # Install Nix

     

       9
       9
       -
           bash <(curl -sS https://nixos.org/nix/install)

     

       10
       10
       -
           source $HOME/.nix-profile/etc/profile.d/nix.sh

     

       6
       6
       +
           # tell Travis to use folding

     

       7
       7
       +
           echo -en "travis_fold:start:$1\r"

     

       11
       8
        
       

     

       12
       12
       -
           # Make sure we can use hydra's binary cache

     

       13
       13
       -
           sudo mkdir /etc/nix

     

       14
       14
       -
           sudo sh -c 'echo "build-max-jobs = 4" > /etc/nix/nix.conf'

     

       9
       9
       +
           case $1 in

     

       15
       10
        
       

     

       16
       16
       -
           # Verify evaluation

     

       17
       17
       -
           echo "=== Verifying that nixpkgs evaluates..."

     

       18
       18
       -
           nix-env -f. -qa --json >/dev/null

     

       19
       19
       -
       elif [[ $1 == nox ]]; then

     

       20
       20
       -
           source $HOME/.nix-profile/etc/profile.d/nix.sh

     

       21
       21
       -
           echo "=== Installing nox..."

     

       22
       22
       -
           nix-build -A nox '<nixpkgs>' --show-trace

     

       23
       23
       -
       elif [[ $1 == build ]]; then

     

       24
       24
       -
           source $HOME/.nix-profile/etc/profile.d/nix.sh

     

       11
       11
       +
               nixpkgs-verify)

     

       12
       12
       +
                   echo "=== Verifying that nixpkgs evaluates..."

     

       25
       13
        
       

     

       26
       26
       -
           if [[ $TRAVIS_OS_NAME == "osx" ]]; then

     

       27
       27
       -
               echo "Skipping NixOS things on darwin"

     

       28
       28
       -
           else

     

       29
       29
       -
               # Nix builds in /tmp and we need exec support

     

       30
       30
       -
               sudo mount -o remount,exec /run

     

       31
       31
       -
               sudo mount -o remount,exec /run/user

     

       32
       32
       -
               sudo mount

     

       14
       14
       +
                   nix-env --file $TRAVIS_BUILD_DIR --query --available --json > /dev/null

     

       15
       15
       +
                   ;;

     

       16
       16
       +
       

     

       17
       17
       +
               nixos-options)

     

       18
       18
       +
                   echo "=== Checking NixOS options"

     

       19
       19
       +
       

     

       20
       20
       +
                   nix-build $TRAVIS_BUILD_DIR/nixos/release.nix --attr options --show-trace

     

       21
       21
       +
                   ;;

     

       22
       22
       +
       

     

       23
       23
       +
               nixos-manual)

     

       24
       24
       +
                   echo "=== Checking NixOS manuals"

     

       25
       25
       +
       

     

       26
       26
       +
                   nix-build $TRAVIS_BUILD_DIR/nixos/release.nix --attr manual --show-trace

     

       27
       27
       +
                   ;;

     

       28
       28
       +
       

     

       29
       29
       +
               nixpkgs-manual)

     

       30
       30
       +
                   echo "=== Checking nixpkgs manuals"

     

       31
       31
       +
       

     

       32
       32
       +
                   nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr manpages --show-trace

     

       33
       33
       +
                   ;;

     

       34
       34
       +
       

     

       35
       35
       +
               nixpkgs-tarball)

     

       36
       36
       +
                   echo "=== Checking nixpkgs tarball creation"

     

       37
       37
       +
       

     

       38
       38
       +
                   nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr tarball --show-trace

     

       39
       39
       +
                   ;;

     

       40
       40
       +
       

     

       41
       41
       +
               nixpkgs-lint)

     

       42
       42
       +
                   echo "=== Checking nixpkgs lint"

     

       33
       43
        
       

     

       34
       34
       -
               echo "=== Checking NixOS options"

     

       35
       35
       -
               nix-build nixos/release.nix -A options --show-trace

     

       44
       44
       +
                   nix-shell --packages nixpkgs-lint --run "nixpkgs-lint -f $TRAVIS_BUILD_DIR"

     

       45
       45
       +
                   ;;

     

       36
       46
        
       

     

       37
       37
       -
               echo "=== Checking tarball creation"

     

       38
       38
       -
               nix-build pkgs/top-level/release.nix -A tarball --show-trace

     

       39
       39
       -
           fi

     

       47
       47
       +
               pr)

     

       48
       48
       +
                   if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

     

       49
       49
       +
                       echo "=== No pull request found"

     

       50
       50
       +
                   else

     

       51
       51
       +
                       echo "=== Building pull request #$TRAVIS_PULL_REQUEST"

     

       40
       52
        
       

     

       41
       41
       -
           if [[ $TRAVIS_PULL_REQUEST == false ]]; then

     

       42
       42
       -
               echo "=== Not a pull request"

     

       43
       43
       -
           else

     

       44
       44
       -
               echo "=== Checking PR"

     

       53
       53
       +
                       token=""

     

       54
       54
       +
                       if [ -n "$GITHUB_TOKEN" ]; then

     

       55
       55
       +
                           token="--token $GITHUB_TOKEN"

     

       56
       56
       +
                       fi

     

       45
       57
        
       

     

       46
       46
       -
               if ! nix-shell -p nox --run "nox-review pr ${TRAVIS_PULL_REQUEST}"; then

     

       47
       47
       -
                   if sudo dmesg | egrep 'Out of memory|Killed process' > /tmp/oom-log; then

     

       48
       48
       -
                       echo "=== The build failed due to running out of memory:"

     

       49
       49
       -
                       cat /tmp/oom-log

     

       50
       50
       -
                       echo "=== Please disregard the result of this Travis build."

     

       58
       58
       +
                       nix-shell --packages nox git --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST" -I nixpkgs=$TRAVIS_BUILD_DIR

     

       51
       59
        
                   fi

     

       52
       52
       -
                   exit 1

     

       53
       53
       -
               fi

     

       54
       54
       -
           fi

     

       55
       55
       -
       else

     

       56
       56
       -
           echo "$0: Unknown option $1" >&2

     

       57
       57
       -
           false

     

       58
       58
       -
       fi

     

       60
       60
       +
                   ;;

     

       61
       61
       +
       

     

       62
       62
       +
               *)

     

       63
       63
       +
                   echo "Skipping unknown option $1"

     

       64
       64
       +
                   ;;

     

       65
       65
       +
           esac

     

       66
       66
       +
       

     

       67
       67
       +
           echo -en "travis_fold:end:$1\r"

     

       68
       68
       +
           shift

     

       69
       69
       +
       done

+71 -82

nixos/modules/config/fonts/fontconfig-ultimate.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>";

     

       6
       6
       -
           cfg = config.fonts.fontconfig.ultimate;

     

       7
       7
       -
           fontconfigUltimateConf = pkgs.writeText "ultimate-conf" ''

     

       8
       8
       -
             <?xml version="1.0"?>

     

       9
       9
       -
             <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       10
       10
       -
             <fontconfig>

     

       11
       11
       -
       

     

       12
       12
       -
               ${optionalString (!cfg.allowBitmaps) ''

     

       13
       13
       -
               <!-- Reject bitmap fonts -->

     

       14
       14
       -
               <selectfont>

     

       15
       15
       -
                 <rejectfont>

     

       16
       16
       -
                   <pattern>

     

       17
       17
       -
                     <patelt name="scalable"><bool>false</bool></patelt>

     

       18
       18
       -
                   </pattern>

     

       19
       19
       -
                 </rejectfont>

     

       20
       20
       -
               </selectfont>

     

       21
       21
       -
               ''}

     

       22
       22
       -
       

     

       23
       23
       -
               ${optionalString cfg.allowType1 ''

     

       24
       24
       -
               <!-- Reject Type 1 fonts -->

     

       25
       25
       -
               <selectfont>

     

       26
       26
       -
                 <rejectfont>

     

       27
       27
       -
                   <pattern>

     

       28
       28
       -
                     <patelt name="fontformat">

     

       29
       29
       -
                       <string>Type 1</string>

     

       30
       30
       -
                     </patelt>

     

       31
       31
       -
                   </pattern>

     

       32
       32
       -
                 </rejectfont>

     

       33
       33
       -
               </selectfont>

     

       34
       34
       -
               ''}

     

       35
       35
       -
       

     

       36
       36
       -
               <!-- Use embedded bitmaps in fonts like Calibri? -->

     

       37
       37
       -
               <match target="font">

     

       38
       38
       -
                 <edit name="embeddedbitmap" mode="assign">

     

       39
       39
       -
                   ${fcBool cfg.useEmbeddedBitmaps}

     

       40
       40
       -
                 </edit>

     

       41
       41
       -
               </match>

     

       42
       42
       -
       

     

       43
       43
       -
               <!-- Force autohint always -->

     

       44
       44
       -
               <match target="font">

     

       45
       45
       -
                 <edit name="force_autohint" mode="assign">

     

       46
       46
       -
                   ${fcBool cfg.forceAutohint}

     

       47
       47
       -
                 </edit>

     

       48
       48
       -
               </match>

     

       49
       49
       -
       

     

       50
       50
       -
               <!-- Render some monospace TTF fonts as bitmaps -->

     

       51
       51
       -
               <match target="pattern">

     

       52
       52
       -
                 <edit name="bitmap_monospace" mode="assign">

     

       53
       53
       -
                   ${fcBool cfg.renderMonoTTFAsBitmap}

     

       54
       54
       -
                 </edit>

     

       55
       55
       -
               </match>

     

       56
       56
       -
       

     

       57
       57
       -
             </fontconfig>

     

       58
       58
       -
           '';

     

       59
       59
       -
           confPkg = 

     

       60
       60
       -
             let version = pkgs.fontconfig.configVersion;

     

       61
       61
       -
             in pkgs.runCommand "font-ultimate-conf" {} ''

     

       62
       62
       -
             mkdir -p $out/etc/fonts/{,${version}/}conf.d/

     

       63
       63
       -
       

     

       64
       64
       -
             cp ${fontconfigUltimateConf} \

     

       65
       65
       -
               $out/etc/fonts/conf.d/52-fontconfig-ultimate.conf

     

       66
       66
       -
       

     

       67
       67
       -
             cp ${fontconfigUltimateConf} \

     

       68
       68
       -
               $out/etc/fonts/${version}/conf.d/52-fontconfig-ultimate.conf

     

       69
       69
       -
       

     

       70
       70
       -
             ${optionalString (cfg.substitutions != "none") ''

     

       71
       71
       -
             cp ${pkgs.fontconfig-ultimate.confd}/etc/fonts/presets/${cfg.substitutions}/*.conf \

     

       72
       72
       -
               $out/etc/fonts/conf.d/

     

       73
       73
       -
             cp ${pkgs.fontconfig-ultimate.confd}/etc/fonts/presets/${cfg.substitutions}/*.conf \

     

       74
       74
       -
               $out/etc/fonts/${version}/conf.d/

     

       75
       75
       -
             ''}

     

       76
       76
       -
       

     

       77
       77
       -
             ln -s ${pkgs.fontconfig-ultimate.confd}/etc/fonts/conf.d/*.conf \

     

       78
       78
       -
               $out/etc/fonts/conf.d/

     

       79
       79
       -
       

     

       80
       80
       -
             ln -s ${pkgs.fontconfig-ultimate.confd}/etc/fonts/conf.d/*.conf \

     

       81
       81
       -
               $out/etc/fonts/${version}/conf.d/

     

       82
       82
       -
           '';

     

       83
       83
       -
       

     

       84
       6
        
       in

     

       85
       7
        
       {

     

       86
       8
        
       

     
···

       193
       115
        
         };

     

       194
       116
        
       

     

       195
       117
        
       

     

       196
       196
       -
         config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {

     

       118
       118
       +
         config =

     

       119
       119
       +
           let ultimate = config.fonts.fontconfig.ultimate;

     

       120
       120
       +
               fontconfigUltimateConf = ''

     

       121
       121
       +
                 <?xml version="1.0"?>

     

       122
       122
       +
                 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       123
       123
       +
                 <fontconfig>

     

       124
       124
       +
       

     

       125
       125
       +
                   ${optionalString (!ultimate.allowBitmaps) ''

     

       126
       126
       +
                   <!-- Reject bitmap fonts -->

     

       127
       127
       +
                   <selectfont>

     

       128
       128
       +
                     <rejectfont>

     

       129
       129
       +
                       <pattern>

     

       130
       130
       +
                         <patelt name="scalable"><bool>false</bool></patelt>

     

       131
       131
       +
                       </pattern>

     

       132
       132
       +
                     </rejectfont>

     

       133
       133
       +
                   </selectfont>

     

       134
       134
       +
                   ''}

     

       135
       135
       +
       

     

       136
       136
       +
                   ${optionalString ultimate.allowType1 ''

     

       137
       137
       +
                   <!-- Reject Type 1 fonts -->

     

       138
       138
       +
                   <selectfont>

     

       139
       139
       +
                     <rejectfont>

     

       140
       140
       +
                       <pattern>

     

       141
       141
       +
                         <patelt name="fontformat">

     

       142
       142
       +
                           <string>Type 1</string>

     

       143
       143
       +
                         </patelt>

     

       144
       144
       +
                       </pattern>

     

       145
       145
       +
                     </rejectfont>

     

       146
       146
       +
                   </selectfont>

     

       147
       147
       +
                   ''}

     

       148
       148
       +
       

     

       149
       149
       +
                   <!-- Use embedded bitmaps in fonts like Calibri? -->

     

       150
       150
       +
                   <match target="font">

     

       151
       151
       +
                     <edit name="embeddedbitmap" mode="assign">

     

       152
       152
       +
                       ${fcBool ultimate.useEmbeddedBitmaps}

     

       153
       153
       +
                     </edit>

     

       154
       154
       +
                   </match>

     

       155
       155
       +
       

     

       156
       156
       +
                   <!-- Force autohint always -->

     

       157
       157
       +
                   <match target="font">

     

       158
       158
       +
                     <edit name="force_autohint" mode="assign">

     

       159
       159
       +
                       ${fcBool ultimate.forceAutohint}

     

       160
       160
       +
                     </edit>

     

       161
       161
       +
                   </match>

     

       162
       162
       +
       

     

       163
       163
       +
                   <!-- Render some monospace TTF fonts as bitmaps -->

     

       164
       164
       +
                   <match target="pattern">

     

       165
       165
       +
                     <edit name="bitmap_monospace" mode="assign">

     

       166
       166
       +
                       ${fcBool ultimate.renderMonoTTFAsBitmap}

     

       167
       167
       +
                     </edit>

     

       168
       168
       +
                   </match>

     

       169
       169
       +
       

     

       170
       170
       +
                   ${optionalString (ultimate.substitutions != "none") ''

     

       171
       171
       +
                   <!-- Type 1 font substitutions -->

     

       172
       172
       +
                   <include ignore_missing="yes">${pkgs.fontconfig-ultimate.confd}/etc/fonts/presets/${ultimate.substitutions}</include>

     

       173
       173
       +
                   ''}

     

       174
       174
       +
       

     

       175
       175
       +
                   <include ignore_missing="yes">${pkgs.fontconfig-ultimate.confd}/etc/fonts/conf.d</include>

     

       176
       176
       +
       

     

       177
       177
       +
                 </fontconfig>

     

       178
       178
       +
               '';

     

       179
       179
       +
           in mkIf (config.fonts.fontconfig.enable && ultimate.enable) {

     

       197
       180
        
       

     

       198
       198
       -
             fonts.fontconfig.confPkgs = [ confPkg ];

     

       199
       199
       -
             

     

       200
       200
       -
             environment.variables = cfg.rendering;

     

       181
       181
       +
             environment.etc."fonts/conf.d/52-fontconfig-ultimate.conf" = {

     

       182
       182
       +
               text = fontconfigUltimateConf;

     

       183
       183
       +
             };

     

       184
       184
       +
       

     

       185
       185
       +
             environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/52-fontconfig-ultimate.conf" = {

     

       186
       186
       +
               text = fontconfigUltimateConf;

     

       187
       187
       +
             };

     

       188
       188
       +
       

     

       189
       189
       +
             environment.variables = ultimate.rendering;

     

       201
       190
        
       

     

       202
       191
        
           };

     

       203
       192

+128 -134

nixos/modules/config/fonts/fontconfig.nix

···

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
       -
       let cfg = config.fonts.fontconfig;

     

       6
       6
       -
           fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>";

     

       7
       7
       -
           renderConf = pkgs.writeText "render-conf" ''

     

       8
       8
       -
             <?xml version='1.0'?>

     

       9
       9
       -
             <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       10
       10
       -
             <fontconfig>

     

       11
       11
       -
       

     

       12
       12
       -
               <!-- Default rendering settings -->

     

       13
       13
       -
               <match target="font">

     

       14
       14
       -
                 <edit mode="assign" name="hinting">

     

       15
       15
       -
                   ${fcBool cfg.hinting.enable}

     

       16
       16
       -
                 </edit>

     

       17
       17
       -
                 <edit mode="assign" name="autohint">

     

       18
       18
       -
                   ${fcBool cfg.hinting.autohint}

     

       19
       19
       -
                 </edit>

     

       20
       20
       -
                 <edit mode="assign" name="hintstyle">

     

       21
       21
       -
                   <const>hint${cfg.hinting.style}</const>

     

       22
       22
       -
                 </edit>

     

       23
       23
       -
                 <edit mode="assign" name="antialias">

     

       24
       24
       -
                   ${fcBool cfg.antialias}

     

       25
       25
       -
                 </edit>

     

       26
       26
       -
                 <edit mode="assign" name="rgba">

     

       27
       27
       -
                   <const>${cfg.subpixel.rgba}</const>

     

       28
       28
       -
                 </edit>

     

       29
       29
       -
                 <edit mode="assign" name="lcdfilter">

     

       30
       30
       -
                   <const>lcd${cfg.subpixel.lcdfilter}</const>

     

       31
       31
       -
                 </edit>

     

       32
       32
       -
               </match>

     

       33
       33
       -
       

     

       34
       34
       -
               ${optionalString (cfg.dpi != 0) ''

     

       35
       35
       -
               <match target="pattern">

     

       36
       36
       -
                 <edit name="dpi" mode="assign">

     

       37
       37
       -
                   <double>${toString cfg.dpi}</double>

     

       38
       38
       -
                 </edit>

     

       39
       39
       -
               </match>

     

       40
       40
       -
               ''}

     

       41
       41
       -
       

     

       42
       42
       -
             </fontconfig>

     

       43
       43
       -
           '';

     

       44
       44
       -
           genericAliasConf = 

     

       45
       45
       -
             let genDefault = fonts: name:

     

       46
       46
       -
               optionalString (fonts != []) ''

     

       47
       47
       -
                 <alias>

     

       48
       48
       -
                   <family>${name}</family>

     

       49
       49
       -
                   <prefer>

     

       50
       50
       -
                   ${concatStringsSep ""

     

       51
       51
       -
                   (map (font: ''

     

       52
       52
       -
                     <family>${font}</family>

     

       53
       53
       -
                   '') fonts)}

     

       54
       54
       -
                   </prefer>

     

       55
       55
       -
                 </alias>

     

       56
       56
       -
               '';

     

       57
       57
       -
             in

     

       58
       58
       -
             pkgs.writeText "generic-alias-conf" ''

     

       59
       59
       -
             <?xml version='1.0'?>

     

       60
       60
       -
             <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       61
       61
       -
             <fontconfig>

     

       62
       62
       -
       

     

       63
       63
       -
               <!-- Default fonts -->

     

       64
       64
       -
               ${genDefault cfg.defaultFonts.sansSerif "sans-serif"}

     

       65
       65
       -
       

     

       66
       66
       -
               ${genDefault cfg.defaultFonts.serif     "serif"}

     

       67
       67
       -
       

     

       68
       68
       -
               ${genDefault cfg.defaultFonts.monospace "monospace"}

     

       69
       69
       -
       

     

       70
       70
       -
             </fontconfig>

     

       71
       71
       -
           '';

     

       72
       72
       -
           cacheConf = let

     

       73
       73
       -
             cache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };

     

       74
       74
       -
           in

     

       75
       75
       -
           pkgs.writeText "cache-conf" ''

     

       76
       76
       -
             <?xml version='1.0'?>

     

       77
       77
       -
             <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       78
       78
       -
             <fontconfig>

     

       79
       79
       -
               <!-- Font directories -->

     

       80
       80
       -
               ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}

     

       81
       81
       -
               <!-- Pre-generated font caches -->

     

       82
       82
       -
               <cachedir>${cache pkgs.fontconfig}</cachedir>

     

       83
       83
       -
               ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) ''

     

       84
       84
       -
                 <cachedir>${cache pkgs.pkgsi686Linux.fontconfig}</cachedir>

     

       85
       85
       -
               ''}

     

       86
       86
       -
             </fontconfig>

     

       87
       87
       -
           '';

     

       88
       88
       -
           userConf = pkgs.writeText "user-conf" ''

     

       89
       89
       -
             <?xml version="1.0"?>

     

       90
       90
       -
             <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       91
       91
       -
             <fontconfig>

     

       92
       92
       -
               <include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>

     

       93
       93
       -
               <include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>

     

       94
       94
       -
             </fontconfig>

     

       95
       95
       -
           '';

     

       96
       96
       -
           fontsConf = pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; };

     

       97
       97
       -
           confPkg = 

     

       98
       98
       -
             let version = pkgs.fontconfig.configVersion;

     

       99
       99
       -
             in pkgs.runCommand "fontconfig-conf" {} ''

     

       100
       100
       -
             mkdir -p $out/etc/fonts/{,${version}/}conf.d

     

       101
       101
       -
       

     

       102
       102
       -
             ln -s ${fontsConf}        $out/etc/fonts/fonts.conf

     

       103
       103
       -
       

     

       104
       104
       -
             ln -s ${pkgs.fontconfig.out}/etc/fonts/fonts.conf $out/etc/fonts/${version}/fonts.conf

     

       105
       105
       -
             ln -s ${pkgs.fontconfig.out}/etc/fonts/conf.d/*   $out/etc/fonts/${version}/conf.d/

     

       106
       106
       -
       

     

       107
       107
       -
             ln -s ${renderConf}       $out/etc/fonts/conf.d/10-nixos-rendering.conf

     

       108
       108
       -
             ln -s ${genericAliasConf} $out/etc/fonts/conf.d/60-nixos-generic-alias.conf

     

       109
       109
       -
       

     

       110
       110
       -
             ln -s ${cacheConf}        $out/etc/fonts/${version}/conf.d/00-nixos.conf

     

       111
       111
       -
       

     

       112
       112
       -
             ln -s ${renderConf}       $out/etc/fonts/${version}/conf.d/10-nixos-rendering.conf

     

       113
       113
       -
             ln -s ${genericAliasConf} $out/etc/fonts/${version}/conf.d/30-nixos-generic-alias.conf

     

       114
       114
       -
       

     

       115
       115
       -
             ${optionalString cfg.includeUserConf

     

       116
       116
       -
             "ln -s ${userConf}        $out/etc/fonts/${version}/conf.d/99-user.conf"}

     

       117
       117
       -
             

     

       118
       118
       -
           '';

     

       119
       119
       -
       in

     

       120
       5
        
       {

     

       121
       6
        
       

     

       122
       7
        
         options = {

     
···

       133
       18
        
                   running X11 applications or any other program that uses

     

       134
       19
        
                   Fontconfig, you can turn this option off and prevent a

     

       135
       20
        
                   dependency on all those fonts.

     

       136
       136
       -
                 '';

     

       137
       137
       -
               };

     

       138
       138
       -
       

     

       139
       139
       -
               confPkgs = mkOption {

     

       140
       140
       -
                 internal = true;

     

       141
       141
       -
                 type     = with types; listOf path;

     

       142
       142
       -
                 default  = [ ];

     

       143
       143
       -
                 description = ''

     

       144
       144
       -
                   Fontconfig configuration packages.

     

       145
       21
        
                 '';

     

       146
       22
        
               };

     

       147
       23
        
       

     
···

       267
       143
        
       

     

       268
       144
        
         };

     

       269
       145
        
       

     

       270
       270
       -
         config = mkIf cfg.enable {

     

       271
       271
       -
           fonts.fontconfig.confPkgs = [ confPkg ];

     

       146
       146
       +
         config =

     

       147
       147
       +
           let fontconfig = config.fonts.fontconfig;

     

       148
       148
       +
               fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>";

     

       149
       149
       +
               renderConf = ''

     

       150
       150
       +
                 <?xml version='1.0'?>

     

       151
       151
       +
                 <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       152
       152
       +
                 <fontconfig>

     

       272
       153
        
       

     

       273
       273
       -
           environment.etc.fonts.source = 

     

       274
       274
       -
             let fontConf = pkgs.symlinkJoin {

     

       275
       275
       -
                   name  = "fontconfig-etc";

     

       276
       276
       -
                   paths = cfg.confPkgs;

     

       277
       277
       -
                 };

     

       278
       278
       -
             in "${fontConf}/etc/fonts/";

     

       154
       154
       +
                   <!-- Default rendering settings -->

     

       155
       155
       +
                   <match target="font">

     

       156
       156
       +
                     <edit mode="assign" name="hinting">

     

       157
       157
       +
                       ${fcBool fontconfig.hinting.enable}

     

       158
       158
       +
                     </edit>

     

       159
       159
       +
                     <edit mode="assign" name="autohint">

     

       160
       160
       +
                       ${fcBool fontconfig.hinting.autohint}

     

       161
       161
       +
                     </edit>

     

       162
       162
       +
                     <edit mode="assign" name="hintstyle">

     

       163
       163
       +
                       <const>hint${fontconfig.hinting.style}</const>

     

       164
       164
       +
                     </edit>

     

       165
       165
       +
                     <edit mode="assign" name="antialias">

     

       166
       166
       +
                       ${fcBool fontconfig.antialias}

     

       167
       167
       +
                     </edit>

     

       168
       168
       +
                     <edit mode="assign" name="rgba">

     

       169
       169
       +
                       <const>${fontconfig.subpixel.rgba}</const>

     

       170
       170
       +
                     </edit>

     

       171
       171
       +
                     <edit mode="assign" name="lcdfilter">

     

       172
       172
       +
                       <const>lcd${fontconfig.subpixel.lcdfilter}</const>

     

       173
       173
       +
                     </edit>

     

       174
       174
       +
                   </match>

     

       175
       175
       +
       

     

       176
       176
       +
                   ${optionalString (fontconfig.dpi != 0) ''

     

       177
       177
       +
                   <match target="pattern">

     

       178
       178
       +
                     <edit name="dpi" mode="assign">

     

       179
       179
       +
                       <double>${toString fontconfig.dpi}</double>

     

       180
       180
       +
                     </edit>

     

       181
       181
       +
                   </match>

     

       182
       182
       +
                   ''}

     

       183
       183
       +
       

     

       184
       184
       +
                 </fontconfig>

     

       185
       185
       +
               '';

     

       186
       186
       +
               genericAliasConf = ''

     

       187
       187
       +
                 <?xml version='1.0'?>

     

       188
       188
       +
                 <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       189
       189
       +
                 <fontconfig>

     

       190
       190
       +
       

     

       191
       191
       +
                   <!-- Default fonts -->

     

       192
       192
       +
                   ${optionalString (fontconfig.defaultFonts.sansSerif != []) ''

     

       193
       193
       +
                   <alias>

     

       194
       194
       +
                     <family>sans-serif</family>

     

       195
       195
       +
                     <prefer>

     

       196
       196
       +
                       ${concatStringsSep "\n"

     

       197
       197
       +
                         (map (font: "<family>${font}</family>")

     

       198
       198
       +
                           fontconfig.defaultFonts.sansSerif)}

     

       199
       199
       +
                     </prefer>

     

       200
       200
       +
                   </alias>

     

       201
       201
       +
                   ''}

     

       202
       202
       +
                   ${optionalString (fontconfig.defaultFonts.serif != []) ''

     

       203
       203
       +
                   <alias>

     

       204
       204
       +
                     <family>serif</family>

     

       205
       205
       +
                     <prefer>

     

       206
       206
       +
                       ${concatStringsSep "\n"

     

       207
       207
       +
                         (map (font: "<family>${font}</family>")

     

       208
       208
       +
                           fontconfig.defaultFonts.serif)}

     

       209
       209
       +
                     </prefer>

     

       210
       210
       +
                   </alias>

     

       211
       211
       +
                   ''}

     

       212
       212
       +
                   ${optionalString (fontconfig.defaultFonts.monospace != []) ''

     

       213
       213
       +
                   <alias>

     

       214
       214
       +
                     <family>monospace</family>

     

       215
       215
       +
                     <prefer>

     

       216
       216
       +
                       ${concatStringsSep "\n"

     

       217
       217
       +
                         (map (font: "<family>${font}</family>")

     

       218
       218
       +
                           fontconfig.defaultFonts.monospace)}

     

       219
       219
       +
                     </prefer>

     

       220
       220
       +
                   </alias>

     

       221
       221
       +
                   ''}

     

       222
       222
       +
       

     

       223
       223
       +
                 </fontconfig>

     

       224
       224
       +
               '';

     

       225
       225
       +
           in mkIf fontconfig.enable {

     

       226
       226
       +
       

     

       227
       227
       +
             # Fontconfig 2.10 backward compatibility

     

       228
       228
       +
       

     

       229
       229
       +
             # Bring in the default (upstream) fontconfig configuration, only for fontconfig 2.10

     

       230
       230
       +
             environment.etc."fonts/fonts.conf".source =

     

       231
       231
       +
               pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; };

     

       232
       232
       +
       

     

       233
       233
       +
             environment.etc."fonts/conf.d/10-nixos-rendering.conf".text = renderConf;

     

       234
       234
       +
             environment.etc."fonts/conf.d/60-nixos-generic-alias.conf".text = genericAliasConf;

     

       235
       235
       +
       

     

       236
       236
       +
             # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig.

     

       237
       237
       +
             # Otherwise specify only font directories.

     

       238
       238
       +
             environment.etc."fonts/${pkgs.fontconfig.configVersion}/fonts.conf".source =

     

       239
       239
       +
               "${pkgs.fontconfig.out}/etc/fonts/fonts.conf";

     

       240
       240
       +
       

     

       241
       241
       +
             environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text =

     

       242
       242
       +
               let

     

       243
       243
       +
                 cache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };

     

       244
       244
       +
               in ''

     

       245
       245
       +
                 <?xml version='1.0'?>

     

       246
       246
       +
                 <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       247
       247
       +
                 <fontconfig>

     

       248
       248
       +
                   <!-- Font directories -->

     

       249
       249
       +
                   ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}

     

       250
       250
       +
                   <!-- Pre-generated font caches -->

     

       251
       251
       +
                   <cachedir>${cache pkgs.fontconfig}</cachedir>

     

       252
       252
       +
                   ${optionalString (pkgs.stdenv.isx86_64 && config.fonts.fontconfig.cache32Bit) ''

     

       253
       253
       +
                     <cachedir>${cache pkgs.pkgsi686Linux.fontconfig}</cachedir>

     

       254
       254
       +
                   ''}

     

       255
       255
       +
                 </fontconfig>

     

       256
       256
       +
               '';

     

       279
       257
        
       

     

       280
       280
       -
           environment.systemPackages = [ pkgs.fontconfig ];

     

       281
       281
       -
         };

     

       258
       258
       +
             environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/10-nixos-rendering.conf".text = renderConf;

     

       259
       259
       +
             environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/60-nixos-generic-alias.conf".text = genericAliasConf;

     

       260
       260
       +
       

     

       261
       261
       +
             environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/99-user.conf" = {

     

       262
       262
       +
               enable = fontconfig.includeUserConf;

     

       263
       263
       +
               text = ''

     

       264
       264
       +
                 <?xml version="1.0"?>

     

       265
       265
       +
                 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

     

       266
       266
       +
                 <fontconfig>

     

       267
       267
       +
                   <include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>

     

       268
       268
       +
                   <include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>

     

       269
       269
       +
                 </fontconfig>

     

       270
       270
       +
               '';

     

       271
       271
       +
             };

     

       272
       272
       +
       

     

       273
       273
       +
             environment.systemPackages = [ pkgs.fontconfig ];

     

       274
       274
       +
       

     

       275
       275
       +
           };

     

       282
       276
        
       

     

       283
       277
        
       }

nixos/modules/config/pulseaudio.nix

···

       161
       161
        
                   ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no";

     

       162
       162
        
                   Restart = "on-failure";

     

       163
       163
        
                 };

     

       164
       164
       +
                 environment = { DISPLAY = ":${toString config.services.xserver.display}"; };

     

       164
       165
        
               };

     

       165
       166
        
       

     

       166
       167
        
               sockets.pulseaudio = {

nixos/modules/module-list.nix

···

       249
       249
        
         ./services/misc/nix-ssh-serve.nix

     

       250
       250
        
         ./services/misc/nzbget.nix

     

       251
       251
        
         ./services/misc/octoprint.nix

     

       252
       252
       +
         ./services/misc/packagekit.nix

     

       252
       253
        
         ./services/misc/parsoid.nix

     

       253
       254
        
         ./services/misc/phd.nix

     

       254
       255
        
         ./services/misc/plex.nix

     
···

       258
       259
        
         ./services/misc/ripple-data-api.nix

     

       259
       260
        
         ./services/misc/rogue.nix

     

       260
       261
        
         ./services/misc/siproxd.nix

     

       262
       262
       +
         ./services/misc/sonarr.nix

     

       261
       263
        
         ./services/misc/spice-vdagentd.nix

     

       262
       264
        
         ./services/misc/subsonic.nix

     

       263
       265
        
         ./services/misc/sundtek.nix

     
···

       474
       476
        
         ./services/web-servers/winstone.nix

     

       475
       477
        
         ./services/web-servers/zope2.nix

     

       476
       478
        
         ./services/x11/colord.nix

     

       479
       479
       +
         ./services/x11/compton.nix

     

       477
       480
        
         ./services/x11/unclutter.nix

     

       478
       481
        
         ./services/x11/desktop-managers/default.nix

     

       479
       482
        
         ./services/x11/display-managers/auto.nix

+10 -10

nixos/modules/security/grsecurity.nix

···

       13
       13
        
                 || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])

     

       14
       14
        
                 && fs.fsType == "zfs")

     

       15
       15
        
           (attrValues config.fileSystems) != [];

     

       16
       16
       +
       

     

       17
       17
       +
         # Ascertain whether NixOS container support is required

     

       18
       18
       +
         containerSupportRequired =

     

       19
       19
       +
           config.boot.enableContainers && config.containers != {};

     

       16
       20
        
       in

     

       17
       21
        
       

     

       18
       22
        
       {

     

       19
       23
        
         options.security.grsecurity = {

     

       20
       24
        
       

     

       21
       21
       -
           enable = mkEnableOption "Grsecurity/PaX";

     

       25
       25
       +
           enable = mkEnableOption "grsecurity/PaX";

     

       22
       26
        
       

     

       23
       27
        
           lockTunables = mkOption {

     

       24
       28
        
             type = types.bool;

     
···

       27
       31
        
             description = ''

     

       28
       32
        
               Whether to automatically lock grsecurity tunables

     

       29
       33
        
               (<option>boot.kernel.sysctl."kernel.grsecurity.*"</option>).  Disable

     

       30
       30
       -
               this to allow configuration of grsecurity features while the system is

     

       31
       31
       -
               running.  The lock can be manually engaged by activating the

     

       32
       32
       -
               <literal>grsec-lock</literal> service unit.

     

       34
       34
       +
               this to allow runtime configuration of grsecurity features.  Activate

     

       35
       35
       +
               the <literal>grsec-lock</literal> service unit to prevent further

     

       36
       36
       +
               configuration until the next reboot.

     

       33
       37
        
             '';

     

       34
       38
        
           };

     

       35
       39
        
       

     
···

       48
       52
        
               (isYES "GRKERNSEC_SYSCTL_DISTRO")

     

       49
       53
        
             ];

     

       50
       54
        
       

     

       51
       51
       -
           # Crashing on an overflow in kernel land is user unfriendly and may prevent

     

       52
       52
       -
           # the system from booting, which is too severe for our use case.

     

       53
       53
       -
           boot.kernelParams = [ "pax_size_overflow_report_only" ];

     

       54
       54
       -
       

     

       55
       55
        
           # Install PaX related utillities into the system profile.  Eventually, we

     

       56
       56
        
           # also want to include gradm here.

     

       57
       57
        
           environment.systemPackages = with pkgs; [ paxctl pax-utils ];

     
···

       59
       59
        
           # Install rules for the grsec device node

     

       60
       60
        
           services.udev.packages = [ pkgs.gradm ];

     

       61
       61
        
       

     

       62
       62
       -
           # This service unit is responsible for locking the Grsecurity tunables.  The

     

       62
       62
       +
           # This service unit is responsible for locking the grsecurity tunables.  The

     

       63
       63
        
           # unit is always defined, but only activated on bootup if lockTunables is

     

       64
       64
        
           # toggled.  When lockTunables is toggled, failure to activate the unit will

     

       65
       65
        
           # enter emergency mode.  The intent is to make it difficult to silently

     
···

       105
       105
        
             "kernel.grsecurity.chroot_deny_chroot" = mkForce 0;

     

       106
       106
        
             "kernel.grsecurity.chroot_deny_mount" = mkForce 0;

     

       107
       107
        
             "kernel.grsecurity.chroot_deny_pivot" = mkForce 0;

     

       108
       108
       -
           } // optionalAttrs config.boot.enableContainers {

     

       108
       108
       +
           } // optionalAttrs containerSupportRequired {

     

       109
       109
        
             # chroot(2) restrictions that conflict with NixOS lightweight containers

     

       110
       110
        
             "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;

     

       111
       111
        
             "kernel.grsecurity.chroot_deny_mount" = mkForce 0;

+1 -1

nixos/modules/services/continuous-integration/jenkins/default.nix

···

       154
       154
        
             '';

     

       155
       155
        
       

     

       156
       156
        
             script = ''

     

       157
       157
       -
               ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/lib/jenkins.war --httpListenAddress=${cfg.listenAddress} \

     

       157
       157
       +
               ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \

     

       158
       158
        
                                                         --httpPort=${toString cfg.port} \

     

       159
       159
        
                                                         --prefix=${cfg.prefix} \

     

       160
       160
        
                                                         ${concatStringsSep " " cfg.extraOptions}

+1 -1

nixos/modules/services/misc/cgminer.nix

···

       126
       126
        
       

     

       127
       127
        
             environment = {

     

       128
       128
        
               LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib'';

     

       129
       129
       -
               DISPLAY = ":0";

     

       129
       129
       +
               DISPLAY = ":${toString config.services.xserver.display}";

     

       130
       130
        
               GPU_MAX_ALLOC_PERCENT = "100";

     

       131
       131
        
               GPU_USE_SYNC_OBJECTS = "1";

     

       132
       132
        
             };

+61

nixos/modules/services/misc/packagekit.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
       

     

       7
       7
       +
         cfg = config.services.packagekit;

     

       8
       8
       +
       

     

       9
       9
       +
         backend = "nix";

     

       10
       10
       +
       

     

       11
       11
       +
         packagekitConf = ''

     

       12
       12
       +
       [Daemon]

     

       13
       13
       +
       DefaultBackend=${backend}

     

       14
       14
       +
       KeepCache=false

     

       15
       15
       +
           '';

     

       16
       16
       +
       

     

       17
       17
       +
         vendorConf = ''

     

       18
       18
       +
       [PackagesNotFound]

     

       19
       19
       +
       DefaultUrl=https://github.com/NixOS/nixpkgs

     

       20
       20
       +
       CodecUrl=https://github.com/NixOS/nixpkgs

     

       21
       21
       +
       HardwareUrl=https://github.com/NixOS/nixpkgs

     

       22
       22
       +
       FontUrl=https://github.com/NixOS/nixpkgs

     

       23
       23
       +
       MimeUrl=https://github.com/NixOS/nixpkgs

     

       24
       24
       +
             '';

     

       25
       25
       +
       

     

       26
       26
       +
       in

     

       27
       27
       +
       

     

       28
       28
       +
       {

     

       29
       29
       +
       

     

       30
       30
       +
         options = {

     

       31
       31
       +
       

     

       32
       32
       +
           services.packagekit = {

     

       33
       33
       +
             enable = mkEnableOption

     

       34
       34
       +
               ''

     

       35
       35
       +
                 PackageKit provides a cross-platform D-Bus abstraction layer for

     

       36
       36
       +
                 installing software. Software utilizing PackageKit can install

     

       37
       37
       +
                 software regardless of the package manager.

     

       38
       38
       +
               '';

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       41
       41
       +
         };

     

       42
       42
       +
       

     

       43
       43
       +
         config = mkIf cfg.enable {

     

       44
       44
       +
       

     

       45
       45
       +
           services.dbus.packages = [ pkgs.packagekit ];

     

       46
       46
       +
       

     

       47
       47
       +
           systemd.services.packagekit = {

     

       48
       48
       +
             description = "PackageKit Daemon";

     

       49
       49
       +
             wantedBy = [ "multi-user.target" ];

     

       50
       50
       +
             serviceConfig.ExecStart = "${pkgs.packagekit}/libexec/packagekitd";

     

       51
       51
       +
             serviceConfig.User = "root";

     

       52
       52
       +
             serviceConfig.BusName = "org.freedesktop.PackageKit";

     

       53
       53
       +
             serviceConfig.Type = "dbus";

     

       54
       54
       +
           };

     

       55
       55
       +
       

     

       56
       56
       +
           environment.etc."PackageKit/PackageKit.conf".text = packagekitConf;

     

       57
       57
       +
           environment.etc."PackageKit/Vendor.conf".text = vendorConf;

     

       58
       58
       +
       

     

       59
       59
       +
         };

     

       60
       60
       +
       

     

       61
       61
       +
       }

+44

nixos/modules/services/misc/sonarr.nix

···

       1
       1
       +
       { config, pkgs, lib, mono, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.sonarr;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           services.sonarr = {

     

       11
       11
       +
             enable = mkEnableOption "Sonarr";

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         config = mkIf cfg.enable {

     

       16
       16
       +
           systemd.services.sonarr = {

     

       17
       17
       +
             description = "Sonarr";

     

       18
       18
       +
             after = [ "network.target" ];

     

       19
       19
       +
             wantedBy = [ "multi-user.target" ];

     

       20
       20
       +
             preStart = ''

     

       21
       21
       +
               test -d /var/lib/sonarr/ || {

     

       22
       22
       +
                 echo "Creating sonarr data directory in /var/lib/sonarr/"

     

       23
       23
       +
                 mkdir -p /var/lib/sonarr/

     

       24
       24
       +
               }

     

       25
       25
       +
               chown -R sonarr /var/lib/sonarr/

     

       26
       26
       +
               chmod 0700 /var/lib/sonarr/

     

       27
       27
       +
             '';

     

       28
       28
       +
       

     

       29
       29
       +
             serviceConfig = {

     

       30
       30
       +
               Type = "simple";

     

       31
       31
       +
               User = "sonarr";

     

       32
       32
       +
               Group = "nogroup";

     

       33
       33
       +
               PermissionsStartOnly = "true";

     

       34
       34
       +
               ExecStart = "${pkgs.sonarr}/bin/NzbDrone --no-browser";

     

       35
       35
       +
               Restart = "on-failure";

     

       36
       36
       +
             };

     

       37
       37
       +
           };

     

       38
       38
       +
       

     

       39
       39
       +
           users.extraUsers.sonarr = {

     

       40
       40
       +
             home = "/var/lib/sonarr";

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+17

nixos/modules/services/monitoring/grafana.nix

···

       9
       9
        
       

     

       10
       10
        
         envOptions = {

     

       11
       11
        
           PATHS_DATA = cfg.dataDir;

     

       12
       12
       +
           PATHS_PLUGINS = "${cfg.dataDir}/plugins";

     

       12
       13
        
           PATHS_LOGS = "${cfg.dataDir}/log";

     

       13
       14
        
       

     

       14
       15
        
           SERVER_PROTOCOL = cfg.protocol;

     
···

       37
       38
        
           USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole;

     

       38
       39
        
       

     

       39
       40
        
           AUTH_ANONYMOUS_ENABLED = b2s cfg.auth.anonymous.enable;

     

       41
       41
       +
           AUTH_ANONYMOUS_ORG_NAME = cfg.auth.anonymous.org_name;

     

       42
       42
       +
           AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role;

     

       40
       43
        
       

     

       41
       44
        
           ANALYTICS_REPORTING_ENABLED = b2s cfg.analytics.reporting.enable;

     

       42
       45
        
         } // cfg.extraOptions;

     
···

       196
       199
        
               default = false;

     

       197
       200
        
               type = types.bool;

     

       198
       201
        
             };

     

       202
       202
       +
             org_name = mkOption {

     

       203
       203
       +
               description = "Which organization to allow anonymous access to";

     

       204
       204
       +
               default = "Main Org.";

     

       205
       205
       +
               type = types.str;

     

       206
       206
       +
             };

     

       207
       207
       +
             org_role = mkOption {

     

       208
       208
       +
               description = "Which role anonymous users have in the organization";

     

       209
       209
       +
               default = "Viewer";

     

       210
       210
       +
               type = types.str;

     

       211
       211
       +
             };

     

       212
       212
       +
       

     

       199
       213
        
           };

     

       200
       214
        
       

     

       201
       215
        
           analytics.reporting = {

     
···

       222
       236
        
             "Grafana passwords will be stored as plaintext in the Nix store!"

     

       223
       237
        
           ];

     

       224
       238
        
       

     

       239
       239
       +
           environment.systemPackages = [ cfg.package ];

     

       240
       240
       +
       

     

       225
       241
        
           systemd.services.grafana = {

     

       226
       242
        
             description = "Grafana Service Daemon";

     

       227
       243
        
             wantedBy = ["multi-user.target"];

     
···

       234
       250
        
             };

     

       235
       251
        
             preStart = ''

     

       236
       252
        
               ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir}

     

       253
       253
       +
               ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir}

     

       237
       254
        
             '';

     

       238
       255
        
           };

     

       239
       256

+80

nixos/modules/services/monitoring/sysstat.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       with lib;

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.sysstat;

     

       5
       5
       +
       in {

     

       6
       6
       +
         options = {

     

       7
       7
       +
           services.sysstat = {

     

       8
       8
       +
             enable = mkOption {

     

       9
       9
       +
               type = types.bool;

     

       10
       10
       +
               default = false;

     

       11
       11
       +
               description = ''

     

       12
       12
       +
                 Whether to enable sar system activity collection.

     

       13
       13
       +
               '';

     

       14
       14
       +
             };

     

       15
       15
       +
       

     

       16
       16
       +
             collect-frequency = mkOption {

     

       17
       17
       +
               default = "*:00/10";

     

       18
       18
       +
               description = ''

     

       19
       19
       +
                 OnCalendar specification for sysstat-collect

     

       20
       20
       +
               '';

     

       21
       21
       +
             };

     

       22
       22
       +
       

     

       23
       23
       +
             collect-args = mkOption {

     

       24
       24
       +
               default = "1 1";

     

       25
       25
       +
               description = ''

     

       26
       26
       +
                 Arguments to pass sa1 when collecting statistics

     

       27
       27
       +
               '';

     

       28
       28
       +
             };

     

       29
       29
       +
           };

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         config = mkIf cfg.enable {

     

       33
       33
       +
           systemd.services.sysstat = {

     

       34
       34
       +
             description = "Resets System Activity Logs";

     

       35
       35
       +
             wantedBy = [ "multi-user.target" ];

     

       36
       36
       +
             preStart = "test -d /var/log/sa || mkdir -p /var/log/sa";

     

       37
       37
       +
       

     

       38
       38
       +
             serviceConfig = {

     

       39
       39
       +
               User = "root";

     

       40
       40
       +
               RemainAfterExit = true;

     

       41
       41
       +
               Type = "oneshot";

     

       42
       42
       +
               ExecStart = "${pkgs.sysstat}/lib/sa/sa1 --boot";

     

       43
       43
       +
             };

     

       44
       44
       +
           };

     

       45
       45
       +
       

     

       46
       46
       +
           systemd.services.sysstat-collect = {

     

       47
       47
       +
             description = "system activity accounting tool";

     

       48
       48
       +
             unitConfig.Documentation = "man:sa1(8)";

     

       49
       49
       +
       

     

       50
       50
       +
             serviceConfig = {

     

       51
       51
       +
               Type = "oneshot";

     

       52
       52
       +
               User = "root";

     

       53
       53
       +
               ExecStart = "${pkgs.sysstat}/lib/sa/sa1 ${cfg.collect-args}";

     

       54
       54
       +
             };

     

       55
       55
       +
           };

     

       56
       56
       +
       

     

       57
       57
       +
           systemd.timers.sysstat-collect = {

     

       58
       58
       +
             description = "Run system activity accounting tool on a regular basis";

     

       59
       59
       +
             wantedBy = [ "timers.target" ];

     

       60
       60
       +
             timerConfig.OnCalendar = cfg.collect-frequency;

     

       61
       61
       +
           };

     

       62
       62
       +
       

     

       63
       63
       +
           systemd.services.sysstat-summary = {

     

       64
       64
       +
             description = "Generate a daily summary of process accounting";

     

       65
       65
       +
             unitConfig.Documentation = "man:sa2(8)";

     

       66
       66
       +
       

     

       67
       67
       +
             serviceConfig = {

     

       68
       68
       +
               Type = "oneshot";

     

       69
       69
       +
               User = "root";

     

       70
       70
       +
               ExecStart = "${pkgs.sysstat}/lib/sa/sa2 -A";

     

       71
       71
       +
             };

     

       72
       72
       +
           };

     

       73
       73
       +
       

     

       74
       74
       +
           systemd.timers.sysstat-summary = {

     

       75
       75
       +
             description = "Generate summary of yesterday's process accounting";

     

       76
       76
       +
             wantedBy = [ "timers.target" ];

     

       77
       77
       +
             timerConfig.OnCalendar = "00:07:00";

     

       78
       78
       +
           };

     

       79
       79
       +
         };

     

       80
       80
       +
       }

+225

nixos/modules/services/x11/compton.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       with builtins;

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
       

     

       8
       8
       +
         cfg = config.services.compton;

     

       9
       9
       +
       

     

       10
       10
       +
         configFile = pkgs.writeText "compton.conf"

     

       11
       11
       +
           (optionalString cfg.fade ''

     

       12
       12
       +
             # fading

     

       13
       13
       +
             fading = true;

     

       14
       14
       +
             fade-delta    = ${toString cfg.fadeDelta};

     

       15
       15
       +
             fade-in-step  = ${elemAt cfg.fadeSteps 0};

     

       16
       16
       +
             fade-out-step = ${elemAt cfg.fadeSteps 1};

     

       17
       17
       +
             fade-exclude  = ${toJSON cfg.fadeExclude};

     

       18
       18
       +
           '' + 

     

       19
       19
       +
           optionalString cfg.shadow ''

     

       20
       20
       +
       

     

       21
       21
       +
             # shadows

     

       22
       22
       +
             shadow = true;

     

       23
       23
       +
             shadow-offset-x = ${toString (elemAt cfg.shadowOffsets 0)};

     

       24
       24
       +
             shadow-offset-y = ${toString (elemAt cfg.shadowOffsets 1)};

     

       25
       25
       +
             shadow-opacity  = ${cfg.shadowOpacity};

     

       26
       26
       +
             shadow-exclude  = ${toJSON cfg.shadowExclude};

     

       27
       27
       +
           '' + ''

     

       28
       28
       +
       

     

       29
       29
       +
             # opacity

     

       30
       30
       +
             active-opacity   = ${cfg.activeOpacity};

     

       31
       31
       +
             inactive-opacity = ${cfg.inactiveOpacity};

     

       32
       32
       +
             menu-opacity     = ${cfg.menuOpacity};

     

       33
       33
       +
             

     

       34
       34
       +
             # other options

     

       35
       35
       +
             backend = ${toJSON cfg.backend};

     

       36
       36
       +
             vsync = ${toJSON cfg.vSync};

     

       37
       37
       +
             refresh-rate = ${toString cfg.refreshRate};

     

       38
       38
       +
           '' + cfg.extraOptions);

     

       39
       39
       +
       

     

       40
       40
       +
       in {

     

       41
       41
       +
       

     

       42
       42
       +
         options.services.compton = {

     

       43
       43
       +
           enable = mkOption {

     

       44
       44
       +
             type = types.bool;

     

       45
       45
       +
             default = false;

     

       46
       46
       +
             example = true;

     

       47
       47
       +
             description = ''

     

       48
       48
       +
               Whether of not to enable Compton as the X.org composite manager.

     

       49
       49
       +
             '';

     

       50
       50
       +
           };

     

       51
       51
       +
       

     

       52
       52
       +
           fade = mkOption {

     

       53
       53
       +
             type = types.bool;

     

       54
       54
       +
             default = false;

     

       55
       55
       +
             example = true;

     

       56
       56
       +
             description = ''

     

       57
       57
       +
               Fade windows in and out.

     

       58
       58
       +
             '';

     

       59
       59
       +
           };

     

       60
       60
       +
       

     

       61
       61
       +
           fadeDelta = mkOption {

     

       62
       62
       +
             type = types.int;

     

       63
       63
       +
             default = 10;

     

       64
       64
       +
             example = 5;

     

       65
       65
       +
             description = ''

     

       66
       66
       +
               Time between fade animation step (in ms).

     

       67
       67
       +
             '';

     

       68
       68
       +
           };

     

       69
       69
       +
       

     

       70
       70
       +
           fadeSteps = mkOption {

     

       71
       71
       +
             type = types.listOf types.str;

     

       72
       72
       +
             default = [ "0.028" "0.03" ];

     

       73
       73
       +
             example = [ "0.04" "0.04" ];

     

       74
       74
       +
             description = ''

     

       75
       75
       +
               Opacity change between fade steps (in and out).

     

       76
       76
       +
             '';

     

       77
       77
       +
           };

     

       78
       78
       +
       

     

       79
       79
       +
           fadeExclude = mkOption {

     

       80
       80
       +
             type = types.listOf types.str;

     

       81
       81
       +
             default = [];

     

       82
       82
       +
             example = [

     

       83
       83
       +
               "window_type *= 'menu'"

     

       84
       84
       +
               "name ~= 'Firefox$'"

     

       85
       85
       +
               "focused = 1" 

     

       86
       86
       +
             ];

     

       87
       87
       +
             description = ''

     

       88
       88
       +
               List of condition of windows that should have no shadow.

     

       89
       89
       +
               See <literal>compton(1)</literal> man page for more examples.

     

       90
       90
       +
             '';

     

       91
       91
       +
           };

     

       92
       92
       +
       

     

       93
       93
       +
           shadow = mkOption {

     

       94
       94
       +
             type = types.bool;

     

       95
       95
       +
             default = false;

     

       96
       96
       +
             example = true;

     

       97
       97
       +
             description = ''

     

       98
       98
       +
               Draw window shadows.

     

       99
       99
       +
             '';

     

       100
       100
       +
           };

     

       101
       101
       +
       

     

       102
       102
       +
           shadowOffsets = mkOption {

     

       103
       103
       +
             type = types.listOf types.int;

     

       104
       104
       +
             default = [ (-15) (-15) ];

     

       105
       105
       +
             example = [ (-10) (-15) ];

     

       106
       106
       +
             description = ''

     

       107
       107
       +
               Left and right offset for shadows (in pixels).

     

       108
       108
       +
             '';

     

       109
       109
       +
           };

     

       110
       110
       +
       

     

       111
       111
       +
           shadowOpacity = mkOption {

     

       112
       112
       +
             type = types.str;

     

       113
       113
       +
             default = "0.75";

     

       114
       114
       +
             example = "0.8";

     

       115
       115
       +
             description = ''

     

       116
       116
       +
               Window shadows opacity (number in range 0 - 1).

     

       117
       117
       +
             '';

     

       118
       118
       +
           };

     

       119
       119
       +
       

     

       120
       120
       +
           shadowExclude = mkOption {

     

       121
       121
       +
             type = types.listOf types.str;

     

       122
       122
       +
             default = [];

     

       123
       123
       +
             example = [

     

       124
       124
       +
               "window_type *= 'menu'"

     

       125
       125
       +
               "name ~= 'Firefox$'"

     

       126
       126
       +
               "focused = 1" 

     

       127
       127
       +
             ];

     

       128
       128
       +
             description = ''

     

       129
       129
       +
               List of condition of windows that should have no shadow.

     

       130
       130
       +
               See <literal>compton(1)</literal> man page for more examples.

     

       131
       131
       +
             '';

     

       132
       132
       +
           };

     

       133
       133
       +
       

     

       134
       134
       +
           activeOpacity = mkOption {

     

       135
       135
       +
             type = types.str;

     

       136
       136
       +
             default = "1.0";

     

       137
       137
       +
             example = "0.8";

     

       138
       138
       +
             description = ''

     

       139
       139
       +
               Opacity of active windows.

     

       140
       140
       +
             '';

     

       141
       141
       +
           };

     

       142
       142
       +
       

     

       143
       143
       +
           inactiveOpacity = mkOption {

     

       144
       144
       +
             type = types.str;

     

       145
       145
       +
             default = "1.0";

     

       146
       146
       +
             example = "0.8";

     

       147
       147
       +
             description = ''

     

       148
       148
       +
               Opacity of inactive windows.

     

       149
       149
       +
             '';

     

       150
       150
       +
           };

     

       151
       151
       +
       

     

       152
       152
       +
           menuOpacity = mkOption {

     

       153
       153
       +
             type = types.str;

     

       154
       154
       +
             default = "1.0";

     

       155
       155
       +
             example = "0.8";

     

       156
       156
       +
             description = ''

     

       157
       157
       +
               Opacity of dropdown and popup menu.

     

       158
       158
       +
             '';

     

       159
       159
       +
           };

     

       160
       160
       +
       

     

       161
       161
       +
           backend = mkOption {

     

       162
       162
       +
             type = types.str;

     

       163
       163
       +
             default = "glx";

     

       164
       164
       +
             description = ''

     

       165
       165
       +
               Backend to use: <literal>glx</literal> or <literal>xrender</literal>.

     

       166
       166
       +
             '';

     

       167
       167
       +
           };

     

       168
       168
       +
       

     

       169
       169
       +
           vSync = mkOption {

     

       170
       170
       +
            type = types.str;

     

       171
       171
       +
            default = "none";

     

       172
       172
       +
            example = "opengl-swc";

     

       173
       173
       +
            description = ''

     

       174
       174
       +
              Enable vertical synchronization using the specified method.

     

       175
       175
       +
              See <literal>compton(1)</literal> man page available methods.

     

       176
       176
       +
            '';

     

       177
       177
       +
           };

     

       178
       178
       +
       

     

       179
       179
       +
           refreshRate = mkOption {

     

       180
       180
       +
             type = types.int;

     

       181
       181
       +
             default = 0;

     

       182
       182
       +
             example = 60;

     

       183
       183
       +
             description = ''

     

       184
       184
       +
              Screen refresh rate (0 = automatically detect).

     

       185
       185
       +
             '';

     

       186
       186
       +
           };

     

       187
       187
       +
       

     

       188
       188
       +
           package = mkOption {

     

       189
       189
       +
             type = types.package;

     

       190
       190
       +
             default = pkgs.compton;

     

       191
       191
       +
             example = literalExample "pkgs.compton";

     

       192
       192
       +
             description = ''

     

       193
       193
       +
               Compton derivation to use.

     

       194
       194
       +
             '';

     

       195
       195
       +
           };

     

       196
       196
       +
       

     

       197
       197
       +
           extraOptions = mkOption {

     

       198
       198
       +
             type = types.str;

     

       199
       199
       +
             default = "";

     

       200
       200
       +
             example = ''

     

       201
       201
       +
               unredir-if-possible = true;

     

       202
       202
       +
               dbe = true;

     

       203
       203
       +
             '';

     

       204
       204
       +
             description = ''

     

       205
       205
       +
               Additional Compton configuration.

     

       206
       206
       +
             '';

     

       207
       207
       +
           };

     

       208
       208
       +
         };

     

       209
       209
       +
       

     

       210
       210
       +
         config = mkIf cfg.enable {

     

       211
       211
       +
           systemd.user.services.compton = {

     

       212
       212
       +
             description = "Compton composite manager";

     

       213
       213
       +
             wantedBy = [ "default.target" ];

     

       214
       214
       +
             serviceConfig = {

     

       215
       215
       +
               ExecStart = "${cfg.package}/bin/compton --config ${configFile}";

     

       216
       216
       +
               RestartSec = 3;

     

       217
       217
       +
               Restart = "always";

     

       218
       218
       +
             };

     

       219
       219
       +
             environment.DISPLAY = ":0";

     

       220
       220
       +
           };

     

       221
       221
       +
       

     

       222
       222
       +
           environment.systemPackages = [ cfg.package ];

     

       223
       223
       +
         };

     

       224
       224
       +
       

     

       225
       225
       +
       }

nixos/modules/services/x11/desktop-managers/gnome3.nix

···

       121
       121
        
           services.upower.enable = config.powerManagement.enable;

     

       122
       122
        
           services.dbus.packages = mkIf config.services.printing.enable [ pkgs.system-config-printer ];

     

       123
       123
        
           services.colord.enable = mkDefault true;

     

       124
       124
       +
           services.packagekit.enable = mkDefault true;

     

       124
       125
        
           hardware.bluetooth.enable = mkDefault true;

     

       125
       126
        
           services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

     

       126
       127

+47 -3

nixos/modules/services/x11/desktop-managers/kde5.nix

···

       50
       50
        
           security.setuidOwners = [

     

       51
       51
        
             {

     

       52
       52
        
               program = "kcheckpass";

     

       53
       53
       -
               source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass";

     

       53
       53
       +
               source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";

     

       54
       54
        
               owner = "root";

     

       55
       55
        
               setuid = true;

     

       56
       56
        
             }

     

       57
       57
        
             {

     

       58
       58
       -
               program = "start_kdeinit_wrapper";

     

       59
       59
       -
               source = "${kde5.plasma-workspace}/lib/libexec/kf5/start_kdeinit_wrapper";

     

       58
       58
       +
               program = "start_kdeinit";

     

       59
       59
       +
               source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";

     

       60
       60
        
               owner = "root";

     

       61
       61
        
               setuid = true;

     

       62
       62
        
             }

     
···

       65
       65
        
           environment.systemPackages =

     

       66
       66
        
             [

     

       67
       67
        
               kde5.frameworkintegration

     

       68
       68
       +
               kde5.kactivities

     

       69
       69
       +
               kde5.kauth

     

       70
       70
       +
               kde5.kcmutils

     

       71
       71
       +
               kde5.kconfig

     

       72
       72
       +
               kde5.kconfigwidgets

     

       73
       73
       +
               kde5.kcoreaddons

     

       74
       74
       +
               kde5.kdbusaddons

     

       75
       75
       +
               kde5.kdeclarative

     

       76
       76
       +
               kde5.kded

     

       77
       77
       +
               kde5.kdesu

     

       78
       78
       +
               kde5.kdnssd

     

       79
       79
       +
               kde5.kemoticons

     

       80
       80
       +
               kde5.kfilemetadata

     

       81
       81
       +
               kde5.kglobalaccel

     

       82
       82
       +
               kde5.kguiaddons

     

       83
       83
       +
               kde5.kiconthemes

     

       84
       84
       +
               kde5.kidletime

     

       85
       85
       +
               kde5.kimageformats

     

       68
       86
        
               kde5.kinit

     

       87
       87
       +
               kde5.kio

     

       88
       88
       +
               kde5.kjobwidgets

     

       89
       89
       +
               kde5.knewstuff

     

       90
       90
       +
               kde5.knotifications

     

       91
       91
       +
               kde5.knotifyconfig

     

       92
       92
       +
               kde5.kpackage

     

       93
       93
       +
               kde5.kparts

     

       94
       94
       +
               kde5.kpeople

     

       95
       95
       +
               kde5.krunner

     

       96
       96
       +
               kde5.kservice

     

       97
       97
       +
               kde5.ktextwidgets

     

       98
       98
       +
               kde5.kwallet

     

       99
       99
       +
               kde5.kwayland

     

       100
       100
       +
               kde5.kwidgetsaddons

     

       101
       101
       +
               kde5.kxmlgui

     

       102
       102
       +
               kde5.kxmlrpcclient

     

       103
       103
       +
               kde5.plasma-framework

     

       104
       104
       +
               kde5.solid

     

       105
       105
       +
               kde5.sonnet

     

       106
       106
       +
               kde5.threadweaver

     

       69
       107
        
       

     

       70
       108
        
               kde5.breeze

     

       109
       109
       +
               kde5.kactivitymanagerd

     

       71
       110
        
               kde5.kde-cli-tools

     

       111
       111
       +
               kde5.kdecoration

     

       72
       112
        
               kde5.kdeplasma-addons

     

       73
       113
        
               kde5.kgamma5

     

       74
       114
        
               kde5.khelpcenter

     
···

       76
       116
        
               kde5.kinfocenter

     

       77
       117
        
               kde5.kmenuedit

     

       78
       118
        
               kde5.kscreen

     

       119
       119
       +
               kde5.kscreenlocker

     

       79
       120
        
               kde5.ksysguard

     

       80
       121
        
               kde5.kwayland

     

       81
       122
        
               kde5.kwin

     

       82
       123
        
               kde5.kwrited

     

       124
       124
       +
               kde5.libkscreen

     

       125
       125
       +
               kde5.libksysguard

     

       83
       126
        
               kde5.milou

     

       84
       127
        
               kde5.oxygen

     

       128
       128
       +
               kde5.plasma-integration

     

       85
       129
        
               kde5.polkit-kde-agent

     

       86
       130
        
               kde5.systemsettings

     

       87
       131

+1 -1

nixos/modules/services/x11/display-managers/default.nix

···

       34
       34
        
       

     

       35
       35
        
             ${optionalString cfg.displayManager.logToJournal ''

     

       36
       36
        
               if [ -z "$_DID_SYSTEMD_CAT" ]; then

     

       37
       37
       -
                 _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$1"

     

       37
       37
       +
                 _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@"

     

       38
       38
        
               fi

     

       39
       39
        
             ''}

     

       40
       40

+96 -4

nixos/modules/services/x11/display-managers/lightdm.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
       

     

       7
       7
       -
         dmcfg = config.services.xserver.displayManager;

     

       7
       7
       +
         xcfg = config.services.xserver;

     

       8
       8
       +
         dmcfg = xcfg.displayManager;

     

       8
       9
        
         xEnv = config.systemd.services."display-manager".environment;

     

       9
       10
        
         cfg = dmcfg.lightdm;

     

       10
       11
        
       

     
···

       36
       37
        
         lightdmConf = writeText "lightdm.conf"

     

       37
       38
        
           ''

     

       38
       39
        
             [LightDM]

     

       39
       39
       -
             greeter-user = ${config.users.extraUsers.lightdm.name}

     

       40
       40
       -
             greeters-directory = ${cfg.greeter.package}

     

       40
       40
       +
             ${optionalString cfg.greeter.enable ''

     

       41
       41
       +
               greeter-user = ${config.users.extraUsers.lightdm.name}

     

       42
       42
       +
               greeters-directory = ${cfg.greeter.package}

     

       43
       43
       +
             ''}

     

       41
       44
        
             sessions-directory = ${dmcfg.session.desktops}

     

       42
       45
        
       

     

       43
       46
        
             [Seat:*]

     

       44
       47
        
             xserver-command = ${xserverWrapper}

     

       45
       48
        
             session-wrapper = ${dmcfg.session.script}

     

       46
       46
       -
             greeter-session = ${cfg.greeter.name}

     

       49
       49
       +
             ${optionalString cfg.greeter.enable ''

     

       50
       50
       +
               greeter-session = ${cfg.greeter.name}

     

       51
       51
       +
             ''}

     

       52
       52
       +
             ${optionalString cfg.autoLogin.enable ''

     

       53
       53
       +
               autologin-user = ${cfg.autoLogin.user}

     

       54
       54
       +
               autologin-user-timeout = ${toString cfg.autoLogin.timeout}

     

       55
       55
       +
               autologin-session = ${defaultSessionName}

     

       56
       56
       +
             ''}

     

       47
       57
        
             ${cfg.extraSeatDefaults}

     

       48
       58
        
           '';

     

       59
       59
       +
       

     

       60
       60
       +
         defaultSessionName =

     

       61
       61
       +
           let

     

       62
       62
       +
             dm = xcfg.desktopManager.default;

     

       63
       63
       +
             wm = xcfg.windowManager.default;

     

       64
       64
       +
           in dm + optionalString (wm != "none") (" + " + wm);

     

       49
       65
        
       in

     

       50
       66
        
       {

     

       51
       67
        
         # Note: the order in which lightdm greeter modules are imported

     
···

       68
       84
        
             };

     

       69
       85
        
       

     

       70
       86
        
             greeter =  {

     

       87
       87
       +
               enable = mkOption {

     

       88
       88
       +
                 type = types.bool;

     

       89
       89
       +
                 default = true;

     

       90
       90
       +
                 description = ''

     

       91
       91
       +
                   If set to false, run lightdm in greeterless mode. This only works if autologin

     

       92
       92
       +
                   is enabled and autoLogin.timeout is zero.

     

       93
       93
       +
                 '';

     

       94
       94
       +
               };

     

       71
       95
        
               package = mkOption {

     

       72
       96
        
                 type = types.package;

     

       73
       97
        
                 description = ''

     
···

       102
       126
        
               description = "Extra lines to append to SeatDefaults section.";

     

       103
       127
        
             };

     

       104
       128
        
       

     

       129
       129
       +
             autoLogin = mkOption {

     

       130
       130
       +
               default = {};

     

       131
       131
       +
               description = ''

     

       132
       132
       +
                 Configuration for automatic login.

     

       133
       133
       +
               '';

     

       134
       134
       +
       

     

       135
       135
       +
               type = types.submodule {

     

       136
       136
       +
                 options = {

     

       137
       137
       +
                   enable = mkOption {

     

       138
       138
       +
                     type = types.bool;

     

       139
       139
       +
                     default = false;

     

       140
       140
       +
                     description = ''

     

       141
       141
       +
                       Automatically log in as the specified <option>autoLogin.user</option>.

     

       142
       142
       +
                     '';

     

       143
       143
       +
                   };

     

       144
       144
       +
       

     

       145
       145
       +
                   user = mkOption {

     

       146
       146
       +
                     type = types.nullOr types.str;

     

       147
       147
       +
                     default = null;

     

       148
       148
       +
                     description = ''

     

       149
       149
       +
                       User to be used for the automatic login.

     

       150
       150
       +
                     '';

     

       151
       151
       +
                   };

     

       152
       152
       +
       

     

       153
       153
       +
                   timeout = mkOption {

     

       154
       154
       +
                     type = types.int;

     

       155
       155
       +
                     default = 0;

     

       156
       156
       +
                     description = ''

     

       157
       157
       +
                       Show the greeter for this many seconds before automatic login occurs.

     

       158
       158
       +
                     '';

     

       159
       159
       +
                   };

     

       160
       160
       +
                 };

     

       161
       161
       +
               };

     

       162
       162
       +
             };

     

       163
       163
       +
       

     

       105
       164
        
           };

     

       106
       165
        
         };

     

       107
       166
        
       

     

       108
       167
        
         config = mkIf cfg.enable {

     

       168
       168
       +
       

     

       169
       169
       +
           assertions = [

     

       170
       170
       +
             { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null;

     

       171
       171
       +
               message = ''

     

       172
       172
       +
                 LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set

     

       173
       173
       +
               '';

     

       174
       174
       +
             }

     

       175
       175
       +
             { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names;

     

       176
       176
       +
               message = ''

     

       177
       177
       +
                 LightDM auto-login requires that services.xserver.desktopManager.default and

     

       178
       178
       +
                 services.xserver.windowMananger.default are set to valid values. The current

     

       179
       179
       +
                 default session: ${defaultSessionName} is not valid.

     

       180
       180
       +
               '';

     

       181
       181
       +
             }

     

       182
       182
       +
             { assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0);

     

       183
       183
       +
               message = ''

     

       184
       184
       +
                 LightDM can only run without greeter if automatic login is enabled and the timeout for it

     

       185
       185
       +
                 is set to zero.

     

       186
       186
       +
               '';

     

       187
       187
       +
             }

     

       188
       188
       +
           ];

     

       189
       189
       +
       

     

       109
       190
        
           services.xserver.displayManager.slim.enable = false;

     

       110
       191
        
       

     

       111
       192
        
           services.xserver.displayManager.job = {

     
···

       144
       225
        
               session  optional ${pkgs.systemd}/lib/security/pam_systemd.so

     

       145
       226
        
             '';

     

       146
       227
        
           };

     

       228
       228
       +
           security.pam.services.lightdm-autologin.text = ''

     

       229
       229
       +
               auth     requisite pam_nologin.so

     

       230
       230
       +
               auth     required  pam_succeed_if.so uid >= 1000 quiet

     

       231
       231
       +
               auth     required  pam_permit.so

     

       232
       232
       +
       

     

       233
       233
       +
               account  include   lightdm

     

       234
       234
       +
       

     

       235
       235
       +
               password include   lightdm

     

       236
       236
       +
       

     

       237
       237
       +
               session  include   lightdm

     

       238
       238
       +
           '';

     

       147
       239
        
       

     

       148
       240
        
           users.extraUsers.lightdm = {

     

       149
       241
        
             createHome = true;

+5 -4

nixos/modules/services/x11/display-managers/sddm.nix

···

       27
       27
        
           ${cfg.stopScript}

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       +
       

     

       30
       31
        
         cfgFile = pkgs.writeText "sddm.conf" ''

     

       31
       32
        
           [General]

     

       32
       33
        
           HaltCommand=${pkgs.systemd}/bin/systemctl poweroff

     
···

       154
       155
        
                     type = types.bool;

     

       155
       156
        
                     default = false;

     

       156
       157
        
                     description = ''

     

       157
       157
       -
                       Automatically log in as the sepecified <option>autoLogin.user</option>.

     

       158
       158
       +
                       Automatically log in as <option>autoLogin.user</option>.

     

       158
       159
        
                     '';

     

       159
       160
        
                   };

     

       160
       161
        
       

     
···

       162
       163
        
                     type = types.nullOr types.str;

     

       163
       164
        
                     default = null;

     

       164
       165
        
                     description = ''

     

       165
       165
       -
                       User to be used for the autologin.

     

       166
       166
       +
                       User to be used for the automatic login.

     

       166
       167
        
                     '';

     

       167
       168
        
                   };

     

       168
       169
        
       

     
···

       170
       171
        
                     type = types.bool;

     

       171
       172
        
                     default = false;

     

       172
       173
        
                     description = ''

     

       173
       173
       -
                       If true automatic login will kick in again on session exit, otherwise it

     

       174
       174
       -
                       will work only the first time.

     

       174
       174
       +
                       If true automatic login will kick in again on session exit (logout), otherwise it

     

       175
       175
       +
                       will only log in automatically when the display-manager is started.

     

       175
       176
        
                     '';

     

       176
       177
        
                   };

     

       177
       178
        
                 };

nixos/modules/services/x11/hardware/libinput.nix

···

       198
       198
        
       

     

       199
       199
        
           environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ];

     

       200
       200
        
       

     

       201
       201
       +
           services.udev.packages = [ pkgs.libinput ];

     

       202
       202
       +
       

     

       201
       203
        
           services.xserver.config =

     

       202
       204
        
             ''

     

       203
       205
        
               # Automatically enable the libinput driver for all touchpads.

+1 -1

nixos/modules/services/x11/redshift.nix

···

       108
       108
        
               RestartSec = 3;

     

       109
       109
        
               Restart = "always";

     

       110
       110
        
             };

     

       111
       111
       -
             environment = { DISPLAY = ":0"; };

     

       111
       111
       +
             environment = { DISPLAY = ":${toString config.services.xserver.display}"; };

     

       112
       112
        
           };

     

       113
       113
        
         };

     

       114
       114

+1 -7

nixos/modules/services/x11/unclutter.nix

···

       39
       39
        
             default = 1;

     

       40
       40
        
           };

     

       41
       41
        
       

     

       42
       42
       -
           displayName = mkOption {

     

       43
       43
       -
             description = "Name of the X11 display";

     

       44
       44
       -
             type = types.str;

     

       45
       45
       -
             default = ":0";

     

       46
       46
       -
           };

     

       47
       47
       -
       

     

       48
       42
        
           excluded = mkOption {

     

       49
       43
        
             description = "Names of windows where unclutter should not apply";

     

       50
       44
        
             type = types.listOf types.str;

     
···

       67
       61
        
             serviceConfig.ExecStart = ''

     

       68
       62
        
               ${cfg.package}/bin/unclutter \

     

       69
       63
        
                 -idle ${toString cfg.timeout} \

     

       70
       70
       -
                 -display ${cfg.displayName} \

     

       64
       64
       +
                 -display :${toString config.services.xserver.display} \

     

       71
       65
        
                 -jitter ${toString (cfg.threeshold - 1)} \

     

       72
       66
        
                 ${optionalString cfg.keystroke "-keystroke"} \

     

       73
       67
        
                 ${concatMapStrings (x: " -"+x) cfg.extraOptions} \

nixos/modules/services/x11/window-managers/default.nix

···

       19
       19
        
           ./jwm.nix

     

       20
       20
        
           ./metacity.nix

     

       21
       21
        
           ./openbox.nix

     

       22
       22
       +
           ./pekwm.nix

     

       22
       23
        
           ./notion.nix

     

       23
       24
        
           ./ratpoison.nix

     

       24
       25
        
           ./sawfish.nix

+25

nixos/modules/services/x11/window-managers/pekwm.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.xserver.windowManager.pekwm;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         ###### interface

     

       10
       10
       +
         options = {

     

       11
       11
       +
           services.xserver.windowManager.pekwm.enable = mkEnableOption "pekwm";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         ###### implementation

     

       15
       15
       +
         config = mkIf cfg.enable {

     

       16
       16
       +
           services.xserver.windowManager.session = singleton {

     

       17
       17
       +
             name = "pekwm";

     

       18
       18
       +
             start = ''

     

       19
       19
       +
               ${pkgs.pekwm}/bin/pekwm &

     

       20
       20
       +
               waitPID=$!

     

       21
       21
       +
             '';

     

       22
       22
       +
           };

     

       23
       23
       +
           environment.systemPackages = [ pkgs.pekwm ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+4 -22

nixos/modules/system/boot/luksroot.nix

···

       36
       36
        
                 ${optionalString (header != null) "--header=${header}"} \

     

       37
       37
        
                 ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"} \

     

       38
       38
        
                 > /.luksopen_args

     

       39
       39
       -
               get_password "Enter LUKS Passphrase" cryptsetup-askpass

     

       39
       39
       +
               cryptsetup-askpass

     

       40
       40
        
               rm /.luksopen_args

     

       41
       41
        
           }

     

       42
       42
        
       

     
···

       78
       78
        
               for try in $(seq 3); do

     

       79
       79
        
       

     

       80
       80
        
                   ${optionalString yubikey.twoFactor ''

     

       81
       81
       -
                   k_user="$(get_password "Enter two-factor passphrase" cat)"

     

       81
       81
       +
                   echo -n "Enter two-factor passphrase: "

     

       82
       82
       +
                   read -s k_user

     

       83
       83
       +
                   echo

     

       82
       84
        
                   ''}

     

       83
       85
        
       

     

       84
       86
        
                   if [ ! -z "$k_user" ]; then

     
···

       459
       461
        
               $out/bin/ykinfo -V

     

       460
       462
        
               $out/bin/openssl-wrap version

     

       461
       463
        
             ''}

     

       462
       462
       -
           '';

     

       463
       463
       -
       

     

       464
       464
       -
           boot.initrd.preDeviceCommands = ''

     

       465
       465
       -
             get_password() {

     

       466
       466
       -
               local ret

     

       467
       467
       -
               local reply

     

       468
       468
       -
               local tty_stat

     

       469
       469
       -
       

     

       470
       470
       -
               tty_stat="$(stty -g)"

     

       471
       471
       -
               stty -echo

     

       472
       472
       -
               for i in `seq 1 3`; do

     

       473
       473
       -
                 echo -n "$1: "

     

       474
       474
       -
                 read reply

     

       475
       475
       -
                 echo "$reply" | "$2"

     

       476
       476
       -
                 if [ "$?" = "0" ]; then

     

       477
       477
       -
                   break

     

       478
       478
       -
                 fi

     

       479
       479
       -
               done

     

       480
       480
       -
               stty "$tty_stat"

     

       481
       481
       -
             }

     

       482
       464
        
           '';

     

       483
       465
        
       

     

       484
       466
        
           boot.initrd.preLVMCommands = concatStrings (mapAttrsToList openCommand preLVM);

+11 -1

nixos/modules/system/boot/plymouth.nix

···

       112
       112
        
             sed -i '/loginctl/d' $out/71-seat.rules

     

       113
       113
        
           '';

     

       114
       114
        
       

     

       115
       115
       +
           # We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen.

     

       115
       116
        
           boot.initrd.preLVMCommands = mkAfter ''

     

       116
       117
        
             mkdir -p /etc/plymouth

     

       117
       118
        
             ln -s ${configFile} /etc/plymouth/plymouthd.conf

     
···

       121
       122
        
             ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins

     

       122
       123
        
       

     

       123
       124
        
             plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session

     

       124
       124
       -
             plymouth --show-splash

     

       125
       125
       +
             plymouth show-splash

     

       126
       126
       +
           '';

     

       127
       127
       +
       

     

       128
       128
       +
           boot.initrd.postMountCommands = ''

     

       129
       129
       +
             plymouth update-root-fs --new-root-dir="$targetRoot"

     

       130
       130
       +
           '';

     

       131
       131
       +
       

     

       132
       132
       +
           # `mkBefore` to ensure that any custom prompts would be visible.

     

       133
       133
       +
           boot.initrd.preFailCommands = mkBefore ''

     

       134
       134
       +
             plymouth quit --wait

     

       125
       135
        
           '';

     

       126
       136
        
       

     

       127
       137
        
         };

+1 -2

nixos/modules/system/boot/stage-1-init.sh

···

       14
       14
        
       fail() {

     

       15
       15
        
           if [ -n "$panicOnFail" ]; then exit 1; fi

     

       16
       16
        
       

     

       17
       17
       -
           # If we have a splash screen started, quit it.

     

       18
       18
       -
           command -v plymouth >/dev/null 2>&1 && plymouth quit

     

       17
       17
       +
           @preFailCommands@

     

       19
       18
        
       

     

       20
       19
        
           # If starting stage 2 failed, allow the user to repair the problem

     

       21
       20
        
           # in an interactive shell.

+9 -1

nixos/modules/system/boot/stage-1.nix

···

       208
       208
        
           inherit (config.boot) resumeDevice devSize runSize;

     

       209
       209
        
       

     

       210
       210
        
           inherit (config.boot.initrd) checkJournalingFS

     

       211
       211
       -
             preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;

     

       211
       211
       +
             preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;

     

       212
       212
        
       

     

       213
       213
        
           resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")

     

       214
       214
        
                           (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);

     
···

       333
       333
        
             description = ''

     

       334
       334
        
               Shell commands to be executed immediately after the stage 1

     

       335
       335
        
               filesystems have been mounted.

     

       336
       336
       +
             '';

     

       337
       337
       +
           };

     

       338
       338
       +
       

     

       339
       339
       +
           boot.initrd.preFailCommands = mkOption {

     

       340
       340
       +
             default = "";

     

       341
       341
       +
             type = types.lines;

     

       342
       342
       +
             description = ''

     

       343
       343
       +
               Shell commands to be executed before the failure prompt is shown.

     

       336
       344
        
             '';

     

       337
       345
        
           };

     

       338
       346

+1 -1

nixos/modules/system/boot/systemd-lib.nix

···

       176
       176
        
             ${optionalString (type == "system") ''

     

       177
       177
        
               # Stupid misc. symlinks.

     

       178
       178
        
               ln -s ${cfg.defaultUnit} $out/default.target

     

       179
       179
       -
       

     

       179
       179
       +
               ln -s ${cfg.ctrlAltDelUnit} $out/ctrl-alt-del.target

     

       180
       180
        
               ln -s rescue.target $out/kbrequest.target

     

       181
       181
        
       

     

       182
       182
        
               mkdir -p $out/getty.target.wants/

+9 -2

nixos/modules/system/boot/systemd.nix

···

       120
       120
        
             "systemd-poweroff.service"

     

       121
       121
        
             "halt.target"

     

       122
       122
        
             "systemd-halt.service"

     

       123
       123
       -
             "ctrl-alt-del.target"

     

       124
       123
        
             "shutdown.target"

     

       125
       124
        
             "umount.target"

     

       126
       125
        
             "final.target"

     
···

       162
       161
        
             "systemd-hostnamed.service"

     

       163
       162
        
             "systemd-binfmt.service"

     

       164
       163
        
           ]

     

       165
       165
       -
       

     

       166
       164
        
           ++ cfg.additionalUpstreamSystemUnits;

     

       167
       165
        
       

     

       168
       166
        
         upstreamSystemWants =

     
···

       483
       481
        
             default = "multi-user.target";

     

       484
       482
        
             type = types.str;

     

       485
       483
        
             description = "Default unit started when the system boots.";

     

       484
       484
       +
           };

     

       485
       485
       +
       

     

       486
       486
       +
           systemd.ctrlAltDelUnit = mkOption {

     

       487
       487
       +
             default = "reboot.target";

     

       488
       488
       +
             type = types.str;

     

       489
       489
       +
             example = "poweroff.target";

     

       490
       490
       +
             description = ''

     

       491
       491
       +
               Target that should be started when Ctrl-Alt-Delete is pressed.

     

       492
       492
       +
             '';

     

       486
       493
        
           };

     

       487
       494
        
       

     

       488
       495
        
           systemd.globalEnvironment = mkOption {

+17 -1

nixos/modules/tasks/filesystems/zfs.nix

···

       270
       270
        
                     ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"

     

       271
       271
        
                   '';

     

       272
       272
        
                 };

     

       273
       273
       -
             in listToAttrs (map createImportService dataPools) // {

     

       273
       273
       +
       

     

       274
       274
       +
               # This forces a sync of any ZFS pools prior to poweroff, even if they're set

     

       275
       275
       +
               # to sync=disabled.

     

       276
       276
       +
               createSyncService = pool:

     

       277
       277
       +
                 nameValuePair "zfs-sync-${pool}" {

     

       278
       278
       +
                   description = "Sync ZFS pool \"${pool}\"";

     

       279
       279
       +
                   wantedBy = [ "shutdown.target" ];

     

       280
       280
       +
                   serviceConfig = {

     

       281
       281
       +
                     Type = "oneshot";

     

       282
       282
       +
                     RemainAfterExit = true;

     

       283
       283
       +
                   };

     

       284
       284
       +
                   script = ''

     

       285
       285
       +
                     ${zfsUserPkg}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"

     

       286
       286
       +
                   '';

     

       287
       287
       +
                 };

     

       288
       288
       +
       

     

       289
       289
       +
             in listToAttrs (map createImportService dataPools ++ map createSyncService allPools) // {

     

       274
       290
        
               "zfs-mount" = { after = [ "systemd-modules-load.service" ]; };

     

       275
       291
        
               "zfs-share" = { after = [ "systemd-modules-load.service" ]; };

     

       276
       292
        
               "zed" = { after = [ "systemd-modules-load.service" ]; };

+2 -18

nixos/modules/virtualisation/containers.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
       

     

       7
       7
       -
         nixos-container = pkgs.substituteAll {

     

       8
       8
       -
           name = "nixos-container";

     

       9
       9
       -
           dir = "bin";

     

       10
       10
       -
           isExecutable = true;

     

       11
       11
       -
           src = ./nixos-container.pl;

     

       12
       12
       -
           perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";

     

       13
       13
       -
           su = "${pkgs.shadow.su}/bin/su";

     

       14
       14
       -
           inherit (pkgs) utillinux;

     

       15
       15
       -
       

     

       16
       16
       -
           postInstall = ''

     

       17
       17
       -
             t=$out/etc/bash_completion.d

     

       18
       18
       -
             mkdir -p $t

     

       19
       19
       -
             cp ${./nixos-container-completion.sh} $t/nixos-container

     

       20
       20
       -
           '';

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       7
        
         # The container's init script, a small wrapper around the regular

     

       24
       8
        
         # NixOS stage-2 init script.

     

       25
       9
        
         containerInit = pkgs.writeScript "container-init"

     
···

       410
       394
        
               ExecReload = pkgs.writeScript "reload-container"

     

       411
       395
        
                 ''

     

       412
       396
        
                   #! ${pkgs.stdenv.shell} -e

     

       413
       413
       -
                   ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \

     

       397
       397
       +
                   ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \

     

       414
       398
        
                     bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"

     

       415
       399
        
                 '';

     

       416
       400
        
       

     
···

       498
       482
        
       

     

       499
       483
        
           networking.dhcpcd.denyInterfaces = [ "ve-*" ];

     

       500
       484
        
       

     

       501
       501
       -
           environment.systemPackages = [ nixos-container ];

     

       485
       485
       +
           environment.systemPackages = [ pkgs.nixos-container ];

     

       502
       486
        
         });

     

       503
       487
        
       }

nixos/modules/virtualisation/nixos-container-completion.sh pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh

nixos/modules/virtualisation/nixos-container.pl pkgs/tools/virtualization/nixos-container/nixos-container.pl

+3 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       62
       62
        
             idx=2

     

       63
       63
        
             extraDisks=""

     

       64
       64
        
             ${flip concatMapStrings cfg.emptyDiskImages (size: ''

     

       65
       65
       -
               ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"

     

       65
       65
       +
               if ! test -e "empty$idx.qcow2"; then

     

       66
       66
       +
                   ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"

     

       67
       67
       +
               fi

     

       66
       68
        
               extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report"

     

       67
       69
        
               idx=$((idx + 1))

     

       68
       70
        
             '')}

nixos/release.nix

···

       231
       231
        
         tests.gnome3 = callTest tests/gnome3.nix {};

     

       232
       232
        
         tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};

     

       233
       233
        
         tests.grsecurity = callTest tests/grsecurity.nix {};

     

       234
       234
       +
         tests.hibernate = callTest tests/hibernate.nix {};

     

       234
       235
        
         tests.i3wm = callTest tests/i3wm.nix {};

     

       235
       236
        
         tests.installer = callSubTests tests/installer.nix {};

     

       236
       237
        
         tests.influxdb = callTest tests/influxdb.nix {};

+42

nixos/tests/hibernate.nix

···

       1
       1
       +
       # Test whether hibernation from partition works.

     

       2
       2
       +
       

     

       3
       3
       +
       import ./make-test.nix (pkgs: {

     

       4
       4
       +
         name = "hibernate";

     

       5
       5
       +
       

     

       6
       6
       +
         nodes = {

     

       7
       7
       +
           machine = { config, lib, pkgs, ... }: with lib; {

     

       8
       8
       +
             virtualisation.emptyDiskImages = [ config.virtualisation.memorySize ];

     

       9
       9
       +
       

     

       10
       10
       +
             systemd.services.backdoor.conflicts = [ "sleep.target" ];

     

       11
       11
       +
       

     

       12
       12
       +
             swapDevices = mkOverride 0 [ { device = "/dev/vdb"; } ];

     

       13
       13
       +
       

     

       14
       14
       +
             networking.firewall.allowedTCPPorts = [ 4444 ];

     

       15
       15
       +
       

     

       16
       16
       +
             systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l -p 4444";

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
           probe = { config, lib, pkgs, ...}: {

     

       20
       20
       +
             environment.systemPackages = [ pkgs.netcat ];

     

       21
       21
       +
           };

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         # 9P doesn't support reconnection to virtio transport after a hibernation.

     

       25
       25
       +
         # Therefore, machine just hangs on any Nix store access.

     

       26
       26
       +
         # To work around it we run a daemon which listens to a TCP connection and

     

       27
       27
       +
         # try to connect to it as a test.

     

       28
       28
       +
       

     

       29
       29
       +
         testScript =

     

       30
       30
       +
           ''

     

       31
       31
       +
             $machine->waitForUnit("multi-user.target");

     

       32
       32
       +
             $machine->succeed("mkswap /dev/vdb");

     

       33
       33
       +
             $machine->succeed("swapon -a");

     

       34
       34
       +
             $machine->startJob("listener");

     

       35
       35
       +
             $machine->succeed("systemctl hibernate &");

     

       36
       36
       +
             $machine->waitForShutdown;

     

       37
       37
       +
             $machine->start;

     

       38
       38
       +
             $probe->waitForUnit("network.target");

     

       39
       39
       +
             $probe->waitUntilSucceeds("echo test | nc -c machine 4444");

     

       40
       40
       +
           '';

     

       41
       41
       +
       

     

       42
       42
       +
       })

nixos/tests/installer.nix

···

       210
       210
        
                       pkgs.nixos-artwork

     

       211
       211
        
                       pkgs.perlPackages.XMLLibXML

     

       212
       212
        
                       pkgs.perlPackages.ListCompare

     

       213
       213
       +
       

     

       214
       214
       +
                       # add curl so that rather than seeing the test attempt to download

     

       215
       215
       +
                       # curl's tarball, we see what it's trying to download

     

       216
       216
       +
                       pkgs.curl

     

       213
       217
        
                     ]

     

       214
       218
        
                     ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub

     

       215
       219
        
                     ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];

+3 -3

pkgs/applications/audio/eq10q/default.nix

···

       1
       1
        
       { stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         name = "eq10q-2-${version}";

     

       4
       4
       -
         version = "beta7.1";

     

       3
       3
       +
         name = "eq10q-${version}";

     

       4
       4
       +
         version = "2.0";

     

       5
       5
        
         src = fetchurl {

     

       6
       6
        
           url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";

     

       7
       7
       -
           sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";

     

       7
       7
       +
           sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h";

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
        
         buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];

+3 -2

pkgs/applications/audio/pd-plugins/puremapping/default.nix

···

       1
       1
        
       { stdenv, fetchurl, unzip, puredata }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "puremapping-20160130";

     

       4
       4
       +
         name = "puremapping-${version}";

     

       5
       5
       +
         version = "20160130";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "http://www.chnry.net/data/puremapping-20160130-generic.zip";

     

       8
       8
       +
           url = "http://www.chnry.net/data/puremapping-${version}-generic.zip";

     

       8
       9
        
           name = "puremapping";

     

       9
       10
        
           sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7";

     

       10
       11
        
         };

-1

pkgs/applications/audio/pd-plugins/zexy/default.nix

···

       16
       16
        
           for i in ${puredata}/include/pd/*; do

     

       17
       17
        
             ln -s $i .

     

       18
       18
        
           done

     

       19
       19
       -
           patchShebangs

     

       20
       19
        
           ./bootstrap.sh

     

       21
       20
        
           ./configure --enable-lpt=no --prefix=$out

     

       22
       21
        
         '';

+9 -8

pkgs/applications/audio/plugin-torture/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "plugin-torture-git-${version}";

     

       5
       5
       -
         version = "2013-10-03";

     

       4
       4
       +
         name = "plugin-torture-${version}";

     

       5
       5
       +
         version = "5";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/cth103/plugin-torture";

     

       9
       9
       -
           rev = "9ee06016982bdfbaa215cd0468cc6ada6367462a";

     

       10
       10
       -
           sha256 = "0ynzfs3z95lbw4l1w276as2a37zxp0cw6pi3lbikr0qk0r7j5j10";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "cth103";

     

       9
       9
       +
           repo = "plugin-torture";

     

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

     

       11
       11
       +
           sha256 = "1mlgxjsyaz86wm4k32ll2w5nghjffnsdqlm6kjv02a4dpb2bfrih";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ];

     
···

       15
       16
        
         installPhase = ''

     

       16
       17
        
           mkdir -p $out/bin

     

       17
       18
        
           cp plugin-torture $out/bin/

     

       18
       18
       -
           cp README $out/bin/

     

       19
       19
       +
           cp find-safe-plugins $out/bin/

     

       19
       20
        
         '';

     

       20
       21
        
       

     

       21
       22
        
         meta = with stdenv.lib; {

+3 -3

pkgs/applications/audio/puredata/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation  rec {

     

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

     

       7
       7
       -
         version = "0.45-4";

     

       7
       7
       +
         version = "0.47-1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz";

     

       11
       11
       -
           sha256 = "1ls2ap5yi2zxvmr247621g4jx0hhfds4j5704a050bn2n3l0va2p";

     

       10
       10
       +
           url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";

     

       11
       11
       +
           sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patchPhase = ''

+7 -3

pkgs/applications/editors/emacs-25/default.nix

···

       5
       5
        
       , autoconf, automake

     

       6
       6
        
       , withX ? !stdenv.isDarwin

     

       7
       7
        
       , withGTK3 ? false, gtk3 ? null

     

       8
       8
       +
       , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null

     

       8
       9
        
       , withGTK2 ? true, gtk2

     

       9
       10
        
       }:

     

       10
       11
        
       

     
···

       14
       15
        
       assert withGTK3 -> withX || stdenv.isDarwin;

     

       15
       16
        
       assert withGTK2 -> !withGTK3 && gtk2 != null;

     

       16
       17
        
       assert withGTK3 -> !withGTK2 && gtk3 != null;

     

       18
       18
       +
       assert withXwidgets -> withGTK3 && webkitgtk24x != null;

     

       17
       19
        
       

     

       18
       20
        
       let

     

       19
       21
        
         toolkit =

     
···

       49
       51
        
               imagemagick gconf ]

     

       50
       52
        
           ++ stdenv.lib.optional (withX && withGTK2) gtk2

     

       51
       53
        
           ++ stdenv.lib.optional (withX && withGTK3) gtk3

     

       52
       52
       -
           ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;

     

       54
       54
       +
           ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo

     

       55
       55
       +
           ++ stdenv.lib.optionals withXwidgets [webkitgtk24x wrapGAppsHook glib_networking];

     

       53
       56
        
       

     

       54
       57
        
         propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];

     

       55
       58
        
       

     

       56
       59
        
         hardeningDisable = [ "format" ];

     

       57
       60
        
       

     

       58
       61
        
         configureFlags =

     

       59
       59
       -
           if stdenv.isDarwin

     

       62
       62
       +
           (if stdenv.isDarwin

     

       60
       63
        
             then [ "--with-ns" "--disable-ns-self-contained" ]

     

       61
       64
        
           else if withX

     

       62
       65
        
             then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]

     

       63
       66
        
             else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"

     

       64
       64
       -
                    "--with-gif=no" "--with-tiff=no" ];

     

       67
       67
       +
                    "--with-gif=no" "--with-tiff=no" ])

     

       68
       68
       +
           ++ stdenv.lib.optional withXwidgets "--with-xwidgets";

     

       65
       69
        
       

     

       66
       70
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX)

     

       67
       71
        
           "-I${cairo.dev}/include/cairo";

pkgs/applications/editors/geany/with-vte.nix

···

       2
       2
        
       let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;

     

       3
       3
        
       in

     

       4
       4
        
       runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } "

     

       5
       5
       +
          mkdir -p $out

     

       6
       6
       +
          ln -s ${geany}/share $out

     

       5
       7
        
          makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib

     

       6
       8
        
       "

+38

pkgs/applications/editors/uemacs/default.nix

···

       1
       1
       +
       { stdenv, fetchgit, ncurses }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "uemacs-${version}";

     

       5
       5
       +
         version = "2014-12-08";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchgit {

     

       8
       8
       +
           url = git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git;

     

       9
       9
       +
           rev = "8841922689769960fa074fbb053cb8507f2f3ed9";

     

       10
       10
       +
           sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           substituteInPlace Makefile \

     

       15
       15
       +
             --replace "-lcurses" "-lncurses" \

     

       16
       16
       +
             --replace "CFLAGS=-O2" "CFLAGS+=" \

     

       17
       17
       +
             --replace "BINDIR=/usr/bin" "BINDIR=$out/bin" \

     

       18
       18
       +
             --replace "LIBDIR=/usr/lib" "LIBDIR=$out/share/uemacs"

     

       19
       19
       +
           substituteInPlace epath.h \

     

       20
       20
       +
             --replace "/usr/global/lib/" "$out/share/uemacs/" \

     

       21
       21
       +
             --replace "/usr/local/bin/" "$out/bin/" \

     

       22
       22
       +
             --replace "/usr/local/lib/" "$out/share/uemacs/" \

     

       23
       23
       +
             --replace "/usr/local/" "$out/bin/" \

     

       24
       24
       +
             --replace "/usr/lib/" "$out/share/uemacs/"

     

       25
       25
       +
           mkdir -p $out/bin $out/share/uemacs

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs = [ ncurses ];

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       31
       31
       +
           homepage = https://git.kernel.org/cgit/editors/uemacs/uemacs.git;

     

       32
       32
       +
           description = "Torvalds Micro-emacs fork";

     

       33
       33
       +
           longDescription = ''

     

       34
       34
       +
             uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e

     

       35
       35
       +
           '';

     

       36
       36
       +
           license = licenses.unfree;

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+21 -14

pkgs/applications/editors/vis/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses, libtermkey, lpeg, lua }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper

     

       2
       2
       +
       , ncurses, libtermkey, lpeg, lua

     

       3
       3
       +
       , acl ? null, libselinux ? null

     

       4
       4
       +
       , version ? "2016-07-15"

     

       5
       5
       +
       , rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08"

     

       6
       6
       +
       , sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd"

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       stdenv.mkDerivation rec {

     

       4
       10
        
         name = "vis-nightly-${version}";

     

       5
       5
       -
         version = "2016-04-15";

     

       11
       11
       +
         inherit version;

     

       6
       12
        
       

     

       7
       13
        
         src = fetchFromGitHub {

     

       8
       8
       -
           sha256 = "0a4gpwniy5r9dpfq51fxjxxnxavdjv8x76w9bbjnbnh8n63p3sj7";

     

       9
       9
       -
           rev = "472c559a273d3c7b0f5ee92260c5544bc3d74576";

     

       14
       14
       +
           inherit sha256;

     

       15
       15
       +
           inherit rev;

     

       10
       16
        
           repo = "vis";

     

       11
       17
        
           owner = "martanne";

     

       12
       18
        
         };

     
···

       14
       20
        
         nativeBuildInputs = [ makeWrapper ];

     

       15
       21
        
       

     

       16
       22
        
         buildInputs = [

     

       17
       17
       -
            unzip

     

       18
       18
       -
            pkgconfig

     

       19
       19
       -
            ncurses

     

       20
       20
       -
            libtermkey

     

       21
       21
       -
            lua

     

       22
       22
       -
            lpeg

     

       23
       23
       +
           unzip pkgconfig

     

       24
       24
       +
           ncurses

     

       25
       25
       +
           libtermkey

     

       26
       26
       +
           lua

     

       27
       27
       +
           lpeg

     

       28
       28
       +
         ] ++ stdenv.lib.optional stdenv.isLinux [

     

       29
       29
       +
           acl

     

       30
       30
       +
           libselinux

     

       23
       31
        
         ];

     

       24
       32
        
       

     

       25
       33
        
         LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";

     
···

       33
       41
        
             --prefix VIS_PATH : "$out/share/vis"

     

       34
       42
        
         '';

     

       35
       43
        
       

     

       36
       36
       -
         meta = {

     

       44
       44
       +
         meta = with stdenv.lib; {

     

       37
       45
        
           description = "A vim like editor";

     

       38
       46
        
           homepage = http://github.com/martanne/vis;

     

       39
       39
       -
           license = stdenv.lib.licenses.isc;

     

       40
       40
       -
           maintainers = [ stdenv.lib.maintainers.vrthra ];

     

       47
       47
       +
           license = licenses.isc;

     

       48
       48
       +
           maintainers = [ maintainers.vrthra ];

     

       41
       49
        
         };

     

       42
       50
        
       }

     

       43
       43
       -

+2 -2

pkgs/applications/graphics/ImageMagick/default.nix

···

       11
       11
        
           else throw "ImageMagick is not supported on this platform.";

     

       12
       12
        
       

     

       13
       13
        
         cfg = {

     

       14
       14
       -
           version = "6.9.3-9";

     

       15
       15
       -
           sha256 = "0q19jgn1iv7zqrw8ibxp4z57iihrc9kyb09k2wnspcacs6vrvinf";

     

       14
       14
       +
           version = "6.9.5-2";

     

       15
       15
       +
           sha256 = "09h3rpr1jnzd7ipy5d16r2gi0bwg4hk5khwzv4cyhv1xzs8pk7pj";

     

       16
       16
        
           patches = [];

     

       17
       17
        
         }

     

       18
       18
        
           # Freeze version on mingw so we don't need to port the patch too often.

+6 -13

pkgs/applications/graphics/ImageMagick/imagetragick.patch

···

       1
       1
       -
       diff --git a/config/policy.xml b/config/policy.xml

     

       2
       2
       -
       index ca3b022..b058c05 100644

     

       3
       1
        
       --- a/config/policy.xml

     

       4
       2
        
       +++ b/config/policy.xml

     

       5
       5
       -
       @@ -58,4 +58,10 @@

     

       6
       6
       -
          <!-- <policy domain="resource" name="time" value="3600"/> -->

     

       7
       7
       -
          <!-- <policy domain="system" name="precision" value="6"/> -->

     

       8
       8
       -
          <policy domain="cache" name="shared-secret" value="passphrase"/>

     

       9
       9
       -
       +

     

       10
       10
       -
       +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />

     

       11
       11
       -
       +  <policy domain="coder" rights="none" pattern="URL" />

     

       12
       12
       -
       +  <policy domain="coder" rights="none" pattern="HTTPS" />

     

       13
       13
       -
       +  <policy domain="coder" rights="none" pattern="MVG" />

     

       14
       14
       -
       +  <policy domain="coder" rights="none" pattern="MSL" />

     

       15
       15
       -
        </policymap>

     

       3
       3
       +
       67a68,72

     

       4
       4
       +
       >   <policy domain="coder" rights="none" pattern="EPHEMERAL" />

     

       5
       5
       +
       >   <policy domain="coder" rights="none" pattern="URL" />

     

       6
       6
       +
       >   <policy domain="coder" rights="none" pattern="HTTPS" />

     

       7
       7
       +
       >   <policy domain="coder" rights="none" pattern="MVG" />

     

       8
       8
       +
       >   <policy domain="coder" rights="none" pattern="MSL" />

+2 -2

pkgs/applications/graphics/gimp/2.8.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

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

     

       8
       8
       -
         version = "2.8.16";

     

       8
       8
       +
         version = "2.8.18";

     

       9
       9
        
       

     

       10
       10
        
         # This declarations for `gimp-with-plugins` wrapper,

     

       11
       11
        
         # (used for determining $out/lib/gimp/${majorVersion}/ paths)

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";

     

       18
       18
       -
           sha256 = "1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm";

     

       18
       18
       +
           sha256 = "0halh6sl3d2j9gahyabj6h6r3yyldcy7sfb4qrfazpkqqr3j5p9r";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs =

pkgs/applications/graphics/pencil/default.nix

···

       32
       32
        
           license = licenses.gpl2; # Commercial license is also available

     

       33
       33
        
           maintainers = with maintainers; [ bjornfor prikhi ];

     

       34
       34
        
           platforms = platforms.linux;

     

       35
       35
       +
           # See https://github.com/prikhi/pencil/issues/840

     

       36
       36
       +
           # ("Error: Platform version '47.0' is not compatible with minVersion >= 36.0 maxVersion <= 46.*")

     

       37
       37
       +
           broken = true;

     

       35
       38
        
         };

     

       36
       39
        
       }

+7 -5

pkgs/applications/graphics/shotwell/default.nix

···

       1
       1
        
       { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite

     

       2
       2
       -
       , webkitgtk24x, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib

     

       2
       2
       +
       , webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib

     

       3
       3
        
       , gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, makeWrapper

     

       4
       4
        
       , gnome_doc_utils, hicolor_icon_theme }:

     

       5
       5
        
       

     

       6
       6
        
       # for dependencies see http://www.yorba.org/projects/shotwell/install/

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
       -
         version = "0.22.0";

     

       9
       9
       +
         version = "${major}.${minor}";

     

       10
       10
       +
         major = "0.23";

     

       11
       11
       +
         minor = "2";

     

       10
       12
        
         name = "shotwell-${version}";

     

       11
       13
        
       

     

       12
       14
        
         src = fetchurl {

     

       13
       13
       -
           url = "mirror://gnome/sources/shotwell/0.22/${name}.tar.xz";

     

       14
       14
       -
           sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";

     

       15
       15
       +
           url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";

     

       16
       16
       +
           sha256 = "d52caae4e3204f2f78e2eb828d955848ea6fef5c91d3ac6e9eb0b185c0490b39";

     

       15
       17
        
         };

     

       16
       18
        
       

     

       17
       19
        
         NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";

     
···

       35
       37
        
         '';

     

       36
       38
        
       

     

       37
       39
        
       

     

       38
       38
       -
         buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x

     

       40
       40
       +
         buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk

     

       39
       41
        
                         pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee

     

       40
       42
        
                         which udev libgudev gnome3.gexiv2 hicolor_icon_theme

     

       41
       43
        
                         libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg

+2 -2

pkgs/applications/misc/emem/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "emem";

     

       5
       5
       -
         version = "0.2.16";

     

       5
       5
       +
         version = "0.2.18";

     

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

     

       7
       7
        
       

     

       8
       8
        
         inherit jdk;

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";

     

       12
       12
       -
           sha256 = "1j6i40mcfwcx85zv0pxpwrqj0zy9s5qd7j63zdqf0lckkjvyrih9";

     

       12
       12
       +
           sha256 = "090sd1q345xlari267j4k27lglnch26dkwa9pibb1q70hdygv0w8";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ ];

+34

pkgs/applications/misc/gpg-mdp/default.nix

···

       1
       1
       +
       { fetchurl, stdenv, ncurses, gnupg }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "0.7.4";

     

       4
       4
       +
       in stdenv.mkDerivation {

     

       5
       5
       +
         # mdp renamed to gpg-mdp because there is a mdp package already.

     

       6
       6
       +
         name = "gpg-mdp-${version}";

     

       7
       7
       +
         meta = {

     

       8
       8
       +
           homepage = https://tamentis.com/projects/mdp/;

     

       9
       9
       +
           license = [stdenv.lib.licenses.isc];

     

       10
       10
       +
           description = "Manage your passwords with GnuPG and a text editor";

     

       11
       11
       +
         };

     

       12
       12
       +
         src = fetchurl {

     

       13
       13
       +
           url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz";

     

       14
       14
       +
           sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g";

     

       15
       15
       +
         };

     

       16
       16
       +
         buildInputs = [ ncurses ];

     

       17
       17
       +
         prePatch = ''

     

       18
       18
       +
           substituteInPlace ./configure \

     

       19
       19
       +
             --replace "alias echo=/bin/echo" ""

     

       20
       20
       +
       

     

       21
       21
       +
           substituteInPlace ./src/config.c \

     

       22
       22
       +
             --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \

     

       23
       23
       +
             --replace "/usr/bin/vi" "vi"

     

       24
       24
       +
       

     

       25
       25
       +
           substituteInPlace ./mdp.1 \

     

       26
       26
       +
             --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2"

     

       27
       27
       +
         '';

     

       28
       28
       +
         # we add symlinks to the binary and man page with the name 'gpg-mdp', in case

     

       29
       29
       +
         # the completely unrelated program also named 'mdp' is already installed.

     

       30
       30
       +
         postFixup = ''

     

       31
       31
       +
           ln -s $out/bin/mdp $out/bin/gpg-mdp

     

       32
       32
       +
           ln -s $out/share/man/man1/mdp.1.gz $out/share/man/man1/gpg-mdp.1.gz

     

       33
       33
       +
         '';

     

       34
       34
       +
       }

+18

pkgs/applications/misc/hugo/default.nix

···

       1
       1
       +
       { stdenv, buildGoPackage, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoPackage rec {

     

       4
       4
       +
         name = "hugo-${version}";

     

       5
       5
       +
         version = "v0.16";

     

       6
       6
       +
         rev = "8b54843a0db694facbaf368af4e777d0ae5fb992";

     

       7
       7
       +
       

     

       8
       8
       +
         goPackagePath = "github.com/spf13/hugo";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           inherit rev;

     

       12
       12
       +
           owner = "spf13";

     

       13
       13
       +
           repo = "hugo";

     

       14
       14
       +
           sha256 = "135mrdi8i56z9m2sihjrdfab6lrczbfgavwvfrngvi1zxnx7scmv";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         goDeps = ./deps.json;

     

       18
       18
       +
       }

+44

pkgs/applications/misc/hugo/deps.json

···

       1
       1
       +
       [

     

       2
       2
       +
         {

     

       3
       3
       +
           "include": "../../libs.json",

     

       4
       4
       +
           "packages": [

     

       5
       5
       +
               "gopkg.in/yaml.v2",

     

       6
       6
       +
               "github.com/hashicorp/hcl",

     

       7
       7
       +
               "github.com/pkg/sftp",

     

       8
       8
       +
               "golang.org/x/sys",

     

       9
       9
       +
               "github.com/hashicorp/go-multierror",

     

       10
       10
       +
               "golang.org/x/crypto",

     

       11
       11
       +
               "github.com/pkg/errors",

     

       12
       12
       +
               "github.com/kr/fs",

     

       13
       13
       +
               "github.com/kyokomi/emoji",

     

       14
       14
       +
               "github.com/bep/inflect",

     

       15
       15
       +
               "github.com/BurntSushi/toml",

     

       16
       16
       +
               "github.com/PuerkitoBio/purell",

     

       17
       17
       +
               "github.com/PuerkitoBio/urlesc",

     

       18
       18
       +
               "github.com/dchest/cssmin",

     

       19
       19
       +
               "github.com/eknkc/amber",

     

       20
       20
       +
               "github.com/gorilla/websocket",

     

       21
       21
       +
               "github.com/kardianos/osext",

     

       22
       22
       +
               "github.com/miekg/mmark",

     

       23
       23
       +
               "github.com/mitchellh/mapstructure",

     

       24
       24
       +
               "github.com/russross/blackfriday",

     

       25
       25
       +
               "github.com/shurcooL/sanitized_anchor_name",

     

       26
       26
       +
               "github.com/spf13/afero",

     

       27
       27
       +
               "github.com/spf13/cast",

     

       28
       28
       +
               "github.com/spf13/jwalterweatherman",

     

       29
       29
       +
               "github.com/spf13/cobra",

     

       30
       30
       +
               "github.com/cpuguy83/go-md2man",

     

       31
       31
       +
               "github.com/inconshreveable/mousetrap",

     

       32
       32
       +
               "github.com/spf13/pflag",

     

       33
       33
       +
               "github.com/spf13/fsync",

     

       34
       34
       +
               "github.com/spf13/viper",

     

       35
       35
       +
               "github.com/kr/pretty",

     

       36
       36
       +
               "github.com/kr/text",

     

       37
       37
       +
               "github.com/magiconair/properties",

     

       38
       38
       +
               "golang.org/x/text",

     

       39
       39
       +
               "github.com/yosssi/ace",

     

       40
       40
       +
               "github.com/spf13/nitro",

     

       41
       41
       +
               "github.com/fsnotify/fsnotify"

     

       42
       42
       +
           ]

     

       43
       43
       +
         }

     

       44
       44
       +
       ]

+2 -2

pkgs/applications/misc/mediainfo-gui/default.nix

···

       2
       2
        
       , desktop_file_utils, libSM, imagemagick }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         version = "0.7.86";

     

       5
       5
       +
         version = "0.7.87";

     

       6
       6
        
         name = "mediainfo-gui-${version}";

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";

     

       9
       9
       -
           sha256 = "15w6m75bk6rsxxdrdibi330ch1x0cw131gynbhmhbsppsg0v5vb5";

     

       9
       9
       +
           sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

+2 -2

pkgs/applications/misc/mediainfo/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.7.86";

     

       4
       4
       +
         version = "0.7.87";

     

       5
       5
        
         name = "mediainfo-${version}";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";

     

       8
       8
       -
           sha256 = "15w6m75bk6rsxxdrdibi330ch1x0cw131gynbhmhbsppsg0v5vb5";

     

       8
       8
       +
           sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

pkgs/applications/misc/multimon-ng/default.nix

···

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ qmake4Hook ];

     

       18
       18
        
       

     

       19
       19
       +
         qmakeFlags = [ "multimon-ng.pro" ];

     

       20
       20
       +
       

     

       19
       21
        
         installPhase = ''

     

       20
       22
        
           mkdir -p $out/bin

     

       21
       23
        
           cp multimon-ng $out/bin

+3 -2

pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, xrdb }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, xrdb, xlsfonts }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "urxvt-font-size-2015-05-22";

     
···

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

     

       15
       15
        
           substituteInPlace font-size \

     

       16
       16
       -
             --replace "xrdb -merge" "${xrdb}/bin/xrdb -merge"

     

       16
       16
       +
             --replace "xrdb -merge" "${xrdb}/bin/xrdb -merge" \

     

       17
       17
       +
             --replace "xlsfonts" "${xlsfonts}/bin/xlsfonts"

     

       17
       18
        
       

     

       18
       19
        
           mkdir -p $out/lib/urxvt/perl

     

       19
       20
        
           cp font-size $out/lib/urxvt/perl

+1 -1

pkgs/applications/misc/slic3r/default.nix

···

       16
       16
        
           EncodeLocale MathClipper ExtUtilsXSpp threads

     

       17
       17
        
           MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo

     

       18
       18
        
           IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX

     

       19
       19
       -
           ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild

     

       19
       19
       +
           ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         desktopItem = makeDesktopItem {

+22

pkgs/applications/misc/wikicurses/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, pythonPackages }:

     

       2
       2
       +
       

     

       3
       3
       +
       pythonPackages.buildPythonApplication rec {

     

       4
       4
       +
         version = "1.3";

     

       5
       5
       +
         name = "wikicurses-${version}";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://github.com/ids1024/wikicurses/archive/v${version}.tar.gz";

     

       9
       9
       +
           sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];

     

       13
       13
       +
       

     

       14
       14
       +
         meta = {

     

       15
       15
       +
           description = "A simple curses interface for MediaWiki sites such as Wikipedia";

     

       16
       16
       +
           homepage = "https://github.com/ids1024/wikicurses/";

     

       17
       17
       +
           license = stdenv.lib.licenses.mit;

     

       18
       18
       +
           platforms = stdenv.lib.platforms.unix;

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
       }

     

       22
       22
       +

+3 -3

pkgs/applications/networking/bittorrentsync/2.0.x.nix

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // {

     

       4
       4
       -
         version = "2.3.7";

     

       4
       4
       +
         version = "2.3.8";

     

       5
       5
        
         sha256s = {

     

       6
       6
       -
           "x86_64-linux" = "1hnw6bv60xrnc733gm1ilywc0y93k2g6bmwgnww9qk7ivbvi6pd1";

     

       7
       7
       -
           "i686-linux"   = "0hj8nbq6mava15m1hxaqq371fqk0whdx5iqsbnppyci0jjnr4qv1";

     

       6
       6
       +
           "x86_64-linux" = "02n5s561cz3mprg682mrbmh3qai42dh64jgi05rqy9s6wgbn66ly";

     

       7
       7
       +
           "i686-linux"   = "118qrnxc7gvm30rsz0xfx6dlxmrr0dk5ajrvszhy06ww7xvqhzji";

     

       8
       8
        
         };

     

       9
       9
        
       })

+183 -183

pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

···

       4
       4
        
       # ruby generate_sources.rb 46.0.1 > sources.nix

     

       5
       5
        
       

     

       6
       6
        
       {

     

       7
       7
       -
         version = "48.0b1";

     

       7
       7
       +
         version = "48.0b7";

     

       8
       8
        
         sources = [

     

       9
       9
       -
           { locale = "ach"; arch = "linux-i686"; sha512 = "464c3b19ab7bda118d962da2699dd40482e1742887bcd9d72b8b7d211c7ab085aaf4c31fdea3c4e195af9030276118431ed7c2e6a917b354c5bf9f55cc8111a9"; }

     

       10
       10
       -
           { locale = "ach"; arch = "linux-x86_64"; sha512 = "d9f9844fb06637ca7449bc00c54c02abf8660c42207c0671fffd53e2415df7b0fc3df782c4a2ccde807b4c2e477b0cf3a74c36acb7cce3f75e4ce267a3575e5c"; }

     

       11
       11
       -
           { locale = "af"; arch = "linux-i686"; sha512 = "77bca1f05627ed9ace120eee7a7cd24fc354e9bf23a7709e38879241ad87c5d39a8cfcf2aed12881b6f9d6d611c334a864c20c9dee877952990c47c631c6a61b"; }

     

       12
       12
       -
           { locale = "af"; arch = "linux-x86_64"; sha512 = "bf4d5353a46778d93627c232c404c768e643420b17d490c932848d126846e4ca3a185df671dcf72b1c1d3fe75606c212e6b0dadd2169b52c4fe73f5088e87b94"; }

     

       13
       13
       -
           { locale = "an"; arch = "linux-i686"; sha512 = "2882258205866c93a4b808b7397ff62efd629b74b5233154190ce72ddd0be5d1eb8153d686d921ddb72049dfae0f11c3eb46128413e578c0f9f6323636a0e378"; }

     

       14
       14
       -
           { locale = "an"; arch = "linux-x86_64"; sha512 = "543b1d66dc37e1843f370ff071adb050af16e5777bc0042c2d25579a7d99b5b1d176ea099a0b3afc19f270ad5f191fec65e544634e2bbc2223ccc6afcb1869e0"; }

     

       15
       15
       -
           { locale = "ar"; arch = "linux-i686"; sha512 = "855fc1c71b50ba5b8354ee7ce2ea59664b40b77d007d99ea6b658873de729e22ca9018e475a669992b2e2bea9388fe0966e06f1e2b0d334df4ffbff2be147949"; }

     

       16
       16
       -
           { locale = "ar"; arch = "linux-x86_64"; sha512 = "8ff272dd30cc66460a617dd80678b68917067b87d63d6b307f6d60e61deda092f46bca9e890d08b69a0738f4c204cd2c5896201b362df68aa9abbe7dd0fcc96d"; }

     

       17
       17
       -
           { locale = "as"; arch = "linux-i686"; sha512 = "607039866932e6ec0692c534aa2e4ddcb3725d81f2908e7e905edafdbafb3221161f5ae4a5b6eb2ba065e9bd66e1f63c008015b17040033ed90ffa0576b1d08b"; }

     

       18
       18
       -
           { locale = "as"; arch = "linux-x86_64"; sha512 = "59f3c28bcbc50a9ffe780025e03edafbbf82a213f28ba8e0f62a04a0e052038c24e1a5928ad4a730455bd358fc3cd0f1188e785dd13f79b377d86e5c55360735"; }

     

       19
       19
       -
           { locale = "ast"; arch = "linux-i686"; sha512 = "c9767d9b73ec2dd411e16b1fab503e97b7960c315533ca529c4898dd10a6e0f809104588ac33f440e1026d026d114ec080cfc312b1902601958656607cdd4ad1"; }

     

       20
       20
       -
           { locale = "ast"; arch = "linux-x86_64"; sha512 = "f4c7ab66af5e7fca460999b3d68793f8099b177809e70f682fcd7b0a50a3d5ad2a1c15bc5df5a63c37437fce9d70e08e963119755626c357bce6eb17bfb229ee"; }

     

       21
       21
       -
           { locale = "az"; arch = "linux-i686"; sha512 = "58bb0eb057caf6af113debeb8d9d7eeb3b2fbd2c52c9dac04c527a67da45b3a4ebac4debfea1704639cdf20ec116876e140f4b55ea5f2b90f3afb9db6b2641b6"; }

     

       22
       22
       -
           { locale = "az"; arch = "linux-x86_64"; sha512 = "a82fdc532e4d9fee9ffab9ab8aa58074c4ed174c131d56b4ed48b1ebce1f8950371fa7c7e174c4f35150b752cdeccc2a553b416e94fb3eec22c0c4467c0b1f20"; }

     

       23
       23
       -
           { locale = "be"; arch = "linux-i686"; sha512 = "55a96ff3fe9e54ec09a828f740899118504848c82b9c842ed27b9c1e1179f8efcbb2fae5e25f01dd1440f9d2ad896e37056fe8240979cf2c60f536870590cac3"; }

     

       24
       24
       -
           { locale = "be"; arch = "linux-x86_64"; sha512 = "6fe1b00f8a03160a5131a52aba5b31401bf18913eb5b6018d1dccb0456ee09154c76220bb94b1ee20bf5b8e63535a888abf895af570e9a668395b497bbdf90b1"; }

     

       25
       25
       -
           { locale = "bg"; arch = "linux-i686"; sha512 = "e21d3a2234b533b9d5904be3c1ee4f489bfdea747ff2b45828c40712f70d631ca824375c7a232989741bfceb8a7eb1ca341a4709285056cea2cf3689326a9c35"; }

     

       26
       26
       -
           { locale = "bg"; arch = "linux-x86_64"; sha512 = "160600a553d452c30d533e4d9a4ccc4c4d0cbbadf7875856f9be0fc81dbb7a686aa79f47ae8ea1c1e3746d150db31c7ce0dc18f1d271a47abb6d9bc35f478bf0"; }

     

       27
       27
       -
           { locale = "bn-BD"; arch = "linux-i686"; sha512 = "6a4267ce4e0d474779f16a7bb31fb873c0d2ba4af993428330bef8c93a24c1f9121b68d50956beb3df549fccf233fa2ce851c69950bf93cf6cdf34debae0cfce"; }

     

       28
       28
       -
           { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "31100d78f0b2fcca2643c822f930ffcf01da9ad3c026d8e05e88b659afddb9d55a000dfe043a87d6e4008d40fced109c134a3bb2c8183a1044d462fdc050989d"; }

     

       29
       29
       -
           { locale = "bn-IN"; arch = "linux-i686"; sha512 = "cb0efc8151949b33c23cb9d4fe41168830e215d4361963ec9399e43c97aa4504b4539a202f2c43283e63ea0a4afbdffb9bbfa1340a256483c3b848ef24660734"; }

     

       30
       30
       -
           { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "37e8311e0126da80740b9f97b4b69eb2285716b309e1986daaec5becf88ee5624343ca3b208fa84eb63477f47234c8d5958e394bf750da32e02d777ee94437f1"; }

     

       31
       31
       -
           { locale = "br"; arch = "linux-i686"; sha512 = "be6cb0e7b1ceb0be27a7203620b19341c16061ce0d4632f9ce135b2559db2ca31adac2e40ef95f98db903fd151a1b5d411232361631272f2d6200dbcc45464be"; }

     

       32
       32
       -
           { locale = "br"; arch = "linux-x86_64"; sha512 = "aa71bd069902a921b2a61ebbcbb604972104ba5f4274788da261e1e527dc7ce10c6a9aa0652773f0d0499d53c2916dd1e2d862b900fb87d678a9bcb401948cba"; }

     

       33
       33
       -
           { locale = "bs"; arch = "linux-i686"; sha512 = "5282780a9f35577498b95ded38f86423d043429a0fb4b9ded956716381a3343ebe653508e8929bd8ac7475a2fa0d6c4c67e84482cae0d40a681338eba09f4c96"; }

     

       34
       34
       -
           { locale = "bs"; arch = "linux-x86_64"; sha512 = "1056be9971338d821025a5d272321ea4b1704f3103c02014cde711516e9da5303dbc5753f0c2c1cf236096a53b3b067261b628f17d6d45e6c713f5b5cdee69b1"; }

     

       35
       35
       -
           { locale = "ca"; arch = "linux-i686"; sha512 = "15c98207cb051466bc89dc15fb2dc1da95490306030fb318f3e3bb184d23590df7213e183af2e5178969099a4edf9752e5872a9d4a091958d7a9ab6087ff6bdf"; }

     

       36
       36
       -
           { locale = "ca"; arch = "linux-x86_64"; sha512 = "f7fc94c6c358dff1336938ff2d28c4fb9b0d391c22acefa7e286004978570e18cc1fd1a41a101a8bee27cbec1d750e04ba43cb409886f2b72e8e16a9aed6c835"; }

     

       37
       37
       -
           { locale = "cak"; arch = "linux-i686"; sha512 = "96da63ceb6d4382abd8d1e343fdc4b72ead5e5ed2e3d451e768c6b092186287dcbaf239c389d29bc23e5641495a3f2a05512377300f45402428647ab77550b17"; }

     

       38
       38
       -
           { locale = "cak"; arch = "linux-x86_64"; sha512 = "8584d4d82c79a56657a01a9cff211fa99e0fbcf0a42103a6cd9688713e7c11b77f35535fe31ed7e48855e055897b2c5fd84c2b1796c313401d8f01ed889ac7cf"; }

     

       39
       39
       -
           { locale = "cs"; arch = "linux-i686"; sha512 = "2dff956f8df85bd007b68eeb8b809ddf7d99a6185f6946d2f4fd371f17e4dbf46bf2aad1799b6a1c84bd983935fa2ade5acd3b062f3eee48f7a160f37f3e8e6e"; }

     

       40
       40
       -
           { locale = "cs"; arch = "linux-x86_64"; sha512 = "725a2e1272722cdce125b5dea7e61525a43ddda6a45cb003f397ec8d1c9334f11adcd7fb6dd2c901de1cd9a0d07eae54304e5f95ecc6c529c80070b9d6af1b47"; }

     

       41
       41
       -
           { locale = "cy"; arch = "linux-i686"; sha512 = "5eeacbc1cd803687235927a91923895930e135a39de62574c79499fe56accb5278da3efc4d151f0f93ec482ad44099481960dd6e3102afa94cce3c30db67b133"; }

     

       42
       42
       -
           { locale = "cy"; arch = "linux-x86_64"; sha512 = "49fc8136b3900b96fcea850a9549812b1cf1e9b1058cf99ee7e2e135cf49827e46ef4361badcc4efbd5dd09600d5269e68392f8df03c2e039d6b3d04b244aa71"; }

     

       43
       43
       -
           { locale = "da"; arch = "linux-i686"; sha512 = "f806a36960cbec3624be8ebf6e7f8116635c7fff63ca890a886bd16fe73ec8a311d1e8b3c34ca680425d4634c91f8b96b0617cd175eef69e701d7c72e8917872"; }

     

       44
       44
       -
           { locale = "da"; arch = "linux-x86_64"; sha512 = "22a274b9a5a1e670369009f2e48a4b7d2f63f18baf435d001506dd590b59115d43619fa824e2156b468b17739aea420621148ca47cd46bc3ace31bc5be4533f8"; }

     

       45
       45
       -
           { locale = "de"; arch = "linux-i686"; sha512 = "6d64a77f420d1f87b7dac151eec75d4d42ec1f904b882b970d88b0e20a38ed5ebf8cbb2180abbdb8fb00dd60621e538fecaf77e09c4aee51f71a38a14f81b9b8"; }

     

       46
       46
       -
           { locale = "de"; arch = "linux-x86_64"; sha512 = "897918d57691fb1a3f93273da48c128cf8a91e9bc5dd12d0ce2b4a085ff4df01db3ee28a378f36b7e7944c23f71df8a6dbf3481ec207cf85b73f3bac95bde054"; }

     

       47
       47
       -
           { locale = "dsb"; arch = "linux-i686"; sha512 = "d5fa1438b71fcd3507175619090840cf983de9efb003f537eb28b9dba66f1cb3518e1410c4918187eb25766634464aaa796ebe0020f8fc110361008751e1c359"; }

     

       48
       48
       -
           { locale = "dsb"; arch = "linux-x86_64"; sha512 = "30cb3759bd1f6ba91dfa847703326a57901782ebf397adaa1a403afe894f9b8cdeba80fc910f50037bae003e61956845f605b0e62c364c1c415b12a5abb87080"; }

     

       49
       49
       -
           { locale = "el"; arch = "linux-i686"; sha512 = "991dfd0870e38ee4a8887a61ce87a4c5af1c21206442a0602197caafae0be2c3c5aa4c7b25fd92fd9968bdf25c780ac342dd0203c3df8d729034ba20a459d120"; }

     

       50
       50
       -
           { locale = "el"; arch = "linux-x86_64"; sha512 = "d62b4f1eb5feeb30e4d2d7b8cb7391f374a209d14b70cdd77acb56106b6df36f54c67a3c5fa1ab4286fd7c46b5d0a42efc52d140b8e5cbe08b17c6d7bd14b498"; }

     

       51
       51
       -
           { locale = "en-GB"; arch = "linux-i686"; sha512 = "2cddfb3d4472bfda882a3e3a054d5826a596bfd6b9b4399d7f45c6ad9f157599206f5e149f6c4fb35845ae291320520bf7a76c891713f1951c6e9a9450e92d23"; }

     

       52
       52
       -
           { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d6bda8496f96448b9b046822547167c9c631dbf35c8bba07226634fc9aa1058009200d10e4e586fe059ab1e7b558d6cfa2c0040a33220d46dba5ca742bfe6f5c"; }

     

       53
       53
       -
           { locale = "en-US"; arch = "linux-i686"; sha512 = "a9025b8d66c9294ede71ed37b7df256476cc640f7b7ce74cc4998c0b4b5741b5f869c486f1eaf4793fb4b2f347ba069f859e1c5318fa8df18c52377c83f8a09d"; }

     

       54
       54
       -
           { locale = "en-US"; arch = "linux-x86_64"; sha512 = "a551550037fe762d6d06a4f046ff4e2f37cd2607aace13df5ba2e28d643ddcef01210367555fb2fc66c6fe45d83f0306f61f4139001d1059ea5e913fbd43cd69"; }

     

       55
       55
       -
           { locale = "en-ZA"; arch = "linux-i686"; sha512 = "3e4721593a69bc289c7299b64e91af0ff121d59ded0167bfdd6692dc6d7a0ce0b0a7e8e89a591cee9fb90dc8b9eac26c5d978e4443b1d3462a0f4030ec8c5a50"; }

     

       56
       56
       -
           { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "76e069c8938cc133576c934e4049fd4d8920d8a823122f1961d4ab69802e9e52e920873fc1406dbab01edebd0cc576ccb12df0ebbf5487ddd49c339111bf7101"; }

     

       57
       57
       -
           { locale = "eo"; arch = "linux-i686"; sha512 = "ff071fd2545a8dfe0fbb1b1dae57d3fc4b0743698e54746da1f774b568b2b9ad9b0e14e2cd27f56031e1d159a05ae7d54060509532a7503b3dcc7fffa442a514"; }

     

       58
       58
       -
           { locale = "eo"; arch = "linux-x86_64"; sha512 = "7705efee2c65de30a0efc6ea0c372061f47c4266ab7faeb6feb01bfde4324ac92ed99a9eab81d8c4e2e6972245953a200c4331b26845eb7a2f9e048fb3023840"; }

     

       59
       59
       -
           { locale = "es-AR"; arch = "linux-i686"; sha512 = "3c08ab10d76650fd11ecd9616af1d4646fabdc55b63c7625940630f8aa25427482a3ff04052b91e6aceac708ca187552f7c87343d08c01cc1b4940e341e1672b"; }

     

       60
       60
       -
           { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "b6d700123f612b93b952f05bfa92dceed8878ad20a84214f8daab63e4eb669f1f69a9a5d6d28896b16b19d3dbd710b98a4851d7f611bea0fd79e41930c3d838e"; }

     

       61
       61
       -
           { locale = "es-CL"; arch = "linux-i686"; sha512 = "7c64c7f7058b1cb3bd5f55b1afa0bc2e779d46d05e5dd354fac7573ad6245ba31aa126301d827ffd17f197b460be24c98ad7c2a9a3d4c66cb6189618a4e38ebe"; }

     

       62
       62
       -
           { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dcc4b4085fd4e480e79ca85b862c421f6e85d200d46b40178ce27177c1ac00f0d19d0c71ae3d7c12e15bf570cd0234743d080d06dae1e9e3c0c2f0eccf4bdf86"; }

     

       63
       63
       -
           { locale = "es-ES"; arch = "linux-i686"; sha512 = "d049bada399fbc723ceb14aa116b9218d14729cca6a2297d852782e4d3a0cc7e278aecc62ec4b7f1e1c5af10f65d0cd0bd39e6fbf95d989ce4d2ea5b0e2f7901"; }

     

       64
       64
       -
           { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "a77978f8af7f932151468c9e002731c8b6b3e9d3d8d8dfdcf28cc545b63f1d859b99c6dd25c547201b050f58bde9a55fc67b8134ecb0c893ce50f7788774fe99"; }

     

       65
       65
       -
           { locale = "es-MX"; arch = "linux-i686"; sha512 = "46a7bc0f112f99ffc218e0161116b373c5b496e8d73744f9ed341fcd0fece5bc4618bcaebd68cb0aa80bf86078163d92205d322464dd8a918463507e4a9bde9d"; }

     

       66
       66
       -
           { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "412f52d4eaf3f85cd452d18164d2ce13d3057b45bd4f81ef2255a3580bb5b7e68f23dfc8622dbe3c4d69291b1fbb4a3312a429713b940b081415157fe5dc849c"; }

     

       67
       67
       -
           { locale = "et"; arch = "linux-i686"; sha512 = "34d56c20cd06f224d1a3916a12bfd3f076a1659d9bf21aacacd5bea59e789ff496600b712a12f0b67410da97e0500d2f28f1f916872bd223f9f3b913ac648552"; }

     

       68
       68
       -
           { locale = "et"; arch = "linux-x86_64"; sha512 = "383a4e2b28217651e76a06dd84eed5f058bf53c25847a6ef0ad1ea9e6a3c98f6a94ef05999a92f03f669e7cea0df11654b201c4e21fc595fcf99bc91b90c05df"; }

     

       69
       69
       -
           { locale = "eu"; arch = "linux-i686"; sha512 = "cae20dc1b9880dcd9ecf4331bf1b6c6208a63ee3490ac8b827c9e338916a9d07e447f93be4108db78ce3cc96b8d3828f1882c28aaf28f198fa4f875035ca5835"; }

     

       70
       70
       -
           { locale = "eu"; arch = "linux-x86_64"; sha512 = "38ff3155783328b685c72f1ada0e01ab8a8fb75b191455dd43de590207f9b3a258da7cca6ecd3538a7d8319c8d1372e174fea0a22baecb497ca33aaff80a33d2"; }

     

       71
       71
       -
           { locale = "fa"; arch = "linux-i686"; sha512 = "6d4d15e4897568d32128f193fa7bb413e63cb2bca23b81a16cb5b9ae7a558b768193461a182552da1153dfb708f834434a1fb63478cb5fe7984b91d00415ea34"; }

     

       72
       72
       -
           { locale = "fa"; arch = "linux-x86_64"; sha512 = "6439f27cec2a8af66a4e68406c88b536c5f8e2b0202ce82aa46e75f840cb3977ddb041d8ee315d95505ebaa0e37b36afbf26ea0f39310cda09f6e765eb7bb120"; }

     

       73
       73
       -
           { locale = "ff"; arch = "linux-i686"; sha512 = "ee9114fe358d9a6dcb7e404f13fc594de9339fc7ad126063b52548d42aaedac7abbce9e647766462de2716c3ad248b6992dc04e96ea3816068e884c30a3bcf84"; }

     

       74
       74
       -
           { locale = "ff"; arch = "linux-x86_64"; sha512 = "beae2223a6b3aa555c071b51a46d3b0758efa53b6002f2486554f5bec154cfc1a1598f0175af654fc47a60a170eda916152e959a5ce2f799b779e5040ae15c5e"; }

     

       75
       75
       -
           { locale = "fi"; arch = "linux-i686"; sha512 = "d8414f63f04a5a9c916487f93c67d2368bb4d8c8fb757c1d58233e6c6e6bde139f323b1c77dda57730173c6005b2647c688f7072ac09c1962b04a2493cdfa18b"; }

     

       76
       76
       -
           { locale = "fi"; arch = "linux-x86_64"; sha512 = "7e0fce63b69653fa5d0d0ffa9598d10976a1f49aeeb48bcd8eee26b51ca1f6d1d898c84944a442d530abcab700dcfdf89c48ca23db9d835c877388a8f694b7ea"; }

     

       77
       77
       -
           { locale = "fr"; arch = "linux-i686"; sha512 = "c3bfda75397d644bc4392ef87f1d24faa033f4c5672adc4d5d0007d5fbd63efd7f46a2febd0bfdf95d8f06152d274daf39ef6355e049e7fd5e53e2d750d03ae0"; }

     

       78
       78
       -
           { locale = "fr"; arch = "linux-x86_64"; sha512 = "81c8091c9d8cc1ede738bb1d9b4fe72580d13de7e3f89410d1c684ca017ee197837788e63243c9722b30e23b2c910cb54fc7985f4936bc6068643a504d9a4ebd"; }

     

       79
       79
       -
           { locale = "fy-NL"; arch = "linux-i686"; sha512 = "59797af1d76fb2afceb06de28c6fd13bdbc14d42c61f87f1f71d8273e03aa691e2ade3ba0361d19721862878c911ec46ffbfd0431d19d6ec0a92ebac05cfb4c4"; }

     

       80
       80
       -
           { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "19d0cfb01374bf2842a17ef4e9f5ab85280c1090723c1657459a230262d22aeb14c2faee1b86ac0b342c5926cbbf0479f2e1ec315117c06ad3272a3362d02f8c"; }

     

       81
       81
       -
           { locale = "ga-IE"; arch = "linux-i686"; sha512 = "c1a4fe00a36e95fcd33d21544ee6b4fa5a6eae0628a37c27057cc801a641fbe5519818ccc157b87b64f24f4886dd6dd629809c89b9c89dc4878de794e48b107d"; }

     

       82
       82
       -
           { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "8d9654ecf7b6cb43b4794f345105c779809b9bd39a9dd46a0fbb1920139e9234e7433fd9a8d7dd57192c738d187f97ab82c8dd3f3a2460e3a34cdc9e9a5c5089"; }

     

       83
       83
       -
           { locale = "gd"; arch = "linux-i686"; sha512 = "0d48b2886c431a9237293f24fa5f8cc7104a3373b24c98e23bbf93f66aeeb5b8b9e737712bdd1c777db19bbd6b01f9a33f0c388b6af023d852cce6543d486973"; }

     

       84
       84
       -
           { locale = "gd"; arch = "linux-x86_64"; sha512 = "0339b6952f993d38686d92ac9a664cfa558f2827b92ae3464188f12e28e2676c8c4718cff62a840dba14de687434cf13902a621094f63e1bca1ebce321800d15"; }

     

       85
       85
       -
           { locale = "gl"; arch = "linux-i686"; sha512 = "5cecaede8ebdfb58951b3f839388b81dccaaaa5d3b4fb5cbf26978b23cd962905191fa91d961037fa15000af47ab48042d272fd18a73e5ed4dcc2bb0ff4416ca"; }

     

       86
       86
       -
           { locale = "gl"; arch = "linux-x86_64"; sha512 = "d1a0447ce592e7d2a8564d9c27fbce5f9378a4e21db3fa501782e57b6e13ede6f42b612fffea32e8891d47010509ac8e3ed1f63c5a81878008f9bead68b6b750"; }

     

       87
       87
       -
           { locale = "gn"; arch = "linux-i686"; sha512 = "aff2f407e4c947d3e34447b43e844135562d79bf937a05dad5ce4dd1853dd479f35b4f6af1b2d8b52deeb9786a4fc67980cbf58ad82a747a7e55ea753a50ad43"; }

     

       88
       88
       -
           { locale = "gn"; arch = "linux-x86_64"; sha512 = "78645796fffe364fcd28b80cde591d88db91a756318f645610f6823b616222c0c53faf8d55aaf1703d4bbcec1e8381cee566bb5739ccfa181e1d1224408463de"; }

     

       89
       89
       -
           { locale = "gu-IN"; arch = "linux-i686"; sha512 = "331bc227d138a49d74cca37f8d7ba4e6eb891064357aa5b0606761f9af8cc4a029816a3a96cc3ac4dfb71b1d010c569940ebd70375fdd06af7b6b487bd90dafe"; }

     

       90
       90
       -
           { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "d1f6c5af9e75e76683d39281eb559ac688436eae65d6bc486763028744af030a6c311d1f0358ead5e88ead60357261032dd739251352cde097986251dfdff325"; }

     

       91
       91
       -
           { locale = "he"; arch = "linux-i686"; sha512 = "7a49d8cabab6aa8480026de6b77e1b6d60333c580d2b9591cf3fdc8c491d269f6a7a7f93118594de8c87576dda868f12de5a88f494736f721ee3ddc16a9afea9"; }

     

       92
       92
       -
           { locale = "he"; arch = "linux-x86_64"; sha512 = "0eed4301d7949415d21426d9e52825710a0f48a1a0a3546f62d757059091bf12b3b53091f2c3102de0682162e3982a9fb58c111c9a6b8245d84825892e1d6844"; }

     

       93
       93
       -
           { locale = "hi-IN"; arch = "linux-i686"; sha512 = "70ecabcdfee807b1a7e0b6a167bab07d3df798672a61bb7b80d1d6c3ace9385c472e08dd31f2c4c684cd5e723e7024016728df7b22943d3adec3d770ba7abd1b"; }

     

       94
       94
       -
           { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "11e8be059afa8298a23857bd68b2f895bb60f73378c513d2aae0395b5faed68123631d9ee44b5608263334269e33b76b4563c063b2feec486e7a2dac1be42275"; }

     

       95
       95
       -
           { locale = "hr"; arch = "linux-i686"; sha512 = "2c99b81cb0c8413aa98dcbac2cbd45d59a440c173a9cd744b78ee0d60b82ec4fe4894fe5e313d51b81caf6b86f40effdb36f5fd90c73cab82acf97c20fb5b152"; }

     

       96
       96
       -
           { locale = "hr"; arch = "linux-x86_64"; sha512 = "fc209d82cbc24eea777a4318f5555d2cea4828bb7f305f868b8fca18014ea7c930f778c716eb0b9c1a7e29d9a4353b4c537900f9d659c432d6a75b1eebf30963"; }

     

       97
       97
       -
           { locale = "hsb"; arch = "linux-i686"; sha512 = "3232380f15a33f31f8e3755707231ba0725b9afdae1d2a0d4fb2eb883ab4dcb5c8aee75549e41e7e2cdf445b6f39331b2be4d7e417604987c7ced46d2dd5dc51"; }

     

       98
       98
       -
           { locale = "hsb"; arch = "linux-x86_64"; sha512 = "11bb460c404316c322e2498986ac6e7cb976a196de7208ee54dcd4ec61b8f05fa8f7782d6cf462cd5531f3137b1688b7797da2d78437e3c4d4f95867c781953c"; }

     

       99
       99
       -
           { locale = "hu"; arch = "linux-i686"; sha512 = "40c3837c7ca4e0dc9e97e4c4422e54cc3ef157933ce9969abf71fd422fbcad517a6f6da3bcada83d3567323e83248a060fccc8a23a7f6fb55568a5b7ee0ff464"; }

     

       100
       100
       -
           { locale = "hu"; arch = "linux-x86_64"; sha512 = "d05bdf14ed9c72031a29e7e9b39afe79bd2ccdc69bafaf8c6196081d462b0aa57a220a8a2105812b215067494c53de8adc994fbbb3549ccfcadfc15f99c710ac"; }

     

       101
       101
       -
           { locale = "hy-AM"; arch = "linux-i686"; sha512 = "a9da495cc3e7a1e89ca8dd7a3db6c83529e0b7ba6562e7f0542f8b9c93bee8e4c219973b0b6fda1abd046d933fca718fab1f6bd4350ee960ddd89144dd321ed6"; }

     

       102
       102
       -
           { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "53db4843e0c9e99188e28bbe46b09239d998a3bae35ab79954bc6eedc5e73c0f3010c500dbb93f8a6ee2d5b22fb3ee9fef9ef6eef2dbbadf4b83f948282a8bc3"; }

     

       103
       103
       -
           { locale = "id"; arch = "linux-i686"; sha512 = "05e7450a164c940e43ce34f6b7c9ad610d1652f11b0f030dfea7c9d8539961b2f3e69ab0d3b8d714725cf3e8bb256f18f4ac3613bc86bbf6223d9914e4eb77f3"; }

     

       104
       104
       -
           { locale = "id"; arch = "linux-x86_64"; sha512 = "7ce0b880406dfbef90ca6ae6f121eaf72bd289e7b57f7686ea83fc182cb9b54a3e0bd8b23bffbcfb3c9e82a6b13c7afa16ce56d426f33f66072db4b5f466db04"; }

     

       105
       105
       -
           { locale = "is"; arch = "linux-i686"; sha512 = "71446911d5142ab19308aca456dcc1d4d087db07898e331604230faa58c2146b980212880c7f88b6e3770b303a8450cff9e447638b5a063daf50ec25d29de738"; }

     

       106
       106
       -
           { locale = "is"; arch = "linux-x86_64"; sha512 = "2542f214cb2474eab97d18a1daffb1181fff569058b91c1c9d7d6400b8401020b69ea9492fca55153c904289be45215b37ed0846d563f8f06ba401c482d59762"; }

     

       107
       107
       -
           { locale = "it"; arch = "linux-i686"; sha512 = "bdf0da50be211492e2acdd9de223ef741fa916c54e94bf9c8eb20685006b68b5f430949161199a915c368d11143caf828c25b2e82c33fd5a61bfcd05de53966e"; }

     

       108
       108
       -
           { locale = "it"; arch = "linux-x86_64"; sha512 = "a4562fdcac6d9ba96fc840498bbb381de6190158fea65c4809ea1ff3518181ed47b7c33bb772077975fd07c23a1e8700403cb6cc67c5fcb1c24e72563214f4bc"; }

     

       109
       109
       -
           { locale = "ja"; arch = "linux-i686"; sha512 = "cc81a02282474928e7d2efc694761168db022ffcbf5ff32d92c21b90edfb194187dfb78f2eca4c42e60cfbba8ab6614c1c7b0359aaecafa47b1c9d3918327cee"; }

     

       110
       110
       -
           { locale = "ja"; arch = "linux-x86_64"; sha512 = "07cd92b7f9647f774b080cfcef828899144cb03472d70394be197c43732b164978e1d9ebc9212a47b58fdcc61f5009328e766f4c6f799f35d73a4dcd2b31fdd4"; }

     

       111
       111
       -
           { locale = "kk"; arch = "linux-i686"; sha512 = "1bef31c35180ad7fd49ab695a6985d8be301a6802225d319e979b8c716e78a5687753b6f63516f4b4221c402a2d2c8c0a0e22aec9023cdee98d71a4335728e7a"; }

     

       112
       112
       -
           { locale = "kk"; arch = "linux-x86_64"; sha512 = "dff599278a27fe2b4efbcc99b7ad3b211ef5debbf1b95d765a36fdbdbaebff69936c250018f237843481244e2b02cb8de4e3090d9422adcbb3d8af4239759269"; }

     

       113
       113
       -
           { locale = "km"; arch = "linux-i686"; sha512 = "0080783187b80019cb4c56e2b30a1a403c632defc375adab7d613489fbf7f217a22a779f0119e2810ee9f0bd024418ffc654df146873a06f59bc7f1de5fbf244"; }

     

       114
       114
       -
           { locale = "km"; arch = "linux-x86_64"; sha512 = "84d1ca7fd0a4d6a39aff375e922dcdcbe51fb2b497c6eebc312abe6cb5b29bd049e648197f0181bb2ee1b47b43275c14eb13233958c0bd4f7cf7b28e5725de97"; }

     

       115
       115
       -
           { locale = "kn"; arch = "linux-i686"; sha512 = "2dac35157e3264547726ad33f786bd86e52a4db8aa8d1449cdfa9993e5bc16556c6005e06cee915e427e74b3eb4eed665a4a6deed7bf3800a95319346fda3690"; }

     

       116
       116
       -
           { locale = "kn"; arch = "linux-x86_64"; sha512 = "175b3edf58286a229ab4045ca2d75f8a00e8ddcac532fbfc8aee5a048e0ae0cd5044155a8619d6dc53756150bce2d46b910e1abe216bf537d259435199cb42cd"; }

     

       117
       117
       -
           { locale = "ko"; arch = "linux-i686"; sha512 = "1db17eaf47e7916366d05021d683c2b4d8f26316abc057a450d24a5d19fa1ed9aaad2f7a45cee63c0f021d93214b62a032d17312cdb123289b31dd2e5bd43808"; }

     

       118
       118
       -
           { locale = "ko"; arch = "linux-x86_64"; sha512 = "4bc673e54fb0c30b7c8389c2a66b322bd4b19e8635cb3d633754214c0726fb95d3194d09435bb4afca17e6cb3f03f028408d13f9ed44d8c2b9c323eabe5101e9"; }

     

       119
       119
       -
           { locale = "lij"; arch = "linux-i686"; sha512 = "8349ba8cf921d73f0c3bd54c9a30df9c0232d7686724a0d635435d65a6bc8baa1915e25702b930cbefe954b5aedd1d3faeaf54ffa9b5dc494e465a635a57369e"; }

     

       120
       120
       -
           { locale = "lij"; arch = "linux-x86_64"; sha512 = "e12597062c060dabaff08c251f82ad63f534c341d1afa94e567c763b7ac290cbb03a27726e03b449ff89fe8b86b25211e807ef7ba34e876d902705f9361d5cdc"; }

     

       121
       121
       -
           { locale = "lt"; arch = "linux-i686"; sha512 = "f67ff28a20ae0580aa537797928bf84cdc088cc0df586071a460eda6ea7b96337a5004b2689688a487ed246b5d83a14bf77a5002f39fe7ccc46e92f65b565cf1"; }

     

       122
       122
       -
           { locale = "lt"; arch = "linux-x86_64"; sha512 = "f4ffb37c69b9c69e9ea54d691bfa3c069b28d5b1b0b48b917f4c6f10c1434bb451b7c17e777b5daf3c869eeefb2a064264bba7591f681d319fcab00335b37384"; }

     

       123
       123
       -
           { locale = "lv"; arch = "linux-i686"; sha512 = "7efe759ef2f0e585a8887e829e2bdf917209efd5b3d5235f5765c0995206c25941abed9b11f9241da565a919f94890682a944d2bb7dd1d1360f67f173dcf2852"; }

     

       124
       124
       -
           { locale = "lv"; arch = "linux-x86_64"; sha512 = "63cdba3ea94fb1847913a42ba70193ebfbbf1235a28881c7d671b20dc8272c5989dcb8290087a0862cea7a4c8ff448ee61b42a13d6c03c8787be1dbd957769f1"; }

     

       125
       125
       -
           { locale = "mai"; arch = "linux-i686"; sha512 = "0619cde7ad13590d2da001fdf87e2fe9772d65d1ce468ea2b1f3085d8c6c157f48d23b343e6886969dde5827d12a368e208242dd16df4e498893d53f030665d7"; }

     

       126
       126
       -
           { locale = "mai"; arch = "linux-x86_64"; sha512 = "f65ab5c51b7dd0f127a4b9f65a0280002af3387b12e8730f8efd79f4700f6c5f5842e3f634dd738571995dfa52ef58ec0d68255ceb52c6a7df0332797dfab253"; }

     

       127
       127
       -
           { locale = "mk"; arch = "linux-i686"; sha512 = "e6d2bf183fc1fa88d0bbccbf058344e8dada0271694ba3bfc149e965ff16ec05ba6f7a04cc39f3657524555e84f25d072d7922fb2c075b0bbb8cd933336f1d94"; }

     

       128
       128
       -
           { locale = "mk"; arch = "linux-x86_64"; sha512 = "68a96a11e38944d654d1aa720b5a099fd0789520b8681f15cf33d972956e7dd2c44d940ea0b2840c48db79615aed8c83d3f19769908752f960f84a7bdcf3a2ab"; }

     

       129
       129
       -
           { locale = "ml"; arch = "linux-i686"; sha512 = "32c8e00f71a7fa609c3b99799f64362962d245d75865ce54fcd72e8cefc45f5cec7a99ed343a7bd92614569e62a02ac0e712b4ca3fce3d5d0f2f7ad52767c209"; }

     

       130
       130
       -
           { locale = "ml"; arch = "linux-x86_64"; sha512 = "c641244006a11de3b6ae947f2d5bf8b40fd4bcde8e7b71d2fa2a8258087bf3d6382f21b10b05b2554f031ee95a579d31d0e0d8f1b72a5e1101acb31075aee02c"; }

     

       131
       131
       -
           { locale = "mr"; arch = "linux-i686"; sha512 = "3949d3e4d9fa507c50f5ca92ee9cb041dc9d034f78d44343139a1576f128a06d8ef3aa2b1fcfe11d77a7489b0f7dd18e14f0ec0fff595dbefc219f6b1eadd969"; }

     

       132
       132
       -
           { locale = "mr"; arch = "linux-x86_64"; sha512 = "c323cf8842f695e47f3c91d356ff63bb0ce7a5cf47cbe874dc6956d90fd84f6330e6e1f5f0bbf61e2cfda66a2dd0e81a756f3b464108e7ad84450722562e5906"; }

     

       133
       133
       -
           { locale = "ms"; arch = "linux-i686"; sha512 = "f5ded01c47ac91d506a10774b198b3c2fdcff35a10ced17cd0cd94a1e367d489f2afe7ae22d59beb420f771684cefe3724c88313249a4c6072ce68f36bb16cbf"; }

     

       134
       134
       -
           { locale = "ms"; arch = "linux-x86_64"; sha512 = "39d4a052c21fe9ee876f8b8a7fabeae9a6a30d959e1a7b27b0a1fd08658cac5959aa4879e3056675e2b7de83f588cf82f5d138f2ee5d9b0bbd135b51de109f7b"; }

     

       135
       135
       -
           { locale = "nb-NO"; arch = "linux-i686"; sha512 = "6cc34cda3cccb3ce92f44244e291dc94238292ef6e91172d73659ca5b4b46fd004483680a7a45ad3643d59c57c7fe7bf4286f4cf7c903301eb39712db9bd3583"; }

     

       136
       136
       -
           { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "da645c69d2675bdd1d2808f0d7446ded4414311bffe5f1a37a685f6f4338a56e831349a1a7904c0332266e909e4e82085585afb14b3fda7925698d66e9912a65"; }

     

       137
       137
       -
           { locale = "nl"; arch = "linux-i686"; sha512 = "a2d906caf6b4c36305cbcd2840915000c53db2ac03122aca162e672014b217237363bc309cdee5ec19d21106073044fe8668fd044805161bf4916cdd938565ed"; }

     

       138
       138
       -
           { locale = "nl"; arch = "linux-x86_64"; sha512 = "6288c2f0306aacd87a82a3a6262b514f32a177674e6b96eeb5a8f937ee36b6573d8a3e6925be87609e4d7dabd1e6367eb0e730d87148cd50c1572756bb098a5a"; }

     

       139
       139
       -
           { locale = "nn-NO"; arch = "linux-i686"; sha512 = "04454f9f5dd2611cc76575a41d56f6819c5b97e213f82ebf0aa5e8393d9cd4a99a9df5291d3e3c3985396a99559f39fe5dc6a85141ac1d2f4919b731d7539a89"; }

     

       140
       140
       -
           { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "fb55685275d0b6c9e47b0356bd4249feeb3005b338d2a2caea4bb7b86edc6991752af9276db91f448032ba7d9e01209d92706f7612531232f87c05cbcb13f337"; }

     

       141
       141
       -
           { locale = "or"; arch = "linux-i686"; sha512 = "16639bc10229e171577abfeab841bd7b5dc411f4e314335787727803a486b8f04e8730a7be9321172fdd60791fce7363d5ce5aa28628cc4d2b7769357737cd0a"; }

     

       142
       142
       -
           { locale = "or"; arch = "linux-x86_64"; sha512 = "041f3a63a4cd9c0f287132252df7aa6d7eedc72650244729e01eb52a93a9ca8206a11cd7783e7778d4cad9a525ce2aef1c423840ea5c54fa202600a0b5805e31"; }

     

       143
       143
       -
           { locale = "pa-IN"; arch = "linux-i686"; sha512 = "7c9cda0d9dd9d1196ca33a58b6f5f3c3f09896bf65e8fbeed67fd9811cb1bdc12b7ca8966b7612cad524a3bcc9dd1e2678627f6cfe172b1bfc2d9b64eaac17cc"; }

     

       144
       144
       -
           { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "56507e7e1e93ae880de5410b4ad8c1302f58b43ade2ee4dc70c1290334edf2ea05f7ddf2ca00317ee33662de29c635caad8f73332935fd5bd4ff6a37758bd195"; }

     

       145
       145
       -
           { locale = "pl"; arch = "linux-i686"; sha512 = "52cb7e700e541a82328c935a0a99313dad6b7699c09a1386697c77544284d53653705ec6d57f3cc1bec632962217c090ee39687a81b19f3a3af2178eba9a1eae"; }

     

       146
       146
       -
           { locale = "pl"; arch = "linux-x86_64"; sha512 = "77a99740ad99808a31df3e71038944901fc0d5339f919cce40389de67baeecf2b9c34608194ea1f0e4a25bbaed0ba06159d10ac8816735b34a2e28ab041ae97b"; }

     

       147
       147
       -
           { locale = "pt-BR"; arch = "linux-i686"; sha512 = "e39d9b22f8b7226ff2908b34847fb77cbe0c834f51985712024de83ece7549c8a89c3ab3d81abb6bfe6a7b21f18dee2d87926abf3d2edf9f8a8976242a4dcb26"; }

     

       148
       148
       -
           { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "a03a0e37ecc2d903715b70eec0a4b2808a913a8e27398dd96206295e1e765283e97b76ba278b394f9629e352c10cdb2011f3184b903d0e6de784a13abfcf9668"; }

     

       149
       149
       -
           { locale = "pt-PT"; arch = "linux-i686"; sha512 = "2d511400948ce05358b9400752bba41cbd947d1a4a5a5a92f982830db92507e257c28ae319f411717253dd53a1a7e73607f9f62fb7b7c8666aa339fdc73ce728"; }

     

       150
       150
       -
           { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "71e2a000333ae8565de6fc9d01e871c2e894f96a9a2544a21aac08ccea0399da37d74c3230c4b3cb7ba0231fcdddaa417f78e48848fda8f063179766cb675038"; }

     

       151
       151
       -
           { locale = "rm"; arch = "linux-i686"; sha512 = "4337964e6daa7bc799f01aa52a33f04c060288bbb881c2321ef938658b57f05b632f734ea0564cddd0078f4b38d1c8cb2c2e6221849ca4aa80579f308fdc2056"; }

     

       152
       152
       -
           { locale = "rm"; arch = "linux-x86_64"; sha512 = "a55e250de5e11ef808243ef974fac8938c70269a36bcf9db898a11997722b8d96d60d76ca28e41e023b4c7e6614e323479d3d4d2831b83655ad3ae3eb5ed774c"; }

     

       153
       153
       -
           { locale = "ro"; arch = "linux-i686"; sha512 = "17171889ac7647e525783c96afa5a5de796d603c8fa6a7ad8d12205ad510f869b35f0df79aaa04e4b980c86ceb923f89936499df7e55539393e40ac92c23bb1d"; }

     

       154
       154
       -
           { locale = "ro"; arch = "linux-x86_64"; sha512 = "721912e5ad4b0ad0727f0185f660351b3c59291b3a22aa394f01c26ee87366b43b5aa08cdfc164c16117e1650837bc2007e42c34756dc26466edbb113f11fc09"; }

     

       155
       155
       -
           { locale = "ru"; arch = "linux-i686"; sha512 = "28dafdbe6ae4fdabc061c68ca82dc6ab8fc463da11c712500378d90dfb662d6e0991f35a918315ce138603283befcee182092ac4f8d348815bef27431252874b"; }

     

       156
       156
       -
           { locale = "ru"; arch = "linux-x86_64"; sha512 = "27bbd48859f5ed6053a2062778537f4952a0847ff74d2dd407766ef4b4f144903167b4fe80b98a5b2b80e42d6b730bdfed36fe9a958d247a335bf31f091b8c70"; }

     

       157
       157
       -
           { locale = "si"; arch = "linux-i686"; sha512 = "0f50616131a3b80499885ed5fb8573fd3ebe522cc893496d03e48ac6eafbc2a5224240971b66c393323d2583512dacb73f3201eef1a495298badad605cc76bb3"; }

     

       158
       158
       -
           { locale = "si"; arch = "linux-x86_64"; sha512 = "37996cbc994a7527c2ffc5143dfe970ae2fe0e098f0bcbf9fd4643e8297bddbe7fc0f4af2f2ee15b0807c339c25d780040e2f9f03975ba9f49359052a2be271e"; }

     

       159
       159
       -
           { locale = "sk"; arch = "linux-i686"; sha512 = "db95ce3b68fdfdfc9916cfbfa6a797370ddf58f5aa234d59bde6e76cf7fc0e821e9954cd0ce090404f5f718b9ede9c1ae6b9c7e37db9e64eb9d9dcfd975c6a79"; }

     

       160
       160
       -
           { locale = "sk"; arch = "linux-x86_64"; sha512 = "f9e28572c83e70c7658fd67abce93d021600fcf6b8daa7861cb6eff315a28c0e531f1082f6c25f5779371b2884c975fbc22cb953aaf589ba6b050bc736d25d9f"; }

     

       161
       161
       -
           { locale = "sl"; arch = "linux-i686"; sha512 = "e40c201c5e892a83a23ac9f1af22e9274bf6d964b39bae2e191bdac100170685376fa81210ddca38c76e5277978772c693563e55871318777cca7ac7e47fd1f3"; }

     

       162
       162
       -
           { locale = "sl"; arch = "linux-x86_64"; sha512 = "ea4a198b300e2fbb23fdf863659b683b772624cf4f6c2c3e5e07af9a3f991a8fdf7113f852646f36f697c705c3a6f24485dcb8e2d615a3a358bfdfca406254a0"; }

     

       163
       163
       -
           { locale = "son"; arch = "linux-i686"; sha512 = "b510efeafff8c32ef3b7f88e81d4c1a1c1b2bb435c2ed4ad69adbef8f5d374677e2231f94700cdbff9e5f747c712d8f58245a4c8f0d38ac3eebb5adcdc42c7ae"; }

     

       164
       164
       -
           { locale = "son"; arch = "linux-x86_64"; sha512 = "8c8d583e7e5ef1363096c905535c8e6dd63900ee50684d9cd36b4e55100930b8fc8ee9a3ae770128cfc71a30a73f331cc508555ecdfd3fbbf359ad08d5cc9519"; }

     

       165
       165
       -
           { locale = "sq"; arch = "linux-i686"; sha512 = "809ec8706df6f3538e3c53765a1f1834cee3d2d9cffbfb1f3e991faeedaca28a2dc3d4e037ed9e00d58ac6cdb27f5575bdafdc454828d9fa988d7764bca88c0c"; }

     

       166
       166
       -
           { locale = "sq"; arch = "linux-x86_64"; sha512 = "6f2c5778d40e9bc5bb558ac626becfcbe33c42e2a2e588ee59065f60643708ff83be55a082b383f7747241ad8d59c0e3e13bc8556967f5fce034ee23d7f054f8"; }

     

       167
       167
       -
           { locale = "sr"; arch = "linux-i686"; sha512 = "cc0e0c039af32611d489bf082dba5ba971b54b22937d4b8fa80150a560a3c452851e67d02f7cb27e1a63229c9a42da449f932cdb88af342e0146022586de109c"; }

     

       168
       168
       -
           { locale = "sr"; arch = "linux-x86_64"; sha512 = "21928411981e8d3fac5e44f02173a08ad4c3135ec874998d6ddf5ef2821226ffee260023e5bb45848a40db19537b1d6cc0b127d9524c0d0616d80618ab1d9228"; }

     

       169
       169
       -
           { locale = "sv-SE"; arch = "linux-i686"; sha512 = "cddd222328f1099c25591b03abe23692fdccc82405df127ff920818fb7952fe384fc1373b1330b971d196e98acd62b3754711b38876050ec3cce7de20f183b79"; }

     

       170
       170
       -
           { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "06c819436de292d531a9d3df34b76bad36bb627e0e45ca042f2dafb06db14cc23e956dc2e00904d5147bf7d0b39c16f712f2b8acb1d9bc4daa210d56d8058e22"; }

     

       171
       171
       -
           { locale = "ta"; arch = "linux-i686"; sha512 = "5e8560e423aa88c1fc5b61cf91c558a861a58d09d7e560790ba835f0bbae85cc82c61e1eb9e1a92e632d2fe24419d3eecec4a15bb083bf0c1568a441a5586a50"; }

     

       172
       172
       -
           { locale = "ta"; arch = "linux-x86_64"; sha512 = "6ba48474d930036d77d23b717fd2e592b19d0ab2b4399f7a6f7bd36da48cc0a2dea9c25442928c507cdfe8a8f37a8d0e4ddb94da42a7a3d6c2ecba26d4f7dd2f"; }

     

       173
       173
       -
           { locale = "te"; arch = "linux-i686"; sha512 = "2df2a46677c979b8702700c69f687e8bfa49e879ccd9204a1ca876b7a5f8925abfe6f81f42e6d6576aff6cea264cced854ae536a3cc01ed04b7a536396e9ff33"; }

     

       174
       174
       -
           { locale = "te"; arch = "linux-x86_64"; sha512 = "d6c7bdb7a823be0cbe8286b977cc265e80ae290ae8fc4002a7dc71eddb3b80a3796e66ad1e00fe2e797ae83272422f460defa86322dea8e33ad0d7dfb50491de"; }

     

       175
       175
       -
           { locale = "th"; arch = "linux-i686"; sha512 = "eb017475d187ef4f1329d303bde84a17995ed84458923330c2ef61940c86674c03f06de2e3655885df49cdc384d1b8e952dfe8ce960cec738f99b8853af1e018"; }

     

       176
       176
       -
           { locale = "th"; arch = "linux-x86_64"; sha512 = "cca6fe63bf24ca1db9d736305dff312f334cbe0a836cb181fdde85c4b2e383e1a19135f441a1f07c69cce716a4c2d3fe42a07fe3c91146aa6598d651890ff049"; }

     

       177
       177
       -
           { locale = "tr"; arch = "linux-i686"; sha512 = "98aa598f348be7705c11834f6d174fa19a8408b87193a93f641c4fe92898f3175f79a1bef9c66dc93c3cc19a372930725025d7ff1bf178e951c9d5dfd675ff36"; }

     

       178
       178
       -
           { locale = "tr"; arch = "linux-x86_64"; sha512 = "a4c2d82f7e56e413526cbe40eb24df79ea264b37dc09b470ccf3416c922730d714ad166507f06b6a68fc85ff73df73309da936ff56499cdf81b78fc973675c86"; }

     

       179
       179
       -
           { locale = "uk"; arch = "linux-i686"; sha512 = "cc04ead20aa1f6d3a8ac470ed3fc69ac0d348ab0523308ae56b49734785fd63bae4ac6fcc32bcac3f2e9350ebfefe76fa39efc2a7a7f5d7c2309b6999f490e90"; }

     

       180
       180
       -
           { locale = "uk"; arch = "linux-x86_64"; sha512 = "1f29246b8bd1a4e07af7b30c2ffcb5239ee5f870e529227e96c0ef091cf9d9d8783891b2e60b0a5dee10e80893ddc6a5cb972d27e70ae4cd0f820ba9f60a2165"; }

     

       181
       181
       -
           { locale = "uz"; arch = "linux-i686"; sha512 = "d144626529e57e93ea12ddca25184903b78b878563302c7f14a396435187791d2a14482a7d10bb569890d9483253474634574f105b9c79763ad6a85fb10de73d"; }

     

       182
       182
       -
           { locale = "uz"; arch = "linux-x86_64"; sha512 = "4e6b7706c6f529739a18748f35d7e31071c6818c0f83261e1d31e66306fb40ac94573f7ebe3b811f4c70f88a2bbca29528b868821962e88ba30dbf84039c5ea1"; }

     

       183
       183
       -
           { locale = "vi"; arch = "linux-i686"; sha512 = "fc7144a73551e09196b7c79e4fcf1ecf5ad92b3e54e8a203e213627133df0260dc53f0cc9bb9e03ccae0953de5f2752e303a35e0fdb720a40637e5b31edd3544"; }

     

       184
       184
       -
           { locale = "vi"; arch = "linux-x86_64"; sha512 = "7a38b4814418516c8971825616874782512bf91d51a798fbdb1b8d8a817d30e72d9fde45238602a6de9cb9c53cd0512acb07f6e16a819ce24fba6467ab1cc8b2"; }

     

       185
       185
       -
           { locale = "xh"; arch = "linux-i686"; sha512 = "0fe791a3270343598417b093476fc7eb50628a7557c56294b3222e657c62a2b5ce7988243d75ae08f7a11c2b9e437d01d47258b1ac93c2579638ac67e12c4d78"; }

     

       186
       186
       -
           { locale = "xh"; arch = "linux-x86_64"; sha512 = "f797c52d88b62aaff15419baf5d7c5b2a44909674602ca82c295120b4b0fcb7182a36952f7adeaf7e9878b3d21031e990d22e5f8dcbc5421a3d587ba37f63906"; }

     

       187
       187
       -
           { locale = "zh-CN"; arch = "linux-i686"; sha512 = "970c14e1f105d6092fd542d73db57260836bf249aee99ab53f43882cb6327520905b7a452e96a6c142676794bf22e13c80e86291bb5b6dcaa09d0d9bb376d4be"; }

     

       188
       188
       -
           { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "b811f9d359fb61674781443d71e961ba687fecbe4904622b6ac410e435e31b6118f30726896021d28ae51628ab95092b28181ca0ae471374c0cbc5a740fea496"; }

     

       189
       189
       -
           { locale = "zh-TW"; arch = "linux-i686"; sha512 = "43f8d6e9cdf5815365e0eb1516ccb5f6c7ac7e19c10d1ee45ee367d721bf1944321879d9966f7000f50d324f14c36f9f8fcd9bb43ef20c780ba39d3c138f2192"; }

     

       190
       190
       -
           { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "02f4910b3c5b6f75e2f19c03452ce0534980be7ff18abed8be2a2f9af19c6eee5928c493e618b00d167bb3b2d7e60724741a2f4de1df9b1e48a05923a7649cef"; }

     

       9
       9
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ach/firefox-48.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "9fa8e2fe59c149abf5b1f4fad168717aa68c9e3e9acb219aaf257aff953a719c2df1dfd55081c6c4398732c9bb16690e4481b7c3c9f1fc9ba20468ca38d7b9fa"; }

     

       10
       10
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ach/firefox-48.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "b4115232ee0cfa6062fb9c06743d31edc444f9e5481b84cae4c1ec275c55500a16fe7478ee79caa269b669e566701be225c45729946ca950a492b36038d208fa"; }

     

       11
       11
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/af/firefox-48.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "03dde31a027765e7003c89188cfdbd87f57447c8d7f6542e11e01ac4242866f6db98943d8d50188b1e0c41d740f3ee95b5f9ead01e9df5ad9beeb066c0b1e54b"; }

     

       12
       12
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/af/firefox-48.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "e9973af0cc52e2126ea682067fd7aa11bf071ae2aafab935d704122480a46658139043a29df30c038af85c1fde836ff7725bed21ea4c4778e176adbab704c6ed"; }

     

       13
       13
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/an/firefox-48.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "1e23956adc055188e4342cfaa0e38d062bcacaf0fb99895fd2fe3535f4e528890a75a18e0620e881e1fc87d11ce8b21c280c88ed11b2444d037990a11fb8e9af"; }

     

       14
       14
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/an/firefox-48.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "e75ea9a5ca4860f228d4b2aba3c9ba4d104a7cc24fa138102d80b595e29a391d15fb82d749ff7a03193dccfccc7bbd106dfbffe5ae7152afc4b62f4d05d58ad2"; }

     

       15
       15
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ar/firefox-48.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "df97f1f2414d9f2c1d5ddc50e901167fe3535ac0f71ef99e08552ff9a5f4b7e6162f258c41d1024e2f886969e7ae80b741c271b551a51ae05a48a3e7987a52b3"; }

     

       16
       16
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ar/firefox-48.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "79da3baef8806966891b803137f2b9610b3562f0a806ab2fe3234f3320cb0efe11ff523373e933d5d230a6959ca68ab013d64dded47e6043e9fee90202c8bbc7"; }

     

       17
       17
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/as/firefox-48.0b7.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "ab18bd3f015cddf2dfe337556d29a20576dda5879a56242955476f50b0978808d3ec63812666ce73a58904a70edf251e3773ea34a38b955510ad331e5f66751a"; }

     

       18
       18
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/as/firefox-48.0b7.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "26be5b409c5e4acd6a09482d1380f902cbc9948fce33ff5e33c22a8573b5ccd05f10a4b6f84dae8ed9280f5b6568a411837ec7bd1b64bfaf18670e2a45c475cf"; }

     

       19
       19
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ast/firefox-48.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "30d23a4012caa6faa02871be312ebf867321b5cddf1e74d7680e426af4a6670b34aa48f237ac8801c696d0cd2551f90ab5fe482b4a9bd03bd7d4521e204bba65"; }

     

       20
       20
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ast/firefox-48.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "cb0ff48d6cefe69c4f05a83d7b9247b5bccc31db8efa708a7de3ffa67459f8427ac255bb6645e59f7ff6047f0370d24d2668954837aed7d71eae88df6824cced"; }

     

       21
       21
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/az/firefox-48.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "00685bee899c7a083fbe2a4dbdbe32df1f291c619e1ca681164a3c88782f6898a11add06a17f13aeb912c635d0fb2ea2c30c0e3bd5ff7cceb63b1134901ecab8"; }

     

       22
       22
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/az/firefox-48.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "e4133e1a9fb103652037caf21bc18815d89bf5e1a0d7b34abe115715e8e5060de8b00d35326bd3cfb9d5edb7cbe286456748953742e4cb5d5c76c7314a344720"; }

     

       23
       23
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/be/firefox-48.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "9444970e5cc3f3359b02b8bc58f13edfd64ae6f99d306ae7d9baa084658c75b85120354614fe2655b600e0005de1b128df1e2967f93dd0fd1c31ee721e0ac306"; }

     

       24
       24
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/be/firefox-48.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "08bf09e7b8f8911e42f5e88852f705c1f7263d1b6a0981c07f7ff651e620bd31c1a6baebd8a8a9353e49f9ed50d1c0d55bb88c97faaade0d415cba482ddc6f73"; }

     

       25
       25
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bg/firefox-48.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "1708e547f2ea234537a0dcf40163ac18c641bb4860e74f054325db8ddf4960ee0649348b458a8fad1f5bfbe1fa4308c9fb13d84fb941c2928ea42f6ea77cccff"; }

     

       26
       26
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bg/firefox-48.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "26540e48ce864590cc40a45d4124250674a1977778d3251b5f46701d3fa3b0f6d8a602b5bbe1449040ff943a2ed12bce7758037fe8ab753d0b43eb815e905ffb"; }

     

       27
       27
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bn-BD/firefox-48.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "6e37580672455a717be37061c4d3135e72cd6aacaceef20957cafe9fc95ff40a6781dd92a8425e4023f75f4d027c5961d7a3b0b6373501790ec5057da519baec"; }

     

       28
       28
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bn-BD/firefox-48.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "1498ed777a7e3aec18945ab01aec80a51e7cf6a202ca38b333ed6aa9517170bf9ec4a3c9e638acb60cac5b01ca16963b41489cdf71cf40655cd87d2ef161d4ad"; }

     

       29
       29
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bn-IN/firefox-48.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "1d9335e8b1268fc163bc31d1afe58613738f08e4ca8a429da63e59e4b862e326cd62d82a686e5710304a5b86e9d2981885ce52aca9913d4cbbcd4c1e0a88e782"; }

     

       30
       30
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bn-IN/firefox-48.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "e686e0a9f8d5078d2a728add3085d0d11fcec9ce8b1a05f242769532ede411f41d8385b2199e2a27edbe8a58648d3e4b91df2d730e6bb17b7cb69c4a22630fb6"; }

     

       31
       31
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/br/firefox-48.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "19f012125431f7c56ecf9ac12bb44a52aa041a97a0b2c1db3656d6229b4215d5bf492730c2bf08244e38ff120ad9003d4ee0842f834cfef8536b8f40d8e2217d"; }

     

       32
       32
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/br/firefox-48.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "250c9dc52e661c91163ece0fc195ed29d621508ab5666ae97d74ffeabd0dac1effddcc4d0ad9573c5c44ba9aa746330b5a6dd40693491f52609b1c47e9fe97a0"; }

     

       33
       33
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bs/firefox-48.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "fa946cf9eba376ddccae25b44c31cb41dec16c016c678c155d0fb6f235c2932fc59eac0df292940acceaa7f463979495de17c86863450a1a771a277440d2033d"; }

     

       34
       34
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bs/firefox-48.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "eaf3e8c8706a6005f6f78645c709cfa2463e47f678baa395db6c562506b872d9d110e973186b4408022cb1d4a8b343d7c84e2e0f1a3c18e3d5c04b72c23243b4"; }

     

       35
       35
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ca/firefox-48.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "c4fefe7ea67edda4cf5ff7dccf6639246fb73eae683ef72bb7c75e25d630cea78fad38d11d690d9786e43e506cff548df3c867fe91d7570048759933f2ec0523"; }

     

       36
       36
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ca/firefox-48.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "9bcad65fcbfdc85892fc552809da740fd28094bf6be32ddf783a6d011c901f3a17d8ba8d33649111978cfd75274641f6e0aa3513b2d05ed100f2d2d9a8cf9057"; }

     

       37
       37
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/cak/firefox-48.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "430b4f156d4130d2a689349c172c40c635ebb4e41d8dff65f7e3971b92ce7682661de763a1ccd706c9fcd11d3590d53193502c01964b703a7a304313c94e710b"; }

     

       38
       38
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/cak/firefox-48.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "46f3fd5a750618f8bfbc8015748e12df62b1f3db470abd3e7b0edba01ffe4dae1909cdbda5dd5cdd78a0d62845eebaf8e6223cc11e4b88b3710e1ce62e3ebd39"; }

     

       39
       39
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/cs/firefox-48.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "d8b8eed71db048dbcd25f116e70040d5105dc3ea9ea69a77064807862f19229cc215ef1482c94609276b914ed7fe55250889b986ac1d11ed086e4de3bb15b9b3"; }

     

       40
       40
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/cs/firefox-48.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "01e23193ad0bb1c0cd218bf22e301fa79da810ec79f4d68afdbb6d7f3da5871de3f15f38abb5cb5440fe29a3781600dce4733fef67d0410ffc6e63b0c29fb9e4"; }

     

       41
       41
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/cy/firefox-48.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "451f4eaae757e9474e905135caa2718d75551f2893a6343256b8c8595dd312e0c5416a7d7488b6670cd361db81d44097fb3c54c3cfa27a7efe6386652addb472"; }

     

       42
       42
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/cy/firefox-48.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "c260f1090ffe09cc714ade4105c74bf234ab03f032cb066cecbc0308866c33169c9b3c7b37f3acd70d17794878d9e7e9f928a29c5e8aa2172d8475ca7460fb15"; }

     

       43
       43
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/da/firefox-48.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "a449772de22183399c34d91b2c747253e7e32bd388e37b6f7194d68b87faf74df805886bc75230b19766ffb40e312c76d439754902b6d3c8b2057a654e656f33"; }

     

       44
       44
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/da/firefox-48.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "990bf989ce48afd5261c7a6d6a4e3ada0c40acaaa5cc8c369724ff7eb73f5800009ea2c4584e8afe926f77d4b18af95510558bd99ff564754625e1c1dfe0d5ef"; }

     

       45
       45
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/de/firefox-48.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5c6cc3a65a31043ba0143d9609ad006b6cb4f9af4cbc57efb4d2012ec08438b63045dca06c93b7d9c657f7cab9e19e01ed2b5dc78b79f2d9f59ff85836a89009"; }

     

       46
       46
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/de/firefox-48.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "1dcee925aa75eb0acdf3e21a0578dc7f747dbef8cecfe5024dba66461e03420ce9a9211b2c69a35861cdc75facb956f576cfe3664f91f4085aba1585d976fccd"; }

     

       47
       47
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/dsb/firefox-48.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "c327582db0a1f78b1d4ec56115220c4bd5751eb46d16f26bd589b4b64291a66845d0277c4eb099cf197225771414ad1bd16a56d41587befd3fa1c766095c697d"; }

     

       48
       48
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/dsb/firefox-48.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "eb049a000e908e5d46726d09ad8a219e1c60ff2f29959f5cfa416a788e5c747f50ff5e6b807fe30f7e013a7f5587f607834ff0faad6e060a33db55d04dc6cfb4"; }

     

       49
       49
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/el/firefox-48.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "634320e4103b0ce72a6c132afc8e33ff4a234669f835a23e526c227e94f62be62075cb69d6883831d72d13d309d4e1ecf9947d850c8079efe0c880f7b7b79aed"; }

     

       50
       50
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/el/firefox-48.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "85c4a47f5d3c65a6ee623f89420141f0cf7e02d8c7338d39c8c672cb0aae2364afd37c66fa740bbfb88c52aa37da6b9d106a824845c881e4de6c2d2604477d47"; }

     

       51
       51
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/en-GB/firefox-48.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "1ea0aafb65140f9c09aa4557d7460cfa9f206bd963137ec72a86d237be9cc3ca131b616c198e330d6328f48ae713cd5ac9f53159477b131e55e3ceef8e2ed7b9"; }

     

       52
       52
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/en-GB/firefox-48.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1a726088d2843ce835154675c6dca3e877af6281bac63aada1e4969782350e985428971b216e9225646c8daf523907394a21080e7f4e40225b9ff62d24df4295"; }

     

       53
       53
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/en-US/firefox-48.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ded034cd43b45d73539a3c3f8a196f26d5e80c3cba84e3d2ccb925815b661b4c9a3eaad1d35bc363ecee70e3ccec953bb03795c6fad33debd1a81ce8dc71669c"; }

     

       54
       54
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/en-US/firefox-48.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "0bdb77bee7fb8720f1154ffa486a8f6564ca592c56ce07b823800bd54218bc01c57bc27cddc73524c8f8fa1944c869523880a02fc698e44c5c71f4c800dd7208"; }

     

       55
       55
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/en-ZA/firefox-48.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "9557d2b57e09c390cd706673c6b2203f2a1beec8952a63e2d891d00b975c67ba3b5f0f6da622e81572d090aecee42ea8ff398df61845f7564ddfd42818bdaf4f"; }

     

       56
       56
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/en-ZA/firefox-48.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "0617a7b1117fe47bec89b86f89248cef981812a2126e64779d2f7b9c81fc11b38cb3ffe8f039aec72d4904cbb95505519e7ce64c115c1613e96adf90ee72f5d3"; }

     

       57
       57
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/eo/firefox-48.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "3e4ffa7728382e6862f224be0f576953120b563e0b68599df545ffb46483ae470d12280556a97b238aba0427651be744e9e93e7ba19be3d0764698367b4ab5ac"; }

     

       58
       58
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/eo/firefox-48.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "acf8527148b42e9ed50d027dd9c9a6de11975d40556b2ceb27bbb2fbe0e37a4f2839ca643972b55de52f95619eb432e16b12f0cfb501a5be3824e977315ef89d"; }

     

       59
       59
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-AR/firefox-48.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "ed70d0cf72acbcac71e0684ef755d987702412103bab21510daa7107b369186569e848586009fb3e654f54ca657e7cb259ad5574d5ca1e16c517100946135466"; }

     

       60
       60
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-AR/firefox-48.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "541f5579e3889413b6cfb1be40f5630ab401b7b0b3054cef1a633d89e36b59b1d83c86e44ccbb3acc8fbb13f2851b16e0b43f9aece4f98b0713b377606e742af"; }

     

       61
       61
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-CL/firefox-48.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "a44839ac7686b1d252cb04fe17ef5c2790d30214e5fa34a3cbd11f12dfbd9168acf7b33ef9dc22a06edd624726511e718691a973c5b70665eff78d0a18287413"; }

     

       62
       62
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-CL/firefox-48.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "84b768876fcbd95dd1f9734368c73b51b82ff445df975bfe913eb74c139e35d069acb1428b9afc51357c4567dba0d03950d7199b3fb43017df4987aa69247450"; }

     

       63
       63
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-ES/firefox-48.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "727f670438db45203d403746b7396b3b754b888b4a1d104b2bd0599790ef12b0a16db9a32b51617ea05bdff4f2ac696566970e83029e7e3d25434ddda8c4e88f"; }

     

       64
       64
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-ES/firefox-48.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "638ebd73556eacf0f2b38ef2d71db5922299d10c0d5b72b6bc7e935d814e300c17dd835f94517b8d0e62ba6e54d5bf5059dcaf57eb03a03bb7068161440f7c22"; }

     

       65
       65
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-MX/firefox-48.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "da88b8c3d5c9aeb33cbd637b00f4790225b7b46f4b8a1edfc6c49edeb1e29929c4690bd66de0afd31492b213a67eb617355adfe5a7d7b5ded09208eb3a861e36"; }

     

       66
       66
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-MX/firefox-48.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "0581028fea7610b44f27a6e5b25203020768d87e83e665aca24e753bbc0f0d49e2935c8f12755e6d4911e5f79052b4362447d1dfdc37838bfe9976e0d218e49e"; }

     

       67
       67
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/et/firefox-48.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "6d150372dff1113d14cb32003fcbbfc11f9aff6ed8a0fc8f5f8e2d5d3119b34a8471469d69e8fe48161297e69f95185c414680b3c59bb95d7e483ab2805b5729"; }

     

       68
       68
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/et/firefox-48.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "72d784c90c054d29420582a9a71d96c9a7270b1ac5592d8b920f8148542f17181d9cd71d019c0294c60112dde94191a686ad105993d7bd8340142ca849b5c150"; }

     

       69
       69
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/eu/firefox-48.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "0c2b1f0f886436c8d9fe6eead6718ee47e72fd988e1e4d83a70200f6d085419636058d6767a66d273842cb44573d39f58f72181ddfce01ca60f392c6c18df22c"; }

     

       70
       70
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/eu/firefox-48.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "7c03846d49cf1dba85202b2f7b6ed722898da5185a956ffde1c88df454560eb682ee562f782c3e21bf62b41ab156048ba1c63efacf7fd46f8fd7adf0536cff5d"; }

     

       71
       71
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fa/firefox-48.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3a21d3ecb88827de7094aa4ccf29005ffbf3f88681c459aa9f159d6dd6b04affda08661b1b77986b73a19de1fd2fdba2ceb91036ecc718a69cc5cb16e8c8bbe9"; }

     

       72
       72
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fa/firefox-48.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4750663d5eae7ba9fa282b0dd97e05cbcf3ace8b0715983525ae207de57d352b45495e0dcc46381979997532a8e20c85567a9de18056181f5d408d57cefddaa4"; }

     

       73
       73
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ff/firefox-48.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "e9f452656328e3c5a2dd7dde23b84ae535551bcba16b14cc58fbf8aa33f2eb8655cb4ff524a15b0a2db2d4af9ef5da4ca853fedb5c0d05b877fb0a8656833311"; }

     

       74
       74
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ff/firefox-48.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "f43daeec8c0647a8ee984d3541172516d1d8822596ab66a1a9651cd31d447a35f078725f1eb4b30a3f01c02b8573fb0ad268ada70ce013cf1932602f22119e4e"; }

     

       75
       75
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fi/firefox-48.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "477e5594a9821864db879ebf04b74852c711c5f0a43e00c02bf17754817c20279c56705aa3e3b51bccd52f9380bc242b12bf58cf40a2b64d9697c8ea76270771"; }

     

       76
       76
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fi/firefox-48.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aeef4b397c9972c055392faf64947d16173a903c290e4d710067c5cbe6c422acb2172f17c8b72bd5b80ae883f4d22c905ca0581c11822975a42031f2621852b3"; }

     

       77
       77
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fr/firefox-48.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "363bd189e7988393a97c7fd9544537068cb541e762427115bde4a3f05297302a30604a5e6a34c97b037c8f2e9c25ddcdee0ebbd8c292ba007362b6de858643c6"; }

     

       78
       78
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fr/firefox-48.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "4da717be716a1c16440be76d988ed2ac2ff73bf5a8734d1025ff190cb6d3b9072bd613d973e65207102e4e54479c32e8101aef59de533487b60a1cf10e7ed9ae"; }

     

       79
       79
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fy-NL/firefox-48.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "49e343a363afb94a8b7f7d2aca557127af4743a97678d123fe2a4355d542497da1f5c43a9c83ec974586ca707c3988d416c9e55090c9bae10923bc5aae785bd9"; }

     

       80
       80
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fy-NL/firefox-48.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1c53d25d464e36d7dcdda0ba6dbe5bfc85c03309dd22edc916c97aac4ef7f4bdf6329349fe66d27e1e885b7ad76359e27c6fa885302905e6c6e785da1535b53e"; }

     

       81
       81
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ga-IE/firefox-48.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "bfa9b70d5b2c891a82b92ad78e5f7b71df005ec142a1fe60e6bbc5717152f1b5325499fa5baca6a9f4e01be104b0dcddc11994a510e7cb41a5f1709dbe00c895"; }

     

       82
       82
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ga-IE/firefox-48.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "3d6bc3254bcffeda6260168bc43e58e1ea517543831579892b784cb43f51d9cf0b598f6acf1b56f51b72b7946f1904eb96168f046a80a76923ba52f265ef6d12"; }

     

       83
       83
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gd/firefox-48.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "4c12d70a50e8d1b5bb2a912f3d070b30783757ea339eefa87e63c46f8e47646e69acaf975f3a565dff67bb65933bcf070bb823c195a5df9ba8968ac9a7fd82ea"; }

     

       84
       84
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gd/firefox-48.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fdb748f6914902308d074262d4a1816d8a0a26a3e7f159d013d321875297b7c46eb266473361567c92c5011234ddc66a89f0a88b7ec6435c39e7488167d0b63c"; }

     

       85
       85
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gl/firefox-48.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e450407c27de08ed93b088222fda97daea6cd69ec93a75f267ec67a510f3ea6a657eb4eed67844990f8815be28fa1af8fd722f208c3b6193fba38188eb03b134"; }

     

       86
       86
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gl/firefox-48.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "be63e8e8dc2daa586fccfcf4e41979cc6746ab2797962a86b6644c9ed14d0f228a0a83aeea7ca115e4a13f33bd5048075ceff9c0ee7516ba1fc50dcece31d88d"; }

     

       87
       87
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gn/firefox-48.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "545a5c29789b626e47db56d0b962989f8a73244d865ef03bbff57272f463706cc5de1cc5e346b0188d4dbd7caa3fb67f6c0ea6064320d6c81a7db678b8eac86c"; }

     

       88
       88
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gn/firefox-48.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "4dff9aad6938c17f3b97b1901831cdf1f993f0c8c03c3d03881680e1a5d82a10c414f85d5d6ef8791ea5c352eeede94036075b8a14046b87b19caf6cb917f950"; }

     

       89
       89
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gu-IN/firefox-48.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "a63a9c54fd2e3db1c161d33b6c725711bbe43d5e915f6bfe50ebe9f667a47299989e9096ac8b8caf80c7f69f0fb276fce33873dc77b930d0cc228d0472ae81af"; }

     

       90
       90
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gu-IN/firefox-48.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "a9dd610aefc900d712bc68075d32ebe0e87a1de05af9b8592533db8cb65a1a6f56db5a566cd3c013a84d72802eac917fafd42517c0ce53b4701f58711ef0b7d8"; }

     

       91
       91
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/he/firefox-48.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "5b0b46f00e3c61ea8c00b849b5605357979c7ec4276f9f490b6e75efee28fd4ba2aa285ebf689bacf58a40f03c2336e77a7b19c7fb518f95d900150c3c70d62e"; }

     

       92
       92
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/he/firefox-48.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d67ef81f2c539718ff6916349f9ecfff42983c2e28b02b64e8ac71c54ef2dbfe5e9a4da6ec6f1b4361e458940bfde6f4da7f22bc19515cbdb98cc0166bdb1c27"; }

     

       93
       93
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hi-IN/firefox-48.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "a15ac725626fdc4f9bfe02e31da4385af32c57c407dce7dc321e259fb29d4c46a254bd484dce8ea7d3e322fcdeef07d62f64a874d45f0460bd2b17007f688b71"; }

     

       94
       94
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hi-IN/firefox-48.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2ded18a44554ddfe73721a35af71b77c600b362dce138ee78a633fa8d4d91a5fd55921654ff9c2eae05d0ebd9ede1de8b5c9bc07f761e068339474bb8622732e"; }

     

       95
       95
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hr/firefox-48.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "797fa8e8ea628b9855f42bc3f77e1928743f9b96566ce886cf2897dbed920a6f83089f518bd07f5f820374e0968de848b46d8a6777d8c77ca581a1b172fd25c1"; }

     

       96
       96
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hr/firefox-48.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "623eb40846a769825300177ffcde2f18721474605e6bbf7cacc0f26f2d7e3e68f0699a173fd0154bdbc6f56c13befe2bf45caa76dd3de7ba2249cb153b8624f2"; }

     

       97
       97
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hsb/firefox-48.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "58b1f83e123fbd32ca6d824aa87e0834d92f8c148db086fba5414519aa77a1469f5010077b119dd6758bf58165afdc1bcb0fe5b0b664a68fb73951047082ec07"; }

     

       98
       98
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hsb/firefox-48.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "853b6fa276e7e6c1ba0a30b95f8fde73e4bd4fb7e745c3722fed9de00bdae0d1739b78570a0108d2ff9efb73e8052e5d5192151ae789c5b336946039ece560d0"; }

     

       99
       99
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hu/firefox-48.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "984d3ab191091e9956bd28a2112715d0c27a24e5345b9c515e2b0521030200d2742041340db0d916915c87071c70b3d60762ca278dbffb88ab35611f30337468"; }

     

       100
       100
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hu/firefox-48.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "cae180b050bd956bca474b187648dc969c2ca8ca3816ebe46d379681bbd470029d93e6518e7fe6170864c2466e6b3752aa3f372df34b672f93687704a26f0b83"; }

     

       101
       101
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hy-AM/firefox-48.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "f26993353fab3bbae965b7d7cdef57bee60839e4a726c75c966ff2e99cf6edd3e249bb3e3adc7791b1095869fe6f5b43861337f8cc6d3017600e61fe436497a8"; }

     

       102
       102
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hy-AM/firefox-48.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "b7c228256d16587720f186c1a257cd157d8302e597dfa6cb72fd984c05105cfbe6e33578addce044a88ae11b11e4e6703aea432d5823526caffb08e81b1b300d"; }

     

       103
       103
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/id/firefox-48.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "324de4444814ec0e57c57fc4ca07dca20e10bb0a80df33ee01dcb8908caf6e5310563bfd66b62ea4eb5f595ed81edd9c504a8b6f81317bf85c4acdf9da2181af"; }

     

       104
       104
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/id/firefox-48.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "8b199bf64955d23fdbf47c92c57022e7742dce10c02242cd3cecfb662303402dce4a6c784c141a63007f4ea92b78e0ea0fa74fb6bddf157a848b2e85f50acde9"; }

     

       105
       105
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/is/firefox-48.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4addbf9e9626f6f81a276e506b5974232da161e108c194ea34f755efa40e5f5b4df6e4feedc90309740b4e8c04b946a8da74cebc28867f2d23ca71d9c0dc4cf0"; }

     

       106
       106
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/is/firefox-48.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "843bcdaf5855dba929b4e12ba88388e3dbe3372051a3d789ac5951a66ff4c044af563e2c04e005788bf087590444d390ccdc0646ed37571e95cfa5225976cd36"; }

     

       107
       107
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/it/firefox-48.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "e637a52c2d365835de33b8e3f3dae7beac254169ac65671282252c3ce33816c3af3cd696c73d15a3f3a3827c72376245ead9b0f655d2bdc857156bab353ddf69"; }

     

       108
       108
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/it/firefox-48.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "f62acc4a2d2e8fee43f3744e3adf6b2850de9b7ada59a9d985b5ea0051a2f00c2fb0ce14bffefe679c0359897e1920e071aacd177bc140719f47d64dccf799c6"; }

     

       109
       109
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ja/firefox-48.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "081aa992d79d9a07e82a3027294752fc338e715e0b26edd6dfbb80fad3fab78fc4c0ab5082cf8880912c3a3249d7d35b0ae99c2152bb87a025219e7ecf16f330"; }

     

       110
       110
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ja/firefox-48.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "3ffd093818c2fadc5d6e6a3ad9891b84352d522686ff1c23a9574c981a2421974d6346284db686a382193078ef3ad4ea8eaa081d9ecf59e4d07c396e1a1b223a"; }

     

       111
       111
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/kk/firefox-48.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "492e2165c88e5e2a1fcce1bfc2c994f7daddc1ded69d6b486f21d0655c6ccf112b1202080cc989bed68a1c35502c078025135af13ddcb0548b17d6f830c09b66"; }

     

       112
       112
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/kk/firefox-48.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f5e7a56849dd1aafc13b3b0772fdb482cf6e283ad98cbf2aa655c016d443242d9b760cf133c130813f04cc572de3f5ccf5cd4beeac98d07cdd4d9441838b1f34"; }

     

       113
       113
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/km/firefox-48.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "d21d401e1505bdea1dda8fcd65622547ff919e0fe2c3ef402c1a5a67a5c61d6c082730ae21286def66699a994f0196202ba03956e9f5ba42a166d8dbff2a1aa6"; }

     

       114
       114
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/km/firefox-48.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "c0e08b44b09c3f8c0e17335c0d287285e3f6cd5e308688da36647ba226ecb10c98f87f92ca6b2d50e0718e39757bcace7132390ffc4d2a339db5d3cfbc37b85b"; }

     

       115
       115
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/kn/firefox-48.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "71d3dbd2fffbf51c64fe7af008e27a2d9ff3dba3417bd9c0f1106fcfd445f88c2865ba03799b8fbbb00c13242c1cc7995b5aeed3d20c19b95448a7597378023d"; }

     

       116
       116
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/kn/firefox-48.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "dda7d698c760ef750575f5978599bb964cc008a18ec048e744aecd17cf41d6eb2b9a69ea13efedf5a5d5a46da990c1df817027b7762cd169ca2f30a0920ebf98"; }

     

       117
       117
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ko/firefox-48.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "f427847b0a4d3e8c52f59a75e4b1971ae96998d202b44ed360f5781775d3cb1c705923a4acb96a365925fa1f27af7e7292d3e4f0af6c22af9803600d7a64a9ee"; }

     

       118
       118
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ko/firefox-48.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fda5463fb43253a392616ea7f0e287464e83bc9f4c9b3a88ae40f0e2bb1b18b5873ebe7304d27b76b2016312d9a2ff416f3006f5a75f315e2be5f8ea16be82a5"; }

     

       119
       119
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/lij/firefox-48.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "38d539b3b0ad87b557aa9c75212c64978fe1397c797247d94ac6b2fec33723d6d05de80f1d79b84989424fe5074204eda4af3f23d163dbcfcd035e5f7f568ce8"; }

     

       120
       120
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/lij/firefox-48.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "a03e8261420d0b336545bf140916fea9cdf6cf2ba5bb55de6f039141011bccec49e88fddf7664e7a574c6da525f2f6646793b9d505135a311710a4d4014fde5d"; }

     

       121
       121
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/lt/firefox-48.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "ca11b61ed252863b6efcdab2438fca21bf837f29bcc7b719e5a99065aedb8f75bcae8beaec1a273624ea3c2a7a57db4386f52096777755297183691498f33c62"; }

     

       122
       122
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/lt/firefox-48.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "7d6af8577ce9c9e3ab13ee3313b4c35bdbeef802bb5a5a15fd991d4fcf063b49ea1292718a4d74ed57b7c6f00889c96c9261bba442476d6aa090623afccebd9b"; }

     

       123
       123
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/lv/firefox-48.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "19024158acd59afccdbe39430e463e9b441cf1950aadc713ff8a74d9da97cc11d9437d86d0542306a8fa4a29a69547b4d59aa28be2bbec8a434425f20ca0d1dd"; }

     

       124
       124
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/lv/firefox-48.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "73c81902a047a13c01fddc07eeab9886c0c55e2a3ebd30fee0a036878e52580f50c47a1dd4050cf39587b63432cc9c2947c88200fb2c95b143379a21ea60c400"; }

     

       125
       125
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/mai/firefox-48.0b7.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "d6a2d0b8821872b4f78f2fc9ec6ab9e602673bfff2d1b6339a37532f883b61134719d0e4e9caba53d3198107b895b3ce193839de2a374391c3fd58e595be1eca"; }

     

       126
       126
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/mai/firefox-48.0b7.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "bdb1e2e97b736b70a7d11538e3fc16be55889b14397709094c2efea1faa3c57b0c272cacca0fb0b307a3cba656145df3f7945cba4e9f762f3f9ee4f389e3ab50"; }

     

       127
       127
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/mk/firefox-48.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "0c52c93a00e1b82b5569787a624806f1c3175d40813da3da0833b23006cb377dd1b693120f96c1a6c172093393ad08321efc52262c5260e80fe037e709c94ae4"; }

     

       128
       128
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/mk/firefox-48.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "bc2c513eb37a667195180ba3933407c7f90cb1e815f2c646a5410fb942e562c3659eaf3200ec6397a12987267ea26be1c71dd4467f80045c79bb793f2144cd89"; }

     

       129
       129
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ml/firefox-48.0b7.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "7336e98002f71f6ff9b51d94b5c2ca2b5ff412d9069837053a63e3819013b36ad6587b9675089243f19474eda2906767e98b2cb3e96ace266ea29f5142c2533d"; }

     

       130
       130
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ml/firefox-48.0b7.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "fe70de56fa9d3bf56d355058c4412427f967f69467dd7b49cd1fa26c6abc898ae061b49bf259eaba7073fd926c1e8e5901a0979a88007ef3ba3d5caf07329203"; }

     

       131
       131
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/mr/firefox-48.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "180072a70d38d4607b8c2105dbfae2647900796208f6f5a6111419c4712e6ea959a6f5ca5068f1f7653ece073087e2f3c5dff177d92da4d92aba4ac1b4b7971e"; }

     

       132
       132
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/mr/firefox-48.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "08bd093d657ae4e6b6136d1627ebd355ea2794c2e2824ca4d4121a5a506b0682a65e1416aa2cab49fd00db4c3736ce09101225b0333385032a958309cd7e4edb"; }

     

       133
       133
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ms/firefox-48.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "a3bdac7effbb5a29f2ff1385da3de4a2c16a914d1d3306cee22b379779b1eb9d45f6a6c6bf10ef1e1a11ab52834a08c5510a38303c10cc6e4cfb96b32ce2769a"; }

     

       134
       134
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ms/firefox-48.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "08f2fe47c14ff5432f8944312e3d45d26dd3fa56bf4b0d350b4504cdc639eab147e3da9edc25b8551ab5156dc214101831c2c1c0f1b159201e5a061461e51285"; }

     

       135
       135
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/nb-NO/firefox-48.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "cfbb14897df334df5f11305ec44f8e4b736a8320b6ed39e5581be413cc4daf92908ed54215e24e35e34e0904a1a500f295ebe64871e53438658d0340f7e708ad"; }

     

       136
       136
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/nb-NO/firefox-48.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "19403a121e9e86447f3265ef72bda4e3a7fca55dfa76e8a25381ff97412329705f8b8a79031fd0116ac7e0fdc29fb9afa0c1de14287399f28e95d181fc933470"; }

     

       137
       137
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/nl/firefox-48.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "73789e769bcf2bd710f5234cc9c0f046abd5aed5d66b4e900b19f87a3c23a7daccfd086d9fb80fc6ced3742ccec90e96aba785330a2dc9cc79d76780fdf56cf3"; }

     

       138
       138
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/nl/firefox-48.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "07a842dbcde5fa7c5623fe5e8bd8dec04b33b300f52a1ffa8fe604ddf93df9879b9179bf8363cca4aa62a1c878ed77fb5e0b5db85355b4a2d1405888a9a6268d"; }

     

       139
       139
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/nn-NO/firefox-48.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "b82f14f66dee3036dd62d0af2889137d51521ff51494584fd8f50f380e8ead3d8290a73843a0aaa7dfc7e38c3f69c28b661185841c3f71f11eec686336c7f36b"; }

     

       140
       140
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/nn-NO/firefox-48.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "9b627e063644d138c5b9b5bfce48431f8926fb3b13caa01547aebf007a002c75f8ae3818d5643f212c2e6d1e6203c49a24412aaadcc2dc5539824c168ecea52e"; }

     

       141
       141
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/or/firefox-48.0b7.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "7e36e94c90cd2ce6116a56a5f1ae2772eabfb19bfbe0a5bb616173f0e3cfc6d9f3cf77db07c767fe2673b29437ea8cdd70584e2b65752660d6c4878d598e0998"; }

     

       142
       142
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/or/firefox-48.0b7.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "cfb9989b2ff2e2a81c3453dc7b03113e251d57b1925ba1fe60bcff4bca9fa16fe8ce6409cda6f90d7afde832b370a731d86c999df08e77a7c69ad6e72181f6e8"; }

     

       143
       143
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pa-IN/firefox-48.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "63e4f8e6e5d6360914073a1a8b9dfd9d1936ad3efef6994a880bde075468cd37809294d3cd80dbb693b429dd82426e06632b6ea87f776da509bfb1ed1cdc1848"; }

     

       144
       144
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pa-IN/firefox-48.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "49a065634297b37532882cad5b13687fb6abfe0fdb577a4ea1bf86568abe2ef5b29bec7d786a47b8a12ad06d4fa78faffdea1f531245488efc42b14da24d2f52"; }

     

       145
       145
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pl/firefox-48.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "06ff4df2f58d8c39ded84915d5f4ea2137f1692b7955c205a738fe65adc8c324c9e4e1f46963e40dfb74c483a33028d6157609e9f99819683008e0e5f992e52e"; }

     

       146
       146
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pl/firefox-48.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "b07fc75e55b860ac8ce03262dfbe77ec558842baef037f0e390245f3bffab03df31f6488811b630ed5355878dc01e4930b839251fa726a121fcbfac2eddae9d8"; }

     

       147
       147
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pt-BR/firefox-48.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "56a5f63dda3c359203a1ada88dda971aefd4219e0d76a8123792131cc5abaf23a1bda2498c1f93725b853576f572205905f3b7d16569611adcf87b7bc96528b2"; }

     

       148
       148
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pt-BR/firefox-48.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "5f7af50fa1620c17e4473c869fa0a4384518b79514108317c1aa8c5f32fe6635bf88eb53d589f4714fcae740988d56163e293960b40b2165eeb6fdc7146586c5"; }

     

       149
       149
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pt-PT/firefox-48.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "b3f4913abae949f1783cb6cfe934b97f3a93a579c8f57d3e29d87e15169234b58c5a243395ddd0944edf4519a9d3d735424bf14ff7280d7a54494989cbe7aed9"; }

     

       150
       150
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pt-PT/firefox-48.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "71853f84f9f1545a099bee0994bc598845aceabf562730c1fbb7b0f9c3ea8113e6ba473840feadf76aa0d35ac0ae5a038188ef6078fdb192de99396973cfebce"; }

     

       151
       151
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/rm/firefox-48.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "d1aef184253166dcab16b1cf25bf58131ec76e30af84ea0a75d89106e253ae4b5ec17d55039b1d1584f39c4ee1ef7eb28b73144cb8312fe15aba74e43cea0ae4"; }

     

       152
       152
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/rm/firefox-48.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "1ebe23f6c352e088180ebc9f03c4e35b1c08a2c8b9efc64ef710c8bb0c70c082bcdc3f23c436a427a95bccc219a5be8011b46d49047483fb57a2be2ea61577a1"; }

     

       153
       153
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ro/firefox-48.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "6ae17fafcc61dcf5ea548e55c7535ac196402c20468ed53eb32a529eb756a88264660dc4acaf1f27dfeb9bf4e5515c75287b4cc8ac42c765358908659ee12d03"; }

     

       154
       154
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ro/firefox-48.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "9635df3cf66825a4ec30ca03f944929977bd526146d5991b03a2539e59a6d5a979f8d25697e9aa6e051ebd6f05bbfeb993e11e547491a272e77c36b695402d93"; }

     

       155
       155
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ru/firefox-48.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "ca1f6e5e32da878f50b2cfa5f42d78ed93423e0f4f308e914a184747c59a82f0d2db5c768fb65a16bb0409070614be44ea14351c21904e32baf5470b81fd4925"; }

     

       156
       156
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ru/firefox-48.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "14f66c3db5d3f17e064eeb80eec31ea4d531b827248eaa5d6d1c936962b77503f7b9adb16daf754909e4749f8548f4be8f86f3d01345bf9999e70d8e7c52f6d6"; }

     

       157
       157
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/si/firefox-48.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "cd45ccd8f3e41ae3f4833f6f5a821dee061898fba61c974099361eb84272676b146896727889f8adecdd563db9c4ce0de666221eacc7f0ef841ce4a5155961d9"; }

     

       158
       158
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/si/firefox-48.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "234fe0d5677b67bf5458df4290b055159860f43a3afa66982b9ed9279a5e74ba90ef6cde23fdbd9fb7134ef0ba47b270880b3561f35fdf2286b23e128f9d0da0"; }

     

       159
       159
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sk/firefox-48.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "0cdc7209cbb2d537ba19ba206b53534f18ec0cfba1ad67a435f7134b1161f13236db2bce707cad50687790861e09ddd31a35eec8fd4965d4b1c697a84b4e00f4"; }

     

       160
       160
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sk/firefox-48.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8db988c2fe8624d9b7154a39df173f2bec70369edebcb02363f5a1ff50e299590722961d58c96bc7cd003e14b7db8e6c1c78a488bd1bf3721e880df1e14fed08"; }

     

       161
       161
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sl/firefox-48.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "a67d0bb63da12db2a1d936b40dfbda4f4473a67c8937c771b8b07c651eb9302128cdce01c02f1bf52ea641dcd9520b5d79561c07a88004ab39ae4ddf28a6cfc0"; }

     

       162
       162
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sl/firefox-48.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "d0f179237a4dfc59d8e847f5393ce7d59c6f399bc9bf5113f70f3850e3452d14542f08ac1b2faf0ec291b0f80183553d4b44c64866902db4ee891f00703bfe4b"; }

     

       163
       163
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/son/firefox-48.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "f66d6383be284933b2b62432b86e6ffa636c737ff5ad2d8159dab527cd951501eedcbe9a41d197fc1a7f14404ead4b2f25b7c1bd1725bef80a5dcba6a793ea42"; }

     

       164
       164
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/son/firefox-48.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "bf461c7cf0f24cc091af8806097b759a5ceb5934fd96011e003a438ea5de0dd9221241665c3b713dbb3485f13070cd7aecc23902a28b2f84bb6bcd69d96b95d6"; }

     

       165
       165
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sq/firefox-48.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cac1528dbddbf0163391cbc7860cd048376de7012950fdb74beb8f0dbecdbfda5b41dc347d100b0a83b31d3b324211e7a253dfbfafbc72f083013250660139c0"; }

     

       166
       166
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sq/firefox-48.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "bc96183968912b8ccd6e46adf82c49777f19b1692a5a06ccc9e24d4cba31fbddca79993f6e33a1693da0a794c081d8696d96dfe84de32003f190c2cceb484e9e"; }

     

       167
       167
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sr/firefox-48.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "4f5ae88197d4841cb38da7b0b8c5cc0ac8a228f6d1f6851bfa8782dc4ae91124da25a2235a13f9074d29498ff227602bafeb2a475e1f83f116ae6df26a575f66"; }

     

       168
       168
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sr/firefox-48.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "334695dbd86e2fe674897b23c9144444e984e16c5cb813a980fbc6b025b214aaf344019dddb8612125c26ab1b6da4b9007dcffc1ddf205cbf226d43f536728ce"; }

     

       169
       169
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sv-SE/firefox-48.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "9bb2a9d07db3f7840e56368edbdaa3760abb2a5e9a266f75ac84ddafe0ab42b582613cce581dd898761ecb869b85ec515a113a79ee1c3470ae48ba261f559c8b"; }

     

       170
       170
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sv-SE/firefox-48.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "3a7dbf64988527a3d1f88fa1840bdf8292cf90ce21b5823aedeb2fb9263a2b7ffd9f89d2709e2a2d208f0c7e70d3819a92c7859cc2c2510a4f0fe8160599d3b4"; }

     

       171
       171
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ta/firefox-48.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "4d6df0bc1dfbb8a0761250fa7bcc3575af66ea0e91e6ed18d340eac96e4ae2c50e1f873c54f10eecc08a0902f3dcb9a9df753d6d9f6a640e7421fa9bf38f884e"; }

     

       172
       172
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ta/firefox-48.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "b13dc2570f7c2f5d4a323aabf1448d04550d6356bd43b143c10fdc7e88a97d79d93b8145c3d7230e9f417a147f5884af3217738e5190955ab61459703bfe5954"; }

     

       173
       173
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/te/firefox-48.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "b3540cdfe33168c6b77386d3d32dd3a44c3198e9669fac89129549f6240475e657c2e790a38f985e85e20315df0769fdee57c65513c914ebee239f51e7932043"; }

     

       174
       174
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/te/firefox-48.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "3aa1ea89e62fa74208c5336c99aa6bdd98358852a032e1c90a70a48b6903523d08cc03e62976e10bfae86cfe0b431befd9a33bd62ef1f262d58bd9d5940255fa"; }

     

       175
       175
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/th/firefox-48.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "8e2e979f54bef8979367b7bc5b54eafbcf774dd4ec47a65352e8529d76edb6a4ea331fa8dafe82894868f4cd6b269424f06668a46596d099400a980694b03db3"; }

     

       176
       176
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/th/firefox-48.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "708841b24ad871cef003040a59379dac33b2131bb699ede2146d02b6be7f562057c6713d050e201075341dbbb8a7fb400c6852cb4d1de2064fcd03ecdda6450f"; }

     

       177
       177
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/tr/firefox-48.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "788e91d5af695acfdca1b02eb422efc8ea35652dadffd3b03babe5622c6e8d0ad1dd200a63589329a28eed3e0ca723e838ceafa721c45a86ffcc34aabc462671"; }

     

       178
       178
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/tr/firefox-48.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "370fc35b68ec734e9f5544f7cb74cb07d706f3e1c181f25c7e1b6e5fe1f9ee1bd9b289e164792e4a31c9fe7fb098c5114919234cda0583794f8964f14d60c4f3"; }

     

       179
       179
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/uk/firefox-48.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "463da060477f0b9831fce5e00248d841fa7b9ccae1e70fd707966aa09f55b7bd4eb89ee04b41ed6619ce465c86ce84236fafe14268a2b97c482830a2c6f8f77e"; }

     

       180
       180
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/uk/firefox-48.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "7a085f96ad6f67092f11ac1605541f1dd39a5ded50a3375e50596e18c76e992a1ec9a648a2ffcf4fefee09a3644d6d5d0abcbb43f5173a1d086f3c38b4ed7ed3"; }

     

       181
       181
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/uz/firefox-48.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3458b936fa06aab7ad5fb37c8bb0e3d1391e764382643b9978ded9e175dbe14fd3658f9b0903a0a5a74bb1aa1d56340fef37f19ca9ed92d3ba3ed28174c2cd2"; }

     

       182
       182
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/uz/firefox-48.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "2899fc4bd5b40996aebd0c67627ddd40bd9c3778001afc23a7d4a232a12ababf4504568594aab045eddf2a1ad71e026bbc832b5ddd265132c74325eb84523a82"; }

     

       183
       183
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/vi/firefox-48.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "c8cbd21b1ec2962e30a525bf7d1f45f449aa80448f3c8cedf2ffd54b2f7e1e07d8f0ceb2c5fdb3a9bd7e2df8fae0b14c65d0d84fd60f6cece8ececec7df468a1"; }

     

       184
       184
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/vi/firefox-48.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "86fd5cf184aa8b897b37dc0f05bdce5dba64e7b8d7d6fea79d42e7a591a141af7b28e87e15a1a98d828ed259c097005b8ff8f52fa5c33873eed199d5f2a391b3"; }

     

       185
       185
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/xh/firefox-48.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "703a39b4d0fbb522c9b7a2c24780776d804025b659a6bfc1b875924429f05d55f2eb57bc333dfc6b0b0b18bf8b18dabdb7a91ec7696cdefb404cbf0b2afd89b7"; }

     

       186
       186
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/xh/firefox-48.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "0551330c8203a93db60f5c4570a03fbd7b63f243eabe2eb0465bb8e3fa6c2389e402b29237fd91f98455f74360c6056d31fc1c1f66c5035c57ff4c8b2500070f"; }

     

       187
       187
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/zh-CN/firefox-48.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "8b9293827007bd0d510ab84e15553f4f396dc058a9871651d63638936fa03cb628ffd31bc2d01dfeee9935ad18976e0941345217e1e161df0ddc7a0e4b527ae6"; }

     

       188
       188
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/zh-CN/firefox-48.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "ecdb91365c00090388b0d0e0b9bf7fc327b6d142c3671fa96e626a744852ee838220efcbcdc57a6fe2f17d8b3a3b57fc3644b30d965a0a5c118cab421755dd05"; }

     

       189
       189
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/zh-TW/firefox-48.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "9f65780b2952210ba613767fb885dd77af3e96596e2d7833902318ac7508c98172abb2a42d3c33c7bdb63826379f039ee50f0df3436c122a4bc794d4e9fd3a20"; }

     

       190
       190
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/zh-TW/firefox-48.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "a915d396e093f2d87f2ee6cfe20f3c26fb6c524968fee0c8d1cbbf1e53a6cdec86921b6e2f252ca3a8dc13bbc8617e97d8d6e883973364e68be70c409bf1b8ad"; }

     

       191
       191
        
         ];

     

       192
       192
        
       }

+2 -12

pkgs/applications/networking/browsers/firefox-bin/default.nix

···

       35
       35
        
       , libheimdal

     

       36
       36
        
       , libpulseaudio

     

       37
       37
        
       , systemd

     

       38
       38
       -
       , channel ? "stable"

     

       38
       38
       +
       , generated ? import ./sources.nix

     

       39
       39
        
       }:

     

       40
       40
        
       

     

       41
       41
        
       assert stdenv.isLinux;

     

       42
       42
        
       

     

       43
       43
        
       let

     

       44
       44
       -
       

     

       45
       45
       -
         generated = if channel == "stable"    then (import ./sources.nix)

     

       46
       46
       -
                else if channel == "beta"      then (import ./beta_sources.nix)

     

       47
       47
       -
                else if channel == "developer" then (import ./dev_sources.nix)

     

       48
       48
       -
                else builtins.abort "Wrong channel! Channel must be one of `stable`, `beta` or `developer`";

     

       49
       44
        
       

     

       50
       45
        
         inherit (generated) version sources;

     

       51
       46
        
       

     
···

       70
       65
        
       stdenv.mkDerivation {

     

       71
       66
        
         name = "firefox-bin-unwrapped-${version}";

     

       72
       67
        
       

     

       73
       73
       -
         src = fetchurl {

     

       74
       74
       -
           url = if channel == "developer"

     

       75
       75
       -
                   then "http://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-aurora/firefox-${version}.${source.locale}.${source.arch}.tar.bz2"

     

       76
       76
       -
                   else "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";

     

       77
       77
       -
           inherit (source) sha512;

     

       78
       78
       -
         };

     

       68
       68
       +
         src = fetchurl { inherit (source) url sha512; };

     

       79
       69
        
       

     

       80
       70
        
         phases = "unpackPhase installPhase";

     

       81
       71

-12

pkgs/applications/networking/browsers/firefox-bin/dev_sources.nix

···

       1
       1
       -
       # This file is generated from generate_sources_dev.rb. DO NOT EDIT.

     

       2
       2
       -
       # Execute the following command to update the file.

     

       3
       3
       -
       #

     

       4
       4
       -
       # ruby generate_sources_dev.rb 49.0a2 > dev_sources.nix

     

       5
       5
       -
       

     

       6
       6
       -
       {

     

       7
       7
       -
         version = "49.0a2";

     

       8
       8
       -
         sources = [

     

       9
       9
       -
           { locale = "en-US"; arch = "linux-i686"; sha512 = "85c4289e561d2246f96a05e3b8df011337984b9f176670826a705c2cd68a1284056ba507e4b6e4887595bf37f25386d9f7b28a20bc1f125865b9fd7b8be17eaa"; }

     

       10
       10
       -
           { locale = "en-US"; arch = "linux-x86_64"; sha512 = "2bf9518dbfbb48348f74929c19d03e8daf51020bf9ba6db577a202b6e98ad7ffb9e9a0b4ca92af010cd3f864ae84940b65438f4230e6de3165f72e4e7280086d"; }

     

       11
       11
       -
         ];

     

       12
       12
       -
       }

+2 -2

pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb

···

       10
       10
        
           ARGV[0]

     

       11
       11
        
         end

     

       12
       12
        
       

     

       13
       13
       -
       base_path = "http://archive.mozilla.org/pub/firefox/releases"

     

       13
       13
       +
       base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases"

     

       14
       14
        
       

     

       15
       15
        
       Source = Struct.new(:hash, :arch, :locale, :filename)

     

       16
       16
        
       

     
···

       39
       39
        
       EOH

     

       40
       40
        
       

     

       41
       41
        
       sources.each do |source|

     

       42
       42
       -
         puts(%Q|    { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)

     

       42
       42
       +
         puts(%Q|    { url = "#{base_path}/#{version}/#{source.arch}/#{source.locale}/firefox-#{version}.tar.bz2"; locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)

     

       43
       43
        
       end

     

       44
       44
        
       

     

       45
       45
        
       puts(<<'EOF')

-53

pkgs/applications/networking/browsers/firefox-bin/generate_sources_dev.rb

···

       1
       1
       -
       #!/usr/bin/env ruby

     

       2
       2
       -
       require "open-uri"

     

       3
       3
       -
       

     

       4
       4
       -
       version =

     

       5
       5
       -
         if ARGV.empty?

     

       6
       6
       -
           $stderr.puts("Usage: ruby generate_sources_dev.rb <version> > dev_sources.nix")

     

       7
       7
       -
           exit(-1)

     

       8
       8
       -
         else

     

       9
       9
       -
           ARGV[0]

     

       10
       10
       -
         end

     

       11
       11
       -
       

     

       12
       12
       -
       base_url = "http://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-aurora"

     

       13
       13
       -
       

     

       14
       14
       -
       arches = ["linux-i686", "linux-x86_64"]

     

       15
       15
       -
       locales = ["en-US"]

     

       16
       16
       -
       sources = []

     

       17
       17
       -
       

     

       18
       18
       -
       Source = Struct.new(:hash, :arch, :locale, :filename)

     

       19
       19
       -
       

     

       20
       20
       -
       locales.each do |locale|

     

       21
       21
       -
         arches.each do |arch|

     

       22
       22
       -
           basename = "firefox-#{version}.#{locale}.#{arch}"

     

       23
       23
       -
           filename = basename + ".tar.bz2"

     

       24
       24
       -
           sha512 = open("#{base_url}/#{basename}.checksums").each_line

     

       25
       25
       -
             .find(filename).first

     

       26
       26
       -
             .split(" ").first

     

       27
       27
       -
           sources << Source.new(sha512, arch, locale, filename)

     

       28
       28
       -
         end

     

       29
       29
       -
       end

     

       30
       30
       -
       

     

       31
       31
       -
       sources = sources.sort_by do |source|

     

       32
       32
       -
         [source.locale, source.arch]

     

       33
       33
       -
       end

     

       34
       34
       -
       

     

       35
       35
       -
       puts(<<"EOH")

     

       36
       36
       -
       # This file is generated from generate_sources_dev.rb. DO NOT EDIT.

     

       37
       37
       -
       # Execute the following command to update the file.

     

       38
       38
       -
       #

     

       39
       39
       -
       # ruby generate_sources_dev.rb 49.0a2 > dev_sources.nix

     

       40
       40
       -
       

     

       41
       41
       -
       {

     

       42
       42
       -
         version = "#{version}";

     

       43
       43
       -
         sources = [

     

       44
       44
       -
       EOH

     

       45
       45
       -
       

     

       46
       46
       -
       sources.each do |source|

     

       47
       47
       -
         puts(%Q|    { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)

     

       48
       48
       -
       end

     

       49
       49
       -
       

     

       50
       50
       -
       puts(<<'EOF')

     

       51
       51
       -
         ];

     

       52
       52
       -
       }

     

       53
       53
       -
       EOF

+182 -182

pkgs/applications/networking/browsers/firefox-bin/sources.nix

···

       6
       6
        
       {

     

       7
       7
        
         version = "47.0.1";

     

       8
       8
        
         sources = [

     

       9
       9
       -
           { locale = "ach"; arch = "linux-i686"; sha512 = "a5391e45d1e59a7c14d8d421286033e3e760bf2b4afddfec3d1767b2ebc957b053c39f17f8185a6c9ca2542c76f6c9612d95d474c01bd5ecc62e5d4f4e43e8df"; }

     

       10
       10
       -
           { locale = "ach"; arch = "linux-x86_64"; sha512 = "48681328033b694adfc6149bd965a3dff90ef014db6f65641ddd3d79ba7901604623735555bad024dc2425f226c65e332a0875d6b18fe1c06b18a1e407b70294"; }

     

       11
       11
       -
           { locale = "af"; arch = "linux-i686"; sha512 = "7757ba99ce9991f67a45d9a19615a93c0a1bf0e35d35c5fe653f04d47c068054c8d91327641a48cd20fb9531cd1e842066c0e6f2dd8b23bff216a9fc727ec84d"; }

     

       12
       12
       -
           { locale = "af"; arch = "linux-x86_64"; sha512 = "7e3d70da29aeb5fc81f5e6dc52a4b8f831813f8c025b1a105df631cc5b675905c82dae842459ad30c5257b74bd5654e9aec5dcfcdee93eb42443c45cda81138e"; }

     

       13
       13
       -
           { locale = "an"; arch = "linux-i686"; sha512 = "1051e1e3a6c25ba6b3aa4ce5adfdc60bcb3c612f3facd5edb702385ea8c0837cc53e95b064a424e0c055a56a11f3a54a7ba37e2ef35045c8cbb834aaec0f6327"; }

     

       14
       14
       -
           { locale = "an"; arch = "linux-x86_64"; sha512 = "27fb75ce402c0d47f8542d3d6d6992587e6ea0caaba2249e763f0f9c4f1d233b37a4b87ebb7e730d16704c7d2abab690660e409e721850875fc09deb0c433252"; }

     

       15
       15
       -
           { locale = "ar"; arch = "linux-i686"; sha512 = "296e23fff265bcc08ec0f81608d50428181163d216fd896c80a1a8c31e95f243112aeedf3bbd96b1efbaa1d6d576a9bfc75e5fe8df434cbb74bb9576f7d90a83"; }

     

       16
       16
       -
           { locale = "ar"; arch = "linux-x86_64"; sha512 = "15f0e7cbf5a98ffa9d2d7befcb11938b76194dff29b1d93ddcbb8f5c655ef33659534874a72aea18f98af06e5fa4392aee5412582ef43292d70603dff2c42c60"; }

     

       17
       17
       -
           { locale = "as"; arch = "linux-i686"; sha512 = "67883c8cb7ffb6c05288b316b2aa5bc3274372dd82ab4c771fcf1e5a968e550d12c89027440704d8479a906beeef24a18ca72ad243628a5ece45918ed990c793"; }

     

       18
       18
       -
           { locale = "as"; arch = "linux-x86_64"; sha512 = "f7718b0dc9bcbfd109591f87263d7791dcd7612b0312d0bf93e68b1f2014d3732dc6740c57a8e64dfc1af7946da14dde617945e38842eb19cfe39376cb12ad44"; }

     

       19
       19
       -
           { locale = "ast"; arch = "linux-i686"; sha512 = "f29b883932752bfa947c48f7c1ff6084b1cf215ea84cf63beaea808702b0b90f50e85aa4cefa4d2c1234b0d366c8f6e3d8fdf7a0f92d432cba790adab6d24174"; }

     

       20
       20
       -
           { locale = "ast"; arch = "linux-x86_64"; sha512 = "8b656c6b08640c125b94f90e1dc8259c90af2e764cee73b02b9dc3c0246b3195906d9208bc2a6b3ca31091d8cdfca8338fa6c489b7caa5685a23133e98847a39"; }

     

       21
       21
       -
           { locale = "az"; arch = "linux-i686"; sha512 = "5ee1247e37964274bbea8021c8e4e5116fedca95712fbd91d709c5c580bd1618c6319cae73278b2f0ba82031e94bd3fb382d2b4dcfc9a5d7ad47ecd80f4fca43"; }

     

       22
       22
       -
           { locale = "az"; arch = "linux-x86_64"; sha512 = "c369046c29dd0dfcf40e69e1f5b5a63423833a376d2b143d3fbf2ee1e23dedb3baf24843ba1178bda94b86f357724898a147d4adfac1e469cbf44166d7ffd16c"; }

     

       23
       23
       -
           { locale = "be"; arch = "linux-i686"; sha512 = "f8a1ab05b8d25a7a30e755a551f0851a308ba0720180685f6946a510363988717f8274ac2c8ef826c60232a62c394b86829d289e7d74e24b7656b55238129b15"; }

     

       24
       24
       -
           { locale = "be"; arch = "linux-x86_64"; sha512 = "df05271371de5fa25ec11164eaac0b253bc892749d421a6ca730dfeceb4ef89492c42ce83a87eccbe91cb03ab001bf0a1d9a20a7296b69841cab8c6b5d2acc36"; }

     

       25
       25
       -
           { locale = "bg"; arch = "linux-i686"; sha512 = "80644b86f9296b708e74843a51f81d368e3508f0f2f74de1a998d30a15f6e3af08ffd70dcc5c79adb76c03be9ff4713fc8403b8433cbc33ca3493941c4fb2fe0"; }

     

       26
       26
       -
           { locale = "bg"; arch = "linux-x86_64"; sha512 = "0e6cdc5b3cc706031c95a550b0c800c9e8e2d7bf241010c22f0872eca4bab018a5f0d4a94abb4f8291c279476700f2101a69ac0c57ae79994fba38b88b00fddb"; }

     

       27
       27
       -
           { locale = "bn-BD"; arch = "linux-i686"; sha512 = "4c697f1dcd68634e2ab712d4f2415e57cf8be0017fff3602223d8af19a1f3a5c973489d13951baaab95924fad42212a485fdff622d2b559be36e246c8a847b67"; }

     

       28
       28
       -
           { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "1931035a9d92dd9246a00b32443e282dc405096407a4feff7856125b7ee156840114c9be0dd58a020c250fa54c4ccb22052d2be291eeec9b5f76303fdf6c4cc5"; }

     

       29
       29
       -
           { locale = "bn-IN"; arch = "linux-i686"; sha512 = "fbab6f7e4205c803a50990624d58aa80cfd3aa76fed02cbf9ea390f4ecdcc1a97bda9b51791cec49f2a7e1010109d5f81a1c9b6ac224f1f70df49407df5f7386"; }

     

       30
       30
       -
           { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "c705ec8356796060c6782261086011bc0bf3ac9f08bc821ce2305c9aac11c522abb802a9d9ab7dcb53b0d38468bb6e667d45b187355d769acb43a8b252c4f400"; }

     

       31
       31
       -
           { locale = "br"; arch = "linux-i686"; sha512 = "c58cd77139a0ae7f3bb8f6f25c40856aca18a831c8f5d6f5d59a45ec615420bd55205093fb66a77591835b0d9493f774b1801a168b9c071086d510a1446cc914"; }

     

       32
       32
       -
           { locale = "br"; arch = "linux-x86_64"; sha512 = "b6bde26d478eac081007ef43a6d588f70dc4d54afc423b019468dc91bfcb117d3b4989c4cbb4cf77a1a11847a58ec74fbf822b6e6f0ef86fdb0065c301294850"; }

     

       33
       33
       -
           { locale = "bs"; arch = "linux-i686"; sha512 = "16ee40d079996f42be77167b73645d389045648c9d36b76e34d0398c7b5b6dee54712d109f93d054236ac7076fc3edb06ee82acae40ad22825a23d92d0e2c636"; }

     

       34
       34
       -
           { locale = "bs"; arch = "linux-x86_64"; sha512 = "ef674f409df5c32fe4584f9de65cc6558d6b3ec78d8a83f5cec829bc1ae09f30399567915e32584334704d12264c2592fecc9e4952beabc8b0d4eb49a7186854"; }

     

       35
       35
       -
           { locale = "ca"; arch = "linux-i686"; sha512 = "fe522bd836c82cb68bb21ad1c7f36bd9a7af1642abf7c035e2d0999b4cc07c58124e4d8de81344598036159102ee12f22c12e44a8a087e54d6c661c3f453b63e"; }

     

       36
       36
       -
           { locale = "ca"; arch = "linux-x86_64"; sha512 = "b618da984d35fbde3819d101c103d8d9a5a4de98f0e254c67e894656019ebb6adc56e14a57410a61430d9aa9c1e0a01339b39a5272164af372544f27329a1644"; }

     

       37
       37
       -
           { locale = "cak"; arch = "linux-i686"; sha512 = "82659aa2fbd091224aef6800b3df1d2e5141b6a295918e4fc4ea09b671184f62c670e3dedd7040b2f167581b0c8a0e8799d861256b273b01b2455d0937722273"; }

     

       38
       38
       -
           { locale = "cak"; arch = "linux-x86_64"; sha512 = "a507cff511c6337f805a27c0f73548342d2fb2cffa683874d66b054b844b17c354cc6da5c3d15618006c2279099b0cd9172b17d9d4b21a3863b5e395db686b22"; }

     

       39
       39
       -
           { locale = "cs"; arch = "linux-i686"; sha512 = "9af91acffc2beeb53280a6cbd21656a91a686c03342fad90dd91314c49535acef1a8abac8fe54bcfc250ca8b8f07e3550c890094f3bcee6baece983cec68bd8a"; }

     

       40
       40
       -
           { locale = "cs"; arch = "linux-x86_64"; sha512 = "c8bea48dc11c021fff9df5ee1a67a6b6e9193ffb2a07e17014d7448254d8a8f4d1512f862ea73bf84dc15b40edbba3fd94cd3d2d18872255bbfc7fa9a7b8ec29"; }

     

       41
       41
       -
           { locale = "cy"; arch = "linux-i686"; sha512 = "7cc062c3b9b4bbfd0b1f7247f06505ae99458514b607d4d9062836085798bab7ade6c4d1c8903b1b961243c6fb6adb4c4f94780f1194f745cf62d786e2c4f5c6"; }

     

       42
       42
       -
           { locale = "cy"; arch = "linux-x86_64"; sha512 = "abafa600b941e17f8aea0e778a937f5fb34cbc8803c93e59febc5d9fde6ad3347ba0bc7aa07ab57a61f6b9d6b11d582b987100364aa8401bca539dc6e14584e3"; }

     

       43
       43
       -
           { locale = "da"; arch = "linux-i686"; sha512 = "d4a9141779f52b78a51b9682b6b44e5ccffdecf5582358ab8a02efe133d9a52023e03c238e106a79e41a8aeaabcc58e0757c1af66837768e7bf4732f26182915"; }

     

       44
       44
       -
           { locale = "da"; arch = "linux-x86_64"; sha512 = "48f0c48aa273cec9830bf806330c7a630185262838007628acad904a45b3186450a8973938c36db636bdef9042c78ce94a4a456e1682ef561abaabab6ac20863"; }

     

       45
       45
       -
           { locale = "de"; arch = "linux-i686"; sha512 = "01675b3a8ecfa10da1d101cba36295b226b130e1cdb2c760541cd76c9b21436ae84ca7228e063402b1ca2eb59acadcac7720c9dd47db8b406675fb273af206c6"; }

     

       46
       46
       -
           { locale = "de"; arch = "linux-x86_64"; sha512 = "6a7ef802a8109f58504b2accb9ef0ee38986f6c8980e0831c30b470f2ee768169557cdbde1a58d7c72996b27596e553185ded476cecdd7114b75d82428b7846e"; }

     

       47
       47
       -
           { locale = "dsb"; arch = "linux-i686"; sha512 = "55528fca4d276b2b0430949686845e3d7d88975129c9a9846408f758b4f9c8f154425db891e5c1930197e36137d6c15ba29de90dad624bad23090015849d0ab5"; }

     

       48
       48
       -
           { locale = "dsb"; arch = "linux-x86_64"; sha512 = "f21c14a57f6f973be824340fcd417ce03765d5826114462f62adbd933661bccbfbe90b66935083619c62d48401c511830574ccc373ca2110093b06fad59734ff"; }

     

       49
       49
       -
           { locale = "el"; arch = "linux-i686"; sha512 = "ac5a808db1ba68286a7199eef33794f7aeeafa26e97a20738fb21be479462bcaeb1e8a7995720d5c7dcaadd0cebe91bb2a3e019873d0cf74f42838f7d5c1a427"; }

     

       50
       50
       -
           { locale = "el"; arch = "linux-x86_64"; sha512 = "c02e6587d99fc3ca66debe854c778a8b3dbf9b514e6ed74fa15e3035a54643b2bc324ff59f1705c6bd392c37ad1996f80dbabbb57df10aff954ed0ff3f5b01d5"; }

     

       51
       51
       -
           { locale = "en-GB"; arch = "linux-i686"; sha512 = "c458c70db0408d627a904781adc9af18011f243689f4c5a606c8f1508b4e9417a8df499673c4ba56d32ea77d0f79ab85ff88852f7c518e7fd124e5970615b2f9"; }

     

       52
       52
       -
           { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "28ccaebc4f7613d7ea8c3b47504923f2d59bdf4afd6e386a67dcb6b6923a9374c1c783e4f904da0b6e0f716ec87a046fc12f3781b732389d1d680745d6955c58"; }

     

       53
       53
       -
           { locale = "en-US"; arch = "linux-i686"; sha512 = "e1ea34bd0829656c04c471b66d2013fc07cbd5cf40b47bf3a932326cca71f9a502c52d1d5e6dd902d274d307079475b0e75d7ff552fcb2fadf31b2883efba79e"; }

     

       54
       54
       -
           { locale = "en-US"; arch = "linux-x86_64"; sha512 = "a56b2ad26df424f008d96968a4e6a10406694b33f42d962f19dff1a0bcdf261bca5dd0e5c6f3af32d892c3268da5ebee8ce182090f04f8480d37d232ccd23b9f"; }

     

       55
       55
       -
           { locale = "en-ZA"; arch = "linux-i686"; sha512 = "d5efc3d4e624f34c81df068f4d6c184cb8a63ad0667695e9ce7099e069b23715eb77cf2004adee41bf355452179959e5ef7450f167f87be70339abb4cf70844a"; }

     

       56
       56
       -
           { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "859730132549691b61e936813f0f5fd3e62f3ef6fa9899e3f68bd3178b7438b4c6b49f54f00d4898b568d6abccdd55a0f9fc6c51858e95735fefcc13de460d73"; }

     

       57
       57
       -
           { locale = "eo"; arch = "linux-i686"; sha512 = "8ef290bf1eb3504ace393b32c2da64d14435edc327c4f13a40cd925efaf7e042a03b6877689b3f2290f85625410a4e48dfb2cf676f138fdba87ffc597b25f4b6"; }

     

       58
       58
       -
           { locale = "eo"; arch = "linux-x86_64"; sha512 = "7d6167749d2a57a9c12180302a825fee14555e9050b6be3c83dd35183678bc36e10391cedcc864ca0dd96d297997a68627dc4fc1a9cd8922e789dcfa814f18eb"; }

     

       59
       59
       -
           { locale = "es-AR"; arch = "linux-i686"; sha512 = "07768e3b3ed903f4327881a132f192a65842a376eeca6d10ec0de69fefb4ddf3d7fee2a704bbc8d229c78556478814d9e53940cca9edee58270d9790d6b76998"; }

     

       60
       60
       -
           { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cac021af09abd742273dc77291fb1528dd5d6d38cef3a5e36e615fbb9f3908655fdc96ceb93fd131c4879acf24e702a044471136e7575f3b550ebcecd982047e"; }

     

       61
       61
       -
           { locale = "es-CL"; arch = "linux-i686"; sha512 = "e92ce6bec5b1ee8cf3db0a604eb4cae6245fb6d04a48eec64b6dd55139f3606cbbcb65511e29a3164d6572929b7216afbaa7f034a2191eba100ecb7403740504"; }

     

       62
       62
       -
           { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "98e57146481a53061c0b30872290ecabc2d14c73805a9461d82aaaf4cf9f301521fd55b01c8159c09a56f52a1580d83c9527986b1390f496d0fbd11227216e7f"; }

     

       63
       63
       -
           { locale = "es-ES"; arch = "linux-i686"; sha512 = "c44df66e140ea9190112f89aedff9519b6bee18f5e2b54aea19acd233e623c299aecf134cdba70d366fcaf6b7795d220052ff75409c7a04394a7aa02d9ea708e"; }

     

       64
       64
       -
           { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "c2d70bc5a304df7b2484c8fb2b374f8e31a69049eb223a53dbd0e4b51e4ccce907efb1674eb637370ce7c3947ba5c09e65f433d10e0f328b80d482f3de9cae12"; }

     

       65
       65
       -
           { locale = "es-MX"; arch = "linux-i686"; sha512 = "96dcb75cffeb85b85f092e295e38ee55c272714c40609ca90cfaac5fa0cfdb3efe8e993319ee690b4a7938c42346bf39f063ab1f3db606e743c1e4720de5a93f"; }

     

       66
       66
       -
           { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "60b50d6726b2e1985564bc02263eb88c9b4c1bb39e6d19812ecc6751d6ad223ba04f65a7755a946fb15dceab90628b057bda89c55fdd4972604586f52c5a4b1c"; }

     

       67
       67
       -
           { locale = "et"; arch = "linux-i686"; sha512 = "0a4bef2277f729c93db413b68f8263eb356f7b3278880574b8ebe010e2db9067b803967e1f0d6912f128a9ad5ef204466f52ae277f3addfb8fe9ac377c3b8a3a"; }

     

       68
       68
       -
           { locale = "et"; arch = "linux-x86_64"; sha512 = "ed1bd4fd67262958601f1107edc589bb28e9b7f9faf0edebdcaf0c07ec6007f527a9eab434582a65271a8f68edac8178601da54eab9398f48b31126657a21b0b"; }

     

       69
       69
       -
           { locale = "eu"; arch = "linux-i686"; sha512 = "8c5c9406345e2a1fca3544aeb742dc0d254c804d887e3614613280c050a63b69320d4488b017ee16b0a2a07bea862e8b245baf7edc9df65689d509986f3c5958"; }

     

       70
       70
       -
           { locale = "eu"; arch = "linux-x86_64"; sha512 = "d8f7004e24033f377391b577c549b66f73cf0e899ce5f580eaccd07713ec03b4362db7b222ce6345d113641d3e6a951302939bbb155c47ec0fa46a201a631427"; }

     

       71
       71
       -
           { locale = "fa"; arch = "linux-i686"; sha512 = "f4e02737e20b6ffd3bc2b3a5e5fa59fc80a8e37dc8459ad4a6b99e7621a4d3f360884915f7136dc201830efe371de37977ef3e27f34f84e2cb734c1fff8f6e36"; }

     

       72
       72
       -
           { locale = "fa"; arch = "linux-x86_64"; sha512 = "8f624b066faa39341b750dbb702dd60ee6ad75b3850c659dac2e21969ebed1f792423e9fb0a9cae7fc456943020f9a0155af5d7c596433eedaaa9990ce07b7d4"; }

     

       73
       73
       -
           { locale = "ff"; arch = "linux-i686"; sha512 = "22a2c5376b1e8d770659475085d98ac1f1020cd816ff3ec6ccfcd68f2484b1b0dc25bb84ca52f4ad27144f4da356ce5e7fd54411d12ae7c852064509470d5828"; }

     

       74
       74
       -
           { locale = "ff"; arch = "linux-x86_64"; sha512 = "bcb3dabc250045b8ad444219055fd9d14902296ef3f9c320bec1bef940f84eeb0d4a50249805188ae96ed0288a70f0216350ee79191beba49aeba890ae515b41"; }

     

       75
       75
       -
           { locale = "fi"; arch = "linux-i686"; sha512 = "0c505a0e1d3030038b61ea159eece3892bcc7d947b6d7010c0be8791525c9d91ad1170d4cb45260584c93a78a4bc831b7acd9f28e95ae62e5b96b31745dcbe50"; }

     

       76
       76
       -
           { locale = "fi"; arch = "linux-x86_64"; sha512 = "f347cde005c6b61366c633db5a8cbc5260dfa0d68230a938d847e3f80bff2f1bed09dddded7b1728f4ef9525610ecd046743f9e71eefb467943fe6b72ed198ca"; }

     

       77
       77
       -
           { locale = "fr"; arch = "linux-i686"; sha512 = "8fb8ea2eab82740657a6b822b330fa0c289c31ad900683b4ad07b1e9b0c6c4e14f50af39d6d0f787642010628800b0a99b5ab0c4cad62e4a579390509b1ddd13"; }

     

       78
       78
       -
           { locale = "fr"; arch = "linux-x86_64"; sha512 = "ae79c5b7f9f8305c3631f4f913baa341a9beaa7a2ee5df1c6c1826030c21bf22b92095ee579affb8911110bf3bcc359793c0beca18d4c32b1fcc1f3d1dbcc4b9"; }

     

       79
       79
       -
           { locale = "fy-NL"; arch = "linux-i686"; sha512 = "1c57d02fdc33ff53de48ed9aa9e89ecd5a56d35b432d5651e71bbfbd5f9dfd18aeaf14d10b881f72df871afd00a12b31ff05cf9d5c5a55cd44a92c7a0156523d"; }

     

       80
       80
       -
           { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "f30f59d630c5d289b61dc7440f7bbb976eb16732370f827365a477090cdf9f2859f39afb7ff9d9be7e8a022f181f2aeb7a3005c00f4c14e6505a28db7ae48a9a"; }

     

       81
       81
       -
           { locale = "ga-IE"; arch = "linux-i686"; sha512 = "739d5feec4bffee67876227f6783d35675f4c0d168b7abbe5f97b6e8edce7fe4b8f04f8240087f7f208db4180f3417997b661c93ebe046decff3f4f4fecac839"; }

     

       82
       82
       -
           { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "cb4344df6e07db839ce8c9fffd1b7b310c8108b5218cea3602972806c1a40f56bf1355ede4cb3595f54179b16e3470e25bfbddc8e39d726c7d6c1e99d128ca8b"; }

     

       83
       83
       -
           { locale = "gd"; arch = "linux-i686"; sha512 = "91004d62bb5f1f6a1d65b35fee9e594d21d9877669e042cb4c9a834b01b35797363e1433a9ce5a8d0a9f64c8b256da6a6d09fa3342b74b7c2af8ce8afb3e4e56"; }

     

       84
       84
       -
           { locale = "gd"; arch = "linux-x86_64"; sha512 = "f04034cafed25c34713ffe4109e53b107b8fe81321c0c0c035f54ff0ce67ac393b42db7598edc658d3f026e447f9ff1c4d1cfdedd31066eefb6019117248e4c0"; }

     

       85
       85
       -
           { locale = "gl"; arch = "linux-i686"; sha512 = "107bdebb92ce86f39cdc45d6bb24a9c4d104820eca6bb77950693ccbd55e7f8a2f143fc3a5bbb1bfda161e7a33c8f6d8d2686b09da1497215defbca2b4e4e109"; }

     

       86
       86
       -
           { locale = "gl"; arch = "linux-x86_64"; sha512 = "c841af5c73343475150b5404b4b54396bda845aa5b231a742aa17ecb7fdbbc5cd4123efc3ac2ede1c24f485d04bd87e8bf7cb00b7135bef236ce56afa0c27a19"; }

     

       87
       87
       -
           { locale = "gn"; arch = "linux-i686"; sha512 = "20954e218967772488bd895ebf069522c3f4c56ebfa09a7c8efb740158cb95b6be76cee8f4d7f2c1c6c505ca9071a0ddc1914784a54f669d337d5196f18b6f4a"; }

     

       88
       88
       -
           { locale = "gn"; arch = "linux-x86_64"; sha512 = "aaed68f13e326792671669883b452b65556998ed757ed5b745c6453d6bae8865a06f137709de37ace2688e2e09f1b96ecf2e5b6374b4170d29100c6f83ce22ce"; }

     

       89
       89
       -
           { locale = "gu-IN"; arch = "linux-i686"; sha512 = "205093ecc0dfcddb2b90e05b1a17f75805a4597bbfad214d67442fd0d952f765b031ba63a3c399ba9c1c46e4d05b3cf786f01c46eb8990240a16431964c93a94"; }

     

       90
       90
       -
           { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "a84ec5015f6922a22a284eaca985010586067370d818e77d401b58782f86dcf2f534f1ef021719c170f1f502525ce25c94760d3b75481c15fade3c25b969b563"; }

     

       91
       91
       -
           { locale = "he"; arch = "linux-i686"; sha512 = "5727fc4699316c4b34be1c2596c5cc20d5fc9d2062b1e106087cdb34b788fe3ebbc098acc8c690bc83c9d9be59ac3b3977fd9116d766ce908aa088660fe34771"; }

     

       92
       92
       -
           { locale = "he"; arch = "linux-x86_64"; sha512 = "c399969bc24b10ca1c1eff17d3414f214cfe3e5b73282942ead5b2ba4d2c58b74d665b13031ccf42956cd45f0fc7b206dd2f9674103c1e3a8861a33577b5caa7"; }

     

       93
       93
       -
           { locale = "hi-IN"; arch = "linux-i686"; sha512 = "f014c47a143d425aa3452be2bbed199a8b5e75d278c35fa86bb6bcac40bfb32bdee22d030386c881c818b465451b35c81f97bf29f9ccfbea606d52c822057899"; }

     

       94
       94
       -
           { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "0e5dc0970680886dc02448d7118b6864092699fe44f3276ca17cba160aee59418f8e39338247897b118de0e1fb7634cf725ddc6a34a8b6f002b7a78d92deffb0"; }

     

       95
       95
       -
           { locale = "hr"; arch = "linux-i686"; sha512 = "a9af43f6cf6f493f728b8942d3a600f3cb3a23eb0818d284ddabb8766f7d274aa0a232f9925b65625bb56d00864946dc6b0567491cbecdd6a7cf626b6964d9b1"; }

     

       96
       96
       -
           { locale = "hr"; arch = "linux-x86_64"; sha512 = "d97951148ca0ba80a67020f323859ea3f508e40906ecfd18f7a8fbe7a2bc85ea4635945b5c6063e1d5d18456471604075e6767da9a4fda6a09dd3e992a7d3a88"; }

     

       97
       97
       -
           { locale = "hsb"; arch = "linux-i686"; sha512 = "2f7adccdc894f345e861b29a6d65909b1cde2649c69ec9223f784e659e8e3f4668f815b3683fe691de0749483167d26885a0199bee88e8524377c7eee3afbe99"; }

     

       98
       98
       -
           { locale = "hsb"; arch = "linux-x86_64"; sha512 = "70e39341ede01e18c653a0eb56b48e31c73ee3df54ebc11bcd220e2d8e19c67c3e248095c4d070b12a0eac5c24acf5a8ad83069673dcaa684229f4706103685e"; }

     

       99
       99
       -
           { locale = "hu"; arch = "linux-i686"; sha512 = "1fc01c6dd873e2194e6196b1bdb0246e95d0b0520f558b21a2052251d2a5202141c09410c4631b3f025479169d8f68411c2a24f32825261fa8d65696fc7cbe0f"; }

     

       100
       100
       -
           { locale = "hu"; arch = "linux-x86_64"; sha512 = "b4509d671d7eac055812add85ae571f52c90b4eeb172d21c22ce844c70192ba235f37a732e94a0edd6794ecd5a8caa5e8bb6ce05a26d3705902d3628420af871"; }

     

       101
       101
       -
           { locale = "hy-AM"; arch = "linux-i686"; sha512 = "a2b7cd1ec95a0b5eb064e816cfcfc6a74a92806772592947267c4b266bf7ce77d1beb17a7c25b905251cf497ca8dfabf16bca367cf6d9e9e635182f306bd71ca"; }

     

       102
       102
       -
           { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9997ca45051e609e289d7730caf1254adacefbf8e618a165750d5bb7ff7933d014781af76501296c89a4236fd3ac477df6e6be5a5dd45f214983c851a856ce5a"; }

     

       103
       103
       -
           { locale = "id"; arch = "linux-i686"; sha512 = "bda5a7c599885bef966daa35a3f34297e38534e32967142ff9cc720a34c7aa9730e3f24623c240637838eca03f78f9b2ee30af3ac3dc8ba48f9664c56b64c789"; }

     

       104
       104
       -
           { locale = "id"; arch = "linux-x86_64"; sha512 = "97d16c5b4382c7fc6ccee416d671e47d345834a44ab111aa486a41c756b25eb894628d0128e8454fc15f38937bc40436b12e60752ce7b7c1fe35a230abaca337"; }

     

       105
       105
       -
           { locale = "is"; arch = "linux-i686"; sha512 = "576b904fb836ea735f652c6b9c91891dee164edd3523c5f99d68cccb4bd6689c29e4c579b6cc44e699a8900101fb8d223f9e0b0860f71a2814ae0ee2c70609e5"; }

     

       106
       106
       -
           { locale = "is"; arch = "linux-x86_64"; sha512 = "592d65977c34c6133f5745a85722f822efa5956bafc6e880954a0b318fa59712c754e882768755fc08f5e08a1c99493c0b30b4219c46169ba663258e3fd3f3fc"; }

     

       107
       107
       -
           { locale = "it"; arch = "linux-i686"; sha512 = "4d749e1b5d8432df789f29a247ab48a688d4aa16fb25dcf7209783c6036bfccb9ff8ac32dcd09dab1708f71896fa034576d6048eef077d1a6c0a3dc58d3cdb26"; }

     

       108
       108
       -
           { locale = "it"; arch = "linux-x86_64"; sha512 = "087c456d691225d9aef54b2013af69cc7bf2501f83060179112e9c40c1d6762202f68e6329a936df091a1ae6aa5f20bcc96a4c8b0451b71270426bddfb45d15c"; }

     

       109
       109
       -
           { locale = "ja"; arch = "linux-i686"; sha512 = "cb4b0bbff7d322f2f04fdaa50b365d4e0a1ff1786206539cd124870ebd69a9305b88d39b9fbed41c64ddbe68098e02c51a0dc665262424f8eff882b1497ea1fd"; }

     

       110
       110
       -
           { locale = "ja"; arch = "linux-x86_64"; sha512 = "b6c9b419a3e746957f93a4bdba9043adc3911b6f76e1eea2e4e31e77e9aa9057ce720205db4af5586a90df4d6b774b90829f1d7689e77c560c50ccae755400b9"; }

     

       111
       111
       -
           { locale = "kk"; arch = "linux-i686"; sha512 = "ae7711d86ce8180997f44f9309a63a436bd8b70ed0dccda773c34ba816daae99b3b1ae913ee87f4d1f9a4e8f016aea670e89652823df16b5e8414bb58ac28225"; }

     

       112
       112
       -
           { locale = "kk"; arch = "linux-x86_64"; sha512 = "49fb6b5ab6aa12535373927519bf36099da6fab7c2e1bcd6f5ce73d91679f58e81eddd3556df65b305fc2d1cd439cf6de081980fa98ff79df16b620ed41290fd"; }

     

       113
       113
       -
           { locale = "km"; arch = "linux-i686"; sha512 = "29dd1808c1430c01dbb395d5e5a833bfbde85453278d4efd32f1afa1eac19a651c0c3a42eb4ba3402f56a8492e80746d753986c0ec0f1a6dc0e5eb6778b5c6ae"; }

     

       114
       114
       -
           { locale = "km"; arch = "linux-x86_64"; sha512 = "f53966aed30b57a601152f09a26414e11bff4ff31683989eb1e47546eaa32fce8cbb6511043f9753cae076d23d6f2172c2b224313cf5f3262f109b49119175e5"; }

     

       115
       115
       -
           { locale = "kn"; arch = "linux-i686"; sha512 = "17dc37df2b3d5a87bbadc4d5c80d4ddff03752b7a80f5c76171ce9f0bc4b8926964b6315cd4f0c6c9dd3142cec56b464503bde34ec3c69e2b8a66ddcae72b0ec"; }

     

       116
       116
       -
           { locale = "kn"; arch = "linux-x86_64"; sha512 = "2af5ac5c254bd0ed2d08656a6fee7966d73aa89973cfad67fd18d7d88fd1f18a2b882de7854af46a3ebc6acba4cceacc06942db7ae495faa2c6ef21c65e94158"; }

     

       117
       117
       -
           { locale = "ko"; arch = "linux-i686"; sha512 = "415fc260f3dcc2ede6c43194501d9522fdfb106f7c86e5d8f5929df6615c73023fffc3efd190deb68bf08bb2a0d4ab34f7605e222301c8350b980f2dbc289c8a"; }

     

       118
       118
       -
           { locale = "ko"; arch = "linux-x86_64"; sha512 = "c991c0b9a89b618ac046882b929fd7e3689e19dd96edf4535b25f9172b6baaa801a4490ae4fd35e82ca3c776afab74a0a09b993f8ae8c2a603d210f2cf248f73"; }

     

       119
       119
       -
           { locale = "lij"; arch = "linux-i686"; sha512 = "3cd367654397d14b782cea4ef8c96f1f6938f011576a8dba92dd4ca832ca3c8682f3e0e161a4288b112fca550d556080d0ece5a79e4c4f6ec99a9298feb6fa12"; }

     

       120
       120
       -
           { locale = "lij"; arch = "linux-x86_64"; sha512 = "2d7475c544df807a956feb9361f889ba0f5e43dc52a9e1dc9c469d86e97f344b4f2995e3fa149a77662969f3acbcc998f430973b2b9d28b23c82c5058b4a9dfc"; }

     

       121
       121
       -
           { locale = "lt"; arch = "linux-i686"; sha512 = "35c8a452ca845576739d5faa9dab6f3c34dcecf9ce95870f68699836f3534b4807c91fbe80007950abbbca662e6d01b406205b3e4cdf4d33e0717ea5d6f57006"; }

     

       122
       122
       -
           { locale = "lt"; arch = "linux-x86_64"; sha512 = "8791df09d841d5ddabd552d0fb0dc7e9446d23092bae1010d92bc3b056a9ad4a6dad01c5d8db531a273945eaaf4c30c922cd03d7b17e1b6be263e0bcb91b8384"; }

     

       123
       123
       -
           { locale = "lv"; arch = "linux-i686"; sha512 = "22b865a344a46096c53a72ff6b1402d00808bb3b49ecabe6f4115ea60e40e522d64afc701648772616fcb784a963bc6d5bb3f89517d7f8407f22fa82d81bad98"; }

     

       124
       124
       -
           { locale = "lv"; arch = "linux-x86_64"; sha512 = "3c66af306b1a8d0a684c12511d95353c0bdda0bea981ce4e577c928be03e12b582b19dcaccdccec551b3cb0fb716323b1079180aa7a8f1204f5e4b5a84b72831"; }

     

       125
       125
       -
           { locale = "mai"; arch = "linux-i686"; sha512 = "780fe423a3cd56a7452df32679ee07a0e328b21cadc78faa2721cec59185c4a4467aeeb75e9237cc86d38dfa2cd71530f02156c4fb9515582ca564dd53d47543"; }

     

       126
       126
       -
           { locale = "mai"; arch = "linux-x86_64"; sha512 = "d27218b59edf004dc57cfa9ffd70dbeb59b7d3c0871b00388a56b505629fd82ddd6f6e0147f5b4c67a8ad72a674e384b66ba2f9455fa9ff218c9ada4b27d1d7d"; }

     

       127
       127
       -
           { locale = "mk"; arch = "linux-i686"; sha512 = "da7ae3718f3c69ec9b62aaaea93951375d82d8d02818d6855fa9f085a64b69c155a1336585d786ae2d33d657110b787f62909dc9e4d54c62d2ea94d2fa8fee3e"; }

     

       128
       128
       -
           { locale = "mk"; arch = "linux-x86_64"; sha512 = "95136f8bf86014a63bcbf4a5cfbd778c4c7e6a84618aa0f6a6948bb597638569b3702e0569b50c5dc9b46339e723377faea8964b921ae9802043fb7983a2c4e4"; }

     

       129
       129
       -
           { locale = "ml"; arch = "linux-i686"; sha512 = "56743acb54283715fb2a910caa85dda61f7e2c1c5e012aa222dc07e3b522572500056fddf990b7ef03a175ff8901fb11b113bcad5c2adf4a6e6e032644ccca2f"; }

     

       130
       130
       -
           { locale = "ml"; arch = "linux-x86_64"; sha512 = "134f35f5f6616c2a7eec48f637277fc02e23b57bf38eccff9777bb08c70a41fe79967b69567f75f9c8bcbad4b22d2ddaf16bec98e399c4b8ca9db9b70e99ef58"; }

     

       131
       131
       -
           { locale = "mr"; arch = "linux-i686"; sha512 = "f29de7ae7dba03465baf86f93d778c9faf3055d50295977c0207c7e4daae6f7ad733ed38e1323263cebe4f737d9a1616024333a97139156470de1a9fe3c16276"; }

     

       132
       132
       -
           { locale = "mr"; arch = "linux-x86_64"; sha512 = "731b4f143fd1303ab54ea3f1b6aca6c4f78ce935caae32fed0b8cdcd46c0ade8c8977131a3be786ea929a7d284c3d45d34851a0d81242761f722f0bceb126957"; }

     

       133
       133
       -
           { locale = "ms"; arch = "linux-i686"; sha512 = "d372bac105f2012b189efedc449c7c183d0daf64cd7a40822ef9d685ce4a1550ca9699620440dd198b13f95513a577766e9f1a8e88b212492831bf7ffcac7e0a"; }

     

       134
       134
       -
           { locale = "ms"; arch = "linux-x86_64"; sha512 = "1287f36a742fa834d5f31e6bc2f6d3651e54f2bc8845a1f0f647e9a9e38ba66c58138961185897c8832107cffff06167a35dc3ee1f0ff830f997f65fb0854a63"; }

     

       135
       135
       -
           { locale = "nb-NO"; arch = "linux-i686"; sha512 = "ac3e46080e188e56a6b67ff77aeffdba7982d7c3aa4156a6f2781ef6b8fe63cac50d678e5afc91aca4ad16c4384d2b2727f74ddc4083da91a1e3590ac98ec9d2"; }

     

       136
       136
       -
           { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "dca52381e45b5c2d89f590971d830010a9ec1a2a513fe655ee93c3fbd980adcea78787701595a95402bdb660c2f3e0a489e001deba13798337493655798c713a"; }

     

       137
       137
       -
           { locale = "nl"; arch = "linux-i686"; sha512 = "6ec01f8eb18384aadb5715a996c8410ffa94b801ee1f1b1ab43bdeb492e179e781e8b85acbeff4a25cb4fef847ce3e2335968458d9f6e47d046083264e91f6f7"; }

     

       138
       138
       -
           { locale = "nl"; arch = "linux-x86_64"; sha512 = "7d5840518312dd167d914a8f7fa5670fe17f9a6fc39ccd128e30f689005b35bd352d0602993713c3d05288f2b036829be8e08398d536e4aebf2341ae2290e633"; }

     

       139
       139
       -
           { locale = "nn-NO"; arch = "linux-i686"; sha512 = "a185f7592649a91214363cf2a0474b5895f33342c98cd4bdc48fafb0cc76310b2ba4f46575970d723c76b2ecfeba8e2b39d9671e6059a15bcb2565258096156c"; }

     

       140
       140
       -
           { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "7f8e7277bcbfbe5f40c161f1ebbeed86159c2b6205a5ea55cd8b6253fa6742bcfede11d4de6c1aba36e2b1e98f9c9a7b8e26f9aa35e1eaadc1d011636d429be3"; }

     

       141
       141
       -
           { locale = "or"; arch = "linux-i686"; sha512 = "a543a7d3f4e24364be7e4df65a81da82d955d1268a4cbce741ad7ddd5f4e9916573e271f02af1e92b123a4da2c7f312c17f6ce714e3057a1b204484ef12133d8"; }

     

       142
       142
       -
           { locale = "or"; arch = "linux-x86_64"; sha512 = "7672596470cd8f49f9c4558b05bd637af1650da729bc518681a8cde3ec785358121fa7ef209e123fca4b59df1a63878832bc32d2ff404b5d2a818b60ba10c15e"; }

     

       143
       143
       -
           { locale = "pa-IN"; arch = "linux-i686"; sha512 = "a99b60ae1eb479e31f838fd41d5de325c418762fdcfa5e0f3bc3d5da8df108d3b64ce5bfac0af09663007becf5327164db8dea0ea7a3876586cc43030a780199"; }

     

       144
       144
       -
           { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "f0110b74842f924808f74979061151fec711d10a6005d2da2fbb8d46fa2a25ecd5a2c804e58c10a918efe570d4d67d05578b0245f526e1aede4bbc786e9f304e"; }

     

       145
       145
       -
           { locale = "pl"; arch = "linux-i686"; sha512 = "7eaa2bad351429d76b476819a1529ed1609388968327382cc13df235a294f2e9fb14295341ff15fe3b2815ffd1c6c8978e2aa104a847fd2cb4adcf2ae3b0b974"; }

     

       146
       146
       -
           { locale = "pl"; arch = "linux-x86_64"; sha512 = "a40e2c15cff0e7f7bff8a5c0bc4cf39df948a21bd37b34ffc93dd87e1f5256526a25526e457fcfd8d081bc872dc1bec13e67da3cf671b6a16dfa17850be4743c"; }

     

       147
       147
       -
           { locale = "pt-BR"; arch = "linux-i686"; sha512 = "c9cd96e68fa2e1f73a49e71c287a25be8d45a8ebb56262e02c40ba5869fc58c7fc43a1f6958592bb377e7dd4064d64f5ebcbcb5cd3a9fe0a007c2da665f50a66"; }

     

       148
       148
       -
           { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "1184751c1d1a0a9044f8df2d20aee7dfe332dc5f851802ebaf2c5c83fa2bcccfd913cb6e16d2baa449cff1b02aa18f828489914c0741a2ef2a46d54fefecc268"; }

     

       149
       149
       -
           { locale = "pt-PT"; arch = "linux-i686"; sha512 = "86538057ae91b1297acc11c9bf3f7d24ba1950edead89d4733f7c898cf53e3848054bf391a975f19766b69f4c56f576ca54e4b8da806db7416f3e3d91777c3c3"; }

     

       150
       150
       -
           { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "0a480c26e5dfe2bb9b536e122ae32e18a6dac999004493839cb506c1ad615e095c554d296f1a77bfccbbb86b58bcf549db83f7de51d02b68d1eb752b421f23cc"; }

     

       151
       151
       -
           { locale = "rm"; arch = "linux-i686"; sha512 = "751ffe931cd60296490c7164f49f61f4a51bac5210328a18d02261a07eb607e181b2bab4fa0b59d2df15334152386bf816a984840d2331b7e801171be9c90594"; }

     

       152
       152
       -
           { locale = "rm"; arch = "linux-x86_64"; sha512 = "3e526c9a1a876e5d2c548c9a68803dd11c04c8214e18eb09c0b1c3fb3833f64c8a3362db8083ac5de81c59268439b53effa3bf1c64807fafc874eb8ed9baf188"; }

     

       153
       153
       -
           { locale = "ro"; arch = "linux-i686"; sha512 = "73cf6a18deafb7ba93fd60cba3ba0bb0191471f977c41bac11bf2fd6cc6f7fd7cf2ad125ac5cf168ef577d71dfb0e893e182f39be6ad186ddc642d87c40041a5"; }

     

       154
       154
       -
           { locale = "ro"; arch = "linux-x86_64"; sha512 = "b62c54b8694b4a662c1d336056d404a8d432ba0a3d4f2964b5c5acc0e39b668fd228105e1c4e307bfab1acfa5c3ce223db4229df01866cdbbc7c1ac95e70fe2c"; }

     

       155
       155
       -
           { locale = "ru"; arch = "linux-i686"; sha512 = "6ebd3b3a1f3613905313129cde7cf113bdd777fd0f600496231ba813a95b04309b25016dd69891d31189a93ccad3f87b9c69d54d6219ad39dd38d1181b1f3102"; }

     

       156
       156
       -
           { locale = "ru"; arch = "linux-x86_64"; sha512 = "539a22d13587cdcc21b6f76ff24ccfd1df98cbaaacac802aed46ba8f2bfed27cb2f3e5c146cbd2c3559aaff22297e692030b9612041a05a6bfca08f49bf0d2fb"; }

     

       157
       157
       -
           { locale = "si"; arch = "linux-i686"; sha512 = "bb0d1621f5b9af886fca0ea7cf7fd851d7c22d2d8f279a7b88e9bce98be33ad7b75d6a51ab47ea859802ed39b467815db60409285afaa0bbf4bb1ce6d590eabc"; }

     

       158
       158
       -
           { locale = "si"; arch = "linux-x86_64"; sha512 = "90337d193df7db41a1384856938bb62212952a80144dcc319a725a9b567ffd4deb7bb7af89b57891d3c17499ff466990e656edf7d0b017b8f4e0370aab445477"; }

     

       159
       159
       -
           { locale = "sk"; arch = "linux-i686"; sha512 = "23a15e6ad5ce9b03c218be4e26e603a412de4d870d5f64b599ae511bfc66bf2cf04613cc06fc1a054d06b80435e284456c0b08e33f34d8c9482f5ca23da6ae62"; }

     

       160
       160
       -
           { locale = "sk"; arch = "linux-x86_64"; sha512 = "a86cbed60f65e4ebb36c614d846fbb2515945112fd4f2482c3a63b49a62c3acb310f050dcbd57cc76a808c049eefd8f779d6aeea53362dd81798bb8d7177c86a"; }

     

       161
       161
       -
           { locale = "sl"; arch = "linux-i686"; sha512 = "8ae008f0077081ef40de3bf08c2de294231f41439a83d8a41a485f53e95ba3f4fc6ef03d6ac98e8848c3f3dad290978f1607d8c847f1622bd86b7d38cd0be730"; }

     

       162
       162
       -
           { locale = "sl"; arch = "linux-x86_64"; sha512 = "34efb560c65329c7f3f6b341cc49ac4952f24e6e9b34e7f5bd45d98618a4d03ac89c6f62580223efd2d37db24a03f76a54381d4162f5430b887122bb56eb49d9"; }

     

       163
       163
       -
           { locale = "son"; arch = "linux-i686"; sha512 = "d3e5a25fbc4a786239a7ae543fefb7b7e3ecc34192c8326af915f18b9b08436656bf68faa4953a34bdc464e32305baecce800f91ef0152bb4b4a8323ab448f33"; }

     

       164
       164
       -
           { locale = "son"; arch = "linux-x86_64"; sha512 = "ffee5d1a23e91911fd1dedb5ecf24bfc6b1733fb582e64a5e07d4df4b7afd9a6c502a70ab3af6624b4594f5ddcd81bc8962ede5b693cc035a96a561389f6bfca"; }

     

       165
       165
       -
           { locale = "sq"; arch = "linux-i686"; sha512 = "1cbaf8c32d1d3205cd85127839eed11b416903960c9e411b9adc71c42ba4add47acddd32a9217bb68f27b90d6765892edf2d356e21235c5bfd5cf69d1ee719f9"; }

     

       166
       166
       -
           { locale = "sq"; arch = "linux-x86_64"; sha512 = "16d93961a53ecc3e1ae3480be9e34f2a22dec2bdab55dbd35d1ea79ecf2ee48f195380bd52efc7d39529601610793b75daadeeb54dd76c9a3702c786af25acdd"; }

     

       167
       167
       -
           { locale = "sr"; arch = "linux-i686"; sha512 = "0b2c5234f1787cd972fad398dc270766fbc3015dc1bba29755e5316f207af9f5787d4aa41e96cffd2c9d31c57a5d1896e63fcd04e6235a4a6798469e738fa10d"; }

     

       168
       168
       -
           { locale = "sr"; arch = "linux-x86_64"; sha512 = "e7c7e7ff7fd81ca86f45997faed7244e4d807c3e5ad7ed66d6feb38c3e9173eaf136bd34af690ce28534f0c531c7f1d11595ec6502dfa42778cc19dee4334c49"; }

     

       169
       169
       -
           { locale = "sv-SE"; arch = "linux-i686"; sha512 = "dffb94b0ddb4b9d2effba3894b408c9f191f2079dc4b47e214347a235c9bf1adf77e520465691d14a274c3f3344c7f8b7d41965051d506728347e0af1117ad27"; }

     

       170
       170
       -
           { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b601906d28f071c6beb3dbd6b37fa68f50809c9c47c9db69d631127ccc7b784e7d3b278aea6de060b34d83b6c78137da32b77f8e17ed199c3213b89dd9391264"; }

     

       171
       171
       -
           { locale = "ta"; arch = "linux-i686"; sha512 = "1a496470ef8e0899bfce66b41490f54d4d32776eaf60aca8725c4732512f1d3befb2e1fc3b942ebea95fe2359509c43d41649e5f90498264b8e02a3352244260"; }

     

       172
       172
       -
           { locale = "ta"; arch = "linux-x86_64"; sha512 = "00e6dbc43ad3c77693903fe534722094826637698df691b266eb801b27cd5e63502c21ca3e34ff939a7645a1f75d36fce6154626019eb96bc73cc39ab845c952"; }

     

       173
       173
       -
           { locale = "te"; arch = "linux-i686"; sha512 = "70ed539571cadf241f819b68ff24829db32f56287aadab31656fdf66c0ed94ccc6cc11b6cef6e2e963203cda47af2c6032db6e5689c37aaaf495b1e4fa970207"; }

     

       174
       174
       -
           { locale = "te"; arch = "linux-x86_64"; sha512 = "d491acd4635ab9b22f76531740c7ee7a85832678aef9ed646e75f56755c02538440adeea71e9ca5a7a5e11f3f2f6941c3c4c1e47380547179f63baaf6c20ad07"; }

     

       175
       175
       -
           { locale = "th"; arch = "linux-i686"; sha512 = "0414f74c6266fc204f2741b6860f7919c957364bd56ccc2cec5ef4b9c4be812c554ab584e6ce53387e6b7a18ad02991a44d9507a16da59a4aabfd44e7fb5b754"; }

     

       176
       176
       -
           { locale = "th"; arch = "linux-x86_64"; sha512 = "2952cceaecdd4013882150e8158607639e4ab2cffdef563d4fd1a015c41f1eff6c5ac22c0b9301a05ab6f9fef9659d54916275d5a50d97ad43bf69f10da7b3c8"; }

     

       177
       177
       -
           { locale = "tr"; arch = "linux-i686"; sha512 = "c5c6273bae2b9a46108a433af3a85b5cbbba4cd3154ee124ccc49f46c4a76264836a76d1b2da4b1064e9a913cc9fe461911c53e44f40343c5f780be04da932e5"; }

     

       178
       178
       -
           { locale = "tr"; arch = "linux-x86_64"; sha512 = "f0b5bef1ea4b948d699a79d902055d5b31afbe5c4f1814d98cadef1ca820ce39212ec009f68d875860a48942e9d797bda88eec4f6ed591dd8b3b260e04170974"; }

     

       179
       179
       -
           { locale = "uk"; arch = "linux-i686"; sha512 = "3a069ba914716ce122c4a89612988708d811b9350d333aab203dde212527c0e0cc86ec4781e6aa23f40b77f2266f76eca366cf355651870f43e180b97aa25c43"; }

     

       180
       180
       -
           { locale = "uk"; arch = "linux-x86_64"; sha512 = "db7931aa3f1d150e4b5b8c87b9d069df4a515fb2aa5e250b8f8a1bae0d8fd9a210ae949df056c47e3c88e8faf28f2571311ce2d6f179e3365720b42f1335b546"; }

     

       181
       181
       -
           { locale = "uz"; arch = "linux-i686"; sha512 = "110a82749e187f39d77f63b16ad515218e5512e5974916e4145e625a40d797e23fdbb5d110a23f061448cfc3d3c597858636c9304e941a34c68368f749c3c900"; }

     

       182
       182
       -
           { locale = "uz"; arch = "linux-x86_64"; sha512 = "1dbf94cef034449e8d1342822384bf1761dc61748e2d876aec1ac628dd161f92b62da832fe397b2fe4f8a1b82f9adf1c3690f26e07ee3e48c6299f95969533cf"; }

     

       183
       183
       -
           { locale = "vi"; arch = "linux-i686"; sha512 = "af97e1dcfc9bfbdce95a5cd35025b2540ad928d3238863471116e071a51b354b7818577bc3e7427c513e7b335bc1510605ba3ad1a37221389de7c7fedf6e2103"; }

     

       184
       184
       -
           { locale = "vi"; arch = "linux-x86_64"; sha512 = "cc938935395e66ef721fdbb8c8b781ef648b5419393ed1687a116a4d9ae12dd18f2edbc8287235504aa6782bbd6a41f9f5dd89c9c712ed4980fb9fa44f46ef38"; }

     

       185
       185
       -
           { locale = "xh"; arch = "linux-i686"; sha512 = "a76dbac054cdb7f5c194766dc54f215de4cb4cca4aacd7c883e0e3632b9dfc18cc25d7a54788e213bc65c894dd26ca9b863199b55b649133f93da9fed9a58fe4"; }

     

       186
       186
       -
           { locale = "xh"; arch = "linux-x86_64"; sha512 = "cfd8bbb81637c19464ec34788254740e999c13bc8a64b4289b0e1c64f76d711a5a5a8380995271f309444032739066f06334da2f81b6ca2b2be33ff55d3ff402"; }

     

       187
       187
       -
           { locale = "zh-CN"; arch = "linux-i686"; sha512 = "d11637b0c28aa1c45b315322ff12392e133aebe21f435564da278b9e301f0c8515ccb721df2bd55c175c48c3e24934837abbba4b84c9fa659b7a58db1da68f04"; }

     

       188
       188
       -
           { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "27a06d87f23eaeec170d1ea7f3df636198bfd4787001e178948fe9b8a3f1aafff3be59b9d01ed5b5851902b550601f061e923a4cda3a972f0ac68928cab28577"; }

     

       189
       189
       -
           { locale = "zh-TW"; arch = "linux-i686"; sha512 = "7c6ef5592b273749ccbf7b37c09984b11722beb7f49d4ed25555b84f0521e0dbac5197c7642ac508a21a1a40c5578dcfb49310858819875cc9407c85426d599a"; }

     

       190
       190
       -
           { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9ccce84a292144f3758190ff2858c077d1e7ec6d49ff5e1efb404b8dfb3bcfebf96eab15d0ec32325e4d96d94f4c6bcc67f4e43dd22af418b822d82a2afaf6f1"; }

     

       9
       9
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ach/firefox-47.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "a5391e45d1e59a7c14d8d421286033e3e760bf2b4afddfec3d1767b2ebc957b053c39f17f8185a6c9ca2542c76f6c9612d95d474c01bd5ecc62e5d4f4e43e8df"; }

     

       10
       10
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ach/firefox-47.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "48681328033b694adfc6149bd965a3dff90ef014db6f65641ddd3d79ba7901604623735555bad024dc2425f226c65e332a0875d6b18fe1c06b18a1e407b70294"; }

     

       11
       11
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/af/firefox-47.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "7757ba99ce9991f67a45d9a19615a93c0a1bf0e35d35c5fe653f04d47c068054c8d91327641a48cd20fb9531cd1e842066c0e6f2dd8b23bff216a9fc727ec84d"; }

     

       12
       12
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/af/firefox-47.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "7e3d70da29aeb5fc81f5e6dc52a4b8f831813f8c025b1a105df631cc5b675905c82dae842459ad30c5257b74bd5654e9aec5dcfcdee93eb42443c45cda81138e"; }

     

       13
       13
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/an/firefox-47.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "1051e1e3a6c25ba6b3aa4ce5adfdc60bcb3c612f3facd5edb702385ea8c0837cc53e95b064a424e0c055a56a11f3a54a7ba37e2ef35045c8cbb834aaec0f6327"; }

     

       14
       14
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/an/firefox-47.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "27fb75ce402c0d47f8542d3d6d6992587e6ea0caaba2249e763f0f9c4f1d233b37a4b87ebb7e730d16704c7d2abab690660e409e721850875fc09deb0c433252"; }

     

       15
       15
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ar/firefox-47.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "296e23fff265bcc08ec0f81608d50428181163d216fd896c80a1a8c31e95f243112aeedf3bbd96b1efbaa1d6d576a9bfc75e5fe8df434cbb74bb9576f7d90a83"; }

     

       16
       16
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ar/firefox-47.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "15f0e7cbf5a98ffa9d2d7befcb11938b76194dff29b1d93ddcbb8f5c655ef33659534874a72aea18f98af06e5fa4392aee5412582ef43292d70603dff2c42c60"; }

     

       17
       17
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/as/firefox-47.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "67883c8cb7ffb6c05288b316b2aa5bc3274372dd82ab4c771fcf1e5a968e550d12c89027440704d8479a906beeef24a18ca72ad243628a5ece45918ed990c793"; }

     

       18
       18
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/as/firefox-47.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "f7718b0dc9bcbfd109591f87263d7791dcd7612b0312d0bf93e68b1f2014d3732dc6740c57a8e64dfc1af7946da14dde617945e38842eb19cfe39376cb12ad44"; }

     

       19
       19
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ast/firefox-47.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "f29b883932752bfa947c48f7c1ff6084b1cf215ea84cf63beaea808702b0b90f50e85aa4cefa4d2c1234b0d366c8f6e3d8fdf7a0f92d432cba790adab6d24174"; }

     

       20
       20
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ast/firefox-47.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "8b656c6b08640c125b94f90e1dc8259c90af2e764cee73b02b9dc3c0246b3195906d9208bc2a6b3ca31091d8cdfca8338fa6c489b7caa5685a23133e98847a39"; }

     

       21
       21
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/az/firefox-47.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "5ee1247e37964274bbea8021c8e4e5116fedca95712fbd91d709c5c580bd1618c6319cae73278b2f0ba82031e94bd3fb382d2b4dcfc9a5d7ad47ecd80f4fca43"; }

     

       22
       22
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/az/firefox-47.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "c369046c29dd0dfcf40e69e1f5b5a63423833a376d2b143d3fbf2ee1e23dedb3baf24843ba1178bda94b86f357724898a147d4adfac1e469cbf44166d7ffd16c"; }

     

       23
       23
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/be/firefox-47.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "f8a1ab05b8d25a7a30e755a551f0851a308ba0720180685f6946a510363988717f8274ac2c8ef826c60232a62c394b86829d289e7d74e24b7656b55238129b15"; }

     

       24
       24
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/be/firefox-47.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "df05271371de5fa25ec11164eaac0b253bc892749d421a6ca730dfeceb4ef89492c42ce83a87eccbe91cb03ab001bf0a1d9a20a7296b69841cab8c6b5d2acc36"; }

     

       25
       25
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/bg/firefox-47.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "80644b86f9296b708e74843a51f81d368e3508f0f2f74de1a998d30a15f6e3af08ffd70dcc5c79adb76c03be9ff4713fc8403b8433cbc33ca3493941c4fb2fe0"; }

     

       26
       26
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/bg/firefox-47.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "0e6cdc5b3cc706031c95a550b0c800c9e8e2d7bf241010c22f0872eca4bab018a5f0d4a94abb4f8291c279476700f2101a69ac0c57ae79994fba38b88b00fddb"; }

     

       27
       27
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/bn-BD/firefox-47.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "4c697f1dcd68634e2ab712d4f2415e57cf8be0017fff3602223d8af19a1f3a5c973489d13951baaab95924fad42212a485fdff622d2b559be36e246c8a847b67"; }

     

       28
       28
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/bn-BD/firefox-47.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "1931035a9d92dd9246a00b32443e282dc405096407a4feff7856125b7ee156840114c9be0dd58a020c250fa54c4ccb22052d2be291eeec9b5f76303fdf6c4cc5"; }

     

       29
       29
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/bn-IN/firefox-47.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "fbab6f7e4205c803a50990624d58aa80cfd3aa76fed02cbf9ea390f4ecdcc1a97bda9b51791cec49f2a7e1010109d5f81a1c9b6ac224f1f70df49407df5f7386"; }

     

       30
       30
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/bn-IN/firefox-47.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "c705ec8356796060c6782261086011bc0bf3ac9f08bc821ce2305c9aac11c522abb802a9d9ab7dcb53b0d38468bb6e667d45b187355d769acb43a8b252c4f400"; }

     

       31
       31
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/br/firefox-47.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "c58cd77139a0ae7f3bb8f6f25c40856aca18a831c8f5d6f5d59a45ec615420bd55205093fb66a77591835b0d9493f774b1801a168b9c071086d510a1446cc914"; }

     

       32
       32
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/br/firefox-47.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "b6bde26d478eac081007ef43a6d588f70dc4d54afc423b019468dc91bfcb117d3b4989c4cbb4cf77a1a11847a58ec74fbf822b6e6f0ef86fdb0065c301294850"; }

     

       33
       33
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/bs/firefox-47.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "16ee40d079996f42be77167b73645d389045648c9d36b76e34d0398c7b5b6dee54712d109f93d054236ac7076fc3edb06ee82acae40ad22825a23d92d0e2c636"; }

     

       34
       34
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/bs/firefox-47.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "ef674f409df5c32fe4584f9de65cc6558d6b3ec78d8a83f5cec829bc1ae09f30399567915e32584334704d12264c2592fecc9e4952beabc8b0d4eb49a7186854"; }

     

       35
       35
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ca/firefox-47.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "fe522bd836c82cb68bb21ad1c7f36bd9a7af1642abf7c035e2d0999b4cc07c58124e4d8de81344598036159102ee12f22c12e44a8a087e54d6c661c3f453b63e"; }

     

       36
       36
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ca/firefox-47.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "b618da984d35fbde3819d101c103d8d9a5a4de98f0e254c67e894656019ebb6adc56e14a57410a61430d9aa9c1e0a01339b39a5272164af372544f27329a1644"; }

     

       37
       37
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/cak/firefox-47.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "82659aa2fbd091224aef6800b3df1d2e5141b6a295918e4fc4ea09b671184f62c670e3dedd7040b2f167581b0c8a0e8799d861256b273b01b2455d0937722273"; }

     

       38
       38
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/cak/firefox-47.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "a507cff511c6337f805a27c0f73548342d2fb2cffa683874d66b054b844b17c354cc6da5c3d15618006c2279099b0cd9172b17d9d4b21a3863b5e395db686b22"; }

     

       39
       39
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/cs/firefox-47.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "9af91acffc2beeb53280a6cbd21656a91a686c03342fad90dd91314c49535acef1a8abac8fe54bcfc250ca8b8f07e3550c890094f3bcee6baece983cec68bd8a"; }

     

       40
       40
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/cs/firefox-47.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "c8bea48dc11c021fff9df5ee1a67a6b6e9193ffb2a07e17014d7448254d8a8f4d1512f862ea73bf84dc15b40edbba3fd94cd3d2d18872255bbfc7fa9a7b8ec29"; }

     

       41
       41
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/cy/firefox-47.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "7cc062c3b9b4bbfd0b1f7247f06505ae99458514b607d4d9062836085798bab7ade6c4d1c8903b1b961243c6fb6adb4c4f94780f1194f745cf62d786e2c4f5c6"; }

     

       42
       42
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/cy/firefox-47.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "abafa600b941e17f8aea0e778a937f5fb34cbc8803c93e59febc5d9fde6ad3347ba0bc7aa07ab57a61f6b9d6b11d582b987100364aa8401bca539dc6e14584e3"; }

     

       43
       43
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/da/firefox-47.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "d4a9141779f52b78a51b9682b6b44e5ccffdecf5582358ab8a02efe133d9a52023e03c238e106a79e41a8aeaabcc58e0757c1af66837768e7bf4732f26182915"; }

     

       44
       44
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/da/firefox-47.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "48f0c48aa273cec9830bf806330c7a630185262838007628acad904a45b3186450a8973938c36db636bdef9042c78ce94a4a456e1682ef561abaabab6ac20863"; }

     

       45
       45
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/de/firefox-47.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "01675b3a8ecfa10da1d101cba36295b226b130e1cdb2c760541cd76c9b21436ae84ca7228e063402b1ca2eb59acadcac7720c9dd47db8b406675fb273af206c6"; }

     

       46
       46
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/de/firefox-47.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "6a7ef802a8109f58504b2accb9ef0ee38986f6c8980e0831c30b470f2ee768169557cdbde1a58d7c72996b27596e553185ded476cecdd7114b75d82428b7846e"; }

     

       47
       47
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/dsb/firefox-47.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "55528fca4d276b2b0430949686845e3d7d88975129c9a9846408f758b4f9c8f154425db891e5c1930197e36137d6c15ba29de90dad624bad23090015849d0ab5"; }

     

       48
       48
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/dsb/firefox-47.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "f21c14a57f6f973be824340fcd417ce03765d5826114462f62adbd933661bccbfbe90b66935083619c62d48401c511830574ccc373ca2110093b06fad59734ff"; }

     

       49
       49
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/el/firefox-47.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "ac5a808db1ba68286a7199eef33794f7aeeafa26e97a20738fb21be479462bcaeb1e8a7995720d5c7dcaadd0cebe91bb2a3e019873d0cf74f42838f7d5c1a427"; }

     

       50
       50
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/el/firefox-47.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "c02e6587d99fc3ca66debe854c778a8b3dbf9b514e6ed74fa15e3035a54643b2bc324ff59f1705c6bd392c37ad1996f80dbabbb57df10aff954ed0ff3f5b01d5"; }

     

       51
       51
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/en-GB/firefox-47.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "c458c70db0408d627a904781adc9af18011f243689f4c5a606c8f1508b4e9417a8df499673c4ba56d32ea77d0f79ab85ff88852f7c518e7fd124e5970615b2f9"; }

     

       52
       52
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/en-GB/firefox-47.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "28ccaebc4f7613d7ea8c3b47504923f2d59bdf4afd6e386a67dcb6b6923a9374c1c783e4f904da0b6e0f716ec87a046fc12f3781b732389d1d680745d6955c58"; }

     

       53
       53
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/en-US/firefox-47.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "e1ea34bd0829656c04c471b66d2013fc07cbd5cf40b47bf3a932326cca71f9a502c52d1d5e6dd902d274d307079475b0e75d7ff552fcb2fadf31b2883efba79e"; }

     

       54
       54
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/en-US/firefox-47.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "a56b2ad26df424f008d96968a4e6a10406694b33f42d962f19dff1a0bcdf261bca5dd0e5c6f3af32d892c3268da5ebee8ce182090f04f8480d37d232ccd23b9f"; }

     

       55
       55
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/en-ZA/firefox-47.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "d5efc3d4e624f34c81df068f4d6c184cb8a63ad0667695e9ce7099e069b23715eb77cf2004adee41bf355452179959e5ef7450f167f87be70339abb4cf70844a"; }

     

       56
       56
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/en-ZA/firefox-47.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "859730132549691b61e936813f0f5fd3e62f3ef6fa9899e3f68bd3178b7438b4c6b49f54f00d4898b568d6abccdd55a0f9fc6c51858e95735fefcc13de460d73"; }

     

       57
       57
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/eo/firefox-47.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "8ef290bf1eb3504ace393b32c2da64d14435edc327c4f13a40cd925efaf7e042a03b6877689b3f2290f85625410a4e48dfb2cf676f138fdba87ffc597b25f4b6"; }

     

       58
       58
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/eo/firefox-47.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "7d6167749d2a57a9c12180302a825fee14555e9050b6be3c83dd35183678bc36e10391cedcc864ca0dd96d297997a68627dc4fc1a9cd8922e789dcfa814f18eb"; }

     

       59
       59
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/es-AR/firefox-47.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "07768e3b3ed903f4327881a132f192a65842a376eeca6d10ec0de69fefb4ddf3d7fee2a704bbc8d229c78556478814d9e53940cca9edee58270d9790d6b76998"; }

     

       60
       60
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/es-AR/firefox-47.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cac021af09abd742273dc77291fb1528dd5d6d38cef3a5e36e615fbb9f3908655fdc96ceb93fd131c4879acf24e702a044471136e7575f3b550ebcecd982047e"; }

     

       61
       61
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/es-CL/firefox-47.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "e92ce6bec5b1ee8cf3db0a604eb4cae6245fb6d04a48eec64b6dd55139f3606cbbcb65511e29a3164d6572929b7216afbaa7f034a2191eba100ecb7403740504"; }

     

       62
       62
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/es-CL/firefox-47.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "98e57146481a53061c0b30872290ecabc2d14c73805a9461d82aaaf4cf9f301521fd55b01c8159c09a56f52a1580d83c9527986b1390f496d0fbd11227216e7f"; }

     

       63
       63
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/es-ES/firefox-47.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "c44df66e140ea9190112f89aedff9519b6bee18f5e2b54aea19acd233e623c299aecf134cdba70d366fcaf6b7795d220052ff75409c7a04394a7aa02d9ea708e"; }

     

       64
       64
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/es-ES/firefox-47.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "c2d70bc5a304df7b2484c8fb2b374f8e31a69049eb223a53dbd0e4b51e4ccce907efb1674eb637370ce7c3947ba5c09e65f433d10e0f328b80d482f3de9cae12"; }

     

       65
       65
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/es-MX/firefox-47.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "96dcb75cffeb85b85f092e295e38ee55c272714c40609ca90cfaac5fa0cfdb3efe8e993319ee690b4a7938c42346bf39f063ab1f3db606e743c1e4720de5a93f"; }

     

       66
       66
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/es-MX/firefox-47.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "60b50d6726b2e1985564bc02263eb88c9b4c1bb39e6d19812ecc6751d6ad223ba04f65a7755a946fb15dceab90628b057bda89c55fdd4972604586f52c5a4b1c"; }

     

       67
       67
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/et/firefox-47.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "0a4bef2277f729c93db413b68f8263eb356f7b3278880574b8ebe010e2db9067b803967e1f0d6912f128a9ad5ef204466f52ae277f3addfb8fe9ac377c3b8a3a"; }

     

       68
       68
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/et/firefox-47.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "ed1bd4fd67262958601f1107edc589bb28e9b7f9faf0edebdcaf0c07ec6007f527a9eab434582a65271a8f68edac8178601da54eab9398f48b31126657a21b0b"; }

     

       69
       69
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/eu/firefox-47.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "8c5c9406345e2a1fca3544aeb742dc0d254c804d887e3614613280c050a63b69320d4488b017ee16b0a2a07bea862e8b245baf7edc9df65689d509986f3c5958"; }

     

       70
       70
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/eu/firefox-47.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "d8f7004e24033f377391b577c549b66f73cf0e899ce5f580eaccd07713ec03b4362db7b222ce6345d113641d3e6a951302939bbb155c47ec0fa46a201a631427"; }

     

       71
       71
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/fa/firefox-47.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "f4e02737e20b6ffd3bc2b3a5e5fa59fc80a8e37dc8459ad4a6b99e7621a4d3f360884915f7136dc201830efe371de37977ef3e27f34f84e2cb734c1fff8f6e36"; }

     

       72
       72
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/fa/firefox-47.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "8f624b066faa39341b750dbb702dd60ee6ad75b3850c659dac2e21969ebed1f792423e9fb0a9cae7fc456943020f9a0155af5d7c596433eedaaa9990ce07b7d4"; }

     

       73
       73
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ff/firefox-47.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "22a2c5376b1e8d770659475085d98ac1f1020cd816ff3ec6ccfcd68f2484b1b0dc25bb84ca52f4ad27144f4da356ce5e7fd54411d12ae7c852064509470d5828"; }

     

       74
       74
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ff/firefox-47.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "bcb3dabc250045b8ad444219055fd9d14902296ef3f9c320bec1bef940f84eeb0d4a50249805188ae96ed0288a70f0216350ee79191beba49aeba890ae515b41"; }

     

       75
       75
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/fi/firefox-47.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "0c505a0e1d3030038b61ea159eece3892bcc7d947b6d7010c0be8791525c9d91ad1170d4cb45260584c93a78a4bc831b7acd9f28e95ae62e5b96b31745dcbe50"; }

     

       76
       76
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/fi/firefox-47.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f347cde005c6b61366c633db5a8cbc5260dfa0d68230a938d847e3f80bff2f1bed09dddded7b1728f4ef9525610ecd046743f9e71eefb467943fe6b72ed198ca"; }

     

       77
       77
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/fr/firefox-47.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "8fb8ea2eab82740657a6b822b330fa0c289c31ad900683b4ad07b1e9b0c6c4e14f50af39d6d0f787642010628800b0a99b5ab0c4cad62e4a579390509b1ddd13"; }

     

       78
       78
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/fr/firefox-47.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "ae79c5b7f9f8305c3631f4f913baa341a9beaa7a2ee5df1c6c1826030c21bf22b92095ee579affb8911110bf3bcc359793c0beca18d4c32b1fcc1f3d1dbcc4b9"; }

     

       79
       79
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/fy-NL/firefox-47.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "1c57d02fdc33ff53de48ed9aa9e89ecd5a56d35b432d5651e71bbfbd5f9dfd18aeaf14d10b881f72df871afd00a12b31ff05cf9d5c5a55cd44a92c7a0156523d"; }

     

       80
       80
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/fy-NL/firefox-47.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "f30f59d630c5d289b61dc7440f7bbb976eb16732370f827365a477090cdf9f2859f39afb7ff9d9be7e8a022f181f2aeb7a3005c00f4c14e6505a28db7ae48a9a"; }

     

       81
       81
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ga-IE/firefox-47.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "739d5feec4bffee67876227f6783d35675f4c0d168b7abbe5f97b6e8edce7fe4b8f04f8240087f7f208db4180f3417997b661c93ebe046decff3f4f4fecac839"; }

     

       82
       82
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ga-IE/firefox-47.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "cb4344df6e07db839ce8c9fffd1b7b310c8108b5218cea3602972806c1a40f56bf1355ede4cb3595f54179b16e3470e25bfbddc8e39d726c7d6c1e99d128ca8b"; }

     

       83
       83
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/gd/firefox-47.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "91004d62bb5f1f6a1d65b35fee9e594d21d9877669e042cb4c9a834b01b35797363e1433a9ce5a8d0a9f64c8b256da6a6d09fa3342b74b7c2af8ce8afb3e4e56"; }

     

       84
       84
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/gd/firefox-47.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "f04034cafed25c34713ffe4109e53b107b8fe81321c0c0c035f54ff0ce67ac393b42db7598edc658d3f026e447f9ff1c4d1cfdedd31066eefb6019117248e4c0"; }

     

       85
       85
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/gl/firefox-47.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "107bdebb92ce86f39cdc45d6bb24a9c4d104820eca6bb77950693ccbd55e7f8a2f143fc3a5bbb1bfda161e7a33c8f6d8d2686b09da1497215defbca2b4e4e109"; }

     

       86
       86
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/gl/firefox-47.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "c841af5c73343475150b5404b4b54396bda845aa5b231a742aa17ecb7fdbbc5cd4123efc3ac2ede1c24f485d04bd87e8bf7cb00b7135bef236ce56afa0c27a19"; }

     

       87
       87
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/gn/firefox-47.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "20954e218967772488bd895ebf069522c3f4c56ebfa09a7c8efb740158cb95b6be76cee8f4d7f2c1c6c505ca9071a0ddc1914784a54f669d337d5196f18b6f4a"; }

     

       88
       88
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/gn/firefox-47.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "aaed68f13e326792671669883b452b65556998ed757ed5b745c6453d6bae8865a06f137709de37ace2688e2e09f1b96ecf2e5b6374b4170d29100c6f83ce22ce"; }

     

       89
       89
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/gu-IN/firefox-47.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "205093ecc0dfcddb2b90e05b1a17f75805a4597bbfad214d67442fd0d952f765b031ba63a3c399ba9c1c46e4d05b3cf786f01c46eb8990240a16431964c93a94"; }

     

       90
       90
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/gu-IN/firefox-47.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "a84ec5015f6922a22a284eaca985010586067370d818e77d401b58782f86dcf2f534f1ef021719c170f1f502525ce25c94760d3b75481c15fade3c25b969b563"; }

     

       91
       91
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/he/firefox-47.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "5727fc4699316c4b34be1c2596c5cc20d5fc9d2062b1e106087cdb34b788fe3ebbc098acc8c690bc83c9d9be59ac3b3977fd9116d766ce908aa088660fe34771"; }

     

       92
       92
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/he/firefox-47.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "c399969bc24b10ca1c1eff17d3414f214cfe3e5b73282942ead5b2ba4d2c58b74d665b13031ccf42956cd45f0fc7b206dd2f9674103c1e3a8861a33577b5caa7"; }

     

       93
       93
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/hi-IN/firefox-47.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "f014c47a143d425aa3452be2bbed199a8b5e75d278c35fa86bb6bcac40bfb32bdee22d030386c881c818b465451b35c81f97bf29f9ccfbea606d52c822057899"; }

     

       94
       94
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/hi-IN/firefox-47.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "0e5dc0970680886dc02448d7118b6864092699fe44f3276ca17cba160aee59418f8e39338247897b118de0e1fb7634cf725ddc6a34a8b6f002b7a78d92deffb0"; }

     

       95
       95
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/hr/firefox-47.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "a9af43f6cf6f493f728b8942d3a600f3cb3a23eb0818d284ddabb8766f7d274aa0a232f9925b65625bb56d00864946dc6b0567491cbecdd6a7cf626b6964d9b1"; }

     

       96
       96
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/hr/firefox-47.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "d97951148ca0ba80a67020f323859ea3f508e40906ecfd18f7a8fbe7a2bc85ea4635945b5c6063e1d5d18456471604075e6767da9a4fda6a09dd3e992a7d3a88"; }

     

       97
       97
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/hsb/firefox-47.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "2f7adccdc894f345e861b29a6d65909b1cde2649c69ec9223f784e659e8e3f4668f815b3683fe691de0749483167d26885a0199bee88e8524377c7eee3afbe99"; }

     

       98
       98
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/hsb/firefox-47.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "70e39341ede01e18c653a0eb56b48e31c73ee3df54ebc11bcd220e2d8e19c67c3e248095c4d070b12a0eac5c24acf5a8ad83069673dcaa684229f4706103685e"; }

     

       99
       99
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/hu/firefox-47.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "1fc01c6dd873e2194e6196b1bdb0246e95d0b0520f558b21a2052251d2a5202141c09410c4631b3f025479169d8f68411c2a24f32825261fa8d65696fc7cbe0f"; }

     

       100
       100
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/hu/firefox-47.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "b4509d671d7eac055812add85ae571f52c90b4eeb172d21c22ce844c70192ba235f37a732e94a0edd6794ecd5a8caa5e8bb6ce05a26d3705902d3628420af871"; }

     

       101
       101
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/hy-AM/firefox-47.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "a2b7cd1ec95a0b5eb064e816cfcfc6a74a92806772592947267c4b266bf7ce77d1beb17a7c25b905251cf497ca8dfabf16bca367cf6d9e9e635182f306bd71ca"; }

     

       102
       102
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/hy-AM/firefox-47.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9997ca45051e609e289d7730caf1254adacefbf8e618a165750d5bb7ff7933d014781af76501296c89a4236fd3ac477df6e6be5a5dd45f214983c851a856ce5a"; }

     

       103
       103
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/id/firefox-47.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "bda5a7c599885bef966daa35a3f34297e38534e32967142ff9cc720a34c7aa9730e3f24623c240637838eca03f78f9b2ee30af3ac3dc8ba48f9664c56b64c789"; }

     

       104
       104
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/id/firefox-47.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "97d16c5b4382c7fc6ccee416d671e47d345834a44ab111aa486a41c756b25eb894628d0128e8454fc15f38937bc40436b12e60752ce7b7c1fe35a230abaca337"; }

     

       105
       105
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/is/firefox-47.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "576b904fb836ea735f652c6b9c91891dee164edd3523c5f99d68cccb4bd6689c29e4c579b6cc44e699a8900101fb8d223f9e0b0860f71a2814ae0ee2c70609e5"; }

     

       106
       106
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/is/firefox-47.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "592d65977c34c6133f5745a85722f822efa5956bafc6e880954a0b318fa59712c754e882768755fc08f5e08a1c99493c0b30b4219c46169ba663258e3fd3f3fc"; }

     

       107
       107
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/it/firefox-47.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "4d749e1b5d8432df789f29a247ab48a688d4aa16fb25dcf7209783c6036bfccb9ff8ac32dcd09dab1708f71896fa034576d6048eef077d1a6c0a3dc58d3cdb26"; }

     

       108
       108
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/it/firefox-47.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "087c456d691225d9aef54b2013af69cc7bf2501f83060179112e9c40c1d6762202f68e6329a936df091a1ae6aa5f20bcc96a4c8b0451b71270426bddfb45d15c"; }

     

       109
       109
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ja/firefox-47.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "cb4b0bbff7d322f2f04fdaa50b365d4e0a1ff1786206539cd124870ebd69a9305b88d39b9fbed41c64ddbe68098e02c51a0dc665262424f8eff882b1497ea1fd"; }

     

       110
       110
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ja/firefox-47.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "b6c9b419a3e746957f93a4bdba9043adc3911b6f76e1eea2e4e31e77e9aa9057ce720205db4af5586a90df4d6b774b90829f1d7689e77c560c50ccae755400b9"; }

     

       111
       111
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/kk/firefox-47.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "ae7711d86ce8180997f44f9309a63a436bd8b70ed0dccda773c34ba816daae99b3b1ae913ee87f4d1f9a4e8f016aea670e89652823df16b5e8414bb58ac28225"; }

     

       112
       112
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/kk/firefox-47.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "49fb6b5ab6aa12535373927519bf36099da6fab7c2e1bcd6f5ce73d91679f58e81eddd3556df65b305fc2d1cd439cf6de081980fa98ff79df16b620ed41290fd"; }

     

       113
       113
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/km/firefox-47.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "29dd1808c1430c01dbb395d5e5a833bfbde85453278d4efd32f1afa1eac19a651c0c3a42eb4ba3402f56a8492e80746d753986c0ec0f1a6dc0e5eb6778b5c6ae"; }

     

       114
       114
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/km/firefox-47.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "f53966aed30b57a601152f09a26414e11bff4ff31683989eb1e47546eaa32fce8cbb6511043f9753cae076d23d6f2172c2b224313cf5f3262f109b49119175e5"; }

     

       115
       115
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/kn/firefox-47.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "17dc37df2b3d5a87bbadc4d5c80d4ddff03752b7a80f5c76171ce9f0bc4b8926964b6315cd4f0c6c9dd3142cec56b464503bde34ec3c69e2b8a66ddcae72b0ec"; }

     

       116
       116
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/kn/firefox-47.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "2af5ac5c254bd0ed2d08656a6fee7966d73aa89973cfad67fd18d7d88fd1f18a2b882de7854af46a3ebc6acba4cceacc06942db7ae495faa2c6ef21c65e94158"; }

     

       117
       117
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ko/firefox-47.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "415fc260f3dcc2ede6c43194501d9522fdfb106f7c86e5d8f5929df6615c73023fffc3efd190deb68bf08bb2a0d4ab34f7605e222301c8350b980f2dbc289c8a"; }

     

       118
       118
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ko/firefox-47.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "c991c0b9a89b618ac046882b929fd7e3689e19dd96edf4535b25f9172b6baaa801a4490ae4fd35e82ca3c776afab74a0a09b993f8ae8c2a603d210f2cf248f73"; }

     

       119
       119
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/lij/firefox-47.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "3cd367654397d14b782cea4ef8c96f1f6938f011576a8dba92dd4ca832ca3c8682f3e0e161a4288b112fca550d556080d0ece5a79e4c4f6ec99a9298feb6fa12"; }

     

       120
       120
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/lij/firefox-47.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "2d7475c544df807a956feb9361f889ba0f5e43dc52a9e1dc9c469d86e97f344b4f2995e3fa149a77662969f3acbcc998f430973b2b9d28b23c82c5058b4a9dfc"; }

     

       121
       121
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/lt/firefox-47.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "35c8a452ca845576739d5faa9dab6f3c34dcecf9ce95870f68699836f3534b4807c91fbe80007950abbbca662e6d01b406205b3e4cdf4d33e0717ea5d6f57006"; }

     

       122
       122
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/lt/firefox-47.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8791df09d841d5ddabd552d0fb0dc7e9446d23092bae1010d92bc3b056a9ad4a6dad01c5d8db531a273945eaaf4c30c922cd03d7b17e1b6be263e0bcb91b8384"; }

     

       123
       123
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/lv/firefox-47.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "22b865a344a46096c53a72ff6b1402d00808bb3b49ecabe6f4115ea60e40e522d64afc701648772616fcb784a963bc6d5bb3f89517d7f8407f22fa82d81bad98"; }

     

       124
       124
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/lv/firefox-47.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "3c66af306b1a8d0a684c12511d95353c0bdda0bea981ce4e577c928be03e12b582b19dcaccdccec551b3cb0fb716323b1079180aa7a8f1204f5e4b5a84b72831"; }

     

       125
       125
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/mai/firefox-47.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "780fe423a3cd56a7452df32679ee07a0e328b21cadc78faa2721cec59185c4a4467aeeb75e9237cc86d38dfa2cd71530f02156c4fb9515582ca564dd53d47543"; }

     

       126
       126
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/mai/firefox-47.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "d27218b59edf004dc57cfa9ffd70dbeb59b7d3c0871b00388a56b505629fd82ddd6f6e0147f5b4c67a8ad72a674e384b66ba2f9455fa9ff218c9ada4b27d1d7d"; }

     

       127
       127
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/mk/firefox-47.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "da7ae3718f3c69ec9b62aaaea93951375d82d8d02818d6855fa9f085a64b69c155a1336585d786ae2d33d657110b787f62909dc9e4d54c62d2ea94d2fa8fee3e"; }

     

       128
       128
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/mk/firefox-47.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "95136f8bf86014a63bcbf4a5cfbd778c4c7e6a84618aa0f6a6948bb597638569b3702e0569b50c5dc9b46339e723377faea8964b921ae9802043fb7983a2c4e4"; }

     

       129
       129
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ml/firefox-47.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "56743acb54283715fb2a910caa85dda61f7e2c1c5e012aa222dc07e3b522572500056fddf990b7ef03a175ff8901fb11b113bcad5c2adf4a6e6e032644ccca2f"; }

     

       130
       130
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ml/firefox-47.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "134f35f5f6616c2a7eec48f637277fc02e23b57bf38eccff9777bb08c70a41fe79967b69567f75f9c8bcbad4b22d2ddaf16bec98e399c4b8ca9db9b70e99ef58"; }

     

       131
       131
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/mr/firefox-47.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "f29de7ae7dba03465baf86f93d778c9faf3055d50295977c0207c7e4daae6f7ad733ed38e1323263cebe4f737d9a1616024333a97139156470de1a9fe3c16276"; }

     

       132
       132
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/mr/firefox-47.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "731b4f143fd1303ab54ea3f1b6aca6c4f78ce935caae32fed0b8cdcd46c0ade8c8977131a3be786ea929a7d284c3d45d34851a0d81242761f722f0bceb126957"; }

     

       133
       133
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ms/firefox-47.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "d372bac105f2012b189efedc449c7c183d0daf64cd7a40822ef9d685ce4a1550ca9699620440dd198b13f95513a577766e9f1a8e88b212492831bf7ffcac7e0a"; }

     

       134
       134
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ms/firefox-47.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "1287f36a742fa834d5f31e6bc2f6d3651e54f2bc8845a1f0f647e9a9e38ba66c58138961185897c8832107cffff06167a35dc3ee1f0ff830f997f65fb0854a63"; }

     

       135
       135
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/nb-NO/firefox-47.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "ac3e46080e188e56a6b67ff77aeffdba7982d7c3aa4156a6f2781ef6b8fe63cac50d678e5afc91aca4ad16c4384d2b2727f74ddc4083da91a1e3590ac98ec9d2"; }

     

       136
       136
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/nb-NO/firefox-47.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "dca52381e45b5c2d89f590971d830010a9ec1a2a513fe655ee93c3fbd980adcea78787701595a95402bdb660c2f3e0a489e001deba13798337493655798c713a"; }

     

       137
       137
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/nl/firefox-47.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "6ec01f8eb18384aadb5715a996c8410ffa94b801ee1f1b1ab43bdeb492e179e781e8b85acbeff4a25cb4fef847ce3e2335968458d9f6e47d046083264e91f6f7"; }

     

       138
       138
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/nl/firefox-47.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "7d5840518312dd167d914a8f7fa5670fe17f9a6fc39ccd128e30f689005b35bd352d0602993713c3d05288f2b036829be8e08398d536e4aebf2341ae2290e633"; }

     

       139
       139
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/nn-NO/firefox-47.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a185f7592649a91214363cf2a0474b5895f33342c98cd4bdc48fafb0cc76310b2ba4f46575970d723c76b2ecfeba8e2b39d9671e6059a15bcb2565258096156c"; }

     

       140
       140
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/nn-NO/firefox-47.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "7f8e7277bcbfbe5f40c161f1ebbeed86159c2b6205a5ea55cd8b6253fa6742bcfede11d4de6c1aba36e2b1e98f9c9a7b8e26f9aa35e1eaadc1d011636d429be3"; }

     

       141
       141
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/or/firefox-47.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "a543a7d3f4e24364be7e4df65a81da82d955d1268a4cbce741ad7ddd5f4e9916573e271f02af1e92b123a4da2c7f312c17f6ce714e3057a1b204484ef12133d8"; }

     

       142
       142
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/or/firefox-47.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "7672596470cd8f49f9c4558b05bd637af1650da729bc518681a8cde3ec785358121fa7ef209e123fca4b59df1a63878832bc32d2ff404b5d2a818b60ba10c15e"; }

     

       143
       143
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/pa-IN/firefox-47.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "a99b60ae1eb479e31f838fd41d5de325c418762fdcfa5e0f3bc3d5da8df108d3b64ce5bfac0af09663007becf5327164db8dea0ea7a3876586cc43030a780199"; }

     

       144
       144
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/pa-IN/firefox-47.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "f0110b74842f924808f74979061151fec711d10a6005d2da2fbb8d46fa2a25ecd5a2c804e58c10a918efe570d4d67d05578b0245f526e1aede4bbc786e9f304e"; }

     

       145
       145
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/pl/firefox-47.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "7eaa2bad351429d76b476819a1529ed1609388968327382cc13df235a294f2e9fb14295341ff15fe3b2815ffd1c6c8978e2aa104a847fd2cb4adcf2ae3b0b974"; }

     

       146
       146
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/pl/firefox-47.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "a40e2c15cff0e7f7bff8a5c0bc4cf39df948a21bd37b34ffc93dd87e1f5256526a25526e457fcfd8d081bc872dc1bec13e67da3cf671b6a16dfa17850be4743c"; }

     

       147
       147
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/pt-BR/firefox-47.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c9cd96e68fa2e1f73a49e71c287a25be8d45a8ebb56262e02c40ba5869fc58c7fc43a1f6958592bb377e7dd4064d64f5ebcbcb5cd3a9fe0a007c2da665f50a66"; }

     

       148
       148
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/pt-BR/firefox-47.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "1184751c1d1a0a9044f8df2d20aee7dfe332dc5f851802ebaf2c5c83fa2bcccfd913cb6e16d2baa449cff1b02aa18f828489914c0741a2ef2a46d54fefecc268"; }

     

       149
       149
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/pt-PT/firefox-47.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "86538057ae91b1297acc11c9bf3f7d24ba1950edead89d4733f7c898cf53e3848054bf391a975f19766b69f4c56f576ca54e4b8da806db7416f3e3d91777c3c3"; }

     

       150
       150
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/pt-PT/firefox-47.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "0a480c26e5dfe2bb9b536e122ae32e18a6dac999004493839cb506c1ad615e095c554d296f1a77bfccbbb86b58bcf549db83f7de51d02b68d1eb752b421f23cc"; }

     

       151
       151
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/rm/firefox-47.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "751ffe931cd60296490c7164f49f61f4a51bac5210328a18d02261a07eb607e181b2bab4fa0b59d2df15334152386bf816a984840d2331b7e801171be9c90594"; }

     

       152
       152
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/rm/firefox-47.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "3e526c9a1a876e5d2c548c9a68803dd11c04c8214e18eb09c0b1c3fb3833f64c8a3362db8083ac5de81c59268439b53effa3bf1c64807fafc874eb8ed9baf188"; }

     

       153
       153
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ro/firefox-47.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "73cf6a18deafb7ba93fd60cba3ba0bb0191471f977c41bac11bf2fd6cc6f7fd7cf2ad125ac5cf168ef577d71dfb0e893e182f39be6ad186ddc642d87c40041a5"; }

     

       154
       154
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ro/firefox-47.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "b62c54b8694b4a662c1d336056d404a8d432ba0a3d4f2964b5c5acc0e39b668fd228105e1c4e307bfab1acfa5c3ce223db4229df01866cdbbc7c1ac95e70fe2c"; }

     

       155
       155
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ru/firefox-47.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "6ebd3b3a1f3613905313129cde7cf113bdd777fd0f600496231ba813a95b04309b25016dd69891d31189a93ccad3f87b9c69d54d6219ad39dd38d1181b1f3102"; }

     

       156
       156
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ru/firefox-47.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "539a22d13587cdcc21b6f76ff24ccfd1df98cbaaacac802aed46ba8f2bfed27cb2f3e5c146cbd2c3559aaff22297e692030b9612041a05a6bfca08f49bf0d2fb"; }

     

       157
       157
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/si/firefox-47.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "bb0d1621f5b9af886fca0ea7cf7fd851d7c22d2d8f279a7b88e9bce98be33ad7b75d6a51ab47ea859802ed39b467815db60409285afaa0bbf4bb1ce6d590eabc"; }

     

       158
       158
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/si/firefox-47.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "90337d193df7db41a1384856938bb62212952a80144dcc319a725a9b567ffd4deb7bb7af89b57891d3c17499ff466990e656edf7d0b017b8f4e0370aab445477"; }

     

       159
       159
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/sk/firefox-47.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "23a15e6ad5ce9b03c218be4e26e603a412de4d870d5f64b599ae511bfc66bf2cf04613cc06fc1a054d06b80435e284456c0b08e33f34d8c9482f5ca23da6ae62"; }

     

       160
       160
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/sk/firefox-47.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "a86cbed60f65e4ebb36c614d846fbb2515945112fd4f2482c3a63b49a62c3acb310f050dcbd57cc76a808c049eefd8f779d6aeea53362dd81798bb8d7177c86a"; }

     

       161
       161
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/sl/firefox-47.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "8ae008f0077081ef40de3bf08c2de294231f41439a83d8a41a485f53e95ba3f4fc6ef03d6ac98e8848c3f3dad290978f1607d8c847f1622bd86b7d38cd0be730"; }

     

       162
       162
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/sl/firefox-47.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "34efb560c65329c7f3f6b341cc49ac4952f24e6e9b34e7f5bd45d98618a4d03ac89c6f62580223efd2d37db24a03f76a54381d4162f5430b887122bb56eb49d9"; }

     

       163
       163
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/son/firefox-47.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "d3e5a25fbc4a786239a7ae543fefb7b7e3ecc34192c8326af915f18b9b08436656bf68faa4953a34bdc464e32305baecce800f91ef0152bb4b4a8323ab448f33"; }

     

       164
       164
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/son/firefox-47.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "ffee5d1a23e91911fd1dedb5ecf24bfc6b1733fb582e64a5e07d4df4b7afd9a6c502a70ab3af6624b4594f5ddcd81bc8962ede5b693cc035a96a561389f6bfca"; }

     

       165
       165
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/sq/firefox-47.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "1cbaf8c32d1d3205cd85127839eed11b416903960c9e411b9adc71c42ba4add47acddd32a9217bb68f27b90d6765892edf2d356e21235c5bfd5cf69d1ee719f9"; }

     

       166
       166
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/sq/firefox-47.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "16d93961a53ecc3e1ae3480be9e34f2a22dec2bdab55dbd35d1ea79ecf2ee48f195380bd52efc7d39529601610793b75daadeeb54dd76c9a3702c786af25acdd"; }

     

       167
       167
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/sr/firefox-47.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "0b2c5234f1787cd972fad398dc270766fbc3015dc1bba29755e5316f207af9f5787d4aa41e96cffd2c9d31c57a5d1896e63fcd04e6235a4a6798469e738fa10d"; }

     

       168
       168
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/sr/firefox-47.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "e7c7e7ff7fd81ca86f45997faed7244e4d807c3e5ad7ed66d6feb38c3e9173eaf136bd34af690ce28534f0c531c7f1d11595ec6502dfa42778cc19dee4334c49"; }

     

       169
       169
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/sv-SE/firefox-47.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "dffb94b0ddb4b9d2effba3894b408c9f191f2079dc4b47e214347a235c9bf1adf77e520465691d14a274c3f3344c7f8b7d41965051d506728347e0af1117ad27"; }

     

       170
       170
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/sv-SE/firefox-47.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b601906d28f071c6beb3dbd6b37fa68f50809c9c47c9db69d631127ccc7b784e7d3b278aea6de060b34d83b6c78137da32b77f8e17ed199c3213b89dd9391264"; }

     

       171
       171
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/ta/firefox-47.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "1a496470ef8e0899bfce66b41490f54d4d32776eaf60aca8725c4732512f1d3befb2e1fc3b942ebea95fe2359509c43d41649e5f90498264b8e02a3352244260"; }

     

       172
       172
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/ta/firefox-47.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "00e6dbc43ad3c77693903fe534722094826637698df691b266eb801b27cd5e63502c21ca3e34ff939a7645a1f75d36fce6154626019eb96bc73cc39ab845c952"; }

     

       173
       173
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/te/firefox-47.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "70ed539571cadf241f819b68ff24829db32f56287aadab31656fdf66c0ed94ccc6cc11b6cef6e2e963203cda47af2c6032db6e5689c37aaaf495b1e4fa970207"; }

     

       174
       174
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/te/firefox-47.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "d491acd4635ab9b22f76531740c7ee7a85832678aef9ed646e75f56755c02538440adeea71e9ca5a7a5e11f3f2f6941c3c4c1e47380547179f63baaf6c20ad07"; }

     

       175
       175
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/th/firefox-47.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "0414f74c6266fc204f2741b6860f7919c957364bd56ccc2cec5ef4b9c4be812c554ab584e6ce53387e6b7a18ad02991a44d9507a16da59a4aabfd44e7fb5b754"; }

     

       176
       176
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/th/firefox-47.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "2952cceaecdd4013882150e8158607639e4ab2cffdef563d4fd1a015c41f1eff6c5ac22c0b9301a05ab6f9fef9659d54916275d5a50d97ad43bf69f10da7b3c8"; }

     

       177
       177
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/tr/firefox-47.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "c5c6273bae2b9a46108a433af3a85b5cbbba4cd3154ee124ccc49f46c4a76264836a76d1b2da4b1064e9a913cc9fe461911c53e44f40343c5f780be04da932e5"; }

     

       178
       178
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/tr/firefox-47.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "f0b5bef1ea4b948d699a79d902055d5b31afbe5c4f1814d98cadef1ca820ce39212ec009f68d875860a48942e9d797bda88eec4f6ed591dd8b3b260e04170974"; }

     

       179
       179
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/uk/firefox-47.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "3a069ba914716ce122c4a89612988708d811b9350d333aab203dde212527c0e0cc86ec4781e6aa23f40b77f2266f76eca366cf355651870f43e180b97aa25c43"; }

     

       180
       180
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/uk/firefox-47.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "db7931aa3f1d150e4b5b8c87b9d069df4a515fb2aa5e250b8f8a1bae0d8fd9a210ae949df056c47e3c88e8faf28f2571311ce2d6f179e3365720b42f1335b546"; }

     

       181
       181
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/uz/firefox-47.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "110a82749e187f39d77f63b16ad515218e5512e5974916e4145e625a40d797e23fdbb5d110a23f061448cfc3d3c597858636c9304e941a34c68368f749c3c900"; }

     

       182
       182
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/uz/firefox-47.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "1dbf94cef034449e8d1342822384bf1761dc61748e2d876aec1ac628dd161f92b62da832fe397b2fe4f8a1b82f9adf1c3690f26e07ee3e48c6299f95969533cf"; }

     

       183
       183
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/vi/firefox-47.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "af97e1dcfc9bfbdce95a5cd35025b2540ad928d3238863471116e071a51b354b7818577bc3e7427c513e7b335bc1510605ba3ad1a37221389de7c7fedf6e2103"; }

     

       184
       184
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/vi/firefox-47.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "cc938935395e66ef721fdbb8c8b781ef648b5419393ed1687a116a4d9ae12dd18f2edbc8287235504aa6782bbd6a41f9f5dd89c9c712ed4980fb9fa44f46ef38"; }

     

       185
       185
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/xh/firefox-47.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "a76dbac054cdb7f5c194766dc54f215de4cb4cca4aacd7c883e0e3632b9dfc18cc25d7a54788e213bc65c894dd26ca9b863199b55b649133f93da9fed9a58fe4"; }

     

       186
       186
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/xh/firefox-47.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "cfd8bbb81637c19464ec34788254740e999c13bc8a64b4289b0e1c64f76d711a5a5a8380995271f309444032739066f06334da2f81b6ca2b2be33ff55d3ff402"; }

     

       187
       187
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/zh-CN/firefox-47.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "d11637b0c28aa1c45b315322ff12392e133aebe21f435564da278b9e301f0c8515ccb721df2bd55c175c48c3e24934837abbba4b84c9fa659b7a58db1da68f04"; }

     

       188
       188
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/zh-CN/firefox-47.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "27a06d87f23eaeec170d1ea7f3df636198bfd4787001e178948fe9b8a3f1aafff3be59b9d01ed5b5851902b550601f061e923a4cda3a972f0ac68928cab28577"; }

     

       189
       189
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-i686/zh-TW/firefox-47.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "7c6ef5592b273749ccbf7b37c09984b11722beb7f49d4ed25555b84f0521e0dbac5197c7642ac508a21a1a40c5578dcfb49310858819875cc9407c85426d599a"; }

     

       190
       190
       +
           { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/zh-TW/firefox-47.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9ccce84a292144f3758190ff2858c077d1e7ec6d49ff5e1efb404b8dfb3bcfebf96eab15d0ec32325e4d96d94f4c6bcc67f4e43dd22af418b822d82a2afaf6f1"; }

     

       191
       191
        
         ];

     

       192
       192
        
       }

+8 -4

pkgs/applications/networking/instant-messengers/teamspeak/client.nix

···

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
        
         name = "teamspeak-client-${version}";

     

       33
       33
        
       

     

       34
       34
       -
         version = "3.0.19.1";

     

       34
       34
       +
         version = "3.0.19.3";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchurl {

     

       37
       37
        
           urls = [

     
···

       39
       39
        
             "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"

     

       40
       40
        
           ];

     

       41
       41
        
           sha256 = if stdenv.is64bit

     

       42
       42
       -
                       then "173mcvrckia0mming1v9nzi0bllr4m430y9swl9kyfsvp44f5n5h"

     

       43
       43
       -
                       else "1iansjlbalwil0nlrlxfl70zzbx009c4rccf4va0kq097rqhgznx";

     

       42
       42
       +
                       then "05620qqi8plxsrzj92g306a0l8wg1pd2l66vpmj71vs0f5lms6p4"

     

       43
       43
       +
                       else "07b2120pa8nyvnvh48vp5vqq7xlxg6vrrx67azz9kfcdzbbarcv9";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         # grab the plugin sdk for the desktop icon

     
···

       101
       101
        
         meta = {

     

       102
       102
        
           description = "The TeamSpeak voice communication tool";

     

       103
       103
        
           homepage = http://teamspeak.com/;

     

       104
       104
       -
           license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest";

     

       104
       104
       +
           license = {

     

       105
       105
       +
             fullName = "Teamspeak client license";

     

       106
       106
       +
             url = http://sales.teamspeakusa.com/licensing.php;

     

       107
       107
       +
             free = false;

     

       108
       108
       +
           };

     

       105
       109
        
           maintainers = [ stdenv.lib.maintainers.lhvwb ];

     

       106
       110
        
           platforms = stdenv.lib.platforms.linux;

     

       107
       111
        
         };

+11 -3

pkgs/applications/networking/mailreaders/mutt/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, which, perl, autoreconfHook

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, ncurses, which, perl, autoreconfHook

     

       2
       2
        
       , gdbm ? null

     

       3
       3
        
       , openssl ? null

     

       4
       4
        
       , cyrus_sasl ? null

     
···

       61
       61
        
           ++ optional saslSupport "--with-sasl";

     

       62
       62
        
       

     

       63
       63
        
         patches =

     

       64
       64
       -
           optional withTrash ./trash.patch ++

     

       65
       65
       -
           optional withSidebar ./sidebar.patch;

     

       64
       64
       +
           optional withTrash (fetchpatch {

     

       65
       65
       +
             name = "trash.patch";

     

       66
       66
       +
             url = "https://aur.archlinux.org/cgit/aur.git/plain/trash.patch?h=mutt-sidebar";

     

       67
       67
       +
             sha256 = "1hrib9jk28mqd02nzv0sx01jfdabzvnwcc5qjc3810zfglzc1nql";

     

       68
       68
       +
           }) ++

     

       69
       69
       +
           optional withSidebar (fetchpatch {

     

       70
       70
       +
             name = "sidebar.patch";

     

       71
       71
       +
             url = "https://aur.archlinux.org/cgit/aur.git/plain/sidebar.patch?h=mutt-sidebar";

     

       72
       72
       +
             sha256 = "1l63wj7kw41jrh00mcxdw4p4vrbc9wld42s99liw8kz2aclymq5m";

     

       73
       73
       +
           });

     

       66
       74
        
       

     

       67
       75
        
         meta = {

     

       68
       76
        
           description = "A small but very powerful text-based mail client";

-4450

pkgs/applications/networking/mailreaders/mutt/sidebar.patch

···

       1
       1
       -
       diff -urN mutt-1.6.1/buffy.c mutt-1.6.1-sidebar/buffy.c

     

       2
       2
       -
       --- mutt-1.6.1/buffy.c	2016-06-12 18:43:00.397447512 +0100

     

       3
       3
       -
       +++ mutt-1.6.1-sidebar/buffy.c	2016-06-12 18:43:03.951502935 +0100

     

       4
       4
       -
       @@ -27,6 +27,10 @@

     

       5
       5
       -
        

     

       6
       6
       -
        #include "mutt_curses.h"

     

       7
       7
       -
        

     

       8
       8
       -
       +#ifdef USE_SIDEBAR

     

       9
       9
       -
       +#include "sidebar.h"

     

       10
       10
       -
       +#endif

     

       11
       11
       -
       +

     

       12
       12
       -
        #ifdef USE_IMAP

     

       13
       13
       -
        #include "imap.h"

     

       14
       14
       -
        #endif

     

       15
       15
       -
       @@ -196,9 +200,17 @@

     

       16
       16
       -
        static BUFFY *buffy_new (const char *path)

     

       17
       17
       -
        {

     

       18
       18
       -
          BUFFY* buffy;

     

       19
       19
       -
       +#ifdef USE_SIDEBAR

     

       20
       20
       -
       +  char rp[PATH_MAX] = "";

     

       21
       21
       -
       +  char *r = NULL;

     

       22
       22
       -
       +#endif

     

       23
       23
       -
        

     

       24
       24
       -
          buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY));

     

       25
       25
       -
          strfcpy (buffy->path, path, sizeof (buffy->path));

     

       26
       26
       -
       +#ifdef USE_SIDEBAR

     

       27
       27
       -
       +  r = realpath (path, rp);

     

       28
       28
       -
       +  strfcpy (buffy->realpath, r ? rp : path, sizeof (buffy->realpath));

     

       29
       29
       -
       +#endif

     

       30
       30
       -
          buffy->next = NULL;

     

       31
       31
       -
          buffy->magic = 0;

     

       32
       32
       -
        

     

       33
       33
       -
       @@ -215,7 +227,10 @@

     

       34
       34
       -
          BUFFY **tmp,*tmp1;

     

       35
       35
       -
          char buf[_POSIX_PATH_MAX];

     

       36
       36
       -
          struct stat sb;

     

       37
       37
       -
       -  char f1[PATH_MAX], f2[PATH_MAX];

     

       38
       38
       -
       +  char f1[PATH_MAX];

     

       39
       39
       -
       +#ifndef USE_SIDEBAR

     

       40
       40
       -
       +  char f2[PATH_MAX];

     

       41
       41
       -
       +#endif

     

       42
       42
       -
          char *p, *q;

     

       43
       43
       -
        

     

       44
       44
       -
          while (MoreArgs (s))

     

       45
       45
       -
       @@ -228,6 +243,9 @@

     

       46
       46
       -
              for (tmp = &Incoming; *tmp;)

     

       47
       47
       -
              {

     

       48
       48
       -
                tmp1=(*tmp)->next;

     

       49
       49
       -
       +#ifdef USE_SIDEBAR

     

       50
       50
       -
       +	mutt_sb_notify_mailbox (*tmp, 0);

     

       51
       51
       -
       +#endif

     

       52
       52
       -
                buffy_free (tmp);

     

       53
       53
       -
                *tmp=tmp1;

     

       54
       54
       -
              }

     

       55
       55
       -
       @@ -243,8 +261,13 @@

     

       56
       56
       -
            p = realpath (buf, f1);

     

       57
       57
       -
            for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))

     

       58
       58
       -
            {

     

       59
       59
       -
       +#ifdef USE_SIDEBAR

     

       60
       60
       -
       +      q = (*tmp)->realpath;

     

       61
       61
       -
       +      if (mutt_strcmp (p ? p : buf, q) == 0)

     

       62
       62
       -
       +#else

     

       63
       63
       -
              q = realpath ((*tmp)->path, f2);

     

       64
       64
       -
              if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0)

     

       65
       65
       -
       +#endif

     

       66
       66
       -
              {

     

       67
       67
       -
        	dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));

     

       68
       68
       -
        	break;

     

       69
       69
       -
       @@ -256,14 +279,21 @@

     

       70
       70
       -
              if(*tmp)

     

       71
       71
       -
              {

     

       72
       72
       -
                tmp1=(*tmp)->next;

     

       73
       73
       -
       +#ifdef USE_SIDEBAR

     

       74
       74
       -
       +	mutt_sb_notify_mailbox (*tmp, 0);

     

       75
       75
       -
       +#endif

     

       76
       76
       -
                buffy_free (tmp);

     

       77
       77
       -
                *tmp=tmp1;

     

       78
       78
       -
              }

     

       79
       79
       -
              continue;

     

       80
       80
       -
            }

     

       81
       81
       -
        

     

       82
       82
       -
       -    if (!*tmp)

     

       83
       83
       -
       +    if (!*tmp) {

     

       84
       84
       -
              *tmp = buffy_new (buf);

     

       85
       85
       -
       +#ifdef USE_SIDEBAR

     

       86
       86
       -
       +      mutt_sb_notify_mailbox (*tmp, 1);

     

       87
       87
       -
       +#endif

     

       88
       88
       -
       +    }

     

       89
       89
       -
        

     

       90
       90
       -
            (*tmp)->new = 0;

     

       91
       91
       -
            (*tmp)->notified = 1;

     

       92
       92
       -
       @@ -306,6 +336,13 @@

     

       93
       93
       -
              return 0;

     

       94
       94
       -
          }

     

       95
       95
       -
        

     

       96
       96
       -
       +#ifdef USE_SIDEBAR

     

       97
       97
       -
       +  if (option (OPTSIDEBAR) && mailbox->msg_unread > 0) {

     

       98
       98
       -
       +    mailbox->new = 1;

     

       99
       99
       -
       +    return 1;

     

       100
       100
       -
       +  }

     

       101
       101
       -
       +#endif

     

       102
       102
       -
       +

     

       103
       103
       -
          if ((dirp = opendir (path)) == NULL)

     

       104
       104
       -
          {

     

       105
       105
       -
            mailbox->magic = 0;

     

       106
       106
       -
       @@ -357,6 +394,93 @@

     

       107
       107
       -
        

     

       108
       108
       -
          return 0;

     

       109
       109
       -
        }

     

       110
       110
       -
       +

     

       111
       111
       -
       +#ifdef USE_SIDEBAR

     

       112
       112
       -
       +/**

     

       113
       113
       -
       + * buffy_maildir_update_dir - Update counts for one directory

     

       114
       114
       -
       + * @mailbox: BUFFY representing a maildir mailbox

     

       115
       115
       -
       + * @dir:     Which directory to search

     

       116
       116
       -
       + *

     

       117
       117
       -
       + * Look through one directory of a maildir mailbox.  The directory could

     

       118
       118
       -
       + * be either "new" or "cur".

     

       119
       119
       -
       + *

     

       120
       120
       -
       + * Count how many new, or flagged, messages there are.

     

       121
       121
       -
       + */

     

       122
       122
       -
       +static void

     

       123
       123
       -
       +buffy_maildir_update_dir (BUFFY *mailbox, const char *dir)

     

       124
       124
       -
       +{

     

       125
       125
       -
       +  char path[_POSIX_PATH_MAX] = "";

     

       126
       126
       -
       +  DIR *dirp = NULL;

     

       127
       127
       -
       +  struct dirent *de = NULL;

     

       128
       128
       -
       +  char *p = NULL;

     

       129
       129
       -
       +  int read;

     

       130
       130
       -
       +

     

       131
       131
       -
       +  snprintf (path, sizeof (path), "%s/%s", mailbox->path, dir);

     

       132
       132
       -
       +

     

       133
       133
       -
       +  dirp = opendir (path);

     

       134
       134
       -
       +  if (!dirp)

     

       135
       135
       -
       +  {

     

       136
       136
       -
       +    mailbox->magic = 0;

     

       137
       137
       -
       +    return;

     

       138
       138
       -
       +  }

     

       139
       139
       -
       +

     

       140
       140
       -
       +  while ((de = readdir (dirp)) != NULL)

     

       141
       141
       -
       +  {

     

       142
       142
       -
       +    if (*de->d_name == '.')

     

       143
       143
       -
       +      continue;

     

       144
       144
       -
       +

     

       145
       145
       -
       +    /* Matches maildir_parse_flags logic */

     

       146
       146
       -
       +    read = 0;

     

       147
       147
       -
       +    mailbox->msg_count++;

     

       148
       148
       -
       +    p = strstr (de->d_name, ":2,");

     

       149
       149
       -
       +    if (p)

     

       150
       150
       -
       +    {

     

       151
       151
       -
       +      p += 3;

     

       152
       152
       -
       +      if (strchr (p, 'S'))

     

       153
       153
       -
       +        read = 1;

     

       154
       154
       -
       +      if (strchr (p, 'F'))

     

       155
       155
       -
       +        mailbox->msg_flagged++;

     

       156
       156
       -
       +    }

     

       157
       157
       -
       +    if (!read) {

     

       158
       158
       -
       +      mailbox->msg_unread++;

     

       159
       159
       -
       +    }

     

       160
       160
       -
       +  }

     

       161
       161
       -
       +

     

       162
       162
       -
       +  closedir (dirp);

     

       163
       163
       -
       +}

     

       164
       164
       -
       +

     

       165
       165
       -
       +/**

     

       166
       166
       -
       + * buffy_maildir_update - Update messages counts for a maildir mailbox

     

       167
       167
       -
       + * @mailbox: BUFFY representing a maildir mailbox

     

       168
       168
       -
       + *

     

       169
       169
       -
       + * Open a mailbox directories and update our record of how many new, or

     

       170
       170
       -
       + * flagged, messages there are.

     

       171
       171
       -
       + */

     

       172
       172
       -
       +void

     

       173
       173
       -
       +buffy_maildir_update (BUFFY *mailbox)

     

       174
       174
       -
       +{

     

       175
       175
       -
       +	if (!option (OPTSIDEBAR))

     

       176
       176
       -
       +		return;

     

       177
       177
       -
       +

     

       178
       178
       -
       +	mailbox->msg_count   = 0;

     

       179
       179
       -
       +	mailbox->msg_unread  = 0;

     

       180
       180
       -
       +	mailbox->msg_flagged = 0;

     

       181
       181
       -
       +

     

       182
       182
       -
       +	buffy_maildir_update_dir (mailbox, "new");

     

       183
       183
       -
       +	if (mailbox->msg_count) {

     

       184
       184
       -
       +		mailbox->new = 1;

     

       185
       185
       -
       +	}

     

       186
       186
       -
       +	buffy_maildir_update_dir (mailbox, "cur");

     

       187
       187
       -
       +

     

       188
       188
       -
       +	mailbox->sb_last_checked = time (NULL);

     

       189
       189
       -
       +

     

       190
       190
       -
       +	/* make sure the updates are actually put on screen */

     

       191
       191
       -
       +	if (SidebarWidth)

     

       192
       192
       -
       +		mutt_sb_draw();

     

       193
       193
       -
       +}

     

       194
       194
       -
       +

     

       195
       195
       -
       +#endif

     

       196
       196
       -
       +

     

       197
       197
       -
        /* returns 1 if mailbox has new mail */ 

     

       198
       198
       -
        static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)

     

       199
       199
       -
        {

     

       200
       200
       -
       @@ -368,7 +491,11 @@

     

       201
       201
       -
          else

     

       202
       202
       -
            statcheck = sb->st_mtime > sb->st_atime

     

       203
       203
       -
              || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);

     

       204
       204
       -
       +#ifdef USE_SIDEBAR

     

       205
       205
       -
       +  if ((!option (OPTSIDEBAR) && statcheck) || (option (OPTSIDEBAR) && mailbox->msg_unread > 0))

     

       206
       206
       -
       +#else

     

       207
       207
       -
          if (statcheck)

     

       208
       208
       -
       +#endif

     

       209
       209
       -
          {

     

       210
       210
       -
            if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)

     

       211
       211
       -
            {

     

       212
       212
       -
       @@ -388,6 +515,42 @@

     

       213
       213
       -
          return rc;

     

       214
       214
       -
        }

     

       215
       215
       -
        

     

       216
       216
       -
       +#ifdef USE_SIDEBAR

     

       217
       217
       -
       +/**

     

       218
       218
       -
       + * buffy_mbox_update - Update messages counts for an mbox mailbox

     

       219
       219
       -
       + * @mailbox: BUFFY representing an mbox mailbox

     

       220
       220
       -
       + * @sb:      stat(2) infomation about the mailbox file

     

       221
       221
       -
       + *

     

       222
       222
       -
       + * Open a mbox file and update our record of how many new, or flagged,

     

       223
       223
       -
       + * messages there are. If the mailbox hasn't changed since the last call,

     

       224
       224
       -
       + * the function does nothing.

     

       225
       225
       -
       + */

     

       226
       226
       -
       +void

     

       227
       227
       -
       +buffy_mbox_update (BUFFY *mailbox, struct stat *sb)

     

       228
       228
       -
       +{

     

       229
       229
       -
       +  CONTEXT *ctx = NULL;

     

       230
       230
       -
       +

     

       231
       231
       -
       +  if (!option (OPTSIDEBAR))

     

       232
       232
       -
       +    return;

     

       233
       233
       -
       +  if ((mailbox->sb_last_checked > sb->st_mtime) && (mailbox->msg_count != 0))

     

       234
       234
       -
       +    return; /* no check necessary */

     

       235
       235
       -
       +

     

       236
       236
       -
       +  ctx = mx_open_mailbox (mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);

     

       237
       237
       -
       +  if (ctx)

     

       238
       238
       -
       +  {

     

       239
       239
       -
       +    mailbox->msg_count       = ctx->msgcount;

     

       240
       240
       -
       +    mailbox->msg_unread      = ctx->unread;

     

       241
       241
       -
       +    mailbox->msg_flagged     = ctx->flagged;

     

       242
       242
       -
       +    mailbox->sb_last_checked = time (NULL);

     

       243
       243
       -
       +    mx_close_mailbox (ctx, 0);

     

       244
       244
       -
       +  }

     

       245
       245
       -
       +

     

       246
       246
       -
       +  /* make sure the updates are actually put on screen */

     

       247
       247
       -
       +  if (SidebarWidth)

     

       248
       248
       -
       +    mutt_sb_draw();

     

       249
       249
       -
       +}

     

       250
       250
       -
       +#endif

     

       251
       251
       -
       +

     

       252
       252
       -
        int mutt_buffy_check (int force)

     

       253
       253
       -
        {

     

       254
       254
       -
          BUFFY *tmp;

     

       255
       255
       -
       @@ -461,16 +623,25 @@

     

       256
       256
       -
              {

     

       257
       257
       -
              case M_MBOX:

     

       258
       258
       -
              case M_MMDF:

     

       259
       259
       -
       +#ifdef USE_SIDEBAR

     

       260
       260
       -
       +	buffy_mbox_update (tmp, &sb);

     

       261
       261
       -
       +#endif

     

       262
       262
       -
        	if (buffy_mbox_hasnew (tmp, &sb) > 0)

     

       263
       263
       -
        	  BuffyCount++;

     

       264
       264
       -
        	break;

     

       265
       265
       -
        

     

       266
       266
       -
              case M_MAILDIR:

     

       267
       267
       -
       +#ifdef USE_SIDEBAR

     

       268
       268
       -
       +	buffy_maildir_update (tmp);

     

       269
       269
       -
       +#endif

     

       270
       270
       -
        	if (buffy_maildir_hasnew (tmp) > 0)

     

       271
       271
       -
        	  BuffyCount++;

     

       272
       272
       -
        	break;

     

       273
       273
       -
        

     

       274
       274
       -
              case M_MH:

     

       275
       275
       -
       +#ifdef USE_SIDEBAR

     

       276
       276
       -
       +	mh_buffy_update (tmp);

     

       277
       277
       -
       +#endif

     

       278
       278
       -
        	mh_buffy(tmp);

     

       279
       279
       -
        	if (tmp->new)

     

       280
       280
       -
        	  BuffyCount++;

     

       281
       281
       -
       diff -urN mutt-1.6.1/buffy.h mutt-1.6.1-sidebar/buffy.h

     

       282
       282
       -
       --- mutt-1.6.1/buffy.h	2016-06-12 18:43:00.397447512 +0100

     

       283
       283
       -
       +++ mutt-1.6.1-sidebar/buffy.h	2016-06-12 18:43:03.951502935 +0100

     

       284
       284
       -
       @@ -16,6 +16,9 @@

     

       285
       285
       -
         *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

     

       286
       286
       -
         */

     

       287
       287
       -
        

     

       288
       288
       -
       +#ifndef _BUFFY_H

     

       289
       289
       -
       +#define _BUFFY_H

     

       290
       290
       -
       +

     

       291
       291
       -
        /*parameter to mutt_parse_mailboxes*/

     

       292
       292
       -
        #define M_MAILBOXES   1

     

       293
       293
       -
        #define M_UNMAILBOXES 2 

     

       294
       294
       -
       @@ -23,13 +26,28 @@

     

       295
       295
       -
        typedef struct buffy_t

     

       296
       296
       -
        {

     

       297
       297
       -
          char path[_POSIX_PATH_MAX];

     

       298
       298
       -
       +#ifdef USE_SIDEBAR

     

       299
       299
       -
       +  char realpath[_POSIX_PATH_MAX];

     

       300
       300
       -
       +#endif

     

       301
       301
       -
          off_t size;

     

       302
       302
       -
          struct buffy_t *next;

     

       303
       303
       -
       +#ifdef USE_SIDEBAR

     

       304
       304
       -
       +  struct buffy_t *prev;

     

       305
       305
       -
       +#endif

     

       306
       306
       -
          short new;			/* mailbox has new mail */

     

       307
       307
       -
       +#ifdef USE_SIDEBAR

     

       308
       308
       -
       +  int msg_count;		/* total number of messages */

     

       309
       309
       -
       +  int msg_unread;		/* number of unread messages */

     

       310
       310
       -
       +  int msg_flagged;		/* number of flagged messages */

     

       311
       311
       -
       +  short is_hidden;		/* is hidden from the sidebar */

     

       312
       312
       -
       +#endif

     

       313
       313
       -
          short notified;		/* user has been notified */

     

       314
       314
       -
          short magic;			/* mailbox type */

     

       315
       315
       -
          short newly_created;		/* mbox or mmdf just popped into existence */

     

       316
       316
       -
          time_t last_visited;		/* time of last exit from this mailbox */

     

       317
       317
       -
       +#ifdef USE_SIDEBAR

     

       318
       318
       -
       +  time_t sb_last_checked;	/* time of last buffy check from sidebar */

     

       319
       319
       -
       +#endif

     

       320
       320
       -
        }

     

       321
       321
       -
        BUFFY;

     

       322
       322
       -
        

     

       323
       323
       -
       @@ -49,3 +67,5 @@

     

       324
       324
       -
        void mutt_buffy_setnotified (const char *path);

     

       325
       325
       -
        

     

       326
       326
       -
        void mh_buffy (BUFFY *);

     

       327
       327
       -
       +

     

       328
       328
       -
       +#endif /* _BUFFY_H */

     

       329
       329
       -
       diff -urN mutt-1.6.1/color.c mutt-1.6.1-sidebar/color.c

     

       330
       330
       -
       --- mutt-1.6.1/color.c	2016-06-12 18:43:00.397447512 +0100

     

       331
       331
       -
       +++ mutt-1.6.1-sidebar/color.c	2016-06-12 18:43:03.951502935 +0100

     

       332
       332
       -
       @@ -94,6 +94,14 @@

     

       333
       333
       -
          { "underline",	MT_COLOR_UNDERLINE },

     

       334
       334
       -
          { "index",		MT_COLOR_INDEX },

     

       335
       335
       -
          { "prompt",		MT_COLOR_PROMPT },

     

       336
       336
       -
       +#ifdef USE_SIDEBAR

     

       337
       337
       -
       +  { "sidebar_divider",	MT_COLOR_DIVIDER },

     

       338
       338
       -
       +  { "sidebar_flagged",	MT_COLOR_FLAGGED },

     

       339
       339
       -
       +  { "sidebar_highlight",MT_COLOR_HIGHLIGHT },

     

       340
       340
       -
       +  { "sidebar_indicator",MT_COLOR_SB_INDICATOR },

     

       341
       341
       -
       +  { "sidebar_new",	MT_COLOR_NEW },

     

       342
       342
       -
       +  { "sidebar_spoolfile",MT_COLOR_SB_SPOOLFILE },

     

       343
       343
       -
       +#endif

     

       344
       344
       -
          { NULL,		0 }

     

       345
       345
       -
        };

     

       346
       346
       -
        

     

       347
       347
       -
       @@ -146,6 +154,9 @@

     

       348
       348
       -
          ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;

     

       349
       349
       -
          ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;

     

       350
       350
       -
          ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;

     

       351
       351
       -
       +#ifdef USE_SIDEBAR

     

       352
       352
       -
       +  ColorDefs[MT_COLOR_HIGHLIGHT] = A_UNDERLINE;

     

       353
       353
       -
       +#endif

     

       354
       354
       -
          /* special meaning: toggle the relevant attribute */

     

       355
       355
       -
          ColorDefs[MT_COLOR_BOLD] = 0;

     

       356
       356
       -
          ColorDefs[MT_COLOR_UNDERLINE] = 0;

     

       357
       357
       -
       diff -urN mutt-1.6.1/compose.c mutt-1.6.1-sidebar/compose.c

     

       358
       358
       -
       --- mutt-1.6.1/compose.c	2016-06-12 18:43:00.398447528 +0100

     

       359
       359
       -
       +++ mutt-1.6.1-sidebar/compose.c	2016-06-12 18:43:03.952502951 +0100

     

       360
       360
       -
       @@ -32,6 +32,9 @@

     

       361
       361
       -
        #include "mailbox.h"

     

       362
       362
       -
        #include "sort.h"

     

       363
       363
       -
        #include "charset.h"

     

       364
       364
       -
       +#ifdef USE_SIDEBAR

     

       365
       365
       -
       +#include "sidebar.h"

     

       366
       366
       -
       +#endif

     

       367
       367
       -
        

     

       368
       368
       -
        #ifdef MIXMASTER

     

       369
       369
       -
        #include "remailer.h"

     

       370
       370
       -
       @@ -72,7 +75,7 @@

     

       371
       371
       -
        

     

       372
       372
       -
        #define HDR_XOFFSET 10

     

       373
       373
       -
        #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */

     

       374
       374
       -
       -#define W (COLS - HDR_XOFFSET)

     

       375
       375
       -
       +#define W (COLS - HDR_XOFFSET - SidebarWidth)

     

       376
       376
       -
        

     

       377
       377
       -
        static const char * const Prompts[] =

     

       378
       378
       -
        {

     

       379
       379
       -
       @@ -110,7 +113,7 @@

     

       380
       380
       -
        

     

       381
       381
       -
        static void redraw_crypt_lines (HEADER *msg)

     

       382
       382
       -
        {

     

       383
       383
       -
       -  mvaddstr (HDR_CRYPT, 0, "Security: ");

     

       384
       384
       -
       +  mvprintw (HDR_CRYPT, SidebarWidth, TITLE_FMT, "Security: ");

     

       385
       385
       -
        

     

       386
       386
       -
          if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)

     

       387
       387
       -
          {

     

       388
       388
       -
       @@ -145,16 +148,16 @@

     

       389
       389
       -
              addstr (_(" (OppEnc mode)"));

     

       390
       390
       -
        

     

       391
       391
       -
          clrtoeol ();

     

       392
       392
       -
       -  move (HDR_CRYPTINFO, 0);

     

       393
       393
       -
       +  move (HDR_CRYPTINFO, SidebarWidth);

     

       394
       394
       -
          clrtoeol ();

     

       395
       395
       -
        

     

       396
       396
       -
          if ((WithCrypto & APPLICATION_PGP)

     

       397
       397
       -
              && (msg->security & APPLICATION_PGP) && (msg->security & SIGN))

     

       398
       398
       -
       -    printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));

     

       399
       399
       -
       +    printw (TITLE_FMT "%s", _("sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));

     

       400
       400
       -
        

     

       401
       401
       -
          if ((WithCrypto & APPLICATION_SMIME)

     

       402
       402
       -
              && (msg->security & APPLICATION_SMIME) && (msg->security & SIGN)) {

     

       403
       403
       -
       -      printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));

     

       404
       404
       -
       +      printw (TITLE_FMT "%s", _("sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));

     

       405
       405
       -
          }

     

       406
       406
       -
        

     

       407
       407
       -
          if ((WithCrypto & APPLICATION_SMIME)

     

       408
       408
       -
       @@ -162,7 +165,7 @@

     

       409
       409
       -
              && (msg->security & ENCRYPT)

     

       410
       410
       -
              && SmimeCryptAlg

     

       411
       411
       -
              && *SmimeCryptAlg) {

     

       412
       412
       -
       -      mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),

     

       413
       413
       -
       +      mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),

     

       414
       414
       -
        		NONULL(SmimeCryptAlg));

     

       415
       415
       -
          }

     

       416
       416
       -
        }

     

       417
       417
       -
       @@ -175,7 +178,8 @@

     

       418
       418
       -
          int c;

     

       419
       419
       -
          char *t;

     

       420
       420
       -
        

     

       421
       421
       -
       -  mvaddstr (HDR_MIX, 0,     "     Mix: ");

     

       422
       422
       -
       +  /* L10N: "Mix" refers to the MixMaster chain for anonymous email */

     

       423
       423
       -
       +  mvprintw (HDR_MIX, SidebarWidth, TITLE_FMT, _("Mix: "));

     

       424
       424
       -
        

     

       425
       425
       -
          if (!chain)

     

       426
       426
       -
          {

     

       427
       427
       -
       @@ -190,7 +194,7 @@

     

       428
       428
       -
            if (t && t[0] == '0' && t[1] == '\0')

     

       429
       429
       -
              t = "<random>";

     

       430
       430
       -
            

     

       431
       431
       -
       -    if (c + mutt_strlen (t) + 2 >= COLS)

     

       432
       432
       -
       +    if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)

     

       433
       433
       -
              break;

     

       434
       434
       -
        

     

       435
       435
       -
            addstr (NONULL(t));

     

       436
       436
       -
       @@ -242,20 +246,23 @@

     

       437
       437
       -
        

     

       438
       438
       -
          buf[0] = 0;

     

       439
       439
       -
          rfc822_write_address (buf, sizeof (buf), addr, 1);

     

       440
       440
       -
       -  mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);

     

       441
       441
       -
       +  mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);

     

       442
       442
       -
          mutt_paddstr (W, buf);

     

       443
       443
       -
        }

     

       444
       444
       -
        

     

       445
       445
       -
        static void draw_envelope (HEADER *msg, char *fcc)

     

       446
       446
       -
        {

     

       447
       447
       -
       +#ifdef USE_SIDEBAR

     

       448
       448
       -
       +  mutt_sb_draw();

     

       449
       449
       -
       +#endif

     

       450
       450
       -
          draw_envelope_addr (HDR_FROM, msg->env->from);

     

       451
       451
       -
          draw_envelope_addr (HDR_TO, msg->env->to);

     

       452
       452
       -
          draw_envelope_addr (HDR_CC, msg->env->cc);

     

       453
       453
       -
          draw_envelope_addr (HDR_BCC, msg->env->bcc);

     

       454
       454
       -
       -  mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);

     

       455
       455
       -
       +  mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);

     

       456
       456
       -
          mutt_paddstr (W, NONULL (msg->env->subject));

     

       457
       457
       -
          draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);

     

       458
       458
       -
       -  mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);

     

       459
       459
       -
       +  mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);

     

       460
       460
       -
          mutt_paddstr (W, fcc);

     

       461
       461
       -
        

     

       462
       462
       -
          if (WithCrypto)

     

       463
       463
       -
       @@ -266,7 +273,7 @@

     

       464
       464
       -
        #endif

     

       465
       465
       -
        

     

       466
       466
       -
          SETCOLOR (MT_COLOR_STATUS);

     

       467
       467
       -
       -  mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));

     

       468
       468
       -
       +  mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));

     

       469
       469
       -
          clrtoeol ();

     

       470
       470
       -
        

     

       471
       471
       -
          NORMAL_COLOR;

     

       472
       472
       -
       @@ -302,7 +309,7 @@

     

       473
       473
       -
          /* redraw the expanded list so the user can see the result */

     

       474
       474
       -
          buf[0] = 0;

     

       475
       475
       -
          rfc822_write_address (buf, sizeof (buf), *addr, 1);

     

       476
       476
       -
       -  move (line, HDR_XOFFSET);

     

       477
       477
       -
       +  move (line, HDR_XOFFSET + SidebarWidth);

     

       478
       478
       -
          mutt_paddstr (W, buf);

     

       479
       479
       -
          

     

       480
       480
       -
          return 0;

     

       481
       481
       -
       @@ -515,7 +522,7 @@

     

       482
       482
       -
          menu->tag = mutt_tag_attach;

     

       483
       483
       -
          menu->data = idx;

     

       484
       484
       -
          menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);

     

       485
       485
       -
       -  

     

       486
       486
       -
       +

     

       487
       487
       -
          while (loop)

     

       488
       488
       -
          {

     

       489
       489
       -
            switch (op = mutt_menuLoop (menu))

     

       490
       490
       -
       @@ -564,7 +571,7 @@

     

       491
       491
       -
        	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)

     

       492
       492
       -
        	{

     

       493
       493
       -
        	  mutt_str_replace (&msg->env->subject, buf);

     

       494
       494
       -
       -	  move (HDR_SUBJECT, HDR_XOFFSET);

     

       495
       495
       -
       +	  move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);

     

       496
       496
       -
        	  if (msg->env->subject)

     

       497
       497
       -
        	    mutt_paddstr (W, msg->env->subject);

     

       498
       498
       -
        	  else

     

       499
       499
       -
       @@ -582,7 +589,7 @@

     

       500
       500
       -
        	{

     

       501
       501
       -
        	  strfcpy (fcc, buf, fcclen);

     

       502
       502
       -
        	  mutt_pretty_mailbox (fcc, fcclen);

     

       503
       503
       -
       -	  move (HDR_FCC, HDR_XOFFSET);

     

       504
       504
       -
       +	  move (HDR_FCC, HDR_XOFFSET + SidebarWidth);

     

       505
       505
       -
        	  mutt_paddstr (W, fcc);

     

       506
       506
       -
        	  fccSet = 1;

     

       507
       507
       -
        	}

     

       508
       508
       -
       diff -urN mutt-1.6.1/configure.ac mutt-1.6.1-sidebar/configure.ac

     

       509
       509
       -
       --- mutt-1.6.1/configure.ac	2016-06-12 18:43:00.398447528 +0100

     

       510
       510
       -
       +++ mutt-1.6.1-sidebar/configure.ac	2016-06-12 18:43:03.952502951 +0100

     

       511
       511
       -
       @@ -175,6 +175,14 @@

     

       512
       512
       -
        	SMIMEAUX_TARGET="smime_keys"

     

       513
       513
       -
        fi

     

       514
       514
       -
        

     

       515
       515
       -
       +AC_ARG_ENABLE(sidebar, AC_HELP_STRING([--enable-sidebar], [Enable Sidebar support]),

     

       516
       516
       -
       +[       if test x$enableval = xyes ; then

     

       517
       517
       -
       +		AC_DEFINE(USE_SIDEBAR, 1, [Define if you want support for the sidebar.])

     

       518
       518
       -
       +		OPS="$OPS \$(srcdir)/OPS.SIDEBAR"

     

       519
       519
       -
       +                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS sidebar.o"

     

       520
       520
       -
       +        fi

     

       521
       521
       -
       +])

     

       522
       522
       -
       +

     

       523
       523
       -
        AC_ARG_WITH(mixmaster, AS_HELP_STRING([--with-mixmaster@<:@=PATH@:>@],[Include Mixmaster support]),

     

       524
       524
       -
          [if test "$withval" != no

     

       525
       525
       -
           then

     

       526
       526
       -
       diff -urN mutt-1.6.1/copy.c mutt-1.6.1-sidebar/copy.c

     

       527
       527
       -
       --- mutt-1.6.1/copy.c	2016-06-12 18:43:00.398447528 +0100

     

       528
       528
       -
       +++ mutt-1.6.1-sidebar/copy.c	2016-06-12 18:43:03.952502951 +0100

     

       529
       529
       -
       @@ -288,7 +288,8 @@

     

       530
       530
       -
              if (flags & (CH_DECODE|CH_PREFIX))

     

       531
       531
       -
              {

     

       532
       532
       -
        	if (mutt_write_one_header (out, 0, headers[x], 

     

       533
       533
       -
       -				   flags & CH_PREFIX ? prefix : 0, mutt_term_width (Wrap), flags) == -1)

     

       534
       534
       -
       +				   flags & CH_PREFIX ? prefix : 0,

     

       535
       535
       -
       +                                   mutt_term_width (Wrap), flags) == -1)

     

       536
       536
       -
        	{

     

       537
       537
       -
        	  error = TRUE;

     

       538
       538
       -
        	  break;

     

       539
       539
       -
       diff -urN mutt-1.6.1/curs_main.c mutt-1.6.1-sidebar/curs_main.c

     

       540
       540
       -
       --- mutt-1.6.1/curs_main.c	2016-06-12 18:43:00.399447544 +0100

     

       541
       541
       -
       +++ mutt-1.6.1-sidebar/curs_main.c	2016-06-12 18:43:03.953502966 +0100

     

       542
       542
       -
       @@ -26,8 +26,13 @@

     

       543
       543
       -
        #include "mailbox.h"

     

       544
       544
       -
        #include "mapping.h"

     

       545
       545
       -
        #include "sort.h"

     

       546
       546
       -
       +#include "buffy.h"

     

       547
       547
       -
        #include "mx.h"

     

       548
       548
       -
        

     

       549
       549
       -
       +#ifdef USE_SIDEBAR

     

       550
       550
       -
       +#include "sidebar.h"

     

       551
       551
       -
       +#endif

     

       552
       552
       -
       +

     

       553
       553
       -
        #ifdef USE_POP

     

       554
       554
       -
        #include "pop.h"

     

       555
       555
       -
        #endif

     

       556
       556
       -
       @@ -595,21 +600,39 @@

     

       557
       557
       -
               menu->redraw |= REDRAW_STATUS;

     

       558
       558
       -
             if (do_buffy_notify)

     

       559
       559
       -
             {

     

       560
       560
       -
       -       if (mutt_buffy_notify () && option (OPTBEEPNEW))

     

       561
       561
       -
       - 	beep ();

     

       562
       562
       -
       +       if (mutt_buffy_notify())

     

       563
       563
       -
       +       {

     

       564
       564
       -
       +         menu->redraw |= REDRAW_STATUS;

     

       565
       565
       -
       +         if (option (OPTBEEPNEW))

     

       566
       566
       -
       +           beep();

     

       567
       567
       -
       +       }

     

       568
       568
       -
             }

     

       569
       569
       -
             else

     

       570
       570
       -
               do_buffy_notify = 1;

     

       571
       571
       -
            }

     

       572
       572
       -
        

     

       573
       573
       -
       +#ifdef USE_SIDEBAR

     

       574
       574
       -
       +    if (option (OPTSIDEBAR))

     

       575
       575
       -
       +        menu->redraw |= REDRAW_SIDEBAR;

     

       576
       576
       -
       +#endif

     

       577
       577
       -
       +

     

       578
       578
       -
            if (op != -1)

     

       579
       579
       -
              mutt_curs_set (0);

     

       580
       580
       -
        

     

       581
       581
       -
            if (menu->redraw & REDRAW_FULL)

     

       582
       582
       -
            {

     

       583
       583
       -
              menu_redraw_full (menu);

     

       584
       584
       -
       +#ifdef USE_SIDEBAR

     

       585
       585
       -
       +      mutt_sb_draw();

     

       586
       586
       -
       +#endif

     

       587
       587
       -
              mutt_show_error ();

     

       588
       588
       -
            }

     

       589
       589
       -
       +#ifdef USE_SIDEBAR

     

       590
       590
       -
       +    else if (menu->redraw & REDRAW_SIDEBAR) {

     

       591
       591
       -
       +      mutt_sb_draw();

     

       592
       592
       -
       +      menu->redraw &= ~REDRAW_SIDEBAR;

     

       593
       593
       -
       +    }

     

       594
       594
       -
       +#endif

     

       595
       595
       -
        

     

       596
       596
       -
            if (menu->menu == MENU_MAIN)

     

       597
       597
       -
            {

     

       598
       598
       -
       @@ -630,9 +653,20 @@

     

       599
       599
       -
        

     

       600
       600
       -
              if (menu->redraw & REDRAW_STATUS)

     

       601
       601
       -
              {

     

       602
       602
       -
       +#ifdef USE_SIDEBAR

     

       603
       603
       -
       +        /* Temporarily lie about the sidebar width */

     

       604
       604
       -
       +	short sw = SidebarWidth;

     

       605
       605
       -
       +	SidebarWidth = 0;

     

       606
       606
       -
       +#endif

     

       607
       607
       -
        	menu_status_line (buf, sizeof (buf), menu, NONULL (Status));

     

       608
       608
       -
       +#ifdef USE_SIDEBAR

     

       609
       609
       -
       +        SidebarWidth = sw; /* Restore the sidebar width */

     

       610
       610
       -
       +#endif

     

       611
       611
       -
        	move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0);

     

       612
       612
       -
        	SETCOLOR (MT_COLOR_STATUS);

     

       613
       613
       -
       +#ifdef USE_SIDEBAR

     

       614
       614
       -
       +	mutt_sb_set_buffystats (Context);

     

       615
       615
       -
       +#endif

     

       616
       616
       -
        	mutt_paddstr (COLS, buf);

     

       617
       617
       -
        	NORMAL_COLOR;

     

       618
       618
       -
        	menu->redraw &= ~REDRAW_STATUS;

     

       619
       619
       -
       @@ -652,7 +686,7 @@

     

       620
       620
       -
        	menu->oldcurrent = -1;

     

       621
       621
       -
        

     

       622
       622
       -
              if (option (OPTARROWCURSOR))

     

       623
       623
       -
       -	move (menu->current - menu->top + menu->offset, 2);

     

       624
       624
       -
       +	move (menu->current - menu->top + menu->offset, SidebarWidth + 2);

     

       625
       625
       -
              else if (option (OPTBRAILLEFRIENDLY))

     

       626
       626
       -
        	move (menu->current - menu->top + menu->offset, 0);

     

       627
       627
       -
              else

     

       628
       628
       -
       @@ -1091,6 +1125,9 @@

     

       629
       629
       -
        	  break;

     

       630
       630
       -
        

     

       631
       631
       -
        	CHECK_MSGCOUNT;

     

       632
       632
       -
       +#ifdef USE_SIDEBAR

     

       633
       633
       -
       +	CHECK_VISIBLE;

     

       634
       634
       -
       +#endif

     

       635
       635
       -
        	CHECK_READONLY;

     

       636
       636
       -
        	{

     

       637
       637
       -
        	  int oldvcount = Context->vcount;

     

       638
       638
       -
       @@ -1150,6 +1187,9 @@

     

       639
       639
       -
        	  menu->redraw = REDRAW_FULL;

     

       640
       640
       -
        	break;

     

       641
       641
       -
        

     

       642
       642
       -
       +#ifdef USE_SIDEBAR

     

       643
       643
       -
       +      case OP_SIDEBAR_OPEN:

     

       644
       644
       -
       +#endif

     

       645
       645
       -
              case OP_MAIN_CHANGE_FOLDER:

     

       646
       646
       -
              case OP_MAIN_NEXT_UNREAD_MAILBOX:

     

       647
       647
       -
        

     

       648
       648
       -
       @@ -1181,6 +1221,14 @@

     

       649
       649
       -
        	{

     

       650
       650
       -
        	  mutt_buffy (buf, sizeof (buf));

     

       651
       651
       -
        

     

       652
       652
       -
       +#ifdef USE_SIDEBAR

     

       653
       653
       -
       +	  if (op == OP_SIDEBAR_OPEN) {

     

       654
       654
       -
       +	    const char *path = mutt_sb_get_highlight();

     

       655
       655
       -
       +	    if (!path)

     

       656
       656
       -
       +	      break;

     

       657
       657
       -
       +	    strncpy (buf, path, sizeof (buf));

     

       658
       658
       -
       +	  } else

     

       659
       659
       -
       +#endif

     

       660
       660
       -
        	  if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)

     

       661
       661
       -
        	  {

     

       662
       662
       -
        	    if (menu->menu == MENU_PAGER)

     

       663
       663
       -
       @@ -1199,6 +1247,9 @@

     

       664
       664
       -
        	}

     

       665
       665
       -
        

     

       666
       666
       -
        	mutt_expand_path (buf, sizeof (buf));

     

       667
       667
       -
       +#ifdef USE_SIDEBAR

     

       668
       668
       -
       +	mutt_sb_set_open_buffy (buf);

     

       669
       669
       -
       +#endif

     

       670
       670
       -
        	if (mx_get_magic (buf) <= 0)

     

       671
       671
       -
        	{

     

       672
       672
       -
        	  mutt_error (_("%s is not a mailbox."), buf);

     

       673
       673
       -
       @@ -2310,6 +2361,21 @@

     

       674
       674
       -
        	mutt_what_key();

     

       675
       675
       -
        	break;

     

       676
       676
       -
        

     

       677
       677
       -
       +#ifdef USE_SIDEBAR

     

       678
       678
       -
       +      case OP_SIDEBAR_NEXT:

     

       679
       679
       -
       +      case OP_SIDEBAR_NEXT_NEW:

     

       680
       680
       -
       +      case OP_SIDEBAR_PAGE_DOWN:

     

       681
       681
       -
       +      case OP_SIDEBAR_PAGE_UP:

     

       682
       682
       -
       +      case OP_SIDEBAR_PREV:

     

       683
       683
       -
       +      case OP_SIDEBAR_PREV_NEW:

     

       684
       684
       -
       +        mutt_sb_change_mailbox (op);

     

       685
       685
       -
       +        break;

     

       686
       686
       -
       +

     

       687
       687
       -
       +      case OP_SIDEBAR_TOGGLE_VISIBLE:

     

       688
       688
       -
       +	toggle_option (OPTSIDEBAR);

     

       689
       689
       -
       +	menu->redraw = REDRAW_FULL;

     

       690
       690
       -
       +	break;

     

       691
       691
       -
       +#endif

     

       692
       692
       -
              default:

     

       693
       693
       -
        	if (menu->menu == MENU_MAIN)

     

       694
       694
       -
        	  km_error_key (MENU_MAIN);

     

       695
       695
       -
       diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head

     

       696
       696
       -
       --- mutt-1.6.1/doc/manual.xml.head	2016-06-12 18:43:00.402447590 +0100

     

       697
       697
       -
       +++ mutt-1.6.1-sidebar/doc/manual.xml.head	2016-06-12 18:43:03.955502998 +0100

     

       698
       698
       -
       @@ -405,6 +405,623 @@

     

       699
       699
       -
        

     

       700
       700
       -
        </sect2>

     

       701
       701
       -
        

     

       702
       702
       -
       +<sect2 id="intro-sidebar">

     

       703
       703
       -
       +	<title>Sidebar</title>

     

       704
       704
       -
       +	<para>

     

       705
       705
       -
       +		The Sidebar shows a list of all your mailboxes.  The list can be

     

       706
       706
       -
       +		turned on and off, it can be themed and the list style can be

     

       707
       707
       -
       +		configured.

     

       708
       708
       -
       +	</para>

     

       709
       709
       -
       +	<para>

     

       710
       710
       -
       +		This part of the manual is suitable for beginners.

     

       711
       711
       -
       +		If you already know Mutt you could skip ahead to the main

     

       712
       712
       -
       +		<link linkend="sidebar">Sidebar guide</link>.

     

       713
       713
       -
       +		If you just want to get started, you could use the sample

     

       714
       714
       -
       +		<link linkend="sidebar-muttrc">Sidebar muttrc</link>.

     

       715
       715
       -
       +	</para>

     

       716
       716
       -
       +	<para>

     

       717
       717
       -
       +		This version of Sidebar is based on Terry Chan's

     

       718
       718
       -
       +		<ulink url="http://www.lunar-linux.org/mutt-sidebar/">2015-11-11 release</ulink>.

     

       719
       719
       -
       +		It contains many

     

       720
       720
       -
       +		<emphasis role="bold"><link linkend="intro-sidebar-features">new features</link></emphasis>,

     

       721
       721
       -
       +		lots of

     

       722
       722
       -
       +		<emphasis role="bold"><link linkend="intro-sidebar-bugfixes">bugfixes</link></emphasis>

     

       723
       723
       -
       +		and a generous helping of

     

       724
       724
       -
       +		<emphasis role="bold">new documentation</emphasis> which you are already reading.

     

       725
       725
       -
       +	</para>

     

       726
       726
       -
       +	<para>

     

       727
       727
       -
       +		To check if Mutt supports <quote>Sidebar</quote>, look for the string

     

       728
       728
       -
       +		<literal>+USE_SIDEBAR</literal> in the mutt version.

     

       729
       729
       -
       +	</para>

     

       730
       730
       -
       +<screen>

     

       731
       731
       -
       +mutt -v

     

       732
       732
       -
       +</screen>

     

       733
       733
       -
       +	<para>

     

       734
       734
       -
       +		<emphasis role="bold">Let's turn on the Sidebar:</emphasis>

     

       735
       735
       -
       +	</para>

     

       736
       736
       -
       +	<screen>set sidebar_visible</screen>

     

       737
       737
       -
       +	<para>

     

       738
       738
       -
       +		You will see something like this.

     

       739
       739
       -
       +		A list of mailboxes on the left.

     

       740
       740
       -
       +		A list of emails, from the selected mailbox, on the right.

     

       741
       741
       -
       +	</para>

     

       742
       742
       -
       +<screen>

     

       743
       743
       -
       +<emphasis role="indicator">Fruit [1]     3/8</emphasis>|  1    + Jan 24  Rhys Lee         (192)  Yew

     

       744
       744
       -
       +Animals [1]   2/6|  2    + Feb 11  Grace Hall       (167)  Ilama

     

       745
       745
       -
       +Cars            4|  3      Feb 23  Aimee Scott      (450)  Nectarine

     

       746
       746
       -
       +Seas          1/7|  4    ! Feb 28  Summer Jackson   (264)  Lemon

     

       747
       747
       -
       +                 |  5      Mar 07  Callum Harrison  (464)  Raspberry

     

       748
       748
       -
       +                 |<emphasis role="indicator">  6 N  + Mar 24  Samuel Harris    (353)  Tangerine          </emphasis>

     

       749
       749
       -
       +                 |  7 N  + Sep 05  Sofia Graham     (335)  Cherry

     

       750
       750
       -
       +                 |  8 N    Sep 16  Ewan Brown       (105)  Ugli

     

       751
       751
       -
       +                 |

     

       752
       752
       -
       +                 |

     

       753
       753
       -
       +</screen>

     

       754
       754
       -
       +<para>

     

       755
       755
       -
       +	This user has four mailboxes: <quote>Fruit</quote>,

     

       756
       756
       -
       +	<quote>Cars</quote>, <quote>Animals</quote> and

     

       757
       757
       -
       +	<quote>Seas</quote>.

     

       758
       758
       -
       +</para>

     

       759
       759
       -
       +<para>

     

       760
       760
       -
       +	The current, open, mailbox is <quote>Fruit</quote>.  We can

     

       761
       761
       -
       +	also see information about the other mailboxes.  For example:

     

       762
       762
       -
       +	The <quote>Animals</quote> mailbox contains, 1 flagged email, 2

     

       763
       763
       -
       +	new emails out of a total of 6 emails.

     

       764
       764
       -
       +</para>

     

       765
       765
       -
       +	<sect3 id="intro-sidebar-navigation">

     

       766
       766
       -
       +		<title>Navigation</title>

     

       767
       767
       -
       +		<para>

     

       768
       768
       -
       +			The Sidebar adds some new <link linkend="sidebar-functions">functions</link>

     

       769
       769
       -
       +			to Mutt.

     

       770
       770
       -
       +		</para>

     

       771
       771
       -
       +		<para>

     

       772
       772
       -
       +			The user pressed the <quote>c</quote> key to

     

       773
       773
       -
       +			<literal>&lt;change-folder&gt;</literal> to the

     

       774
       774
       -
       +			<quote>Animals</quote> mailbox.  The Sidebar automatically

     

       775
       775
       -
       +			updated the indicator to match.

     

       776
       776
       -
       +		</para>

     

       777
       777
       -
       +<screen>

     

       778
       778
       -
       +Fruit [1]     3/8|  1      Jan 03  Tia Gibson       (362)  Caiman

     

       779
       779
       -
       +<emphasis role="indicator">Animals [1]   2/6</emphasis>|  2    + Jan 22  Rhys Lee         ( 48)  Dolphin

     

       780
       780
       -
       +Cars            4|  3    ! Aug 16  Ewan Brown       (333)  Hummingbird

     

       781
       781
       -
       +Seas          1/7|  4      Sep 25  Grace Hall       ( 27)  Capybara

     

       782
       782
       -
       +                 |<emphasis role="indicator">  5 N  + Nov 12  Evelyn Rogers    (453)  Tapir              </emphasis>

     

       783
       783
       -
       +                 |  6 N  + Nov 16  Callum Harrison  (498)  Hedgehog

     

       784
       784
       -
       +                 |

     

       785
       785
       -
       +                 |

     

       786
       786
       -
       +                 |

     

       787
       787
       -
       +                 |

     

       788
       788
       -
       +</screen>

     

       789
       789
       -
       +		<para>

     

       790
       790
       -
       +			Let's map some functions:

     

       791
       791
       -
       +		</para>

     

       792
       792
       -
       +<screen>

     

       793
       793
       -
       +bind index,pager \CP sidebar-prev       <emphasis role="comment"># Ctrl-Shift-P - Previous Mailbox</emphasis>

     

       794
       794
       -
       +bind index,pager \CN sidebar-next       <emphasis role="comment"># Ctrl-Shift-N - Next Mailbox</emphasis>

     

       795
       795
       -
       +bind index,pager \CO sidebar-open       <emphasis role="comment"># Ctrl-Shift-O - Open Highlighted Mailbox</emphasis>

     

       796
       796
       -
       +</screen>

     

       797
       797
       -
       +		<para>

     

       798
       798
       -
       +			Press <quote>Ctrl-Shift-N</quote> (Next mailbox) twice will

     

       799
       799
       -
       +			move the Sidebar <emphasis role="bold">highlight</emphasis> to

     

       800
       800
       -
       +			down to the <quote>Seas</quote> mailbox.

     

       801
       801
       -
       +		</para>

     

       802
       802
       -
       +<screen>

     

       803
       803
       -
       +Fruit [1]     3/8|  1      Jan 03  Tia Gibson       (362)  Caiman

     

       804
       804
       -
       +<emphasis role="indicator">Animals [1]   2/6</emphasis>|  2    + Jan 22  Rhys Lee         ( 48)  Dolphin

     

       805
       805
       -
       +Cars            4|  3    ! Aug 16  Ewan Brown       (333)  Hummingbird

     

       806
       806
       -
       +<emphasis role="highlight">Seas          1/7</emphasis>|  4      Sep 25  Grace Hall       ( 27)  Capybara

     

       807
       807
       -
       +                 |<emphasis role="indicator">  5 N  + Nov 12  Evelyn Rogers    (453)  Tapir              </emphasis>

     

       808
       808
       -
       +                 |  6 N  + Nov 16  Callum Harrison  (498)  Hedgehog

     

       809
       809
       -
       +                 |

     

       810
       810
       -
       +                 |

     

       811
       811
       -
       +                 |

     

       812
       812
       -
       +                 |

     

       813
       813
       -
       +</screen>

     

       814
       814
       -
       +		<note>

     

       815
       815
       -
       +			Functions <literal>&lt;sidebar-next&gt;</literal> and

     

       816
       816
       -
       +			<literal>&lt;sidebar-prev&gt;</literal> move the Sidebar

     

       817
       817
       -
       +			<emphasis role="bold">highlight</emphasis>.

     

       818
       818
       -
       +			They <emphasis role="bold">do not</emphasis> change the open

     

       819
       819
       -
       +			mailbox.

     

       820
       820
       -
       +		</note>

     

       821
       821
       -
       +		<para>

     

       822
       822
       -
       +			Press <quote>Ctrl-Shift-O</quote>

     

       823
       823
       -
       +			(<literal>&lt;sidebar-open&gt;</literal>)

     

       824
       824
       -
       +			to open the highlighted mailbox.

     

       825
       825
       -
       +		</para>

     

       826
       826
       -
       +<screen>

     

       827
       827
       -
       +Fruit [1]     3/8|  1    ! Mar 07  Finley Jones     (139)  Molucca Sea

     

       828
       828
       -
       +Animals [1]   2/6|  2    + Mar 24  Summer Jackson   ( 25)  Arafura Sea

     

       829
       829
       -
       +Cars            4|  3    + Feb 28  Imogen Baker     (193)  Pechora Sea

     

       830
       830
       -
       +<emphasis role="indicator">Seas          1/7</emphasis>|<emphasis role="indicator">  4 N  + Feb 23  Isla Hussain     (348)  Balearic Sea       </emphasis>

     

       831
       831
       -
       +                 |

     

       832
       832
       -
       +                 |

     

       833
       833
       -
       +                 |

     

       834
       834
       -
       +                 |

     

       835
       835
       -
       +                 |

     

       836
       836
       -
       +                 |

     

       837
       837
       -
       +</screen>

     

       838
       838
       -
       +	</sect3>

     

       839
       839
       -
       +	<sect3 id="intro-sidebar-features">

     

       840
       840
       -
       +		<title>Features</title>

     

       841
       841
       -
       +		<para>

     

       842
       842
       -
       +			The Sidebar shows a list of mailboxes in a panel.

     

       843
       843
       -
       +		<para>

     

       844
       844
       -
       +		</para>

     

       845
       845
       -
       +			Everything about the Sidebar can be configured.

     

       846
       846
       -
       +		</para>

     

       847
       847
       -
       +		<itemizedlist>

     

       848
       848
       -
       +		<title><link linkend="intro-sidebar-basics">State of the Sidebar</link></title>

     

       849
       849
       -
       +			<listitem><para>Visibility</para></listitem>

     

       850
       850
       -
       +			<listitem><para>Width</para></listitem>

     

       851
       851
       -
       +		</itemizedlist>

     

       852
       852
       -
       +		<itemizedlist>

     

       853
       853
       -
       +		<title><link linkend="intro-sidebar-limit">Which mailboxes are displayed</link></title>

     

       854
       854
       -
       +			<listitem><para>Display all</para></listitem>

     

       855
       855
       -
       +			<listitem><para>Limit to mailboxes with new mail</para></listitem>

     

       856
       856
       -
       +			<listitem><para>Whitelist mailboxes to display always</para></listitem>

     

       857
       857
       -
       +		</itemizedlist>

     

       858
       858
       -
       +		<itemizedlist>

     

       859
       859
       -
       +		<title><link linkend="sidebar-sort">The order in which mailboxes are displayed</link></title>

     

       860
       860
       -
       +		<title></title>

     

       861
       861
       -
       +			<listitem><para>Unsorted (order of mailboxes commands)</para></listitem>

     

       862
       862
       -
       +			<listitem><para>Sorted alphabetically</para></listitem>

     

       863
       863
       -
       +			<listitem><para>Sorted by number of new mails</para></listitem>

     

       864
       864
       -
       +		</itemizedlist>

     

       865
       865
       -
       +		<itemizedlist>

     

       866
       866
       -
       +		<title><link linkend="intro-sidebar-colors">Color</link></title>

     

       867
       867
       -
       +			<listitem><para>Sidebar indicators and divider</para></listitem>

     

       868
       868
       -
       +			<listitem><para>Mailboxes depending on their type</para></listitem>

     

       869
       869
       -
       +			<listitem><para>Mailboxes depending on their contents</para></listitem>

     

       870
       870
       -
       +		</itemizedlist>

     

       871
       871
       -
       +		<itemizedlist>

     

       872
       872
       -
       +		<title><link linkend="sidebar-functions">Key bindings</link></title>

     

       873
       873
       -
       +			<listitem><para>Hide/Unhide the Sidebar</para></listitem>

     

       874
       874
       -
       +			<listitem><para>Select previous/next mailbox</para></listitem>

     

       875
       875
       -
       +			<listitem><para>Select previous/next mailbox with new mail</para></listitem>

     

       876
       876
       -
       +			<listitem><para>Page up/down through a list of mailboxes</para></listitem>

     

       877
       877
       -
       +		</itemizedlist>

     

       878
       878
       -
       +		<itemizedlist>

     

       879
       879
       -
       +		<title>Misc</title>

     

       880
       880
       -
       +			<listitem><para><link linkend="intro-sidebar-format">Formatting string for mailbox</link></para></listitem>

     

       881
       881
       -
       +			<listitem><para><link linkend="sidebar-next-new-wrap">Wraparound searching</link></para></listitem>

     

       882
       882
       -
       +			<listitem><para><link linkend="intro-sidebar-abbrev">Flexible mailbox abbreviations</link></para></listitem>

     

       883
       883
       -
       +			<listitem><para>Support for Unicode mailbox names (utf-8)</para></listitem>

     

       884
       884
       -
       +		</itemizedlist>

     

       885
       885
       -
       +	</sect3>

     

       886
       886
       -
       +	<sect3 id="intro-sidebar-display">

     

       887
       887
       -
       +		<title>Display</title>

     

       888
       888
       -
       +		<para>

     

       889
       889
       -
       +			Everything about the Sidebar can be configured.

     

       890
       890
       -
       +		</para>

     

       891
       891
       -
       +		<itemizedlist>

     

       892
       892
       -
       +			<title>For a quick reference:</title>

     

       893
       893
       -
       +			<listitem><para><link linkend="sidebar-variables">Sidebar variables to set</link> </para></listitem>

     

       894
       894
       -
       +			<listitem><para><link linkend="sidebar-colors">Sidebar colors to apply</link></para></listitem>

     

       895
       895
       -
       +			<listitem><para><link linkend="sidebar-sort">Sidebar sort methods</link></para></listitem>

     

       896
       896
       -
       +		</itemizedlist>

     

       897
       897
       -
       +		<sect4 id="intro-sidebar-basics">

     

       898
       898
       -
       +			<title>Sidebar Basics</title>

     

       899
       899
       -
       +			<para>

     

       900
       900
       -
       +				The most important variable is <literal>$sidebar_visible</literal>.

     

       901
       901
       -
       +				You can set this in your <quote>muttrc</quote>, or bind a key to the

     

       902
       902
       -
       +				function <literal>&lt;sidebar-toggle-visible&gt;</literal>.

     

       903
       903
       -
       +			</para>

     

       904
       904
       -
       +<screen>

     

       905
       905
       -
       +set sidebar_visible                         <emphasis role="comment"># Make the Sidebar visible by default</emphasis>

     

       906
       906
       -
       +bind index,pager B sidebar-toggle-visible   <emphasis role="comment"># Use 'B' to switch the Sidebar on and off</emphasis>

     

       907
       907
       -
       +</screen>

     

       908
       908
       -
       +			<para>

     

       909
       909
       -
       +				Next, decide how wide you want the Sidebar to be.  25

     

       910
       910
       -
       +				characters might be enough for the mailbox name and some numbers.

     

       911
       911
       -
       +		Remember, you can hide/show the Sidebar at the press of button.

     

       912
       912
       -
       +		</para>

     

       913
       913
       -
       +		<para>

     

       914
       914
       -
       +		Finally, you might want to change the divider character.

     

       915
       915
       -
       +		By default, Sidebar draws an ASCII line between it and the Index panel

     

       916
       916
       -
       +				If your terminal supports it, you can use a Unicode line-drawing character.

     

       917
       917
       -
       +			</para>

     

       918
       918
       -
       +<screen>

     

       919
       919
       -
       +set sidebar_width = 25                  <emphasis role="comment"># Plenty of space</emphasis>

     

       920
       920
       -
       +set sidebar_divider_char = '│'          <emphasis role="comment"># Pretty line-drawing character</emphasis>

     

       921
       921
       -
       +</screen>

     

       922
       922
       -
       +		</sect4>

     

       923
       923
       -
       +		<sect4 id="intro-sidebar-format">

     

       924
       924
       -
       +			<title>Sidebar Format String</title>

     

       925
       925
       -
       +			<para>

     

       926
       926
       -
       +				<literal>$sidebar_format</literal> allows you to customize the Sidebar display.

     

       927
       927
       -
       +				For an introduction, read <link linkend="index-format">format strings</link>

     

       928
       928
       -
       +				including the section about <link linkend="formatstrings-conditionals">conditionals</link>.

     

       929
       929
       -
       +			</para>

     

       930
       930
       -
       +			<para>

     

       931
       931
       -
       +				The default value is <literal>%B%?F? [%F]?%* %?N?%N/?%S</literal>

     

       932
       932
       -
       +			</para>

     

       933
       933
       -
       +			<itemizedlist>

     

       934
       934
       -
       +				<title>Which breaks down as:</title>

     

       935
       935
       -
       +				<listitem><para><literal>%B</literal> - Mailbox name</para></listitem>

     

       936
       936
       -
       +				<listitem><para><literal>%?F? [%F]?</literal> - If flagged emails <literal>[%F]</literal>, otherwise nothing</para></listitem>

     

       937
       937
       -
       +				<listitem><para><literal>%* </literal> - Pad with spaces</para></listitem>

     

       938
       938
       -
       +				<listitem><para><literal>%?N?%N/?</literal> - If new emails <literal>%N/</literal>, otherwise nothing</para></listitem>

     

       939
       939
       -
       +				<listitem><para><literal>%S</literal> - Total number of emails</para></listitem>

     

       940
       940
       -
       +			</itemizedlist>

     

       941
       941
       -
       +			<table>

     

       942
       942
       -
       +				<title>sidebar_format</title>

     

       943
       943
       -
       +				<tgroup cols="3">

     

       944
       944
       -
       +					<thead>

     

       945
       945
       -
       +						<row>

     

       946
       946
       -
       +							<entry>Format</entry>

     

       947
       947
       -
       +							<entry>Notes</entry>

     

       948
       948
       -
       +							<entry>Description</entry>

     

       949
       949
       -
       +						</row>

     

       950
       950
       -
       +					</thead>

     

       951
       951
       -
       +					<tbody>

     

       952
       952
       -
       +						<row>

     

       953
       953
       -
       +							<entry>%B</entry>

     

       954
       954
       -
       +							<entry></entry>

     

       955
       955
       -
       +							<entry>Name of the mailbox</entry>

     

       956
       956
       -
       +						</row>

     

       957
       957
       -
       +						<row>

     

       958
       958
       -
       +							<entry>%S</entry>

     

       959
       959
       -
       +							<entry>*</entry>

     

       960
       960
       -
       +							<entry>Size of mailbox (total number of messages)</entry>

     

       961
       961
       -
       +						</row>

     

       962
       962
       -
       +						<row>

     

       963
       963
       -
       +							<entry>%N</entry>

     

       964
       964
       -
       +							<entry>*</entry>

     

       965
       965
       -
       +							<entry>Number of New messages in the mailbox</entry>

     

       966
       966
       -
       +						</row>

     

       967
       967
       -
       +						<row>

     

       968
       968
       -
       +							<entry>%F</entry>

     

       969
       969
       -
       +							<entry>*</entry>

     

       970
       970
       -
       +							<entry>Number of Flagged messages in the mailbox</entry>

     

       971
       971
       -
       +						</row>

     

       972
       972
       -
       +						<row>

     

       973
       973
       -
       +							<entry>%!</entry>

     

       974
       974
       -
       +							<entry></entry>

     

       975
       975
       -
       +							<entry>

     

       976
       976
       -
       +								<quote>!</quote>: one flagged message;

     

       977
       977
       -
       +								<quote>!!</quote>: two flagged messages;

     

       978
       978
       -
       +								<quote>n!</quote>: n flagged messages (for n &gt; 2).

     

       979
       979
       -
       +								Otherwise prints nothing.

     

       980
       980
       -
       +							</entry>

     

       981
       981
       -
       +						</row>

     

       982
       982
       -
       +						<row>

     

       983
       983
       -
       +							<entry>%d</entry>

     

       984
       984
       -
       +							<entry>* ‡</entry>

     

       985
       985
       -
       +							<entry>Number of deleted messages</entry>

     

       986
       986
       -
       +						</row>

     

       987
       987
       -
       +						<row>

     

       988
       988
       -
       +							<entry>%L</entry>

     

       989
       989
       -
       +							<entry>* ‡</entry>

     

       990
       990
       -
       +							<entry>Number of messages after limiting</entry>

     

       991
       991
       -
       +						</row>

     

       992
       992
       -
       +						<row>

     

       993
       993
       -
       +							<entry>%t</entry>

     

       994
       994
       -
       +							<entry>* ‡</entry>

     

       995
       995
       -
       +							<entry>Number of tagged messages</entry>

     

       996
       996
       -
       +						</row>

     

       997
       997
       -
       +						<row>

     

       998
       998
       -
       +							<entry>%&gt;X</entry>

     

       999
       999
       -
       +							<entry></entry>

     

       1000
       1000
       -
       +							<entry>Right justify the rest of the string and pad with <quote>X</quote></entry>

     

       1001
       1001
       -
       +						</row>

     

       1002
       1002
       -
       +						<row>

     

       1003
       1003
       -
       +							<entry>%|X</entry>

     

       1004
       1004
       -
       +							<entry></entry>

     

       1005
       1005
       -
       +							<entry>Pad to the end of the line with

     

       1006
       1006
       -
       +							<quote>X</quote></entry>

     

       1007
       1007
       -
       +						</row>

     

       1008
       1008
       -
       +						<row>

     

       1009
       1009
       -
       +							<entry>%*X</entry>

     

       1010
       1010
       -
       +							<entry></entry>

     

       1011
       1011
       -
       +							<entry>Soft-fill with character <quote>X</quote>as pad</entry>

     

       1012
       1012
       -
       +						</row>

     

       1013
       1013
       -
       +					</tbody>

     

       1014
       1014
       -
       +				</tgroup>

     

       1015
       1015
       -
       +			</table>

     

       1016
       1016
       -
       +			<para>

     

       1017
       1017
       -
       +			* = Can be optionally printed if nonzero

     

       1018
       1018
       -
       +			</para>

     

       1019
       1019
       -
       +			<para>

     

       1020
       1020
       -
       +			‡ = Only applicable to the current folder

     

       1021
       1021
       -
       +			</para>

     

       1022
       1022
       -
       +			<para>

     

       1023
       1023
       -
       +				Here are some examples.

     

       1024
       1024
       -
       +				They show the number of (F)lagged, (N)ew and (S)ize.

     

       1025
       1025
       -
       +			</para>

     

       1026
       1026
       -
       +			<table>

     

       1027
       1027
       -
       +				<title>sidebar_format</title>

     

       1028
       1028
       -
       +				<tgroup cols="2">

     

       1029
       1029
       -
       +					<thead>

     

       1030
       1030
       -
       +						<row>

     

       1031
       1031
       -
       +							<entry>Format</entry>

     

       1032
       1032
       -
       +							<entry>Example</entry>

     

       1033
       1033
       -
       +						</row>

     

       1034
       1034
       -
       +					</thead>

     

       1035
       1035
       -
       +					<tbody>

     

       1036
       1036
       -
       +						<row>

     

       1037
       1037
       -
       +							<entry><literal>%B%?F? [%F]?%* %?N?%N/?%S</literal></entry>

     

       1038
       1038
       -
       +							<entry><screen>mailbox [F]            N/S</screen></entry>

     

       1039
       1039
       -
       +						</row>

     

       1040
       1040
       -
       +						<row>

     

       1041
       1041
       -
       +							<entry><literal>%B%* %F:%N:%S</literal></entry>

     

       1042
       1042
       -
       +							<entry><screen>mailbox              F:N:S</screen></entry>

     

       1043
       1043
       -
       +						</row>

     

       1044
       1044
       -
       +						<row>

     

       1045
       1045
       -
       +							<entry><literal>%B %?N?(%N)?%* %S</literal></entry>

     

       1046
       1046
       -
       +							<entry><screen>mailbox (N)              S</screen></entry>

     

       1047
       1047
       -
       +						</row>

     

       1048
       1048
       -
       +						<row>

     

       1049
       1049
       -
       +							<entry><literal>%B%* ?F?%F/?%N</literal></entry>

     

       1050
       1050
       -
       +							<entry><screen>mailbox                F/S</screen></entry>

     

       1051
       1051
       -
       +						</row>

     

       1052
       1052
       -
       +					</tbody>

     

       1053
       1053
       -
       +				</tgroup>

     

       1054
       1054
       -
       +			</table>

     

       1055
       1055
       -
       +		</sect4>

     

       1056
       1056
       -
       +		<sect4 id="intro-sidebar-abbrev">

     

       1057
       1057
       -
       +			<title>Abbreviating Mailbox Names</title>

     

       1058
       1058
       -
       +			<para>

     

       1059
       1059
       -
       +				<literal>$sidebar_delim_chars</literal> tells Sidebar

     

       1060
       1060
       -
       +				how to split up mailbox paths.  For local directories

     

       1061
       1061
       -
       +				use <quote>/</quote>; for IMAP folders use <quote>.</quote>

     

       1062
       1062
       -
       +			</para>

     

       1063
       1063
       -
       +			<sect5 id="intro-sidebar-abbrev-ex1">

     

       1064
       1064
       -
       +				<title>Example 1</title>

     

       1065
       1065
       -
       +				<para>

     

       1066
       1066
       -
       +					This example works well if your mailboxes have unique names

     

       1067
       1067
       -
       +					after the last separator.

     

       1068
       1068
       -
       +				</para>

     

       1069
       1069
       -
       +				<para>

     

       1070
       1070
       -
       +					Add some mailboxes of diffent depths.

     

       1071
       1071
       -
       +				</para>

     

       1072
       1072
       -
       +<screen>

     

       1073
       1073
       -
       +set folder="~/mail"

     

       1074
       1074
       -
       +mailboxes =fruit/apple          =fruit/banana          =fruit/cherry

     

       1075
       1075
       -
       +mailboxes =water/sea/sicily     =water/sea/archipelago =water/sea/sibuyan

     

       1076
       1076
       -
       +mailboxes =water/ocean/atlantic =water/ocean/pacific   =water/ocean/arctic

     

       1077
       1077
       -
       +</screen>

     

       1078
       1078
       -
       +				<para>

     

       1079
       1079
       -
       +					Shorten the names:

     

       1080
       1080
       -
       +				</para>

     

       1081
       1081
       -
       +<screen>

     

       1082
       1082
       -
       +set sidebar_short_path                  <emphasis role="comment"># Shorten mailbox names</emphasis>

     

       1083
       1083
       -
       +set sidebar_delim_chars="/"             <emphasis role="comment"># Delete everything up to the last / character</emphasis>

     

       1084
       1084
       -
       +</screen>

     

       1085
       1085
       -
       +				<para>

     

       1086
       1086
       -
       +					The screenshot below shows what the Sidebar would look like

     

       1087
       1087
       -
       +					before and after shortening.

     

       1088
       1088
       -
       +				</para>

     

       1089
       1089
       -
       +<screen>

     

       1090
       1090
       -
       +|fruit/apple                            |apple

     

       1091
       1091
       -
       +|fruit/banana                           |banana

     

       1092
       1092
       -
       +|fruit/cherry                           |cherry

     

       1093
       1093
       -
       +|water/sea/sicily                       |sicily

     

       1094
       1094
       -
       +|water/sea/archipelago                  |archipelago

     

       1095
       1095
       -
       +|water/sea/sibuyan                      |sibuyan

     

       1096
       1096
       -
       +|water/ocean/atlantic                   |atlantic

     

       1097
       1097
       -
       +|water/ocean/pacific                    |pacific

     

       1098
       1098
       -
       +|water/ocean/arctic                     |arctic

     

       1099
       1099
       -
       +</screen>

     

       1100
       1100
       -
       +			</sect5>

     

       1101
       1101
       -
       +			<sect5 id="intro-sidebar-abbrev-ex2">

     

       1102
       1102
       -
       +				<title>Example 2</title>

     

       1103
       1103
       -
       +				<para>

     

       1104
       1104
       -
       +					This example works well if you have lots of mailboxes which are arranged

     

       1105
       1105
       -
       +					in a tree.

     

       1106
       1106
       -
       +				</para>

     

       1107
       1107
       -
       +				<para>

     

       1108
       1108
       -
       +					Add some mailboxes of diffent depths.

     

       1109
       1109
       -
       +				</para>

     

       1110
       1110
       -
       +<screen>

     

       1111
       1111
       -
       +set folder="~/mail"

     

       1112
       1112
       -
       +mailboxes =fruit

     

       1113
       1113
       -
       +mailboxes =fruit/apple =fruit/banana =fruit/cherry

     

       1114
       1114
       -
       +mailboxes =water

     

       1115
       1115
       -
       +mailboxes =water/sea

     

       1116
       1116
       -
       +mailboxes =water/sea/sicily =water/sea/archipelago =water/sea/sibuyan

     

       1117
       1117
       -
       +mailboxes =water/ocean

     

       1118
       1118
       -
       +mailboxes =water/ocean/atlantic =water/ocean/pacific =water/ocean/arctic

     

       1119
       1119
       -
       +</screen>

     

       1120
       1120
       -
       +				<para>

     

       1121
       1121
       -
       +					Shorten the names:

     

       1122
       1122
       -
       +				</para>

     

       1123
       1123
       -
       +<screen>

     

       1124
       1124
       -
       +set sidebar_short_path                  <emphasis role="comment"># Shorten mailbox names</emphasis>

     

       1125
       1125
       -
       +set sidebar_delim_chars="/"             <emphasis role="comment"># Delete everything up to the last / character</emphasis>

     

       1126
       1126
       -
       +set sidebar_folder_indent               <emphasis role="comment"># Indent folders whose names we've shortened</emphasis>

     

       1127
       1127
       -
       +set sidebar_indent_string="  "          <emphasis role="comment"># Indent with two spaces</emphasis>

     

       1128
       1128
       -
       +</screen>

     

       1129
       1129
       -
       +				<para>

     

       1130
       1130
       -
       +					The screenshot below shows what the Sidebar would look like

     

       1131
       1131
       -
       +					before and after shortening.

     

       1132
       1132
       -
       +				</para>

     

       1133
       1133
       -
       +<screen>

     

       1134
       1134
       -
       +|fruit                                  |fruit

     

       1135
       1135
       -
       +|fruit/apple                            |  apple

     

       1136
       1136
       -
       +|fruit/banana                           |  banana

     

       1137
       1137
       -
       +|fruit/cherry                           |  cherry

     

       1138
       1138
       -
       +|water                                  |water

     

       1139
       1139
       -
       +|water/sea                              |  sea

     

       1140
       1140
       -
       +|water/sea/sicily                       |    sicily

     

       1141
       1141
       -
       +|water/sea/archipelago                  |    archipelago

     

       1142
       1142
       -
       +|water/sea/sibuyan                      |    sibuyan

     

       1143
       1143
       -
       +|water/ocean                            |  ocean

     

       1144
       1144
       -
       +|water/ocean/atlantic                   |    atlantic

     

       1145
       1145
       -
       +|water/ocean/pacific                    |    pacific

     

       1146
       1146
       -
       +|water/ocean/arctic                     |    arctic

     

       1147
       1147
       -
       +</screen>

     

       1148
       1148
       -
       +				<para>

     

       1149
       1149
       -
       +					Sometimes, it will be necessary to add mailboxes, that you

     

       1150
       1150
       -
       +					don't use, to fill in part of the tree.	 This will trade

     

       1151
       1151
       -
       +					vertical space for horizonal space (but it looks good).

     

       1152
       1152
       -
       +				</para>

     

       1153
       1153
       -
       +			</sect5>

     

       1154
       1154
       -
       +		</sect4>

     

       1155
       1155
       -
       +		<sect4 id="intro-sidebar-limit">

     

       1156
       1156
       -
       +			<title>Limiting the Number of Mailboxes</title>

     

       1157
       1157
       -
       +			<para>

     

       1158
       1158
       -
       +				If you have a lot of mailboxes, sometimes it can be useful to hide

     

       1159
       1159
       -
       +				the ones you aren't using.	<literal>$sidebar_new_mail_only</literal>

     

       1160
       1160
       -
       +				tells Sidebar to only show mailboxes that contain new, or flagged, email.

     

       1161
       1161
       -
       +			</para>

     

       1162
       1162
       -
       +			<para>

     

       1163
       1163
       -
       +				If you want some mailboxes to be always visible, then use the

     

       1164
       1164
       -
       +				<literal>sidebar_whitelist</literal> command.  It takes a list of

     

       1165
       1165
       -
       +				mailboxes as parameters.

     

       1166
       1166
       -
       +			</para>

     

       1167
       1167
       -
       +<screen>

     

       1168
       1168
       -
       +set sidebar_new_mail_only               <emphasis role="comment"># Only mailboxes with new/flagged email</emphasis>

     

       1169
       1169
       -
       +sidebar_whitelist fruit fruit/apple     <emphasis role="comment"># Always display these two mailboxes</emphasis>

     

       1170
       1170
       -
       +</screen>

     

       1171
       1171
       -
       +		</sect4>

     

       1172
       1172
       -
       +	</sect3>

     

       1173
       1173
       -
       +	<sect3 id="intro-sidebar-colors">

     

       1174
       1174
       -
       +		<title>Colors</title>

     

       1175
       1175
       -
       +		<para>

     

       1176
       1176
       -
       +			Here is a sample color scheme:

     

       1177
       1177
       -
       +		</para>

     

       1178
       1178
       -
       +<screen>

     

       1179
       1179
       -
       +color sidebar_indicator default color17         <emphasis role="comment"># Dark blue background</emphasis>

     

       1180
       1180
       -
       +color sidebar_highlight white   color238        <emphasis role="comment"># Grey background</emphasis>

     

       1181
       1181
       -
       +color sidebar_spoolfile yellow  default         <emphasis role="comment"># Yellow</emphasis>

     

       1182
       1182
       -
       +color sidebar_new       green   default         <emphasis role="comment"># Green</emphasis>

     

       1183
       1183
       -
       +color sidebar_flagged   red     default         <emphasis role="comment"># Red</emphasis>

     

       1184
       1184
       -
       +color sidebar_divider   color8  default         <emphasis role="comment"># Dark grey</emphasis>

     

       1185
       1185
       -
       +</screen>

     

       1186
       1186
       -
       +		<para>

     

       1187
       1187
       -
       +			There is a priority order when coloring Sidebar mailboxes.

     

       1188
       1188
       -
       +			e.g.  If a mailbox has new mail it will have the

     

       1189
       1189
       -
       +			<literal>sidebar_new</literal> color, even if it also contains

     

       1190
       1190
       -
       +			flagged mails.

     

       1191
       1191
       -
       +		</para>

     

       1192
       1192
       -
       +		<table id="table-intro-sidebar-colors">

     

       1193
       1193
       -
       +			<title>Sidebar Color Priority</title>

     

       1194
       1194
       -
       +			<tgroup cols="3">

     

       1195
       1195
       -
       +				<thead>

     

       1196
       1196
       -
       +					<row>

     

       1197
       1197
       -
       +						<entry>Priority</entry>

     

       1198
       1198
       -
       +						<entry>Color</entry>

     

       1199
       1199
       -
       +						<entry>Description</entry>

     

       1200
       1200
       -
       +					</row>

     

       1201
       1201
       -
       +				</thead>

     

       1202
       1202
       -
       +				<tbody>

     

       1203
       1203
       -
       +					<row>

     

       1204
       1204
       -
       +						<entry>Highest</entry>

     

       1205
       1205
       -
       +						<entry><literal>sidebar_indicator</literal></entry>

     

       1206
       1206
       -
       +						<entry>Mailbox is open</entry>

     

       1207
       1207
       -
       +					</row>

     

       1208
       1208
       -
       +					<row>

     

       1209
       1209
       -
       +						<entry></entry>

     

       1210
       1210
       -
       +						<entry><literal>sidebar_highlight</literal></entry>

     

       1211
       1211
       -
       +						<entry>Mailbox is highlighed</entry>

     

       1212
       1212
       -
       +					</row>

     

       1213
       1213
       -
       +					<row>

     

       1214
       1214
       -
       +						<entry></entry>

     

       1215
       1215
       -
       +						<entry><literal>sidebar_spoolfile</literal></entry>

     

       1216
       1216
       -
       +						<entry>Mailbox is the spoolfile (receives incoming mail)</entry>

     

       1217
       1217
       -
       +					</row>

     

       1218
       1218
       -
       +					<row>

     

       1219
       1219
       -
       +						<entry></entry>

     

       1220
       1220
       -
       +						<entry><literal>sidebar_new</literal></entry>

     

       1221
       1221
       -
       +						<entry>Mailbox contains new mail</entry>

     

       1222
       1222
       -
       +					</row>

     

       1223
       1223
       -
       +					<row>

     

       1224
       1224
       -
       +						<entry></entry>

     

       1225
       1225
       -
       +						<entry><literal>sidebar_flagged</literal></entry>

     

       1226
       1226
       -
       +						<entry>Mailbox contains flagged mail</entry>

     

       1227
       1227
       -
       +					</row>

     

       1228
       1228
       -
       +					<row>

     

       1229
       1229
       -
       +						<entry>Lowest</entry>

     

       1230
       1230
       -
       +						<entry>(None)</entry>

     

       1231
       1231
       -
       +						<entry>Mailbox does not match above</entry>

     

       1232
       1232
       -
       +					</row>

     

       1233
       1233
       -
       +				</tbody>

     

       1234
       1234
       -
       +			</tgroup>

     

       1235
       1235
       -
       +		</table>

     

       1236
       1236
       -
       +	</sect3>

     

       1237
       1237
       -
       +	<sect3 id="intro-sidebar-bugfixes">

     

       1238
       1238
       -
       +		<title>Bug-fixes</title>

     

       1239
       1239
       -
       +		<para>

     

       1240
       1240
       -
       +			If you haven't used Sidebar before, you can ignore this section.

     

       1241
       1241
       -
       +		</para>

     

       1242
       1242
       -
       +		<para>

     

       1243
       1243
       -
       +			These bugs have been fixed since the previous Sidebar release: 2015-11-11.

     

       1244
       1244
       -
       +		</para>

     

       1245
       1245
       -
       +		<itemizedlist>

     

       1246
       1246
       -
       +			<listitem><para>Fix bug when starting in compose mode</para></listitem>

     

       1247
       1247
       -
       +			<listitem><para>Fix bug with empty sidebar_divider_char string</para></listitem>

     

       1248
       1248
       -
       +			<listitem><para>Fix bug with header wrapping</para></listitem>

     

       1249
       1249
       -
       +			<listitem><para>Correctly handle utf8 character sequences</para></listitem>

     

       1250
       1250
       -
       +			<listitem><para>Fix a bug in mh_buffy_update</para></listitem>

     

       1251
       1251
       -
       +			<listitem><para>Fix refresh -- time overflowed short</para></listitem>

     

       1252
       1252
       -
       +			<listitem><para>Protect against empty format strings</para></listitem>

     

       1253
       1253
       -
       +			<listitem><para>Limit Sidebar width to COLS</para></listitem>

     

       1254
       1254
       -
       +			<listitem><para>Handle unmailboxes * safely</para></listitem>

     

       1255
       1255
       -
       +			<listitem><para>Refresh Sidebar after timeout</para></listitem>

     

       1256
       1256
       -
       +		</itemizedlist>

     

       1257
       1257
       -
       +	</sect3>

     

       1258
       1258
       -
       +	<sect3 id="intro-sidebar-config-changes">

     

       1259
       1259
       -
       +		<title>Config Changes</title>

     

       1260
       1260
       -
       +		<para>

     

       1261
       1261
       -
       +			If you haven't used Sidebar before, you can ignore this section.

     

       1262
       1262
       -
       +		</para>

     

       1263
       1263
       -
       +		<para>

     

       1264
       1264
       -
       +			Some of the Sidebar config has been changed to make its meaning clearer.

     

       1265
       1265
       -
       +			These changes have been made since the previous Sidebar release: 2015-11-11.

     

       1266
       1266
       -
       +		</para>

     

       1267
       1267
       -
       +		<table id="table-intro-sidebar-config-changes">

     

       1268
       1268
       -
       +			<title>Config Changes</title>

     

       1269
       1269
       -
       +			<tgroup cols="2">

     

       1270
       1270
       -
       +				<thead>

     

       1271
       1271
       -
       +					<row>

     

       1272
       1272
       -
       +						<entry>Old Name</entry>

     

       1273
       1273
       -
       +						<entry>New Name</entry>

     

       1274
       1274
       -
       +					</row>

     

       1275
       1275
       -
       +				</thead>

     

       1276
       1276
       -
       +				<tbody>

     

       1277
       1277
       -
       +					<row>

     

       1278
       1278
       -
       +						<entry><literal>$sidebar_delim</literal></entry>

     

       1279
       1279
       -
       +						<entry><literal>$sidebar_divider_char</literal></entry>

     

       1280
       1280
       -
       +					</row>

     

       1281
       1281
       -
       +					<row>

     

       1282
       1282
       -
       +						<entry><literal>$sidebar_folderindent</literal></entry>

     

       1283
       1283
       -
       +						<entry><literal>$sidebar_folder_indent</literal></entry>

     

       1284
       1284
       -
       +					</row>

     

       1285
       1285
       -
       +					<row>

     

       1286
       1286
       -
       +						<entry><literal>$sidebar_indentstr</literal></entry>

     

       1287
       1287
       -
       +						<entry><literal>$sidebar_indent_string</literal></entry>

     

       1288
       1288
       -
       +					</row>

     

       1289
       1289
       -
       +					<row>

     

       1290
       1290
       -
       +						<entry><literal>$sidebar_newmail_only</literal></entry>

     

       1291
       1291
       -
       +						<entry><literal>$sidebar_new_mail_only</literal></entry>

     

       1292
       1292
       -
       +					</row>

     

       1293
       1293
       -
       +					<row>

     

       1294
       1294
       -
       +						<entry><literal>$sidebar_refresh</literal></entry>

     

       1295
       1295
       -
       +						<entry><literal>$sidebar_refresh_time</literal></entry>

     

       1296
       1296
       -
       +					</row>

     

       1297
       1297
       -
       +					<row>

     

       1298
       1298
       -
       +						<entry><literal>$sidebar_shortpath</literal></entry>

     

       1299
       1299
       -
       +						<entry><literal>$sidebar_short_path</literal></entry>

     

       1300
       1300
       -
       +					</row>

     

       1301
       1301
       -
       +					<row>

     

       1302
       1302
       -
       +						<entry><literal>$sidebar_sort</literal></entry>

     

       1303
       1303
       -
       +						<entry><literal>$sidebar_sort_method</literal></entry>

     

       1304
       1304
       -
       +					</row>

     

       1305
       1305
       -
       +					<row>

     

       1306
       1306
       -
       +						<entry><literal>&lt;sidebar-scroll-down&gt;</literal></entry>

     

       1307
       1307
       -
       +						<entry><literal>&lt;sidebar-page-down&gt;</literal></entry>

     

       1308
       1308
       -
       +					</row>

     

       1309
       1309
       -
       +					<row>

     

       1310
       1310
       -
       +						<entry><literal>&lt;sidebar-scroll-up&gt;</literal></entry>

     

       1311
       1311
       -
       +						<entry><literal>&lt;sidebar-page-up&gt;</literal></entry>

     

       1312
       1312
       -
       +					</row>

     

       1313
       1313
       -
       +				</tbody>

     

       1314
       1314
       -
       +			</tgroup>

     

       1315
       1315
       -
       +		</table>

     

       1316
       1316
       -
       +	</sect3>

     

       1317
       1317
       -
       +</sect2>

     

       1318
       1318
       -
       +

     

       1319
       1319
       -
        <sect2 id="intro-help">

     

       1320
       1320
       -
        <title>Help</title>

     

       1321
       1321
       -
        

     

       1322
       1322
       -
       @@ -6773,6 +7390,17 @@

     

       1323
       1323
       -
        </para>

     

       1324
       1324
       -
        

     

       1325
       1325
       -
        <para>

     

       1326
       1326
       -
       +Mutt will set the <literal>COLUMNS</literal> environment variable to

     

       1327
       1327
       -
       +the width of the pager.  Some programs make use of this environment

     

       1328
       1328
       -
       +variable automatically.  Others provide a command line argument that

     

       1329
       1329
       -
       +can use this to set the output width:

     

       1330
       1330
       -
       +</para>

     

       1331
       1331
       -
       +

     

       1332
       1332
       -
       +<screen>

     

       1333
       1333
       -
       +text/html; lynx -dump -width ${COLUMNS:-80} %s; copiousoutput

     

       1334
       1334
       -
       +</screen>

     

       1335
       1335
       -
       +

     

       1336
       1336
       -
       +<para>

     

       1337
       1337
       -
        Note that when using the built-in pager, <emphasis>only</emphasis>

     

       1338
       1338
       -
        entries with this flag will be considered a handler for a MIME type

     

       1339
       1339
       -
        &mdash; all other entries will be ignored.

     

       1340
       1340
       -
       @@ -7467,6 +8095,16 @@

     

       1341
       1341
       -
        

     

       1342
       1342
       -
        </sect2>

     

       1343
       1343
       -
        

     

       1344
       1344
       -
       +<sect2 id="mutt-patches">

     

       1345
       1345
       -
       +<title>Mutt Patches</title>

     

       1346
       1346
       -
       +<para>

     

       1347
       1347
       -
       +Mutt may also be <quote>patched</quote> to support smaller features.

     

       1348
       1348
       -
       +These patches should add a free-form string to the end Mutt's version string.

     

       1349
       1349
       -
       +Running <literal>mutt -v</literal> might show:

     

       1350
       1350
       -
       +<screen>patch-1.6.1.sidebar.20160502</screen>

     

       1351
       1351
       -
       +</para>

     

       1352
       1352
       -
       +</sect2>

     

       1353
       1353
       -
       +

     

       1354
       1354
       -
        <sect2 id="url-syntax">

     

       1355
       1355
       -
        <title>URL Syntax</title>

     

       1356
       1356
       -
        

     

       1357
       1357
       -
       @@ -8081,6 +8719,469 @@

     

       1358
       1358
       -
        

     

       1359
       1359
       -
        </sect1>

     

       1360
       1360
       -
        

     

       1361
       1361
       -
       +<sect1 id="sidebar">

     

       1362
       1362
       -
       +	<title>Sidebar Patch</title>

     

       1363
       1363
       -
       +	<subtitle>Overview of mailboxes</subtitle>

     

       1364
       1364
       -
       +

     

       1365
       1365
       -
       +	<sect2 id="sidebar-patch">

     

       1366
       1366
       -
       +		<title>Patch</title>

     

       1367
       1367
       -
       +

     

       1368
       1368
       -
       +		<para>

     

       1369
       1369
       -
       +			To check if Mutt supports <quote>Sidebar</quote>, look for

     

       1370
       1370
       -
       +			<quote>+USE_SIDEBAR</quote> in the mutt version.

     

       1371
       1371
       -
       +			See: <xref linkend="compile-time-features"/>.

     

       1372
       1372
       -
       +		</para>

     

       1373
       1373
       -
       +

     

       1374
       1374
       -
       +		<itemizedlist>

     

       1375
       1375
       -
       +			<title>Dependencies:</title>

     

       1376
       1376
       -
       +			<listitem><para>mutt-1.6.1</para></listitem>

     

       1377
       1377
       -
       +		</itemizedlist>

     

       1378
       1378
       -
       +

     

       1379
       1379
       -
       +		<para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>

     

       1380
       1380
       -
       +	</sect2>

     

       1381
       1381
       -
       +

     

       1382
       1382
       -
       +	<sect2 id="sidebar-intro">

     

       1383
       1383
       -
       +		<title>Introduction</title>

     

       1384
       1384
       -
       +

     

       1385
       1385
       -
       +		<para>

     

       1386
       1386
       -
       +			The Sidebar shows a list of all your mailboxes.  The list can be

     

       1387
       1387
       -
       +			turned on and off, it can be themed and the list style can be

     

       1388
       1388
       -
       +			configured.

     

       1389
       1389
       -
       +		</para>

     

       1390
       1390
       -
       +

     

       1391
       1391
       -
       +		<para>

     

       1392
       1392
       -
       +			This part of the manual is a reference guide.

     

       1393
       1393
       -
       +			If you want a simple introduction with examples see the

     

       1394
       1394
       -
       +			<link linkend="intro-sidebar">Sidebar Howto</link>.

     

       1395
       1395
       -
       +			If you just want to get started, you could use the sample

     

       1396
       1396
       -
       +			<link linkend="sidebar-muttrc">Sidebar muttrc</link>.

     

       1397
       1397
       -
       +		</para>

     

       1398
       1398
       -
       +

     

       1399
       1399
       -
       +		<para>

     

       1400
       1400
       -
       +			This version of Sidebar is based on Terry Chan's

     

       1401
       1401
       -
       +			<ulink url="http://www.lunar-linux.org/mutt-sidebar/">2015-11-11 release</ulink>.

     

       1402
       1402
       -
       +			It contains many

     

       1403
       1403
       -
       +			<emphasis role="bold"><link linkend="intro-sidebar-features">new features</link></emphasis>,

     

       1404
       1404
       -
       +			lots of

     

       1405
       1405
       -
       +			<emphasis role="bold"><link linkend="intro-sidebar-bugfixes">bugfixes</link></emphasis>.

     

       1406
       1406
       -
       +		</para>

     

       1407
       1407
       -
       +	</sect2>

     

       1408
       1408
       -
       +

     

       1409
       1409
       -
       +	<sect2 id="sidebar-variables">

     

       1410
       1410
       -
       +		<title>Variables</title>

     

       1411
       1411
       -
       +

     

       1412
       1412
       -
       +		<table id="table-sidebar-variables">

     

       1413
       1413
       -
       +			<title>Sidebar Variables</title>

     

       1414
       1414
       -
       +			<tgroup cols="3">

     

       1415
       1415
       -
       +				<thead>

     

       1416
       1416
       -
       +					<row>

     

       1417
       1417
       -
       +						<entry>Name</entry>

     

       1418
       1418
       -
       +						<entry>Type</entry>

     

       1419
       1419
       -
       +						<entry>Default</entry>

     

       1420
       1420
       -
       +					</row>

     

       1421
       1421
       -
       +				</thead>

     

       1422
       1422
       -
       +				<tbody>

     

       1423
       1423
       -
       +					<row>

     

       1424
       1424
       -
       +						<entry><literal>sidebar_delim_chars</literal></entry>

     

       1425
       1425
       -
       +						<entry>string</entry>

     

       1426
       1426
       -
       +						<entry><literal>/.</literal></entry>

     

       1427
       1427
       -
       +					</row>

     

       1428
       1428
       -
       +					<row>

     

       1429
       1429
       -
       +						<entry><literal>sidebar_divider_char</literal></entry>

     

       1430
       1430
       -
       +						<entry>string</entry>

     

       1431
       1431
       -
       +						<entry><literal>|</literal></entry>

     

       1432
       1432
       -
       +					</row>

     

       1433
       1433
       -
       +					<row>

     

       1434
       1434
       -
       +						<entry><literal>sidebar_folder_indent</literal></entry>

     

       1435
       1435
       -
       +						<entry>boolean</entry>

     

       1436
       1436
       -
       +						<entry><literal>no</literal></entry>

     

       1437
       1437
       -
       +					</row>

     

       1438
       1438
       -
       +					<row>

     

       1439
       1439
       -
       +						<entry><literal>sidebar_format</literal></entry>

     

       1440
       1440
       -
       +						<entry>string</entry>

     

       1441
       1441
       -
       +						<entry><literal>%B%?F? [%F]?%* %?N?%N/?%S</literal></entry>

     

       1442
       1442
       -
       +					</row>

     

       1443
       1443
       -
       +					<row>

     

       1444
       1444
       -
       +						<entry><literal>sidebar_indent_string</literal></entry>

     

       1445
       1445
       -
       +						<entry>string</entry>

     

       1446
       1446
       -
       +						<entry><literal>&nbsp;&nbsp;</literal> (two spaces)</entry>

     

       1447
       1447
       -
       +					</row>

     

       1448
       1448
       -
       +					<row>

     

       1449
       1449
       -
       +						<entry><literal>sidebar_new_mail_only</literal></entry>

     

       1450
       1450
       -
       +						<entry>boolean</entry>

     

       1451
       1451
       -
       +						<entry><literal>no</literal></entry>

     

       1452
       1452
       -
       +					</row>

     

       1453
       1453
       -
       +					<row>

     

       1454
       1454
       -
       +						<entry><literal>sidebar_next_new_wrap</literal></entry>

     

       1455
       1455
       -
       +						<entry>boolean</entry>

     

       1456
       1456
       -
       +						<entry><literal>no</literal></entry>

     

       1457
       1457
       -
       +					</row>

     

       1458
       1458
       -
       +					<row>

     

       1459
       1459
       -
       +						<entry><literal>sidebar_refresh_time</literal></entry>

     

       1460
       1460
       -
       +						<entry>number</entry>

     

       1461
       1461
       -
       +						<entry><literal>60</literal></entry>

     

       1462
       1462
       -
       +					</row>

     

       1463
       1463
       -
       +					<row>

     

       1464
       1464
       -
       +						<entry><literal>sidebar_short_path</literal></entry>

     

       1465
       1465
       -
       +						<entry>boolean</entry>

     

       1466
       1466
       -
       +						<entry><literal>no</literal></entry>

     

       1467
       1467
       -
       +					</row>

     

       1468
       1468
       -
       +					<row>

     

       1469
       1469
       -
       +						<entry><literal>sidebar_sort_method</literal></entry>

     

       1470
       1470
       -
       +						<entry>enum</entry>

     

       1471
       1471
       -
       +						<entry><literal>SORT_ORDER</literal></entry>

     

       1472
       1472
       -
       +					</row>

     

       1473
       1473
       -
       +					<row>

     

       1474
       1474
       -
       +						<entry><literal>sidebar_visible</literal></entry>

     

       1475
       1475
       -
       +						<entry>boolean</entry>

     

       1476
       1476
       -
       +						<entry><literal>no</literal></entry>

     

       1477
       1477
       -
       +					</row>

     

       1478
       1478
       -
       +					<row>

     

       1479
       1479
       -
       +						<entry><literal>sidebar_whitelist</literal></entry>

     

       1480
       1480
       -
       +						<entry>list</entry>

     

       1481
       1481
       -
       +						<entry>(empty)</entry>

     

       1482
       1482
       -
       +					</row>

     

       1483
       1483
       -
       +					<row>

     

       1484
       1484
       -
       +						<entry><literal>sidebar_width</literal></entry>

     

       1485
       1485
       -
       +						<entry>number</entry>

     

       1486
       1486
       -
       +						<entry><literal>20</literal></entry>

     

       1487
       1487
       -
       +					</row>

     

       1488
       1488
       -
       +				</tbody>

     

       1489
       1489
       -
       +			</tgroup>

     

       1490
       1490
       -
       +		</table>

     

       1491
       1491
       -
       +	</sect2>

     

       1492
       1492
       -
       +

     

       1493
       1493
       -
       +	<sect2 id="sidebar-functions">

     

       1494
       1494
       -
       +		<title>Functions</title>

     

       1495
       1495
       -
       +

     

       1496
       1496
       -
       +		<para>

     

       1497
       1497
       -
       +			Sidebar adds the following functions to Mutt.

     

       1498
       1498
       -
       +			By default, none of them are bound to keys.

     

       1499
       1499
       -
       +		</para>

     

       1500
       1500
       -
       +

     

       1501
       1501
       -
       +		<table id="table-sidebar-functions">

     

       1502
       1502
       -
       +			<title>Sidebar Functions</title>

     

       1503
       1503
       -
       +			<tgroup cols="3">

     

       1504
       1504
       -
       +				<thead>

     

       1505
       1505
       -
       +					<row>

     

       1506
       1506
       -
       +						<entry>Menus</entry>

     

       1507
       1507
       -
       +						<entry>Function</entry>

     

       1508
       1508
       -
       +						<entry>Description</entry>

     

       1509
       1509
       -
       +					</row>

     

       1510
       1510
       -
       +				</thead>

     

       1511
       1511
       -
       +				<tbody>

     

       1512
       1512
       -
       +					<row>

     

       1513
       1513
       -
       +						<entry>index,pager</entry>

     

       1514
       1514
       -
       +						<entry><literal>&lt;sidebar-next&gt;</literal></entry>

     

       1515
       1515
       -
       +						<entry>Move the highlight to next mailbox</entry>

     

       1516
       1516
       -
       +					</row>

     

       1517
       1517
       -
       +					<row>

     

       1518
       1518
       -
       +						<entry>index,pager</entry>

     

       1519
       1519
       -
       +						<entry><literal>&lt;sidebar-next-new&gt;</literal></entry>

     

       1520
       1520
       -
       +						<entry>Move the highlight to next mailbox with new mail</entry>

     

       1521
       1521
       -
       +					</row>

     

       1522
       1522
       -
       +					<row>

     

       1523
       1523
       -
       +						<entry>index,pager</entry>

     

       1524
       1524
       -
       +						<entry><literal>&lt;sidebar-open&gt;</literal></entry>

     

       1525
       1525
       -
       +						<entry>Open highlighted mailbox</entry>

     

       1526
       1526
       -
       +					</row>

     

       1527
       1527
       -
       +					<row>

     

       1528
       1528
       -
       +						<entry>index,pager</entry>

     

       1529
       1529
       -
       +						<entry><literal>&lt;sidebar-page-down&gt;</literal></entry>

     

       1530
       1530
       -
       +						<entry>Scroll the Sidebar down 1 page</entry>

     

       1531
       1531
       -
       +					</row>

     

       1532
       1532
       -
       +					<row>

     

       1533
       1533
       -
       +						<entry>index,pager</entry>

     

       1534
       1534
       -
       +						<entry><literal>&lt;sidebar-page-up&gt;</literal></entry>

     

       1535
       1535
       -
       +						<entry>Scroll the Sidebar up 1 page</entry>

     

       1536
       1536
       -
       +					</row>

     

       1537
       1537
       -
       +					<row>

     

       1538
       1538
       -
       +						<entry>index,pager</entry>

     

       1539
       1539
       -
       +						<entry><literal>&lt;sidebar-prev&gt;</literal></entry>

     

       1540
       1540
       -
       +						<entry>Move the highlight to previous mailbox</entry>

     

       1541
       1541
       -
       +					</row>

     

       1542
       1542
       -
       +					<row>

     

       1543
       1543
       -
       +						<entry>index,pager</entry>

     

       1544
       1544
       -
       +						<entry><literal>&lt;sidebar-prev-new&gt;</literal></entry>

     

       1545
       1545
       -
       +						<entry>Move the highlight to previous mailbox with new mail</entry>

     

       1546
       1546
       -
       +					</row>

     

       1547
       1547
       -
       +					<row>

     

       1548
       1548
       -
       +						<entry>index,pager</entry>

     

       1549
       1549
       -
       +						<entry><literal>&lt;sidebar-toggle-visible&gt;</literal></entry>

     

       1550
       1550
       -
       +						<entry>Make the Sidebar (in)visible</entry>

     

       1551
       1551
       -
       +					</row>

     

       1552
       1552
       -
       +				</tbody>

     

       1553
       1553
       -
       +			</tgroup>

     

       1554
       1554
       -
       +		</table>

     

       1555
       1555
       -
       +	</sect2>

     

       1556
       1556
       -
       +

     

       1557
       1557
       -
       +	<sect2 id="sidebar-commands">

     

       1558
       1558
       -
       +		<title>Commands</title>

     

       1559
       1559
       -
       +		<cmdsynopsis>

     

       1560
       1560
       -
       +			<command>sidebar_whitelist</command>

     

       1561
       1561
       -
       +			<arg choice="plain">

     

       1562
       1562
       -
       +				<replaceable class="parameter">mailbox</replaceable>

     

       1563
       1563
       -
       +			</arg>

     

       1564
       1564
       -
       +			<arg choice="opt" rep="repeat">

     

       1565
       1565
       -
       +				<replaceable class="parameter">mailbox</replaceable>

     

       1566
       1566
       -
       +			</arg>

     

       1567
       1567
       -
       +		</cmdsynopsis>

     

       1568
       1568
       -
       +	</sect2>

     

       1569
       1569
       -
       +

     

       1570
       1570
       -
       +	<sect2 id="sidebar-colors">

     

       1571
       1571
       -
       +		<title>Colors</title>

     

       1572
       1572
       -
       +

     

       1573
       1573
       -
       +		<table id="table-sidebar-colors">

     

       1574
       1574
       -
       +			<title>Sidebar Colors</title>

     

       1575
       1575
       -
       +			<tgroup cols="3">

     

       1576
       1576
       -
       +				<thead>

     

       1577
       1577
       -
       +					<row>

     

       1578
       1578
       -
       +						<entry>Name</entry>

     

       1579
       1579
       -
       +						<entry>Default Color</entry>

     

       1580
       1580
       -
       +						<entry>Description</entry>

     

       1581
       1581
       -
       +					</row>

     

       1582
       1582
       -
       +				</thead>

     

       1583
       1583
       -
       +				<tbody>

     

       1584
       1584
       -
       +					<row>

     

       1585
       1585
       -
       +						<entry><literal>sidebar_divider</literal></entry>

     

       1586
       1586
       -
       +						<entry>default</entry>

     

       1587
       1587
       -
       +						<entry>The dividing line between the Sidebar and the Index/Pager panels</entry>

     

       1588
       1588
       -
       +					</row>

     

       1589
       1589
       -
       +					<row>

     

       1590
       1590
       -
       +						<entry><literal>sidebar_flagged</literal></entry>

     

       1591
       1591
       -
       +						<entry>default</entry>

     

       1592
       1592
       -
       +						<entry>Mailboxes containing flagged mail</entry>

     

       1593
       1593
       -
       +					</row>

     

       1594
       1594
       -
       +					<row>

     

       1595
       1595
       -
       +						<entry><literal>sidebar_highlight</literal></entry>

     

       1596
       1596
       -
       +						<entry>underline</entry>

     

       1597
       1597
       -
       +						<entry>Cursor to select a mailbox</entry>

     

       1598
       1598
       -
       +					</row>

     

       1599
       1599
       -
       +					<row>

     

       1600
       1600
       -
       +						<entry><literal>sidebar_indicator</literal></entry>

     

       1601
       1601
       -
       +						<entry>mutt <literal>indicator</literal></entry>

     

       1602
       1602
       -
       +						<entry>The mailbox open in the Index panel</entry>

     

       1603
       1603
       -
       +					</row>

     

       1604
       1604
       -
       +					<row>

     

       1605
       1605
       -
       +						<entry><literal>sidebar_new</literal></entry>

     

       1606
       1606
       -
       +						<entry>default</entry>

     

       1607
       1607
       -
       +						<entry>Mailboxes containing new mail</entry>

     

       1608
       1608
       -
       +					</row>

     

       1609
       1609
       -
       +					<row>

     

       1610
       1610
       -
       +						<entry><literal>sidebar_spoolfile</literal></entry>

     

       1611
       1611
       -
       +						<entry>default</entry>

     

       1612
       1612
       -
       +						<entry>Mailbox that receives incoming mail</entry>

     

       1613
       1613
       -
       +					</row>

     

       1614
       1614
       -
       +				</tbody>

     

       1615
       1615
       -
       +			</tgroup>

     

       1616
       1616
       -
       +		</table>

     

       1617
       1617
       -
       +

     

       1618
       1618
       -
       +		If the <literal>sidebar_indicator</literal> color isn't set, then the default Mutt

     

       1619
       1619
       -
       +		indicator color will be used (the color used in the index panel).

     

       1620
       1620
       -
       +	</sect2>

     

       1621
       1621
       -
       +

     

       1622
       1622
       -
       +	<sect2 id="sidebar-sort">

     

       1623
       1623
       -
       +		<title>Sort</title>

     

       1624
       1624
       -
       +

     

       1625
       1625
       -
       +		<table id="table-sidebar-sort">

     

       1626
       1626
       -
       +			<title>Sidebar Sort</title>

     

       1627
       1627
       -
       +			<tgroup cols="2">

     

       1628
       1628
       -
       +				<thead>

     

       1629
       1629
       -
       +					<row>

     

       1630
       1630
       -
       +						<entry>Sort</entry>

     

       1631
       1631
       -
       +						<entry>Description</entry>

     

       1632
       1632
       -
       +					</row>

     

       1633
       1633
       -
       +				</thead>

     

       1634
       1634
       -
       +				<tbody>

     

       1635
       1635
       -
       +					<row>

     

       1636
       1636
       -
       +						<entry><literal>alpha</literal></entry>

     

       1637
       1637
       -
       +						<entry>Alphabetically by path</entry>

     

       1638
       1638
       -
       +					</row>

     

       1639
       1639
       -
       +					<row>

     

       1640
       1640
       -
       +						<entry><literal>count</literal></entry>

     

       1641
       1641
       -
       +						<entry>Total number of messages</entry>

     

       1642
       1642
       -
       +					</row>

     

       1643
       1643
       -
       +					<row>

     

       1644
       1644
       -
       +						<entry><literal>flagged</literal></entry>

     

       1645
       1645
       -
       +						<entry>Number of flagged messages</entry>

     

       1646
       1646
       -
       +					</row>

     

       1647
       1647
       -
       +					<row>

     

       1648
       1648
       -
       +						<entry><literal>name</literal></entry>

     

       1649
       1649
       -
       +						<entry>Alphabetically by path</entry>

     

       1650
       1650
       -
       +					</row>

     

       1651
       1651
       -
       +					<row>

     

       1652
       1652
       -
       +						<entry><literal>new</literal></entry>

     

       1653
       1653
       -
       +						<entry>Number of new messages</entry>

     

       1654
       1654
       -
       +					</row>

     

       1655
       1655
       -
       +					<row>

     

       1656
       1656
       -
       +						<entry><literal>path</literal></entry>

     

       1657
       1657
       -
       +						<entry>Alphabetically by path</entry>

     

       1658
       1658
       -
       +					</row>

     

       1659
       1659
       -
       +					<row>

     

       1660
       1660
       -
       +						<entry><literal>unsorted</literal></entry>

     

       1661
       1661
       -
       +						<entry>Do not resort the paths</entry>

     

       1662
       1662
       -
       +					</row>

     

       1663
       1663
       -
       +				</tbody>

     

       1664
       1664
       -
       +			</tgroup>

     

       1665
       1665
       -
       +		</table>

     

       1666
       1666
       -
       +	</sect2>

     

       1667
       1667
       -
       +

     

       1668
       1668
       -
       +	<sect2 id="sidebar-muttrc">

     

       1669
       1669
       -
       +		<title>Muttrc</title>

     

       1670
       1670
       -
       +<screen>

     

       1671
       1671
       -
       +<emphasis role="comment"># This is a complete list of sidebar-related configuration.

     

       1672
       1672
       -
       + 

     

       1673
       1673
       -
       +# --------------------------------------------------------------------------

     

       1674
       1674
       -
       +# VARIABLES - shown with their default values

     

       1675
       1675
       -
       +# --------------------------------------------------------------------------

     

       1676
       1676
       -
       + 

     

       1677
       1677
       -
       +# Should the Sidebar be shown?</emphasis>

     

       1678
       1678
       -
       +set sidebar_visible = no

     

       1679
       1679
       -
       + 

     

       1680
       1680
       -
       +<emphasis role="comment"># How wide should the Sidebar be in screen columns?

     

       1681
       1681
       -
       +# Note: Some characters, e.g. Chinese, take up two columns each.</emphasis>

     

       1682
       1682
       -
       +set sidebar_width = 20

     

       1683
       1683
       -
       + 

     

       1684
       1684
       -
       +<emphasis role="comment"># Should the mailbox paths be abbreviated?</emphasis>

     

       1685
       1685
       -
       +set sidebar_short_path = no

     

       1686
       1686
       -
       + 

     

       1687
       1687
       -
       +<emphasis role="comment"># When abbreviating mailbox path names, use any of these characters as path

     

       1688
       1688
       -
       +# separators.  Only the part after the last separators will be shown.

     

       1689
       1689
       -
       +# For file folders '/' is good.  For IMAP folders, often '.' is useful.</emphasis>

     

       1690
       1690
       -
       +set sidebar_delim_chars = '/.'

     

       1691
       1691
       -
       + 

     

       1692
       1692
       -
       +<emphasis role="comment"># If the mailbox path is abbreviated, should it be indented?</emphasis>

     

       1693
       1693
       -
       +set sidebar_folder_indent = no

     

       1694
       1694
       -
       + 

     

       1695
       1695
       -
       +<emphasis role="comment"># Indent mailbox paths with this string.</emphasis>

     

       1696
       1696
       -
       +set sidebar_indent_string = '  '

     

       1697
       1697
       -
       + 

     

       1698
       1698
       -
       +<emphasis role="comment"># Make the Sidebar only display mailboxes that contain new, or flagged,

     

       1699
       1699
       -
       +# mail.</emphasis>

     

       1700
       1700
       -
       +set sidebar_new_mail_only = no

     

       1701
       1701
       -
       + 

     

       1702
       1702
       -
       +<emphasis role="comment"># Any mailboxes that are whitelisted will always be visible, even if the

     

       1703
       1703
       -
       +# sidebar_new_mail_only option is enabled.</emphasis>

     

       1704
       1704
       -
       +sidebar_whitelist '/home/user/mailbox1'

     

       1705
       1705
       -
       +sidebar_whitelist '/home/user/mailbox2'

     

       1706
       1706
       -
       + 

     

       1707
       1707
       -
       +<emphasis role="comment"># When searching for mailboxes containing new mail, should the search wrap

     

       1708
       1708
       -
       +# around when it reaches the end of the list?</emphasis>

     

       1709
       1709
       -
       +set sidebar_next_new_wrap = no

     

       1710
       1710
       -
       + 

     

       1711
       1711
       -
       +<emphasis role="comment"># The character to use as the divider between the Sidebar and the other Mutt

     

       1712
       1712
       -
       +# panels.

     

       1713
       1713
       -
       +# Note: Only the first character of this string is used.</emphasis>

     

       1714
       1714
       -
       +set sidebar_divider_char = '|'

     

       1715
       1715
       -
       + 

     

       1716
       1716
       -
       +<emphasis role="comment"># Display the Sidebar mailboxes using this format string.</emphasis>

     

       1717
       1717
       -
       +set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'

     

       1718
       1718
       -
       + 

     

       1719
       1719
       -
       +<emphasis role="comment"># Sidebar will not refresh its list of mailboxes any more frequently than

     

       1720
       1720
       -
       +# this number of seconds.  This will help reduce disk/network traffic.</emphasis>

     

       1721
       1721
       -
       +set sidebar_refresh_time = 60

     

       1722
       1722
       -
       + 

     

       1723
       1723
       -
       +<emphasis role="comment"># Sort the mailboxes in the Sidebar using this method:

     

       1724
       1724
       -
       +#       count    - total number of messages

     

       1725
       1725
       -
       +#       flagged  - number of flagged messages

     

       1726
       1726
       -
       +#       new      - number of new messages

     

       1727
       1727
       -
       +#       path     - mailbox path

     

       1728
       1728
       -
       +#       unsorted - do not sort the mailboxes</emphasis>

     

       1729
       1729
       -
       +set sidebar_sort_method = 'unsorted'

     

       1730
       1730
       -
       + 

     

       1731
       1731
       -
       +<emphasis role="comment"># --------------------------------------------------------------------------

     

       1732
       1732
       -
       +# FUNCTIONS - shown with an example mapping

     

       1733
       1733
       -
       +# --------------------------------------------------------------------------

     

       1734
       1734
       -
       + 

     

       1735
       1735
       -
       +# Move the highlight to the previous mailbox</emphasis>

     

       1736
       1736
       -
       +bind index,pager \Cp sidebar-prev

     

       1737
       1737
       -
       + 

     

       1738
       1738
       -
       +<emphasis role="comment"># Move the highlight to the next mailbox</emphasis>

     

       1739
       1739
       -
       +bind index,pager \Cn sidebar-next

     

       1740
       1740
       -
       + 

     

       1741
       1741
       -
       +<emphasis role="comment"># Open the highlighted mailbox</emphasis>

     

       1742
       1742
       -
       +bind index,pager \Co sidebar-open

     

       1743
       1743
       -
       + 

     

       1744
       1744
       -
       +<emphasis role="comment"># Move the highlight to the previous page

     

       1745
       1745
       -
       +# This is useful if you have a LOT of mailboxes.</emphasis>

     

       1746
       1746
       -
       +bind index,pager &lt;F3&gt; sidebar-page-up

     

       1747
       1747
       -
       + 

     

       1748
       1748
       -
       +<emphasis role="comment"># Move the highlight to the next page

     

       1749
       1749
       -
       +# This is useful if you have a LOT of mailboxes.</emphasis>

     

       1750
       1750
       -
       +bind index,pager &lt;F4&gt; sidebar-page-down

     

       1751
       1751
       -
       + 

     

       1752
       1752
       -
       +<emphasis role="comment"># Move the highlight to the previous mailbox containing new, or flagged,

     

       1753
       1753
       -
       +# mail.</emphasis>

     

       1754
       1754
       -
       +bind index,pager &lt;F5&gt; sidebar-prev-new

     

       1755
       1755
       -
       + 

     

       1756
       1756
       -
       +<emphasis role="comment"># Move the highlight to the next mailbox containing new, or flagged, mail.</emphasis>

     

       1757
       1757
       -
       +bind index,pager &lt;F6&gt; sidebar-next-new

     

       1758
       1758
       -
       + 

     

       1759
       1759
       -
       +<emphasis role="comment"># Toggle the visibility of the Sidebar.</emphasis>

     

       1760
       1760
       -
       +bind index,pager B sidebar-toggle-visible

     

       1761
       1761
       -
       + 

     

       1762
       1762
       -
       +<emphasis role="comment"># --------------------------------------------------------------------------

     

       1763
       1763
       -
       +# COLORS - some unpleasant examples are given

     

       1764
       1764
       -
       +# --------------------------------------------------------------------------

     

       1765
       1765
       -
       +# Note: All color operations are of the form:

     

       1766
       1766
       -
       +#       color OBJECT FOREGROUND BACKGROUND

     

       1767
       1767
       -
       + 

     

       1768
       1768
       -
       +# Color of the current, open, mailbox

     

       1769
       1769
       -
       +# Note: This is a general Mutt option which colors all selected items.</emphasis>

     

       1770
       1770
       -
       +color indicator cyan black

     

       1771
       1771
       -
       + 

     

       1772
       1772
       -
       +<emphasis role="comment"># Color of the highlighted, but not open, mailbox.</emphasis>

     

       1773
       1773
       -
       +color sidebar_highlight black color8

     

       1774
       1774
       -
       + 

     

       1775
       1775
       -
       +<emphasis role="comment"># Color of the divider separating the Sidebar from Mutt panels</emphasis>

     

       1776
       1776
       -
       +color sidebar_divider color8 black

     

       1777
       1777
       -
       + 

     

       1778
       1778
       -
       +<emphasis role="comment"># Color to give mailboxes containing flagged mail</emphasis>

     

       1779
       1779
       -
       +color sidebar_flagged red black

     

       1780
       1780
       -
       + 

     

       1781
       1781
       -
       +<emphasis role="comment"># Color to give mailboxes containing new mail</emphasis>

     

       1782
       1782
       -
       +color sidebar_new green black

     

       1783
       1783
       -
       + 

     

       1784
       1784
       -
       +<emphasis role="comment"># --------------------------------------------------------------------------

     

       1785
       1785
       -
       + 

     

       1786
       1786
       -
       +# vim: syntax=muttrc</emphasis>

     

       1787
       1787
       -
       +</screen>

     

       1788
       1788
       -
       +	</sect2>

     

       1789
       1789
       -
       +

     

       1790
       1790
       -
       +	<sect2 id="sidebar-see-also">

     

       1791
       1791
       -
       +		<title>See Also</title>

     

       1792
       1792
       -
       +

     

       1793
       1793
       -
       +		<itemizedlist>

     

       1794
       1794
       -
       +			<listitem><para><link linkend="regexp">Regular Expressions</link></para></listitem>

     

       1795
       1795
       -
       +			<listitem><para><link linkend="patterns">Patterns</link></para></listitem>

     

       1796
       1796
       -
       +			<listitem><para><link linkend="color">Color command</link></para></listitem>

     

       1797
       1797
       -
       +			<listitem><para><link linkend="notmuch">notmuch patch</link></para></listitem>

     

       1798
       1798
       -
       +		</itemizedlist>

     

       1799
       1799
       -
       +	</sect2>

     

       1800
       1800
       -
       +

     

       1801
       1801
       -
       +	<sect2 id="sidebar-known-bugs">

     

       1802
       1802
       -
       +		<title>Known Bugs</title>

     

       1803
       1803
       -
       +		Unsorted isn't

     

       1804
       1804
       -
       +	</sect2>

     

       1805
       1805
       -
       +

     

       1806
       1806
       -
       +	<sect2 id="sidebar-credits">

     

       1807
       1807
       -
       +		<title>Credits</title>

     

       1808
       1808
       -
       +		<itemizedlist>

     

       1809
       1809
       -
       +		<listitem><para>Justin Hibbits <email>jrh29@po.cwru.edu</email></para></listitem>

     

       1810
       1810
       -
       +		<listitem><para>Thomer M. Gil <email>mutt@thomer.com</email></para></listitem>

     

       1811
       1811
       -
       +		<listitem><para>David Sterba <email>dsterba@suse.cz</email></para></listitem>

     

       1812
       1812
       -
       +		<listitem><para>Evgeni Golov <email>evgeni@debian.org</email></para></listitem>

     

       1813
       1813
       -
       +		<listitem><para>Fabian Groffen <email>grobian@gentoo.org</email></para></listitem>

     

       1814
       1814
       -
       +		<listitem><para>Jason DeTiberus <email>jdetiber@redhat.com</email></para></listitem>

     

       1815
       1815
       -
       +		<listitem><para>Stefan Assmann <email>sassmann@kpanic.de</email></para></listitem>

     

       1816
       1816
       -
       +		<listitem><para>Steve Kemp <email>steve@steve.org.uk</email></para></listitem>

     

       1817
       1817
       -
       +		<listitem><para>Terry Chan <email>tchan@lunar-linux.org</email></para></listitem>

     

       1818
       1818
       -
       +		<listitem><para>Tyler Earnest <email>tylere@rne.st</email></para></listitem>

     

       1819
       1819
       -
       +		<listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>

     

       1820
       1820
       -
       +		</itemizedlist>

     

       1821
       1821
       -
       +	</sect2>

     

       1822
       1822
       -
       +</sect1>

     

       1823
       1823
       -
       +

     

       1824
       1824
       -
        </chapter>

     

       1825
       1825
       -
        

     

       1826
       1826
       -
        <chapter id="security">

     

       1827
       1827
       -
       @@ -9237,6 +10338,17 @@

     

       1828
       1828
       -
        

     

       1829
       1829
       -
        <listitem>

     

       1830
       1830
       -
        <cmdsynopsis>

     

       1831
       1831
       -
       +<command><link linkend="sidebar-whitelist">sidebar_whitelist</link></command>

     

       1832
       1832
       -
       +<arg choice="plain">

     

       1833
       1833
       -
       +<replaceable class="parameter">item</replaceable>

     

       1834
       1834
       -
       +</arg>

     

       1835
       1835
       -
       +<arg choice="plain">

     

       1836
       1836
       -
       +<replaceable class="parameter">command</replaceable>

     

       1837
       1837
       -
       +</arg>

     

       1838
       1838
       -
       +</cmdsynopsis>

     

       1839
       1839
       -
       +</listitem>

     

       1840
       1840
       -
       +<listitem>

     

       1841
       1841
       -
       +<cmdsynopsis>

     

       1842
       1842
       -
        <command><link linkend="source">source</link></command>

     

       1843
       1843
       -
        <arg choice="plain">

     

       1844
       1844
       -
        <replaceable class="parameter">filename</replaceable>

     

       1845
       1845
       -
       diff -urN mutt-1.6.1/doc/mutt.css mutt-1.6.1-sidebar/doc/mutt.css

     

       1846
       1846
       -
       --- mutt-1.6.1/doc/mutt.css	2016-06-12 18:43:00.402447590 +0100

     

       1847
       1847
       -
       +++ mutt-1.6.1-sidebar/doc/mutt.css	2016-06-12 18:43:03.811500752 +0100

     

       1848
       1848
       -
       @@ -9,17 +9,24 @@

     

       1849
       1849
       -
        div.table-contents table th, div.informaltable table th {

     

       1850
       1850
       -
            font-family:sans-serif;

     

       1851
       1851
       -
            background:#d0d0d0;

     

       1852
       1852
       -
       -    font-weight:normal;

     

       1853
       1853
       -
       +    font-weight:bold;

     

       1854
       1854
       -
            vertical-align:top;

     

       1855
       1855
       -
        }

     

       1856
       1856
       -
       -div.cmdsynopsis { border-left:1px solid #707070; padding-left:5px; }

     

       1857
       1857
       -
       +div.cmdsynopsis { border-left:1px solid #707070; padding-left: 1em; }

     

       1858
       1858
       -
        li div.cmdsynopsis { border-left:none; padding-left:0px; }

     

       1859
       1859
       -
       -pre.screen, div.note { background:#f0f0f0; border:1px solid #c0c0c0; padding:5px; margin-left:2%; margin-right:2%; }

     

       1860
       1860
       -
       +li p { margin: 0; }

     

       1861
       1861
       -
       +pre.screen, div.note { border:1px solid #c0c0c0; margin-left:2%; margin-right:2%; }

     

       1862
       1862
       -
       +pre.screen { color: #ffffff; background:#000000; padding: 0.5em; }

     

       1863
       1863
       -
       +div.note { background:#ffff80; padding: 0.5em; }

     

       1864
       1864
       -
        div.example p.title { margin-left:2%; }

     

       1865
       1865
       -
        div.note h3 { font-size:small; font-style:italic; font-variant: small-caps; }

     

       1866
       1866
       -
        div.note h3:after { content: ":" }

     

       1867
       1867
       -
        div.note { margin-bottom: 5px; }

     

       1868
       1868
       -
       -.command { font-family: monospace; font-weight: normal; }

     

       1869
       1869
       -
       +div.literallayout, .command { font-family: monospace; font-weight: normal; }

     

       1870
       1870
       -
        .command strong { font-weight: normal; }

     

       1871
       1871
       -
        tr { vertical-align: top; }

     

       1872
       1872
       -
       -.comment { color:#707070; }

     

       1873
       1873
       -
       +.comment { color:#00c000; }

     

       1874
       1874
       -
       +code.literal { background: #f0f0f0; color: #000000; }

     

       1875
       1875
       -
       +span.indicator { background: #000060; color: #ffffff; }

     

       1876
       1876
       -
       +span.highlight { background: #404040; color: #ffffff; }

     

       1877
       1877
       -
       +span.reverse { background: #ffffff; color: #000000; }

     

       1878
       1878
       -
       diff -urN mutt-1.6.1/doc/muttrc.sidebar mutt-1.6.1-sidebar/doc/muttrc.sidebar

     

       1879
       1879
       -
       --- mutt-1.6.1/doc/muttrc.sidebar	1970-01-01 01:00:00.000000000 +0100

     

       1880
       1880
       -
       +++ mutt-1.6.1-sidebar/doc/muttrc.sidebar	2016-06-12 18:43:03.812500768 +0100

     

       1881
       1881
       -
       @@ -0,0 +1,116 @@

     

       1882
       1882
       -
       +# This is a complete list of sidebar-related configuration.

     

       1883
       1883
       -
       +

     

       1884
       1884
       -
       +# --------------------------------------------------------------------------

     

       1885
       1885
       -
       +# VARIABLES - shown with their default values

     

       1886
       1886
       -
       +# --------------------------------------------------------------------------

     

       1887
       1887
       -
       +

     

       1888
       1888
       -
       +# Should the Sidebar be shown?

     

       1889
       1889
       -
       +set sidebar_visible = no

     

       1890
       1890
       -
       +

     

       1891
       1891
       -
       +# How wide should the Sidebar be in screen columns?

     

       1892
       1892
       -
       +# Note: Some characters, e.g. Chinese, take up two columns each.

     

       1893
       1893
       -
       +set sidebar_width = 20

     

       1894
       1894
       -
       +

     

       1895
       1895
       -
       +# Should the mailbox paths be abbreviated?

     

       1896
       1896
       -
       +set sidebar_short_path = no

     

       1897
       1897
       -
       +

     

       1898
       1898
       -
       +# When abbreviating mailbox path names, use any of these characters as path

     

       1899
       1899
       -
       +# separators.  Only the part after the last separators will be shown.

     

       1900
       1900
       -
       +# For file folders '/' is good.  For IMAP folders, often '.' is useful.

     

       1901
       1901
       -
       +set sidebar_delim_chars = '/.'

     

       1902
       1902
       -
       +

     

       1903
       1903
       -
       +# If the mailbox path is abbreviated, should it be indented?

     

       1904
       1904
       -
       +set sidebar_folder_indent = no

     

       1905
       1905
       -
       +

     

       1906
       1906
       -
       +# Indent mailbox paths with this string.

     

       1907
       1907
       -
       +set sidebar_indent_string = '  '

     

       1908
       1908
       -
       +

     

       1909
       1909
       -
       +# Make the Sidebar only display mailboxes that contain new, or flagged,

     

       1910
       1910
       -
       +# mail.

     

       1911
       1911
       -
       +set sidebar_new_mail_only = no

     

       1912
       1912
       -
       +

     

       1913
       1913
       -
       +# Any mailboxes that are whitelisted will always be visible, even if the

     

       1914
       1914
       -
       +# sidebar_new_mail_only option is enabled.

     

       1915
       1915
       -
       +sidebar_whitelist '/home/user/mailbox1'

     

       1916
       1916
       -
       +sidebar_whitelist '/home/user/mailbox2'

     

       1917
       1917
       -
       +

     

       1918
       1918
       -
       +# When searching for mailboxes containing new mail, should the search wrap

     

       1919
       1919
       -
       +# around when it reaches the end of the list?

     

       1920
       1920
       -
       +set sidebar_next_new_wrap = no

     

       1921
       1921
       -
       +

     

       1922
       1922
       -
       +# The character to use as the divider between the Sidebar and the other Mutt

     

       1923
       1923
       -
       +# panels.

     

       1924
       1924
       -
       +# Note: Only the first character of this string is used.

     

       1925
       1925
       -
       +set sidebar_divider_char = '|'

     

       1926
       1926
       -
       +

     

       1927
       1927
       -
       +# Display the Sidebar mailboxes using this format string.

     

       1928
       1928
       -
       +set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'

     

       1929
       1929
       -
       +

     

       1930
       1930
       -
       +# Sidebar will not refresh its list of mailboxes any more frequently than

     

       1931
       1931
       -
       +# this number of seconds.  This will help reduce disk/network traffic.

     

       1932
       1932
       -
       +set sidebar_refresh_time = 60

     

       1933
       1933
       -
       +

     

       1934
       1934
       -
       +# Sort the mailboxes in the Sidebar using this method:

     

       1935
       1935
       -
       +#       count    - total number of messages

     

       1936
       1936
       -
       +#       flagged  - number of flagged messages

     

       1937
       1937
       -
       +#       new      - number of new messages

     

       1938
       1938
       -
       +#       path     - mailbox path

     

       1939
       1939
       -
       +#       unsorted - do not sort the mailboxes

     

       1940
       1940
       -
       +set sidebar_sort_method = 'unsorted'

     

       1941
       1941
       -
       +

     

       1942
       1942
       -
       +# --------------------------------------------------------------------------

     

       1943
       1943
       -
       +# FUNCTIONS - shown with an example mapping

     

       1944
       1944
       -
       +# --------------------------------------------------------------------------

     

       1945
       1945
       -
       +

     

       1946
       1946
       -
       +# Move the highlight to the previous mailbox

     

       1947
       1947
       -
       +bind index,pager \Cp sidebar-prev

     

       1948
       1948
       -
       +

     

       1949
       1949
       -
       +# Move the highlight to the next mailbox

     

       1950
       1950
       -
       +bind index,pager \Cn sidebar-next

     

       1951
       1951
       -
       +

     

       1952
       1952
       -
       +# Open the highlighted mailbox

     

       1953
       1953
       -
       +bind index,pager \Co sidebar-open

     

       1954
       1954
       -
       +

     

       1955
       1955
       -
       +# Move the highlight to the previous page

     

       1956
       1956
       -
       +# This is useful if you have a LOT of mailboxes.

     

       1957
       1957
       -
       +bind index,pager <F3> sidebar-page-up

     

       1958
       1958
       -
       +

     

       1959
       1959
       -
       +# Move the highlight to the next page

     

       1960
       1960
       -
       +# This is useful if you have a LOT of mailboxes.

     

       1961
       1961
       -
       +bind index,pager <F4> sidebar-page-down

     

       1962
       1962
       -
       +

     

       1963
       1963
       -
       +# Move the highlight to the previous mailbox containing new, or flagged,

     

       1964
       1964
       -
       +# mail.

     

       1965
       1965
       -
       +bind index,pager <F5> sidebar-prev-new

     

       1966
       1966
       -
       +

     

       1967
       1967
       -
       +# Move the highlight to the next mailbox containing new, or flagged, mail.

     

       1968
       1968
       -
       +bind index,pager <F6> sidebar-next-new

     

       1969
       1969
       -
       +

     

       1970
       1970
       -
       +# Toggle the visibility of the Sidebar.

     

       1971
       1971
       -
       +bind index,pager B sidebar-toggle-visible

     

       1972
       1972
       -
       +

     

       1973
       1973
       -
       +# --------------------------------------------------------------------------

     

       1974
       1974
       -
       +# COLORS - some unpleasant examples are given

     

       1975
       1975
       -
       +# --------------------------------------------------------------------------

     

       1976
       1976
       -
       +# Note: All color operations are of the form:

     

       1977
       1977
       -
       +#       color OBJECT FOREGROUND BACKGROUND

     

       1978
       1978
       -
       +

     

       1979
       1979
       -
       +# Color of the current, open, mailbox

     

       1980
       1980
       -
       +# Note: This is a general Mutt option which colors all selected items.

     

       1981
       1981
       -
       +color indicator cyan black

     

       1982
       1982
       -
       +

     

       1983
       1983
       -
       +# Color of the highlighted, but not open, mailbox.

     

       1984
       1984
       -
       +color sidebar_highlight black color8

     

       1985
       1985
       -
       +

     

       1986
       1986
       -
       +# Color of the divider separating the Sidebar from Mutt panels

     

       1987
       1987
       -
       +color sidebar_divider color8 black

     

       1988
       1988
       -
       +

     

       1989
       1989
       -
       +# Color to give mailboxes containing flagged mail

     

       1990
       1990
       -
       +color sidebar_flagged red black

     

       1991
       1991
       -
       +

     

       1992
       1992
       -
       +# Color to give mailboxes containing new mail

     

       1993
       1993
       -
       +color sidebar_new green black

     

       1994
       1994
       -
       +

     

       1995
       1995
       -
       +# --------------------------------------------------------------------------

     

       1996
       1996
       -
       +

     

       1997
       1997
       -
       +# vim: syntax=muttrc

     

       1998
       1998
       -
       diff -urN mutt-1.6.1/doc/vimrc.sidebar mutt-1.6.1-sidebar/doc/vimrc.sidebar

     

       1999
       1999
       -
       --- mutt-1.6.1/doc/vimrc.sidebar	1970-01-01 01:00:00.000000000 +0100

     

       2000
       2000
       -
       +++ mutt-1.6.1-sidebar/doc/vimrc.sidebar	2016-06-12 18:43:03.813500783 +0100

     

       2001
       2001
       -
       @@ -0,0 +1,35 @@

     

       2002
       2002
       -
       +" Vim syntax file for the mutt sidebar patch

     

       2003
       2003
       -
       +

     

       2004
       2004
       -
       +syntax keyword muttrcVarBool    skipwhite contained sidebar_folder_indent nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2005
       2005
       -
       +syntax keyword muttrcVarBool    skipwhite contained sidebar_new_mail_only nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2006
       2006
       -
       +syntax keyword muttrcVarBool    skipwhite contained sidebar_next_new_wrap nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2007
       2007
       -
       +syntax keyword muttrcVarBool    skipwhite contained sidebar_short_path    nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2008
       2008
       -
       +syntax keyword muttrcVarBool    skipwhite contained sidebar_visible       nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2009
       2009
       -
       +

     

       2010
       2010
       -
       +syntax keyword muttrcVarNum     skipwhite contained sidebar_refresh_time  nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2011
       2011
       -
       +syntax keyword muttrcVarNum     skipwhite contained sidebar_width         nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr

     

       2012
       2012
       -
       +

     

       2013
       2013
       -
       +syntax keyword muttrcVarStr     contained skipwhite sidebar_divider_char  nextgroup=muttrcVarEqualsIdxFmt

     

       2014
       2014
       -
       +syntax keyword muttrcVarStr     contained skipwhite sidebar_delim_chars   nextgroup=muttrcVarEqualsIdxFmt

     

       2015
       2015
       -
       +syntax keyword muttrcVarStr     contained skipwhite sidebar_format        nextgroup=muttrcVarEqualsIdxFmt

     

       2016
       2016
       -
       +syntax keyword muttrcVarStr     contained skipwhite sidebar_indent_string nextgroup=muttrcVarEqualsIdxFmt

     

       2017
       2017
       -
       +syntax keyword muttrcVarStr     contained skipwhite sidebar_sort_method   nextgroup=muttrcVarEqualsIdxFmt

     

       2018
       2018
       -
       +

     

       2019
       2019
       -
       +syntax keyword muttrcCommand    sidebar_whitelist

     

       2020
       2020
       -
       +

     

       2021
       2021
       -
       +syntax match muttrcFunction     contained "\<sidebar-next\>"

     

       2022
       2022
       -
       +syntax match muttrcFunction     contained "\<sidebar-next-new\>"

     

       2023
       2023
       -
       +syntax match muttrcFunction     contained "\<sidebar-open\>"

     

       2024
       2024
       -
       +syntax match muttrcFunction     contained "\<sidebar-page-down\>"

     

       2025
       2025
       -
       +syntax match muttrcFunction     contained "\<sidebar-page-up\>"

     

       2026
       2026
       -
       +syntax match muttrcFunction     contained "\<sidebar-prev\>"

     

       2027
       2027
       -
       +syntax match muttrcFunction     contained "\<sidebar-prev-new\>"

     

       2028
       2028
       -
       +syntax match muttrcFunction     contained "\<sidebar-toggle-visible\>"

     

       2029
       2029
       -
       +

     

       2030
       2030
       -
       +syntax keyword muttrcColorField contained sidebar_divider

     

       2031
       2031
       -
       +syntax keyword muttrcColorField contained sidebar_flagged

     

       2032
       2032
       -
       +syntax keyword muttrcColorField contained sidebar_highlight

     

       2033
       2033
       -
       +syntax keyword muttrcColorField contained sidebar_indicator

     

       2034
       2034
       -
       +syntax keyword muttrcColorField contained sidebar_new

     

       2035
       2035
       -
       +

     

       2036
       2036
       -
       +" vim: syntax=vim

     

       2037
       2037
       -
       diff -urN mutt-1.6.1/filter.c mutt-1.6.1-sidebar/filter.c

     

       2038
       2038
       -
       --- mutt-1.6.1/filter.c	2016-06-12 18:43:00.403447606 +0100

     

       2039
       2039
       -
       +++ mutt-1.6.1-sidebar/filter.c	2016-06-12 18:43:03.835501127 +0100

     

       2040
       2040
       -
       @@ -21,6 +21,7 @@

     

       2041
       2041
       -
        #endif

     

       2042
       2042
       -
        

     

       2043
       2043
       -
        #include "mutt.h"

     

       2044
       2044
       -
       +#include "mutt_curses.h"

     

       2045
       2045
       -
        

     

       2046
       2046
       -
        #include <unistd.h>

     

       2047
       2047
       -
        #include <stdlib.h>

     

       2048
       2048
       -
       @@ -34,6 +35,7 @@

     

       2049
       2049
       -
        		       int fdin, int fdout, int fderr)

     

       2050
       2050
       -
        {

     

       2051
       2051
       -
          int pin[2], pout[2], perr[2], thepid;

     

       2052
       2052
       -
       +  char columns[11];

     

       2053
       2053
       -
        

     

       2054
       2054
       -
          if (in)

     

       2055
       2055
       -
          {

     

       2056
       2056
       -
       @@ -117,6 +119,9 @@

     

       2057
       2057
       -
              close (fderr);

     

       2058
       2058
       -
            }

     

       2059
       2059
       -
        

     

       2060
       2060
       -
       +    snprintf (columns, sizeof (columns), "%d", COLS - SidebarWidth);

     

       2061
       2061
       -
       +    setenv ("COLUMNS", columns, 1);

     

       2062
       2062
       -
       +

     

       2063
       2063
       -
            execl (EXECSHELL, "sh", "-c", cmd, NULL);

     

       2064
       2064
       -
            _exit (127);

     

       2065
       2065
       -
          }

     

       2066
       2066
       -
       diff -urN mutt-1.6.1/flags.c mutt-1.6.1-sidebar/flags.c

     

       2067
       2067
       -
       --- mutt-1.6.1/flags.c	2016-06-12 18:43:00.403447606 +0100

     

       2068
       2068
       -
       +++ mutt-1.6.1-sidebar/flags.c	2016-06-12 18:43:03.956503013 +0100

     

       2069
       2069
       -
       @@ -25,6 +25,10 @@

     

       2070
       2070
       -
        #include "sort.h"

     

       2071
       2071
       -
        #include "mx.h"

     

       2072
       2072
       -
        

     

       2073
       2073
       -
       +#ifdef USE_SIDEBAR

     

       2074
       2074
       -
       +#include "sidebar.h"

     

       2075
       2075
       -
       +#endif

     

       2076
       2076
       -
       +

     

       2077
       2077
       -
        void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)

     

       2078
       2078
       -
        {

     

       2079
       2079
       -
          int changed = h->changed;

     

       2080
       2080
       -
       @@ -263,6 +267,9 @@

     

       2081
       2081
       -
           */

     

       2082
       2082
       -
          if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))

     

       2083
       2083
       -
            h->searched = 0;

     

       2084
       2084
       -
       +#ifdef USE_SIDEBAR

     

       2085
       2085
       -
       +  mutt_sb_draw();

     

       2086
       2086
       -
       +#endif

     

       2087
       2087
       -
        }

     

       2088
       2088
       -
        

     

       2089
       2089
       -
        void mutt_tag_set_flag (int flag, int bf)

     

       2090
       2090
       -
       diff -urN mutt-1.6.1/functions.h mutt-1.6.1-sidebar/functions.h

     

       2091
       2091
       -
       --- mutt-1.6.1/functions.h	2016-06-12 18:43:00.403447606 +0100

     

       2092
       2092
       -
       +++ mutt-1.6.1-sidebar/functions.h	2016-06-12 18:43:03.956503013 +0100

     

       2093
       2093
       -
       @@ -168,6 +168,16 @@

     

       2094
       2094
       -
          { "decrypt-copy",		OP_DECRYPT_COPY,		NULL },

     

       2095
       2095
       -
          { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },

     

       2096
       2096
       -
        

     

       2097
       2097
       -
       +#ifdef USE_SIDEBAR

     

       2098
       2098
       -
       +  { "sidebar-next",		OP_SIDEBAR_NEXT,		NULL },

     

       2099
       2099
       -
       +  { "sidebar-next-new",		OP_SIDEBAR_NEXT_NEW,		NULL },

     

       2100
       2100
       -
       +  { "sidebar-open",		OP_SIDEBAR_OPEN,		NULL },

     

       2101
       2101
       -
       +  { "sidebar-page-down",	OP_SIDEBAR_PAGE_DOWN,		NULL },

     

       2102
       2102
       -
       +  { "sidebar-page-up",		OP_SIDEBAR_PAGE_UP,		NULL },

     

       2103
       2103
       -
       +  { "sidebar-prev",		OP_SIDEBAR_PREV,		NULL },

     

       2104
       2104
       -
       +  { "sidebar-prev-new",		OP_SIDEBAR_PREV_NEW,		NULL },

     

       2105
       2105
       -
       +  { "sidebar-toggle-visible",	OP_SIDEBAR_TOGGLE_VISIBLE,	NULL },

     

       2106
       2106
       -
       +#endif

     

       2107
       2107
       -
        

     

       2108
       2108
       -
          { NULL,			0,				NULL }

     

       2109
       2109
       -
        };

     

       2110
       2110
       -
       @@ -272,6 +282,17 @@

     

       2111
       2111
       -
        

     

       2112
       2112
       -
          { "what-key",		OP_WHAT_KEY,		NULL },

     

       2113
       2113
       -
        

     

       2114
       2114
       -
       +#ifdef USE_SIDEBAR

     

       2115
       2115
       -
       +  { "sidebar-next",		OP_SIDEBAR_NEXT,		NULL },

     

       2116
       2116
       -
       +  { "sidebar-next-new",		OP_SIDEBAR_NEXT_NEW,		NULL },

     

       2117
       2117
       -
       +  { "sidebar-open",		OP_SIDEBAR_OPEN,		NULL },

     

       2118
       2118
       -
       +  { "sidebar-page-down",	OP_SIDEBAR_PAGE_DOWN,		NULL },

     

       2119
       2119
       -
       +  { "sidebar-page-up",		OP_SIDEBAR_PAGE_UP,		NULL },

     

       2120
       2120
       -
       +  { "sidebar-prev",		OP_SIDEBAR_PREV,		NULL },

     

       2121
       2121
       -
       +  { "sidebar-prev-new",		OP_SIDEBAR_PREV_NEW,		NULL },

     

       2122
       2122
       -
       +  { "sidebar-toggle-visible",	OP_SIDEBAR_TOGGLE_VISIBLE,	NULL },

     

       2123
       2123
       -
       +#endif

     

       2124
       2124
       -
       +

     

       2125
       2125
       -
          { NULL,		0,				NULL }

     

       2126
       2126
       -
        };

     

       2127
       2127
       -
        

     

       2128
       2128
       -
       diff -urN mutt-1.6.1/globals.h mutt-1.6.1-sidebar/globals.h

     

       2129
       2129
       -
       --- mutt-1.6.1/globals.h	2016-06-12 18:43:00.403447606 +0100

     

       2130
       2130
       -
       +++ mutt-1.6.1-sidebar/globals.h	2016-06-12 18:43:03.956503013 +0100

     

       2131
       2131
       -
       @@ -118,6 +118,12 @@

     

       2132
       2132
       -
        WHERE char *SendCharset;

     

       2133
       2133
       -
        WHERE char *Sendmail;

     

       2134
       2134
       -
        WHERE char *Shell;

     

       2135
       2135
       -
       +#ifdef USE_SIDEBAR

     

       2136
       2136
       -
       +WHERE char *SidebarDelimChars;

     

       2137
       2137
       -
       +WHERE char *SidebarDividerChar;

     

       2138
       2138
       -
       +WHERE char *SidebarFormat;

     

       2139
       2139
       -
       +WHERE char *SidebarIndentString;

     

       2140
       2140
       -
       +#endif

     

       2141
       2141
       -
        WHERE char *Signature;

     

       2142
       2142
       -
        WHERE char *SimpleSearch;

     

       2143
       2143
       -
        #if USE_SMTP

     

       2144
       2144
       -
       @@ -214,6 +220,14 @@

     

       2145
       2145
       -
        WHERE short ScoreThresholdRead;

     

       2146
       2146
       -
        WHERE short ScoreThresholdFlag;

     

       2147
       2147
       -
        

     

       2148
       2148
       -
       +/* This isn't excluded from the build because it's too entwined in the code.

     

       2149
       2149
       -
       + * For now. */

     

       2150
       2150
       -
       +WHERE short SidebarWidth;

     

       2151
       2151
       -
       +#ifdef USE_SIDEBAR

     

       2152
       2152
       -
       +WHERE short SidebarRefreshTime;

     

       2153
       2153
       -
       +WHERE LIST *SidebarWhitelist INITVAL(0);

     

       2154
       2154
       -
       +#endif

     

       2155
       2155
       -
       +

     

       2156
       2156
       -
        #ifdef USE_IMAP

     

       2157
       2157
       -
        WHERE short ImapKeepalive;

     

       2158
       2158
       -
        WHERE short ImapPipelineDepth;

     

       2159
       2159
       -
       diff -urN mutt-1.6.1/imap/command.c mutt-1.6.1-sidebar/imap/command.c

     

       2160
       2160
       -
       --- mutt-1.6.1/imap/command.c	2016-06-12 18:43:00.405447637 +0100

     

       2161
       2161
       -
       +++ mutt-1.6.1-sidebar/imap/command.c	2016-06-12 18:43:03.839501189 +0100

     

       2162
       2162
       -
       @@ -1016,6 +1016,14 @@

     

       2163
       2163
       -
        	     opened */

     

       2164
       2164
       -
        	  status->uidnext = oldun;

     

       2165
       2165
       -
        

     

       2166
       2166
       -
       +#ifdef USE_SIDEBAR

     

       2167
       2167
       -
       +	/* Make the sidebar show the correct numbers */

     

       2168
       2168
       -
       +	if (status->messages) {

     

       2169
       2169
       -
       +	  inc->msg_count  = status->messages;

     

       2170
       2170
       -
       +	  inc->msg_unread = status->unseen;

     

       2171
       2171
       -
       +	}

     

       2172
       2172
       -
       +#endif

     

       2173
       2173
       -
       +

     

       2174
       2174
       -
                FREE (&value);

     

       2175
       2175
       -
                return;

     

       2176
       2176
       -
              }

     

       2177
       2177
       -
       diff -urN mutt-1.6.1/imap/imap.c mutt-1.6.1-sidebar/imap/imap.c

     

       2178
       2178
       -
       --- mutt-1.6.1/imap/imap.c	2016-06-12 18:43:00.405447637 +0100

     

       2179
       2179
       -
       +++ mutt-1.6.1-sidebar/imap/imap.c	2016-06-12 18:43:03.958503044 +0100

     

       2180
       2180
       -
       @@ -1535,7 +1535,11 @@

     

       2181
       2181
       -
        

     

       2182
       2182
       -
            imap_munge_mbox_name (idata, munged, sizeof (munged), name);

     

       2183
       2183
       -
            snprintf (command, sizeof (command),

     

       2184
       2184
       -
       +#ifdef USE_SIDEBAR

     

       2185
       2185
       -
       +	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);

     

       2186
       2186
       -
       +#else

     

       2187
       2187
       -
        	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);

     

       2188
       2188
       -
       +#endif

     

       2189
       2189
       -
        

     

       2190
       2190
       -
            if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)

     

       2191
       2191
       -
            {

     

       2192
       2192
       -
       diff -urN mutt-1.6.1/init.c mutt-1.6.1-sidebar/init.c

     

       2193
       2193
       -
       --- mutt-1.6.1/init.c	2016-06-12 18:43:00.406447652 +0100

     

       2194
       2194
       -
       +++ mutt-1.6.1-sidebar/init.c	2016-06-12 18:43:03.959503060 +0100

     

       2195
       2195
       -
       @@ -2173,6 +2173,9 @@

     

       2196
       2196
       -
        	case DT_SORT_AUX:

     

       2197
       2197
       -
        	  map = SortAuxMethods;

     

       2198
       2198
       -
        	  break;

     

       2199
       2199
       -
       +	case DT_SORT_SIDEBAR:

     

       2200
       2200
       -
       +	  map = SortSidebarMethods;

     

       2201
       2201
       -
       +	  break;

     

       2202
       2202
       -
        	default:

     

       2203
       2203
       -
        	  map = SortMethods;

     

       2204
       2204
       -
        	  break;

     

       2205
       2205
       -
       diff -urN mutt-1.6.1/init.h mutt-1.6.1-sidebar/init.h

     

       2206
       2206
       -
       --- mutt-1.6.1/init.h	2016-06-12 18:43:00.408447684 +0100

     

       2207
       2207
       -
       +++ mutt-1.6.1-sidebar/init.h	2016-06-12 18:43:03.960503075 +0100

     

       2208
       2208
       -
       @@ -42,11 +42,12 @@

     

       2209
       2209
       -
        #define DTYPE(x) ((x) & DT_MASK)

     

       2210
       2210
       -
        

     

       2211
       2211
       -
        /* subtypes */

     

       2212
       2212
       -
       -#define DT_SUBTYPE_MASK	0xf0

     

       2213
       2213
       -
       +#define DT_SUBTYPE_MASK	0xff0

     

       2214
       2214
       -
        #define DT_SORT_ALIAS	0x10

     

       2215
       2215
       -
        #define DT_SORT_BROWSER 0x20

     

       2216
       2216
       -
        #define DT_SORT_KEYS	0x40

     

       2217
       2217
       -
        #define DT_SORT_AUX	0x80

     

       2218
       2218
       -
       +#define DT_SORT_SIDEBAR	0x100

     

       2219
       2219
       -
        

     

       2220
       2220
       -
        /* flags to parse_set() */

     

       2221
       2221
       -
        #define M_SET_INV	(1<<0)	/* default is to invert all vars */

     

       2222
       2222
       -
       @@ -2665,6 +2666,147 @@

     

       2223
       2223
       -
          ** Command to use when spawning a subshell.  By default, the user's login

     

       2224
       2224
       -
          ** shell from \fC/etc/passwd\fP is used.

     

       2225
       2225
       -
          */

     

       2226
       2226
       -
       +#ifdef USE_SIDEBAR

     

       2227
       2227
       -
       +  { "sidebar_divider_char", DT_STR, R_BOTH, UL &SidebarDividerChar, UL "|" },

     

       2228
       2228
       -
       +  /*

     

       2229
       2229
       -
       +  ** .pp

     

       2230
       2230
       -
       +  ** This specifies the characters to be drawn between the sidebar (when

     

       2231
       2231
       -
       +  ** visible) and the other Mutt panels. ASCII and Unicode line-drawing

     

       2232
       2232
       -
       +  ** characters are supported.

     

       2233
       2233
       -
       +  */

     

       2234
       2234
       -
       +  { "sidebar_delim_chars", DT_STR, R_NONE, UL &SidebarDelimChars, UL "/." },

     

       2235
       2235
       -
       +  /*

     

       2236
       2236
       -
       +  ** .pp

     

       2237
       2237
       -
       +  ** This contains the list of characters which you would like to treat

     

       2238
       2238
       -
       +  ** as folder separators for displaying paths in the sidebar.

     

       2239
       2239
       -
       +  ** .pp

     

       2240
       2240
       -
       +  ** Local mail is often arranged in directories: `dir1/dir2/mailbox'.

     

       2241
       2241
       -
       +  ** .ts

     

       2242
       2242
       -
       +  ** set sidebar_delim_chars='/'

     

       2243
       2243
       -
       +  ** .te

     

       2244
       2244
       -
       +  ** .pp

     

       2245
       2245
       -
       +  ** IMAP mailboxes are often named: `folder1.folder2.mailbox'.

     

       2246
       2246
       -
       +  ** .ts

     

       2247
       2247
       -
       +  ** set sidebar_delim_chars='.'

     

       2248
       2248
       -
       +  ** .te

     

       2249
       2249
       -
       +  ** .pp

     

       2250
       2250
       -
       +  ** \fBSee also:\fP $$sidebar_short_path, $$sidebar_folder_indent, $$sidebar_indent_string.

     

       2251
       2251
       -
       +  */

     

       2252
       2252
       -
       +  { "sidebar_folder_indent", DT_BOOL, R_BOTH, OPTSIDEBARFOLDERINDENT, 0 },

     

       2253
       2253
       -
       +  /*

     

       2254
       2254
       -
       +  ** .pp

     

       2255
       2255
       -
       +  ** Set this to indent mailboxes in the sidebar.

     

       2256
       2256
       -
       +  ** .pp

     

       2257
       2257
       -
       +  ** \fBSee also:\fP $$sidebar_short_path, $$sidebar_indent_string, $$sidebar_delim_chars.

     

       2258
       2258
       -
       +  */

     

       2259
       2259
       -
       +  { "sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%?F? [%F]?%* %?N?%N/?%S" },

     

       2260
       2260
       -
       +  /*

     

       2261
       2261
       -
       +  ** .pp

     

       2262
       2262
       -
       +  ** This variable allows you to customize the sidebar display. This string is

     

       2263
       2263
       -
       +  ** similar to $$index_format, but has its own set of \fCprintf(3)\fP-like

     

       2264
       2264
       -
       +  ** sequences:

     

       2265
       2265
       -
       +  ** .dl

     

       2266
       2266
       -
       +  ** .dt %B  .dd Name of the mailbox

     

       2267
       2267
       -
       +  ** .dt %S  .dd * Size of mailbox (total number of messages)

     

       2268
       2268
       -
       +  ** .dt %N  .dd * Number of New messages in the mailbox

     

       2269
       2269
       -
       +  ** .dt %F  .dd * Number of Flagged messages in the mailbox

     

       2270
       2270
       -
       +  ** .dt %!  .dd ``!'' : one flagged message;

     

       2271
       2271
       -
       +  **             ``!!'' : two flagged messages;

     

       2272
       2272
       -
       +  **             ``n!'' : n flagged messages (for n > 2).

     

       2273
       2273
       -
       +  **             Otherwise prints nothing.

     

       2274
       2274
       -
       +  ** .dt %d  .dd * @ Number of deleted messages

     

       2275
       2275
       -
       +  ** .dt %L  .dd * @ Number of messages after limiting

     

       2276
       2276
       -
       +  ** .dt %t  .dd * @ Number of tagged messages

     

       2277
       2277
       -
       +  ** .dt %>X .dd right justify the rest of the string and pad with ``X''

     

       2278
       2278
       -
       +  ** .dt %|X .dd pad to the end of the line with ``X''

     

       2279
       2279
       -
       +  ** .dt %*X .dd soft-fill with character ``X'' as pad

     

       2280
       2280
       -
       +  ** .de

     

       2281
       2281
       -
       +  ** .pp

     

       2282
       2282
       -
       +  ** * = Can be optionally printed if nonzero

     

       2283
       2283
       -
       +  ** @ = Only applicable to the current folder

     

       2284
       2284
       -
       +  */

     

       2285
       2285
       -
       +  { "sidebar_indent_string", DT_STR, R_BOTH, UL &SidebarIndentString, UL "  " },

     

       2286
       2286
       -
       +  /*

     

       2287
       2287
       -
       +  ** .pp

     

       2288
       2288
       -
       +  ** This specifies the string that is used to indent mailboxes in the sidebar.

     

       2289
       2289
       -
       +  ** It defaults to two spaces.

     

       2290
       2290
       -
       +  ** .pp

     

       2291
       2291
       -
       +  ** \fBSee also:\fP $$sidebar_short_path, $$sidebar_folder_indent, $$sidebar_delim_chars.

     

       2292
       2292
       -
       +  */

     

       2293
       2293
       -
       +  { "sidebar_new_mail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, 0 },

     

       2294
       2294
       -
       +  /*

     

       2295
       2295
       -
       +  ** .pp

     

       2296
       2296
       -
       +  ** When set, the sidebar will only display mailboxes containing new, or

     

       2297
       2297
       -
       +  ** flagged, mail.

     

       2298
       2298
       -
       +  ** .pp

     

       2299
       2299
       -
       +  ** \fBSee also:\fP $sidebar_whitelist.

     

       2300
       2300
       -
       +  */

     

       2301
       2301
       -
       +  { "sidebar_next_new_wrap", DT_BOOL, R_BOTH, UL OPTSIDEBARNEXTNEWWRAP, 0 },

     

       2302
       2302
       -
       +  /*

     

       2303
       2303
       -
       +  ** .pp

     

       2304
       2304
       -
       +  ** When set, the \fC<sidebar-next-new>\fP command will not stop and the end of

     

       2305
       2305
       -
       +  ** the list of mailboxes, but wrap around to the beginning. The

     

       2306
       2306
       -
       +  ** \fC<sidebar-prev-new>\fP command is similarly affected, wrapping around to

     

       2307
       2307
       -
       +  ** the end of the list.

     

       2308
       2308
       -
       +  */

     

       2309
       2309
       -
       +  { "sidebar_refresh_time", DT_NUM, R_BOTH, UL &SidebarRefreshTime, 60 },

     

       2310
       2310
       -
       +  /*

     

       2311
       2311
       -
       +  ** .pp

     

       2312
       2312
       -
       +  ** Set sidebar_refresh_time to the minimum number of seconds between refreshes.

     

       2313
       2313
       -
       +  ** This will reduce network traffic.

     

       2314
       2314
       -
       +  ** .pp

     

       2315
       2315
       -
       +  ** \fBNote:\fP Set to 0 to disable refreshing.

     

       2316
       2316
       -
       +  */

     

       2317
       2317
       -
       +  { "sidebar_short_path", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 },

     

       2318
       2318
       -
       +  /*

     

       2319
       2319
       -
       +  ** .pp

     

       2320
       2320
       -
       +  ** By default the sidebar will show the mailbox's path, relative to the

     

       2321
       2321
       -
       +  ** $$folder variable. Setting \fCsidebar_shortpath=yes\fP will shorten the

     

       2322
       2322
       -
       +  ** names relative to the previous name. Here's an example:

     

       2323
       2323
       -
       +  ** .dl

     

       2324
       2324
       -
       +  ** .dt \fBshortpath=no\fP .dd \fBshortpath=yes\fP .dd \fBshortpath=yes, folderindent=yes, indentstr=".."\fP

     

       2325
       2325
       -
       +  ** .dt \fCfruit\fP        .dd \fCfruit\fP         .dd \fCfruit\fP

     

       2326
       2326
       -
       +  ** .dt \fCfruit.apple\fP  .dd \fCapple\fP         .dd \fC..apple\fP

     

       2327
       2327
       -
       +  ** .dt \fCfruit.banana\fP .dd \fCbanana\fP        .dd \fC..banana\fP

     

       2328
       2328
       -
       +  ** .dt \fCfruit.cherry\fP .dd \fCcherry\fP        .dd \fC..cherry\fP

     

       2329
       2329
       -
       +  ** .de

     

       2330
       2330
       -
       +  ** .pp

     

       2331
       2331
       -
       +  ** \fBSee also:\fP $$sidebar_delim_chars, $$sidebar_folder_indent, $$sidebar_indent_string.

     

       2332
       2332
       -
       +  */

     

       2333
       2333
       -
       +  { "sidebar_sort_method", DT_SORT|DT_SORT_SIDEBAR, R_NONE, UL &SidebarSortMethod, SORT_ORDER },

     

       2334
       2334
       -
       +  /*

     

       2335
       2335
       -
       +  ** .pp

     

       2336
       2336
       -
       +  ** Specifies how to sort entries in the file browser.  By default, the

     

       2337
       2337
       -
       +  ** entries are sorted alphabetically.  Valid values:

     

       2338
       2338
       -
       +  ** .il

     

       2339
       2339
       -
       +  ** .dd alpha (alphabetically)

     

       2340
       2340
       -
       +  ** .dd count (all message count)

     

       2341
       2341
       -
       +  ** .dd date

     

       2342
       2342
       -
       +  ** .dd desc (description)

     

       2343
       2343
       -
       +  ** .dd new (new message count)

     

       2344
       2344
       -
       +  ** .dd size

     

       2345
       2345
       -
       +  ** .dd unsorted

     

       2346
       2346
       -
       +  ** .ie

     

       2347
       2347
       -
       +  ** .pp

     

       2348
       2348
       -
       +  ** You may optionally use the ``reverse-'' prefix to specify reverse sorting

     

       2349
       2349
       -
       +  ** order (example: ``\fCset sort_browser=reverse-date\fP'').

     

       2350
       2350
       -
       +  */

     

       2351
       2351
       -
       +  { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },

     

       2352
       2352
       -
       +  /*

     

       2353
       2353
       -
       +  ** .pp

     

       2354
       2354
       -
       +  ** This specifies whether or not to show sidebar. The sidebar shows a list of

     

       2355
       2355
       -
       +  ** all your mailboxes.

     

       2356
       2356
       -
       +  ** .pp

     

       2357
       2357
       -
       +  ** \fBSee also:\fP $$sidebar_format, $$sidebar_width

     

       2358
       2358
       -
       +  */

     

       2359
       2359
       -
       +  { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },

     

       2360
       2360
       -
       +  /*

     

       2361
       2361
       -
       +  ** .pp

     

       2362
       2362
       -
       +  ** This controls the width of the sidebar.  It is measured in screen columns.

     

       2363
       2363
       -
       +  ** For example: sidebar_width=20 could display 20 ASCII characters, or 10

     

       2364
       2364
       -
       +  ** Chinese characters.

     

       2365
       2365
       -
       +  */

     

       2366
       2366
       -
       +#endif

     

       2367
       2367
       -
          { "sig_dashes",	DT_BOOL, R_NONE, OPTSIGDASHES, 1 },

     

       2368
       2368
       -
          /*

     

       2369
       2369
       -
          ** .pp

     

       2370
       2370
       -
       @@ -3652,6 +3794,19 @@

     

       2371
       2371
       -
          { NULL,       0 }

     

       2372
       2372
       -
        };

     

       2373
       2373
       -
        

     

       2374
       2374
       -
       +const struct mapping_t SortSidebarMethods[] = {

     

       2375
       2375
       -
       +  { "alpha",		SORT_PATH },

     

       2376
       2376
       -
       +  { "count",		SORT_COUNT },

     

       2377
       2377
       -
       +  { "desc",		SORT_DESC },

     

       2378
       2378
       -
       +  { "flagged",		SORT_FLAGGED },

     

       2379
       2379
       -
       +  { "mailbox-order",	SORT_ORDER },

     

       2380
       2380
       -
       +  { "name",		SORT_PATH },

     

       2381
       2381
       -
       +  { "new",		SORT_COUNT_NEW },

     

       2382
       2382
       -
       +  { "path",		SORT_PATH },

     

       2383
       2383
       -
       +  { "unsorted",		SORT_ORDER },

     

       2384
       2384
       -
       +  { NULL,		0 }

     

       2385
       2385
       -
       +};

     

       2386
       2386
       -
       +

     

       2387
       2387
       -
        

     

       2388
       2388
       -
        /* functions used to parse commands in a rc file */

     

       2389
       2389
       -
        

     

       2390
       2390
       -
       @@ -3741,6 +3896,9 @@

     

       2391
       2391
       -
          { "send-hook",	mutt_parse_hook,	M_SENDHOOK },

     

       2392
       2392
       -
          { "send2-hook",	mutt_parse_hook,	M_SEND2HOOK },

     

       2393
       2393
       -
          { "set",		parse_set,		0 },

     

       2394
       2394
       -
       +#ifdef USE_SIDEBAR

     

       2395
       2395
       -
       +  { "sidebar_whitelist",parse_list,		UL &SidebarWhitelist },

     

       2396
       2396
       -
       +#endif

     

       2397
       2397
       -
          { "source",		parse_source,		0 },

     

       2398
       2398
       -
          { "spam",		parse_spam_list,	M_SPAM },

     

       2399
       2399
       -
          { "nospam",		parse_spam_list,	M_NOSPAM },

     

       2400
       2400
       -
       diff -urN mutt-1.6.1/keymap.c mutt-1.6.1-sidebar/keymap.c

     

       2401
       2401
       -
       --- mutt-1.6.1/keymap.c	2016-06-12 18:43:00.408447684 +0100

     

       2402
       2402
       -
       +++ mutt-1.6.1-sidebar/keymap.c	2016-06-12 18:43:03.960503075 +0100

     

       2403
       2403
       -
       @@ -453,6 +453,9 @@

     

       2404
       2404
       -
            }

     

       2405
       2405
       -
        #endif

     

       2406
       2406
       -
        

     

       2407
       2407
       -
       +    /* update sidebar stats */

     

       2408
       2408
       -
       +    mutt_buffy_check(0);

     

       2409
       2409
       -
       +

     

       2410
       2410
       -
            timeout (i * 1000);

     

       2411
       2411
       -
            tmp = mutt_getch();

     

       2412
       2412
       -
            timeout (-1);

     

       2413
       2413
       -
       diff -urN mutt-1.6.1/mailbox.h mutt-1.6.1-sidebar/mailbox.h

     

       2414
       2414
       -
       --- mutt-1.6.1/mailbox.h	2016-06-12 18:43:00.408447684 +0100

     

       2415
       2415
       -
       +++ mutt-1.6.1-sidebar/mailbox.h	2016-06-12 18:43:03.960503075 +0100

     

       2416
       2416
       -
       @@ -27,6 +27,9 @@

     

       2417
       2417
       -
        #define M_NEWFOLDER	(1<<4) /* create a new folder - same as M_APPEND, but uses

     

       2418
       2418
       -
        				* safe_fopen() for mbox-style folders.

     

       2419
       2419
       -
        				*/

     

       2420
       2420
       -
       +#ifdef USE_SIDEBAR

     

       2421
       2421
       -
       +#define M_PEEK		(1<<5) /* revert atime back after taking a look (if applicable) */

     

       2422
       2422
       -
       +#endif

     

       2423
       2423
       -
        

     

       2424
       2424
       -
        /* mx_open_new_message() */

     

       2425
       2425
       -
        #define M_ADD_FROM	(1<<0)	/* add a From_ line */

     

       2426
       2426
       -
       diff -urN mutt-1.6.1/main.c mutt-1.6.1-sidebar/main.c

     

       2427
       2427
       -
       --- mutt-1.6.1/main.c	2016-06-12 18:43:00.409447699 +0100

     

       2428
       2428
       -
       +++ mutt-1.6.1-sidebar/main.c	2016-06-12 18:43:03.961503091 +0100

     

       2429
       2429
       -
       @@ -31,6 +31,9 @@

     

       2430
       2430
       -
        #include "url.h"

     

       2431
       2431
       -
        #include "mutt_crypt.h"

     

       2432
       2432
       -
        #include "mutt_idna.h"

     

       2433
       2433
       -
       +#ifdef USE_SIDEBAR

     

       2434
       2434
       -
       +#include "sidebar.h"

     

       2435
       2435
       -
       +#endif

     

       2436
       2436
       -
        

     

       2437
       2437
       -
        #ifdef USE_SASL

     

       2438
       2438
       -
        #include "mutt_sasl.h"

     

       2439
       2439
       -
       @@ -485,6 +488,12 @@

     

       2440
       2440
       -
        	"-USE_HCACHE  "

     

       2441
       2441
       -
        #endif

     

       2442
       2442
       -
        

     

       2443
       2443
       -
       +#ifdef USE_SIDEBAR

     

       2444
       2444
       -
       +	"+USE_SIDEBAR  "

     

       2445
       2445
       -
       +#else

     

       2446
       2446
       -
       +	"-USE_SIDEBAR  "

     

       2447
       2447
       -
       +#endif

     

       2448
       2448
       -
       +

     

       2449
       2449
       -
        	);

     

       2450
       2450
       -
        

     

       2451
       2451
       -
        #ifdef ISPELL

     

       2452
       2452
       -
       @@ -557,7 +566,11 @@

     

       2453
       2453
       -
        

     

       2454
       2454
       -
        int main (int argc, char **argv)

     

       2455
       2455
       -
        {

     

       2456
       2456
       -
       +#ifdef USE_SIDEBAR

     

       2457
       2457
       -
       +  char folder[PATH_MAX] = "";

     

       2458
       2458
       -
       +#else

     

       2459
       2459
       -
          char folder[_POSIX_PATH_MAX] = "";

     

       2460
       2460
       -
       +#endif

     

       2461
       2461
       -
          char *subject = NULL;

     

       2462
       2462
       -
          char *includeFile = NULL;

     

       2463
       2463
       -
          char *draftFile = NULL;

     

       2464
       2464
       -
       @@ -828,6 +841,9 @@

     

       2465
       2465
       -
            clear ();

     

       2466
       2466
       -
            mutt_error = mutt_curses_error;

     

       2467
       2467
       -
            mutt_message = mutt_curses_message;

     

       2468
       2468
       -
       +#ifdef USE_SIDEBAR

     

       2469
       2469
       -
       +    mutt_sb_init();

     

       2470
       2470
       -
       +#endif

     

       2471
       2471
       -
          }

     

       2472
       2472
       -
        

     

       2473
       2473
       -
          /* Create the Maildir directory if it doesn't exist. */

     

       2474
       2474
       -
       @@ -1184,6 +1200,15 @@

     

       2475
       2475
       -
              strfcpy (folder, NONULL(Spoolfile), sizeof (folder));

     

       2476
       2476
       -
            mutt_expand_path (folder, sizeof (folder));

     

       2477
       2477
       -
        

     

       2478
       2478
       -
       +#ifdef USE_SIDEBAR

     

       2479
       2479
       -
       +    {

     

       2480
       2480
       -
       +      char tmpfolder[PATH_MAX] = "";

     

       2481
       2481
       -
       +      strfcpy (tmpfolder, folder, sizeof (tmpfolder));

     

       2482
       2482
       -
       +      if (!realpath (tmpfolder, folder))

     

       2483
       2483
       -
       +        strfcpy (folder, tmpfolder, sizeof (tmpfolder));

     

       2484
       2484
       -
       +    }

     

       2485
       2485
       -
       +#endif

     

       2486
       2486
       -
       +

     

       2487
       2487
       -
            mutt_str_replace (&CurrentFolder, folder);

     

       2488
       2488
       -
            mutt_str_replace (&LastFolder, folder);

     

       2489
       2489
       -
        

     

       2490
       2490
       -
       @@ -1206,6 +1231,9 @@

     

       2491
       2491
       -
            if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))

     

       2492
       2492
       -
               || !explicit_folder)

     

       2493
       2493
       -
            {

     

       2494
       2494
       -
       +#ifdef USE_SIDEBAR

     

       2495
       2495
       -
       +      mutt_sb_set_open_buffy (folder);

     

       2496
       2496
       -
       +#endif

     

       2497
       2497
       -
              mutt_index_menu ();

     

       2498
       2498
       -
              if (Context)

     

       2499
       2499
       -
        	FREE (&Context);

     

       2500
       2500
       -
       diff -urN mutt-1.6.1/Makefile.am mutt-1.6.1-sidebar/Makefile.am

     

       2501
       2501
       -
       --- mutt-1.6.1/Makefile.am	2016-06-12 18:43:00.389447388 +0100

     

       2502
       2502
       -
       +++ mutt-1.6.1-sidebar/Makefile.am	2016-06-12 18:43:03.944502826 +0100

     

       2503
       2503
       -
       @@ -56,7 +56,7 @@

     

       2504
       2504
       -
        	mutt_idna.c mutt_sasl.c mutt_socket.c mutt_ssl.c mutt_ssl_gnutls.c \

     

       2505
       2505
       -
        	mutt_tunnel.c pgp.c pgpinvoke.c pgpkey.c pgplib.c pgpmicalg.c \

     

       2506
       2506
       -
        	pgppacket.c pop.c pop_auth.c pop_lib.c remailer.c resize.c sha1.c \

     

       2507
       2507
       -
       -	smime.c smtp.c utf8.c wcwidth.c \

     

       2508
       2508
       -
       +	sidebar.c smime.c smtp.c utf8.c wcwidth.c \

     

       2509
       2509
       -
        	bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h

     

       2510
       2510
       -
        

     

       2511
       2511
       -
        EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \

     

       2512
       2512
       -
       @@ -71,7 +71,7 @@

     

       2513
       2513
       -
        	mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \

     

       2514
       2514
       -
        	README.SSL smime.h group.h \

     

       2515
       2515
       -
        	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \

     

       2516
       2516
       -
       -	ChangeLog mkchangelog.sh mutt_idna.h \

     

       2517
       2517
       -
       +	ChangeLog mkchangelog.sh mutt_idna.h sidebar.h OPS.sidebar \

     

       2518
       2518
       -
        	snprintf.c regex.c crypt-gpgme.h hcachever.sh.in sys_socket.h \

     

       2519
       2519
       -
        	txt2c.c txt2c.sh version.sh check_sec.sh

     

       2520
       2520
       -
        

     

       2521
       2521
       -
       @@ -129,9 +129,9 @@

     

       2522
       2522
       -
        keymap_defs.h: $(OPS) $(srcdir)/gen_defs

     

       2523
       2523
       -
        	$(srcdir)/gen_defs $(OPS) > keymap_defs.h

     

       2524
       2524
       -
        

     

       2525
       2525
       -
       -keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs

     

       2526
       2526
       -
       +keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs

     

       2527
       2527
       -
        	rm -f $@

     

       2528
       2528
       -
       -	$(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \

     

       2529
       2529
       -
       +	$(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.PGP \

     

       2530
       2530
       -
        		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \

     

       2531
       2531
       -
        			> keymap_alldefs.h

     

       2532
       2532
       -
        

     

       2533
       2533
       -
       diff -urN mutt-1.6.1/mbox.c mutt-1.6.1-sidebar/mbox.c

     

       2534
       2534
       -
       --- mutt-1.6.1/mbox.c	2016-06-12 18:43:00.409447699 +0100

     

       2535
       2535
       -
       +++ mutt-1.6.1-sidebar/mbox.c	2016-06-12 18:43:03.961503091 +0100

     

       2536
       2536
       -
       @@ -100,6 +100,9 @@

     

       2537
       2537
       -
            mutt_perror (ctx->path);

     

       2538
       2538
       -
            return (-1);

     

       2539
       2539
       -
          }

     

       2540
       2540
       -
       +#ifdef USE_SIDEBAR

     

       2541
       2541
       -
       +  ctx->atime = sb.st_atime;

     

       2542
       2542
       -
       +#endif

     

       2543
       2543
       -
          ctx->mtime = sb.st_mtime;

     

       2544
       2544
       -
          ctx->size = sb.st_size;

     

       2545
       2545
       -
        

     

       2546
       2546
       -
       @@ -251,6 +254,9 @@

     

       2547
       2547
       -
        

     

       2548
       2548
       -
          ctx->size = sb.st_size;

     

       2549
       2549
       -
          ctx->mtime = sb.st_mtime;

     

       2550
       2550
       -
       +#ifdef USE_SIDEBAR

     

       2551
       2551
       -
       +  ctx->atime = sb.st_atime;

     

       2552
       2552
       -
       +#endif

     

       2553
       2553
       -
        

     

       2554
       2554
       -
        #ifdef NFS_ATTRIBUTE_HACK

     

       2555
       2555
       -
          if (sb.st_mtime > sb.st_atime)

     

       2556
       2556
       -
       diff -urN mutt-1.6.1/menu.c mutt-1.6.1-sidebar/menu.c

     

       2557
       2557
       -
       --- mutt-1.6.1/menu.c	2016-06-12 18:43:00.409447699 +0100

     

       2558
       2558
       -
       +++ mutt-1.6.1-sidebar/menu.c	2016-06-12 18:43:03.961503091 +0100

     

       2559
       2559
       -
       @@ -24,6 +24,9 @@

     

       2560
       2560
       -
        #include "mutt_curses.h"

     

       2561
       2561
       -
        #include "mutt_menu.h"

     

       2562
       2562
       -
        #include "mbyte.h"

     

       2563
       2563
       -
       +#ifdef USE_SIDEBAR

     

       2564
       2564
       -
       +#include "sidebar.h"

     

       2565
       2565
       -
       +#endif

     

       2566
       2566
       -
        

     

       2567
       2567
       -
        char* SearchBuffers[MENU_MAX];

     

       2568
       2568
       -
        

     

       2569
       2569
       -
       @@ -184,7 +187,7 @@

     

       2570
       2570
       -
        {

     

       2571
       2571
       -
          char *scratch = safe_strdup (s);

     

       2572
       2572
       -
          int shift = option (OPTARROWCURSOR) ? 3 : 0;

     

       2573
       2573
       -
       -  int cols = COLS - shift;

     

       2574
       2574
       -
       +  int cols = COLS - shift - SidebarWidth;

     

       2575
       2575
       -
        

     

       2576
       2576
       -
          mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);

     

       2577
       2577
       -
          s[n - 1] = 0;

     

       2578
       2578
       -
       @@ -237,6 +240,9 @@

     

       2579
       2579
       -
          int do_color;

     

       2580
       2580
       -
          int attr;

     

       2581
       2581
       -
        

     

       2582
       2582
       -
       +#ifdef USE_SIDEBAR

     

       2583
       2583
       -
       +  mutt_sb_draw();

     

       2584
       2584
       -
       +#endif

     

       2585
       2585
       -
          for (i = menu->top; i < menu->top + menu->pagelen; i++)

     

       2586
       2586
       -
          {

     

       2587
       2587
       -
            if (i < menu->max)

     

       2588
       2588
       -
       @@ -247,7 +253,7 @@

     

       2589
       2589
       -
              menu_pad_string (buf, sizeof (buf));

     

       2590
       2590
       -
        

     

       2591
       2591
       -
              ATTRSET(attr);

     

       2592
       2592
       -
       -      move(i - menu->top + menu->offset, 0);

     

       2593
       2593
       -
       +      move(i - menu->top + menu->offset, SidebarWidth);

     

       2594
       2594
       -
              do_color = 1;

     

       2595
       2595
       -
        

     

       2596
       2596
       -
              if (i == menu->current)

     

       2597
       2597
       -
       @@ -270,7 +276,11 @@

     

       2598
       2598
       -
            else

     

       2599
       2599
       -
            {

     

       2600
       2600
       -
              NORMAL_COLOR;

     

       2601
       2601
       -
       +#ifdef USE_SIDEBAR

     

       2602
       2602
       -
       +      CLEARLINE_WIN(i - menu->top + menu->offset);

     

       2603
       2603
       -
       +#else

     

       2604
       2604
       -
              CLEARLINE(i - menu->top + menu->offset);

     

       2605
       2605
       -
       +#endif

     

       2606
       2606
       -
            }

     

       2607
       2607
       -
          }

     

       2608
       2608
       -
          NORMAL_COLOR;

     

       2609
       2609
       -
       @@ -287,7 +297,7 @@

     

       2610
       2610
       -
            return;

     

       2611
       2611
       -
          }

     

       2612
       2612
       -
          

     

       2613
       2613
       -
       -  move (menu->oldcurrent + menu->offset - menu->top, 0);

     

       2614
       2614
       -
       +  move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);

     

       2615
       2615
       -
          ATTRSET(menu->color (menu->oldcurrent));

     

       2616
       2616
       -
        

     

       2617
       2617
       -
          if (option (OPTARROWCURSOR))

     

       2618
       2618
       -
       @@ -299,13 +309,13 @@

     

       2619
       2619
       -
            {

     

       2620
       2620
       -
              menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);

     

       2621
       2621
       -
              menu_pad_string (buf, sizeof (buf));

     

       2622
       2622
       -
       -      move (menu->oldcurrent + menu->offset - menu->top, 3);

     

       2623
       2623
       -
       +      move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);

     

       2624
       2624
       -
              print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);

     

       2625
       2625
       -
            }

     

       2626
       2626
       -
        

     

       2627
       2627
       -
            /* now draw it in the new location */

     

       2628
       2628
       -
            SETCOLOR(MT_COLOR_INDICATOR);

     

       2629
       2629
       -
       -    mvaddstr(menu->current + menu->offset - menu->top, 0, "->");

     

       2630
       2630
       -
       +    mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->");

     

       2631
       2631
       -
          }

     

       2632
       2632
       -
          else

     

       2633
       2633
       -
          {

     

       2634
       2634
       -
       @@ -318,7 +328,7 @@

     

       2635
       2635
       -
            menu_make_entry (buf, sizeof (buf), menu, menu->current);

     

       2636
       2636
       -
            menu_pad_string (buf, sizeof (buf));

     

       2637
       2637
       -
            SETCOLOR(MT_COLOR_INDICATOR);

     

       2638
       2638
       -
       -    move(menu->current - menu->top + menu->offset, 0);

     

       2639
       2639
       -
       +    move(menu->current - menu->top + menu->offset, SidebarWidth);

     

       2640
       2640
       -
            print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);

     

       2641
       2641
       -
          }

     

       2642
       2642
       -
          menu->redraw &= REDRAW_STATUS;

     

       2643
       2643
       -
       @@ -330,7 +340,7 @@

     

       2644
       2644
       -
          char buf[LONG_STRING];

     

       2645
       2645
       -
          int attr = menu->color (menu->current);

     

       2646
       2646
       -
          

     

       2647
       2647
       -
       -  move (menu->current + menu->offset - menu->top, 0);

     

       2648
       2648
       -
       +  move (menu->current + menu->offset - menu->top, SidebarWidth);

     

       2649
       2649
       -
          menu_make_entry (buf, sizeof (buf), menu, menu->current);

     

       2650
       2650
       -
          menu_pad_string (buf, sizeof (buf));

     

       2651
       2651
       -
        

     

       2652
       2652
       -
       @@ -873,7 +883,7 @@

     

       2653
       2653
       -
            

     

       2654
       2654
       -
            

     

       2655
       2655
       -
            if (option (OPTARROWCURSOR))

     

       2656
       2656
       -
       -      move (menu->current - menu->top + menu->offset, 2);

     

       2657
       2657
       -
       +      move (menu->current - menu->top + menu->offset, SidebarWidth + 2);

     

       2658
       2658
       -
            else if (option (OPTBRAILLEFRIENDLY))

     

       2659
       2659
       -
              move (menu->current - menu->top + menu->offset, 0);

     

       2660
       2660
       -
            else

     

       2661
       2661
       -
       diff -urN mutt-1.6.1/mh.c mutt-1.6.1-sidebar/mh.c

     

       2662
       2662
       -
       --- mutt-1.6.1/mh.c	2016-06-12 18:43:00.410447715 +0100

     

       2663
       2663
       -
       +++ mutt-1.6.1-sidebar/mh.c	2016-06-12 18:43:03.962503107 +0100

     

       2664
       2664
       -
       @@ -295,6 +295,48 @@

     

       2665
       2665
       -
          mhs_free_sequences (&mhs);

     

       2666
       2666
       -
        }

     

       2667
       2667
       -
        

     

       2668
       2668
       -
       +#ifdef USE_SIDEBAR

     

       2669
       2669
       -
       +/**

     

       2670
       2670
       -
       + * mh_buffy_update - Update messages counts for an mh mailbox

     

       2671
       2671
       -
       + * @mailbox: BUFFY representing a maildir mailbox

     

       2672
       2672
       -
       + *

     

       2673
       2673
       -
       + * Read through an mh mailbox and count messages.  Save the number of new,

     

       2674
       2674
       -
       + * flagged messages and a timestamp for now.

     

       2675
       2675
       -
       + */

     

       2676
       2676
       -
       +void

     

       2677
       2677
       -
       +mh_buffy_update (BUFFY *mailbox)

     

       2678
       2678
       -
       +{

     

       2679
       2679
       -
       +  int i;

     

       2680
       2680
       -
       +  struct mh_sequences mhs;

     

       2681
       2681
       -
       +

     

       2682
       2682
       -
       +  if (!mailbox)

     

       2683
       2683
       -
       +    return;

     

       2684
       2684
       -
       +

     

       2685
       2685
       -
       +  if (!option (OPTSIDEBAR))

     

       2686
       2686
       -
       +    return;

     

       2687
       2687
       -
       +

     

       2688
       2688
       -
       +  memset (&mhs, 0, sizeof (mhs));

     

       2689
       2689
       -
       +

     

       2690
       2690
       -
       +  if (mh_read_sequences (&mhs, mailbox->path) < 0)

     

       2691
       2691
       -
       +    return;

     

       2692
       2692
       -
       +

     

       2693
       2693
       -
       +  mailbox->msg_count   = 0;

     

       2694
       2694
       -
       +  mailbox->msg_unread  = 0;

     

       2695
       2695
       -
       +  mailbox->msg_flagged = 0;

     

       2696
       2696
       -
       +

     

       2697
       2697
       -
       +  for (i = 0; i <= mhs.max; i++)

     

       2698
       2698
       -
       +  {

     

       2699
       2699
       -
       +    mailbox->msg_count++;

     

       2700
       2700
       -
       +    if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN)

     

       2701
       2701
       -
       +      mailbox->msg_unread++;

     

       2702
       2702
       -
       +    if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED)

     

       2703
       2703
       -
       +      mailbox->msg_flagged++;

     

       2704
       2704
       -
       +  }

     

       2705
       2705
       -
       +  mhs_free_sequences (&mhs);

     

       2706
       2706
       -
       +  mailbox->sb_last_checked = time (NULL);

     

       2707
       2707
       -
       +}

     

       2708
       2708
       -
       +#endif

     

       2709
       2709
       -
       +

     

       2710
       2710
       -
        static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)

     

       2711
       2711
       -
        {

     

       2712
       2712
       -
          int fd;

     

       2713
       2713
       -
       diff -urN mutt-1.6.1/mutt_curses.h mutt-1.6.1-sidebar/mutt_curses.h

     

       2714
       2714
       -
       --- mutt-1.6.1/mutt_curses.h	2016-06-12 18:43:00.410447715 +0100

     

       2715
       2715
       -
       +++ mutt-1.6.1-sidebar/mutt_curses.h	2016-06-12 18:43:03.962503107 +0100

     

       2716
       2716
       -
       @@ -64,6 +64,9 @@

     

       2717
       2717
       -
        #undef lines

     

       2718
       2718
       -
        #endif /* lines */

     

       2719
       2719
       -
        

     

       2720
       2720
       -
       +#ifdef USE_SIDEBAR

     

       2721
       2721
       -
       +#define CLEARLINE_WIN(x) move (x,SidebarWidth), clrtoeol()

     

       2722
       2722
       -
       +#endif

     

       2723
       2723
       -
        #define CLEARLINE(x) move(x,0), clrtoeol()

     

       2724
       2724
       -
        #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)

     

       2725
       2725
       -
        #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)

     

       2726
       2726
       -
       @@ -124,6 +127,14 @@

     

       2727
       2727
       -
          MT_COLOR_UNDERLINE,

     

       2728
       2728
       -
          MT_COLOR_INDEX,

     

       2729
       2729
       -
          MT_COLOR_PROMPT,

     

       2730
       2730
       -
       +#ifdef USE_SIDEBAR

     

       2731
       2731
       -
       +  MT_COLOR_DIVIDER,

     

       2732
       2732
       -
       +  MT_COLOR_FLAGGED,

     

       2733
       2733
       -
       +  MT_COLOR_HIGHLIGHT,

     

       2734
       2734
       -
       +  MT_COLOR_NEW,

     

       2735
       2735
       -
       +  MT_COLOR_SB_INDICATOR,

     

       2736
       2736
       -
       +  MT_COLOR_SB_SPOOLFILE,

     

       2737
       2737
       -
       +#endif

     

       2738
       2738
       -
          MT_COLOR_MAX

     

       2739
       2739
       -
        };

     

       2740
       2740
       -
        

     

       2741
       2741
       -
       @@ -163,12 +174,16 @@

     

       2742
       2742
       -
        

     

       2743
       2743
       -
        static inline int mutt_term_width(short wrap)

     

       2744
       2744
       -
        {

     

       2745
       2745
       -
       +  int cols = COLS;

     

       2746
       2746
       -
       +#ifdef USE_SIDEBAR

     

       2747
       2747
       -
       +  cols -= SidebarWidth;

     

       2748
       2748
       -
       +#endif

     

       2749
       2749
       -
          if (wrap < 0)

     

       2750
       2750
       -
       -    return COLS > -wrap ? COLS + wrap : COLS;

     

       2751
       2751
       -
       +    return cols > -wrap ? cols + wrap : cols;

     

       2752
       2752
       -
          else if (wrap)

     

       2753
       2753
       -
       -    return wrap < COLS ? wrap : COLS;

     

       2754
       2754
       -
       +    return wrap < cols ? wrap : cols;

     

       2755
       2755
       -
          else

     

       2756
       2756
       -
       -    return COLS;

     

       2757
       2757
       -
       +    return cols;

     

       2758
       2758
       -
        }

     

       2759
       2759
       -
        

     

       2760
       2760
       -
        extern int *ColorQuote;

     

       2761
       2761
       -
       diff -urN mutt-1.6.1/mutt.h mutt-1.6.1-sidebar/mutt.h

     

       2762
       2762
       -
       --- mutt-1.6.1/mutt.h	2016-06-12 18:43:00.410447715 +0100

     

       2763
       2763
       -
       +++ mutt-1.6.1-sidebar/mutt.h	2016-06-12 18:43:03.962503107 +0100

     

       2764
       2764
       -
       @@ -428,6 +428,13 @@

     

       2765
       2765
       -
          OPTSAVEEMPTY,

     

       2766
       2766
       -
          OPTSAVENAME,

     

       2767
       2767
       -
          OPTSCORE,

     

       2768
       2768
       -
       +#ifdef USE_SIDEBAR

     

       2769
       2769
       -
       +  OPTSIDEBAR,

     

       2770
       2770
       -
       +  OPTSIDEBARFOLDERINDENT,

     

       2771
       2771
       -
       +  OPTSIDEBARNEWMAILONLY,

     

       2772
       2772
       -
       +  OPTSIDEBARNEXTNEWWRAP,

     

       2773
       2773
       -
       +  OPTSIDEBARSHORTPATH,

     

       2774
       2774
       -
       +#endif

     

       2775
       2775
       -
          OPTSIGDASHES,

     

       2776
       2776
       -
          OPTSIGONTOP,

     

       2777
       2777
       -
          OPTSORTRE,

     

       2778
       2778
       -
       @@ -872,6 +879,9 @@

     

       2779
       2779
       -
        {

     

       2780
       2780
       -
          char *path;

     

       2781
       2781
       -
          FILE *fp;

     

       2782
       2782
       -
       +#ifdef USE_SIDEBAR

     

       2783
       2783
       -
       +  time_t atime;

     

       2784
       2784
       -
       +#endif

     

       2785
       2785
       -
          time_t mtime;

     

       2786
       2786
       -
          off_t size;

     

       2787
       2787
       -
          off_t vsize;

     

       2788
       2788
       -
       @@ -906,6 +916,9 @@

     

       2789
       2789
       -
          unsigned int quiet : 1;	/* inhibit status messages? */

     

       2790
       2790
       -
          unsigned int collapsed : 1;   /* are all threads collapsed? */

     

       2791
       2791
       -
          unsigned int closing : 1;	/* mailbox is being closed */

     

       2792
       2792
       -
       +#ifdef USE_SIDEBAR

     

       2793
       2793
       -
       +  unsigned int peekonly : 1;	/* just taking a glance, revert atime */

     

       2794
       2794
       -
       +#endif

     

       2795
       2795
       -
        

     

       2796
       2796
       -
          /* driver hooks */

     

       2797
       2797
       -
          void *data;			/* driver specific data */

     

       2798
       2798
       -
       diff -urN mutt-1.6.1/muttlib.c mutt-1.6.1-sidebar/muttlib.c

     

       2799
       2799
       -
       --- mutt-1.6.1/muttlib.c	2016-06-12 18:43:00.411447731 +0100

     

       2800
       2800
       -
       +++ mutt-1.6.1-sidebar/muttlib.c	2016-06-12 18:43:03.963503122 +0100

     

       2801
       2801
       -
       @@ -1282,7 +1282,7 @@

     

       2802
       2802
       -
        	  pl = pw = 1;

     

       2803
       2803
       -
        

     

       2804
       2804
       -
        	/* see if there's room to add content, else ignore */

     

       2805
       2805
       -
       -	if ((col < COLS && wlen < destlen) || soft)

     

       2806
       2806
       -
       +	if ((col < (COLS - SidebarWidth) && (wlen < destlen)) || soft)

     

       2807
       2807
       -
        	{

     

       2808
       2808
       -
        	  int pad;

     

       2809
       2809
       -
        

     

       2810
       2810
       -
       @@ -1293,7 +1293,7 @@

     

       2811
       2811
       -
        

     

       2812
       2812
       -
        	  /* try to consume as many columns as we can, if we don't have

     

       2813
       2813
       -
        	   * memory for that, use as much memory as possible */

     

       2814
       2814
       -
       -	  pad = (COLS - col - wid) / pw;

     

       2815
       2815
       -
       +	  pad = (COLS - SidebarWidth - col - wid) / pw;

     

       2816
       2816
       -
        	  if (pad > 0 && wlen + (pad * pl) + len > destlen)

     

       2817
       2817
       -
        	    pad = ((signed)(destlen - wlen - len)) / pl;

     

       2818
       2818
       -
        	  if (pad > 0)

     

       2819
       2819
       -
       @@ -1312,13 +1312,13 @@

     

       2820
       2820
       -
        	    /* \0-terminate dest for length computation in mutt_wstr_trunc() */

     

       2821
       2821
       -
        	    *wptr = 0;

     

       2822
       2822
       -
        	    /* make sure right part is at most as wide as display */

     

       2823
       2823
       -
       -	    len = mutt_wstr_trunc (buf, destlen, COLS-offset, &wid);

     

       2824
       2824
       -
       +	    len = mutt_wstr_trunc (buf, destlen, COLS - offset - SidebarWidth, &wid);

     

       2825
       2825
       -
        	    /* truncate left so that right part fits completely in */

     

       2826
       2826
       -
        	    wlen = mutt_wstr_trunc (dest, destlen - len, col + pad*pw -offset, &col);

     

       2827
       2827
       -
        	    wptr = dest + wlen;

     

       2828
       2828
       -
        	  }

     

       2829
       2829
       -
        	  if (len + wlen > destlen)

     

       2830
       2830
       -
       -	    len = mutt_wstr_trunc (buf, destlen - wlen, COLS - col, NULL);

     

       2831
       2831
       -
       +	    len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL);

     

       2832
       2832
       -
        	  memcpy (wptr, buf, len);

     

       2833
       2833
       -
        	  wptr += len;

     

       2834
       2834
       -
        	  wlen += len;

     

       2835
       2835
       -
       diff -urN mutt-1.6.1/mutt_menu.h mutt-1.6.1-sidebar/mutt_menu.h

     

       2836
       2836
       -
       --- mutt-1.6.1/mutt_menu.h	2016-06-12 18:43:00.410447715 +0100

     

       2837
       2837
       -
       +++ mutt-1.6.1-sidebar/mutt_menu.h	2016-06-12 18:43:03.962503107 +0100

     

       2838
       2838
       -
       @@ -34,6 +34,9 @@

     

       2839
       2839
       -
        #define REDRAW_FULL		(1<<5)

     

       2840
       2840
       -
        #define REDRAW_BODY		(1<<6)

     

       2841
       2841
       -
        #define REDRAW_SIGWINCH		(1<<7)

     

       2842
       2842
       -
       +#ifdef USE_SIDEBAR

     

       2843
       2843
       -
       +#define REDRAW_SIDEBAR		(1<<8)

     

       2844
       2844
       -
       +#endif

     

       2845
       2845
       -
        

     

       2846
       2846
       -
        #define M_MODEFMT "-- Mutt: %s"

     

       2847
       2847
       -
        

     

       2848
       2848
       -
       diff -urN mutt-1.6.1/mx.c mutt-1.6.1-sidebar/mx.c

     

       2849
       2849
       -
       --- mutt-1.6.1/mx.c	2016-06-12 18:43:00.411447731 +0100

     

       2850
       2850
       -
       +++ mutt-1.6.1-sidebar/mx.c	2016-06-12 18:43:03.963503122 +0100

     

       2851
       2851
       -
       @@ -29,6 +29,9 @@

     

       2852
       2852
       -
        #include "copy.h"

     

       2853
       2853
       -
        #include "keymap.h"

     

       2854
       2854
       -
        #include "url.h"

     

       2855
       2855
       -
       +#ifdef USE_SIDEBAR

     

       2856
       2856
       -
       +#include "sidebar.h"

     

       2857
       2857
       -
       +#endif

     

       2858
       2858
       -
        

     

       2859
       2859
       -
        #ifdef USE_IMAP

     

       2860
       2860
       -
        #include "imap.h"

     

       2861
       2861
       -
       @@ -580,6 +583,7 @@

     

       2862
       2862
       -
         *		M_APPEND	open mailbox for appending

     

       2863
       2863
       -
         *		M_READONLY	open mailbox in read-only mode

     

       2864
       2864
       -
         *		M_QUIET		only print error messages

     

       2865
       2865
       -
       + *		M_PEEK		revert atime where applicable

     

       2866
       2866
       -
         *	ctx	if non-null, context struct to use

     

       2867
       2867
       -
         */

     

       2868
       2868
       -
        CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)

     

       2869
       2869
       -
       @@ -602,6 +606,10 @@

     

       2870
       2870
       -
            ctx->quiet = 1;

     

       2871
       2871
       -
          if (flags & M_READONLY)

     

       2872
       2872
       -
            ctx->readonly = 1;

     

       2873
       2873
       -
       +#ifdef USE_SIDEBAR

     

       2874
       2874
       -
       +  if (flags & M_PEEK)

     

       2875
       2875
       -
       +    ctx->peekonly = 1;

     

       2876
       2876
       -
       +#endif

     

       2877
       2877
       -
        

     

       2878
       2878
       -
          if (flags & (M_APPEND|M_NEWFOLDER))

     

       2879
       2879
       -
          {

     

       2880
       2880
       -
       @@ -705,8 +713,21 @@

     

       2881
       2881
       -
          if(!ctx) 

     

       2882
       2882
       -
            return;

     

       2883
       2883
       -
        

     

       2884
       2884
       -
       +#ifdef USE_SIDEBAR

     

       2885
       2885
       -
       +  /* fix up the times so buffy won't get confused */

     

       2886
       2886
       -
       +  struct utimbuf ut;

     

       2887
       2887
       -
       +  if (ctx->peekonly && ctx->path && (ctx->mtime > ctx->atime)) {

     

       2888
       2888
       -
       +    ut.actime  = ctx->atime;

     

       2889
       2889
       -
       +    ut.modtime = ctx->mtime;

     

       2890
       2890
       -
       +    utime (ctx->path, &ut);

     

       2891
       2891
       -
       +  }

     

       2892
       2892
       -
       +#endif

     

       2893
       2893
       -
       +

     

       2894
       2894
       -
          /* never announce that a mailbox we've just left has new mail. #3290

     

       2895
       2895
       -
           * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */

     

       2896
       2896
       -
       +#ifdef USE_SIDEBAR

     

       2897
       2897
       -
       +  if (!ctx->peekonly)

     

       2898
       2898
       -
       +#endif

     

       2899
       2899
       -
          mutt_buffy_setnotified(ctx->path);

     

       2900
       2900
       -
        

     

       2901
       2901
       -
          if (ctx->mx_close)

     

       2902
       2902
       -
       @@ -812,6 +833,12 @@

     

       2903
       2903
       -
            if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read 

     

       2904
       2904
       -
                && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))

     

       2905
       2905
       -
              read_msgs++;

     

       2906
       2906
       -
       +#ifdef USE_SIDEBAR

     

       2907
       2907
       -
       +    if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read)

     

       2908
       2908
       -
       +      ctx->unread--;

     

       2909
       2909
       -
       +    if (ctx->hdrs[i]->deleted && ctx->hdrs[i]->flagged)

     

       2910
       2910
       -
       +      ctx->flagged--;

     

       2911
       2911
       -
       +#endif

     

       2912
       2912
       -
          }

     

       2913
       2913
       -
        

     

       2914
       2914
       -
          if (read_msgs && quadoption (OPT_MOVE) != M_NO)

     

       2915
       2915
       -
       @@ -981,6 +1008,11 @@

     

       2916
       2916
       -
              !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))

     

       2917
       2917
       -
            mx_unlink_empty (ctx->path);

     

       2918
       2918
       -
        

     

       2919
       2919
       -
       +#ifdef USE_SIDEBAR

     

       2920
       2920
       -
       +  ctx->msgcount -= ctx->deleted;

     

       2921
       2921
       -
       +  mutt_sb_set_buffystats (ctx);

     

       2922
       2922
       -
       +#endif

     

       2923
       2923
       -
       +

     

       2924
       2924
       -
          mx_fastclose_mailbox (ctx);

     

       2925
       2925
       -
        

     

       2926
       2926
       -
          return 0;

     

       2927
       2927
       -
       diff -urN mutt-1.6.1/mx.h mutt-1.6.1-sidebar/mx.h

     

       2928
       2928
       -
       --- mutt-1.6.1/mx.h	2016-06-12 18:43:00.411447731 +0100

     

       2929
       2929
       -
       +++ mutt-1.6.1-sidebar/mx.h	2016-06-12 18:43:03.963503122 +0100

     

       2930
       2930
       -
       @@ -26,6 +26,7 @@

     

       2931
       2931
       -
        #define _MX_H

     

       2932
       2932
       -
        

     

       2933
       2933
       -
        #include "mailbox.h"

     

       2934
       2934
       -
       +#include "buffy.h"

     

       2935
       2935
       -
        

     

       2936
       2936
       -
        /* supported mailbox formats */

     

       2937
       2937
       -
        enum

     

       2938
       2938
       -
       @@ -57,6 +58,9 @@

     

       2939
       2939
       -
        int mh_read_dir (CONTEXT *, const char *);

     

       2940
       2940
       -
        int mh_sync_mailbox (CONTEXT *, int *);

     

       2941
       2941
       -
        int mh_check_mailbox (CONTEXT *, int *);

     

       2942
       2942
       -
       +#ifdef USE_SIDEBAR

     

       2943
       2943
       -
       +void mh_buffy_update (BUFFY *mailbox);

     

       2944
       2944
       -
       +#endif

     

       2945
       2945
       -
        int mh_check_empty (const char *);

     

       2946
       2946
       -
        

     

       2947
       2947
       -
        int maildir_read_dir (CONTEXT *);

     

       2948
       2948
       -
       diff -urN mutt-1.6.1/OPS.SIDEBAR mutt-1.6.1-sidebar/OPS.SIDEBAR

     

       2949
       2949
       -
       --- mutt-1.6.1/OPS.SIDEBAR	1970-01-01 01:00:00.000000000 +0100

     

       2950
       2950
       -
       +++ mutt-1.6.1-sidebar/OPS.SIDEBAR	2016-06-12 18:43:03.944502826 +0100

     

       2951
       2951
       -
       @@ -0,0 +1,8 @@

     

       2952
       2952
       -
       +OP_SIDEBAR_NEXT "Move the highlight to next mailbox"

     

       2953
       2953
       -
       +OP_SIDEBAR_NEXT_NEW "Move the highlight to next mailbox with new mail"

     

       2954
       2954
       -
       +OP_SIDEBAR_OPEN "Open highlighted mailbox"

     

       2955
       2955
       -
       +OP_SIDEBAR_PAGE_DOWN "Scroll the Sidebar down 1 page"

     

       2956
       2956
       -
       +OP_SIDEBAR_PAGE_UP "Scroll the Sidebar up 1 page"

     

       2957
       2957
       -
       +OP_SIDEBAR_PREV "Move the highlight to previous mailbox"

     

       2958
       2958
       -
       +OP_SIDEBAR_PREV_NEW "Move the highlight to previous mailbox with new mail"

     

       2959
       2959
       -
       +OP_SIDEBAR_TOGGLE_VISIBLE "Make the Sidebar (in)visible"

     

       2960
       2960
       -
       diff -urN mutt-1.6.1/pager.c mutt-1.6.1-sidebar/pager.c

     

       2961
       2961
       -
       --- mutt-1.6.1/pager.c	2016-06-12 18:43:00.412447746 +0100

     

       2962
       2962
       -
       +++ mutt-1.6.1-sidebar/pager.c	2016-06-12 18:43:03.964503138 +0100

     

       2963
       2963
       -
       @@ -29,6 +29,9 @@

     

       2964
       2964
       -
        #include "pager.h"

     

       2965
       2965
       -
        #include "attach.h"

     

       2966
       2966
       -
        #include "mbyte.h"

     

       2967
       2967
       -
       +#ifdef USE_SIDEBAR

     

       2968
       2968
       -
       +#include "sidebar.h"

     

       2969
       2969
       -
       +#endif

     

       2970
       2970
       -
        

     

       2971
       2971
       -
        #include "mutt_crypt.h"

     

       2972
       2972
       -
        

     

       2973
       2973
       -
       @@ -1491,7 +1494,7 @@

     

       2974
       2974
       -
           * a newline (grr!).

     

       2975
       2975
       -
           */

     

       2976
       2976
       -
        #ifndef USE_SLANG_CURSES

     

       2977
       2977
       -
       -    if (col < COLS)

     

       2978
       2978
       -
       +    if (col < (COLS - SidebarWidth))

     

       2979
       2979
       -
        #endif

     

       2980
       2980
       -
              addch ('\n');

     

       2981
       2981
       -
        

     

       2982
       2982
       -
       @@ -1573,6 +1576,7 @@

     

       2983
       2983
       -
        

     

       2984
       2984
       -
          int bodyoffset = 1;			/* offset of first line of real text */

     

       2985
       2985
       -
          int statusoffset = 0; 		/* offset for the status bar */

     

       2986
       2986
       -
       +  int statuswidth = COLS;

     

       2987
       2987
       -
          int helpoffset = LINES - 2;		/* offset for the help bar. */

     

       2988
       2988
       -
          int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */

     

       2989
       2989
       -
        

     

       2990
       2990
       -
       @@ -1747,7 +1751,7 @@

     

       2991
       2991
       -
            if ((redraw & REDRAW_BODY) || topline != oldtopline)

     

       2992
       2992
       -
            {

     

       2993
       2993
       -
              do {

     

       2994
       2994
       -
       -	move (bodyoffset, 0);

     

       2995
       2995
       -
       +	move (bodyoffset, SidebarWidth);

     

       2996
       2996
       -
        	curline = oldtopline = topline;

     

       2997
       2997
       -
        	lines = 0;

     

       2998
       2998
       -
        	force_redraw = 0;

     

       2999
       2999
       -
       @@ -1760,6 +1764,9 @@

     

       3000
       3000
       -
        			    &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)

     

       3001
       3001
       -
        	    lines++;

     

       3002
       3002
       -
        	  curline++;

     

       3003
       3003
       -
       +#ifdef USE_SIDEBAR

     

       3004
       3004
       -
       +	  move (lines + bodyoffset, SidebarWidth);

     

       3005
       3005
       -
       +#endif

     

       3006
       3006
       -
        	}

     

       3007
       3007
       -
        	last_offset = lineInfo[curline].offset;

     

       3008
       3008
       -
              } while (force_redraw);

     

       3009
       3009
       -
       @@ -1772,6 +1779,9 @@

     

       3010
       3010
       -
        	  addch ('~');

     

       3011
       3011
       -
        	addch ('\n');

     

       3012
       3012
       -
        	lines++;

     

       3013
       3013
       -
       +#ifdef USE_SIDEBAR

     

       3014
       3014
       -
       +	move (lines + bodyoffset, SidebarWidth);

     

       3015
       3015
       -
       +#endif

     

       3016
       3016
       -
              }

     

       3017
       3017
       -
              NORMAL_COLOR;

     

       3018
       3018
       -
        

     

       3019
       3019
       -
       @@ -1789,29 +1799,49 @@

     

       3020
       3020
       -
              hfi.ctx = Context;

     

       3021
       3021
       -
              hfi.pager_progress = pager_progress_str;

     

       3022
       3022
       -
        

     

       3023
       3023
       -
       +#ifdef USE_SIDEBAR

     

       3024
       3024
       -
       +      statuswidth = COLS;

     

       3025
       3025
       -
       +      if (option (OPTSTATUSONTOP) && (PagerIndexLines > 0))

     

       3026
       3026
       -
       +        statuswidth -= SidebarWidth;

     

       3027
       3027
       -
       +#endif

     

       3028
       3028
       -
       +

     

       3029
       3029
       -
              if (last_pos < sb.st_size - 1)

     

       3030
       3030
       -
        	snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size));

     

       3031
       3031
       -
              else

     

       3032
       3032
       -
        	strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));

     

       3033
       3033
       -
        

     

       3034
       3034
       -
              /* print out the pager status bar */

     

       3035
       3035
       -
       -      move (statusoffset, 0);

     

       3036
       3036
       -
       +      move (statusoffset, SidebarWidth);

     

       3037
       3037
       -
              SETCOLOR (MT_COLOR_STATUS);

     

       3038
       3038
       -
       +#ifdef USE_SIDEBAR

     

       3039
       3039
       -
       +      short sw = SidebarWidth;

     

       3040
       3040
       -
       +      if (option (OPTSTATUSONTOP) && PagerIndexLines > 0) {

     

       3041
       3041
       -
       +        CLEARLINE_WIN (statusoffset);

     

       3042
       3042
       -
       +      } else {

     

       3043
       3043
       -
       +        CLEARLINE (statusoffset);

     

       3044
       3044
       -
       +        /* Temporarily lie about the sidebar width */

     

       3045
       3045
       -
       +        SidebarWidth = 0;

     

       3046
       3046
       -
       +      }

     

       3047
       3047
       -
       +#endif

     

       3048
       3048
       -
        

     

       3049
       3049
       -
              if (IsHeader (extra) || IsMsgAttach (extra))

     

       3050
       3050
       -
              {

     

       3051
       3051
       -
       -	size_t l1 = COLS * MB_LEN_MAX;

     

       3052
       3052
       -
       +	size_t l1 = statuswidth * MB_LEN_MAX;

     

       3053
       3053
       -
        	size_t l2 = sizeof (buffer);

     

       3054
       3054
       -
        	hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;

     

       3055
       3055
       -
        	mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);

     

       3056
       3056
       -
       -	mutt_paddstr (COLS, buffer);

     

       3057
       3057
       -
       +	mutt_paddstr (statuswidth, buffer);

     

       3058
       3058
       -
              }

     

       3059
       3059
       -
              else

     

       3060
       3060
       -
              {

     

       3061
       3061
       -
        	char bn[STRING];

     

       3062
       3062
       -
        	snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);

     

       3063
       3063
       -
       -	mutt_paddstr (COLS, bn);

     

       3064
       3064
       -
       +	mutt_paddstr (statuswidth, bn);

     

       3065
       3065
       -
              }

     

       3066
       3066
       -
       +#ifdef USE_SIDEBAR

     

       3067
       3067
       -
       +      if (!option (OPTSTATUSONTOP) || PagerIndexLines == 0)

     

       3068
       3068
       -
       +        SidebarWidth = sw; /* Restore the sidebar width */

     

       3069
       3069
       -
       +#endif

     

       3070
       3070
       -
              NORMAL_COLOR;

     

       3071
       3071
       -
              if (option(OPTTSENABLED) && TSSupported)

     

       3072
       3072
       -
              {

     

       3073
       3073
       -
       @@ -1827,16 +1857,26 @@

     

       3074
       3074
       -
              /* redraw the pager_index indicator, because the

     

       3075
       3075
       -
               * flags for this message might have changed. */

     

       3076
       3076
       -
              menu_redraw_current (index);

     

       3077
       3077
       -
       +#ifdef USE_SIDEBAR

     

       3078
       3078
       -
       +      mutt_sb_draw();

     

       3079
       3079
       -
       +#endif

     

       3080
       3080
       -
        

     

       3081
       3081
       -
              /* print out the index status bar */

     

       3082
       3082
       -
              menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));

     

       3083
       3083
       -
         

     

       3084
       3084
       -
       -      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);

     

       3085
       3085
       -
       +      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),

     

       3086
       3086
       -
       +          (option(OPTSTATUSONTOP) ? 0: SidebarWidth));

     

       3087
       3087
       -
              SETCOLOR (MT_COLOR_STATUS);

     

       3088
       3088
       -
       -      mutt_paddstr (COLS, buffer);

     

       3089
       3089
       -
       +      mutt_paddstr (COLS - (option(OPTSTATUSONTOP) ? 0 : SidebarWidth), buffer);

     

       3090
       3090
       -
              NORMAL_COLOR;

     

       3091
       3091
       -
            }

     

       3092
       3092
       -
        

     

       3093
       3093
       -
       +#ifdef USE_SIDEBAR

     

       3094
       3094
       -
       +    /* if we're not using the index, update every time */

     

       3095
       3095
       -
       +    if (index == 0)

     

       3096
       3096
       -
       +      mutt_sb_draw();

     

       3097
       3097
       -
       +#endif

     

       3098
       3098
       -
       +

     

       3099
       3099
       -
            redraw = 0;

     

       3100
       3100
       -
        

     

       3101
       3101
       -
            if (option(OPTBRAILLEFRIENDLY)) {

     

       3102
       3102
       -
       @@ -2498,8 +2538,12 @@

     

       3103
       3103
       -
        	  ch = 0;

     

       3104
       3104
       -
        	}

     

       3105
       3105
       -
        

     

       3106
       3106
       -
       -	if (option (OPTFORCEREDRAWPAGER))

     

       3107
       3107
       -
       +	if (option (OPTFORCEREDRAWPAGER)) {

     

       3108
       3108
       -
        	  redraw = REDRAW_FULL;

     

       3109
       3109
       -
       +#ifdef USE_SIDEBAR

     

       3110
       3110
       -
       +	  mutt_sb_draw();

     

       3111
       3111
       -
       +#endif

     

       3112
       3112
       -
       +	}

     

       3113
       3113
       -
        	unset_option (OPTFORCEREDRAWINDEX);

     

       3114
       3114
       -
        	unset_option (OPTFORCEREDRAWPAGER);

     

       3115
       3115
       -
        	break;

     

       3116
       3116
       -
       @@ -2777,6 +2821,22 @@

     

       3117
       3117
       -
        	mutt_what_key ();

     

       3118
       3118
       -
        	break;

     

       3119
       3119
       -
        

     

       3120
       3120
       -
       +#ifdef USE_SIDEBAR

     

       3121
       3121
       -
       +      case OP_SIDEBAR_NEXT:

     

       3122
       3122
       -
       +      case OP_SIDEBAR_NEXT_NEW:

     

       3123
       3123
       -
       +      case OP_SIDEBAR_PAGE_DOWN:

     

       3124
       3124
       -
       +      case OP_SIDEBAR_PAGE_UP:

     

       3125
       3125
       -
       +      case OP_SIDEBAR_PREV:

     

       3126
       3126
       -
       +      case OP_SIDEBAR_PREV_NEW:

     

       3127
       3127
       -
       +	mutt_sb_change_mailbox (ch);

     

       3128
       3128
       -
       +	break;

     

       3129
       3129
       -
       +

     

       3130
       3130
       -
       +      case OP_SIDEBAR_TOGGLE_VISIBLE:

     

       3131
       3131
       -
       +	toggle_option (OPTSIDEBAR);

     

       3132
       3132
       -
       +	redraw = REDRAW_FULL;

     

       3133
       3133
       -
       +	break;

     

       3134
       3134
       -
       +#endif

     

       3135
       3135
       -
       +

     

       3136
       3136
       -
              default:

     

       3137
       3137
       -
        	ch = -1;

     

       3138
       3138
       -
        	break;

     

       3139
       3139
       -
       diff -urN mutt-1.6.1/PATCHES mutt-1.6.1-sidebar/PATCHES

     

       3140
       3140
       -
       --- mutt-1.6.1/PATCHES	2016-06-12 18:43:00.395447481 +0100

     

       3141
       3141
       -
       +++ mutt-1.6.1-sidebar/PATCHES	2016-06-12 18:43:03.949502904 +0100

     

       3142
       3142
       -
       @@ -0,0 +1 @@

     

       3143
       3143
       -
       +patch-sidebar-neo-20160612

     

       3144
       3144
       -
       diff -urN mutt-1.6.1/README.sidebar mutt-1.6.1-sidebar/README.sidebar

     

       3145
       3145
       -
       --- mutt-1.6.1/README.sidebar	1970-01-01 01:00:00.000000000 +0100

     

       3146
       3146
       -
       +++ mutt-1.6.1-sidebar/README.sidebar	2016-06-12 18:43:03.792500456 +0100

     

       3147
       3147
       -
       @@ -0,0 +1,145 @@

     

       3148
       3148
       -
       +Sidebar Patch

     

       3149
       3149
       -
       +=============

     

       3150
       3150
       -
       +

     

       3151
       3151
       -
       +    Overview of mailboxes

     

       3152
       3152
       -
       +

     

       3153
       3153
       -
       +    NOTES:

     

       3154
       3154
       -
       +

     

       3155
       3155
       -
       +    If you haven't used the sidebar before, you might like to read the

     

       3156
       3156
       -
       +    Sidebar Introduction:

     

       3157
       3157
       -
       +

     

       3158
       3158
       -
       +        http://www.neomutt.org/sidebar-intro.html

     

       3159
       3159
       -
       +

     

       3160
       3160
       -
       +    If you have used an older version of the Sidebar, please note that some

     

       3161
       3161
       -
       +    of the configuration has changed.

     

       3162
       3162
       -
       +

     

       3163
       3163
       -
       +        http://www.neomutt.org/sidebar-intro.html#intro-sidebar-config-changes

     

       3164
       3164
       -
       +

     

       3165
       3165
       -
       +Patch

     

       3166
       3166
       -
       +-----

     

       3167
       3167
       -
       +

     

       3168
       3168
       -
       +    To check if Mutt supports "Sidebar", look for "+USE_SIDEBAR" in the mutt

     

       3169
       3169
       -
       +    version.

     

       3170
       3170
       -
       +

     

       3171
       3171
       -
       +    Dependencies

     

       3172
       3172
       -
       +    * mutt-1.6.1

     

       3173
       3173
       -
       +

     

       3174
       3174
       -
       +Introduction

     

       3175
       3175
       -
       +------------

     

       3176
       3176
       -
       +

     

       3177
       3177
       -
       +    The Sidebar shows a list of all your mailboxes. The list can be turned on

     

       3178
       3178
       -
       +    and off, it can be themed and the list style can be configured.

     

       3179
       3179
       -
       +

     

       3180
       3180
       -
       +    This part of the manual is a reference guide. If you want a simple

     

       3181
       3181
       -
       +    introduction with examples see the Sidebar Howto. If you just want to get

     

       3182
       3182
       -
       +    started, you could use the sample Sidebar muttrc.

     

       3183
       3183
       -
       +

     

       3184
       3184
       -
       +    This version of Sidebar is based on Terry Chan's [2015-11-11

     

       3185
       3185
       -
       +    release](http://www.lunar-linux.org/mutt-sidebar/). It contains many new

     

       3186
       3186
       -
       +    features, lots of bugfixes.

     

       3187
       3187
       -
       +

     

       3188
       3188
       -
       +Variables

     

       3189
       3189
       -
       +---------

     

       3190
       3190
       -
       +

     

       3191
       3191
       -
       +    Sidebar Variables

     

       3192
       3192
       -
       +

     

       3193
       3193
       -
       +    | Name                    | Type    | Default                     |

     

       3194
       3194
       -
       +    |-------------------------|---------|-----------------------------|

     

       3195
       3195
       -
       +    | 'sidebar_delim_chars'   | string  | '/.'                        |

     

       3196
       3196
       -
       +    | 'sidebar_divider_char'  | string  | '|'                         |

     

       3197
       3197
       -
       +    | 'sidebar_folder_indent' | boolean | 'no'                        |

     

       3198
       3198
       -
       +    | 'sidebar_format'        | string  | '%B%?F? [%F]?%* %?N?%N/?%S' |

     

       3199
       3199
       -
       +    | 'sidebar_indent_string' | string  | '  ' (two spaces)           |

     

       3200
       3200
       -
       +    | 'sidebar_new_mail_only' | boolean | 'no'                        |

     

       3201
       3201
       -
       +    | 'sidebar_next_new_wrap' | boolean | 'no'                        |

     

       3202
       3202
       -
       +    | 'sidebar_refresh_time'  | number  | '60'                        |

     

       3203
       3203
       -
       +    | 'sidebar_short_path'    | boolean | 'no'                        |

     

       3204
       3204
       -
       +    | 'sidebar_sort_method'   | enum    | 'SORT_ORDER'                |

     

       3205
       3205
       -
       +    | 'sidebar_visible'       | boolean | 'no'                        |

     

       3206
       3206
       -
       +    | 'sidebar_whitelist'     | list    | (empty)                     |

     

       3207
       3207
       -
       +    | 'sidebar_width'         | number  | '20'                        |

     

       3208
       3208
       -
       +

     

       3209
       3209
       -
       +Functions

     

       3210
       3210
       -
       +---------

     

       3211
       3211
       -
       +

     

       3212
       3212
       -
       +    Sidebar Functions

     

       3213
       3213
       -
       +

     

       3214
       3214
       -
       +    Sidebar adds the following functions to Mutt. By default, none of them are

     

       3215
       3215
       -
       +    bound to keys.

     

       3216
       3216
       -
       +

     

       3217
       3217
       -
       +    | Menus       | Function                   | Description                                          |

     

       3218
       3218
       -
       +    |-------------|----------------------------|------------------------------------------------------|

     

       3219
       3219
       -
       +    | index,pager | '<sidebar-next>'           | Move the highlight to next mailbox                   |

     

       3220
       3220
       -
       +    | index,pager | '<sidebar-next-new>'       | Move the highlight to next mailbox with new mail     |

     

       3221
       3221
       -
       +    | index,pager | '<sidebar-open>'           | Open highlighted mailbox                             |

     

       3222
       3222
       -
       +    | index,pager | '<sidebar-page-down>'      | Scroll the Sidebar down 1 page                       |

     

       3223
       3223
       -
       +    | index,pager | '<sidebar-page-up>'        | Scroll the Sidebar up 1 page                         |

     

       3224
       3224
       -
       +    | index,pager | '<sidebar-prev>'           | Move the highlight to previous mailbox               |

     

       3225
       3225
       -
       +    | index,pager | '<sidebar-prev-new>'       | Move the highlight to previous mailbox with new mail |

     

       3226
       3226
       -
       +    | index,pager | '<sidebar-toggle-visible>' | Make the Sidebar (in)visible                         |

     

       3227
       3227
       -
       +

     

       3228
       3228
       -
       +Commands

     

       3229
       3229
       -
       +--------

     

       3230
       3230
       -
       +

     

       3231
       3231
       -
       +        sidebar_whitelist mailbox [ mailbox... ]

     

       3232
       3232
       -
       +

     

       3233
       3233
       -
       +Colors

     

       3234
       3234
       -
       +------

     

       3235
       3235
       -
       +

     

       3236
       3236
       -
       +    Sidebar Colors

     

       3237
       3237
       -
       +

     

       3238
       3238
       -
       +    | Name                | Default Color    | Description                                                      |

     

       3239
       3239
       -
       +    |---------------------|------------------|------------------------------------------------------------------|

     

       3240
       3240
       -
       +    | 'sidebar_divider'   | default          | The dividing line between the Sidebar and the Index/Pager panels |

     

       3241
       3241
       -
       +    | 'sidebar_flagged'   | default          | Mailboxes containing flagged mail                                |

     

       3242
       3242
       -
       +    | 'sidebar_highlight' | underline        | Cursor to select a mailbox                                       |

     

       3243
       3243
       -
       +    | 'sidebar_indicator' | mutt 'indicator' | The mailbox open in the Index panel                              |

     

       3244
       3244
       -
       +    | 'sidebar_new'       | default          | Mailboxes containing new mail                                    |

     

       3245
       3245
       -
       +    | 'sidebar_spoolfile' | default          | Mailbox that receives incoming mail                              |

     

       3246
       3246
       -
       +

     

       3247
       3247
       -
       +    If the sidebar_indicator color isn't set, then the default Mutt indicator

     

       3248
       3248
       -
       +    color will be used (the color used in the index panel).

     

       3249
       3249
       -
       +

     

       3250
       3250
       -
       +Sort

     

       3251
       3251
       -
       +----

     

       3252
       3252
       -
       +

     

       3253
       3253
       -
       +    Sidebar Sort

     

       3254
       3254
       -
       +

     

       3255
       3255
       -
       +    | Sort       | Description                |

     

       3256
       3256
       -
       +    |------------|----------------------------|

     

       3257
       3257
       -
       +    | 'alpha'    | Alphabetically by path     |

     

       3258
       3258
       -
       +    | 'count'    | Total number of messages   |

     

       3259
       3259
       -
       +    | 'flagged'  | Number of flagged messages |

     

       3260
       3260
       -
       +    | 'name'     | Alphabetically by path     |

     

       3261
       3261
       -
       +    | 'new'      | Number of new messages     |

     

       3262
       3262
       -
       +    | 'path'     | Alphabetically by path     |

     

       3263
       3263
       -
       +    | 'unsorted' | Do not resort the paths    |

     

       3264
       3264
       -
       +

     

       3265
       3265
       -
       +See Also

     

       3266
       3266
       -
       +--------

     

       3267
       3267
       -
       +

     

       3268
       3268
       -
       +    * Regular Expressions

     

       3269
       3269
       -
       +    * Patterns

     

       3270
       3270
       -
       +    * Color command

     

       3271
       3271
       -
       +    * notmuch patch

     

       3272
       3272
       -
       +

     

       3273
       3273
       -
       +Known Bugs

     

       3274
       3274
       -
       +----------

     

       3275
       3275
       -
       +

     

       3276
       3276
       -
       +    Unsorted isn't

     

       3277
       3277
       -
       +

     

       3278
       3278
       -
       +Credits

     

       3279
       3279
       -
       +-------

     

       3280
       3280
       -
       +

     

       3281
       3281
       -
       +    * Justin Hibbits <jrh29@po.cwru.edu>

     

       3282
       3282
       -
       +    * Thomer M. Gil <mutt@thomer.com>

     

       3283
       3283
       -
       +    * David Sterba <dsterba@suse.cz>

     

       3284
       3284
       -
       +    * Evgeni Golov <evgeni@debian.org>

     

       3285
       3285
       -
       +    * Fabian Groffen <grobian@gentoo.org>

     

       3286
       3286
       -
       +    * Jason DeTiberus <jdetiber@redhat.com>

     

       3287
       3287
       -
       +    * Stefan Assmann <sassmann@kpanic.de>

     

       3288
       3288
       -
       +    * Steve Kemp <steve@steve.org.uk>

     

       3289
       3289
       -
       +    * Terry Chan <tchan@lunar-linux.org>

     

       3290
       3290
       -
       +    * Tyler Earnest <tylere@rne.st>

     

       3291
       3291
       -
       +    * Richard Russon <rich@flatcap.org>

     

       3292
       3292
       -
       +

     

       3293
       3293
       -
       diff -urN mutt-1.6.1/sidebar.c mutt-1.6.1-sidebar/sidebar.c

     

       3294
       3294
       -
       --- mutt-1.6.1/sidebar.c	1970-01-01 01:00:00.000000000 +0100

     

       3295
       3295
       -
       +++ mutt-1.6.1-sidebar/sidebar.c	2016-06-14 18:46:00.000000000 +0100

     

       3296
       3296
       -
       @@ -0,0 +1,1090 @@

     

       3297
       3297
       -
       +/* Copyright (C) 2004 Justin Hibbits <jrh29@po.cwru.edu>

     

       3298
       3298
       -
       + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>

     

       3299
       3299
       -
       + * Copyright (C) 2015-2016 Richard Russon <rich@flatcap.org>

     

       3300
       3300
       -
       + *

     

       3301
       3301
       -
       + *     This program is free software; you can redistribute it and/or modify

     

       3302
       3302
       -
       + *     it under the terms of the GNU General Public License as published by

     

       3303
       3303
       -
       + *     the Free Software Foundation; either version 2 of the License, or

     

       3304
       3304
       -
       + *     (at your option) any later version.

     

       3305
       3305
       -
       + *

     

       3306
       3306
       -
       + *     This program is distributed in the hope that it will be useful,

     

       3307
       3307
       -
       + *     but WITHOUT ANY WARRANTY; without even the implied warranty of

     

       3308
       3308
       -
       + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

     

       3309
       3309
       -
       + *     GNU General Public License for more details.

     

       3310
       3310
       -
       + *

     

       3311
       3311
       -
       + *     You should have received a copy of the GNU General Public License

     

       3312
       3312
       -
       + *     along with this program; if not, write to the Free Software

     

       3313
       3313
       -
       + *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.

     

       3314
       3314
       -
       + */

     

       3315
       3315
       -
       +

     

       3316
       3316
       -
       +#if HAVE_CONFIG_H

     

       3317
       3317
       -
       +# include "config.h"

     

       3318
       3318
       -
       +#endif

     

       3319
       3319
       -
       +

     

       3320
       3320
       -
       +#include "mutt.h"

     

       3321
       3321
       -
       +#include "buffy.h"

     

       3322
       3322
       -
       +#include "keymap.h"

     

       3323
       3323
       -
       +#include "mutt_curses.h"

     

       3324
       3324
       -
       +#include "mutt_menu.h"

     

       3325
       3325
       -
       +#include "sort.h"

     

       3326
       3326
       -
       +

     

       3327
       3327
       -
       +/* Previous values for some sidebar config */

     

       3328
       3328
       -
       +static short  OldVisible;	/* sidebar_visible */

     

       3329
       3329
       -
       +static short  OldWidth;		/* sidebar_width */

     

       3330
       3330
       -
       +static short  PreviousSort;	/* sidebar_sort_method */

     

       3331
       3331
       -
       +static time_t LastRefresh;	/* Time of last refresh */

     

       3332
       3332
       -
       +

     

       3333
       3333
       -
       +/* Keep track of various BUFFYs */

     

       3334
       3334
       -
       +static BUFFY *TopBuffy;		/* First mailbox visible in sidebar */

     

       3335
       3335
       -
       +static BUFFY *OpnBuffy;		/* Current (open) mailbox */

     

       3336
       3336
       -
       +static BUFFY *HilBuffy;		/* Highlighted mailbox */

     

       3337
       3337
       -
       +static BUFFY *BotBuffy;		/* Last mailbox visible in sidebar */

     

       3338
       3338
       -
       +static BUFFY *Outgoing;		/* Last mailbox in the linked list */

     

       3339
       3339
       -
       +

     

       3340
       3340
       -
       +/**

     

       3341
       3341
       -
       + * struct sidebar_entry - Info about folders in the sidebar

     

       3342
       3342
       -
       + *

     

       3343
       3343
       -
       + * Used in the mutt_FormatString callback

     

       3344
       3344
       -
       + */

     

       3345
       3345
       -
       +struct sidebar_entry

     

       3346
       3346
       -
       +{

     

       3347
       3347
       -
       +  char         box[STRING];

     

       3348
       3348
       -
       +  BUFFY       *buffy;

     

       3349
       3349
       -
       +};

     

       3350
       3350
       -
       +

     

       3351
       3351
       -
       +

     

       3352
       3352
       -
       +/**

     

       3353
       3353
       -
       + * find_next_new - Find the next folder that contains new mail

     

       3354
       3354
       -
       + * @wrap: Wrap around to the beginning if the end is reached

     

       3355
       3355
       -
       + *

     

       3356
       3356
       -
       + * Search down the list of mail folders for one containing new mail.

     

       3357
       3357
       -
       + *

     

       3358
       3358
       -
       + * Returns:

     

       3359
       3359
       -
       + *	BUFFY*: Success

     

       3360
       3360
       -
       + *	NULL:   Failure

     

       3361
       3361
       -
       + */

     

       3362
       3362
       -
       +static BUFFY *find_next_new (int wrap)

     

       3363
       3363
       -
       +{

     

       3364
       3364
       -
       +  BUFFY *b = HilBuffy;

     

       3365
       3365
       -
       +  if (!b)

     

       3366
       3366
       -
       +    return NULL;

     

       3367
       3367
       -
       +

     

       3368
       3368
       -
       +  do

     

       3369
       3369
       -
       +  {

     

       3370
       3370
       -
       +    b = b->next;

     

       3371
       3371
       -
       +    if (!b && wrap)

     

       3372
       3372
       -
       +      b = Incoming;

     

       3373
       3373
       -
       +    if (!b || (b == HilBuffy))

     

       3374
       3374
       -
       +      break;

     

       3375
       3375
       -
       +    if (b->msg_unread > 0)

     

       3376
       3376
       -
       +      return b;

     

       3377
       3377
       -
       +  } while (b);

     

       3378
       3378
       -
       +

     

       3379
       3379
       -
       +  return NULL;

     

       3380
       3380
       -
       +}

     

       3381
       3381
       -
       +

     

       3382
       3382
       -
       +/**

     

       3383
       3383
       -
       + * find_prev_new - Find the previous folder that contains new mail

     

       3384
       3384
       -
       + * @wrap: Wrap around to the beginning if the end is reached

     

       3385
       3385
       -
       + *

     

       3386
       3386
       -
       + * Search up the list of mail folders for one containing new mail.

     

       3387
       3387
       -
       + *

     

       3388
       3388
       -
       + * Returns:

     

       3389
       3389
       -
       + *	BUFFY*: Success

     

       3390
       3390
       -
       + *	NULL:   Failure

     

       3391
       3391
       -
       + */

     

       3392
       3392
       -
       +static BUFFY *find_prev_new (int wrap)

     

       3393
       3393
       -
       +{

     

       3394
       3394
       -
       +  BUFFY *b = HilBuffy;

     

       3395
       3395
       -
       +  if (!b)

     

       3396
       3396
       -
       +    return NULL;

     

       3397
       3397
       -
       +

     

       3398
       3398
       -
       +  do

     

       3399
       3399
       -
       +  {

     

       3400
       3400
       -
       +    b = b->prev;

     

       3401
       3401
       -
       +    if (!b && wrap)

     

       3402
       3402
       -
       +      b = Outgoing;

     

       3403
       3403
       -
       +    if (!b || (b == HilBuffy))

     

       3404
       3404
       -
       +      break;

     

       3405
       3405
       -
       +    if (b->msg_unread > 0)

     

       3406
       3406
       -
       +      return b;

     

       3407
       3407
       -
       +  } while (b);

     

       3408
       3408
       -
       +

     

       3409
       3409
       -
       +  return NULL;

     

       3410
       3410
       -
       +}

     

       3411
       3411
       -
       +

     

       3412
       3412
       -
       +/**

     

       3413
       3413
       -
       + * cb_format_str - Create the string to show in the sidebar

     

       3414
       3414
       -
       + * @dest:        Buffer in which to save string

     

       3415
       3415
       -
       + * @destlen:     Buffer length

     

       3416
       3416
       -
       + * @col:         Starting column, UNUSED

     

       3417
       3417
       -
       + * @op:          printf-like operator, e.g. 'B'

     

       3418
       3418
       -
       + * @src:         printf-like format string

     

       3419
       3419
       -
       + * @prefix:      Field formatting string, UNUSED

     

       3420
       3420
       -
       + * @ifstring:    If condition is met, display this string

     

       3421
       3421
       -
       + * @elsestring:  Otherwise, display this string

     

       3422
       3422
       -
       + * @data:        Pointer to our sidebar_entry

     

       3423
       3423
       -
       + * @flags:       Format flags, e.g. M_FORMAT_OPTIONAL

     

       3424
       3424
       -
       + *

     

       3425
       3425
       -
       + * cb_format_str is a callback function for mutt_FormatString.  It understands

     

       3426
       3426
       -
       + * five operators. '%B' : Mailbox name, '%F' : Number of flagged messages,

     

       3427
       3427
       -
       + * '%N' : Number of new messages, '%S' : Size (total number of messages),

     

       3428
       3428
       -
       + * '%!' : Icon denoting number of flagged messages.

     

       3429
       3429
       -
       + *

     

       3430
       3430
       -
       + * Returns: src (unchanged)

     

       3431
       3431
       -
       + */

     

       3432
       3432
       -
       +static const char *cb_format_str(char *dest, size_t destlen, size_t col, char op,

     

       3433
       3433
       -
       +                                 const char *src, const char *prefix, const char *ifstring,

     

       3434
       3434
       -
       +                                 const char *elsestring, unsigned long data, format_flag flags)

     

       3435
       3435
       -
       +{

     

       3436
       3436
       -
       +  struct sidebar_entry *sbe = (struct sidebar_entry *) data;

     

       3437
       3437
       -
       +  unsigned int optional;

     

       3438
       3438
       -
       +  char fmt[STRING];

     

       3439
       3439
       -
       +

     

       3440
       3440
       -
       +  if (!sbe || !dest)

     

       3441
       3441
       -
       +    return src;

     

       3442
       3442
       -
       +

     

       3443
       3443
       -
       +  dest[0] = 0;	/* Just in case there's nothing to do */

     

       3444
       3444
       -
       +

     

       3445
       3445
       -
       +  BUFFY *b = sbe->buffy;

     

       3446
       3446
       -
       +  if (!b)

     

       3447
       3447
       -
       +    return src;

     

       3448
       3448
       -
       +

     

       3449
       3449
       -
       +  int c = Context && (mutt_strcmp (Context->path, b->path) == 0);

     

       3450
       3450
       -
       +

     

       3451
       3451
       -
       +  optional = flags & M_FORMAT_OPTIONAL;

     

       3452
       3452
       -
       +

     

       3453
       3453
       -
       +  switch (op)

     

       3454
       3454
       -
       +  {

     

       3455
       3455
       -
       +    case 'B':

     

       3456
       3456
       -
       +      mutt_format_s (dest, destlen, prefix, sbe->box);

     

       3457
       3457
       -
       +      break;

     

       3458
       3458
       -
       +

     

       3459
       3459
       -
       +    case 'd':

     

       3460
       3460
       -
       +      if (!optional)

     

       3461
       3461
       -
       +      {

     

       3462
       3462
       -
       +        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);

     

       3463
       3463
       -
       +        snprintf (dest, destlen, fmt, c ? Context->deleted : 0);

     

       3464
       3464
       -
       +      }

     

       3465
       3465
       -
       +      else if ((c && Context->deleted == 0) || !c)

     

       3466
       3466
       -
       +        optional = 0;

     

       3467
       3467
       -
       +      break;

     

       3468
       3468
       -
       +

     

       3469
       3469
       -
       +    case 'F':

     

       3470
       3470
       -
       +      if (!optional)

     

       3471
       3471
       -
       +      {

     

       3472
       3472
       -
       +        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);

     

       3473
       3473
       -
       +        snprintf (dest, destlen, fmt, b->msg_flagged);

     

       3474
       3474
       -
       +      }

     

       3475
       3475
       -
       +      else if (b->msg_flagged == 0)

     

       3476
       3476
       -
       +        optional = 0;

     

       3477
       3477
       -
       +      break;

     

       3478
       3478
       -
       +

     

       3479
       3479
       -
       +    case 'L':

     

       3480
       3480
       -
       +      if (!optional)

     

       3481
       3481
       -
       +      {

     

       3482
       3482
       -
       +        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);

     

       3483
       3483
       -
       +        snprintf (dest, destlen, fmt, c ? Context->vcount : b->msg_count);

     

       3484
       3484
       -
       +      }

     

       3485
       3485
       -
       +      else if ((c && Context->vcount == b->msg_count) || !c)

     

       3486
       3486
       -
       +        optional = 0;

     

       3487
       3487
       -
       +      break;

     

       3488
       3488
       -
       +

     

       3489
       3489
       -
       +    case 'N':

     

       3490
       3490
       -
       +      if (!optional)

     

       3491
       3491
       -
       +      {

     

       3492
       3492
       -
       +        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);

     

       3493
       3493
       -
       +        snprintf (dest, destlen, fmt, b->msg_unread);

     

       3494
       3494
       -
       +      }

     

       3495
       3495
       -
       +      else if (b->msg_unread == 0)

     

       3496
       3496
       -
       +        optional = 0;

     

       3497
       3497
       -
       +      break;

     

       3498
       3498
       -
       +

     

       3499
       3499
       -
       +    case 'S':

     

       3500
       3500
       -
       +      if (!optional)

     

       3501
       3501
       -
       +      {

     

       3502
       3502
       -
       +        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);

     

       3503
       3503
       -
       +        snprintf (dest, destlen, fmt, b->msg_count);

     

       3504
       3504
       -
       +      }

     

       3505
       3505
       -
       +      else if (b->msg_count == 0)

     

       3506
       3506
       -
       +        optional = 0;

     

       3507
       3507
       -
       +      break;

     

       3508
       3508
       -
       +

     

       3509
       3509
       -
       +    case 't':

     

       3510
       3510
       -
       +      if (!optional)

     

       3511
       3511
       -
       +      {

     

       3512
       3512
       -
       +        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);

     

       3513
       3513
       -
       +        snprintf (dest, destlen, fmt, c ? Context->tagged : 0);

     

       3514
       3514
       -
       +      }

     

       3515
       3515
       -
       +      else if ((c && Context->tagged == 0) || !c)

     

       3516
       3516
       -
       +        optional = 0;

     

       3517
       3517
       -
       +      break;

     

       3518
       3518
       -
       +

     

       3519
       3519
       -
       +    case '!':

     

       3520
       3520
       -
       +      if (b->msg_flagged == 0)

     

       3521
       3521
       -
       +        mutt_format_s (dest, destlen, prefix, "");

     

       3522
       3522
       -
       +      else if (b->msg_flagged == 1)

     

       3523
       3523
       -
       +        mutt_format_s (dest, destlen, prefix, "!");

     

       3524
       3524
       -
       +      else if (b->msg_flagged == 2)

     

       3525
       3525
       -
       +        mutt_format_s (dest, destlen, prefix, "!!");

     

       3526
       3526
       -
       +      else

     

       3527
       3527
       -
       +      {

     

       3528
       3528
       -
       +        snprintf (fmt, sizeof (fmt), "%d!", b->msg_flagged);

     

       3529
       3529
       -
       +        mutt_format_s (dest, destlen, prefix, fmt);

     

       3530
       3530
       -
       +      }

     

       3531
       3531
       -
       +      break;

     

       3532
       3532
       -
       +  }

     

       3533
       3533
       -
       +

     

       3534
       3534
       -
       +  if (optional)

     

       3535
       3535
       -
       +    mutt_FormatString (dest, destlen, col, ifstring,   cb_format_str, (unsigned long) sbe, flags);

     

       3536
       3536
       -
       +  else if (flags & M_FORMAT_OPTIONAL)

     

       3537
       3537
       -
       +    mutt_FormatString (dest, destlen, col, elsestring, cb_format_str, (unsigned long) sbe, flags);

     

       3538
       3538
       -
       +

     

       3539
       3539
       -
       +  /* We return the format string, unchanged */

     

       3540
       3540
       -
       +  return src;

     

       3541
       3541
       -
       +}

     

       3542
       3542
       -
       +

     

       3543
       3543
       -
       +/**

     

       3544
       3544
       -
       + * make_sidebar_entry - Turn mailbox data into a sidebar string

     

       3545
       3545
       -
       + * @buf:     Buffer in which to save string

     

       3546
       3546
       -
       + * @buflen:  Buffer length

     

       3547
       3547
       -
       + * @width:   Desired width in screen cells

     

       3548
       3548
       -
       + * @box:     Mailbox name

     

       3549
       3549
       -
       + * @size:    Size (total number of messages)

     

       3550
       3550
       -
       + * @new:     Number of new messages

     

       3551
       3551
       -
       + * @flagged: Number of flagged messages

     

       3552
       3552
       -
       + *

     

       3553
       3553
       -
       + * Take all the relevant mailbox data and the desired screen width and then get

     

       3554
       3554
       -
       + * mutt_FormatString to do the actual work. mutt_FormatString will callback to

     

       3555
       3555
       -
       + * us using cb_format_str() for the sidebar specific formatting characters.

     

       3556
       3556
       -
       + */

     

       3557
       3557
       -
       +static void make_sidebar_entry (char *buf, unsigned int buflen, int width, char *box,

     

       3558
       3558
       -
       +                                BUFFY *b)

     

       3559
       3559
       -
       +{

     

       3560
       3560
       -
       +  struct sidebar_entry sbe;

     

       3561
       3561
       -
       +

     

       3562
       3562
       -
       +  if (!buf || !box || !b)

     

       3563
       3563
       -
       +    return;

     

       3564
       3564
       -
       +

     

       3565
       3565
       -
       +  sbe.buffy = b;

     

       3566
       3566
       -
       +  strfcpy (sbe.box, box, sizeof (sbe.box));

     

       3567
       3567
       -
       +

     

       3568
       3568
       -
       +  /* Temporarily lie about the screen width */

     

       3569
       3569
       -
       +  int oc = COLS;

     

       3570
       3570
       -
       +  COLS = width + SidebarWidth;

     

       3571
       3571
       -
       +  mutt_FormatString (buf, buflen, 0, NONULL(SidebarFormat), cb_format_str, (unsigned long) &sbe, 0);

     

       3572
       3572
       -
       +  COLS = oc;

     

       3573
       3573
       -
       +

     

       3574
       3574
       -
       +  /* Force string to be exactly the right width */

     

       3575
       3575
       -
       +  int w = mutt_strwidth (buf);

     

       3576
       3576
       -
       +  int s = strlen (buf);

     

       3577
       3577
       -
       +  width = MIN(buflen, width);

     

       3578
       3578
       -
       +  if (w < width)

     

       3579
       3579
       -
       +  {

     

       3580
       3580
       -
       +    /* Pad with spaces */

     

       3581
       3581
       -
       +    memset (buf + s, ' ', width - w);

     

       3582
       3582
       -
       +    buf[s + width - w] = 0;

     

       3583
       3583
       -
       +  }

     

       3584
       3584
       -
       +  else if (w > width)

     

       3585
       3585
       -
       +  {

     

       3586
       3586
       -
       +    /* Truncate to fit */

     

       3587
       3587
       -
       +    int len = mutt_wstr_trunc (buf, buflen, width, NULL);

     

       3588
       3588
       -
       +    buf[len] = 0;

     

       3589
       3589
       -
       +  }

     

       3590
       3590
       -
       +}

     

       3591
       3591
       -
       +

     

       3592
       3592
       -
       +/**

     

       3593
       3593
       -
       + * cb_qsort_buffy - qsort callback to sort BUFFYs

     

       3594
       3594
       -
       + * @a: First  BUFFY to compare

     

       3595
       3595
       -
       + * @b: Second BUFFY to compare

     

       3596
       3596
       -
       + *

     

       3597
       3597
       -
       + * Compare the paths of two BUFFYs taking the locale into account.

     

       3598
       3598
       -
       + *

     

       3599
       3599
       -
       + * Returns:

     

       3600
       3600
       -
       + *	-1: a precedes b

     

       3601
       3601
       -
       + *	 0: a and b are identical

     

       3602
       3602
       -
       + *	 1: b precedes a

     

       3603
       3603
       -
       + */

     

       3604
       3604
       -
       +static int cb_qsort_buffy (const void *a, const void *b)

     

       3605
       3605
       -
       +{

     

       3606
       3606
       -
       +  const BUFFY *b1 = *(const BUFFY **) a;

     

       3607
       3607
       -
       +  const BUFFY *b2 = *(const BUFFY **) b;

     

       3608
       3608
       -
       +

     

       3609
       3609
       -
       +  /* Special case -- move hidden BUFFYs to the end */

     

       3610
       3610
       -
       +  if (b1->is_hidden != b2->is_hidden)

     

       3611
       3611
       -
       +  {

     

       3612
       3612
       -
       +    if (b1->is_hidden)

     

       3613
       3613
       -
       +      return 1;

     

       3614
       3614
       -
       +    else

     

       3615
       3615
       -
       +      return -1;

     

       3616
       3616
       -
       +  }

     

       3617
       3617
       -
       +

     

       3618
       3618
       -
       +  int result = 0;

     

       3619
       3619
       -
       +

     

       3620
       3620
       -
       +  switch ((SidebarSortMethod & SORT_MASK))

     

       3621
       3621
       -
       +  {

     

       3622
       3622
       -
       +    case SORT_COUNT:

     

       3623
       3623
       -
       +      result = (b2->msg_count - b1->msg_count);

     

       3624
       3624
       -
       +      break;

     

       3625
       3625
       -
       +    case SORT_COUNT_NEW:

     

       3626
       3626
       -
       +      result = (b2->msg_unread - b1->msg_unread);

     

       3627
       3627
       -
       +      break;

     

       3628
       3628
       -
       +    case SORT_FLAGGED:

     

       3629
       3629
       -
       +      result = (b2->msg_flagged - b1->msg_flagged);

     

       3630
       3630
       -
       +      break;

     

       3631
       3631
       -
       +    case SORT_PATH:

     

       3632
       3632
       -
       +      result = mutt_strcasecmp (b1->path, b2->path);

     

       3633
       3633
       -
       +      break;

     

       3634
       3634
       -
       +  }

     

       3635
       3635
       -
       +

     

       3636
       3636
       -
       +  if (SidebarSortMethod & SORT_REVERSE)

     

       3637
       3637
       -
       +    result = -result;

     

       3638
       3638
       -
       +

     

       3639
       3639
       -
       +  return result;

     

       3640
       3640
       -
       +}

     

       3641
       3641
       -
       +

     

       3642
       3642
       -
       +/**

     

       3643
       3643
       -
       + * buffy_going - Prevent our pointers becoming invalid

     

       3644
       3644
       -
       + * @b: BUFFY about to be deleted

     

       3645
       3645
       -
       + *

     

       3646
       3646
       -
       + * If we receive a delete-notification for a BUFFY, we need to change any

     

       3647
       3647
       -
       + * pointers we have to reference a different BUFFY, or set them to NULL.

     

       3648
       3648
       -
       + *

     

       3649
       3649
       -
       + * We don't update the prev/next pointers, they'll be fixed on the next

     

       3650
       3650
       -
       + * call to prepare_sidebar().

     

       3651
       3651
       -
       + *

     

       3652
       3652
       -
       + * Returns:

     

       3653
       3653
       -
       + *	A valid alternative BUFFY, or NULL

     

       3654
       3654
       -
       + */

     

       3655
       3655
       -
       +static BUFFY *buffy_going (const BUFFY *b)

     

       3656
       3656
       -
       +{

     

       3657
       3657
       -
       +  if (!b)

     

       3658
       3658
       -
       +    return NULL;

     

       3659
       3659
       -
       +

     

       3660
       3660
       -
       +  if (b->prev)

     

       3661
       3661
       -
       +  {

     

       3662
       3662
       -
       +    b->prev->next = NULL;

     

       3663
       3663
       -
       +  }

     

       3664
       3664
       -
       +

     

       3665
       3665
       -
       +  if (b->next)

     

       3666
       3666
       -
       +  {

     

       3667
       3667
       -
       +    b->next->prev = NULL;

     

       3668
       3668
       -
       +    return b->next;

     

       3669
       3669
       -
       +  }

     

       3670
       3670
       -
       +

     

       3671
       3671
       -
       +  return b->prev;

     

       3672
       3672
       -
       +}

     

       3673
       3673
       -
       +

     

       3674
       3674
       -
       +/**

     

       3675
       3675
       -
       + * update_buffy_visibility - Should a BUFFY be displayed in the sidebar

     

       3676
       3676
       -
       + * @arr:     array of BUFFYs

     

       3677
       3677
       -
       + * @arr_len: number of BUFFYs in array

     

       3678
       3678
       -
       + *

     

       3679
       3679
       -
       + * For each BUFFY in the array, check whether we should display it.

     

       3680
       3680
       -
       + * This is determined by several criteria.  If the BUFFY:

     

       3681
       3681
       -
       + *	is the currently open mailbox

     

       3682
       3682
       -
       + *	is the currently highlighted mailbox

     

       3683
       3683
       -
       + *	has unread messages

     

       3684
       3684
       -
       + *	has flagged messages

     

       3685
       3685
       -
       + *	is whitelisted

     

       3686
       3686
       -
       + */

     

       3687
       3687
       -
       +static void update_buffy_visibility (BUFFY **arr, int arr_len)

     

       3688
       3688
       -
       +{

     

       3689
       3689
       -
       +  if (!arr)

     

       3690
       3690
       -
       +    return;

     

       3691
       3691
       -
       +

     

       3692
       3692
       -
       +  short new_only = option (OPTSIDEBARNEWMAILONLY);

     

       3693
       3693
       -
       +

     

       3694
       3694
       -
       +  BUFFY *b;

     

       3695
       3695
       -
       +  int i;

     

       3696
       3696
       -
       +  for (i = 0; i < arr_len; i++)

     

       3697
       3697
       -
       +  {

     

       3698
       3698
       -
       +    b = arr[i];

     

       3699
       3699
       -
       +

     

       3700
       3700
       -
       +    b->is_hidden = 0;

     

       3701
       3701
       -
       +

     

       3702
       3702
       -
       +    if (!new_only)

     

       3703
       3703
       -
       +      continue;

     

       3704
       3704
       -
       +

     

       3705
       3705
       -
       +    if ((b == OpnBuffy) || (b->msg_unread  > 0) ||

     

       3706
       3706
       -
       +        (b == HilBuffy) || (b->msg_flagged > 0))

     

       3707
       3707
       -
       +      continue;

     

       3708
       3708
       -
       +

     

       3709
       3709
       -
       +    if (Context && (strcmp (b->path, Context->path) == 0))

     

       3710
       3710
       -
       +      /* Spool directory */

     

       3711
       3711
       -
       +      continue;

     

       3712
       3712
       -
       +

     

       3713
       3713
       -
       +    if (mutt_find_list (SidebarWhitelist, b->path))

     

       3714
       3714
       -
       +      /* Explicitly asked to be visible */

     

       3715
       3715
       -
       +      continue;

     

       3716
       3716
       -
       +

     

       3717
       3717
       -
       +    b->is_hidden = 1;

     

       3718
       3718
       -
       +  }

     

       3719
       3719
       -
       +}

     

       3720
       3720
       -
       +

     

       3721
       3721
       -
       +/**

     

       3722
       3722
       -
       + * sort_buffy_array - Sort an array of BUFFY pointers

     

       3723
       3723
       -
       + * @arr:     array of BUFFYs

     

       3724
       3724
       -
       + * @arr_len: number of BUFFYs in array

     

       3725
       3725
       -
       + *

     

       3726
       3726
       -
       + * Sort an array of BUFFY pointers according to the current sort config

     

       3727
       3727
       -
       + * option "sidebar_sort_method". This calls qsort to do the work which calls our

     

       3728
       3728
       -
       + * callback function "cb_qsort_buffy".

     

       3729
       3729
       -
       + *

     

       3730
       3730
       -
       + * Once sorted, the prev/next links will be reconstructed.

     

       3731
       3731
       -
       + */

     

       3732
       3732
       -
       +static void sort_buffy_array (BUFFY **arr, int arr_len)

     

       3733
       3733
       -
       +{

     

       3734
       3734
       -
       +  if (!arr)

     

       3735
       3735
       -
       +    return;

     

       3736
       3736
       -
       +

     

       3737
       3737
       -
       +  /* These are the only sort methods we understand */

     

       3738
       3738
       -
       +  short ssm = (SidebarSortMethod & SORT_MASK);

     

       3739
       3739
       -
       +  if ((ssm == SORT_COUNT)     ||

     

       3740
       3740
       -
       +      (ssm == SORT_COUNT_NEW) ||

     

       3741
       3741
       -
       +      (ssm == SORT_DESC)      ||

     

       3742
       3742
       -
       +      (ssm == SORT_FLAGGED)   ||

     

       3743
       3743
       -
       +      (ssm == SORT_PATH))

     

       3744
       3744
       -
       +    qsort (arr, arr_len, sizeof (*arr), cb_qsort_buffy);

     

       3745
       3745
       -
       +

     

       3746
       3746
       -
       +  int i;

     

       3747
       3747
       -
       +  for (i = 0; i < (arr_len - 1); i++)

     

       3748
       3748
       -
       +    arr[i]->next = arr[i + 1];

     

       3749
       3749
       -
       +  arr[arr_len - 1]->next = NULL;

     

       3750
       3750
       -
       +

     

       3751
       3751
       -
       +  for (i = 1; i < arr_len; i++)

     

       3752
       3752
       -
       +    arr[i]->prev = arr[i - 1];

     

       3753
       3753
       -
       +  arr[0]->prev = NULL;

     

       3754
       3754
       -
       +}

     

       3755
       3755
       -
       +

     

       3756
       3756
       -
       +/**

     

       3757
       3757
       -
       + * prepare_sidebar - Prepare the list of BUFFYs for the sidebar display

     

       3758
       3758
       -
       + * @page_size:  The number of lines on a page

     

       3759
       3759
       -
       + *

     

       3760
       3760
       -
       + * Before painting the sidebar, we count the BUFFYs, determine which are

     

       3761
       3761
       -
       + * visible, sort them and set up our page pointers.

     

       3762
       3762
       -
       + *

     

       3763
       3763
       -
       + * This is a lot of work to do each refresh, but there are many things that

     

       3764
       3764
       -
       + * can change outside of the sidebar that we don't hear about.

     

       3765
       3765
       -
       + *

     

       3766
       3766
       -
       + * Returns:

     

       3767
       3767
       -
       + *	0: No, don't draw the sidebar

     

       3768
       3768
       -
       + *	1: Yes, draw the sidebar

     

       3769
       3769
       -
       + */

     

       3770
       3770
       -
       +static int prepare_sidebar (int page_size)

     

       3771
       3771
       -
       +{

     

       3772
       3772
       -
       +  BUFFY *b = Incoming;

     

       3773
       3773
       -
       +  if (!b)

     

       3774
       3774
       -
       +    return 0;

     

       3775
       3775
       -
       +

     

       3776
       3776
       -
       +  int count = 0;

     

       3777
       3777
       -
       +  for (; b; b = b->next)

     

       3778
       3778
       -
       +    count++;

     

       3779
       3779
       -
       +

     

       3780
       3780
       -
       +  BUFFY **arr = safe_malloc (count * sizeof (*arr));

     

       3781
       3781
       -
       +

     

       3782
       3782
       -
       +  int i = 0;

     

       3783
       3783
       -
       +  for (b = Incoming; b; b = b->next, i++)

     

       3784
       3784
       -
       +    arr[i] = b;

     

       3785
       3785
       -
       +

     

       3786
       3786
       -
       +  update_buffy_visibility (arr, count);

     

       3787
       3787
       -
       +  sort_buffy_array        (arr, count);

     

       3788
       3788
       -
       +

     

       3789
       3789
       -
       +  Incoming = arr[0];

     

       3790
       3790
       -
       +

     

       3791
       3791
       -
       +  int top_index =  0;

     

       3792
       3792
       -
       +  int opn_index = -1;

     

       3793
       3793
       -
       +  int hil_index = -1;

     

       3794
       3794
       -
       +  int bot_index = -1;

     

       3795
       3795
       -
       +

     

       3796
       3796
       -
       +  for (i = 0; i < count; i++)

     

       3797
       3797
       -
       +  {

     

       3798
       3798
       -
       +    if (OpnBuffy == arr[i])

     

       3799
       3799
       -
       +      opn_index = i;

     

       3800
       3800
       -
       +    if (HilBuffy == arr[i])

     

       3801
       3801
       -
       +      hil_index = i;

     

       3802
       3802
       -
       +  }

     

       3803
       3803
       -
       +

     

       3804
       3804
       -
       +  if (!HilBuffy || (SidebarSortMethod != PreviousSort))

     

       3805
       3805
       -
       +  {

     

       3806
       3806
       -
       +    if (OpnBuffy)

     

       3807
       3807
       -
       +    {

     

       3808
       3808
       -
       +      HilBuffy  = OpnBuffy;

     

       3809
       3809
       -
       +      hil_index = opn_index;

     

       3810
       3810
       -
       +    }

     

       3811
       3811
       -
       +    else

     

       3812
       3812
       -
       +    {

     

       3813
       3813
       -
       +      HilBuffy  = arr[0];

     

       3814
       3814
       -
       +      hil_index = 0;

     

       3815
       3815
       -
       +    }

     

       3816
       3816
       -
       +  }

     

       3817
       3817
       -
       +  if (TopBuffy)

     

       3818
       3818
       -
       +    top_index = (hil_index / page_size) * page_size;

     

       3819
       3819
       -
       +  else

     

       3820
       3820
       -
       +    top_index = hil_index;

     

       3821
       3821
       -
       +  TopBuffy = arr[top_index];

     

       3822
       3822
       -
       +

     

       3823
       3823
       -
       +  bot_index = top_index + page_size - 1;

     

       3824
       3824
       -
       +  if (bot_index > (count - 1))

     

       3825
       3825
       -
       +    bot_index = count - 1;

     

       3826
       3826
       -
       +  BotBuffy  = arr[bot_index];

     

       3827
       3827
       -
       +

     

       3828
       3828
       -
       +  Outgoing = arr[count - 1];

     

       3829
       3829
       -
       +

     

       3830
       3830
       -
       +  PreviousSort = SidebarSortMethod;

     

       3831
       3831
       -
       +  FREE (&arr);

     

       3832
       3832
       -
       +  return 1;

     

       3833
       3833
       -
       +}

     

       3834
       3834
       -
       +

     

       3835
       3835
       -
       +/**

     

       3836
       3836
       -
       + * visible - Should we display the sidebar?

     

       3837
       3837
       -
       + *

     

       3838
       3838
       -
       + * After validating the config options "sidebar_visible" and "sidebar_width",

     

       3839
       3839
       -
       + * determine whether we should should display the sidebar.

     

       3840
       3840
       -
       + *

     

       3841
       3841
       -
       + * When not visible, set the global SidebarWidth to 0.

     

       3842
       3842
       -
       + *

     

       3843
       3843
       -
       + * Returns:

     

       3844
       3844
       -
       + *	Boolean

     

       3845
       3845
       -
       + */

     

       3846
       3846
       -
       +static short

     

       3847
       3847
       -
       +visible (void)

     

       3848
       3848
       -
       +{

     

       3849
       3849
       -
       +  short new_visible = option (OPTSIDEBAR);

     

       3850
       3850
       -
       +  short new_width   = SidebarWidth;

     

       3851
       3851
       -
       +

     

       3852
       3852
       -
       +  if (OldWidth != new_width)

     

       3853
       3853
       -
       +  {

     

       3854
       3854
       -
       +    if (new_width > 0)

     

       3855
       3855
       -
       +    {

     

       3856
       3856
       -
       +      OldWidth = new_width;

     

       3857
       3857
       -
       +    }

     

       3858
       3858
       -
       +  }

     

       3859
       3859
       -
       +

     

       3860
       3860
       -
       +  if (OldVisible != new_visible)

     

       3861
       3861
       -
       +  {

     

       3862
       3862
       -
       +    if (new_visible)

     

       3863
       3863
       -
       +    {

     

       3864
       3864
       -
       +      set_option (OPTSIDEBAR);

     

       3865
       3865
       -
       +    }

     

       3866
       3866
       -
       +    else

     

       3867
       3867
       -
       +    {

     

       3868
       3868
       -
       +      unset_option (OPTSIDEBAR);

     

       3869
       3869
       -
       +    }

     

       3870
       3870
       -
       +    OldVisible = new_visible;

     

       3871
       3871
       -
       +  }

     

       3872
       3872
       -
       +  else if (new_width == 0)

     

       3873
       3873
       -
       +  {

     

       3874
       3874
       -
       +    unset_option (OPTSIDEBAR);

     

       3875
       3875
       -
       +    OldVisible = 0;

     

       3876
       3876
       -
       +  }

     

       3877
       3877
       -
       +

     

       3878
       3878
       -
       +  if (!option (OPTSIDEBAR))

     

       3879
       3879
       -
       +  {

     

       3880
       3880
       -
       +    SidebarWidth = 0;

     

       3881
       3881
       -
       +  }

     

       3882
       3882
       -
       +  else if (new_width == 0)

     

       3883
       3883
       -
       +  {

     

       3884
       3884
       -
       +    SidebarWidth = OldWidth;

     

       3885
       3885
       -
       +  }

     

       3886
       3886
       -
       +  else

     

       3887
       3887
       -
       +  {

     

       3888
       3888
       -
       +    SidebarWidth = new_width;

     

       3889
       3889
       -
       +  }

     

       3890
       3890
       -
       +

     

       3891
       3891
       -
       +  return new_visible;

     

       3892
       3892
       -
       +}

     

       3893
       3893
       -
       +

     

       3894
       3894
       -
       +/**

     

       3895
       3895
       -
       + * draw_divider - Draw a line between the sidebar and the rest of mutt

     

       3896
       3896
       -
       + * @first_row:  Screen line to start (0-based)

     

       3897
       3897
       -
       + * @num_rows:   Number of rows to fill

     

       3898
       3898
       -
       + *

     

       3899
       3899
       -
       + * Draw a divider using characters from the config option "sidebar_divider_char".

     

       3900
       3900
       -
       + * This can be an ASCII or Unicode character.  First we calculate this

     

       3901
       3901
       -
       + * characters' width in screen columns, then subtract that from the config

     

       3902
       3902
       -
       + * option "sidebar_width".

     

       3903
       3903
       -
       + *

     

       3904
       3904
       -
       + * Returns:

     

       3905
       3905
       -
       + *	-1: Error: bad character, etc

     

       3906
       3906
       -
       + *	0:  Error: 0 width character

     

       3907
       3907
       -
       + *	n:  Success: character occupies n screen columns

     

       3908
       3908
       -
       + */

     

       3909
       3909
       -
       +static int draw_divider (int first_row, int num_rows)

     

       3910
       3910
       -
       +{

     

       3911
       3911
       -
       +  /* Calculate the width of the delimiter in screen cells */

     

       3912
       3912
       -
       +  int delim_len = mutt_strwidth (SidebarDividerChar);

     

       3913
       3913
       -
       +

     

       3914
       3914
       -
       +  if (delim_len < 1)

     

       3915
       3915
       -
       +    return delim_len;

     

       3916
       3916
       -
       +

     

       3917
       3917
       -
       +  if ((SidebarWidth + delim_len) > (COLS + 1))

     

       3918
       3918
       -
       +    return 0;

     

       3919
       3919
       -
       +

     

       3920
       3920
       -
       +  if (delim_len > SidebarWidth)

     

       3921
       3921
       -
       +    return -1;

     

       3922
       3922
       -
       +

     

       3923
       3923
       -
       +  SETCOLOR(MT_COLOR_DIVIDER);

     

       3924
       3924
       -
       +

     

       3925
       3925
       -
       +  int i;

     

       3926
       3926
       -
       +  for (i = 0; i < num_rows; i++)

     

       3927
       3927
       -
       +  {

     

       3928
       3928
       -
       +    move (first_row + i, SidebarWidth - delim_len);

     

       3929
       3929
       -
       +    addstr (NONULL(SidebarDividerChar));

     

       3930
       3930
       -
       +  }

     

       3931
       3931
       -
       +

     

       3932
       3932
       -
       +  return delim_len;

     

       3933
       3933
       -
       +}

     

       3934
       3934
       -
       +

     

       3935
       3935
       -
       +/**

     

       3936
       3936
       -
       + * fill_empty_space - Wipe the remaining Sidebar space

     

       3937
       3937
       -
       + * @first_row:  Screen line to start (0-based)

     

       3938
       3938
       -
       + * @num_rows:   Number of rows to fill

     

       3939
       3939
       -
       + * @width:      Width of the Sidebar (minus the divider)

     

       3940
       3940
       -
       + *

     

       3941
       3941
       -
       + * Write spaces over the area the sidebar isn't using.

     

       3942
       3942
       -
       + */

     

       3943
       3943
       -
       +static void fill_empty_space (int first_row, int num_rows, int width)

     

       3944
       3944
       -
       +{

     

       3945
       3945
       -
       +  /* Fill the remaining rows with blank space */

     

       3946
       3946
       -
       +  SETCOLOR(MT_COLOR_NORMAL);

     

       3947
       3947
       -
       +

     

       3948
       3948
       -
       +  int r;

     

       3949
       3949
       -
       +  for (r = 0; r < num_rows; r++)

     

       3950
       3950
       -
       +  {

     

       3951
       3951
       -
       +    int i = 0;

     

       3952
       3952
       -
       +    move (first_row + r, 0);

     

       3953
       3953
       -
       +    for (; i < width; i++)

     

       3954
       3954
       -
       +      addch (' ');

     

       3955
       3955
       -
       +  }

     

       3956
       3956
       -
       +}

     

       3957
       3957
       -
       +

     

       3958
       3958
       -
       +/**

     

       3959
       3959
       -
       + * draw_sidebar - Write out a list of mailboxes, on the left

     

       3960
       3960
       -
       + * @first_row:  Screen line to start (0-based)

     

       3961
       3961
       -
       + * @num_rows:   Number of rows to fill

     

       3962
       3962
       -
       + * @div_width:  Width in screen characters taken by the divider

     

       3963
       3963
       -
       + *

     

       3964
       3964
       -
       + * Display a list of mailboxes in a panel on the left.  What's displayed will

     

       3965
       3965
       -
       + * depend on our index markers: TopBuffy, OpnBuffy, HilBuffy, BotBuffy.

     

       3966
       3966
       -
       + * On the first run they'll be NULL, so we display the top of Mutt's list

     

       3967
       3967
       -
       + * (Incoming).

     

       3968
       3968
       -
       + *

     

       3969
       3969
       -
       + * TopBuffy - first visible mailbox

     

       3970
       3970
       -
       + * BotBuffy - last  visible mailbox

     

       3971
       3971
       -
       + * OpnBuffy - mailbox shown in Mutt's Index Panel

     

       3972
       3972
       -
       + * HilBuffy - Unselected mailbox (the paging follows this)

     

       3973
       3973
       -
       + *

     

       3974
       3974
       -
       + * The entries are formatted using "sidebar_format" and may be abbreviated:

     

       3975
       3975
       -
       + * "sidebar_short_path", indented: "sidebar_folder_indent",

     

       3976
       3976
       -
       + * "sidebar_indent_string" and sorted: "sidebar_sort_method".  Finally, they're

     

       3977
       3977
       -
       + * trimmed to fit the available space.

     

       3978
       3978
       -
       + */

     

       3979
       3979
       -
       +static void draw_sidebar (int first_row, int num_rows, int div_width)

     

       3980
       3980
       -
       +{

     

       3981
       3981
       -
       +  BUFFY *b = TopBuffy;

     

       3982
       3982
       -
       +  if (!b)

     

       3983
       3983
       -
       +    return;

     

       3984
       3984
       -
       +

     

       3985
       3985
       -
       +  int w = MIN(COLS, (SidebarWidth - div_width));

     

       3986
       3986
       -
       +  int row = 0;

     

       3987
       3987
       -
       +  for (b = TopBuffy; b && (row < num_rows); b = b->next)

     

       3988
       3988
       -
       +  {

     

       3989
       3989
       -
       +    if (b->is_hidden)

     

       3990
       3990
       -
       +      continue;

     

       3991
       3991
       -
       +

     

       3992
       3992
       -
       +    if (b == OpnBuffy)

     

       3993
       3993
       -
       +    {

     

       3994
       3994
       -
       +      if ((ColorDefs[MT_COLOR_SB_INDICATOR] != 0))

     

       3995
       3995
       -
       +        SETCOLOR(MT_COLOR_SB_INDICATOR);

     

       3996
       3996
       -
       +      else

     

       3997
       3997
       -
       +        SETCOLOR(MT_COLOR_INDICATOR);

     

       3998
       3998
       -
       +    }

     

       3999
       3999
       -
       +    else if (b == HilBuffy)

     

       4000
       4000
       -
       +      SETCOLOR(MT_COLOR_HIGHLIGHT);

     

       4001
       4001
       -
       +    else if ((ColorDefs[MT_COLOR_SB_SPOOLFILE] != 0) &&

     

       4002
       4002
       -
       +               (mutt_strcmp (b->path, Spoolfile) == 0))

     

       4003
       4003
       -
       +      SETCOLOR(MT_COLOR_SB_SPOOLFILE);

     

       4004
       4004
       -
       +    else if (b->msg_unread > 0)

     

       4005
       4005
       -
       +      SETCOLOR(MT_COLOR_NEW);

     

       4006
       4006
       -
       +    else if (b->msg_flagged > 0)

     

       4007
       4007
       -
       +      SETCOLOR(MT_COLOR_FLAGGED);

     

       4008
       4008
       -
       +    else

     

       4009
       4009
       -
       +      SETCOLOR(MT_COLOR_NORMAL);

     

       4010
       4010
       -
       +

     

       4011
       4011
       -
       +    move (first_row + row, 0);

     

       4012
       4012
       -
       +    if (Context && Context->path &&

     

       4013
       4013
       -
       +        (!strcmp (b->path, Context->path)||

     

       4014
       4014
       -
       +         !strcmp (b->realpath, Context->path)))

     

       4015
       4015
       -
       +    {

     

       4016
       4016
       -
       +      b->msg_unread  = Context->unread;

     

       4017
       4017
       -
       +      b->msg_count   = Context->msgcount;

     

       4018
       4018
       -
       +      b->msg_flagged = Context->flagged;

     

       4019
       4019
       -
       +    }

     

       4020
       4020
       -
       +

     

       4021
       4021
       -
       +    /* compute length of Maildir without trailing separator */

     

       4022
       4022
       -
       +    size_t maildirlen = strlen (Maildir);

     

       4023
       4023
       -
       +    if (SidebarDelimChars && strchr (SidebarDelimChars, Maildir[maildirlen - 1]))

     

       4024
       4024
       -
       +      maildirlen--;

     

       4025
       4025
       -
       +

     

       4026
       4026
       -
       +    /* check whether Maildir is a prefix of the current folder's path */

     

       4027
       4027
       -
       +    short maildir_is_prefix = 0;

     

       4028
       4028
       -
       +    if ((strlen (b->path) > maildirlen) && (strncmp (Maildir, b->path, maildirlen) == 0))

     

       4029
       4029
       -
       +      maildir_is_prefix = 1;

     

       4030
       4030
       -
       +

     

       4031
       4031
       -
       +    /* calculate depth of current folder and generate its display name with indented spaces */

     

       4032
       4032
       -
       +    int sidebar_folder_depth = 0;

     

       4033
       4033
       -
       +    char *sidebar_folder_name;

     

       4034
       4034
       -
       +    int i;

     

       4035
       4035
       -
       +    if (option (OPTSIDEBARSHORTPATH))

     

       4036
       4036
       -
       +    {

     

       4037
       4037
       -
       +      /* disregard a trailing separator, so strlen() - 2 */

     

       4038
       4038
       -
       +      sidebar_folder_name = b->path;

     

       4039
       4039
       -
       +      for (i = strlen (sidebar_folder_name) - 2; i >= 0; i--)

     

       4040
       4040
       -
       +      {

     

       4041
       4041
       -
       +        if (SidebarDelimChars &&

     

       4042
       4042
       -
       +            strchr (SidebarDelimChars, sidebar_folder_name[i]))

     

       4043
       4043
       -
       +        {

     

       4044
       4044
       -
       +          sidebar_folder_name += (i + 1);

     

       4045
       4045
       -
       +          break;

     

       4046
       4046
       -
       +        }

     

       4047
       4047
       -
       +      }

     

       4048
       4048
       -
       +    }

     

       4049
       4049
       -
       +    else

     

       4050
       4050
       -
       +      sidebar_folder_name = b->path + maildir_is_prefix * (maildirlen + 1);

     

       4051
       4051
       -
       +

     

       4052
       4052
       -
       +    if (maildir_is_prefix && option (OPTSIDEBARFOLDERINDENT))

     

       4053
       4053
       -
       +    {

     

       4054
       4054
       -
       +      const char *tmp_folder_name;

     

       4055
       4055
       -
       +      int lastsep = 0;

     

       4056
       4056
       -
       +      tmp_folder_name = b->path + maildirlen + 1;

     

       4057
       4057
       -
       +      int tmplen = (int) strlen (tmp_folder_name) - 1;

     

       4058
       4058
       -
       +      for (i = 0; i < tmplen; i++)

     

       4059
       4059
       -
       +      {

     

       4060
       4060
       -
       +        if (SidebarDelimChars && strchr (SidebarDelimChars, tmp_folder_name[i]))

     

       4061
       4061
       -
       +        {

     

       4062
       4062
       -
       +          sidebar_folder_depth++;

     

       4063
       4063
       -
       +          lastsep = i + 1;

     

       4064
       4064
       -
       +        }

     

       4065
       4065
       -
       +      }

     

       4066
       4066
       -
       +      if (sidebar_folder_depth > 0)

     

       4067
       4067
       -
       +      {

     

       4068
       4068
       -
       +        if (option (OPTSIDEBARSHORTPATH))

     

       4069
       4069
       -
       +          tmp_folder_name += lastsep;  /* basename */

     

       4070
       4070
       -
       +        sidebar_folder_name = malloc (strlen (tmp_folder_name) + sidebar_folder_depth*strlen (NONULL(SidebarIndentString)) + 1);

     

       4071
       4071
       -
       +        sidebar_folder_name[0]=0;

     

       4072
       4072
       -
       +        for (i=0; i < sidebar_folder_depth; i++)

     

       4073
       4073
       -
       +          strncat (sidebar_folder_name, NONULL(SidebarIndentString), strlen (NONULL(SidebarIndentString)));

     

       4074
       4074
       -
       +        strncat (sidebar_folder_name, tmp_folder_name, strlen (tmp_folder_name));

     

       4075
       4075
       -
       +      }

     

       4076
       4076
       -
       +    }

     

       4077
       4077
       -
       +    char str[STRING];

     

       4078
       4078
       -
       +    make_sidebar_entry (str, sizeof (str), w, sidebar_folder_name, b);

     

       4079
       4079
       -
       +    printw ("%s", str);

     

       4080
       4080
       -
       +    if (sidebar_folder_depth > 0)

     

       4081
       4081
       -
       +      FREE (&sidebar_folder_name);

     

       4082
       4082
       -
       +    row++;

     

       4083
       4083
       -
       +  }

     

       4084
       4084
       -
       +

     

       4085
       4085
       -
       +  fill_empty_space (first_row + row, num_rows - row, w);

     

       4086
       4086
       -
       +}

     

       4087
       4087
       -
       +

     

       4088
       4088
       -
       +

     

       4089
       4089
       -
       +/**

     

       4090
       4090
       -
       + * mutt_sb_init - Set some default values for the sidebar.

     

       4091
       4091
       -
       + */

     

       4092
       4092
       -
       +void

     

       4093
       4093
       -
       +mutt_sb_init (void)

     

       4094
       4094
       -
       +{

     

       4095
       4095
       -
       +  OldVisible = option (OPTSIDEBAR);

     

       4096
       4096
       -
       +  if (SidebarWidth > 0)

     

       4097
       4097
       -
       +  {

     

       4098
       4098
       -
       +    OldWidth = SidebarWidth;

     

       4099
       4099
       -
       +  }

     

       4100
       4100
       -
       +  else

     

       4101
       4101
       -
       +  {

     

       4102
       4102
       -
       +    OldWidth = 20;

     

       4103
       4103
       -
       +    if (OldVisible)

     

       4104
       4104
       -
       +    {

     

       4105
       4105
       -
       +      SidebarWidth = OldWidth;

     

       4106
       4106
       -
       +    }

     

       4107
       4107
       -
       +  }

     

       4108
       4108
       -
       +}

     

       4109
       4109
       -
       +

     

       4110
       4110
       -
       +/**

     

       4111
       4111
       -
       + * mutt_sb_draw - Completely redraw the sidebar

     

       4112
       4112
       -
       + *

     

       4113
       4113
       -
       + * Completely refresh the sidebar region.  First draw the divider; then, for

     

       4114
       4114
       -
       + * each BUFFY, call make_sidebar_entry; finally blank out any remaining space.

     

       4115
       4115
       -
       + */

     

       4116
       4116
       -
       +void mutt_sb_draw (void)

     

       4117
       4117
       -
       +{

     

       4118
       4118
       -
       +  if (!visible())

     

       4119
       4119
       -
       +    return;

     

       4120
       4120
       -
       +

     

       4121
       4121
       -
       +  /* XXX - if transitioning from invisible to visible */

     

       4122
       4122
       -
       +  /* if (OldVisible == 0) */

     

       4123
       4123
       -
       +  /* 	mutt_buffy_check (1); we probably have bad or no numbers */

     

       4124
       4124
       -
       +

     

       4125
       4125
       -
       +  int x = getcurx (stdscr);

     

       4126
       4126
       -
       +  int y = getcury (stdscr);

     

       4127
       4127
       -
       +

     

       4128
       4128
       -
       +  int first_row = 0;

     

       4129
       4129
       -
       +  int num_rows  = LINES - 2;

     

       4130
       4130
       -
       +

     

       4131
       4131
       -
       +  if (option (OPTHELP) || option (OPTSTATUSONTOP))

     

       4132
       4132
       -
       +    first_row++;

     

       4133
       4133
       -
       +

     

       4134
       4134
       -
       +  if (option (OPTHELP))

     

       4135
       4135
       -
       +    num_rows--;

     

       4136
       4136
       -
       +

     

       4137
       4137
       -
       +  int div_width = draw_divider (first_row, num_rows);

     

       4138
       4138
       -
       +  if (div_width < 0)

     

       4139
       4139
       -
       +    return;

     

       4140
       4140
       -
       +

     

       4141
       4141
       -
       +  if (!Incoming)

     

       4142
       4142
       -
       +  {

     

       4143
       4143
       -
       +    int w = MIN(COLS, (SidebarWidth - div_width));

     

       4144
       4144
       -
       +    fill_empty_space (first_row, num_rows, w);

     

       4145
       4145
       -
       +    return;

     

       4146
       4146
       -
       +  }

     

       4147
       4147
       -
       +

     

       4148
       4148
       -
       +  if (!prepare_sidebar (num_rows))

     

       4149
       4149
       -
       +    return;

     

       4150
       4150
       -
       +

     

       4151
       4151
       -
       +  draw_sidebar (first_row, num_rows, div_width);

     

       4152
       4152
       -
       +  move (y, x);

     

       4153
       4153
       -
       +}

     

       4154
       4154
       -
       +

     

       4155
       4155
       -
       +/**

     

       4156
       4156
       -
       + * mutt_sb_should_refresh - Check if the sidebar is due to be refreshed

     

       4157
       4157
       -
       + *

     

       4158
       4158
       -
       + * The "sidebar_refresh_time" config option allows the user to limit the frequency

     

       4159
       4159
       -
       + * with which the sidebar is refreshed.

     

       4160
       4160
       -
       + *

     

       4161
       4161
       -
       + * Returns:

     

       4162
       4162
       -
       + *	1  Yes, refresh is due

     

       4163
       4163
       -
       + *	0  No,  refresh happened recently

     

       4164
       4164
       -
       + */

     

       4165
       4165
       -
       +int mutt_sb_should_refresh (void)

     

       4166
       4166
       -
       +{

     

       4167
       4167
       -
       +  if (!option (OPTSIDEBAR))

     

       4168
       4168
       -
       +    return 0;

     

       4169
       4169
       -
       +

     

       4170
       4170
       -
       +  if (SidebarRefreshTime == 0)

     

       4171
       4171
       -
       +    return 0;

     

       4172
       4172
       -
       +

     

       4173
       4173
       -
       +  time_t diff = (time (NULL) - LastRefresh);

     

       4174
       4174
       -
       +

     

       4175
       4175
       -
       +  return (diff >= SidebarRefreshTime);

     

       4176
       4176
       -
       +}

     

       4177
       4177
       -
       +

     

       4178
       4178
       -
       +/**

     

       4179
       4179
       -
       + * mutt_sb_change_mailbox - Change the selected mailbox

     

       4180
       4180
       -
       + * @op: Operation code

     

       4181
       4181
       -
       + *

     

       4182
       4182
       -
       + * Change the selected mailbox, e.g. "Next mailbox", "Previous Mailbox

     

       4183
       4183
       -
       + * with new mail". The operations are listed OPS.SIDEBAR which is built

     

       4184
       4184
       -
       + * into an enum in keymap_defs.h.

     

       4185
       4185
       -
       + *

     

       4186
       4186
       -
       + * If the operation is successful, HilBuffy will be set to the new mailbox.

     

       4187
       4187
       -
       + * This function only *selects* the mailbox, doesn't *open* it.

     

       4188
       4188
       -
       + *

     

       4189
       4189
       -
       + * Allowed values are: OP_SIDEBAR_NEXT, OP_SIDEBAR_NEXT_NEW,

     

       4190
       4190
       -
       + * OP_SIDEBAR_PAGE_DOWN, OP_SIDEBAR_PAGE_UP, OP_SIDEBAR_PREV,

     

       4191
       4191
       -
       + * OP_SIDEBAR_PREV_NEW.

     

       4192
       4192
       -
       + */

     

       4193
       4193
       -
       +void mutt_sb_change_mailbox (int op)

     

       4194
       4194
       -
       +{

     

       4195
       4195
       -
       +  BUFFY *b;

     

       4196
       4196
       -
       +  if (!HilBuffy)	/* It'll get reset on the next draw */

     

       4197
       4197
       -
       +    return;

     

       4198
       4198
       -
       +

     

       4199
       4199
       -
       +  switch (op)

     

       4200
       4200
       -
       +  {

     

       4201
       4201
       -
       +    case OP_SIDEBAR_NEXT:

     

       4202
       4202
       -
       +      if (!HilBuffy->next)

     

       4203
       4203
       -
       +        return;

     

       4204
       4204
       -
       +      if (HilBuffy->next->is_hidden)

     

       4205
       4205
       -
       +        return;

     

       4206
       4206
       -
       +      HilBuffy = HilBuffy->next;

     

       4207
       4207
       -
       +      break;

     

       4208
       4208
       -
       +    case OP_SIDEBAR_NEXT_NEW:

     

       4209
       4209
       -
       +      b = find_next_new (option (OPTSIDEBARNEXTNEWWRAP));

     

       4210
       4210
       -
       +      if (!b)

     

       4211
       4211
       -
       +        return;

     

       4212
       4212
       -
       +      else

     

       4213
       4213
       -
       +        HilBuffy = b;

     

       4214
       4214
       -
       +      break;

     

       4215
       4215
       -
       +    case OP_SIDEBAR_PAGE_DOWN:

     

       4216
       4216
       -
       +      HilBuffy = BotBuffy;

     

       4217
       4217
       -
       +      if (HilBuffy->next)

     

       4218
       4218
       -
       +        HilBuffy = HilBuffy->next;

     

       4219
       4219
       -
       +      break;

     

       4220
       4220
       -
       +    case OP_SIDEBAR_PAGE_UP:

     

       4221
       4221
       -
       +      HilBuffy = TopBuffy;

     

       4222
       4222
       -
       +      if (HilBuffy != Incoming)

     

       4223
       4223
       -
       +        HilBuffy = HilBuffy->prev;

     

       4224
       4224
       -
       +      break;

     

       4225
       4225
       -
       +    case OP_SIDEBAR_PREV:

     

       4226
       4226
       -
       +      if (!HilBuffy->prev)

     

       4227
       4227
       -
       +        return;

     

       4228
       4228
       -
       +      if (HilBuffy->prev->is_hidden)	/* Can't happen, we've sorted the hidden to the end */

     

       4229
       4229
       -
       +        return;

     

       4230
       4230
       -
       +      HilBuffy = HilBuffy->prev;

     

       4231
       4231
       -
       +      break;

     

       4232
       4232
       -
       +    case OP_SIDEBAR_PREV_NEW:

     

       4233
       4233
       -
       +      b = find_prev_new (option (OPTSIDEBARNEXTNEWWRAP));

     

       4234
       4234
       -
       +      if (!b)

     

       4235
       4235
       -
       +        return;

     

       4236
       4236
       -
       +      else

     

       4237
       4237
       -
       +        HilBuffy = b;

     

       4238
       4238
       -
       +      break;

     

       4239
       4239
       -
       +    default:

     

       4240
       4240
       -
       +      return;

     

       4241
       4241
       -
       +  }

     

       4242
       4242
       -
       +

     

       4243
       4243
       -
       +  /* We can change folder even if the sidebar is hidden */

     

       4244
       4244
       -
       +  if (option (OPTSIDEBAR))

     

       4245
       4245
       -
       +    mutt_sb_draw();

     

       4246
       4246
       -
       +}

     

       4247
       4247
       -
       +

     

       4248
       4248
       -
       +/**

     

       4249
       4249
       -
       + * mutt_sb_set_buffystats - Update the BUFFY's message counts from the CONTEXT

     

       4250
       4250
       -
       + * @ctx:  A mailbox CONTEXT

     

       4251
       4251
       -
       + *

     

       4252
       4252
       -
       + * Given a mailbox CONTEXT, find a matching mailbox BUFFY and copy the message

     

       4253
       4253
       -
       + * counts into it.

     

       4254
       4254
       -
       + */

     

       4255
       4255
       -
       +void mutt_sb_set_buffystats (const CONTEXT *ctx)

     

       4256
       4256
       -
       +{

     

       4257
       4257
       -
       +  /* Even if the sidebar's hidden,

     

       4258
       4258
       -
       +   * we should take note of the new data. */

     

       4259
       4259
       -
       +  BUFFY *b = Incoming;

     

       4260
       4260
       -
       +  if (!ctx || !b)

     

       4261
       4261
       -
       +    return;

     

       4262
       4262
       -
       +

     

       4263
       4263
       -
       +  for (; b; b = b->next)

     

       4264
       4264
       -
       +  {

     

       4265
       4265
       -
       +    if (!strcmp (b->path,     ctx->path) ||

     

       4266
       4266
       -
       +        !strcmp (b->realpath, ctx->path))

     

       4267
       4267
       -
       +    {

     

       4268
       4268
       -
       +      b->msg_unread  = ctx->unread;

     

       4269
       4269
       -
       +      b->msg_count   = ctx->msgcount;

     

       4270
       4270
       -
       +      b->msg_flagged = ctx->flagged;

     

       4271
       4271
       -
       +      break;

     

       4272
       4272
       -
       +    }

     

       4273
       4273
       -
       +  }

     

       4274
       4274
       -
       +}

     

       4275
       4275
       -
       +

     

       4276
       4276
       -
       +/**

     

       4277
       4277
       -
       + * mutt_sb_get_highlight - Get the BUFFY that's highlighted in the sidebar

     

       4278
       4278
       -
       + *

     

       4279
       4279
       -
       + * Get the path of the mailbox that's highlighted in the sidebar.

     

       4280
       4280
       -
       + *

     

       4281
       4281
       -
       + * Returns:

     

       4282
       4282
       -
       + *	Mailbox path

     

       4283
       4283
       -
       + */

     

       4284
       4284
       -
       +const char *mutt_sb_get_highlight (void)

     

       4285
       4285
       -
       +{

     

       4286
       4286
       -
       +  if (!HilBuffy)

     

       4287
       4287
       -
       +    return NULL;

     

       4288
       4288
       -
       +

     

       4289
       4289
       -
       +  return HilBuffy->path;

     

       4290
       4290
       -
       +}

     

       4291
       4291
       -
       +

     

       4292
       4292
       -
       +/**

     

       4293
       4293
       -
       + * mutt_sb_set_open_buffy - Set the OpnBuffy based on a mailbox path

     

       4294
       4294
       -
       + * @path: Mailbox path

     

       4295
       4295
       -
       + *

     

       4296
       4296
       -
       + * Search through the list of mailboxes.  If a BUFFY has a matching path, set

     

       4297
       4297
       -
       + * OpnBuffy to it.

     

       4298
       4298
       -
       + */

     

       4299
       4299
       -
       +BUFFY *mutt_sb_set_open_buffy (const char *path)

     

       4300
       4300
       -
       +{

     

       4301
       4301
       -
       +  /* Even if the sidebar is hidden */

     

       4302
       4302
       -
       +

     

       4303
       4303
       -
       +  BUFFY *b = Incoming;

     

       4304
       4304
       -
       +

     

       4305
       4305
       -
       +  if (!path || !b)

     

       4306
       4306
       -
       +    return NULL;

     

       4307
       4307
       -
       +

     

       4308
       4308
       -
       +  OpnBuffy = NULL;

     

       4309
       4309
       -
       +

     

       4310
       4310
       -
       +  for (; b; b = b->next)

     

       4311
       4311
       -
       +  {

     

       4312
       4312
       -
       +    if (!strcmp (b->path,     path) ||

     

       4313
       4313
       -
       +        !strcmp (b->realpath, path))

     

       4314
       4314
       -
       +    {

     

       4315
       4315
       -
       +      OpnBuffy = b;

     

       4316
       4316
       -
       +      HilBuffy = b;

     

       4317
       4317
       -
       +      break;

     

       4318
       4318
       -
       +    }

     

       4319
       4319
       -
       +  }

     

       4320
       4320
       -
       +

     

       4321
       4321
       -
       +  return OpnBuffy;

     

       4322
       4322
       -
       +}

     

       4323
       4323
       -
       +

     

       4324
       4324
       -
       +/**

     

       4325
       4325
       -
       + * mutt_sb_set_update_time - Note the time that the sidebar was updated

     

       4326
       4326
       -
       + *

     

       4327
       4327
       -
       + * Update the timestamp representing the last sidebar update.  If the user

     

       4328
       4328
       -
       + * configures "sidebar_refresh_time", this will help to reduce traffic.

     

       4329
       4329
       -
       + */

     

       4330
       4330
       -
       +void mutt_sb_set_update_time (void)

     

       4331
       4331
       -
       +{

     

       4332
       4332
       -
       +  /* XXX - should this be public? */

     

       4333
       4333
       -
       +

     

       4334
       4334
       -
       +  LastRefresh = time (NULL);

     

       4335
       4335
       -
       +}

     

       4336
       4336
       -
       +

     

       4337
       4337
       -
       +/**

     

       4338
       4338
       -
       + * mutt_sb_notify_mailbox - The state of a BUFFY is about to change

     

       4339
       4339
       -
       + *

     

       4340
       4340
       -
       + * We receive a notification:

     

       4341
       4341
       -
       + *	After a new BUFFY has been created

     

       4342
       4342
       -
       + *	Before a BUFFY is deleted

     

       4343
       4343
       -
       + *

     

       4344
       4344
       -
       + * Before a deletion, check that our pointers won't be invalidated.

     

       4345
       4345
       -
       + */

     

       4346
       4346
       -
       +void mutt_sb_notify_mailbox (BUFFY *b, int created)

     

       4347
       4347
       -
       +{

     

       4348
       4348
       -
       +  if (!b)

     

       4349
       4349
       -
       +    return;

     

       4350
       4350
       -
       +

     

       4351
       4351
       -
       +  /* Any new/deleted mailboxes will cause a refresh.  As long as

     

       4352
       4352
       -
       +   * they're valid, our pointers will be updated in prepare_sidebar() */

     

       4353
       4353
       -
       +

     

       4354
       4354
       -
       +  if (created)

     

       4355
       4355
       -
       +  {

     

       4356
       4356
       -
       +    if (!TopBuffy)

     

       4357
       4357
       -
       +      TopBuffy = b;

     

       4358
       4358
       -
       +    if (!HilBuffy)

     

       4359
       4359
       -
       +      HilBuffy = b;

     

       4360
       4360
       -
       +    if (!BotBuffy)

     

       4361
       4361
       -
       +      BotBuffy = b;

     

       4362
       4362
       -
       +    if (!Outgoing)

     

       4363
       4363
       -
       +      Outgoing = b;

     

       4364
       4364
       -
       +    if (!OpnBuffy && Context)

     

       4365
       4365
       -
       +    {

     

       4366
       4366
       -
       +      /* This might happen if the user "unmailboxes *", then

     

       4367
       4367
       -
       +       * "mailboxes" our current mailbox back again */

     

       4368
       4368
       -
       +      if (mutt_strcmp (b->path, Context->path) == 0)

     

       4369
       4369
       -
       +        OpnBuffy = b;

     

       4370
       4370
       -
       +    }

     

       4371
       4371
       -
       +  }

     

       4372
       4372
       -
       +  else

     

       4373
       4373
       -
       +  {

     

       4374
       4374
       -
       +    BUFFY *replacement = buffy_going (b);

     

       4375
       4375
       -
       +    if (TopBuffy == b)

     

       4376
       4376
       -
       +      TopBuffy = replacement;

     

       4377
       4377
       -
       +    if (OpnBuffy == b)

     

       4378
       4378
       -
       +      OpnBuffy = NULL;

     

       4379
       4379
       -
       +    if (HilBuffy == b)

     

       4380
       4380
       -
       +      HilBuffy = replacement;

     

       4381
       4381
       -
       +    if (BotBuffy == b)

     

       4382
       4382
       -
       +      BotBuffy = replacement;

     

       4383
       4383
       -
       +    if (Outgoing == b)

     

       4384
       4384
       -
       +      Outgoing = replacement;

     

       4385
       4385
       -
       +  }

     

       4386
       4386
       -
       +}

     

       4387
       4387
       -
       diff -urN mutt-1.6.1/sidebar.h mutt-1.6.1-sidebar/sidebar.h

     

       4388
       4388
       -
       --- mutt-1.6.1/sidebar.h	1970-01-01 01:00:00.000000000 +0100

     

       4389
       4389
       -
       +++ mutt-1.6.1-sidebar/sidebar.h	2016-06-12 18:43:03.967503185 +0100

     

       4390
       4390
       -
       @@ -0,0 +1,36 @@

     

       4391
       4391
       -
       +/* Copyright (C) 2004 Justin Hibbits <jrh29@po.cwru.edu>

     

       4392
       4392
       -
       + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>

     

       4393
       4393
       -
       + * Copyright (C) 2015-2016 Richard Russon <rich@flatcap.org>

     

       4394
       4394
       -
       + *

     

       4395
       4395
       -
       + *     This program is free software; you can redistribute it and/or modify

     

       4396
       4396
       -
       + *     it under the terms of the GNU General Public License as published by

     

       4397
       4397
       -
       + *     the Free Software Foundation; either version 2 of the License, or

     

       4398
       4398
       -
       + *     (at your option) any later version.

     

       4399
       4399
       -
       + *

     

       4400
       4400
       -
       + *     This program is distributed in the hope that it will be useful,

     

       4401
       4401
       -
       + *     but WITHOUT ANY WARRANTY; without even the implied warranty of

     

       4402
       4402
       -
       + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

     

       4403
       4403
       -
       + *     GNU General Public License for more details.

     

       4404
       4404
       -
       + *

     

       4405
       4405
       -
       + *     You should have received a copy of the GNU General Public License

     

       4406
       4406
       -
       + *     along with this program; if not, write to the Free Software

     

       4407
       4407
       -
       + *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.

     

       4408
       4408
       -
       + */

     

       4409
       4409
       -
       +

     

       4410
       4410
       -
       +#ifndef SIDEBAR_H

     

       4411
       4411
       -
       +#define SIDEBAR_H

     

       4412
       4412
       -
       +

     

       4413
       4413
       -
       +#include "mutt.h"

     

       4414
       4414
       -
       +#include "buffy.h"

     

       4415
       4415
       -
       +

     

       4416
       4416
       -
       +void         mutt_sb_change_mailbox (int op);

     

       4417
       4417
       -
       +void         mutt_sb_draw (void);

     

       4418
       4418
       -
       +const char * mutt_sb_get_highlight (void);

     

       4419
       4419
       -
       +void         mutt_sb_init (void);

     

       4420
       4420
       -
       +void         mutt_sb_notify_mailbox (BUFFY *b, int created);

     

       4421
       4421
       -
       +void         mutt_sb_set_buffystats (const CONTEXT *ctx);

     

       4422
       4422
       -
       +BUFFY *      mutt_sb_set_open_buffy (const char *path);

     

       4423
       4423
       -
       +void         mutt_sb_set_update_time (void);

     

       4424
       4424
       -
       +int          mutt_sb_should_refresh (void);

     

       4425
       4425
       -
       +

     

       4426
       4426
       -
       +#endif /* SIDEBAR_H */

     

       4427
       4427
       -
       diff -urN mutt-1.6.1/sort.h mutt-1.6.1-sidebar/sort.h

     

       4428
       4428
       -
       --- mutt-1.6.1/sort.h	2016-06-12 18:43:00.415447793 +0100

     

       4429
       4429
       -
       +++ mutt-1.6.1-sidebar/sort.h	2016-06-12 18:43:03.968503200 +0100

     

       4430
       4430
       -
       @@ -31,6 +31,12 @@

     

       4431
       4431
       -
        #define SORT_KEYID	12

     

       4432
       4432
       -
        #define SORT_TRUST	13

     

       4433
       4433
       -
        #define SORT_SPAM	14

     

       4434
       4434
       -
       +#define SORT_COUNT	15

     

       4435
       4435
       -
       +#define SORT_COUNT_NEW	16

     

       4436
       4436
       -
       +#define SORT_DESC	17

     

       4437
       4437
       -
       +#define SORT_FLAGGED	18

     

       4438
       4438
       -
       +#define SORT_PATH	19

     

       4439
       4439
       -
       +

     

       4440
       4440
       -
        /* dgc: Sort & SortAux are shorts, so I'm bumping these bitflags up from

     

       4441
       4441
       -
         * bits 4 & 5 to bits 8 & 9 to make room for more sort keys in the future. */

     

       4442
       4442
       -
        #define SORT_MASK	0xff

     

       4443
       4443
       -
       @@ -50,6 +56,7 @@

     

       4444
       4444
       -
        WHERE short Sort INITVAL (SORT_DATE);

     

       4445
       4445
       -
        WHERE short SortAux INITVAL (SORT_DATE); /* auxiliary sorting method */

     

       4446
       4446
       -
        WHERE short SortAlias INITVAL (SORT_ALIAS);

     

       4447
       4447
       -
       +WHERE short SidebarSortMethod INITVAL (SORT_ORDER);

     

       4448
       4448
       -
        

     

       4449
       4449
       -
        /* FIXME: This one does not belong to here */

     

       4450
       4450
       -
        WHERE short PgpSortKeys INITVAL (SORT_ADDRESS);

-797

pkgs/applications/networking/mailreaders/mutt/trash.patch

···

       1
       1
       -
       diff -urN mutt-1.6.1/commands.c mutt-1.6.1-trash/commands.c

     

       2
       2
       -
       --- mutt-1.6.1/commands.c	2016-06-12 18:43:00.397447512 +0100

     

       3
       3
       -
       +++ mutt-1.6.1-trash/commands.c	2016-06-12 18:43:04.892517610 +0100

     

       4
       4
       -
       @@ -720,6 +720,7 @@

     

       5
       5
       -
            if (option (OPTDELETEUNTAG))

     

       6
       6
       -
              mutt_set_flag (Context, h, M_TAG, 0);

     

       7
       7
       -
          }

     

       8
       8
       -
       +  mutt_set_flag (Context, h, M_APPENDED, 1);

     

       9
       9
       -
          

     

       10
       10
       -
          return 0;

     

       11
       11
       -
        }

     

       12
       12
       -
       diff -urN mutt-1.6.1/curs_main.c mutt-1.6.1-trash/curs_main.c

     

       13
       13
       -
       --- mutt-1.6.1/curs_main.c	2016-06-12 18:43:00.399447544 +0100

     

       14
       14
       -
       +++ mutt-1.6.1-trash/curs_main.c	2016-06-12 18:43:04.895517656 +0100

     

       15
       15
       -
       @@ -1919,6 +1919,7 @@

     

       16
       16
       -
        	MAYBE_REDRAW (menu->redraw);

     

       17
       17
       -
        	break;

     

       18
       18
       -
        

     

       19
       19
       -
       +      case OP_PURGE_MESSAGE:

     

       20
       20
       -
              case OP_DELETE:

     

       21
       21
       -
        

     

       22
       22
       -
        	CHECK_MSGCOUNT;

     

       23
       23
       -
       @@ -1930,6 +1931,7 @@

     

       24
       24
       -
        	if (tag)

     

       25
       25
       -
        	{

     

       26
       26
       -
        	  mutt_tag_set_flag (M_DELETE, 1);

     

       27
       27
       -
       +	  mutt_tag_set_flag (M_PURGED, (op != OP_PURGE_MESSAGE) ? 0 : 1);

     

       28
       28
       -
        	  if (option (OPTDELETEUNTAG))

     

       29
       29
       -
        	    mutt_tag_set_flag (M_TAG, 0);

     

       30
       30
       -
        	  menu->redraw = REDRAW_INDEX;

     

       31
       31
       -
       @@ -1937,6 +1939,8 @@

     

       32
       32
       -
        	else

     

       33
       33
       -
        	{

     

       34
       34
       -
        	  mutt_set_flag (Context, CURHDR, M_DELETE, 1);

     

       35
       35
       -
       +	  mutt_set_flag (Context, CURHDR, M_PURGED,

     

       36
       36
       -
       +			 (op != OP_PURGE_MESSAGE) ? 0 : 1);

     

       37
       37
       -
        	  if (option (OPTDELETEUNTAG))

     

       38
       38
       -
        	    mutt_set_flag (Context, CURHDR, M_TAG, 0);

     

       39
       39
       -
        	  if (option (OPTRESOLVE))

     

       40
       40
       -
       @@ -2242,11 +2246,13 @@

     

       41
       41
       -
        	if (tag)

     

       42
       42
       -
        	{

     

       43
       43
       -
        	  mutt_tag_set_flag (M_DELETE, 0);

     

       44
       44
       -
       +	  mutt_tag_set_flag (M_PURGED, 0);

     

       45
       45
       -
        	  menu->redraw = REDRAW_INDEX;

     

       46
       46
       -
        	}

     

       47
       47
       -
        	else

     

       48
       48
       -
        	{

     

       49
       49
       -
        	  mutt_set_flag (Context, CURHDR, M_DELETE, 0);

     

       50
       50
       -
       +	  mutt_set_flag (Context, CURHDR, M_PURGED, 0);

     

       51
       51
       -
        	  if (option (OPTRESOLVE) && menu->current < Context->vcount - 1)

     

       52
       52
       -
        	  {

     

       53
       53
       -
        	    menu->current++;

     

       54
       54
       -
       @@ -2268,9 +2274,11 @@

     

       55
       55
       -
        	CHECK_ACL(M_ACL_DELETE, _("Cannot undelete message(s)"));

     

       56
       56
       -
        

     

       57
       57
       -
        	rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0,

     

       58
       58
       -
       -				   op == OP_UNDELETE_THREAD ? 0 : 1);

     

       59
       59
       -
       +				   op == OP_UNDELETE_THREAD ? 0 : 1)

     

       60
       60
       -
       +	  + mutt_thread_set_flag (CURHDR, M_PURGED, 0,

     

       61
       61
       -
       +				  (op == OP_UNDELETE_THREAD) ? 0 : 1);

     

       62
       62
       -
        

     

       63
       63
       -
       -	if (rc != -1)

     

       64
       64
       -
       +	if (rc > -1)

     

       65
       65
       -
        	{

     

       66
       66
       -
        	  if (option (OPTRESOLVE))

     

       67
       67
       -
        	  {

     

       68
       68
       -
       diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-trash/doc/manual.xml.head

     

       69
       69
       -
       --- mutt-1.6.1/doc/manual.xml.head	2016-06-12 18:43:00.402447590 +0100

     

       70
       70
       -
       +++ mutt-1.6.1-trash/doc/manual.xml.head	2016-06-12 18:43:04.901517750 +0100

     

       71
       71
       -
       @@ -7467,6 +7467,16 @@

     

       72
       72
       -
        

     

       73
       73
       -
        </sect2>

     

       74
       74
       -
        

     

       75
       75
       -
       +<sect2 id="mutt-patches">

     

       76
       76
       -
       +<title>Mutt Patches</title>

     

       77
       77
       -
       +<para>

     

       78
       78
       -
       +Mutt may also be <quote>patched</quote> to support smaller features.

     

       79
       79
       -
       +These patches should add a free-form string to the end Mutt's version string.

     

       80
       80
       -
       +Running <literal>mutt -v</literal> might show:

     

       81
       81
       -
       +<screen>patch-1.6.1.sidebar.20160502</screen>

     

       82
       82
       -
       +</para>

     

       83
       83
       -
       +</sect2>

     

       84
       84
       -
       +

     

       85
       85
       -
        <sect2 id="url-syntax">

     

       86
       86
       -
        <title>URL Syntax</title>

     

       87
       87
       -
        

     

       88
       88
       -
       @@ -8081,6 +8091,175 @@

     

       89
       89
       -
        

     

       90
       90
       -
        </sect1>

     

       91
       91
       -
        

     

       92
       92
       -
       +<sect1 id="trash-folder">

     

       93
       93
       -
       +	<title>Trash Folder Patch</title>

     

       94
       94
       -
       +	<subtitle>Automatically move "deleted" emails to a trash bin</subtitle>

     

       95
       95
       -
       +

     

       96
       96
       -
       +	<sect2 id="trash-folder-patch">

     

       97
       97
       -
       +		<title>Patch</title>

     

       98
       98
       -
       +

     

       99
       99
       -
       +		<para>

     

       100
       100
       -
       +			To check if Mutt supports <quote>Trash Folder</quote>, look for

     

       101
       101
       -
       +			<quote>patch-trash</quote> in the mutt version.

     

       102
       102
       -
       +			See: <xref linkend="mutt-patches"/>.

     

       103
       103
       -
       +		</para>

     

       104
       104
       -
       +

     

       105
       105
       -
       +		If IMAP is enabled, this patch will use it

     

       106
       106
       -
       +

     

       107
       107
       -
       +		<itemizedlist>

     

       108
       108
       -
       +			<title>Dependencies:</title>

     

       109
       109
       -
       +			<listitem><para>mutt-1.6.1</para></listitem>

     

       110
       110
       -
       +			<listitem><para>IMAP support</para></listitem>

     

       111
       111
       -
       +		</itemizedlist>

     

       112
       112
       -
       +

     

       113
       113
       -
       +		<para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>

     

       114
       114
       -
       +	</sect2>

     

       115
       115
       -
       +

     

       116
       116
       -
       +	<sect2 id="trash-folder-intro">

     

       117
       117
       -
       +		<title>Introduction</title>

     

       118
       118
       -
       +

     

       119
       119
       -
       +		<para>

     

       120
       120
       -
       +		In Mutt, when you <quote>delete</quote> an email it is first marked

     

       121
       121
       -
       +		deleted.  The email isn't really gone until

     

       122
       122
       -
       +		<link linkend="index-map">&lt;sync-mailbox&gt;</link> is called.

     

       123
       123
       -
       +		This happens when the user leaves the folder, or the function is called

     

       124
       124
       -
       +		manually.

     

       125
       125
       -
       +		</para>

     

       126
       126
       -
       +

     

       127
       127
       -
       +		<para>

     

       128
       128
       -
       +		After <literal>&lt;sync-mailbox&gt;</literal> has been called the email is gone forever.

     

       129
       129
       -
       +		</para>

     

       130
       130
       -
       +

     

       131
       131
       -
       +		<para>

     

       132
       132
       -
       +		The <link linkend="trash">$trash</link> variable defines a folder in

     

       133
       133
       -
       +		which to keep old emails.  As before, first you mark emails for

     

       134
       134
       -
       +		deletion.  When &lt;sync-mailbox&gt; is called the emails are moved to

     

       135
       135
       -
       +		the trash folder.

     

       136
       136
       -
       +		</para>

     

       137
       137
       -
       +

     

       138
       138
       -
       +		<para>

     

       139
       139
       -
       +		The <literal>$trash</literal> path can be either a full directory,

     

       140
       140
       -
       +		or be relative to the <link linkend="folder">$folder</link>

     

       141
       141
       -
       +		variable, like the <literal>mailboxes</literal> command.

     

       142
       142
       -
       +		</para>

     

       143
       143
       -
       +

     

       144
       144
       -
       +		<note>

     

       145
       145
       -
       +		Emails deleted from the trash folder are gone forever.

     

       146
       146
       -
       +		</note>

     

       147
       147
       -
       +	</sect2>

     

       148
       148
       -
       +

     

       149
       149
       -
       +	<sect2 id="trash-folder-variables">

     

       150
       150
       -
       +		<title>Variables</title>

     

       151
       151
       -
       +		<table id="table-trash-variables">

     

       152
       152
       -
       +			<title>Trash Variables</title>

     

       153
       153
       -
       +			<tgroup cols="3">

     

       154
       154
       -
       +				<thead>

     

       155
       155
       -
       +					<row>

     

       156
       156
       -
       +						<entry>Name</entry>

     

       157
       157
       -
       +						<entry>Type</entry>

     

       158
       158
       -
       +						<entry>Default</entry>

     

       159
       159
       -
       +					</row>

     

       160
       160
       -
       +				</thead>

     

       161
       161
       -
       +				<tbody>

     

       162
       162
       -
       +					<row>

     

       163
       163
       -
       +						<entry>trash</entry>

     

       164
       164
       -
       +						<entry>string</entry>

     

       165
       165
       -
       +						<entry>(none)</entry>

     

       166
       166
       -
       +					</row>

     

       167
       167
       -
       +				</tbody>

     

       168
       168
       -
       +			</tgroup>

     

       169
       169
       -
       +		</table>

     

       170
       170
       -
       +	</sect2>

     

       171
       171
       -
       +

     

       172
       172
       -
       +	<sect2 id="trash-folder-functions">

     

       173
       173
       -
       +		<title>Functions</title>

     

       174
       174
       -
       +		<table id="table-trash-functions">

     

       175
       175
       -
       +			<title>Trash Functions</title>

     

       176
       176
       -
       +			<tgroup cols="4">

     

       177
       177
       -
       +				<thead>

     

       178
       178
       -
       +					<row>

     

       179
       179
       -
       +						<entry>Menus</entry>

     

       180
       180
       -
       +						<entry>Default Key</entry>

     

       181
       181
       -
       +						<entry>Function</entry>

     

       182
       182
       -
       +						<entry>Description</entry>

     

       183
       183
       -
       +					</row>

     

       184
       184
       -
       +				</thead>

     

       185
       185
       -
       +				<tbody>

     

       186
       186
       -
       +					<row>

     

       187
       187
       -
       +						<entry>index,pager</entry>

     

       188
       188
       -
       +						<entry>(none)</entry>

     

       189
       189
       -
       +						<entry><literal>&lt;purge-message&gt;</literal></entry>

     

       190
       190
       -
       +						<entry>really delete the current entry, bypassing the trash folder</entry>

     

       191
       191
       -
       +					</row>

     

       192
       192
       -
       +				</tbody>

     

       193
       193
       -
       +			</tgroup>

     

       194
       194
       -
       +		</table>

     

       195
       195
       -
       +	</sect2>

     

       196
       196
       -
       +

     

       197
       197
       -
       +<!--

     

       198
       198
       -
       +	<sect2 id="trash-folder-commands">

     

       199
       199
       -
       +		<title>Commands</title>

     

       200
       200
       -
       +		<para>None</para>

     

       201
       201
       -
       +	</sect2>

     

       202
       202
       -
       +

     

       203
       203
       -
       +	<sect2 id="trash-folder-colors">

     

       204
       204
       -
       +		<title>Colors</title>

     

       205
       205
       -
       +		<para>None</para>

     

       206
       206
       -
       +	</sect2>

     

       207
       207
       -
       +

     

       208
       208
       -
       +	<sect2 id="trash-folder-sort">

     

       209
       209
       -
       +		<title>Sort</title>

     

       210
       210
       -
       +		<para>None</para>

     

       211
       211
       -
       +	</sect2>

     

       212
       212
       -
       +-->

     

       213
       213
       -
       +

     

       214
       214
       -
       +	<sect2 id="trash-folder-muttrc">

     

       215
       215
       -
       +		<title>Muttrc</title>

     

       216
       216
       -
       +<screen>

     

       217
       217
       -
       +<emphasis role="comment"># Example Mutt config file for the 'trash' feature.

     

       218
       218
       -
       + 

     

       219
       219
       -
       +# This feature defines a new 'trash' folder.

     

       220
       220
       -
       +# When mail is deleted it will be moved to this folder.

     

       221
       221
       -
       + 

     

       222
       222
       -
       +# Folder in which to put deleted emails</emphasis>

     

       223
       223
       -
       +set trash='+Trash'

     

       224
       224
       -
       +set trash='/home/flatcap/Mail/Trash'

     

       225
       225
       -
       + 

     

       226
       226
       -
       +<emphasis role="comment"># The default delete key 'd' will move an email to the 'trash' folder

     

       227
       227
       -
       +# Bind 'D' to REALLY delete an email</emphasis>

     

       228
       228
       -
       +bind index D purge-message

     

       229
       229
       -
       + 

     

       230
       230
       -
       +<emphasis role="comment"># Note: Deleting emails from the 'trash' folder will REALLY delete them.

     

       231
       231
       -
       + 

     

       232
       232
       -
       +# vim: syntax=muttrc</emphasis>

     

       233
       233
       -
       +</screen>

     

       234
       234
       -
       +	</sect2>

     

       235
       235
       -
       +

     

       236
       236
       -
       +	<sect2 id="trash-folder-see-also">

     

       237
       237
       -
       +		<title>See Also</title>

     

       238
       238
       -
       +

     

       239
       239
       -
       +		<itemizedlist>

     

       240
       240
       -
       +			<listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>

     

       241
       241
       -
       +			<listitem><para><link linkend="folder-hook">folder-hook</link></para></listitem>

     

       242
       242
       -
       +		</itemizedlist>

     

       243
       243
       -
       +	</sect2>

     

       244
       244
       -
       +

     

       245
       245
       -
       +	<sect2 id="trash-folder-known-bugs">

     

       246
       246
       -
       +		<title>Known Bugs</title>

     

       247
       247
       -
       +		<para>None</para>

     

       248
       248
       -
       +	</sect2>

     

       249
       249
       -
       +

     

       250
       250
       -
       +	<sect2 id="trash-folder-credits">

     

       251
       251
       -
       +		<title>Credits</title>

     

       252
       252
       -
       +		<itemizedlist>

     

       253
       253
       -
       +		<listitem><para>Cedric Duval <email>cedricduval@free.fr</email></para></listitem>

     

       254
       254
       -
       +		<listitem><para>Benjamin Kuperman <email>kuperman@acm.org</email></para></listitem>

     

       255
       255
       -
       +		<listitem><para>Paul Miller <email>paul@voltar.org</email></para></listitem>

     

       256
       256
       -
       +		<listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>

     

       257
       257
       -
       +		</itemizedlist>

     

       258
       258
       -
       +	</sect2>

     

       259
       259
       -
       +</sect1>

     

       260
       260
       -
       +

     

       261
       261
       -
        </chapter>

     

       262
       262
       -
        

     

       263
       263
       -
        <chapter id="security">

     

       264
       264
       -
       diff -urN mutt-1.6.1/doc/muttrc.trash mutt-1.6.1-trash/doc/muttrc.trash

     

       265
       265
       -
       --- mutt-1.6.1/doc/muttrc.trash	1970-01-01 01:00:00.000000000 +0100

     

       266
       266
       -
       +++ mutt-1.6.1-trash/doc/muttrc.trash	2016-06-12 18:43:04.768515676 +0100

     

       267
       267
       -
       @@ -0,0 +1,16 @@

     

       268
       268
       -
       +# Example Mutt config file for the 'trash' feature.

     

       269
       269
       -
       +

     

       270
       270
       -
       +# This feature defines a new 'trash' folder.

     

       271
       271
       -
       +# When mail is deleted it will be moved to this folder.

     

       272
       272
       -
       +

     

       273
       273
       -
       +# Folder in which to put deleted emails

     

       274
       274
       -
       +set trash='+Trash'

     

       275
       275
       -
       +set trash='/home/flatcap/Mail/Trash'

     

       276
       276
       -
       +

     

       277
       277
       -
       +# The default delete key 'd' will move an email to the 'trash' folder

     

       278
       278
       -
       +# Bind 'D' to REALLY delete an email

     

       279
       279
       -
       +bind index D purge-message

     

       280
       280
       -
       +

     

       281
       281
       -
       +# Note: Deleting emails from the 'trash' folder will REALLY delete them.

     

       282
       282
       -
       +

     

       283
       283
       -
       +# vim: syntax=muttrc

     

       284
       284
       -
       diff -urN mutt-1.6.1/doc/vimrc.trash mutt-1.6.1-trash/doc/vimrc.trash

     

       285
       285
       -
       --- mutt-1.6.1/doc/vimrc.trash	1970-01-01 01:00:00.000000000 +0100

     

       286
       286
       -
       +++ mutt-1.6.1-trash/doc/vimrc.trash	2016-06-12 18:43:04.769515692 +0100

     

       287
       287
       -
       @@ -0,0 +1,7 @@

     

       288
       288
       -
       +" Vim syntax file for the mutt trash patch

     

       289
       289
       -
       +

     

       290
       290
       -
       +syntax keyword muttrcVarStr     contained skipwhite trash                 nextgroup=muttrcVarEqualsIdxFmt

     

       291
       291
       -
       +

     

       292
       292
       -
       +syntax match muttrcFunction     contained "\<purge-message\>"

     

       293
       293
       -
       +

     

       294
       294
       -
       +" vim: syntax=vim

     

       295
       295
       -
       diff -urN mutt-1.6.1/flags.c mutt-1.6.1-trash/flags.c

     

       296
       296
       -
       --- mutt-1.6.1/flags.c	2016-06-12 18:43:00.403447606 +0100

     

       297
       297
       -
       +++ mutt-1.6.1-trash/flags.c	2016-06-12 18:43:04.902517766 +0100

     

       298
       298
       -
       @@ -65,7 +65,13 @@

     

       299
       299
       -
              {

     

       300
       300
       -
        	h->deleted = 0;

     

       301
       301
       -
                update = 1;

     

       302
       302
       -
       -	if (upd_ctx) ctx->deleted--;

     

       303
       303
       -
       +        if (upd_ctx) {

     

       304
       304
       -
       +          ctx->deleted--;

     

       305
       305
       -
       +          if (h->appended) {

     

       306
       306
       -
       +            ctx->appended--;

     

       307
       307
       -
       +	  }

     

       308
       308
       -
       +        }

     

       309
       309
       -
       +        h->appended = 0; /* when undeleting, also reset the appended flag */

     

       310
       310
       -
        #ifdef USE_IMAP

     

       311
       311
       -
                /* see my comment above */

     

       312
       312
       -
        	if (ctx->magic == M_IMAP) 

     

       313
       313
       -
       @@ -87,6 +93,27 @@

     

       314
       314
       -
              }

     

       315
       315
       -
              break;

     

       316
       316
       -
        

     

       317
       317
       -
       +    case M_APPENDED:

     

       318
       318
       -
       +      if (bf) {

     

       319
       319
       -
       +        if (!h->appended) {

     

       320
       320
       -
       +          h->appended = 1;

     

       321
       321
       -
       +          if (upd_ctx) {

     

       322
       322
       -
       +            ctx->appended++;

     

       323
       323
       -
       +          }

     

       324
       324
       -
       +        }

     

       325
       325
       -
       +      }

     

       326
       326
       -
       +      break;

     

       327
       327
       -
       +

     

       328
       328
       -
       +    case M_PURGED:

     

       329
       329
       -
       +      if (bf) {

     

       330
       330
       -
       +        if (!h->purged) {

     

       331
       331
       -
       +          h->purged = 1;

     

       332
       332
       -
       +        }

     

       333
       333
       -
       +      } else if (h->purged) {

     

       334
       334
       -
       +        h->purged = 0;

     

       335
       335
       -
       +      }

     

       336
       336
       -
       +      break;

     

       337
       337
       -
       +

     

       338
       338
       -
            case M_NEW:

     

       339
       339
       -
        

     

       340
       340
       -
              if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))

     

       341
       341
       -
       diff -urN mutt-1.6.1/functions.h mutt-1.6.1-trash/functions.h

     

       342
       342
       -
       --- mutt-1.6.1/functions.h	2016-06-12 18:43:00.403447606 +0100

     

       343
       343
       -
       +++ mutt-1.6.1-trash/functions.h	2016-06-12 18:43:04.902517766 +0100

     

       344
       344
       -
       @@ -121,6 +121,7 @@

     

       345
       345
       -
          { "toggle-write",		OP_TOGGLE_WRITE,		"%" },

     

       346
       346
       -
          { "next-thread",		OP_MAIN_NEXT_THREAD,		"\016" },

     

       347
       347
       -
          { "next-subthread",		OP_MAIN_NEXT_SUBTHREAD,		"\033n" },

     

       348
       348
       -
       +  { "purge-message",		OP_PURGE_MESSAGE,		NULL },

     

       349
       349
       -
          { "query",			OP_QUERY,			"Q" },

     

       350
       350
       -
          { "quit",			OP_QUIT,			"q" },

     

       351
       351
       -
          { "reply",			OP_REPLY,			"r" },

     

       352
       352
       -
       @@ -213,6 +214,7 @@

     

       353
       353
       -
          { "print-message",	OP_PRINT,			"p" },

     

       354
       354
       -
          { "previous-thread",	OP_MAIN_PREV_THREAD,		"\020" },

     

       355
       355
       -
          { "previous-subthread",OP_MAIN_PREV_SUBTHREAD,	"\033p" },

     

       356
       356
       -
       +  { "purge-message",	OP_PURGE_MESSAGE,		NULL },

     

       357
       357
       -
          { "quit",		OP_QUIT,			"Q" },

     

       358
       358
       -
          { "exit",		OP_EXIT,			"q" },

     

       359
       359
       -
          { "reply",		OP_REPLY,			"r" },

     

       360
       360
       -
       diff -urN mutt-1.6.1/globals.h mutt-1.6.1-trash/globals.h

     

       361
       361
       -
       --- mutt-1.6.1/globals.h	2016-06-12 18:43:00.403447606 +0100

     

       362
       362
       -
       +++ mutt-1.6.1-trash/globals.h	2016-06-12 18:43:04.903517781 +0100

     

       363
       363
       -
       @@ -141,6 +141,7 @@

     

       364
       364
       -
        WHERE char *Status;

     

       365
       365
       -
        WHERE char *Tempdir;

     

       366
       366
       -
        WHERE char *Tochars;

     

       367
       367
       -
       +WHERE char *TrashPath;

     

       368
       368
       -
        WHERE char *TSStatusFormat;

     

       369
       369
       -
        WHERE char *TSIconFormat;

     

       370
       370
       -
        WHERE short TSSupported;

     

       371
       371
       -
       diff -urN mutt-1.6.1/imap/imap.c mutt-1.6.1-trash/imap/imap.c

     

       372
       372
       -
       --- mutt-1.6.1/imap/imap.c	2016-06-12 18:43:00.405447637 +0100

     

       373
       373
       -
       +++ mutt-1.6.1-trash/imap/imap.c	2016-06-12 18:43:04.905517812 +0100

     

       374
       374
       -
       @@ -888,6 +888,12 @@

     

       375
       375
       -
                  if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted)

     

       376
       376
       -
                    match = invert ^ hdrs[n]->deleted;

     

       377
       377
       -
        	  break;

     

       378
       378
       -
       +        case M_EXPIRED: /* imap_fast_trash version of M_DELETED */

     

       379
       379
       -
       +	  if (hdrs[n]->purged)

     

       380
       380
       -
       +	    break;

     

       381
       381
       -
       +          if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted)

     

       382
       382
       -
       +            match = invert ^ (hdrs[n]->deleted && !hdrs[n]->appended);

     

       383
       383
       -
       +	  break;

     

       384
       384
       -
                case M_FLAG:

     

       385
       385
       -
                  if (hdrs[n]->flagged != HEADER_DATA(hdrs[n])->flagged)

     

       386
       386
       -
                    match = invert ^ hdrs[n]->flagged;

     

       387
       387
       -
       @@ -2038,3 +2044,53 @@

     

       388
       388
       -
        

     

       389
       389
       -
          return -1;

     

       390
       390
       -
        }

     

       391
       391
       -
       +

     

       392
       392
       -
       +/**

     

       393
       393
       -
       + * imap_fast_trash - XXX

     

       394
       394
       -
       + */

     

       395
       395
       -
       +int

     

       396
       396
       -
       +imap_fast_trash (void)

     

       397
       397
       -
       +{

     

       398
       398
       -
       +	if ((Context->magic == M_IMAP) && mx_is_imap (TrashPath)) {

     

       399
       399
       -
       +		IMAP_MBOX mx;

     

       400
       400
       -
       +		IMAP_DATA *idata = (IMAP_DATA *) Context->data;

     

       401
       401
       -
       +		char mbox[LONG_STRING];

     

       402
       402
       -
       +		char mmbox[LONG_STRING];

     

       403
       403
       -
       +		int rc;

     

       404
       404
       -
       +		dprint (1, (debugfile, "[itf] trashcan seems to be on imap.\n"));

     

       405
       405
       -
       +

     

       406
       406
       -
       +		if (imap_parse_path (TrashPath, &mx) == 0) {

     

       407
       407
       -
       +			if (mutt_account_match (&(idata->conn->account), &(mx.account))) {

     

       408
       408
       -
       +				dprint (1, (debugfile, "[itf] trashcan seems to be on the same account.\n"));

     

       409
       409
       -
       +

     

       410
       410
       -
       +				imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));

     

       411
       411
       -
       +				if (!*mbox)

     

       412
       412
       -
       +					strfcpy (mbox, "INBOX", sizeof (mbox));

     

       413
       413
       -
       +				imap_munge_mbox_name (idata, mmbox, sizeof (mmbox), mbox);

     

       414
       414
       -
       +

     

       415
       415
       -
       +				rc = imap_exec_msgset (idata, "UID COPY", mmbox, M_EXPIRED, 0, 0);

     

       416
       416
       -
       +				if (rc == 0) {

     

       417
       417
       -
       +					dprint (1, (debugfile, "imap_copy_messages: No messages del-tagged\n"));

     

       418
       418
       -
       +					rc = -1;

     

       419
       419
       -
       +					goto old_way;

     

       420
       420
       -
       +				} else if (rc < 0) {

     

       421
       421
       -
       +					dprint (1, (debugfile, "could not queue copy\n"));

     

       422
       422
       -
       +					goto old_way;

     

       423
       423
       -
       +				} else {

     

       424
       424
       -
       +					mutt_message (_("Copying %d messages to %s..."), rc, mbox);

     

       425
       425
       -
       +					return 0;

     

       426
       426
       -
       +				}

     

       427
       427
       -
       +			} else {

     

       428
       428
       -
       +				dprint (1, (debugfile, "[itf] trashcan seems to be on a different account.\n"));

     

       429
       429
       -
       +			}

     

       430
       430
       -
       +old_way:

     

       431
       431
       -
       +			FREE(&mx.mbox); /* we probably only need to free this when the parse works */

     

       432
       432
       -
       +		} else {

     

       433
       433
       -
       +			dprint (1, (debugfile, "[itf] failed to parse TrashPath.\n"));

     

       434
       434
       -
       +		}

     

       435
       435
       -
       +

     

       436
       436
       -
       +		dprint (1, (debugfile, "[itf] giving up and trying old fasioned way.\n"));

     

       437
       437
       -
       +	}

     

       438
       438
       -
       +

     

       439
       439
       -
       +	return 1;

     

       440
       440
       -
       +}

     

       441
       441
       -
       diff -urN mutt-1.6.1/imap/imap.h mutt-1.6.1-trash/imap/imap.h

     

       442
       442
       -
       --- mutt-1.6.1/imap/imap.h	2016-06-12 18:43:00.405447637 +0100

     

       443
       443
       -
       +++ mutt-1.6.1-trash/imap/imap.h	2016-06-12 18:43:04.774515769 +0100

     

       444
       444
       -
       @@ -72,4 +72,7 @@

     

       445
       445
       -
        

     

       446
       446
       -
        int imap_account_match (const ACCOUNT* a1, const ACCOUNT* a2);

     

       447
       447
       -
        

     

       448
       448
       -
       +/* trash */

     

       449
       449
       -
       +int imap_fast_trash (void);

     

       450
       450
       -
       +

     

       451
       451
       -
        #endif

     

       452
       452
       -
       diff -urN mutt-1.6.1/imap/message.c mutt-1.6.1-trash/imap/message.c

     

       453
       453
       -
       --- mutt-1.6.1/imap/message.c	2016-06-12 18:43:00.406447652 +0100

     

       454
       454
       -
       +++ mutt-1.6.1-trash/imap/message.c	2016-06-12 18:43:04.906517828 +0100

     

       455
       455
       -
       @@ -886,6 +886,7 @@

     

       456
       456
       -
                if (ctx->hdrs[n]->tagged)

     

       457
       457
       -
                {

     

       458
       458
       -
                  mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);

     

       459
       459
       -
       +          mutt_set_flag (ctx, ctx->hdrs[n], M_APPENDED, 1);

     

       460
       460
       -
                  if (option (OPTDELETEUNTAG))

     

       461
       461
       -
                    mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);

     

       462
       462
       -
                }

     

       463
       463
       -
       @@ -893,6 +894,7 @@

     

       464
       464
       -
            else

     

       465
       465
       -
            {

     

       466
       466
       -
              mutt_set_flag (ctx, h, M_DELETE, 1);

     

       467
       467
       -
       +      mutt_set_flag (ctx, h, M_APPENDED, 1);

     

       468
       468
       -
              if (option (OPTDELETEUNTAG))

     

       469
       469
       -
                mutt_set_flag (ctx, h, M_TAG, 0);

     

       470
       470
       -
            }

     

       471
       471
       -
       diff -urN mutt-1.6.1/init.h mutt-1.6.1-trash/init.h

     

       472
       472
       -
       --- mutt-1.6.1/init.h	2016-06-12 18:43:00.408447684 +0100

     

       473
       473
       -
       +++ mutt-1.6.1-trash/init.h	2016-06-12 18:43:04.909517875 +0100

     

       474
       474
       -
       @@ -3419,6 +3419,16 @@

     

       475
       475
       -
          ** provided that ``$$ts_enabled'' has been set. This string is identical in

     

       476
       476
       -
          ** formatting to the one used by ``$$status_format''.

     

       477
       477
       -
          */

     

       478
       478
       -
       +  { "trash",            DT_PATH, R_NONE, UL &TrashPath, 0 },

     

       479
       479
       -
       +  /*

     

       480
       480
       -
       +  ** .pp

     

       481
       481
       -
       +  ** If set, this variable specifies the path of the trash folder where the

     

       482
       482
       -
       +  ** mails marked for deletion will be moved, instead of being irremediably

     

       483
       483
       -
       +  ** purged.

     

       484
       484
       -
       +  ** .pp

     

       485
       485
       -
       +  ** NOTE: When you delete a message in the trash folder, it is really

     

       486
       486
       -
       +  ** deleted, so that you have a way to clean the trash.

     

       487
       487
       -
       +  */

     

       488
       488
       -
        #ifdef USE_SOCKET

     

       489
       489
       -
          { "tunnel",            DT_STR, R_NONE, UL &Tunnel, UL 0 },

     

       490
       490
       -
          /*

     

       491
       491
       -
       diff -urN mutt-1.6.1/mutt.h mutt-1.6.1-trash/mutt.h

     

       492
       492
       -
       --- mutt-1.6.1/mutt.h	2016-06-12 18:43:00.410447715 +0100

     

       493
       493
       -
       +++ mutt-1.6.1-trash/mutt.h	2016-06-12 18:43:04.912517922 +0100

     

       494
       494
       -
       @@ -182,6 +182,8 @@

     

       495
       495
       -
          M_DELETE,

     

       496
       496
       -
          M_UNDELETE,

     

       497
       497
       -
          M_DELETED,

     

       498
       498
       -
       +  M_APPENDED,

     

       499
       499
       -
       +  M_PURGED,

     

       500
       500
       -
          M_FLAG,

     

       501
       501
       -
          M_TAG,

     

       502
       502
       -
          M_UNTAG,

     

       503
       503
       -
       @@ -719,6 +721,8 @@

     

       504
       504
       -
          unsigned int mime : 1;    		/* has a MIME-Version header? */

     

       505
       505
       -
          unsigned int flagged : 1; 		/* marked important? */

     

       506
       506
       -
          unsigned int tagged : 1;

     

       507
       507
       -
       +  unsigned int appended : 1;		/* has been saved */

     

       508
       508
       -
       +  unsigned int purged : 1;   /* bypassing the trash folder */

     

       509
       509
       -
          unsigned int deleted : 1;

     

       510
       510
       -
          unsigned int changed : 1;

     

       511
       511
       -
          unsigned int attach_del : 1; 		/* has an attachment marked for deletion */

     

       512
       512
       -
       @@ -891,6 +895,7 @@

     

       513
       513
       -
          int new;			/* how many new messages? */

     

       514
       514
       -
          int unread;			/* how many unread messages? */

     

       515
       515
       -
          int deleted;			/* how many deleted messages */

     

       516
       516
       -
       +  int appended;                 /* how many saved messages? */

     

       517
       517
       -
          int flagged;			/* how many flagged messages */

     

       518
       518
       -
          int msgnotreadyet;		/* which msg "new" in pager, -1 if none */

     

       519
       519
       -
        

     

       520
       520
       -
       diff -urN mutt-1.6.1/muttlib.c mutt-1.6.1-trash/muttlib.c

     

       521
       521
       -
       --- mutt-1.6.1/muttlib.c	2016-06-12 18:43:00.411447731 +0100

     

       522
       522
       -
       +++ mutt-1.6.1-trash/muttlib.c	2016-06-12 18:43:04.913517937 +0100

     

       523
       523
       -
       @@ -1511,7 +1511,9 @@

     

       524
       524
       -
        

     

       525
       525
       -
          if (magic > 0 && !mx_access (s, W_OK))

     

       526
       526
       -
          {

     

       527
       527
       -
       -    if (option (OPTCONFIRMAPPEND))

     

       528
       528
       -
       +    if (option (OPTCONFIRMAPPEND) &&

     

       529
       529
       -
       +       (!TrashPath || (mutt_strcmp (s, TrashPath) != 0)))

     

       530
       530
       -
       +       /* if we're appending to the trash, there's no point in asking */

     

       531
       531
       -
            {

     

       532
       532
       -
              snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);

     

       533
       533
       -
              if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)

     

       534
       534
       -
       diff -urN mutt-1.6.1/mx.c mutt-1.6.1-trash/mx.c

     

       535
       535
       -
       --- mutt-1.6.1/mx.c	2016-06-12 18:43:00.411447731 +0100

     

       536
       536
       -
       +++ mutt-1.6.1-trash/mx.c	2016-06-12 18:43:04.914517953 +0100

     

       537
       537
       -
       @@ -776,6 +776,62 @@

     

       538
       538
       -
          return rc;

     

       539
       539
       -
        }

     

       540
       540
       -
        

     

       541
       541
       -
       +/**

     

       542
       542
       -
       + * trash_append - XXX

     

       543
       543
       -
       + *

     

       544
       544
       -
       + * move deleted mails to the trash folder

     

       545
       545
       -
       + */

     

       546
       546
       -
       +static int trash_append (CONTEXT *ctx)

     

       547
       547
       -
       +{

     

       548
       548
       -
       +	CONTEXT *ctx_trash;

     

       549
       549
       -
       +	int i = 0;

     

       550
       550
       -
       +	struct stat st, stc;

     

       551
       551
       -
       +

     

       552
       552
       -
       +	if (!TrashPath || !ctx->deleted ||

     

       553
       553
       -
       +	   ((ctx->magic == M_MAILDIR) && option (OPTMAILDIRTRASH))) {

     

       554
       554
       -
       +		return 0;

     

       555
       555
       -
       +	}

     

       556
       556
       -
       +

     

       557
       557
       -
       +	for (; i < ctx->msgcount && (!ctx->hdrs[i]->deleted || ctx->hdrs[i]->appended); i++);

     

       558
       558
       -
       +		/* nothing */

     

       559
       559
       -
       +

     

       560
       560
       -
       +	if (i == ctx->msgcount)

     

       561
       561
       -
       +		return 0; /* nothing to be done */

     

       562
       562
       -
       +

     

       563
       563
       -
       +	if (mutt_save_confirm (TrashPath, &st) != 0) {

     

       564
       564
       -
       +		mutt_error _("message(s) not deleted");

     

       565
       565
       -
       +		return -1;

     

       566
       566
       -
       +	}

     

       567
       567
       -
       +

     

       568
       568
       -
       +	if (lstat (ctx->path, &stc) == 0 && stc.st_ino == st.st_ino

     

       569
       569
       -
       +	    && stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev) {

     

       570
       570
       -
       +		return 0;  /* we are in the trash folder: simple sync */

     

       571
       571
       -
       +	}

     

       572
       572
       -
       +

     

       573
       573
       -
       +#ifdef USE_IMAP

     

       574
       574
       -
       +	if (!imap_fast_trash())

     

       575
       575
       -
       +		return 0;

     

       576
       576
       -
       +#endif

     

       577
       577
       -
       +

     

       578
       578
       -
       +	if ((ctx_trash = mx_open_mailbox (TrashPath, M_APPEND, NULL)) != NULL) {

     

       579
       579
       -
       +		for (i = 0 ; i < ctx->msgcount ; i++) {

     

       580
       580
       -
       +			if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended

     

       581
       581
       -
       +			    && !ctx->hdrs[i]->purged

     

       582
       582
       -
       +			    && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1) {

     

       583
       583
       -
       +				mx_close_mailbox (ctx_trash, NULL);

     

       584
       584
       -
       +				return -1;

     

       585
       585
       -
       +			}

     

       586
       586
       -
       +		}

     

       587
       587
       -
       +

     

       588
       588
       -
       +		mx_close_mailbox (ctx_trash, NULL);

     

       589
       589
       -
       +	} else {

     

       590
       590
       -
       +		mutt_error _("Can't open trash folder");

     

       591
       591
       -
       +		return -1;

     

       592
       592
       -
       +	}

     

       593
       593
       -
       +

     

       594
       594
       -
       +	return 0;

     

       595
       595
       -
       +}

     

       596
       596
       -
       +

     

       597
       597
       -
        /* save changes and close mailbox */

     

       598
       598
       -
        int mx_close_mailbox (CONTEXT *ctx, int *index_hint)

     

       599
       599
       -
        {

     

       600
       600
       -
       @@ -912,6 +968,7 @@

     

       601
       601
       -
        	  if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)

     

       602
       602
       -
        	  {

     

       603
       603
       -
        	    mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);

     

       604
       604
       -
       +	    mutt_set_flag (ctx, ctx->hdrs[i], M_APPENDED, 1);

     

       605
       605
       -
        	  }

     

       606
       606
       -
        	  else

     

       607
       607
       -
        	  {

     

       608
       608
       -
       @@ -936,6 +993,14 @@

     

       609
       609
       -
            return 0;

     

       610
       610
       -
          }

     

       611
       611
       -
          

     

       612
       612
       -
       +  /* copy mails to the trash before expunging */

     

       613
       613
       -
       +  if (purge && ctx->deleted && mutt_strcmp (ctx->path, TrashPath)) {

     

       614
       614
       -
       +    if (trash_append (ctx) != 0) {

     

       615
       615
       -
       +      ctx->closing = 0;

     

       616
       616
       -
       +      return -1;

     

       617
       617
       -
       +    }

     

       618
       618
       -
       +  }

     

       619
       619
       -
       +

     

       620
       620
       -
        #ifdef USE_IMAP

     

       621
       621
       -
          /* allow IMAP to preserve the deleted flag across sessions */

     

       622
       622
       -
          if (ctx->magic == M_IMAP)

     

       623
       623
       -
       @@ -1140,6 +1205,12 @@

     

       624
       624
       -
          msgcount = ctx->msgcount;

     

       625
       625
       -
          deleted = ctx->deleted;

     

       626
       626
       -
        

     

       627
       627
       -
       +  if (purge && ctx->deleted && mutt_strcmp (ctx->path, TrashPath)) {

     

       628
       628
       -
       +    if (trash_append (ctx) == -1) {

     

       629
       629
       -
       +      return -1;

     

       630
       630
       -
       +    }

     

       631
       631
       -
       +  }

     

       632
       632
       -
       +

     

       633
       633
       -
        #ifdef USE_IMAP

     

       634
       634
       -
          if (ctx->magic == M_IMAP)

     

       635
       635
       -
            rc = imap_sync_mailbox (ctx, purge, index_hint);

     

       636
       636
       -
       diff -urN mutt-1.6.1/OPS mutt-1.6.1-trash/OPS

     

       637
       637
       -
       --- mutt-1.6.1/OPS	2016-06-12 18:43:00.389447388 +0100

     

       638
       638
       -
       +++ mutt-1.6.1-trash/OPS	2016-06-12 18:43:04.883517469 +0100

     

       639
       639
       -
       @@ -142,6 +142,7 @@

     

       640
       640
       -
        OP_PREV_LINE "scroll up one line"

     

       641
       641
       -
        OP_PREV_PAGE "move to the previous page"

     

       642
       642
       -
        OP_PRINT "print the current entry"

     

       643
       643
       -
       +OP_PURGE_MESSAGE "really delete the current entry, bypassing the trash folder"

     

       644
       644
       -
        OP_QUERY "query external program for addresses"

     

       645
       645
       -
        OP_QUERY_APPEND "append new query results to current results"

     

       646
       646
       -
        OP_QUIT "save changes to mailbox and quit"

     

       647
       647
       -
       diff -urN mutt-1.6.1/pager.c mutt-1.6.1-trash/pager.c

     

       648
       648
       -
       --- mutt-1.6.1/pager.c	2016-06-12 18:43:00.412447746 +0100

     

       649
       649
       -
       +++ mutt-1.6.1-trash/pager.c	2016-06-12 18:43:04.915517968 +0100

     

       650
       650
       -
       @@ -2351,6 +2351,7 @@

     

       651
       651
       -
        	MAYBE_REDRAW (redraw);

     

       652
       652
       -
        	break;

     

       653
       653
       -
        

     

       654
       654
       -
       +      case OP_PURGE_MESSAGE:

     

       655
       655
       -
              case OP_DELETE:

     

       656
       656
       -
        	CHECK_MODE(IsHeader (extra));

     

       657
       657
       -
        	CHECK_READONLY;

     

       658
       658
       -
       @@ -2358,6 +2359,8 @@

     

       659
       659
       -
        	CHECK_ACL(M_ACL_DELETE, _("Cannot delete message"));

     

       660
       660
       -
        

     

       661
       661
       -
        	mutt_set_flag (Context, extra->hdr, M_DELETE, 1);

     

       662
       662
       -
       +	mutt_set_flag (Context, extra->hdr, M_PURGED,

     

       663
       663
       -
       +		       ch != OP_PURGE_MESSAGE ? 0 : 1);

     

       664
       664
       -
                if (option (OPTDELETEUNTAG))

     

       665
       665
       -
        	  mutt_set_flag (Context, extra->hdr, M_TAG, 0);

     

       666
       666
       -
        	redraw = REDRAW_STATUS | REDRAW_INDEX;

     

       667
       667
       -
       @@ -2688,6 +2691,7 @@

     

       668
       668
       -
        	CHECK_ACL(M_ACL_DELETE, _("Cannot undelete message"));

     

       669
       669
       -
        

     

       670
       670
       -
        	mutt_set_flag (Context, extra->hdr, M_DELETE, 0);

     

       671
       671
       -
       +	mutt_set_flag (Context, extra->hdr, M_PURGED, 0);

     

       672
       672
       -
        	redraw = REDRAW_STATUS | REDRAW_INDEX;

     

       673
       673
       -
        	if (option (OPTRESOLVE))

     

       674
       674
       -
        	{

     

       675
       675
       -
       @@ -2704,9 +2708,11 @@

     

       676
       676
       -
        	CHECK_ACL(M_ACL_DELETE, _("Cannot undelete message(s)"));

     

       677
       677
       -
        

     

       678
       678
       -
        	r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,

     

       679
       679
       -
       +				  ch == OP_UNDELETE_THREAD ? 0 : 1)

     

       680
       680
       -
       +	  + mutt_thread_set_flag (extra->hdr, M_PURGED, 0,

     

       681
       681
       -
        				  ch == OP_UNDELETE_THREAD ? 0 : 1);

     

       682
       682
       -
        

     

       683
       683
       -
       -	if (r != -1)

     

       684
       684
       -
       +	if (r > -1)

     

       685
       685
       -
        	{

     

       686
       686
       -
        	  if (option (OPTRESOLVE))

     

       687
       687
       -
        	  {

     

       688
       688
       -
       diff -urN mutt-1.6.1/PATCHES mutt-1.6.1-trash/PATCHES

     

       689
       689
       -
       --- mutt-1.6.1/PATCHES	2016-06-12 18:43:00.395447481 +0100

     

       690
       690
       -
       +++ mutt-1.6.1-trash/PATCHES	2016-06-12 18:43:04.889517563 +0100

     

       691
       691
       -
       @@ -0,0 +1 @@

     

       692
       692
       -
       +patch-trash-neo-20160612

     

       693
       693
       -
       diff -urN mutt-1.6.1/pattern.c mutt-1.6.1-trash/pattern.c

     

       694
       694
       -
       --- mutt-1.6.1/pattern.c	2016-06-12 18:43:00.413447762 +0100

     

       695
       695
       -
       +++ mutt-1.6.1-trash/pattern.c	2016-06-12 18:43:04.916517984 +0100

     

       696
       696
       -
       @@ -1367,8 +1367,9 @@

     

       697
       697
       -
              {

     

       698
       698
       -
        	switch (op)

     

       699
       699
       -
        	{

     

       700
       700
       -
       -	  case M_DELETE:

     

       701
       701
       -
        	  case M_UNDELETE:

     

       702
       702
       -
       +	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_PURGED, 0);

     

       703
       703
       -
       +	  case M_DELETE:

     

       704
       704
       -
        	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_DELETE, 

     

       705
       705
       -
        			  (op == M_DELETE));

     

       706
       706
       -
        	    break;

     

       707
       707
       -
       diff -urN mutt-1.6.1/postpone.c mutt-1.6.1-trash/postpone.c

     

       708
       708
       -
       --- mutt-1.6.1/postpone.c	2016-06-12 18:43:00.414447777 +0100

     

       709
       709
       -
       +++ mutt-1.6.1-trash/postpone.c	2016-06-12 18:43:04.917518000 +0100

     

       710
       710
       -
       @@ -277,6 +277,9 @@

     

       711
       711
       -
          /* finished with this message, so delete it. */

     

       712
       712
       -
          mutt_set_flag (PostContext, h, M_DELETE, 1);

     

       713
       713
       -
        

     

       714
       714
       -
       +  /* and consider it saved, so that it won't be moved to the trash folder */

     

       715
       715
       -
       +  mutt_set_flag (PostContext, h, M_APPENDED, 1);

     

       716
       716
       -
       +

     

       717
       717
       -
          /* update the count for the status display */

     

       718
       718
       -
          PostCount = PostContext->msgcount - PostContext->deleted;

     

       719
       719
       -
        

     

       720
       720
       -
       diff -urN mutt-1.6.1/README.trash mutt-1.6.1-trash/README.trash

     

       721
       721
       -
       --- mutt-1.6.1/README.trash	1970-01-01 01:00:00.000000000 +0100

     

       722
       722
       -
       +++ mutt-1.6.1-trash/README.trash	2016-06-12 18:43:04.748515364 +0100

     

       723
       723
       -
       @@ -0,0 +1,74 @@

     

       724
       724
       -
       +Trash Folder Patch

     

       725
       725
       -
       +==================

     

       726
       726
       -
       +

     

       727
       727
       -
       +    Automatically move "deleted" emails to a trash bin

     

       728
       728
       -
       +

     

       729
       729
       -
       +Patch

     

       730
       730
       -
       +-----

     

       731
       731
       -
       +

     

       732
       732
       -
       +    To check if Mutt supports "Trash Folder", look for "patch-trash" in the

     

       733
       733
       -
       +    mutt version.

     

       734
       734
       -
       +

     

       735
       735
       -
       +    If IMAP is enabled, this patch will use it

     

       736
       736
       -
       +

     

       737
       737
       -
       +    Dependencies

     

       738
       738
       -
       +    * mutt-1.6.1

     

       739
       739
       -
       +    * IMAP support

     

       740
       740
       -
       +

     

       741
       741
       -
       +Introduction

     

       742
       742
       -
       +------------

     

       743
       743
       -
       +

     

       744
       744
       -
       +    In Mutt, when you "delete" an email it is first marked deleted. The email

     

       745
       745
       -
       +    isn't really gone until <sync-mailbox> is called. This happens when the

     

       746
       746
       -
       +    user leaves the folder, or the function is called manually.

     

       747
       747
       -
       +

     

       748
       748
       -
       +    After '<sync-mailbox>' has been called the email is gone forever.

     

       749
       749
       -
       +

     

       750
       750
       -
       +    The $trash variable defines a folder in which to keep old emails. As

     

       751
       751
       -
       +    before, first you mark emails for deletion. When <sync-mailbox> is called

     

       752
       752
       -
       +    the emails are moved to the trash folder.

     

       753
       753
       -
       +

     

       754
       754
       -
       +    The '$trash' path can be either a full directory, or be relative to the

     

       755
       755
       -
       +    $folder variable, like the 'mailboxes' command.

     

       756
       756
       -
       +

     

       757
       757
       -
       +    > Note

     

       758
       758
       -
       +    >

     

       759
       759
       -
       +    > Emails deleted from the trash folder are gone forever.

     

       760
       760
       -
       +

     

       761
       761
       -
       +Variables

     

       762
       762
       -
       +---------

     

       763
       763
       -
       +

     

       764
       764
       -
       +    Trash Variables

     

       765
       765
       -
       +

     

       766
       766
       -
       +    | Name  | Type   | Default |

     

       767
       767
       -
       +    |-------|--------|---------|

     

       768
       768
       -
       +    | trash | string | (none)  |

     

       769
       769
       -
       +

     

       770
       770
       -
       +Functions

     

       771
       771
       -
       +---------

     

       772
       772
       -
       +

     

       773
       773
       -
       +    Trash Functions

     

       774
       774
       -
       +

     

       775
       775
       -
       +    | Menus       | Default Key | Function          | Description                                                 |

     

       776
       776
       -
       +    |-------------|-------------|-------------------|-------------------------------------------------------------|

     

       777
       777
       -
       +    | index,pager | (none)      | '<purge-message>' | really delete the current entry, bypassing the trash folder |

     

       778
       778
       -
       +

     

       779
       779
       -
       +See Also

     

       780
       780
       -
       +--------

     

       781
       781
       -
       +

     

       782
       782
       -
       +    * NeoMutt project

     

       783
       783
       -
       +    * folder-hook

     

       784
       784
       -
       +

     

       785
       785
       -
       +Known Bugs

     

       786
       786
       -
       +----------

     

       787
       787
       -
       +

     

       788
       788
       -
       +    None

     

       789
       789
       -
       +

     

       790
       790
       -
       +Credits

     

       791
       791
       -
       +-------

     

       792
       792
       -
       +

     

       793
       793
       -
       +    * Cedric Duval <cedricduval@free.fr>

     

       794
       794
       -
       +    * Benjamin Kuperman <kuperman@acm.org>

     

       795
       795
       -
       +    * Paul Miller <paul@voltar.org>

     

       796
       796
       -
       +    * Richard Russon <rich@flatcap.org>

     

       797
       797
       -
       +

+2 -2

pkgs/applications/networking/syncthing/default.nix

···

       1
       1
        
       { stdenv, fetchgit, go }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.13.9";

     

       4
       4
       +
         version = "0.13.10";

     

       5
       5
        
         name = "syncthing-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchgit {

     

       8
       8
        
           url = https://github.com/syncthing/syncthing;

     

       9
       9
        
           rev = "refs/tags/v${version}";

     

       10
       10
       -
           sha256 = "1ah3a86rjfqlx4mqyvn8j3r806i65mzhs5xnfg4aakzmwpr5zpx0";

     

       10
       10
       +
           sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ go ];

+4 -3

pkgs/applications/office/kmymoney/default.nix

···

       3
       3
        
       , doxygen, aqbanking, gwenhywfar }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "kmymoney-4.7.2";

     

       6
       6
       +
         name = "kmymoney-${version}";

     

       7
       7
       +
         version = "4.8.0";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";

     

       10
       10
       -
           sha256 = "0g9rakjx7zmw4bf7m5516rrx0n3bl2by3nn24iiz9209yfgw5cmz";

     

       10
       10
       +
           url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";

     

       11
       11
       +
           sha256 = "1hlayhcmdfayma4hchv2bfyg82ry0h74hg4095d959mg19qkb9n2";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         cmakeFlags = [

pkgs/applications/office/libreoffice/default.nix

···

       124
       124
        
           sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk

     

       125
       125
        
           # one more fragile test?

     

       126
       126
        
           sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx

     

       127
       127
       +
           # rendering-dependent test

     

       128
       128
       +
           sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx

     

       127
       129
        
         '';

     

       128
       130
        
       

     

       129
       131
        
         makeFlags = "SHELL=${bash}/bin/bash";

pkgs/applications/office/libreoffice/still.nix

···

       124
       124
        
           sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk

     

       125
       125
        
           # one more fragile test?

     

       126
       126
        
           sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx

     

       127
       127
       +
           # rendering-dependent test

     

       128
       128
       +
           sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx

     

       127
       129
        
         '';

     

       128
       130
        
       

     

       129
       131
        
         makeFlags = "SHELL=${bash}/bin/bash";

+1 -1

pkgs/applications/office/mendeley/default.nix

···

       19
       19
        
         url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";

     

       20
       20
        
         sha256 = if stdenv.system == arch32

     

       21
       21
        
           then "0lsmaw8zzyfvndsz1awz3vl5cdvsik9wc3ck8983y20awh7r9f4m"

     

       22
       22
       -
           else "12p6rgxiqajnfgd8nmknyb8icdkln727sshba8x1xlxakxg5c4q4";

     

       22
       22
       +
           else "0q11v6dv7z5q4s9hlr1hmsd73nmkp8l0sj0b3hjxfblx4mqk6wl7";

     

       23
       23
        
       

     

       24
       24
        
         deps = [

     

       25
       25
        
           gcc.cc

+45

pkgs/applications/office/planner/default.nix

···

       1
       1
       +
       { stdenv, fetchurl

     

       2
       2
       +
       , pkgconfig

     

       3
       3
       +
       , intltool

     

       4
       4
       +
       , gnome

     

       5
       5
       +
       , libxslt

     

       6
       6
       +
       , python

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       let

     

       10
       10
       +
         version = "${major}.${minor}.${patch}";

     

       11
       11
       +
         major = "0";

     

       12
       12
       +
         minor = "14";

     

       13
       13
       +
         patch = "6";

     

       14
       14
       +
       

     

       15
       15
       +
       in stdenv.mkDerivation {

     

       16
       16
       +
         name = "planner-${version}";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchurl {

     

       19
       19
       +
           url = "http://ftp.gnome.org/pub/GNOME/sources/planner/${major}.${minor}/planner-${version}.tar.xz";

     

       20
       20
       +
           sha256 = "15h6ps58giy5r1g66sg1l4xzhjssl362mfny2x09khdqsvk2j38k";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         buildInputs = [

     

       24
       24
       +
           pkgconfig

     

       25
       25
       +
           intltool

     

       26
       26
       +
           gnome.GConf

     

       27
       27
       +
           gnome.gtk

     

       28
       28
       +
           gnome.libgnomecanvas

     

       29
       29
       +
           gnome.libgnomeui

     

       30
       30
       +
           gnome.libglade

     

       31
       31
       +
           gnome.scrollkeeper

     

       32
       32
       +
           libxslt

     

       33
       33
       +
           python

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         enableParallelBuilding = true;

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with stdenv.lib; {

     

       39
       39
       +
           homepage = https://wiki.gnome.org/Apps/Planner/;

     

       40
       40
       +
           description = "Project management application for GNOME";

     

       41
       41
       +
           license = licenses.gpl2;

     

       42
       42
       +
           platforms = platforms.linux;

     

       43
       43
       +
           maintainers = [ maintainers.rasendubi ];

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+10

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

···

       9
       9
        
           sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         unpackPhase = ''

     

       13
       13
       +
           tar xjf ${src}

     

       14
       14
       +
         '';

     

       15
       15
       +
       

     

       12
       16
        
         buildInputs = [ qtbase qtsvg boost qmakeHook ];

     

       13
       17
        
       

     

       18
       18
       +
         qmakeFlags = [ "phoenix.pro" ];

     

       19
       19
       +
       

     

       20
       20
       +
         preConfigure = ''

     

       21
       21
       +
           cd fritzing-${version}.source

     

       22
       22
       +
         '';

     

       23
       23
       +
         

     

       14
       24
        
         meta = {

     

       15
       25
        
           description = "An open source prototyping tool for Arduino-based projects";

     

       16
       26
        
           homepage = http://fritzing.org/;

+3 -3

pkgs/applications/science/logic/coq/8.5.nix

···

       6
       6
        
       {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         version = "8.5pl1";

     

       9
       9
       +
         version = "8.5pl2";

     

       10
       10
        
         coq-version = "8.5";

     

       11
       11
        
         buildIde = lablgtk != null;

     

       12
       12
        
         ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";

     
···

       24
       24
        
       

     

       25
       25
        
         src = fetchurl {

     

       26
       26
        
           url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";

     

       27
       27
       -
           sha256 = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";

     

       27
       27
       +
           sha256 = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

     
···

       34
       34
        
           RM=$(type -tp rm)

     

       35
       35
        
           substituteInPlace configure --replace "/bin/uname" "$UNAME"

     

       36
       36
        
           substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"

     

       37
       37
       -
           substituteInPlace configure.ml --replace "if arch = \"Darwin\" then \"md5" "if arch = \"Darwinx\" then \"md5"

     

       37
       37
       +
           substituteInPlace configure.ml --replace "if arch = \"Darwin\" || arch = \"FreeBSD\" then \"md5" "if arch = \"Darwinx\" then \"md5"

     

       38
       38
        
           ${csdpPatch}

     

       39
       39
        
         '';

     

       40
       40

+2 -2

pkgs/applications/science/logic/tptp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "TPTP-${version}";

     

       5
       5
       -
         version = "6.3.0";

     

       5
       5
       +
         version = "6.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = [

     

       9
       9
        
             "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"

     

       10
       10
        
             "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"

     

       11
       11
        
           ];

     

       12
       12
       -
           sha256 = "0xy4cqniyx9fv8r9mc5q5b7xl163pkr9hcmpq6gkls2a0pvg07w9";

     

       12
       12
       +
           sha256 = "1i5hi8grfl5zyh8py63zn39rg019bd90h2l312iswbgai6nyfdw0";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ tcsh yap perl patchelf ];

+3 -3

pkgs/applications/science/logic/why3/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name    = "why3-${version}";

     

       5
       5
       -
         version = "0.87.0";

     

       5
       5
       +
         version = "0.87.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url    = https://gforge.inria.fr/frs/download.php/file/35643/why3-0.87.0.tar.gz;

     

       9
       9
       -
           sha256 = "0c3vhcb70ay7iwvmq0m25fqh38y40c5x7mki4r9pxf13vgbs3xb0";

     

       8
       8
       +
           url    = https://gforge.inria.fr/frs/download.php/file/35893/why3-0.87.1.tar.gz;

     

       9
       9
       +
           sha256 = "1ssik2f6fkpvwpdmxz8hrm3p62qas3sjlqya0r57s60ilpkgiwwb";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = (with ocamlPackages; [

+2 -2

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

···

       41
       41
        
           cp -v Lie.exe $out

     

       42
       42
        
           cp -v lie $out/bin

     

       43
       43
        
       

     

       44
       44
       -
           cp -v LEARN LEARN.ind $out

     

       45
       45
       -
           cp -v INFO.ind INFO.[0-4] $out

     

       44
       44
       +
           cp -v LEARN* $out

     

       45
       45
       +
           cp -v INFO* $out

     

       46
       46
        
         '';

     

       47
       47
        
       }

+2 -2

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

···

       1
       1
        
       {stdenv, fetchurl, gfortran, openblas}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "JAGS-3.4.0";

     

       4
       4
       +
         name = "JAGS-4.1.0";

     

       5
       5
        
         src = fetchurl {

     

       6
       6
        
           url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";

     

       7
       7
       -
           sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib";

     

       7
       7
       +
           sha256 = "08pmrnbwibc0brgn5cx860jcl0s2xaw4amw7g45649r1bcdz7v25";

     

       8
       8
        
         };

     

       9
       9
        
         buildInputs = [gfortran openblas];

     

       10
       10
        
         configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];

+52

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

···

       1
       1
       +
       { stdenv, fetchurl, perl, gperf, bison, groff

     

       2
       2
       +
       , pkgconfig, libXft, fontconfig, pcre

     

       3
       3
       +
       , libtomcrypt, libtommath, lz4, zlib }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         name = "bitkeeper-${version}";

     

       7
       7
       +
         version = "7.3ce";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.tar.gz";

     

       11
       11
       +
           sha256 = "0lk4vydpq5bi52m81h327gvzdzybf8kkak7yjwmpj6kg1jn9blaz";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         enableParallelBuilding = true;

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           perl gperf bison groff libXft pkgconfig

     

       18
       18
       +
           pcre libtomcrypt libtommath lz4

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
               substituteInPlace port/unix_platform.sh \

     

       23
       23
       +
                       --replace /bin/rm rm

     

       24
       24
       +
               substituteInPlace ./undo.c \

     

       25
       25
       +
                       --replace /bin/cat cat

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         sourceRoot = "bk-${version}/src";

     

       29
       29
       +
         buildPhase = ''

     

       30
       30
       +
           make -j6 V=1 p

     

       31
       31
       +
           make image

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         installPhase = ''

     

       35
       35
       +
           ./utils/bk-* $out/bitkeeper

     

       36
       36
       +
           mkdir -p $out/bin

     

       37
       37
       +
           $out/bitkeeper/bk links $out/bin

     

       38
       38
       +
           chmod g-w $out

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = {

     

       42
       42
       +
           description     = "A distributed version control system";

     

       43
       43
       +
           longDescription = ''

     

       44
       44
       +
             BitKeeper is a fast, enterprise-ready, distributed SCM that

     

       45
       45
       +
             scales up to very large projects and down to tiny ones.

     

       46
       46
       +
           '';

     

       47
       47
       +
           homepage    = https://www.bitkeeper.org/;

     

       48
       48
       +
           license     = stdenv.lib.licenses.asl20;

     

       49
       49
       +
           platforms   = stdenv.lib.platforms.linux;

     

       50
       50
       +
           maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+2 -2

pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "diff-so-fancy-${version}";

     

       5
       5
       -
         version = "0.10.0";

     

       5
       5
       +
         version = "0.10.1";

     

       6
       6
        
       

     

       7
       7
        
         # perl is needed here so patchShebangs can do its job

     

       8
       8
        
         buildInputs = [perl makeWrapper];

     
···

       11
       11
        
           owner = "so-fancy";

     

       12
       12
        
           repo = "diff-so-fancy";

     

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

     

       14
       14
       -
           sha256 = "08dv9xlrsyjr1ylm83lbsv2p5asfia4ib97bwgcacsdxxh5zyqh9";

     

       14
       14
       +
           sha256 = "0wp5civn70jzil1gbygx6ccrxfrmc8xx90v7zgf36rqi2yhvv64m";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildPhase = null;

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

···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ];

     

       20
       20
        
       

     

       21
       21
       +
         qmakeFlags = [ "guitone.pro" ];

     

       22
       22
       +
       

     

       21
       23
        
         meta = {

     

       22
       24
        
           description = "Qt4 based GUI for monotone";

     

       23
       25
        
           homepage = http://guitone.thomaskeller.biz;

+48

pkgs/applications/video/openshot-qt/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen

     

       2
       2
       +
       , ffmpeg, python3Packages, qt55}:

     

       3
       3
       +
       

     

       4
       4
       +
       with stdenv.lib;

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         libopenshot = callPackage ./libopenshot.nix {};

     

       8
       8
       +
       in

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       10
       10
       +
         name = "openshot-qt-${version}";

     

       11
       11
       +
         version = "2.0.7";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "OpenShot";

     

       15
       15
       +
           repo = "openshot-qt";

     

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

     

       17
       17
       +
           sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           qt55.qtbase

     

       24
       24
       +
           qt55.qtmultimedia

     

       25
       25
       +
           libopenshot

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         installPhase = ''

     

       29
       29
       +
           mkdir -p $(toPythonPath $out)

     

       30
       30
       +
           cp -r src/* $(toPythonPath $out)

     

       31
       31
       +
           mkdir -p $out/bin

     

       32
       32
       +
           echo "#/usr/bin/env sh" >$out/bin/openshot-qt

     

       33
       33
       +
           echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt

     

       34
       34
       +
           chmod +x $out/bin/openshot-qt

     

       35
       35
       +
           wrapProgram $out/bin/openshot-qt \

     

       36
       36
       +
             --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip_4_16}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH"

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         doCheck = false;

     

       40
       40
       +
       

     

       41
       41
       +
         meta = {

     

       42
       42
       +
           homepage = "http://openshot.org/";

     

       43
       43
       +
           description = "Free, open-source video editor";

     

       44
       44
       +
           license = licenses.gpl3Plus;

     

       45
       45
       +
           maintainers = [maintainers.tohl];

     

       46
       46
       +
           platforms = platforms.linux;

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+31

pkgs/applications/video/openshot-qt/libopenshot-audio.nix

···

       1
       1
       +
       {stdenv, fetchurl, fetchFromGitHub, cmake, doxygen

     

       2
       2
       +
       , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor, alsaLib}:

     

       3
       3
       +
       

     

       4
       4
       +
       with stdenv.lib;

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         name = "libopenshot-audio-${version}";

     

       8
       8
       +
         version = "0.1.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "OpenShot";

     

       12
       12
       +
           repo = "libopenshot-audio";

     

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

     

       14
       14
       +
           sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           cmake doxygen

     

       19
       19
       +
           libX11 libXft libXrandr libXinerama libXext libXcursor alsaLib

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         doCheck = false;

     

       23
       23
       +
       

     

       24
       24
       +
         meta = {

     

       25
       25
       +
           homepage = "http://openshot.org/";

     

       26
       26
       +
           description = "Free, open-source video editor";

     

       27
       27
       +
           license = licenses.gpl3Plus;

     

       28
       28
       +
           maintainers = [maintainers.tohl];

     

       29
       29
       +
           platforms = platforms.linux;

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+46

pkgs/applications/video/openshot-qt/libopenshot.nix

···

       1
       1
       +
       {stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen

     

       2
       2
       +
       , imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}:

     

       3
       3
       +
       

     

       4
       4
       +
       with stdenv.lib;

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         libopenshot_audio = callPackage ./libopenshot-audio.nix {};

     

       8
       8
       +
       in

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       10
       10
       +
         name = "libopenshot-${version}";

     

       11
       11
       +
         version = "0.1.1";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "OpenShot";

     

       15
       15
       +
           repo = "libopenshot";

     

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

     

       17
       17
       +
           sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         patchPhase = ''

     

       21
       21
       +
           sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt

     

       22
       22
       +
           sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt

     

       23
       23
       +
           sed -i 's/{RUBY_VENDOR_ARCH_DIR}/ENV{RUBY_VENDOR_ARCH_DIR}/g' src/bindings/ruby/CMakeLists.txt

     

       24
       24
       +
           export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)

     

       25
       25
       +
           export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs = [

     

       29
       29
       +
           cmake doxygen

     

       30
       30
       +
           imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby

     

       31
       31
       +
           unittest-cpp

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}";

     

       35
       35
       +
         "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";

     

       36
       36
       +
       

     

       37
       37
       +
         doCheck = false;

     

       38
       38
       +
       

     

       39
       39
       +
         meta = {

     

       40
       40
       +
           homepage = "http://openshot.org/";

     

       41
       41
       +
           description = "Free, open-source video editor";

     

       42
       42
       +
           license = licenses.gpl3Plus;

     

       43
       43
       +
           maintainers = [maintainers.tohl];

     

       44
       44
       +
           platforms = platforms.linux;

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+5 -1

pkgs/applications/virtualization/rkt/default.nix

···

       50
       50
        
       

     

       51
       51
        
         installPhase = ''

     

       52
       52
        
           mkdir -p $out/bin

     

       53
       53
       -
           cp -Rv $BUILDDIR/target/bin/* $out/bin

     

       53
       53
       +
           cp -Rv $BUILDDIR/target/bin/rkt $out/bin

     

       54
       54
       +
       

     

       55
       55
       +
           mkdir -p $out/lib/rkt/stage1-images/

     

       56
       56
       +
           cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/lib/rkt/stage1-images/

     

       57
       57
       +
       

     

       54
       58
        
           wrapProgram $out/bin/rkt \

     

       55
       59
        
             --prefix LD_LIBRARY_PATH : ${systemd}/lib \

     

       56
       60
        
             --prefix PATH : ${iptables}/bin

+27 -11

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

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig

     

       2
       2
       -
       , dbus, libconfig, libdrm, libxml2, mesa, pcre

     

       3
       3
       -
       , libXcomposite, libXfixes, libXdamage, libXinerama

     

       4
       4
       -
       , libXrandr, libXrender, libXext }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,

     

       2
       2
       +
         libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,

     

       3
       3
       +
         libXext, xwininfo }:

     

       5
       4
        
       

     

       6
       5
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
       

     

       8
       6
        
         name = "compton-0.1_beta2";

     

       9
       7
        
       

     

       10
       8
        
         src = fetchurl {

     
···

       12
       10
        
           sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";

     

       13
       11
        
         };

     

       14
       12
        
       

     

       15
       15
       -
         buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre

     

       16
       16
       -
           libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ];

     

       13
       13
       +
         buildInputs = [

     

       14
       14
       +
           pkgconfig

     

       15
       15
       +
           dbus

     

       16
       16
       +
           libconfig

     

       17
       17
       +
           libdrm

     

       18
       18
       +
           libxml2

     

       19
       19
       +
           mesa

     

       20
       20
       +
           pcre

     

       21
       21
       +
           libXcomposite

     

       22
       22
       +
           libXfixes

     

       23
       23
       +
           libXdamage

     

       24
       24
       +
           libXinerama

     

       25
       25
       +
           libXrandr

     

       26
       26
       +
           libXrender

     

       27
       27
       +
           libXext

     

       28
       28
       +
         ];

     

       29
       29
       +
         

     

       30
       30
       +
         propagatedBuildInputs = [ xwininfo ];

     

       31
       31
       +
         

     

       17
       32
        
         installFlags = "PREFIX=$(out)";

     

       18
       33
        
       

     

       19
       34
        
         meta = with stdenv.lib; {

     

       20
       35
        
           homepage = https://github.com/chjj/compton/;

     

       21
       36
        
           description = "A fork of XCompMgr, a sample compositing manager for X servers";

     

       22
       37
        
           longDescription = ''

     

       23
       23
       -
             A fork of XCompMgr, which is a  sample compositing manager for X servers

     

       24
       24
       -
             supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables

     

       25
       25
       -
             basic eye-candy effects. This fork adds additional features, such as additional

     

       26
       26
       -
             effects, and a fork at a well-defined and proper place.

     

       38
       38
       +
             A fork of XCompMgr, which is a sample compositing manager for X

     

       39
       39
       +
             servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE

     

       40
       40
       +
             extensions. It enables basic eye-candy effects. This fork adds

     

       41
       41
       +
             additional features, such as additional effects, and a fork at a

     

       42
       42
       +
             well-defined and proper place.

     

       27
       43
        
           '';

     

       28
       44
        
           license = licenses.mit;

     

       29
       45
        
           platforms = platforms.linux;

+4 -2

pkgs/applications/window-managers/compton/git.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,

     

       2
       2
        
         docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,

     

       3
       3
        
         pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,

     

       4
       4
       -
         libXrandr, libXrender }:

     

       4
       4
       +
         libXrandr, libXrender, xwininfo }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         name = "compton-git-2015-09-21";

     
···

       37
       37
        
           pcre

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
       +
         propagatedBuildInputs = [ xwininfo ];

     

       41
       41
       +
       

     

       40
       42
        
         installFlags = "PREFIX=$(out)";

     

       41
       43
        
       

     

       42
       44
        
         meta = with stdenv.lib; {

     
···

       47
       49
        
           longDescription = ''

     

       48
       50
        
             A fork of XCompMgr, which is a sample compositing manager for X

     

       49
       51
        
             servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE

     

       50
       50
       -
             extensions.  It enables basic eye-candy effects. This fork adds

     

       52
       52
       +
             extensions. It enables basic eye-candy effects. This fork adds

     

       51
       53
        
             additional features, such as additional effects, and a fork at a

     

       52
       54
        
             well-defined and proper place.

     

       53
       55
        
           '';

+39

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

···

       1
       1
       +
       { stdenv, fetchurl, pkgconfig

     

       2
       2
       +
       , libpng, libjpeg

     

       3
       3
       +
       , libXext, libXft, libXpm, libXrandr, libXinerama }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
       

     

       7
       7
       +
         name = "pekwm-${version}";

     

       8
       8
       +
         version = "0.1.17";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchurl {

     

       11
       11
       +
           url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2";

     

       12
       12
       +
           sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ pkgconfig libpng libjpeg

     

       16
       16
       +
         libXext libXft libXpm libXrandr libXinerama ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with stdenv.lib; {

     

       19
       19
       +
           description = "A lightweight window manager";

     

       20
       20
       +
           longDescription = ''

     

       21
       21
       +
             pekwm is a window manager that once upon a time was based on the

     

       22
       22
       +
             aewm++ window manager, but it has evolved enough that it no

     

       23
       23
       +
             longer resembles aewm++ at all. It has a much expanded

     

       24
       24
       +
             feature-set, including window grouping (similar to ion, pwm, or

     

       25
       25
       +
             fluxbox), autoproperties, xinerama, keygrabber that supports

     

       26
       26
       +
             keychains, and much more.      

     

       27
       27
       +
             - Lightweight and Unobtrusive, a window manager shouldn't be

     

       28
       28
       +
               noticed.

     

       29
       29
       +
             - Very configurable, we all work and think in different ways.

     

       30
       30
       +
             - Automatic properties, for all the lazy people, make things

     

       31
       31
       +
               appear as they should when starting applications.

     

       32
       32
       +
             - Chainable Keygrabber, usability for everyone.

     

       33
       33
       +
           '';

     

       34
       34
       +
             homepage = https://www.pekwm.org;

     

       35
       35
       +
             license = licenses.gpl2;

     

       36
       36
       +
             maintainers = [ maintainers.AndersonTorres ];

     

       37
       37
       +
             platforms = platforms.linux;

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+31 -29

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

···

       3
       3
        
       , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       stdenv.mkDerivation rec {

     

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

     

       8
       8
       -
         version = "0.7";

     

       6
       6
       +
       let

     

       7
       7
       +
         version = "0.8";

     

       8
       8
       +
       in

     

       9
       9
       +
         stdenv.mkDerivation rec {

     

       10
       10
       +
           name = "sway-${version}";

     

       9
       11
        
       

     

       10
       10
       -
         src = fetchFromGitHub {

     

       11
       11
       -
           owner = "Sircmpwn";

     

       12
       12
       -
           repo = "sway";

     

       13
       13
       -
           rev = "0.7";

     

       14
       14
       -
           sha256 = "05mn68brqz7j3a1sb5xd3pxzzdd8swnhw2g7cc9f7rdjr5dlrjip";

     

       15
       15
       -
         };

     

       12
       12
       +
           src = fetchFromGitHub {

     

       13
       13
       +
             owner = "Sircmpwn";

     

       14
       14
       +
             repo = "sway";

     

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

     

       16
       16
       +
             sha256 = "10i62cn1z7fwg0jwkskmzcaha39lprkl4zvkp59jr5wvpjligdq3";

     

       17
       17
       +
           };

     

       16
       18
        
       

     

       17
       17
       -
         nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];

     

       19
       19
       +
           nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];

     

       18
       20
        
       

     

       19
       19
       -
         buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];

     

       21
       21
       +
           buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];

     

       20
       22
        
       

     

       21
       21
       -
         patchPhase = ''

     

       22
       22
       -
           sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;

     

       23
       23
       -
         '';

     

       23
       23
       +
           patchPhase = ''

     

       24
       24
       +
             sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;

     

       25
       25
       +
           '';

     

       24
       26
        
       

     

       25
       25
       -
         makeFlags = "PREFIX=$(out)";

     

       26
       26
       -
         installPhase = "PREFIX=$out make install";

     

       27
       27
       +
           makeFlags = "PREFIX=$(out)";

     

       28
       28
       +
           installPhase = "PREFIX=$out make install";

     

       27
       29
        
       

     

       28
       28
       -
         LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];

     

       29
       29
       -
         preFixup = ''

     

       30
       30
       -
           wrapProgram $out/bin/sway \

     

       31
       31
       -
             --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";

     

       32
       32
       -
         '';

     

       30
       30
       +
           LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];

     

       31
       31
       +
           preFixup = ''

     

       32
       32
       +
             wrapProgram $out/bin/sway \

     

       33
       33
       +
               --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";

     

       34
       34
       +
           '';

     

       33
       35
        
       

     

       34
       34
       -
         meta = with stdenv.lib; {

     

       35
       35
       -
           description = "i3-compatible window manager for Wayland";

     

       36
       36
       -
           homepage    = "http://swaywm.org";

     

       37
       37
       -
           license     = licenses.mit;

     

       38
       38
       -
           platforms   = platforms.linux;

     

       39
       39
       -
           maintainers = with maintainers; [ ];

     

       40
       40
       -
         };

     

       41
       41
       -
       }

     

       36
       36
       +
           meta = with stdenv.lib; {

     

       37
       37
       +
             description = "i3-compatible window manager for Wayland";

     

       38
       38
       +
             homepage    = "http://swaywm.org";

     

       39
       39
       +
             license     = licenses.mit;

     

       40
       40
       +
             platforms   = platforms.linux;

     

       41
       41
       +
             maintainers = with maintainers; [ ];

     

       42
       42
       +
           };

     

       43
       43
       +
         }

+16 -16

pkgs/build-support/docker/tarsum.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
           "tarsum"

     

       5
       5
       -
           "io"

     

       6
       6
       -
           "io/ioutil"

     

       7
       7
       -
           "fmt"

     

       8
       8
       -
           "os"

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"io"

     

       6
       6
       +
       	"io/ioutil"

     

       7
       7
       +
       	"os"

     

       8
       8
       +
       	"tarsum"

     

       9
       9
        
       )

     

       10
       10
        
       

     

       11
       11
        
       func main() {

     

       12
       12
       -
           ts, err := tarsum.NewTarSum(os.Stdin, false, tarsum.Version1)

     

       13
       13
       -
           if err != nil {

     

       14
       14
       -
               fmt.Println(err)

     

       15
       15
       -
               os.Exit(1)

     

       16
       16
       -
           }

     

       12
       12
       +
       	ts, err := tarsum.NewTarSum(os.Stdin, true, tarsum.Version1)

     

       13
       13
       +
       	if err != nil {

     

       14
       14
       +
       		fmt.Println(err)

     

       15
       15
       +
       		os.Exit(1)

     

       16
       16
       +
       	}

     

       17
       17
        
       

     

       18
       18
       -
           if _, err = io.Copy(ioutil.Discard, ts); err != nil {

     

       19
       19
       -
               fmt.Println(err)

     

       20
       20
       -
               os.Exit(1)

     

       21
       21
       -
           }

     

       18
       18
       +
       	if _, err = io.Copy(ioutil.Discard, ts); err != nil {

     

       19
       19
       +
       		fmt.Println(err)

     

       20
       20
       +
       		os.Exit(1)

     

       21
       21
       +
       	}

     

       22
       22
        
       

     

       23
       23
       -
           fmt.Println(ts.Sum(nil))

     

       24
       24
       -
       }
     

       23
       23
       +
       	fmt.Println(ts.Sum(nil))

     

       24
       24
       +
       }

+75

pkgs/build-support/fetchmavenartifact/default.nix

···

       1
       1
       +
       # Adaptation of the MIT-licensed work on `sbt2nix` done by Charles O'Farrell

     

       2
       2
       +
       

     

       3
       3
       +
       { fetchurl, stdenv }:

     

       4
       4
       +
       let

     

       5
       5
       +
         defaultRepos = [

     

       6
       6
       +
           http://central.maven.org/maven2

     

       7
       7
       +
           http://oss.sonatype.org/content/repositories/releases

     

       8
       8
       +
           http://oss.sonatype.org/content/repositories/public

     

       9
       9
       +
           http://repo.typesafe.com/typesafe/releases

     

       10
       10
       +
         ];

     

       11
       11
       +
       in

     

       12
       12
       +
       

     

       13
       13
       +
       args@

     

       14
       14
       +
       { # Example: "org.apache.httpcomponents"

     

       15
       15
       +
         groupId

     

       16
       16
       +
       , # Example: "httpclient"

     

       17
       17
       +
         artifactId

     

       18
       18
       +
       , # Example: "4.3.6"

     

       19
       19
       +
         version

     

       20
       20
       +
       , # List of maven repositories from where to fetch the artifact.

     

       21
       21
       +
         # Example: [ http://oss.sonatype.org/content/repositories/public ].

     

       22
       22
       +
         repos ? defaultRepos

     

       23
       23
       +
         # The `url` and `urls` parameters, if specified should point to the JAR

     

       24
       24
       +
         # file and will take precedence over the `repos` parameter. Only one of `url`

     

       25
       25
       +
         # and `urls` can be specified, not both.

     

       26
       26
       +
       , url ? ""

     

       27
       27
       +
       , urls ? []

     

       28
       28
       +
       , # The rest of the arguments are just forwarded to `fetchurl`.

     

       29
       29
       +
         ...

     

       30
       30
       +
       }:

     

       31
       31
       +
       

     

       32
       32
       +
       # only one of url and urls can be specified at a time.

     

       33
       33
       +
       assert (url == "") || (urls == []);

     

       34
       34
       +
       # if repos is empty, then url or urls must be specified.

     

       35
       35
       +
       assert (repos != []) || (url != "") || (urls != []);

     

       36
       36
       +
       

     

       37
       37
       +
       

     

       38
       38
       +
       let

     

       39
       39
       +
         name_ =

     

       40
       40
       +
           with stdenv.lib; concatStrings [

     

       41
       41
       +
             (replaceChars ["."] ["_"] groupId) "_"

     

       42
       42
       +
             (replaceChars ["."] ["_"] artifactId) "-"

     

       43
       43
       +
             version

     

       44
       44
       +
           ];

     

       45
       45
       +
         mkJarUrl = repoUrl:

     

       46
       46
       +
           with stdenv.lib; concatStringsSep "/" [

     

       47
       47
       +
             (removeSuffix "/" repoUrl)

     

       48
       48
       +
             (replaceChars ["."] ["/"] groupId)

     

       49
       49
       +
             artifactId

     

       50
       50
       +
             version

     

       51
       51
       +
             "${artifactId}-${version}.jar"

     

       52
       52
       +
           ];

     

       53
       53
       +
         urls_ =

     

       54
       54
       +
           if url != "" then [url]

     

       55
       55
       +
           else if urls != [] then urls

     

       56
       56
       +
           else map mkJarUrl repos;

     

       57
       57
       +
         jar =

     

       58
       58
       +
           fetchurl (

     

       59
       59
       +
             builtins.removeAttrs args ["groupId" "artifactId" "version" "repos" "url" ]

     

       60
       60
       +
               // { urls = urls_; name = "${name_}.jar"; }

     

       61
       61
       +
           );

     

       62
       62
       +
       in

     

       63
       63
       +
         stdenv.mkDerivation {

     

       64
       64
       +
           name = name_;

     

       65
       65
       +
           phases = "installPhase fixupPhase";

     

       66
       66
       +
           # By moving the jar to $out/share/java we make it discoverable by java

     

       67
       67
       +
           # packages packages that mention this derivation in their buildInputs.

     

       68
       68
       +
           installPhase = ''

     

       69
       69
       +
             mkdir -p $out/share/java

     

       70
       70
       +
             ln -s ${jar} $out/share/java

     

       71
       71
       +
           '';

     

       72
       72
       +
           # We also add a `jar` attribute that can be used to easily obtain the path

     

       73
       73
       +
           # to the downloaded jar file.

     

       74
       74
       +
           passthru.jar = jar;

     

       75
       75
       +
         }

pkgs/build-support/fetchurl/mirrors.nix

···

       10
       10
        
       

     

       11
       11
        
         # SourceForge.

     

       12
       12
        
         sourceforge = [

     

       13
       13
       +
           http://downloads.sourceforge.net/

     

       13
       14
        
           http://prdownloads.sourceforge.net/

     

       14
       15
        
           http://heanet.dl.sourceforge.net/sourceforge/

     

       15
       16
        
           http://surfnet.dl.sourceforge.net/sourceforge/

+22

pkgs/data/fonts/liberationsansnarrow/binary.nix

···

       1
       1
       +
       { stdenv, fetchurl, liberationsansnarrow }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "1.07.3";

     

       5
       5
       +
         name = "liberationsansnarrow-${version}";

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";

     

       8
       8
       +
           sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         phases = [ "unpackPhase" "installPhase" ];

     

       12
       12
       +
       

     

       13
       13
       +
         installPhase = ''

     

       14
       14
       +
           mkdir -p $out/share/fonts/truetype

     

       15
       15
       +
           cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype

     

       16
       16
       +
       

     

       17
       17
       +
           mkdir -p "$out/doc/${name}"

     

       18
       18
       +
           cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         inherit (liberationsansnarrow) meta;

     

       22
       22
       +
       }

+39

pkgs/data/fonts/liberationsansnarrow/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, fontforge, pythonPackages, python}:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "liberationsansnarrow";

     

       5
       5
       +
         version = "1.07.3";

     

       6
       6
       +
         name = "${pname}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";

     

       10
       10
       +
           sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         buildInputs = [ fontforge pythonPackages.fonttools python ];

     

       14
       14
       +
       

     

       15
       15
       +
         installPhase = ''

     

       16
       16
       +
           mkdir -p $out/share/fonts/truetype

     

       17
       17
       +
           cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype

     

       18
       18
       +
       

     

       19
       19
       +
           mkdir -p "$out/doc/${name}"

     

       20
       20
       +
           cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "Liberation Sans Narrow Font Family is a replacement for Arial Narrow";

     

       25
       25
       +
           longDescription = ''

     

       26
       26
       +
             Liberation Sans Narrow is a font originally created by Ascender

     

       27
       27
       +
             Inc and licensed to Oracle Corporation under a GPLv2 license. It is

     

       28
       28
       +
             metrically compatible with the commonly used Arial Narrow fonts

     

       29
       29
       +
             on Microsoft systems. It is no longer distributed with the

     

       30
       30
       +
             latest versions of the Liberation Fonts, as Red Hat has changed the

     

       31
       31
       +
             license to the Open Font License.

     

       32
       32
       +
           '';

     

       33
       33
       +
       

     

       34
       34
       +
           license = licenses.gpl2;

     

       35
       35
       +
           homepage = https://fedorahosted.org/liberation-fonts/;

     

       36
       36
       +
           maintainers = [ maintainers.leenaars

     

       37
       37
       +
           ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+10 -6

pkgs/desktops/gnome-3/3.18/default.nix

···

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
        
         pkgsFun = overrides:

     

       6
       6
       -
           let 

     

       6
       6
       +
           let

     

       7
       7
        
             self = self_ // overrides;

     

       8
       8
        
             self_ = with self; {

     

       9
       9
        
       

     
···

       35
       35
        
           gnome-clocks gnome-music gnome-tweak-tool gnome-photos

     

       36
       36
        
           nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs

     

       37
       37
        
           gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool

     

       38
       38
       -
           gnome-getting-started-docs

     

       38
       38
       +
           gnome-getting-started-docs gnome-software gnome-packagekit

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
        
         gamesPackages = with gnome3; [ swell-foop lightsoff iagno

     
···

       79
       79
        
         dconf = callPackage ./core/dconf { };

     

       80
       80
        
         dconf-editor = callPackage ./core/dconf-editor { };

     

       81
       81
        
       

     

       82
       82
       -
         empathy = callPackage ./core/empathy { 

     

       82
       82
       +
         empathy = callPackage ./core/empathy {

     

       83
       83
        
           webkitgtk = webkitgtk24x;

     

       84
       84
        
           clutter-gst = pkgs.clutter-gst;

     

       85
       85
        
         };

     
···

       360
       360
        
       

     

       361
       361
        
         california = callPackage ./misc/california { };

     

       362
       362
        
       

     

       363
       363
       -
         geary = callPackage ./misc/geary { 

     

       363
       363
       +
         geary = callPackage ./misc/geary {

     

       364
       364
        
           webkitgtk = webkitgtk24x;

     

       365
       365
        
         };

     

       366
       366
        
       

     

       367
       367
        
         gfbgraph = callPackage ./misc/gfbgraph { };

     

       368
       368
        
       

     

       369
       369
       -
         gitg = callPackage ./misc/gitg { 

     

       369
       369
       +
         gitg = callPackage ./misc/gitg {

     

       370
       370
        
           webkitgtk = webkitgtk24x;

     

       371
       371
        
         };

     

       372
       372
        
       

     
···

       383
       383
        
         gpaste = callPackage ./misc/gpaste { };

     

       384
       384
        
       

     

       385
       385
        
         pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };

     

       386
       386
       -
         

     

       386
       386
       +
       

     

       387
       387
        
         gtkhtml = callPackage ./misc/gtkhtml { };

     

       388
       388
        
       

     

       389
       389
        
         pomodoro = callPackage ./misc/pomodoro { };

     

       390
       390
        
       

     

       391
       391
        
         gnome-video-effects = callPackage ./misc/gnome-video-effects { };

     

       392
       392
       +
       

     

       393
       393
       +
         gnome-software = callPackage ./misc/gnome-software { };

     

       394
       394
       +
       

     

       395
       395
       +
         gnome-packagekit = callPackage ./misc/gnome-packagekit { };

     

       392
       396
        
       

     

       393
       397
        
           };

     

       394
       398
        
         in self; # pkgsFun

+26

pkgs/desktops/gnome-3/3.18/misc/gnome-packagekit/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit

     

       2
       2
       +
       , fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "gnome-packagekit-${version}";

     

       6
       6
       +
         version = "3.18.0";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://gnome/sources/gnome-packagekit/3.18/${name}.tar.xz";

     

       10
       10
       +
           sha256 = "0a7ww807b77yjf6l8s2ycpxx813lyncwaxq227jckphazpq65a50";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

     

       16
       16
       +
         buildInputs = [ libxslt gnome3.gtk packagekit fontconfig

     

       17
       17
       +
                         libcanberra_gtk3 libnotify dbus_glib dbus_libs ];

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           homepage = https://www.freedesktop.org/software/PackageKit/;

     

       21
       21
       +
           platforms = platforms.linux;

     

       22
       22
       +
           maintainers = gnome3.maintainers;

     

       23
       23
       +
           license = licenses.gpl2;

     

       24
       24
       +
           description = "Tools for installing software on the GNOME desktop using PackageKit";

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+31

pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit

     

       2
       2
       +
       , appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "gnome-software-${version}";

     

       6
       6
       +
         version = "3.18.3";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://gnome/sources/gnome-software/3.18/${name}.tar.xz";

     

       10
       10
       +
           sha256 = "0ywvjmn0cwr4kv2l6ic80ac7js7hpsp3g127cj7h256iaqgsaxnc";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

     

       14
       14
       +
         buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup

     

       15
       15
       +
                         gnome3.gsettings_desktop_schemas gnome3.gnome_desktop

     

       16
       16
       +
                         polkit attr acl libyaml ];

     

       17
       17
       +
         propagatedBuildInputs = [ isocodes ];

     

       18
       18
       +
       

     

       19
       19
       +
         postInstall = ''

     

       20
       20
       +
           mkdir -p $out/share/xml/

     

       21
       21
       +
           ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with stdenv.lib; {

     

       25
       25
       +
           homepage = https://www.freedesktop.org/software/PackageKit/;

     

       26
       26
       +
           platforms = platforms.linux;

     

       27
       27
       +
           maintainers = gnome3.maintainers;

     

       28
       28
       +
           license = licenses.gpl2;

     

       29
       29
       +
           description = "GNOME Software lets you install and update applications and system extensions.";

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+5 -4

pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
       -
       fetchurl: {

     

       4
       4
       -
         name = "evolution-3.20.2";

     

       3
       3
       +
       fetchurl: rec {

     

       4
       4
       +
         major = "3.20";

     

       5
       5
       +
         name = "evolution-${major}.4";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = mirror://gnome/sources/evolution/3.20/evolution-3.20.2.tar.xz;

     

       8
       8
       -
           sha256 = "66fa6e18c4e6a29c44870d5786e4dbb82507a8254bca9e27e802625081fca630";

     

       8
       8
       +
           url = "mirror://gnome/sources/evolution/${major}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "1g1nai6jz0irz94d06vx8gbwbzdp7r53qjxvjfhdqhlhnhy76a9c";

     

       9
       10
        
         };

     

       10
       11
        
       }

+5 -4

pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
       -
       fetchurl: {

     

       4
       4
       -
         name = "evolution-data-server-3.20.2";

     

       3
       3
       +
       fetchurl: rec {

     

       4
       4
       +
         major = "3.20";

     

       5
       5
       +
         name = "evolution-data-server-${major}.4";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = mirror://gnome/sources/evolution-data-server/3.20/evolution-data-server-3.20.2.tar.xz;

     

       8
       8
       -
           sha256 = "8cdc74b08f1404f5df4b8cf5ccc4999a3e70a1db9ce472f71b623266941ffad9";

     

       8
       8
       +
           url = "mirror://gnome/sources/evolution-data-server/${major}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "03h81dnk34b3xf2065rymr1jd7as4dmpd89hyf380c5np36f6l7j";

     

       9
       10
        
         };

     

       10
       11
        
       }

+5 -4

pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
       -
       fetchurl: {

     

       4
       4
       -
         name = "gnome-online-accounts-3.20.1";

     

       3
       3
       +
       fetchurl: rec {

     

       4
       4
       +
         major = "3.20";

     

       5
       5
       +
         name = "gnome-online-accounts-${major}.2";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = mirror://gnome/sources/gnome-online-accounts/3.20/gnome-online-accounts-3.20.1.tar.xz;

     

       8
       8
       -
           sha256 = "c37aebc1e12f31f5516d33a354181e4d202a07da4f7d3a95b0da8cf0028c0c93";

     

       8
       8
       +
           url = "mirror://gnome/sources/gnome-online-accounts/${major}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "1pf1rn1i7dqll9ph6scg2g281njx5pq6z0wyj9493m474nfmsmab";

     

       9
       10
        
         };

     

       10
       11
        
       }

+5 -4

pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
       -
       fetchurl: {

     

       4
       4
       -
         name = "gnome-session-3.20.1";

     

       3
       3
       +
       fetchurl: rec {

     

       4
       4
       +
         major = "3.20";

     

       5
       5
       +
         name = "gnome-session-${major}.2";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = mirror://gnome/sources/gnome-session/3.20/gnome-session-3.20.1.tar.xz;

     

       8
       8
       -
           sha256 = "2ae9f53dc74f851222fbefbe0dc08db0a78cc76ceeb156f92ebd4d40fd038913";

     

       8
       8
       +
           url = "mirror://gnome/sources/gnome-session/${major}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "1npnjm6wirz2v0liv7n23ivp2w0y1q230qcdb681hhzmp7h9fpq2";

     

       9
       10
        
         };

     

       10
       11
        
       }

+27

pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit

     

       2
       2
       +
       , appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3

     

       3
       3
       +
       , json_glib }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         inherit (import ./src.nix fetchurl) name src;

     

       7
       7
       +
       

     

       8
       8
       +
         nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

     

       9
       9
       +
         buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup

     

       10
       10
       +
                         gnome3.gsettings_desktop_schemas gnome3.gnome_desktop

     

       11
       11
       +
       		  gtkspell3 json_glib

     

       12
       12
       +
                         polkit attr acl libyaml ];

     

       13
       13
       +
         propagatedBuildInputs = [ isocodes ];

     

       14
       14
       +
       

     

       15
       15
       +
         postInstall = ''

     

       16
       16
       +
           mkdir -p $out/share/xml/

     

       17
       17
       +
           ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with stdenv.lib; {

     

       21
       21
       +
           homepage = https://www.freedesktop.org/software/PackageKit/;

     

       22
       22
       +
           platforms = platforms.linux;

     

       23
       23
       +
           maintainers = gnome3.maintainers;

     

       24
       24
       +
           license = licenses.gpl2;

     

       25
       25
       +
           description = "GNOME Software lets you install and update applications and system extensions.";

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+10

pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix

···

       1
       1
       +
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
       +
       

     

       3
       3
       +
       fetchurl: {

     

       4
       4
       +
         name = "gnome-software-3.20.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.0.tar.xz;

     

       8
       8
       +
           sha256 = "0w0bp29fm13a235gq8vylihzjfxx20ri46w4w2syaw0cixxihbix";

     

       9
       9
       +
         };

     

       10
       10
       +
       }

+8 -4

pkgs/desktops/gnome-3/3.20/default.nix

···

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
        
         pkgsFun = overrides:

     

       6
       6
       -
           let 

     

       6
       6
       +
           let

     

       7
       7
        
             self = self_ // overrides;

     

       8
       8
        
             self_ = with self; {

     

       9
       9
        
       

     
···

       35
       35
        
           gnome-clocks gnome-music gnome-tweak-tool gnome-photos

     

       36
       36
        
           nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs

     

       37
       37
        
           gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool

     

       38
       38
       -
           gnome-getting-started-docs

     

       38
       38
       +
           gnome-getting-started-docs gnome-packagekit gnome-software

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
        
         gamesPackages = with gnome3; [ swell-foop lightsoff iagno

     
···

       148
       148
        
         gnome-screenshot = callPackage ./core/gnome-screenshot { };

     

       149
       149
        
       

     

       150
       150
        
         gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };

     

       151
       151
       +
       

     

       152
       152
       +
         gnome-software = callPackage ./core/gnome-software { };

     

       151
       153
        
       

     

       152
       154
        
         gnome-system-log = callPackage ./core/gnome-system-log { };

     

       153
       155
        
       

     
···

       359
       361
        
       

     

       360
       362
        
         california = callPackage ./misc/california { };

     

       361
       363
        
       

     

       362
       362
       -
         geary = callPackage ./misc/geary { 

     

       364
       364
       +
         geary = callPackage ./misc/geary {

     

       363
       365
        
           webkitgtk = webkitgtk24x;

     

       364
       366
        
         };

     

       365
       367
        
       

     

       366
       368
        
         gfbgraph = callPackage ./misc/gfbgraph { };

     

       367
       369
        
       

     

       368
       368
       -
         gitg = callPackage ./misc/gitg { 

     

       370
       370
       +
         gitg = callPackage ./misc/gitg {

     

       369
       371
        
           webkitgtk = webkitgtk24x;

     

       370
       372
        
         };

     

       371
       373
        
       

     
···

       392
       394
        
         pomodoro = callPackage ./misc/pomodoro { };

     

       393
       395
        
       

     

       394
       396
        
         gnome-video-effects = callPackage ./misc/gnome-video-effects { };

     

       397
       397
       +
       

     

       398
       398
       +
         gnome-packagekit = callPackage ./misc/gnome-packagekit { };

     

       395
       399
        
       

     

       396
       400
        
           };

     

       397
       401
        
         in self; # pkgsFun

+5 -4

pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
       -
       fetchurl: {

     

       4
       4
       -
         name = "gnome-sudoku-3.20.2";

     

       3
       3
       +
       fetchurl: rec {

     

       4
       4
       +
         major = "3.20";

     

       5
       5
       +
         name = "gnome-sudoku-${major}.4";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = mirror://gnome/sources/gnome-sudoku/3.20/gnome-sudoku-3.20.2.tar.xz;

     

       8
       8
       -
           sha256 = "9c7e737686e88c20e83ca366bfc0a20194b7fe4af7c74ab752d98f0af1df3553";

     

       8
       8
       +
           url = "mirror://gnome/sources/gnome-sudoku/${major}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "1hw6r0yfg60ynp4gxnqm6zrsklzn0d6lb88vybdbifzrlaww8xwh";

     

       9
       10
        
         };

     

       10
       11
        
       }

+20

pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit

     

       2
       2
       +
       , fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
       +
       

     

       7
       7
       +
         NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

     

       8
       8
       +
       

     

       9
       9
       +
         nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

     

       10
       10
       +
         buildInputs = [ libxslt gnome3.gtk packagekit fontconfig

     

       11
       11
       +
                         libcanberra_gtk3 libnotify dbus_glib dbus_libs ];

     

       12
       12
       +
       

     

       13
       13
       +
         meta = with stdenv.lib; {

     

       14
       14
       +
           homepage = https://www.freedesktop.org/software/PackageKit/;

     

       15
       15
       +
           platforms = platforms.linux;

     

       16
       16
       +
           maintainers = gnome3.maintainers;

     

       17
       17
       +
           license = licenses.gpl2;

     

       18
       18
       +
           description = "Tools for installing software on the GNOME desktop using PackageKit";

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+10

pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix

···

       1
       1
       +
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
       +
       

     

       3
       3
       +
       fetchurl: {

     

       4
       4
       +
         name = "gnome-packagekit-3.20.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = mirror://gnome/sources/gnome-packagekit/3.20/gnome-packagekit-3.20.0.tar.xz;

     

       8
       8
       +
           sha256 = "0wf5r0qrdlalbr73fpfaapq61vlya3nwygsv4wm2bxaf56v5sjmq";

     

       9
       9
       +
         };

     

       10
       10
       +
       }

+2 -2

pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix

···

       1
       1
        
       fetchurl: rec {

     

       2
       2
        
         major = "1.0";

     

       3
       3
       -
         minor = "0";

     

       3
       3
       +
         minor = "3";

     

       4
       4
        
         name = "gspell-${major}.${minor}";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "1nkpy005qyrfdklrjnvx5xksd3dv27fmn48wi12q8c8whxy2al3a";

     

       8
       8
       +
           sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr";

     

       9
       9
        
         };

     

       10
       10
        
       }

+2 -2

pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "1.0";

     

       4
       4
       +
         version = "1.0.1";

     

       5
       5
        
         basename = "pidgin-im-gnome-shell-extension";

     

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

     

       7
       7
        
       

     
···

       9
       9
        
           owner = "muffinmad";

     

       10
       10
        
           repo = "${basename}";

     

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

     

       12
       12
       -
           sha256 = "0vj4w9qqx9gads24w3f6v6mfh5va28bp8rc4w7lz0vhp7njmy1yy";

     

       12
       12
       +
           sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ glib ];

+20 -31

pkgs/desktops/kde-5/applications/ark/default.nix

···

       1
       1
       -
       { kdeApp

     

       2
       2
       -
       , lib

     

       3
       3
       -
       , extra-cmake-modules

     

       4
       4
       -
       , kdoctools

     

       5
       5
       -
       , karchive

     

       6
       6
       -
       , kconfig

     

       7
       7
       -
       , kcrash

     

       8
       8
       -
       , kdbusaddons

     

       9
       9
       -
       , ki18n

     

       10
       10
       -
       , kiconthemes

     

       11
       11
       -
       , khtml

     

       12
       12
       -
       , kio

     

       13
       13
       -
       , kservice

     

       14
       14
       -
       , kpty

     

       15
       15
       -
       , kwidgetsaddons

     

       16
       16
       -
       , libarchive

     

       17
       17
       -
       , p7zip

     

       18
       18
       -
       , unrar

     

       19
       19
       -
       , unzipNLS

     

       20
       20
       -
       , zip

     

       1
       1
       +
       {

     

       2
       2
       +
         kdeApp, lib,

     

       3
       3
       +
       

     

       4
       4
       +
         extra-cmake-modules, kdoctools, makeQtWrapper,

     

       5
       5
       +
       

     

       6
       6
       +
         karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,

     

       7
       7
       +
         kservice, kpty, kwidgetsaddons, libarchive,

     

       8
       8
       +
       

     

       9
       9
       +
         # Archive tools

     

       10
       10
       +
         p7zip, unrar, unzipNLS, zip

     

       21
       11
        
       }:

     

       22
       12
        
       

     

       23
       23
       -
       let PATH = lib.makeBinPath [

     

       24
       24
       -
             p7zip unrar unzipNLS zip

     

       25
       25
       -
           ];

     

       26
       26
       -
       in

     

       27
       27
       -
       

     

       28
       13
        
       kdeApp {

     

       29
       14
        
         name = "ark";

     

       30
       15
        
         nativeBuildInputs = [

     

       31
       31
       -
           extra-cmake-modules

     

       32
       32
       -
           kdoctools

     

       16
       16
       +
           extra-cmake-modules kdoctools makeQtWrapper

     

       33
       17
        
         ];

     

       34
       18
        
         propagatedBuildInputs = [

     

       35
       19
        
           khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice

     

       36
       20
        
           kpty kwidgetsaddons libarchive

     

       37
       21
        
         ];

     

       38
       38
       -
         postInstall = ''

     

       39
       39
       -
           wrapQtProgram "$out/bin/ark" \

     

       40
       40
       -
               --prefix PATH : "${PATH}"

     

       41
       41
       -
         '';

     

       22
       22
       +
         postInstall =

     

       23
       23
       +
           let

     

       24
       24
       +
             PATH = lib.makeBinPath [

     

       25
       25
       +
               p7zip unrar unzipNLS zip

     

       26
       26
       +
             ];

     

       27
       27
       +
           in ''

     

       28
       28
       +
             wrapQtProgram "$out/bin/ark" \

     

       29
       29
       +
                 --prefix PATH : "${PATH}"

     

       30
       30
       +
           '';

     

       42
       31
        
         meta = {

     

       43
       32
        
           license = with lib.licenses; [ gpl2 lgpl3 ];

     

       44
       33
        
           maintainers = [ lib.maintainers.ttuegel ];

+7 -28

pkgs/desktops/kde-5/applications/kate.nix

···

       1
       1
       -
       { kdeApp

     

       2
       2
       -
       , lib

     

       3
       3
       -
       , extra-cmake-modules

     

       4
       4
       -
       , kdoctools

     

       5
       5
       -
       , qtscript

     

       6
       6
       -
       , kactivities

     

       7
       7
       -
       , kconfig

     

       8
       8
       -
       , kcrash

     

       9
       9
       -
       , kguiaddons

     

       10
       10
       -
       , kiconthemes

     

       11
       11
       -
       , ki18n

     

       12
       12
       -
       , kinit

     

       13
       13
       -
       , kjobwidgets

     

       14
       14
       -
       , kio

     

       15
       15
       -
       , kparts

     

       16
       16
       -
       , ktexteditor

     

       17
       17
       -
       , kwindowsystem

     

       18
       18
       -
       , kxmlgui

     

       19
       19
       -
       , kdbusaddons

     

       20
       20
       -
       , kwallet

     

       21
       21
       -
       , plasma-framework

     

       22
       22
       -
       , kitemmodels

     

       23
       23
       -
       , knotifications

     

       24
       24
       -
       , threadweaver

     

       25
       25
       -
       , knewstuff

     

       26
       26
       -
       , libgit2

     

       1
       1
       +
       {

     

       2
       2
       +
         kdeApp, lib, makeQtWrapper, extra-cmake-modules, kdoctools,

     

       3
       3
       +
         kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit,

     

       4
       4
       +
         kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons,

     

       5
       5
       +
         kwallet, plasma-framework, kitemmodels, knotifications, qtscript, threadweaver,

     

       6
       6
       +
         knewstuff, libgit2

     

       27
       7
        
       }:

     

       28
       8
        
       

     

       29
       9
        
       kdeApp {

     
···

       33
       13
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       34
       14
        
         };

     

       35
       15
        
         nativeBuildInputs = [

     

       36
       36
       -
           extra-cmake-modules

     

       37
       37
       -
           kdoctools

     

       16
       16
       +
           extra-cmake-modules kdoctools makeQtWrapper

     

       38
       17
        
         ];

     

       39
       18
        
         propagatedBuildInputs = [

     

       40
       19
        
           kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript

+1 -1

pkgs/desktops/kde-5/applications/spectacle.nix

···

       29
       29
        
           kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications

     

       30
       30
        
           kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor

     

       31
       31
        
         ];

     

       32
       32
       -
         postFixup = ''

     

       32
       32
       +
         postInstall = ''

     

       33
       33
        
           wrapQtProgram "$out/bin/spectacle"

     

       34
       34
        
         '';

     

       35
       35
        
       }

+2 -9

pkgs/desktops/kde-5/frameworks/baloo.nix

···

       1
       1
        
       { kdeFramework, lib, extra-cmake-modules, kauth, kconfig

     

       2
       2
        
       , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime

     

       3
       3
       -
       , kio, lmdb, makeQtWrapper, qtbase, solid

     

       3
       3
       +
       , kio, lmdb, qtbase, solid

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       kdeFramework {

     

       7
       7
        
         name = "baloo";

     

       8
       8
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       9
       9
        
         propagatedBuildInputs = [

     

       10
       10
        
           kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio

     

       11
       11
        
           kidletime lmdb qtbase solid

     

       12
       12
        
         ];

     

       13
       13
       -
         postInstall = ''

     

       14
       14
       -
           wrapQtProgram "$out/bin/baloo_file"

     

       15
       15
       -
           wrapQtProgram "$out/bin/baloo_file_extractor"

     

       16
       16
       -
           wrapQtProgram "$out/bin/balooctl"

     

       17
       17
       -
           wrapQtProgram "$out/bin/baloosearch"

     

       18
       18
       -
           wrapQtProgram "$out/bin/balooshow"

     

       19
       19
       -
         '';

     

       20
       13
        
         meta = {

     

       21
       14
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       22
       15
        
         };

+16 -9

pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh

···

       1
       1
        
       _ecmSetXdgDirs() {

     

       2
       2
        
           addToSearchPathOnce XDG_DATA_DIRS "$1/share"

     

       3
       3
        
           addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"

     

       4
       4
       -
           addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"

     

       4
       4
       +
           addToSearchPathOnce RUNTIME_XDG_CONFIG_DIRS "$1/etc/xdg"

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
        
       _ecmSharePaths=( \

     

       8
       8
       +
           "appdata" \

     

       9
       9
       +
           "applications" \

     

       8
       10
        
           "config.cfg" \

     

       11
       11
       +
           "dbus-1" \

     

       12
       12
       +
           "desktop-directories" \

     

       13
       13
       +
           "doc" \

     

       14
       14
       +
           "icons" \

     

       9
       15
        
           "kconf_update" \

     

       10
       16
        
           "kservices5" \

     

       11
       17
        
           "kservicetypes5" \

     

       12
       18
        
           "knotifications5" \

     

       13
       13
       -
           "applications" \

     

       14
       14
       -
           "desktop-directories" \

     

       19
       19
       +
           "kxmlgui5" \

     

       20
       20
       +
           "locale" \

     

       15
       21
        
           "mime" \

     

       16
       16
       -
           "dbus-1" \

     

       17
       17
       -
           "interfaces" \

     

       18
       18
       -
           "services" \

     

       19
       19
       -
           "system-services" )

     

       22
       22
       +
           "polkit-1" \

     

       23
       23
       +
           "sounds" \

     

       24
       24
       +
           "templates" \

     

       25
       25
       +
           "wallpapers" \

     

       26
       26
       +
           )

     

       20
       27
        
       

     

       21
       28
        
       _ecmPropagateNative() {

     

       22
       29
        
           for dir in ${_ecmSharePaths[@]}; do

     
···

       24
       31
        
                   propagateOnce propagatedNativeBuildInputs "$1"

     

       25
       32
        
                   if [ -z "$crossConfig" ]; then

     

       26
       33
        
                       propagateOnce propagatedUserEnvPkgs "$1"

     

       27
       27
       -
                       addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"

     

       34
       34
       +
                       addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share"

     

       28
       35
        
                   fi

     

       29
       36
        
                   break

     

       30
       37
        
               fi

     
···

       38
       45
        
               if [ -d "$1/share/$dir" ]; then

     

       39
       46
        
                   propagateOnce propagatedBuildInputs "$1"

     

       40
       47
        
                   propagateOnce propagatedUserEnvPkgs "$1"

     

       41
       41
       -
                   addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"

     

       48
       48
       +
                   addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share"

     

       42
       49
        
                   break

     

       43
       50
        
               fi

     

       44
       51
        
           done

+2 -9

pkgs/desktops/kde-5/frameworks/kconfig.nix

···

       1
       1
        
       { kdeFramework, lib

     

       2
       2
        
       , extra-cmake-modules

     

       3
       3
       -
       , makeQtWrapper

     

       4
       3
        
       }:

     

       5
       4
        
       

     

       6
       5
        
       kdeFramework {

     

       7
       6
        
         name = "kconfig";

     

       8
       8
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       9
       9
       -
         postInstall = ''

     

       10
       10
       -
           wrapQtProgram "$out/bin/kreadconfig5"

     

       11
       11
       -
           wrapQtProgram "$out/bin/kwriteconfig5"

     

       12
       12
       -
         '';

     

       13
       13
       -
         meta = {

     

       14
       14
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       15
       15
       -
         };

     

       7
       7
       +
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       8
       8
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       16
       9
        
       }

+2 -3

pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix

···

       1
       1
        
       { kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig

     

       2
       2
       -
       , kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper

     

       2
       2
       +
       , kdoctools, kguiaddons, ki18n, kwidgetsaddons

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       kdeFramework {

     

       6
       6
        
         name = "kconfigwidgets";

     

       7
       7
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       8
       8
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       9
       9
        
         propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ];

     

       10
       10
        
         patches = [ ./0001-qdiriterator-follow-symlinks.patch ];

     

       11
       11
        
         postInstall = ''

     

       12
       12
        
           moveToOutput "bin/preparetips5" "$dev"

     

       13
       13
       -
           wrapQtProgram "$dev/bin/preparetips5"

     

       14
       13
        
         '';

     

       15
       14
        
       }

+2 -5

pkgs/desktops/kde-5/frameworks/kcoreaddons.nix

···

       1
       1
       -
       { kdeFramework, lib, makeQtWrapper

     

       1
       1
       +
       { kdeFramework, lib

     

       2
       2
        
       , extra-cmake-modules

     

       3
       3
        
       , shared_mime_info

     

       4
       4
        
       }:

     
···

       6
       6
        
       kdeFramework {

     

       7
       7
        
         name = "kcoreaddons";

     

       8
       8
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       9
       9
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       10
       10
        
         propagatedBuildInputs = [ shared_mime_info ];

     

       11
       11
       -
         postInstall = ''

     

       12
       12
       -
           wrapQtProgram "$out/bin/desktoptojson"

     

       13
       13
       -
         '';

     

       14
       11
        
       }

+2 -8

pkgs/desktops/kde-5/frameworks/kdbusaddons.nix

···

       1
       1
        
       { kdeFramework, lib

     

       2
       2
        
       , extra-cmake-modules

     

       3
       3
       -
       , makeQtWrapper

     

       4
       3
        
       , qtx11extras

     

       5
       4
        
       }:

     

       6
       5
        
       

     

       7
       6
        
       kdeFramework {

     

       8
       7
        
         name = "kdbusaddons";

     

       9
       9
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       8
       8
       +
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       9
       9
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       10
       10
        
         propagatedBuildInputs = [ qtx11extras ];

     

       11
       11
       -
         postInstall = ''

     

       12
       12
       -
           wrapQtProgram "$out/bin/kquitapp5"

     

       13
       13
       -
         '';

     

       14
       14
       -
         meta = {

     

       15
       15
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       16
       16
       -
         };

     

       17
       11
        
       }

+2 -5

pkgs/desktops/kde-5/frameworks/kdeclarative.nix

···

       1
       1
        
       { kdeFramework, lib, extra-cmake-modules, epoxy, kconfig

     

       2
       2
        
       , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage

     

       3
       3
       -
       , kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig

     

       3
       3
       +
       , kwidgetsaddons, kwindowsystem, pkgconfig

     

       4
       4
        
       , qtdeclarative

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       kdeFramework {

     

       8
       8
        
         name = "kdeclarative";

     

       9
       9
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       10
       10
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       10
       10
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       11
       11
        
         propagatedBuildInputs = [

     

       12
       12
        
           epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage

     

       13
       13
        
           kwidgetsaddons kwindowsystem qtdeclarative

     

       14
       14
        
         ];

     

       15
       15
       -
         postInstall = ''

     

       16
       16
       -
           wrapQtProgram "$out/bin/kpackagelauncherqml"

     

       17
       17
       -
         '';

     

       18
       15
        
       }

+2 -5

pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix

···

       1
       1
       -
       { kdeFramework, lib, makeQtWrapper

     

       1
       1
       +
       { kdeFramework, lib

     

       2
       2
        
       , extra-cmake-modules

     

       3
       3
        
       , kcompletion

     

       4
       4
        
       , kconfig

     
···

       18
       18
        
       kdeFramework {

     

       19
       19
        
         name = "kdesignerplugin";

     

       20
       20
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       21
       21
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       21
       21
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       22
       22
        
         propagatedBuildInputs = [

     

       23
       23
        
           kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio

     

       24
       24
        
           kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet

     

       25
       25
        
         ];

     

       26
       26
       -
         postInstall = ''

     

       27
       27
       -
           wrapQtProgram "$out/bin/kgendesignerplugin"

     

       28
       28
       -
         '';

     

       29
       26
        
       }

+2 -2

pkgs/desktops/kde-5/frameworks/kdoctools/default.nix

···

       1
       1
        
       { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45

     

       2
       2
       -
       , docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages

     

       2
       2
       +
       , docbook5_xsl, karchive, ki18n, perl, perlPackages

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       kdeFramework {

     
···

       7
       7
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       8
       8
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       9
       9
        
         propagatedBuildInputs = [ karchive ki18n ];

     

       10
       10
       -
         propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];

     

       10
       10
       +
         propagatedNativeBuildInputs = [ perl perlPackages.URI ];

     

       11
       11
        
         cmakeFlags = [

     

       12
       12
        
           "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"

     

       13
       13
        
           "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"

+1 -5

pkgs/desktops/kde-5/frameworks/kglobalaccel.nix

···

       5
       5
        
       , kcrash

     

       6
       6
        
       , kdbusaddons

     

       7
       7
        
       , kwindowsystem

     

       8
       8
       -
       , makeQtWrapper

     

       9
       8
        
       , qtx11extras

     

       10
       9
        
       }:

     

       11
       10
        
       

     

       12
       11
        
       kdeFramework {

     

       13
       12
        
         name = "kglobalaccel";

     

       14
       13
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       15
       15
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       16
       15
        
         propagatedBuildInputs = [

     

       17
       16
        
           kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras

     

       18
       17
        
         ];

     

       19
       19
       -
         postInstall = ''

     

       20
       20
       -
           wrapQtProgram "$out/bin/kglobalaccel5"

     

       21
       21
       -
         '';

     

       22
       18
        
       }

+2 -5

pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix

···

       1
       1
        
       { kdeFramework, lib, copyPathsToStore

     

       2
       2
       -
       , extra-cmake-modules, makeQtWrapper

     

       2
       2
       +
       , extra-cmake-modules

     

       3
       3
        
       , karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       7
       7
        
         name = "kiconthemes";

     

       8
       8
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       9
       9
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       10
       10
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       10
       10
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       11
       11
        
         propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];

     

       12
       12
       -
         postInstall = ''

     

       13
       13
       -
           wrapQtProgram "$out/bin/kiconfinder5"

     

       14
       14
       -
         '';

     

       15
       12
        
       }

+6 -4

pkgs/desktops/kde-5/frameworks/kinit/default.nix

···

       1
       1
       -
       { kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash

     

       2
       2
       -
       , kdoctools, ki18n, kio, kservice, kwindowsystem, libcap

     

       1
       1
       +
       {

     

       2
       2
       +
         kdeFramework, lib, copyPathsToStore,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kconfig, kcrash, ki18n, kio, kservice, kwindowsystem

     

       3
       5
        
       }:

     

       4
       6
        
       

     

       5
       7
        
       kdeFramework {

     

       6
       8
        
         name = "kinit";

     

       7
       9
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       8
       8
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools libcap.out ];

     

       10
       10
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       9
       11
        
         propagatedBuildInputs = [

     

       10
       10
       -
           kconfig kcrash ki18n kio kservice kwindowsystem libcap

     

       12
       12
       +
           kconfig kcrash ki18n kio kservice kwindowsystem

     

       11
       13
        
         ];

     

       12
       14
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       13
       15
        
       }

+4 -4

pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch

···

       1
       1
       -
       Index: kinit-5.21.0/src/kdeinit/kinit.cpp

     

       1
       1
       +
       Index: kinit-5.24.0/src/kdeinit/kinit.cpp

     

       2
       2
        
       ===================================================================

     

       3
       3
       -
       --- kinit-5.21.0.orig/src/kdeinit/kinit.cpp

     

       4
       4
       -
       +++ kinit-5.21.0/src/kdeinit/kinit.cpp

     

       5
       5
       -
       @@ -657,19 +657,16 @@ static pid_t launch(int argc, const char

     

       3
       3
       +
       --- kinit-5.24.0.orig/src/kdeinit/kinit.cpp

     

       4
       4
       +
       +++ kinit-5.24.0/src/kdeinit/kinit.cpp

     

       5
       5
       +
       @@ -672,19 +672,16 @@ static pid_t launch(int argc, const char

     

       6
       6
        
        

     

       7
       7
        
                if (!libpath.isEmpty()) {

     

       8
       8
        
                    if (libpath_relative) {

pkgs/desktops/kde-5/frameworks/kinit/series

···

       1
       1
        
       kinit-libpath.patch

     

       2
       2
       +
       start_kdeinit-path.patch

+13

pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch

···

       1
       1
       +
       Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- kinit-5.24.0.orig/src/start_kdeinit/start_kdeinit_wrapper.c

     

       4
       4
       +
       +++ kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c

     

       5
       5
       +
       @@ -23,7 +23,7 @@

     

       6
       6
       +
        #include <string.h>

     

       7
       7
       +
        #include <unistd.h>

     

       8
       8
       +
        

     

       9
       9
       +
       -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"

     

       10
       10
       +
       +#define EXECUTE "/var/setuid-wrappers/start_kdeinit"

     

       11
       11
       +
        

     

       12
       12
       +
        #if KDEINIT_OOM_PROTECT

     

       13
       13
       +

+2 -8

pkgs/desktops/kde-5/frameworks/kio/default.nix

···

       3
       3
        
       , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons

     

       4
       4
        
       , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews

     

       5
       5
        
       , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet

     

       6
       6
       -
       , kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper

     

       6
       6
       +
       , kwidgetsaddons, kwindowsystem, kxmlgui

     

       7
       7
        
       , qtscript, qtx11extras, solid

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       kdeFramework {

     

       11
       11
        
         name = "kio";

     

       12
       12
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       13
       13
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
        
         propagatedBuildInputs = [

     

       15
       15
        
           acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons

     

       16
       16
        
           kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice

     
···

       18
       18
        
           qtx11extras

     

       19
       19
        
         ];

     

       20
       20
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       21
       21
       -
         postInstall = ''

     

       22
       22
       -
           wrapQtProgram "$out/bin/kcookiejar5"

     

       23
       23
       -
           wrapQtProgram "$out/bin/ktelnetservice5"

     

       24
       24
       -
           wrapQtProgram "$out/bin/ktrash5"

     

       25
       25
       -
           wrapQtProgram "$out/bin/protocoltojson"

     

       26
       26
       -
         '';

     

       27
       21
        
       }

+1 -5

pkgs/desktops/kde-5/frameworks/kjs.nix

···

       1
       1
        
       { kdeFramework, lib

     

       2
       2
        
       , extra-cmake-modules

     

       3
       3
        
       , kdoctools

     

       4
       4
       -
       , makeQtWrapper

     

       5
       4
        
       }:

     

       6
       5
        
       

     

       7
       6
        
       kdeFramework {

     

       8
       7
        
         name = "kjs";

     

       9
       8
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       10
       10
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       11
       11
       -
         postInstall = ''

     

       12
       12
       -
           wrapQtProgram "$out/bin/kjs5"

     

       13
       13
       -
         '';

     

       9
       9
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       10
        
       }

+2 -6

pkgs/desktops/kde-5/frameworks/kjsembed.nix

···

       1
       1
        
       { kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs

     

       2
       2
       -
       , makeQtWrapper, qtsvg

     

       2
       2
       +
       , qtsvg

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       kdeFramework {

     

       6
       6
        
         name = "kjsembed";

     

       7
       7
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       8
       8
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       9
       9
        
         propagatedBuildInputs = [ ki18n kjs qtsvg ];

     

       10
       10
       -
         postInstall = ''

     

       11
       11
       -
           wrapQtProgram "$out/bin/kjscmd5"

     

       12
       12
       -
           wrapQtProgram "$out/bin/kjsconsole"

     

       13
       13
       -
         '';

     

       14
       10
        
       }

+1 -5

pkgs/desktops/kde-5/frameworks/kpackage/default.nix

···

       5
       5
        
       , kcoreaddons

     

       6
       6
        
       , kdoctools

     

       7
       7
        
       , ki18n

     

       8
       8
       -
       , makeQtWrapper

     

       9
       8
        
       }:

     

       10
       9
        
       

     

       11
       10
        
       kdeFramework {

     

       12
       11
        
         name = "kpackage";

     

       13
       12
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       14
       14
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       14
        
         propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];

     

       16
       15
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       17
       17
       -
         postInstall = ''

     

       18
       18
       -
           wrapQtProgram "$out/bin/kpackagetool5"

     

       19
       19
       -
         '';

     

       20
       16
        
       }

-43

pkgs/desktops/kde-5/frameworks/kservice/setup-hook.sh

···

       1
       1
       -
       addServicePkg() {

     

       2
       2
       -
           local propagated

     

       3
       3
       -
           for dir in "share/kservices5" "share/kservicetypes5"; do

     

       4
       4
       -
               if [[ -d "$1/$dir" ]]; then

     

       5
       5
       -
                   propagated=

     

       6
       6
       -
                   for pkg in $propagatedBuildInputs; do

     

       7
       7
       -
                       if [[ "z$pkg" == "z$1" ]]; then

     

       8
       8
       -
                           propagated=1

     

       9
       9
       -
                           break

     

       10
       10
       -
                       fi

     

       11
       11
       -
                   done

     

       12
       12
       -
                   if [[ -z $propagated ]]; then

     

       13
       13
       -
                       propagatedBuildInputs="$propagatedBuildInputs $1"

     

       14
       14
       -
                   fi

     

       15
       15
       -
       

     

       16
       16
       -
                   propagated=

     

       17
       17
       -
                   for pkg in $propagatedUserEnvPkgs; do

     

       18
       18
       -
                       if [[ "z$pkg" == "z$1" ]]; then

     

       19
       19
       -
                           propagated=1

     

       20
       20
       -
                           break

     

       21
       21
       -
                       fi

     

       22
       22
       -
                   done

     

       23
       23
       -
                   if [[ -z $propagated ]]; then

     

       24
       24
       -
                       propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"

     

       25
       25
       -
                   fi

     

       26
       26
       -
       

     

       27
       27
       -
                   break

     

       28
       28
       -
               fi

     

       29
       29
       -
           done

     

       30
       30
       -
       }

     

       31
       31
       -
       

     

       32
       32
       -
       envHooks+=(addServicePkg)

     

       33
       33
       -
       

     

       34
       34
       -
       local propagated

     

       35
       35
       -
       for pkg in $propagatedBuildInputs; do

     

       36
       36
       -
           if [[ "z$pkg" == "z@out@" ]]; then

     

       37
       37
       -
               propagated=1

     

       38
       38
       -
               break

     

       39
       39
       -
           fi

     

       40
       40
       -
       done

     

       41
       41
       -
       if [[ -z $propagated ]]; then

     

       42
       42
       -
           propagatedBuildInputs="$propagatedBuildInputs @out@"

     

       43
       43
       -
       fi

+2 -2

pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix

···

       1
       1
        
       { kdeFramework, lib, copyPathsToStore

     

       2
       2
       -
       , extra-cmake-modules, makeQtWrapper, perl

     

       2
       2
       +
       , extra-cmake-modules, perl

     

       3
       3
        
       , karchive, kconfig, kguiaddons, kiconthemes, kparts

     

       4
       4
        
       , libgit2

     

       5
       5
        
       , qtscript, qtxmlpatterns

     
···

       9
       9
        
       kdeFramework {

     

       10
       10
        
         name = "ktexteditor";

     

       11
       11
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       12
       12
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];

     

       12
       12
       +
         nativeBuildInputs = [ extra-cmake-modules perl ];

     

       13
       13
        
         propagatedBuildInputs = [

     

       14
       14
        
           karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript

     

       15
       15
        
           qtxmlpatterns sonnet

+2 -6

pkgs/desktops/kde-5/frameworks/kwallet.nix

···

       1
       1
        
       { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets

     

       2
       2
        
       , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes

     

       3
       3
        
       , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt

     

       4
       4
       -
       , makeQtWrapper }:

     

       4
       4
       +
       }:

     

       5
       5
        
       

     

       6
       6
        
       kdeFramework {

     

       7
       7
        
         name = "kwallet";

     

       8
       8
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       9
       9
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       10
       10
        
         propagatedBuildInputs = [

     

       11
       11
        
           kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes

     

       12
       12
        
           knotifications kservice kwidgetsaddons kwindowsystem libgcrypt

     

       13
       13
        
         ];

     

       14
       14
       -
         postInstall = ''

     

       15
       15
       -
           wrapQtProgram "$out/bin/kwalletd5"

     

       16
       16
       -
           wrapQtProgram "$out/bin/kwallet-query"

     

       17
       17
       -
         '';

     

       18
       14
        
       }

+2 -5

pkgs/desktops/kde-5/frameworks/plasma-framework.nix

···

       2
       2
        
       , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative

     

       3
       3
        
       , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio

     

       4
       4
        
       , knotifications, kpackage, kservice, kwindowsystem, kxmlgui

     

       5
       5
       -
       , makeQtWrapper, qtscript, qtx11extras

     

       5
       5
       +
       , qtscript, qtx11extras

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       kdeFramework {

     

       9
       9
        
         name = "plasma-framework";

     

       10
       10
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       11
       11
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       12
       12
        
         propagatedBuildInputs = [

     

       13
       13
        
           kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons

     

       14
       14
        
           kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications

     

       15
       15
        
           kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras

     

       16
       16
        
         ];

     

       17
       17
       -
         postInstall = ''

     

       18
       18
       -
           wrapQtProgram "$out/bin/plasmapkg2"

     

       19
       19
       -
         '';

     

       20
       17
        
       }

+1 -5

pkgs/desktops/kde-5/frameworks/solid.nix

···

       1
       1
        
       { kdeFramework, lib

     

       2
       2
        
       , extra-cmake-modules

     

       3
       3
       -
       , makeQtWrapper

     

       4
       3
        
       , qtdeclarative

     

       5
       4
        
       }:

     

       6
       5
        
       

     

       7
       6
        
       kdeFramework {

     

       8
       7
        
         name = "solid";

     

       9
       8
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       10
       10
       -
         nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       11
       10
        
         propagatedBuildInputs = [ qtdeclarative ];

     

       12
       12
       -
         postInstall = ''

     

       13
       13
       -
           wrapQtProgram "$out/bin/solid-hardware5"

     

       14
       14
       -
         '';

     

       15
       11
        
       }

+12 -27

pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix

···

       1
       1
       -
       { plasmaPackage, lib, copyPathsToStore

     

       2
       2
       -
       , extra-cmake-modules, kdoctools

     

       3
       3
       -
       , baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative

     

       4
       4
       -
       , kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff

     

       5
       5
       -
       , knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland

     

       6
       6
       -
       , kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon

     

       7
       7
       -
       , plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid

     

       8
       8
       -
       , isocodes, libdbusmenu, libSM, libXcursor, pam, wayland

     

       1
       1
       +
       {

     

       2
       2
       +
         plasmaPackage, lib, copyPathsToStore,

     

       3
       3
       +
       

     

       4
       4
       +
         extra-cmake-modules, kdoctools,

     

       5
       5
       +
       

     

       6
       6
       +
         baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,

     

       7
       7
       +
         kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,

     

       8
       8
       +
         knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland,

     

       9
       9
       +
         kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon,

     

       10
       10
       +
         plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid, isocodes,

     

       11
       11
       +
         libdbusmenu, libSM, libXcursor, pam, wayland

     

       9
       12
        
       }:

     

       10
       13
        
       

     

       11
       14
        
       plasmaPackage {

     

       12
       15
        
         name = "plasma-workspace";

     

       13
       16
        
       

     

       14
       17
        
         nativeBuildInputs = [

     

       15
       15
       -
           extra-cmake-modules

     

       16
       16
       -
           kdoctools

     

       18
       18
       +
           extra-cmake-modules kdoctools

     

       17
       19
        
         ];

     

       18
       20
        
         buildInputs = [

     

       19
       21
        
           baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative

     
···

       36
       38
        
           rm "$out/bin/startplasmacompositor"

     

       37
       39
        
           rm "$out/lib/libexec/startplasma"

     

       38
       40
        
           rm -r "$out/share/wayland-sessions"

     

       39
       39
       -
         '';

     

       40
       40
       -
       

     

       41
       41
       -
         preFixup = ''

     

       42
       42
       -
           wrapQtProgram $out/bin/kcheckrunning

     

       43
       43
       -
           wrapQtProgram $out/bin/kcminit

     

       44
       44
       -
           wrapQtProgram $out/bin/kcminit_startup

     

       45
       45
       -
           wrapQtProgram $out/bin/kdostartupconfig5

     

       46
       46
       -
           wrapQtProgram $out/bin/klipper

     

       47
       47
       -
           wrapQtProgram $out/bin/krunner

     

       48
       48
       -
           wrapQtProgram $out/bin/ksmserver

     

       49
       49
       -
           wrapQtProgram $out/bin/ksplashqml

     

       50
       50
       -
           wrapQtProgram $out/bin/kstartupconfig5

     

       51
       51
       -
           wrapQtProgram $out/bin/kuiserver5

     

       52
       52
       -
           wrapQtProgram $out/bin/plasmashell

     

       53
       53
       -
           wrapQtProgram $out/bin/plasmawindowed

     

       54
       54
       -
           wrapQtProgram $out/bin/systemmonitor

     

       55
       55
       -
           wrapQtProgram $out/bin/xembedsniproxy

     

       56
       41
        
         '';

     

       57
       42
        
       }

+35 -13

pkgs/desktops/kde-5/plasma/startkde/default.nix

···

       1
       1
       -
       { stdenv, lib, runCommand

     

       2
       2
       -
       , dbus, qttools, socat

     

       3
       3
       -
       , gnugrep, gnused

     

       4
       4
       -
       , kconfig, kinit, kservice

     

       5
       5
       -
       , plasma-workspace

     

       6
       6
       -
       , xmessage, xprop, xsetroot

     

       1
       1
       +
       {

     

       2
       2
       +
         stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig,

     

       3
       3
       +
         kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase,

     

       4
       4
       +
         qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtscript, qtsvg,

     

       5
       5
       +
         qtx11extras, qtxmlpatterns

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       let

     

       10
       9
        
       

     

       11
       10
        
         env = {

     

       12
       11
        
           inherit (stdenv) shell;

     

       13
       13
       -
           paths = builtins.map (pkg: pkg.out or pkg)

     

       12
       12
       +
           bins = builtins.map (pkg: pkg.out or pkg)

     

       14
       13
        
             [

     

       15
       14
        
               dbus qttools socat

     

       16
       15
        
               gnugrep gnused

     

       17
       16
        
               kconfig kinit kservice

     

       18
       17
        
               plasma-workspace

     

       19
       18
        
               xmessage xprop xsetroot

     

       19
       19
       +
             ];

     

       20
       20
       +
           libs = builtins.map (pkg: pkg.out or pkg)

     

       21
       21
       +
             [

     

       22
       22
       +
               qtbase qtdeclarative qtgraphicaleffects qtquickcontrols

     

       23
       23
       +
               qtscript qtsvg qtx11extras qtxmlpatterns

     

       20
       24
        
             ];

     

       21
       25
        
         };

     

       22
       26
        
       

     

       23
       27
        
       in runCommand "startkde" env ''

     

       24
       24
       -
         prefix_PATH=

     

       25
       25
       -
         for pkg in $paths; do

     

       26
       26
       -
           addToSearchPath prefix_PATH "$pkg/bin"

     

       27
       27
       -
           addToSearchPath prefix_PATH "$pkg/lib/libexec"

     

       28
       28
       -
           addToSearchPath prefix_PATH "$pkg/lib/libexec/kf5"

     

       28
       28
       +
       

     

       29
       29
       +
         # Configure PATH variable

     

       30
       30
       +
         suffixPATH=

     

       31
       31
       +
         for p in $bins; do

     

       32
       32
       +
             addToSearchPath suffixPATH "$p/bin"

     

       33
       33
       +
             addToSearchPath suffixPATH "$p/lib/libexec"

     

       34
       34
       +
             addToSearchPath suffixPATH "$p/lib/libexec/kf5"

     

       29
       35
        
         done

     

       30
       30
       -
         substitute ${./startkde.sh} "$out" --subst-var shell --subst-var prefix_PATH

     

       36
       36
       +
       

     

       37
       37
       +
         # Configure Qt search paths

     

       38
       38
       +
         QT_PLUGIN_PATH=

     

       39
       39
       +
         QML_IMPORT_PATH=

     

       40
       40
       +
         QML2_IMPORT_PATH=

     

       41
       41
       +
         for p in $libs; do

     

       42
       42
       +
             addToSearchPath QT_PLUGIN_PATH "$p/lib/qt5/plugins"

     

       43
       43
       +
             addToSearchPath QML_IMPORT_PATH "$p/lib/qt5/imports"

     

       44
       44
       +
             addToSearchPath QML2_IMPORT_PATH "$p/lib/qt5/qml"

     

       45
       45
       +
         done

     

       46
       46
       +
       

     

       47
       47
       +
         substitute ${./startkde.sh} "$out" \

     

       48
       48
       +
             --subst-var shell \

     

       49
       49
       +
             --subst-var suffixPATH \

     

       50
       50
       +
             --subst-var QT_PLUGIN_PATH \

     

       51
       51
       +
             --subst-var QML_IMPORT_PATH \

     

       52
       52
       +
             --subst-var QML2_IMPORT_PATH

     

       31
       53
        
         chmod +x "$out"

     

       32
       54
        
       ''

+19 -17

pkgs/desktops/kde-5/plasma/startkde/startkde.sh

···

       1
       1
        
       #!@shell@

     

       2
       2
        
       

     

       3
       3
       -
       PATH="@prefix_PATH@:$PATH"

     

       3
       3
       +
       PATH="$PATH${PATH:+:}@suffixPATH@"

     

       4
       4
       +
       

     

       5
       5
       +
       export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@"

     

       6
       6
       +
       export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@"

     

       7
       7
       +
       export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@"

     

       4
       8
        
       

     

       5
       9
        
       # The KDE icon cache is supposed to update itself

     

       6
       10
        
       # automatically, but it uses the timestamp on the icon

     
···

       73
       77
        
       kcminputrc Mouse cursorSize ''

     

       74
       78
        
       ksplashrc KSplash Theme Breeze

     

       75
       79
        
       ksplashrc KSplash Engine KSplashQML

     

       76
       76
       -
       kdeglobals KScreen ScaleFactor 1

     

       80
       80
       +
       kdeglobals KScreen ScreenScaleFactors ''

     

       77
       81
        
       kcmfonts General forceFontDPI 0

     

       78
       82
        
       EOF

     

       79
       83
        
       

     
···

       153
       157
        
       dl=$DESKTOP_LOCKED

     

       154
       158
        
       unset DESKTOP_LOCKED # Don't want it in the environment

     

       155
       159
        
       

     

       156
       156
       -
       # Make sure that D-Bus is running

     

       157
       157
       -
       # D-Bus autolaunch is broken

     

       158
       158
       -
       if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then

     

       159
       159
       -
           eval $(dbus-launch --sh-syntax --exit-with-session)

     

       160
       160
       -
       fi

     

       161
       161
       -
       if qdbus >/dev/null 2>/dev/null; then

     

       162
       162
       -
           : # ok

     

       163
       163
       -
       else

     

       164
       164
       -
           echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2

     

       165
       165
       -
           test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null

     

       166
       166
       -
           xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"

     

       167
       167
       -
           exit 1

     

       168
       168
       -
       fi

     

       169
       169
       -
       

     

       170
       160
        
       ksplash_pid=

     

       171
       161
        
       if test -z "$dl"; then

     

       172
       162
        
         # the splashscreen and progress indicator

     
···

       205
       195
        
       

     

       206
       196
        
       echo 'startkde: Starting up...'  1>&2

     

       207
       197
        
       

     

       198
       198
       +
       # Make sure that D-Bus is running

     

       199
       199
       +
       if $qdbus >/dev/null 2>/dev/null; then

     

       200
       200
       +
           : # ok

     

       201
       201
       +
       else

     

       202
       202
       +
           echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2

     

       203
       203
       +
           test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null

     

       204
       204
       +
           xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"

     

       205
       205
       +
           exit 1

     

       206
       206
       +
       fi

     

       207
       207
       +
       

     

       208
       208
        
       # Mark that full KDE session is running (e.g. Konqueror preloading works only

     

       209
       209
        
       # with full KDE running). The KDE_FULL_SESSION property can be detected by

     

       210
       210
        
       # any X client connected to the same X session, even if not launched

     
···

       251
       251
        
       fi

     

       252
       252
        
       

     

       253
       253
        
       # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment

     

       254
       254
       -
       ksyncdbusenv

     

       254
       254
       +
       dbus-update-activation-environment --systemd --all

     

       255
       255
        
       if test $? -ne 0; then

     

       256
       256
        
         # Startup error

     

       257
       257
        
         echo 'startkde: Could not sync environment to dbus.'  1>&2

     
···

       270
       270
        
         xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."

     

       271
       271
        
         exit 1

     

       272
       272
        
       fi

     

       273
       273
       +
       

     

       274
       274
       +
       qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit

     

       273
       275
        
       

     

       274
       276
        
       # (NixOS) Run kbuildsycoca5 before starting the user session because things

     

       275
       277
        
       # may be missing or moved if they have run nixos-rebuild and it may not be

+1 -1

pkgs/development/compilers/elm/default.nix

···

       40
       40
        
             EOF

     

       41
       41
        
           '' + lib.concatStrings cmds;

     

       42
       42
        
       

     

       43
       43
       -
         hsPkgs = haskell.packages.ghc7103.override {

     

       43
       43
       +
         hsPkgs = haskell.packages.ghc801.override {

     

       44
       44
        
           overrides = self: super:

     

       45
       45
        
             let hlib = haskell.lib;

     

       46
       46
        
                 elmRelease = import ./packages/release.nix { inherit (self) callPackage; };

+7 -7

pkgs/development/compilers/elm/packages/elm-compiler.nix

···

       3
       3
        
       , fetchgit, filemanip, filepath, HUnit, indents

     

       4
       4
        
       , language-ecmascript, language-glsl, mtl, parsec, pretty, process

     

       5
       5
        
       , QuickCheck, stdenv, test-framework, test-framework-hunit

     

       6
       6
       -
       , test-framework-quickcheck2, text, union-find, wl-pprint

     

       6
       6
       +
       , test-framework-quickcheck2, text, union-find

     

       7
       7
        
       }:

     

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "elm-compiler";

     

       10
       10
       -
         version = "0.17";

     

       10
       10
       +
         version = "0.17.1";

     

       11
       11
        
         src = fetchgit {

     

       12
       12
        
           url = "https://github.com/elm-lang/elm-compiler";

     

       13
       13
       -
           sha256 = "1vx4jp20nj4s41zsqnwyh80dvg7b7kd9fh6agl99v1xx9d3i6ws1";

     

       14
       14
       -
           rev = "c9c7e72c424a13255f8ee84c719f7ef48b689c1a";

     

       13
       13
       +
           sha256 = "17y0jlii81mnjywknblcv1nfja51slmwrhz9x8w144b0sblcj0if";

     

       14
       14
       +
           rev = "e44deafaf9cbf3749484070f267f03a368711adb";

     

       15
       15
        
         };

     

       16
       16
        
         isLibrary = true;

     

       17
       17
        
         isExecutable = true;

     
···

       19
       19
        
           aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary

     

       20
       20
        
           bytestring containers directory edit-distance filepath indents

     

       21
       21
        
           language-ecmascript language-glsl mtl parsec pretty process text

     

       22
       22
       -
           union-find wl-pprint

     

       22
       22
       +
           union-find

     

       23
       23
        
         ];

     

       24
       24
        
         executableHaskellDepends = [

     

       25
       25
        
           aeson base binary directory filepath process text

     
···

       29
       29
        
           bytestring containers directory edit-distance filemanip filepath

     

       30
       30
        
           HUnit indents language-ecmascript language-glsl mtl parsec pretty

     

       31
       31
        
           process QuickCheck test-framework test-framework-hunit

     

       32
       32
       -
           test-framework-quickcheck2 text union-find wl-pprint

     

       32
       32
       +
           test-framework-quickcheck2 text union-find

     

       33
       33
        
         ];

     

       34
       34
        
         jailbreak = true;

     

       35
       35
        
         homepage = "http://elm-lang.org";

     

       36
       36
       -
         description = "Values to help with elm-package, elm-make, and elm-lang.org";

     

       36
       36
       +
         description = "Values to help with elm-package, elm-make, and elm-lang.org.";

     

       37
       37
        
         license = stdenv.lib.licenses.bsd3;

     

       38
       38
        
       }

+20 -11

pkgs/development/compilers/elm/packages/elm-format.nix

···

       2
       2
        
       , bytestring, containers, directory, edit-distance, fetchgit

     

       3
       3
        
       , filemanip, filepath, HUnit, indents, mtl, optparse-applicative

     

       4
       4
        
       , parsec, pretty, process, QuickCheck, quickcheck-io

     

       5
       5
       -
       , regex-applicative, split, stdenv, test-framework

     

       6
       6
       -
       , test-framework-hunit, test-framework-quickcheck2, text

     

       7
       7
       -
       , union-find, wl-pprint

     

       5
       5
       +
       , regex-applicative, split, stdenv, tasty, tasty-golden

     

       6
       6
       +
       , tasty-hunit, tasty-quickcheck, text, union-find, wl-pprint

     

       8
       7
        
       }:

     

       9
       8
        
       mkDerivation {

     

       10
       9
        
         pname = "elm-format";

     

       11
       11
       -
         version = "0.3.1";

     

       10
       10
       +
         version = "0.4.0";

     

       12
       11
        
         src = fetchgit {

     

       13
       12
        
           url = "http://github.com/avh4/elm-format";

     

       14
       14
       -
           sha256 = "04kl50kzvjf4i140dlhs6f9fd2wmk6cnvyfamx2xh8vbwbnwrkj4";

     

       15
       15
       -
           rev = "0637f3772de2297d12ea35f5b66961e1d827552c";

     

       13
       13
       +
           sha256 = "199xh2w5cwcf79a8fv6j8dpk9h8a4cygrf8cfr9p7bvp2wvczibm";

     

       14
       14
       +
           rev = "d9cbe65c5f01d21b5a02c2f963aa4c9d3f0539d0";

     

       16
       15
        
         };

     

       17
       16
        
         isLibrary = false;

     

       18
       17
        
         isExecutable = true;

     
···

       23
       22
        
           text

     

       24
       23
        
         ];

     

       25
       24
        
         testHaskellDepends = [

     

       26
       26
       -
           aeson ansi-terminal base binary bytestring containers directory

     

       27
       27
       -
           edit-distance filemanip filepath HUnit indents mtl parsec pretty

     

       28
       28
       -
           process QuickCheck quickcheck-io regex-applicative split

     

       29
       29
       -
           test-framework test-framework-hunit test-framework-quickcheck2 text

     

       30
       30
       -
           union-find wl-pprint

     

       25
       25
       +
           aeson ansi-terminal ansi-wl-pprint base binary bytestring

     

       26
       26
       +
           containers directory edit-distance filemanip filepath HUnit indents

     

       27
       27
       +
           mtl optparse-applicative parsec pretty process QuickCheck

     

       28
       28
       +
           quickcheck-io regex-applicative split tasty tasty-golden

     

       29
       29
       +
           tasty-hunit tasty-quickcheck text union-find wl-pprint

     

       31
       30
        
         ];

     

       32
       31
        
         jailbreak = true;

     

       33
       32
        
         homepage = "http://elm-lang.org";

     

       34
       33
        
         description = "A source code formatter for Elm";

     

       35
       34
        
         license = stdenv.lib.licenses.bsd3;

     

       35
       35
       +
       

     

       36
       36
       +
         # XXX: I've manually disabled tests, only the following test is failing

     

       37
       37
       +
         # ...

     

       38
       38
       +
         # ElmFormat.Cli

     

       39
       39
       +
         #   format a single file in place:                    OK

     

       40
       40
       +
         #   usage instructions:                               FAIL

     

       41
       41
       +
         # ...

     

       42
       42
       +
         # 1 out of 266 tests failed (0.50s)

     

       43
       43
       +
         # Test suite elm-format-tests: FAIL

     

       44
       44
       +
         doCheck = false;

     

       36
       45
        
       }

+6 -5

pkgs/development/compilers/elm/packages/elm-make.nix

···

       1
       1
        
       { mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary

     

       2
       2
        
       , blaze-html, blaze-markup, bytestring, containers, directory

     

       3
       3
        
       , elm-compiler, elm-package, fetchgit, filepath, mtl

     

       4
       4
       -
       , optparse-applicative, stdenv, text, time, raw-strings-qq

     

       4
       4
       +
       , optparse-applicative, raw-strings-qq, stdenv, text, time

     

       5
       5
        
       }:

     

       6
       6
        
       mkDerivation {

     

       7
       7
        
         pname = "elm-make";

     

       8
       8
       -
         version = "0.17";

     

       8
       8
       +
         version = "0.17.1";

     

       9
       9
        
         src = fetchgit {

     

       10
       10
        
           url = "https://github.com/elm-lang/elm-make";

     

       11
       11
       -
           sha256 = "0ywi6iq2a3rb8a68ryqpq9y22536aa9k71wy7fcmrd5nwkmpwd2r";

     

       12
       12
       -
           rev = "5f7b74567c43eff341048c7caceb247b51cdb8bb";

     

       11
       11
       +
           sha256 = "0k9w5gl48lhhr3n2iflf0vkb3w6al0xcbglgiw4fq1ssz3aa7ijw";

     

       12
       12
       +
           rev = "0a0a1f52ab04e2d68d60a5798722e1de30b47335";

     

       13
       13
        
         };

     

       14
       14
        
         isLibrary = false;

     

       15
       15
        
         isExecutable = true;

     

       16
       16
        
         executableHaskellDepends = [

     

       17
       17
        
           aeson ansi-terminal ansi-wl-pprint base binary blaze-html

     

       18
       18
        
           blaze-markup bytestring containers directory elm-compiler

     

       19
       19
       -
           elm-package filepath mtl optparse-applicative text time raw-strings-qq

     

       19
       19
       +
           elm-package filepath mtl optparse-applicative raw-strings-qq text

     

       20
       20
       +
           time

     

       20
       21
        
         ];

     

       21
       22
        
         jailbreak = true;

     

       22
       23
        
         homepage = "http://elm-lang.org";

+16 -13

pkgs/development/compilers/elm/packages/elm-package.nix

···

       1
       1
        
       { mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary

     

       2
       2
       -
       , bytestring, containers, directory, elm-compiler, fetchgit

     

       3
       3
       -
       , filepath, HTTP, http-client, http-client-tls, http-types, mtl

     

       4
       4
       -
       , network, optparse-applicative, pretty, stdenv, text, time

     

       5
       5
       -
       , unordered-containers, vector, zip-archive

     

       2
       2
       +
       , bytestring, containers, directory, edit-distance, elm-compiler

     

       3
       3
       +
       , fetchgit, filepath, HTTP, http-client, http-client-tls

     

       4
       4
       +
       , http-types, mtl, network, optparse-applicative, parallel-io

     

       5
       5
       +
       , pretty, stdenv, text, time, unordered-containers, vector

     

       6
       6
       +
       , zip-archive

     

       6
       7
        
       }:

     

       7
       8
        
       mkDerivation {

     

       8
       9
        
         pname = "elm-package";

     

       9
       9
       -
         version = "0.17";

     

       10
       10
       +
         version = "0.17.1";

     

       10
       11
        
         src = fetchgit {

     

       11
       12
        
           url = "https://github.com/elm-lang/elm-package";

     

       12
       12
       -
           sha256 = "0z86560a2f7w3ywqvzqghgz100z0yn8zsiixkw4lp5168krp4axg";

     

       13
       13
       -
           rev = "fc0924210fe5a7c0af543769b1353dbb2ddf2f0c";

     

       13
       13
       +
           sha256 = "0dnn871py0pvzxsjjggy5ww2zj9g71c2dcnp38rcr4nbj8yxik85";

     

       14
       14
       +
           rev = "9011ccdbced1d06aa60de0e3096e609ef44d26dd";

     

       14
       15
        
         };

     

       15
       16
        
         isLibrary = true;

     

       16
       17
        
         isExecutable = true;

     

       17
       18
        
         libraryHaskellDepends = [

     

       18
       18
       -
           aeson aeson-pretty base binary bytestring containers directory

     

       19
       19
       -
           elm-compiler filepath HTTP http-client http-client-tls http-types

     

       20
       20
       -
           mtl network text time unordered-containers vector zip-archive

     

       19
       19
       +
           aeson aeson-pretty ansi-wl-pprint base binary bytestring containers

     

       20
       20
       +
           directory edit-distance elm-compiler filepath HTTP http-client

     

       21
       21
       +
           http-client-tls http-types mtl network parallel-io text time

     

       22
       22
       +
           unordered-containers vector zip-archive

     

       21
       23
        
         ];

     

       22
       24
        
         executableHaskellDepends = [

     

       23
       25
        
           aeson aeson-pretty ansi-wl-pprint base binary bytestring containers

     

       24
       24
       -
           directory elm-compiler filepath HTTP http-client http-client-tls

     

       25
       25
       -
           http-types mtl network optparse-applicative pretty text time

     

       26
       26
       -
           unordered-containers vector zip-archive

     

       26
       26
       +
           directory edit-distance elm-compiler filepath HTTP http-client

     

       27
       27
       +
           http-client-tls http-types mtl network optparse-applicative

     

       28
       28
       +
           parallel-io pretty text time unordered-containers vector

     

       29
       29
       +
           zip-archive

     

       27
       30
        
         ];

     

       28
       31
        
         jailbreak = true;

     

       29
       32
        
         homepage = "http://github.com/elm-lang/elm-package";

+8 -8

pkgs/development/compilers/elm/packages/elm-reactor-elm.nix

···

       1
       1
        
       {

     

       2
       2
        
         "elm-lang/virtual-dom" = {

     

       3
       3
       -
           version = "1.0.0";

     

       4
       4
       -
           sha256 = "0pa8k04g9yfixahsb30j0rbhfh6hwdh7xmm2fvk0hkidw7b4xg57";

     

       3
       3
       +
           version = "1.1.0";

     

       4
       4
       +
           sha256 = "16g66cvvh85ddciq0ymaqfyq2bcz11pxn0g0dc1wx7bmlqx7q1jz";

     

       5
       5
        
         };

     

       6
       6
        
         "evancz/elm-markdown" = {

     

       7
       7
        
           version = "3.0.0";

     

       8
       8
        
           sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6";

     

       9
       9
        
         };

     

       10
       10
        
         "elm-lang/html" = {

     

       11
       11
       -
           version = "1.0.0";

     

       12
       12
       -
           sha256 = "16cr01yxkpkmgbgclp2p80nd62a6fjw3qipzjsgksrhwv9vv4gm4";

     

       11
       11
       +
           version = "1.1.0";

     

       12
       12
       +
           sha256 = "1v7pwxxd81qrfywb4rr199p2i9z77vjkbwjwm5gy1nxdpi8mb50y";

     

       13
       13
        
         };

     

       14
       14
        
         "elm-lang/svg" = {

     

       15
       15
       -
           version = "1.0.0";

     

       16
       16
       -
           sha256 = "0c29y6c58x2sq1bl29z1hr5gi2rlza8clk7ssgzmsf4xbvcczbjx";

     

       15
       15
       +
           version = "1.1.1";

     

       16
       16
       +
           sha256 = "0xzc0fq2kg797km0nq2f52w6xdffrl9l0y5zbkpa72w163zpxkkn";

     

       17
       17
        
         };

     

       18
       18
        
         "elm-lang/core" = {

     

       19
       19
       -
           version = "4.0.0";

     

       20
       20
       -
           sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw";

     

       19
       19
       +
           version = "4.0.2";

     

       20
       20
       +
           sha256 = "1qjhfr3gd1qmfvna7iddspmk26v2nmgmgw9m6yyz10ygy3i9mla6";

     

       21
       21
        
         };

     

       22
       22
        
       }

+13 -10

pkgs/development/compilers/elm/packages/elm-reactor.nix

···

       1
       1
       -
       { mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs

     

       2
       2
       -
       , directory, elm-compiler, fetchgit, filepath, fsnotify, mtl

     

       3
       3
       -
       , snap-core, snap-server, stdenv, text, time, transformers

     

       4
       4
       -
       , websockets, websockets-snap, elm-package, file-embed

     

       1
       1
       +
       { mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring

     

       2
       2
       +
       , cmdargs, containers, directory, elm-compiler, elm-package

     

       3
       3
       +
       , fetchgit, file-embed, filepath, fsnotify, mtl, process, snap-core

     

       4
       4
       +
       , snap-server, stdenv, template-haskell, text, time, transformers

     

       5
       5
       +
       , unordered-containers, utf8-string, websockets, websockets-snap

     

       5
       6
        
       }:

     

       6
       7
        
       mkDerivation {

     

       7
       8
        
         pname = "elm-reactor";

     

       8
       8
       -
         version = "0.17";

     

       9
       9
       +
         version = "0.17.1";

     

       9
       10
        
         src = fetchgit {

     

       10
       11
        
           url = "https://github.com/elm-lang/elm-reactor";

     

       11
       11
       -
           sha256 = "03lb6fcc5d02gflarxc54l71hbwdb73v423ffjz5hvlha6ixglv7";

     

       12
       12
       -
           rev = "4781ad2fbb6cbcde0d659dec293bbed9c847ba71";

     

       12
       12
       +
           sha256 = "14kkqskvhkfznpl8cmjlvv3rp6ciqmdbxrmq6f20p3aznvkrdvf8";

     

       13
       13
       +
           rev = "7522d7ef379c5a4ffbba11b1be09ed04add08a63";

     

       13
       14
        
         };

     

       14
       15
        
         isLibrary = false;

     

       15
       16
        
         isExecutable = true;

     

       16
       17
        
         executableHaskellDepends = [

     

       17
       17
       -
           base blaze-html blaze-markup bytestring cmdargs directory

     

       18
       18
       -
           elm-compiler filepath fsnotify mtl snap-core snap-server text time

     

       19
       19
       -
           transformers websockets websockets-snap elm-package file-embed

     

       18
       18
       +
           aeson base blaze-html blaze-markup bytestring cmdargs containers

     

       19
       19
       +
           directory elm-compiler elm-package file-embed filepath fsnotify mtl

     

       20
       20
       +
           process snap-core snap-server template-haskell text time

     

       21
       21
       +
           transformers unordered-containers utf8-string websockets

     

       22
       22
       +
           websockets-snap

     

       20
       23
        
         ];

     

       21
       24
        
         jailbreak = true;

     

       22
       25
        
         homepage = "http://elm-lang.org";

+6 -5

pkgs/development/compilers/elm/packages/elm-repl.nix

···

       2
       2
        
       , containers, directory, elm-compiler, elm-package, fetchgit

     

       3
       3
        
       , filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv

     

       4
       4
        
       , test-framework, test-framework-hunit, test-framework-quickcheck2

     

       5
       5
       +
       , text

     

       5
       6
        
       }:

     

       6
       7
        
       mkDerivation {

     

       7
       8
        
         pname = "elm-repl";

     

       8
       8
       -
         version = "0.17";

     

       9
       9
       +
         version = "0.17.1";

     

       9
       10
        
         src = fetchgit {

     

       10
       11
        
           url = "https://github.com/elm-lang/elm-repl";

     

       11
       11
       -
           sha256 = "0bpmkm7q3a0h4hwlbwcnzaqgf6n5p1qw65z8kw84f52s5bndc0wc";

     

       12
       12
       -
           rev = "95b4555cff6b6e2a55a4ea3dab00bfb39dfebf0d";

     

       12
       12
       +
           sha256 = "0nh2yfr0bi4rg1kak1gjaczpq56y1nii05b5y7hn6n4w651jkm28";

     

       13
       13
       +
           rev = "413ac0d4ee43c8542afd3041bbb7b8c903cd3d30";

     

       13
       14
        
         };

     

       14
       15
        
         isLibrary = false;

     

       15
       16
        
         isExecutable = true;

     

       16
       17
        
         executableHaskellDepends = [

     

       17
       18
        
           base binary bytestring bytestring-trie cmdargs containers directory

     

       18
       18
       -
           elm-compiler elm-package filepath haskeline mtl parsec

     

       19
       19
       +
           elm-compiler elm-package filepath haskeline mtl parsec text

     

       19
       20
        
         ];

     

       20
       21
        
         testHaskellDepends = [

     

       21
       22
        
           base bytestring bytestring-trie cmdargs directory elm-compiler

     
···

       24
       25
        
         ];

     

       25
       26
        
         jailbreak = true;

     

       26
       27
        
         homepage = "https://github.com/elm-lang/elm-repl";

     

       27
       27
       -
         description = "A REPL for Elm";

     

       28
       28
       +
         description = "a REPL for Elm";

     

       28
       29
        
         license = stdenv.lib.licenses.bsd3;

     

       29
       30
        
       }

+1 -1

pkgs/development/compilers/elm/packages/release.nix

···

       2
       2
        
       # Please, do not modify it by hand!

     

       3
       3
        
       { callPackage }:

     

       4
       4
        
       {

     

       5
       5
       -
         version = "0.17";

     

       5
       5
       +
         version = "0.17.1";

     

       6
       6
        
         packages = {

     

       7
       7
        
           elm-compiler = callPackage ./elm-compiler.nix { };

     

       8
       8
        
           elm-package = callPackage ./elm-package.nix { };

+8 -8

pkgs/development/compilers/elm/update-elm.rb

···

       1
       1
        
       #!/usr/bin/env ruby

     

       2
       2
        
       

     

       3
       3
        
       # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs

     

       4
       4
       -
       $elm_version = "0.17"

     

       5
       5
       -
       $elm_packages = { "elm-compiler" => "0.17",

     

       6
       6
       -
                         "elm-package" => "0.17",

     

       7
       7
       -
                         "elm-make" => "0.17",

     

       8
       8
       -
                         "elm-reactor" => "0.17",

     

       9
       9
       -
                         "elm-repl" => "0.17"

     

       4
       4
       +
       $elm_version = "0.17.1"

     

       5
       5
       +
       $elm_packages = { "elm-compiler" => "0.17.1",

     

       6
       6
       +
                         "elm-package" => "0.17.1",

     

       7
       7
       +
                         "elm-make" => "0.17.1",

     

       8
       8
       +
                         "elm-reactor" => "0.17.1",

     

       9
       9
       +
                         "elm-repl" => "0.17.1"

     

       10
       10
        
                       }

     

       11
       11
        
       

     

       12
       12
        
       for pkg, ver in $elm_packages

     

       13
       13
       -
         system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > #{pkg}.nix"

     

       13
       13
       +
         system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > packages/#{pkg}.nix"

     

       14
       14
        
       end

     

       15
       15
        
       

     

       16
       16
       -
       File.open("release.nix", 'w') do |file|

     

       16
       16
       +
       File.open("packages/release.nix", 'w') do |file|

     

       17
       17
        
         file.puts "# This file is auto-generated by ./update-elm.rb."

     

       18
       18
        
         file.puts "# Please, do not modify it by hand!"

     

       19
       19
        
         file.puts "{ callPackage }:"

+2 -2

pkgs/development/compilers/ghc/6.10.2-binary.nix

···

       1
       1
       -
       {stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}:

     

       1
       1
       +
       {stdenv, lib, fetchurl, perl, libedit, ncurses5, gmp}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "6.10.2";

     
···

       40
       40
        
           (if stdenv.isLinux then ''

     

       41
       41
        
             find . -type f -perm -0100 \

     

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

     

       43
       43
       -
                 --set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} \;

     

       43
       43
       +
                 --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \;

     

       44
       44
        
             for prog in ld ar gcc strip ranlib; do

     

       45
       45
        
               find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;

     

       46
       46
        
             done

+2 -2

pkgs/development/compilers/ghc/7.0.4-binary.nix

···

       1
       1
       -
       {stdenv, fetchurl, perl, ncurses, gmp, libiconv}:

     

       1
       1
       +
       {stdenv, fetchurl, perl, ncurses5, gmp, libiconv}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "7.0.4";

     
···

       62
       62
        
           stdenv.lib.optionalString stdenv.isLinux ''

     

       63
       63
        
             find . -type f -perm -0100 \

     

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

     

       65
       65
       -
                 --set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} \;

     

       65
       65
       +
                 --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \;

     

       66
       66
        
             sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       67
       67
        
             sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       68
       68
        
             for prog in ld ar gcc strip ranlib; do

+2 -2

pkgs/development/compilers/ghc/7.4.2-binary.nix

···

       1
       1
       -
       {stdenv, fetchurl, perl, ncurses, gmp, libiconv, makeWrapper}:

     

       1
       1
       +
       {stdenv, fetchurl, perl, ncurses5, gmp, libiconv, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "7.4.2";

     
···

       61
       61
        
           # find editline/gmp.

     

       62
       62
        
           stdenv.lib.optionalString stdenv.isLinux ''

     

       63
       63
        
             mkdir -p "$out/lib"

     

       64
       64
       -
             ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"

     

       64
       64
       +
             ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"

     

       65
       65
        
             find . -type f -perm -0100 \

     

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

     

       67
       67
        
                 --set-rpath "$out/lib:${gmp.out}/lib" {} \;

-35

pkgs/development/compilers/path64/default.nix

···

       1
       1
       -
       {stdenv, fetchgit, perl, flex, bison, gmp, mpfr, cmake}:

     

       2
       2
       -
       

     

       3
       3
       -
       assert stdenv.system == "x86_64-linux";

     

       4
       4
       -
       

     

       5
       5
       -
       stdenv.mkDerivation {

     

       6
       6
       -
         name = "path64-2010-07-02";

     

       7
       7
       -
       

     

       8
       8
       -
         src = fetchgit {

     

       9
       9
       -
           url = git://github.com/path64/compiler.git;

     

       10
       10
       -
           rev = "e17f7f952831bbf1d996";

     

       11
       11
       -
           sha256 = "fa1320959e1131557d5f82e98f4621a222ec45e1d6e0e7f271d2c13de4fd0dd1";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         patchPhase = ''

     

       15
       15
       -
           sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c

     

       16
       16
       -
           sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in

     

       17
       17
       -
         '';

     

       18
       18
       -
       

     

       19
       19
       -
         cmakeFlags = ''

     

       20
       20
       -
           -DPATH64_ENABLE_HUGEPAGES=ON 

     

       21
       21
       -
           -DPATH64_ENABLE_MATHLIBS=ON -DPATH64_ENABLE_OPENMP=ON 

     

       22
       22
       -
           -DPATH64_ENABLE_PSCRUNTIME=OFF

     

       23
       23
       -
           -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 

     

       24
       24
       -
           -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF

     

       25
       25
       -
           -DPSC_CRT_PATH=${stdenv.cc.libc.out}/lib

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         makeFlags = "-j4";

     

       29
       29
       -
       

     

       30
       30
       -
         installPhase = ''

     

       31
       31
       -
           exit 1; 

     

       32
       32
       -
         '';

     

       33
       33
       -
       

     

       34
       34
       -
         buildInputs = [ perl flex bison gmp mpfr cmake ];

     

       35
       35
       -
       }

+2 -2

pkgs/development/compilers/sbcl/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         name    = "sbcl-${version}";

     

       12
       12
       -
         version = "1.3.6";

     

       12
       12
       +
         version = "1.3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";

     

       16
       16
       -
           sha256 = "1ndha72ji30qkq3rq76sp0yrka0679agg97x9imda2pyv0dsq5zh";

     

       16
       16
       +
           sha256 = "0fjdqnb2rsm2vi9794ywp27jr239ddvzc4xfr0dk49jd4v7p2kc5";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         patchPhase = ''

+198

pkgs/development/go-modules/libs.json

···

       1602
       1602
        
           }

     

       1603
       1603
        
         },

     

       1604
       1604
        
         {

     

       1605
       1605
       +
           "goPackagePath": "github.com/yosssi/ace",

     

       1606
       1606
       +
           "fetch": {

     

       1607
       1607
       +
             "type": "git",

     

       1608
       1608
       +
             "url": "https://github.com/yosssi/ace",

     

       1609
       1609
       +
             "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d",

     

       1610
       1610
       +
             "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"

     

       1611
       1611
       +
           }

     

       1612
       1612
       +
         },

     

       1613
       1613
       +
         {

     

       1614
       1614
       +
           "goPackagePath": "github.com/spf13/viper",

     

       1615
       1615
       +
           "fetch": {

     

       1616
       1616
       +
             "type": "git",

     

       1617
       1617
       +
             "url": "https://github.com/spf13/viper",

     

       1618
       1618
       +
             "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd",

     

       1619
       1619
       +
             "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0"

     

       1620
       1620
       +
           }

     

       1621
       1621
       +
         },

     

       1622
       1622
       +
         {

     

       1623
       1623
       +
           "goPackagePath": "github.com/spf13/pflag",

     

       1624
       1624
       +
           "fetch": {

     

       1625
       1625
       +
             "type": "git",

     

       1626
       1626
       +
             "url": "https://github.com/spf13/pflag",

     

       1627
       1627
       +
             "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0",

     

       1628
       1628
       +
             "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp"

     

       1629
       1629
       +
           }

     

       1630
       1630
       +
         },

     

       1631
       1631
       +
         {

     

       1632
       1632
       +
           "goPackagePath": "github.com/spf13/jwalterweatherman",

     

       1633
       1633
       +
           "fetch": {

     

       1634
       1634
       +
             "type": "git",

     

       1635
       1635
       +
             "url": "https://github.com/spf13/jwalterweatherman",

     

       1636
       1636
       +
             "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46",

     

       1637
       1637
       +
             "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"

     

       1638
       1638
       +
           }

     

       1639
       1639
       +
         },

     

       1640
       1640
       +
         {

     

       1605
       1641
        
           "goPackagePath": "github.com/fsnotify/fsnotify",

     

       1606
       1642
        
           "fetch": {

     

       1607
       1643
        
             "type": "git",

     
···

       1617
       1653
        
             "url": "https://github.com/ogier/pflag",

     

       1618
       1654
        
             "rev": "45c278ab3607870051a2ea9040bb85fcb8557481",

     

       1619
       1655
        
             "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"

     

       1656
       1656
       +
           }

     

       1657
       1657
       +
         },

     

       1658
       1658
       +
         {

     

       1659
       1659
       +
           "goPackagePath": "github.com/magiconair/properties",

     

       1660
       1660
       +
           "fetch": {

     

       1661
       1661
       +
             "type": "git",

     

       1662
       1662
       +
             "url": "https://github.com/magiconair/properties",

     

       1663
       1663
       +
             "rev": "c265cfa48dda6474e208715ca93e987829f572f8",

     

       1664
       1664
       +
             "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"

     

       1665
       1665
       +
           }

     

       1666
       1666
       +
         },

     

       1667
       1667
       +
         {

     

       1668
       1668
       +
           "goPackagePath": "github.com/bep/inflect",

     

       1669
       1669
       +
           "fetch": {

     

       1670
       1670
       +
             "type": "git",

     

       1671
       1671
       +
             "url": "https://github.com/bep/inflect",

     

       1672
       1672
       +
             "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69",

     

       1673
       1673
       +
             "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"

     

       1674
       1674
       +
           }

     

       1675
       1675
       +
         },

     

       1676
       1676
       +
         {

     

       1677
       1677
       +
           "goPackagePath": "github.com/eknkc/amber",

     

       1678
       1678
       +
           "fetch": {

     

       1679
       1679
       +
             "type": "git",

     

       1680
       1680
       +
             "url": "https://github.com/eknkc/amber",

     

       1681
       1681
       +
             "rev": "91774f050c1453128146169b626489e60108ec03",

     

       1682
       1682
       +
             "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"

     

       1683
       1683
       +
           }

     

       1684
       1684
       +
         },

     

       1685
       1685
       +
         {

     

       1686
       1686
       +
           "goPackagePath": "github.com/spf13/afero",

     

       1687
       1687
       +
           "fetch": {

     

       1688
       1688
       +
             "type": "git",

     

       1689
       1689
       +
             "url": "https://github.com/spf13/afero",

     

       1690
       1690
       +
             "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8",

     

       1691
       1691
       +
             "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"

     

       1692
       1692
       +
           }

     

       1693
       1693
       +
         },

     

       1694
       1694
       +
         {

     

       1695
       1695
       +
           "goPackagePath": "github.com/spf13/cast",

     

       1696
       1696
       +
           "fetch": {

     

       1697
       1697
       +
             "type": "git",

     

       1698
       1698
       +
             "url": "https://github.com/spf13/cast",

     

       1699
       1699
       +
             "rev": "27b586b42e29bec072fe7379259cc719e1289da6",

     

       1700
       1700
       +
             "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"

     

       1701
       1701
       +
           }

     

       1702
       1702
       +
         },

     

       1703
       1703
       +
         {

     

       1704
       1704
       +
           "goPackagePath": "github.com/spf13/cobra",

     

       1705
       1705
       +
           "fetch": {

     

       1706
       1706
       +
             "type": "git",

     

       1707
       1707
       +
             "url": "https://github.com/spf13/cobra",

     

       1708
       1708
       +
             "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7",

     

       1709
       1709
       +
             "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"

     

       1710
       1710
       +
           }

     

       1711
       1711
       +
         },

     

       1712
       1712
       +
         {

     

       1713
       1713
       +
           "goPackagePath": "github.com/dchest/cssmin",

     

       1714
       1714
       +
           "fetch": {

     

       1715
       1715
       +
             "type": "git",

     

       1716
       1716
       +
             "url": "https://github.com/dchest/cssmin",

     

       1717
       1717
       +
             "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239",

     

       1718
       1718
       +
             "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"

     

       1719
       1719
       +
           }

     

       1720
       1720
       +
         },

     

       1721
       1721
       +
         {

     

       1722
       1722
       +
           "goPackagePath": "github.com/spf13/fsync",

     

       1723
       1723
       +
           "fetch": {

     

       1724
       1724
       +
             "type": "git",

     

       1725
       1725
       +
             "url": "https://github.com/spf13/fsync",

     

       1726
       1726
       +
             "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1",

     

       1727
       1727
       +
             "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"

     

       1728
       1728
       +
           }

     

       1729
       1729
       +
         },

     

       1730
       1730
       +
         {

     

       1731
       1731
       +
           "goPackagePath": "github.com/cpuguy83/go-md2man",

     

       1732
       1732
       +
           "fetch": {

     

       1733
       1733
       +
             "type": "git",

     

       1734
       1734
       +
             "url": "https://github.com/cpuguy83/go-md2man",

     

       1735
       1735
       +
             "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599",

     

       1736
       1736
       +
             "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"

     

       1737
       1737
       +
           }

     

       1738
       1738
       +
         },

     

       1739
       1739
       +
         {

     

       1740
       1740
       +
           "goPackagePath": "github.com/miekg/mmark",

     

       1741
       1741
       +
           "fetch": {

     

       1742
       1742
       +
             "type": "git",

     

       1743
       1743
       +
             "url": "https://github.com/miekg/mmark",

     

       1744
       1744
       +
             "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a",

     

       1745
       1745
       +
             "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"

     

       1746
       1746
       +
           }

     

       1747
       1747
       +
         },

     

       1748
       1748
       +
         {

     

       1749
       1749
       +
           "goPackagePath": "github.com/spf13/nitro",

     

       1750
       1750
       +
           "fetch": {

     

       1751
       1751
       +
             "type": "git",

     

       1752
       1752
       +
             "url": "https://github.com/spf13/nitro",

     

       1753
       1753
       +
             "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8",

     

       1754
       1754
       +
             "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"

     

       1755
       1755
       +
           }

     

       1756
       1756
       +
         },

     

       1757
       1757
       +
         {

     

       1758
       1758
       +
           "goPackagePath": "github.com/PuerkitoBio/purell",

     

       1759
       1759
       +
           "fetch": {

     

       1760
       1760
       +
             "type": "git",

     

       1761
       1761
       +
             "url": "https://github.com/PuerkitoBio/purell",

     

       1762
       1762
       +
             "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3",

     

       1763
       1763
       +
             "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"

     

       1764
       1764
       +
           }

     

       1765
       1765
       +
         },

     

       1766
       1766
       +
         {

     

       1767
       1767
       +
           "goPackagePath": "github.com/opennota/urlesc",

     

       1768
       1768
       +
           "fetch": {

     

       1769
       1769
       +
             "type": "git",

     

       1770
       1770
       +
             "url": "https://github.com/opennota/urlesc",

     

       1771
       1771
       +
             "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587",

     

       1772
       1772
       +
             "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"

     

       1773
       1773
       +
           }

     

       1774
       1774
       +
         },

     

       1775
       1775
       +
         {

     

       1776
       1776
       +
           "goPackagePath": "github.com/pkg/sftp",

     

       1777
       1777
       +
           "fetch": {

     

       1778
       1778
       +
             "type": "git",

     

       1779
       1779
       +
             "url": "https://github.com/pkg/sftp",

     

       1780
       1780
       +
             "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472",

     

       1781
       1781
       +
             "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"

     

       1782
       1782
       +
           }

     

       1783
       1783
       +
         },

     

       1784
       1784
       +
         {

     

       1785
       1785
       +
           "goPackagePath": "github.com/kr/fs",

     

       1786
       1786
       +
           "fetch": {

     

       1787
       1787
       +
             "type": "git",

     

       1788
       1788
       +
             "url": "https://github.com/kr/fs",

     

       1789
       1789
       +
             "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",

     

       1790
       1790
       +
             "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"

     

       1791
       1791
       +
           }

     

       1792
       1792
       +
         },

     

       1793
       1793
       +
         {

     

       1794
       1794
       +
           "goPackagePath": "github.com/kyokomi/emoji",

     

       1795
       1795
       +
           "fetch": {

     

       1796
       1796
       +
             "type": "git",

     

       1797
       1797
       +
             "url": "https://github.com/kyokomi/emoji",

     

       1798
       1798
       +
             "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9",

     

       1799
       1799
       +
             "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"

     

       1800
       1800
       +
           }

     

       1801
       1801
       +
         },

     

       1802
       1802
       +
         {

     

       1803
       1803
       +
           "goPackagePath": "github.com/pkg/errors",

     

       1804
       1804
       +
           "fetch": {

     

       1805
       1805
       +
             "type": "git",

     

       1806
       1806
       +
             "url": "https://github.com/pkg/errors",

     

       1807
       1807
       +
             "rev": "494e70f7620561491c2ca11e185bbef4b70060da",

     

       1808
       1808
       +
             "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"

     

       1809
       1809
       +
           }

     

       1810
       1810
       +
         },

     

       1811
       1811
       +
         {

     

       1812
       1812
       +
           "goPackagePath": "github.com/PuerkitoBio/urlesc",

     

       1813
       1813
       +
           "fetch": {

     

       1814
       1814
       +
             "type": "git",

     

       1815
       1815
       +
             "url": "https://github.com/PuerkitoBio/urlesc",

     

       1816
       1816
       +
             "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587",

     

       1817
       1817
       +
             "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"

     

       1620
       1818
        
           }

     

       1621
       1819
        
         }

     

       1622
       1820
        
       ]

+1 -1

pkgs/development/guile-modules/guile-sdl/default.nix

···

       20
       20
        
         nativeBuildInputs = [ guile ];

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
       -
           SDL SDL_image SDL_ttf SDL_mixer

     

       23
       23
       +
           SDL.dev SDL_image SDL_ttf SDL_mixer

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         GUILE_AUTO_COMPILE = 0;

pkgs/development/haskell-modules/configuration-common.nix

···

       242
       242
        
               '';

     

       243
       243
        
             })) pkgs.libcxx;

     

       244
       244
        
       

     

       245
       245
       +
         inline-c-cpp = if !pkgs.stdenv.isDarwin

     

       246
       246
       +
           then super.inline-c-cpp

     

       247
       247
       +
           else addExtraLibrary (overrideCabal super.inline-c-cpp (drv:

     

       248
       248
       +
             {

     

       249
       249
       +
               postPatch = ''

     

       250
       250
       +
                 substituteInPlace inline-c-cpp.cabal --replace stdc++ c++

     

       251
       251
       +
               '';

     

       252
       252
       +
             })) pkgs.libcxx;

     

       253
       253
       +
       

     

       245
       254
        
         # tests don't compile for some odd reason

     

       246
       255
        
         jwt = dontCheck super.jwt;

     

       247
       256

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

···

       90
       90
        
         khumba:

     

       91
       91
        
           - goatee

     

       92
       92
        
           - goatee-gtk

     

       93
       93
       +
           - hoppy-docs

     

       94
       94
       +
           - hoppy-generator

     

       95
       95
       +
           - hoppy-runtime

     

       96
       96
       +
           - hoppy-std

     

       97
       97
       +
           - qtah-cpp-qt5

     

       98
       98
       +
           - qtah-examples

     

       99
       99
       +
           - qtah-generator

     

       100
       100
       +
           - qtah-qt5

     

       93
       101
        
         psibi:

     

       94
       102
        
           - path-pieces

     

       95
       103
        
           - persistent

+2 -2

pkgs/development/haskell-modules/default.nix

···

       9
       9
        
         allCabalFiles = pkgs.fetchFromGitHub {

     

       10
       10
        
            owner = "commercialhaskell";

     

       11
       11
        
            repo = "all-cabal-hashes";

     

       12
       12
       -
            rev = "461610ab6f0cf581e186643c037f1981755792d9";

     

       13
       13
       -
            sha256 = "0x2577lfd5cbbaivl72273kw93gcmxvbjybk7w4h2ic3zvs1fnvm";

     

       12
       12
       +
            rev = "72f1318540eff69544eb8c14a16f630d0c5448b8";

     

       13
       13
       +
            sha256 = "1czi1rajk2726mqrw3qp7a43h26acbjw54ll3ns063yzg9hg469m";

     

       14
       14
        
          };

     

       15
       15
        
       

     

       16
       16
        
         inherit (stdenv.lib) fix' extends;

+8 -5

pkgs/development/interpreters/octave/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull

     

       2
       2
        
       , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk

     

       3
       3
       -
       , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas

     

       3
       3
       +
       , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp

     

       4
       4
        
       , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null

     

       5
       5
        
       , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null

     

       6
       6
        
       }:

     
···

       27
       27
        
       

     

       28
       28
        
         buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11

     

       29
       29
        
           graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile

     

       30
       30
       -
           fftw fftwSinglePrec qrupdate ]

     

       30
       30
       +
           fftw fftwSinglePrec qrupdate arpack libwebp ]

     

       31
       31
        
           ++ (stdenv.lib.optional (qt != null) qt)

     

       32
       32
        
           ++ (stdenv.lib.optional (qscintilla != null) qscintilla)

     

       33
       33
        
           ++ (stdenv.lib.optional (ghostscript != null) ghostscript)

     
···

       38
       38
        
           ++ (stdenv.lib.optional (jdk != null) jdk)

     

       39
       39
        
           ++ (stdenv.lib.optional (gnuplot != null) gnuplot)

     

       40
       40
        
           ++ (stdenv.lib.optional (python != null) python)

     

       41
       41
       +
           ++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11])

     

       41
       42
        
           ;

     

       42
       43
        
       

     

       43
       43
       -
         doCheck = true;

     

       44
       44
       +
         doCheck = !stdenv.isDarwin;

     

       44
       45
        
       

     

       45
       46
        
         enableParallelBuilding = true;

     

       46
       47
        
       

     
···

       50
       51
        
             "--with-blas=openblas"

     

       51
       52
        
             "--with-lapack=openblas"

     

       52
       53
        
           ]

     

       53
       53
       -
           ++ stdenv.lib.optional openblas.blas64 "--enable-64";

     

       54
       54
       +
           ++ stdenv.lib.optional openblas.blas64 "--enable-64"

     

       55
       55
       +
           ++ stdenv.lib.optionals stdenv.isDarwin ["--with-x=no"]

     

       56
       56
       +
           ;

     

       54
       57
        
       

     

       55
       58
        
         # Keep a copy of the octave tests detailed results in the output

     

       56
       59
        
         # derivation, because someone may care

     
···

       67
       70
        
           homepage = http://octave.org/;

     

       68
       71
        
           license = stdenv.lib.licenses.gpl3Plus;

     

       69
       72
        
           maintainers = with stdenv.lib.maintainers; [viric raskin];

     

       70
       70
       -
           platforms = with stdenv.lib.platforms; linux;

     

       73
       73
       +
           platforms = with stdenv.lib.platforms; linux ++ darwin;

     

       71
       74
        
         };

     

       72
       75
        
       }

+5 -3

pkgs/development/interpreters/python/2.6/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false

     

       1
       1
       +
       { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, less, includeModules ? false

     

       2
       2
        
       , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage

     

       3
       3
        
       , python26Packages }:

     

       4
       4
        
       

     
···

       53
       53
        
           [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]

     

       54
       54
        
           ++ optional zlibSupport zlib;

     

       55
       55
        
       

     

       56
       56
       +
         propagatedBuildInputs = [ less ];

     

       57
       57
       +
       

     

       56
       58
        
         mkPaths = paths: {

     

       57
       59
        
           C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;

     

       58
       60
        
           LIBRARY_PATH = makeLibraryPath paths;

     
···

       64
       66
        
           name = "python${if includeModules then "" else "-minimal"}-${version}";

     

       65
       67
        
           pythonVersion = majorVersion;

     

       66
       68
        
       

     

       67
       67
       -
           inherit majorVersion version src patches buildInputs preConfigure

     

       68
       68
       -
                   configureFlags;

     

       69
       69
       +
           inherit majorVersion version src patches buildInputs propagatedBuildInputs

     

       70
       70
       +
                   preConfigure configureFlags;

     

       69
       71
        
       

     

       70
       72
        
           inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;

     

       71
       73

+4 -3

pkgs/development/interpreters/python/2.7/default.nix

···

       1
       1
        
       { stdenv, fetchurl, self, callPackage, python27Packages

     

       2
       2
        
       , bzip2, openssl, gettext

     

       3
       3
       +
       , less

     

       3
       4
        
       

     

       4
       5
        
       , includeModules ? false

     

       5
       6
        
       

     
···

       22
       23
        
       

     

       23
       24
        
       let

     

       24
       25
        
         majorVersion = "2.7";

     

       25
       25
       -
         version = "${majorVersion}.11";

     

       26
       26
       +
         version = "${majorVersion}.12";

     

       26
       27
        
       

     

       27
       28
        
         src = fetchurl {

     

       28
       29
        
           url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";

     

       29
       29
       -
           sha256 = "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn";

     

       30
       30
       +
           sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       32
       33
        
         patches =

     
···

       108
       109
        
           ++ optional zlibSupport zlib

     

       109
       110
        
           ++ optional stdenv.isDarwin CF;

     

       110
       111
        
       

     

       111
       111
       -
         propagatedBuildInputs = optional stdenv.isDarwin configd;

     

       112
       112
       +
         propagatedBuildInputs = [ less ] ++ optional stdenv.isDarwin configd;

     

       112
       113
        
       

     

       113
       114
        
         mkPaths = paths: {

     

       114
       115
        
           C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;

+11 -9

pkgs/development/interpreters/python/2.7/no-ldconfig.patch

···

       1
       1
       -
       diff -ru -x '*~' Python-2.7.11-orig/Lib/ctypes/util.py Python-2.7.11/Lib/ctypes/util.py

     

       2
       2
       -
       --- Python-2.7.11-orig/Lib/ctypes/util.py	2015-12-05 20:46:56.000000000 +0100

     

       3
       3
       -
       +++ Python-2.7.11/Lib/ctypes/util.py	2016-07-01 14:24:50.714223450 +0200

     

       4
       4
       -
       @@ -212,31 +212,7 @@

     

       1
       1
       +
       diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py

     

       2
       2
       +
       index b2c514d..a6eca81 100644

     

       3
       3
       +
       --- a/Lib/ctypes/util.py

     

       4
       4
       +
       +++ b/Lib/ctypes/util.py

     

       5
       5
       +
       @@ -207,31 +207,7 @@ elif os.name == "posix":

     

       5
       6
        
            else:

     

       6
       7
        
        

     

       7
       8
        
                def _findSoname_ldconfig(name):

     
···

       21
       22
        
       -

     

       22
       23
        
       -            # XXX assuming GLIBC's ldconfig (with option -p)

     

       23
       24
        
       -            expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)

     

       24
       24
       -
       -            f = os.popen('/sbin/ldconfig -p 2>/dev/null')

     

       25
       25
       +
       -            f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')

     

       25
       26
        
       -            try:

     

       26
       27
        
       -                data = f.read()

     

       27
       28
        
       -            finally:

     
···

       34
       35
        
        

     

       35
       36
        
                def find_library(name):

     

       36
       37
        
                    return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))

     

       37
       37
       -
       diff -ru -x '*~' Python-2.7.11-orig/Lib/uuid.py Python-2.7.11/Lib/uuid.py

     

       38
       38
       -
       --- Python-2.7.11-orig/Lib/uuid.py	2015-12-05 20:47:09.000000000 +0100

     

       39
       39
       -
       +++ Python-2.7.11/Lib/uuid.py	2016-07-01 14:33:14.360446897 +0200

     

       40
       40
       -
       @@ -437,57 +437,7 @@

     

       38
       38
       +
       diff --git a/Lib/uuid.py b/Lib/uuid.py

     

       39
       39
       +
       index 7432032..9829d18 100644

     

       40
       40
       +
       --- a/Lib/uuid.py

     

       41
       41
       +
       +++ b/Lib/uuid.py

     

       42
       42
       +
       @@ -437,57 +437,7 @@ def _netbios_getnode():

     

       41
       43
        
                return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +

     

       42
       44
        
                        (bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])

     

       43
       45

pkgs/development/interpreters/python/3.3/default.nix

···

       2
       2
        
       , bzip2

     

       3
       3
        
       , db

     

       4
       4
        
       , gdbm

     

       5
       5
       +
       , less

     

       5
       6
        
       , libX11, xproto

     

       6
       7
        
       , lzma

     

       7
       8
        
       , ncurses

     
···

       27
       28
        
         buildInputs = filter (p: p != null) [

     

       28
       29
        
           zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto

     

       29
       30
        
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           less

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       30
       36
        
       in

     

       31
       37
        
       stdenv.mkDerivation {

     

       32
       38
        
         name = "python3-${version}";

     
···

       34
       40
        
         inherit majorVersion version;

     

       35
       41
        
       

     

       36
       42
        
         inherit buildInputs;

     

       43
       43
       +
         inherit propagatedBuildInputs;

     

       37
       44
        
       

     

       38
       45
        
         src = fetchurl {

     

       39
       46
        
           url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";

pkgs/development/interpreters/python/3.4/default.nix

···

       2
       2
        
       , bzip2

     

       3
       3
        
       , db

     

       4
       4
        
       , gdbm

     

       5
       5
       +
       , less

     

       5
       6
        
       , libX11, xproto

     

       6
       7
        
       , lzma

     

       7
       8
        
       , ncurses

     
···

       42
       43
        
           libX11

     

       43
       44
        
           xproto

     

       44
       45
        
         ] ++ optionals stdenv.isDarwin [ CF configd ];

     

       46
       46
       +
       

     

       47
       47
       +
         propagatedBuildInputs = [

     

       48
       48
       +
           less

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       45
       51
        
       in

     

       46
       52
        
       stdenv.mkDerivation {

     

       47
       53
        
         name = "python3-${fullVersion}";

     
···

       49
       55
        
         inherit majorVersion version;

     

       50
       56
        
       

     

       51
       57
        
         inherit buildInputs;

     

       58
       58
       +
         inherit propagatedBuildInputs;

     

       52
       59
        
       

     

       53
       60
        
         src = fetchurl {

     

       54
       61
        
           url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";

pkgs/development/interpreters/python/3.5/default.nix

···

       2
       2
        
       , bzip2

     

       3
       3
        
       , db

     

       4
       4
        
       , gdbm

     

       5
       5
       +
       , less

     

       5
       6
        
       , libX11, xproto

     

       6
       7
        
       , lzma

     

       7
       8
        
       , ncurses

     
···

       42
       43
        
           libX11

     

       43
       44
        
           xproto

     

       44
       45
        
         ] ++ optionals stdenv.isDarwin [ CF configd ];

     

       46
       46
       +
       

     

       47
       47
       +
         propagatedBuildInputs = [

     

       48
       48
       +
           less

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       45
       51
        
       in

     

       46
       52
        
       stdenv.mkDerivation {

     

       47
       53
        
         name = "python3-${fullVersion}";

     
···

       49
       55
        
         inherit majorVersion version;

     

       50
       56
        
       

     

       51
       57
        
         inherit buildInputs;

     

       58
       58
       +
         inherit propagatedBuildInputs;

     

       52
       59
        
       

     

       53
       60
        
         src = fetchurl {

     

       54
       61
        
           url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";

+145

pkgs/development/interpreters/python/3.6/default.nix

···

       1
       1
       +
       { stdenv, fetchurl

     

       2
       2
       +
       , glibc

     

       3
       3
       +
       , bzip2

     

       4
       4
       +
       , db

     

       5
       5
       +
       , gdbm

     

       6
       6
       +
       , less

     

       7
       7
       +
       , libX11, xproto

     

       8
       8
       +
       , lzma

     

       9
       9
       +
       , ncurses

     

       10
       10
       +
       , openssl

     

       11
       11
       +
       , readline

     

       12
       12
       +
       , sqlite

     

       13
       13
       +
       , tcl, tk

     

       14
       14
       +
       , zlib

     

       15
       15
       +
       , callPackage

     

       16
       16
       +
       , self

     

       17
       17
       +
       , python36Packages

     

       18
       18
       +
       

     

       19
       19
       +
       , CF, configd

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       assert readline != null -> ncurses != null;

     

       23
       23
       +
       

     

       24
       24
       +
       with stdenv.lib;

     

       25
       25
       +
       

     

       26
       26
       +
       let

     

       27
       27
       +
         majorVersion = "3.6";

     

       28
       28
       +
         pythonVersion = majorVersion;

     

       29
       29
       +
         version = "${majorVersion}.0a3";

     

       30
       30
       +
         fullVersion = "${version}";

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = filter (p: p != null) [

     

       33
       33
       +
           glibc

     

       34
       34
       +
           zlib

     

       35
       35
       +
           bzip2

     

       36
       36
       +
           lzma

     

       37
       37
       +
           gdbm

     

       38
       38
       +
           sqlite

     

       39
       39
       +
           db

     

       40
       40
       +
           readline

     

       41
       41
       +
           ncurses

     

       42
       42
       +
           openssl

     

       43
       43
       +
           tcl

     

       44
       44
       +
           tk

     

       45
       45
       +
           libX11

     

       46
       46
       +
           xproto

     

       47
       47
       +
         ] ++ optionals stdenv.isDarwin [ CF configd ];

     

       48
       48
       +
       

     

       49
       49
       +
         propagatedBuildInputs = [

     

       50
       50
       +
           less

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
       in

     

       54
       54
       +
       stdenv.mkDerivation {

     

       55
       55
       +
         name = "python3-${fullVersion}";

     

       56
       56
       +
         pythonVersion = majorVersion;

     

       57
       57
       +
         inherit majorVersion version;

     

       58
       58
       +
       

     

       59
       59
       +
         inherit buildInputs;

     

       60
       60
       +
         inherit propagatedBuildInputs;

     

       61
       61
       +
       

     

       62
       62
       +
         src = fetchurl {

     

       63
       63
       +
           url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz";

     

       64
       64
       +
           sha256 = "08c3598bwihibwca9lwxq923sjq9shvgv3wxv4vkga2n6hf63l1c";

     

       65
       65
       +
         };

     

       66
       66
       +
       

     

       67
       67
       +
         NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

     

       68
       68
       +
       

     

       69
       69
       +
         prePatch = optionalString stdenv.isDarwin ''

     

       70
       70
       +
           substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'

     

       71
       71
       +
         '';

     

       72
       72
       +
       

     

       73
       73
       +
         preConfigure = ''

     

       74
       74
       +
           for i in /usr /sw /opt /pkg; do	# improve purity

     

       75
       75
       +
             substituteInPlace ./setup.py --replace $i /no-such-path

     

       76
       76
       +
           done

     

       77
       77
       +
           ${optionalString stdenv.isDarwin ''

     

       78
       78
       +
              export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"

     

       79
       79
       +
              export MACOSX_DEPLOYMENT_TARGET=10.6

     

       80
       80
       +
            ''}

     

       81
       81
       +
       

     

       82
       82
       +
           substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc}/include

     

       83
       83
       +
       

     

       84
       84
       +
           configureFlagsArray=( --enable-shared --with-threads

     

       85
       85
       +
                                 CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"

     

       86
       86
       +
                                 LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"

     

       87
       87
       +
                                 LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"

     

       88
       88
       +
                               )

     

       89
       89
       +
         '';

     

       90
       90
       +
       

     

       91
       91
       +
         setupHook = ./setup-hook.sh;

     

       92
       92
       +
       

     

       93
       93
       +
         postInstall = ''

     

       94
       94
       +
           # needed for some packages, especially packages that backport functionality

     

       95
       95
       +
           # to 2.x from 3.x

     

       96
       96
       +
           for item in $out/lib/python${majorVersion}/test/*; do

     

       97
       97
       +
             if [[ "$item" != */test_support.py* ]]; then

     

       98
       98
       +
               rm -rf "$item"

     

       99
       99
       +
             else

     

       100
       100
       +
               echo $item

     

       101
       101
       +
             fi

     

       102
       102
       +
           done

     

       103
       103
       +
           touch $out/lib/python${majorVersion}/test/__init__.py

     

       104
       104
       +
       

     

       105
       105
       +
           ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"

     

       106
       106
       +
           paxmark E $out/bin/python${majorVersion}

     

       107
       107
       +
         '';

     

       108
       108
       +
       

     

       109
       109
       +
         passthru = rec {

     

       110
       110
       +
           zlibSupport = zlib != null;

     

       111
       111
       +
           sqliteSupport = sqlite != null;

     

       112
       112
       +
           dbSupport = db != null;

     

       113
       113
       +
           readlineSupport = readline != null;

     

       114
       114
       +
           opensslSupport = openssl != null;

     

       115
       115
       +
           tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);

     

       116
       116
       +
           libPrefix = "python${majorVersion}";

     

       117
       117
       +
           executable = "python${majorVersion}m";

     

       118
       118
       +
           buildEnv = callPackage ../wrapper.nix { python = self; };

     

       119
       119
       +
           withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; };

     

       120
       120
       +
           isPy3 = true;

     

       121
       121
       +
           isPy35 = true;

     

       122
       122
       +
           is_py3k = true;  # deprecated

     

       123
       123
       +
           sitePackages = "lib/${libPrefix}/site-packages";

     

       124
       124
       +
           interpreter = "${self}/bin/${executable}";

     

       125
       125
       +
         };

     

       126
       126
       +
       

     

       127
       127
       +
         enableParallelBuilding = true;

     

       128
       128
       +
       

     

       129
       129
       +
         meta = {

     

       130
       130
       +
           homepage = http://python.org;

     

       131
       131
       +
           description = "A high-level dynamically-typed programming language";

     

       132
       132
       +
           longDescription = ''

     

       133
       133
       +
             Python is a remarkably powerful dynamic programming language that

     

       134
       134
       +
             is used in a wide variety of application domains. Some of its key

     

       135
       135
       +
             distinguishing features include: clear, readable syntax; strong

     

       136
       136
       +
             introspection capabilities; intuitive object orientation; natural

     

       137
       137
       +
             expression of procedural code; full modularity, supporting

     

       138
       138
       +
             hierarchical packages; exception-based error handling; and very

     

       139
       139
       +
             high level dynamic data types.

     

       140
       140
       +
           '';

     

       141
       141
       +
           license = licenses.psfl;

     

       142
       142
       +
           platforms = with platforms; linux ++ darwin;

     

       143
       143
       +
           maintainers = with maintainers; [ chaoflow domenkozar cstrahan kragniz ];

     

       144
       144
       +
         };

     

       145
       145
       +
       }

+15

pkgs/development/interpreters/python/3.6/setup-hook.sh

···

       1
       1
       +
       addPythonPath() {

     

       2
       2
       +
           addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.6/site-packages

     

       3
       3
       +
       }

     

       4
       4
       +
       

     

       5
       5
       +
       toPythonPath() {

     

       6
       6
       +
           local paths="$1"

     

       7
       7
       +
           local result=

     

       8
       8
       +
           for i in $paths; do

     

       9
       9
       +
               p="$i/lib/python3.6/site-packages"

     

       10
       10
       +
               result="${result}${result:+:}$p"

     

       11
       11
       +
           done

     

       12
       12
       +
           echo $result

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       envHooks+=(addPythonPath)

+13 -10

pkgs/development/libraries/appstream-glib/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, glib

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib

     

       2
       2
        
       , gtk_doc, autoconf, automake, libtool, libarchive, libyaml

     

       3
       3
        
       , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl

     

       4
       4
       +
       , libuuid, json_glib

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "appstream-glib-0.3.6";

     

       8
       8
       +
         name = "appstream-glib-0.5.11";

     

       8
       9
        
       

     

       9
       9
       -
         src = fetchurl {

     

       10
       10
       -
           url = "https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_3_6.tar.gz";

     

       11
       11
       -
           sha256 = "1zdxg9dk9vxw2cs04cswd138di3dysz0hxk4918750hh19s3859c";

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "hughsie";

     

       12
       12
       +
           repo = "appstream-glib";

     

       13
       13
       +
           rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;

     

       14
       14
       +
           sha256 = "1rvfncm9z29h70pd718j73cd263g6yyxkxrg7zfzy0gj6wwzvhkh";

     

       12
       15
        
         };

     

       13
       16
        
       

     

       14
       14
       -
         buildInputs = [ glib libtool pkgconfig gtk_doc gettext intltool sqlite libsoup

     

       15
       15
       -
                         gcab attr acl docbook_xsl

     

       16
       16
       -
                         libarchive libyaml gtk3 autoconf automake gobjectIntrospection ];

     

       17
       17
       +
         nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ];

     

       18
       18
       +
         buildInputs = [ glib gtk_doc gettext sqlite libsoup

     

       19
       19
       +
                         gcab attr acl docbook_xsl libuuid json_glib

     

       20
       20
       +
                         libarchive libyaml gtk3 gobjectIntrospection ];

     

       17
       21
        
       

     

       18
       22
        
         configureScript = "./autogen.sh";

     

       19
       23
        
       

     
···

       22
       26
        
           homepage    = https://github.com/hughsie/appstream-glib;

     

       23
       27
        
           license     = licenses.lgpl21Plus;

     

       24
       28
        
           platforms   = platforms.linux;

     

       25
       25
       -
           maintainers = with maintainers; [ lethalman ];

     

       29
       29
       +
           maintainers = with maintainers; [ lethalman matthewbauer ];

     

       26
       30
        
         };

     

       27
       27
       -
       

     

       28
       31
        
       }

+6 -3

pkgs/development/libraries/fltk/default.nix

···

       1
       1
        
       { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi

     

       2
       2
        
       , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng

     

       3
       3
        
       , cfg ? {}

     

       4
       4
       +
       , darwin, libtiff, freetype

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       let inherit (composableDerivation) edf; in

     
···

       21
       22
        
         '';

     

       22
       23
        
       

     

       23
       24
        
         nativeBuildInputs = [ pkgconfig ];

     

       24
       24
       -
         propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];

     

       25
       25
       +
         propagatedBuildInputs = [ inputproto ]

     

       26
       26
       +
           ++ (if stdenv.isDarwin

     

       27
       27
       +
               then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff])

     

       28
       28
       +
               else [ xlibsWrapper libXi freeglut ]);

     

       25
       29
        
       

     

       26
       30
        
         enableParallelBuilding = true;

     

       27
       31
        
       

     
···

       55
       59
        
         meta = {

     

       56
       60
        
           description = "A C++ cross-platform lightweight GUI library";

     

       57
       61
        
           homepage = http://www.fltk.org;

     

       58
       58
       -
           platforms = stdenv.lib.platforms.linux;

     

       62
       62
       +
           platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       59
       63
        
           license = stdenv.lib.licenses.gpl2;

     

       60
       64
        
         };

     

       61
       65
        
       

     

       62
       66
        
       }

     

       63
       63
       -

pkgs/development/libraries/fontconfig/default.nix

···

       68
       68
        
           cd "$out/etc/fonts"

     

       69
       69
        
           rm conf.d/{50-user,51-local}.conf

     

       70
       70
        
           "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \

     

       71
       71
       +
             --stringparam fontconfig "$out" \

     

       71
       72
        
             --stringparam fontconfigConfigVersion "${configVersion}" \

     

       72
       73
        
             --path $out/share/xml/fontconfig \

     

       73
       74
        
             ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \

pkgs/development/libraries/fontconfig/make-fonts-conf.xsl

···

       28
       28
        
             <!-- /var/cache/fontconfig is useful for non-nixos systems -->

     

       29
       29
        
             <cachedir>/var/cache/fontconfig</cachedir>

     

       30
       30
        
       

     

       31
       31
       +
             <!-- fontconfig distribution conf.d -->

     

       32
       32
       +
             <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>

     

       31
       33
        
             <!-- versioned system-wide config -->

     

       32
       34
        
             <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include>

     

       33
       35

+5 -1

pkgs/development/libraries/libinput/default.nix

···

       3
       3
        
       , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation

     

       4
       4
        
       , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support

     

       5
       5
        
       , testsSupport ? false, check ? null, valgrind ? null

     

       6
       6
       +
       , autoconf, automake

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       assert documentationSupport -> doxygen != null && graphviz != null;

     
···

       32
       33
        
       

     

       33
       34
        
         nativeBuildInputs = [ pkgconfig ];

     

       34
       35
        
       

     

       35
       35
       -
         buildInputs = [ libevdev mtdev libwacom ]

     

       36
       36
       +
         buildInputs = [ libevdev mtdev libwacom autoconf automake ]

     

       36
       37
        
           ++ optionals eventGUISupport [ cairo glib gtk3 ]

     

       37
       38
        
           ++ optionals documentationSupport [ doxygen graphviz ]

     

       38
       39
        
           ++ optionals testsSupport [ check valgrind ];

     

       39
       40
        
       

     

       40
       41
        
         propagatedBuildInputs = [ udev ];

     

       42
       42
       +
       

     

       43
       43
       +
         patches = [ ./udev-absolute-path.patch ];

     

       44
       44
       +
         patchFlags = [ "-p0" ];

     

       41
       45
        
       

     

       42
       46
        
         meta = {

     

       43
       47
        
           description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";

+12

pkgs/development/libraries/libinput/udev-absolute-path.patch

···

       1
       1
       +
       --- configure.ac	2016-05-27 14:00:25.248388226 +0200

     

       2
       2
       +
       +++ configure.ac	2016-05-27 14:01:28.228943416 +0200

     

       3
       3
       +
       @@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil

     

       4
       4
       +
        # Used by the udev rules so we can use callouts during testing without

     

       5
       5
       +
        # installing everything first. Default is the empty string so the installed

     

       6
       6
       +
        # rule will use udev's default path. Override is in udev/Makefile.am

     

       7
       7
       +
       -AC_SUBST(UDEV_TEST_PATH, "")

     

       8
       8
       +
       +UDEV_TEST_PATH="${UDEV_DIR}/"

     

       9
       9
       +
       +AC_SUBST(UDEV_TEST_PATH)

     

       10
       10
       +
        AC_PATH_PROG(SED, [sed])

     

       11
       11
       +
        

     

       12
       12
       +
        AC_CONFIG_FILES([Makefile

+36

pkgs/development/libraries/libjpeg-drop/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, static ? true }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         name = "libjpeg-drop-9b";

     

       7
       7
       +
       

     

       8
       8
       +
         srcs = [

     

       9
       9
       +
           (fetchurl {

     

       10
       10
       +
             url = http://www.ijg.org/files/jpegsrc.v9b.tar.gz;

     

       11
       11
       +
             sha256 = "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4";

     

       12
       12
       +
           })

     

       13
       13
       +
           (fetchurl {

     

       14
       14
       +
             url = http://jpegclub.org/droppatch.v9b.tar.gz;

     

       15
       15
       +
             sha256 = "022bnvpird7w5pwbfqpq7j7pwja5kp6x9k3sdypcy3g2nwwy2wwk";

     

       16
       16
       +
           })

     

       17
       17
       +
         ];

     

       18
       18
       +
       

     

       19
       19
       +
         postUnpack = ''

     

       20
       20
       +
           rm jpegtran

     

       21
       21
       +
           mv jpegtran.c jpeg-9b/jpegtran.c

     

       22
       22
       +
           mv transupp.c jpeg-9b/transupp.c

     

       23
       23
       +
           mv transupp.h jpeg-9b/transupp.h

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         configureFlags = []

     

       27
       27
       +
           ++ optional static [ "--enable-static" "--disable-shared" ];

     

       28
       28
       +
       

     

       29
       29
       +
         outputs = [ "dev" "out" "man" "bin" ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = {

     

       32
       32
       +
           homepage = http://jpegclub.org/jpegtran/;

     

       33
       33
       +
           description = "Experimental lossless crop 'n' drop (cut & paste) patches for libjpeg";

     

       34
       34
       +
           license = stdenv.lib.licenses.free;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+2 -2

pkgs/development/libraries/libmediainfo/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.7.86";

     

       4
       4
       +
         version = "0.7.87";

     

       5
       5
        
         name = "libmediainfo-${version}";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";

     

       8
       8
       -
           sha256 = "14m7cgd93mglc9a4x28pb4yc6nfxhqk7vfryca83vpn80la1lxy0";

     

       8
       8
       +
           sha256 = "1gvjvc809mrhpcqr62cihhc6jnwml197xjbgydnzvsghih8dq8s9";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

+2 -2

pkgs/development/libraries/libmsgpack/default.nix

···

       1
       1
        
       { callPackage, fetchFromGitHub, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       callPackage ./generic.nix (args // rec {

     

       4
       4
       -
         version = "1.1.0";

     

       4
       4
       +
         version = "2.0.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "msgpack";

     

       8
       8
        
           repo = "msgpack-c";

     

       9
       9
        
           rev = "cpp-${version}";

     

       10
       10
       -
           sha256 = "1hnpnin6gjiilbzfd75871kamfn9grrf53qpbs061sflvz56fddq";

     

       10
       10
       +
           sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7";

     

       11
       11
        
         };

     

       12
       12
        
       })

+1 -1

pkgs/development/libraries/libtomcrypt/default.nix

···

       4
       4
        
         name = "libtomcrypt-1.17";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = "http://libtom.org/files/crypt-1.17.tar.bz2";

     

       7
       7
       +
           url = "https://github.com/libtom/libtomcrypt/releases/download/1.17/crypt-1.17.tar.bz2";

     

       8
       8
        
           sha256 = "e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116";

     

       9
       9
        
         };

     

       10
       10

+3 -3

pkgs/development/libraries/libtommath/default.nix

···

       1
       1
        
       {stdenv, fetchurl, libtool}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "libtommath-0.39";

     

       4
       4
       +
         name = "libtommath-1.0";

     

       5
       5
        
         

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = http://math.libtomcrypt.com/files/ltm-0.39.tar.bz2;

     

       8
       8
       -
           sha256 = "1kjx8rrw62nanzc5qp8fj6r3ybhw8ca60ahkyb70f10aiij49zs2";

     

       7
       7
       +
           url = https://github.com/libtom/libtommath/releases/download/v1.0/ltm-1.0.tar.xz;

     

       8
       8
       +
           sha256 = "0v5mpd8zqjfs2hr900w1mxifz23xylyjdqyx1i1wl7q9xvwpsflr";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [libtool];

+25

pkgs/development/libraries/libui/default.nix

···

       1
       1
       +
       { stdenv, fetchgit, cmake, pkgconfig, gtk3 }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "3.1.a";

     

       5
       5
       +
         name = "libui-${version}";

     

       6
       6
       +
         src  = fetchgit {

     

       7
       7
       +
           url    = "https://github.com/andlabs/libui.git";

     

       8
       8
       +
           rev    = "6ebdc96b93273c3cedf81159e7843025caa83058";

     

       9
       9
       +
           sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ cmake pkgconfig gtk3 ];

     

       13
       13
       +
       

     

       14
       14
       +
         installPhase = ''

     

       15
       15
       +
           mkdir -p $out

     

       16
       16
       +
           mv ./out/libui.so.0 $out/libui.so.0

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports.";

     

       21
       21
       +
           homepage    = https://github.com/andlabs/libui;

     

       22
       22
       +
           platforms   = platforms.linux;

     

       23
       23
       +
           license     = licenses.mit;

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+4 -5

pkgs/development/libraries/ncurses/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, pkgconfig

     

       2
       2
        
       

     

       3
       3
       +
       , abiVersion

     

       3
       4
        
       , mouseSupport ? false

     

       4
       5
        
       , unicode ? true

     

       5
       6
        
       

     

       6
       7
        
       , gpm

     

       7
       8
        
       }:

     

       8
       9
        
       let

     

       9
       9
       -
         inherit (stdenv) isDarwin;

     

       10
       10
       -
         abiVersion = if isDarwin then "5" else "6";

     

       11
       11
       -
         version = if isDarwin then "5.9" else "6.0";

     

       12
       12
       -
         sha256 = if isDarwin

     

       10
       10
       +
         version = if abiVersion == "5" then "5.9" else "6.0";

     

       11
       11
       +
         sha256 = if abiVersion == "5"

     

       13
       12
        
           then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"

     

       14
       13
        
           else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";

     

       15
       14
        
       in

     
···

       21
       20
        
           inherit sha256;

     

       22
       21
        
         };

     

       23
       22
        
       

     

       24
       24
       -
         patches = [ ./clang.patch ];

     

       23
       23
       +
         patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;

     

       25
       24
        
       

     

       26
       25
        
         outputs = [ "dev" "out" "man" ];

     

       27
       26
        
         setOutputFlags = false; # some aren't supported

+46

pkgs/development/libraries/ncurses/gcc-5.patch

···

       1
       1
       +
       https://bugs.gentoo.org/545114

     

       2
       2
       +
       

     

       3
       3
       +
       extracted from the upstream change (which had many unrelated commits in one)

     

       4
       4
       +
       

     

       5
       5
       +
       From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001

     

       6
       6
       +
       From: "Thomas E. Dickey" <dickey@invisible-island.net>

     

       7
       7
       +
       Date: Sun, 7 Dec 2014 03:10:09 +0000

     

       8
       8
       +
       Subject: [PATCH] ncurses 5.9 - patch 20141206

     

       9
       9
       +
       

     

       10
       10
       +
       + modify MKlib_gen.sh to work around change in development version of

     

       11
       11
       +
         gcc introduced here:

     

       12
       12
       +
       	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html

     

       13
       13
       +
       	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html

     

       14
       14
       +
         (reports by Marcus Shawcroft, Maohui Lei).

     

       15
       15
       +
       

     

       16
       16
       +
       diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh

     

       17
       17
       +
       index d8cc3c9..b91398c 100755

     

       18
       18
       +
       --- a/ncurses/base/MKlib_gen.sh

     

       19
       19
       +
       +++ b/ncurses/base/MKlib_gen.sh

     

       20
       20
       +
       @@ -474,11 +474,22 @@ sed -n -f $ED1 \

     

       21
       21
       +
        	-e 's/gen_$//' \

     

       22
       22
       +
        	-e 's/  / /g' >>$TMP

     

       23
       23
       +
        

     

       24
       24
       +
       +cat >$ED1 <<EOF

     

       25
       25
       +
       +s/  / /g

     

       26
       26
       +
       +s/^ //

     

       27
       27
       +
       +s/ $//

     

       28
       28
       +
       +s/P_NCURSES_BOOL/NCURSES_BOOL/g

     

       29
       29
       +
       +EOF

     

       30
       30
       +
       +

     

       31
       31
       +
       +# A patch discussed here:

     

       32
       32
       +
       +#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html

     

       33
       33
       +
       +# introduces spurious #line markers.  Work around that by ignoring the system's

     

       34
       34
       +
       +# attempt to define "bool" and using our own symbol here.

     

       35
       35
       +
       +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2

     

       36
       36
       +
       +cat $ED2 >$TMP

     

       37
       37
       +
       +

     

       38
       38
       +
        $preprocessor $TMP 2>/dev/null \

     

       39
       39
       +
       -| sed \

     

       40
       40
       +
       -	-e 's/  / /g' \

     

       41
       41
       +
       -	-e 's/^ //' \

     

       42
       42
       +
       -	-e 's/_Bool/NCURSES_BOOL/g' \

     

       43
       43
       +
       +| sed -f $ED1 \

     

       44
       44
       +
        | $AWK -f $AW2 \

     

       45
       45
       +
        | sed -f $ED3 \

     

       46
       46
       +
        | sed \

+3 -1

pkgs/development/libraries/qrupdate/default.nix

···

       28
       28
        
       

     

       29
       29
        
         buildFlags = [ "lib" "solib" ];

     

       30
       30
        
       

     

       31
       31
       -
         installTargets = "install";

     

       31
       31
       +
         installTargets = if stdenv.isDarwin

     

       32
       32
       +
                          then ["install-staticlib" "install-shlib"]

     

       33
       33
       +
                          else "install";

     

       32
       34
        
       

     

       33
       35
        
         buildInputs = [ gfortran openblas ];

     

       34
       36
        
       }

+6 -6

pkgs/development/libraries/qt-3/default.nix

···

       25
       25
        
         setupHook = ./setup-hook.sh;

     

       26
       26
        
       

     

       27
       27
        
         src = fetchurl {

     

       28
       28
       -
           url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2;

     

       28
       28
       +
           url = http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2;

     

       29
       29
        
           sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";

     

       30
       30
        
         };

     

       31
       31
        
       

     
···

       41
       41
        
           -I${xextproto}/include

     

       42
       42
        
           ${if openglSupport then "-dlopen-opengl

     

       43
       43
        
             -L${mesa}/lib -I${mesa}/include

     

       44
       44
       -
             -L${libXmu}/lib -I${libXmu}/include" else ""}

     

       44
       44
       +
             -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""}

     

       45
       45
        
           ${if threadSupport then "-thread" else "-no-thread"}

     

       46
       46
       -
           ${if xrenderSupport then "-xrender -L${libXrender}/lib -I${libXrender}/include" else "-no-xrender"}

     

       46
       46
       +
           ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"}

     

       47
       47
        
           ${if xrandrSupport then "-xrandr

     

       48
       48
       -
             -L${libXrandr}/lib -I${libXrandr}/include

     

       48
       48
       +
             -L${libXrandr.out}/lib -I${libXrandr.dev}/include

     

       49
       49
        
             -I${randrproto}/include" else "-no-xrandr"}

     

       50
       50
       -
           ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"}

     

       51
       51
       -
           ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}

     

       50
       50
       +
           ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"}

     

       51
       51
       +
           ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""}

     

       52
       52
        
           ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}

     

       53
       53
        
           ${if xftSupport then "-xft

     

       54
       54
        
             -L${libXft.out}/lib -I${libXft.dev}/include

+12 -14

pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh

···

       2
       2
        
           local prog="$1"

     

       3
       3
        
           shift

     

       4
       4
        
           wrapProgram "$prog" \

     

       5
       5
       -
               --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \

     

       6
       6
       -
               --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \

     

       7
       7
       -
               --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \

     

       8
       8
       -
               --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \

     

       9
       9
       -
               --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \

     

       5
       5
       +
               --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \

     

       6
       6
       +
               --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \

     

       7
       7
       +
               --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \

     

       8
       8
       +
               --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \

     

       9
       9
       +
               --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \

     

       10
       10
        
               "$@"

     

       11
       11
        
       }

     

       12
       12
        
       

     
···

       16
       16
        
           shift

     

       17
       17
        
           shift

     

       18
       18
        
           makeWrapper "$old" "$new" \

     

       19
       19
       -
               --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \

     

       20
       20
       -
               --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \

     

       21
       21
       -
               --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \

     

       22
       22
       -
               --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \

     

       23
       23
       -
               --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \

     

       19
       19
       +
               --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \

     

       20
       20
       +
               --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \

     

       21
       21
       +
               --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \

     

       22
       22
       +
               --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \

     

       23
       23
       +
               --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \

     

       24
       24
        
               "$@"

     

       25
       25
        
       }

     

       26
       26
        
       

     
···

       29
       29
        
           export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"

     

       30
       30
        
           export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"

     

       31
       31
        
           export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"

     

       32
       32
       -
           export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"

     

       33
       33
       -
           export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"

     

       34
       34
       -
           export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"

     

       35
       35
       -
           export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share"

     

       32
       32
       +
           export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share"

     

       33
       33
       +
           export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"

     

       36
       34
        
       }

     

       37
       35
        
       

     

       38
       36
        
       prePhases+=(_makeQtWrapperSetup)

+13 -91

pkgs/development/libraries/qt-5/5.5/qmake-hook.sh

···

       1
       1
       -
       if [[ -z "$QMAKE" ]]; then

     

       2
       2
       -
       

     

       3
       3
       -
       _qtLinkDependencyDir() {

     

       4
       4
       -
           @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2"

     

       5
       5
       -
           if [ -n "$NIX_QT_SUBMODULE" ]; then

     

       6
       6
       -
               find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs"

     

       7
       7
       -
           fi

     

       8
       8
       -
       }

     

       9
       9
       -
       

     

       10
       10
       -
       _qtLinkModule() {

     

       11
       11
       -
           if [ -d "$1/mkspecs" ]; then

     

       12
       12
       -
               # $1 is a Qt module

     

       13
       13
       -
               _qtLinkDependencyDir "$1" mkspecs

     

       14
       14
       -
       

     

       15
       15
       -
               for dir in bin include lib share; do

     

       16
       16
       -
                   if [ -d "$1/$dir" ]; then

     

       17
       17
       -
                       _qtLinkDependencyDir "$1" "$dir"

     

       18
       18
       -
                   fi

     

       19
       19
       -
               done

     

       20
       20
       -
           fi

     

       21
       21
       -
       }

     

       22
       22
       -
       

     

       23
       23
       -
       _qtRmModules() {

     

       24
       24
       -
           cat "$out/nix-support/qt-inputs" | while read file; do

     

       25
       25
       -
             if [ -h "$out/$file" ]; then

     

       26
       26
       -
               rm "$out/$file"

     

       27
       27
       -
             fi

     

       28
       28
       -
           done

     

       1
       1
       +
       qmakeConfigurePhase() {

     

       2
       2
       +
           runHook preConfigure

     

       29
       3
        
       

     

       30
       30
       -
           cat "$out/nix-support/qt-inputs" | while read file; do

     

       31
       31
       -
             if [ -d "$out/$file" ]; then

     

       32
       32
       -
               rmdir --ignore-fail-on-non-empty -p "$out/$file"

     

       33
       33
       -
             fi

     

       34
       34
       -
           done

     

       35
       35
       -
       

     

       36
       36
       -
           rm "$out/nix-support/qt-inputs"

     

       37
       37
       -
       }

     

       4
       4
       +
           qmake PREFIX=$out $qmakeFlags

     

       38
       5
        
       

     

       39
       39
       -
       _qtRmQmake() {

     

       40
       40
       -
           rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"

     

       6
       6
       +
           runHook postConfigure

     

       41
       7
        
       }

     

       42
       8
        
       

     

       43
       43
       -
       _qtSetQmakePath() {

     

       44
       44
       -
           export PATH="$qtOut/bin${PATH:+:}$PATH"

     

       45
       45
       -
       }

     

       9
       9
       +
       if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then

     

       10
       10
       +
           configurePhase=qmakeConfigurePhase

     

       11
       11
       +
       fi

     

       46
       12
        
       

     

       47
       47
       -
       _qtMultioutModuleDevs() {

     

       13
       13
       +
       _qtModuleMultioutDevsPre() {

     

       48
       14
        
           # We cannot simply set these paths in configureFlags because libQtCore retains

     

       49
       15
        
           # references to the paths it was built with.

     

       50
       16
        
           moveToOutput "bin" "${!outputDev}"

     
···

       53
       19
        
           # The destination directory must exist or moveToOutput will do nothing

     

       54
       20
        
           mkdir -p "${!outputDev}/share"

     

       55
       21
        
           moveToOutput "share/doc" "${!outputDev}"

     

       22
       22
       +
       }

     

       56
       23
        
       

     

       24
       24
       +
       _qtModuleMultioutDevsPost() {

     

       57
       25
        
           # Move libtool archives and qmake project files to $dev/lib

     

       58
       26
        
           if [ "z${!outputLib}" != "z${!outputDev}" ]; then

     

       59
       27
        
               pushd "${!outputLib}"

     

       60
       28
        
               if [ -d "lib" ]; then

     

       61
       61
       -
                   find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 \) | \

     

       29
       29
       +
                   find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \

     

       62
       30
        
                       while read -r -d $'\0' file; do

     

       63
       31
        
                           mkdir -p "${!outputDev}/$(dirname "$file")"

     

       64
       32
        
                           mv "${!outputLib}/$file" "${!outputDev}/$file"

     
···

       68
       36
        
           fi

     

       69
       37
        
       }

     

       70
       38
        
       

     

       71
       71
       -
       _qtRmQtOut() {

     

       72
       72
       -
           rm -fr "$qtOut"

     

       73
       73
       -
       }

     

       74
       74
       -
       

     

       75
       75
       -
       qmakeConfigurePhase() {

     

       76
       76
       -
           runHook preConfigure

     

       77
       77
       -
       

     

       78
       78
       -
           qmake PREFIX=$out $qmakeFlags

     

       79
       79
       -
       

     

       80
       80
       -
           runHook postConfigure

     

       81
       81
       -
       }

     

       82
       82
       -
       

     

       83
       83
       -
       qtOut=""

     

       84
       84
       -
       if [[ -z "$NIX_QT_SUBMODULE" ]]; then

     

       85
       85
       -
           qtOut=`mktemp -d`

     

       86
       86
       -
       else

     

       87
       87
       -
           qtOut=$out

     

       88
       88
       -
       fi

     

       89
       89
       -
       

     

       90
       90
       -
       mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"

     

       91
       91
       -
       

     

       92
       92
       -
       cp "@qt_dev@/bin/qmake" "$qtOut/bin"

     

       93
       93
       -
       cat >"$qtOut/bin/qt.conf" <<EOF

     

       94
       94
       -
       [Paths]

     

       95
       95
       -
       Prefix = $qtOut

     

       96
       96
       -
       Plugins = lib/qt5/plugins

     

       97
       97
       -
       Imports = lib/qt5/imports

     

       98
       98
       -
       Qml2Imports = lib/qt5/qml

     

       99
       99
       -
       Documentation = share/doc/qt5

     

       100
       100
       -
       EOF

     

       101
       101
       -
       

     

       102
       102
       -
       export QMAKE="$qtOut/bin/qmake"

     

       103
       103
       -
       

     

       104
       104
       -
       envHooks+=(_qtLinkModule)

     

       105
       105
       -
       # Set PATH to find qmake first in a preConfigure hook

     

       106
       106
       -
       # It must run after all the envHooks!

     

       107
       107
       -
       postHooks+=(_qtSetQmakePath)

     

       108
       108
       -
       

     

       109
       109
       -
       if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then

     

       110
       110
       -
           configurePhase=qmakeConfigurePhase

     

       111
       111
       -
       fi

     

       112
       112
       -
       

     

       113
       39
        
       if [ -n "$NIX_QT_SUBMODULE" ]; then

     

       114
       114
       -
           postInstallHooks+=(_qtRmQmake _qtRmModules)

     

       115
       115
       -
           preFixupHooks+=(_qtMultioutModuleDevs)

     

       116
       116
       -
       else

     

       117
       117
       -
           postInstallHooks+=(_qtRmQtOut)

     

       118
       118
       -
       fi

     

       119
       119
       -
       

     

       40
       40
       +
           preFixupHooks+=(_qtModuleMultioutDevsPre)

     

       41
       41
       +
           postFixupHooks+=(_qtModuleMultioutDevsPost)

     

       120
       42
        
       fi

pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

···

       276
       276
        
             fixQtModuleCMakeConfig "Xml"

     

       277
       277
        
           '';

     

       278
       278
        
       

     

       279
       279
       +
         inherit lndir;

     

       279
       280
        
         setupHook = ./setup-hook.sh;

     

       280
       281
        
       

     

       281
       282
        
         enableParallelBuilding = true;

+122 -3

pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh

···

       24
       24
        
           addToSearchPathOnceWithCustomDelimiter ' ' "$@"

     

       25
       25
        
       }

     

       26
       26
        
       

     

       27
       27
       -
       _qtPropagateRuntimeDependencies() {

     

       27
       27
       +
       _qtPropagate() {

     

       28
       28
        
           for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do

     

       29
       29
        
               if [ -d "$1/$dir" ]; then

     

       30
       30
        
                   propagateOnce propagatedBuildInputs "$1"

     

       31
       31
       -
                   propagateOnce propagatedUserEnvPkgs "$1"

     

       32
       31
        
                   break

     

       33
       32
        
               fi

     

       34
       33
        
           done

     
···

       37
       36
        
           addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"

     

       38
       37
        
       }

     

       39
       38
        
       

     

       40
       40
       -
       envHooks+=(_qtPropagateRuntimeDependencies)

     

       39
       39
       +
       crossEnvHooks+=(_qtPropagate)

     

       40
       40
       +
       

     

       41
       41
       +
       _qtPropagateNative() {

     

       42
       42
       +
           for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do

     

       43
       43
       +
               if [ -d "$1/$dir" ]; then

     

       44
       44
       +
                   propagateOnce propagatedNativeBuildInputs "$1"

     

       45
       45
       +
                   break

     

       46
       46
       +
               fi

     

       47
       47
       +
           done

     

       48
       48
       +
           if [ -z "$crossConfig" ]; then

     

       49
       49
       +
               addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"

     

       50
       50
       +
               addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"

     

       51
       51
       +
               addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"

     

       52
       52
       +
           fi

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       envHooks+=(_qtPropagateNative)

     

       41
       56
        
       

     

       42
       57
        
       _qtMultioutDevs() {

     

       43
       58
        
           # This is necessary whether the package is a Qt module or not

     
···

       50
       65
        
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"

     

       51
       66
        
           export NIX_QT_PIC=1

     

       52
       67
        
       fi

     

       68
       68
       +
       

     

       69
       69
       +
       _qtSetCMakePrefix() {

     

       70
       70
       +
           export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"

     

       71
       71
       +
       }

     

       72
       72
       +
       

     

       73
       73
       +
       _qtRmTmp() {

     

       74
       74
       +
           if [ -z "$NIX_QT_SUBMODULE" ]; then

     

       75
       75
       +
               rm -fr "$NIX_QT5_TMP"

     

       76
       76
       +
           else

     

       77
       77
       +
               cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read file; do

     

       78
       78
       +
                   if [ ! -d "$NIX_QT5_TMP/$file" ]; then

     

       79
       79
       +
                       rm -f "$NIX_QT5_TMP/$file"

     

       80
       80
       +
                   fi

     

       81
       81
       +
               done

     

       82
       82
       +
       

     

       83
       83
       +
               cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read dir; do

     

       84
       84
       +
                   if [ -d "$NIX_QT5_TMP/$dir" ]; then

     

       85
       85
       +
                       rmdir --ignore-fail-on-non-empty -p "$NIX_QT5_TMP/$dir"

     

       86
       86
       +
                   fi

     

       87
       87
       +
               done

     

       88
       88
       +
       

     

       89
       89
       +
               rm "$NIX_QT5_TMP/nix-support/qt-inputs"

     

       90
       90
       +
           fi

     

       91
       91
       +
       }

     

       92
       92
       +
       

     

       93
       93
       +
       _qtSetQmakePath() {

     

       94
       94
       +
           export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH"

     

       95
       95
       +
       }

     

       96
       96
       +
       

     

       97
       97
       +
       if [ -z "$NIX_QT5_TMP" ]; then

     

       98
       98
       +
           if [ -z "$NIX_QT_SUBMODULE" ]; then

     

       99
       99
       +
               NIX_QT5_TMP=$(mktemp -d)

     

       100
       100
       +
           else

     

       101
       101
       +
               NIX_QT5_TMP=$out

     

       102
       102
       +
           fi

     

       103
       103
       +
           postInstallHooks+=(_qtRmTmp)

     

       104
       104
       +
       

     

       105
       105
       +
           mkdir -p "$NIX_QT5_TMP/nix-support"

     

       106
       106
       +
           for subdir in bin include lib mkspecs share; do

     

       107
       107
       +
               mkdir "$NIX_QT5_TMP/$subdir"

     

       108
       108
       +
               echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs"

     

       109
       109
       +
           done

     

       110
       110
       +
       

     

       111
       111
       +
           postHooks+=(_qtSetCMakePrefix)

     

       112
       112
       +
       

     

       113
       113
       +
           cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin"

     

       114
       114
       +
           echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs"

     

       115
       115
       +
       

     

       116
       116
       +
           cat >"$NIX_QT5_TMP/bin/qt.conf" <<EOF

     

       117
       117
       +
       [Paths]

     

       118
       118
       +
       Prefix = $NIX_QT5_TMP

     

       119
       119
       +
       Plugins = lib/qt5/plugins

     

       120
       120
       +
       Imports = lib/qt5/imports

     

       121
       121
       +
       Qml2Imports = lib/qt5/qml

     

       122
       122
       +
       Documentation = share/doc/qt5

     

       123
       123
       +
       EOF

     

       124
       124
       +
           echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"

     

       125
       125
       +
       

     

       126
       126
       +
           export QMAKE="$NIX_QT5_TMP/bin/qmake"

     

       127
       127
       +
       

     

       128
       128
       +
           # Set PATH to find qmake first in a preConfigure hook

     

       129
       129
       +
           # It must run after all the envHooks!

     

       130
       130
       +
           preConfigureHooks+=(_qtSetQmakePath)

     

       131
       131
       +
       fi

     

       132
       132
       +
       

     

       133
       133
       +
       qt5LinkModuleDir() {

     

       134
       134
       +
           if [ -d "$1/$2" ]; then

     

       135
       135
       +
               @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2"

     

       136
       136
       +
               find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs"

     

       137
       137
       +
           fi

     

       138
       138
       +
       }

     

       139
       139
       +
       

     

       140
       140
       +
       NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"

     

       141
       141
       +
       NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"

     

       142
       142
       +
       

     

       143
       143
       +
       _qtLinkAllModules() {

     

       144
       144
       +
           IFS=: read -a modules <<< $NIX_QT5_MODULES

     

       145
       145
       +
           for module in ${modules[@]}; do

     

       146
       146
       +
               qt5LinkModuleDir "$module" "lib"

     

       147
       147
       +
           done

     

       148
       148
       +
       

     

       149
       149
       +
           IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV

     

       150
       150
       +
           for module in ${modules[@]}; do

     

       151
       151
       +
               qt5LinkModuleDir "$module" "bin"

     

       152
       152
       +
               qt5LinkModuleDir "$module" "include"

     

       153
       153
       +
               qt5LinkModuleDir "$module" "lib"

     

       154
       154
       +
               qt5LinkModuleDir "$module" "mkspecs"

     

       155
       155
       +
               qt5LinkModuleDir "$module" "share"

     

       156
       156
       +
           done

     

       157
       157
       +
       }

     

       158
       158
       +
       

     

       159
       159
       +
       preConfigureHooks+=(_qtLinkAllModules)

     

       160
       160
       +
       

     

       161
       161
       +
       _qtFixCMakePaths() {

     

       162
       162
       +
           find "${!outputLib}" -name "*.cmake" | while read file; do

     

       163
       163
       +
               substituteInPlace "$file" \

     

       164
       164
       +
                   --subst-var-by NIX_OUT "${!outputLib}" \

     

       165
       165
       +
                   --subst-var-by NIX_DEV "${!outputDev}"

     

       166
       166
       +
           done

     

       167
       167
       +
       }

     

       168
       168
       +
       

     

       169
       169
       +
       if [ -n "$NIX_QT_SUBMODULE" ]; then

     

       170
       170
       +
           postInstallHooks+=(_qtFixCMakePaths)

     

       171
       171
       +
       fi

-1

pkgs/development/libraries/qt-5/5.5/qtlocation.nix

···

       4
       4
        
         name = "qtlocation";

     

       5
       5
        
         qtInputs = [ qtbase qtmultimedia ];

     

       6
       6
        
         postFixup = ''

     

       7
       7
       -
           fixQtModuleCMakeConfig "Location"

     

       8
       7
        
           fixQtModuleCMakeConfig "Positioning"

     

       9
       8
        
         '';

     

       10
       9
        
       }

+12 -14

pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh

···

       2
       2
        
           local prog="$1"

     

       3
       3
        
           shift

     

       4
       4
        
           wrapProgram "$prog" \

     

       5
       5
       -
               --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \

     

       6
       6
       -
               --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \

     

       7
       7
       -
               --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \

     

       8
       8
       -
               --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \

     

       9
       9
       -
               --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \

     

       5
       5
       +
               --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \

     

       6
       6
       +
               --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \

     

       7
       7
       +
               --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \

     

       8
       8
       +
               --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \

     

       9
       9
       +
               --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \

     

       10
       10
        
               "$@"

     

       11
       11
        
       }

     

       12
       12
        
       

     
···

       16
       16
        
           shift

     

       17
       17
        
           shift

     

       18
       18
        
           makeWrapper "$old" "$new" \

     

       19
       19
       -
               --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \

     

       20
       20
       -
               --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \

     

       21
       21
       -
               --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \

     

       22
       22
       -
               --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \

     

       23
       23
       -
               --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \

     

       19
       19
       +
               --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \

     

       20
       20
       +
               --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \

     

       21
       21
       +
               --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \

     

       22
       22
       +
               --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \

     

       23
       23
       +
               --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \

     

       24
       24
        
               "$@"

     

       25
       25
        
       }

     

       26
       26
        
       

     
···

       29
       29
        
           export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"

     

       30
       30
        
           export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"

     

       31
       31
        
           export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"

     

       32
       32
       -
           export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"

     

       33
       33
       -
           export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"

     

       34
       34
       -
           export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"

     

       35
       35
       -
           export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share"

     

       32
       32
       +
           export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share"

     

       33
       33
       +
           export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"

     

       36
       34
        
       }

     

       37
       35
        
       

     

       38
       36
        
       prePhases+=(_makeQtWrapperSetup)

-4

pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh

···

       28
       28
        
           for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do

     

       29
       29
        
               if [ -d "$1/$dir" ]; then

     

       30
       30
        
                   propagateOnce propagatedBuildInputs "$1"

     

       31
       31
       -
                   propagateOnce propagatedUserEnvPkgs "$1"

     

       32
       31
        
                   break

     

       33
       32
        
               fi

     

       34
       33
        
           done

     
···

       43
       42
        
           for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do

     

       44
       43
        
               if [ -d "$1/$dir" ]; then

     

       45
       44
        
                   propagateOnce propagatedNativeBuildInputs "$1"

     

       46
       46
       -
                   if [ -z "$crossConfig" ]; then

     

       47
       47
       -
                       propagateOnce propagatedUserEnvPkgs "$1"

     

       48
       48
       -
                   fi

     

       49
       45
        
                   break

     

       50
       46
        
               fi

     

       51
       47
        
           done

+3 -1

pkgs/development/libraries/tk/generic.nix

···

       17
       17
        
           "--with-tcl=${tcl}/lib"

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ pkgconfig tcl libXft ]

     

       20
       20
       +
         buildInputs = [ pkgconfig ]

     

       21
       21
        
           ++ stdenv.lib.optional stdenv.isDarwin fontconfig;

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [ tcl libXft ];

     

       22
       24
        
       

     

       23
       25
        
         NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;

     

       24
       26

+26

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

···

       1
       1
       +
       {stdenv, fetchFromGitHub, cmake}:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         name = "unittest-cpp-${version}";

     

       7
       7
       +
         version = "1.6.1";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "unittest-cpp";

     

       11
       11
       +
           repo = "unittest-cpp";

     

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

     

       13
       13
       +
           sha256 = "1sva2bm90z4vmwwvp0af82f7p4sdq5j2jjqzhs2ppihdkggn62d1";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [cmake];

     

       17
       17
       +
       

     

       18
       18
       +
         doCheck = false;

     

       19
       19
       +
       

     

       20
       20
       +
         meta = {

     

       21
       21
       +
           homepage = "https://github.com/unittest-cpp/unittest-cpp";

     

       22
       22
       +
           description = "Lightweight unit testing framework for C++";

     

       23
       23
       +
           license = licenses.mit;

     

       24
       24
       +
           maintainers = [maintainers.tohl];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+3 -2

pkgs/development/libraries/webkitgtk/2.4.nix

···

       15
       15
        
       with stdenv.lib;

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         name = "webkitgtk-${version}";

     

       18
       18
       -
         version = "2.4.9";

     

       18
       18
       +
         version = "2.4.11";

     

       19
       19
        
       

     

       20
       20
        
         meta = with stdenv.lib; {

     

       21
       21
        
           description = "Web content rendering engine, GTK+ port";

     
···

       27
       27
        
       

     

       28
       28
        
         src = fetchurl {

     

       29
       29
        
           url = "http://webkitgtk.org/releases/${name}.tar.xz";

     

       30
       30
       -
           sha256 = "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg";

     

       30
       30
       +
           sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         CC = "cc";

     
···

       46
       46
        
       

     

       47
       47
        
         configureFlags = with stdenv.lib; [

     

       48
       48
        
           "--disable-geolocation"

     

       49
       49
       +
           "--disable-jit"

     

       49
       50
        
           (optionalString enableIntrospection "--enable-introspection")

     

       50
       51
        
         ] ++ optional withGtk2 [

     

       51
       52
        
           "--with-gtk=2.0"

+3 -24

pkgs/development/r-modules/default.nix

···

       1137
       1137
        
           "choroplethr" # depends on broken package acs

     

       1138
       1138
        
           "acs" # broken build

     

       1139
       1139
        
           "spray" # depends on broken package partitions

     

       1140
       1140
       -
           "simmr" # depends on broken package rjags

     

       1141
       1141
       -
           "morse" # depends on broken package rjags

     

       1142
       1142
       -
           "gemtc" # depends on broken package rjags

     

       1143
       1143
       -
           "EasyMARK" # depends on broken package rjags

     

       1144
       1144
       -
           "PVAClone" # depends on broken package rjags

     

       1145
       1145
       -
           "sharx" # depends on broken package rjags

     

       1146
       1146
       -
           "dcmle" # depends on broken package rjags

     

       1147
       1147
       -
           "dclone" # depends on broken package rjags

     

       1148
       1148
       -
           "CNVrd2" # depends on broken package rjags

     

       1149
       1149
       -
           "bayescount" # depends on broken package rjags

     

       1150
       1150
       -
           "BANOVA" # depends on broken package rjags

     

       1151
       1151
       -
           "rjags" # broken build

     

       1140
       1140
       +
           "CNVrd2" # broken build

     

       1152
       1141
        
           "proteoQC" # depends on broken package rTANDEM

     

       1153
       1142
        
           "PGA" # depends on broken package rTANDEM

     

       1154
       1143
        
           "MBESS" # depends on broken package OpenMx

     
···

       1211
       1200
        
           "ARTool" # depends on broken package nlopt

     

       1212
       1201
        
           "AssetPricing" # broken build

     

       1213
       1202
        
           "AtelieR" # broken build

     

       1214
       1214
       -
           "auRoc" # depends on broken package rjags

     

       1203
       1203
       +
           "auRoc" # depends on broken package MBESS

     

       1215
       1204
        
           "AutoModel" # depends on broken package car

     

       1216
       1205
        
           "bamdit" # broken build

     

       1217
       1217
       -
           "BANOVA" # broken build

     

       1218
       1206
        
           "bapred" # depends on broken package lme4

     

       1219
       1207
        
           "bartMachine" # depends on broken package nlopt

     

       1220
       1220
       -
           "bayescount" # broken build

     

       1221
       1208
        
           "bayesDem" # depends on broken package nlopt

     

       1222
       1209
        
           "bayesLife" # depends on broken package nlopt

     

       1223
       1210
        
           "BayesMed" # broken build

     
···

       1283
       1270
        
           "covmat" # depends on broken package VIM

     

       1284
       1271
        
           "cplexAPI" # build is broken

     

       1285
       1272
        
           "cquad" # depends on broken package car

     

       1286
       1286
       -
           "crmPack" # depends on broken package rjags

     

       1287
       1273
        
           "CrypticIBDcheck" # depends on broken package nlopt

     

       1288
       1274
        
           "ctsem" # depends on broken package OpenMx

     

       1289
       1275
        
           "cudaBayesreg" # build is broken

     
···

       1293
       1279
        
           "datafsm" # depends on broken package caret

     

       1294
       1280
        
           "dbConnect" # broken build

     

       1295
       1281
        
           "DBKGrad" # depends on broken package rpanel

     

       1296
       1296
       -
           "dcmle" # broken build

     

       1282
       1282
       +
           #"dcmle" # broken build

     

       1297
       1283
        
           "ddst" # broken build

     

       1298
       1284
        
           "Deducer" # depends on broken package nlopt

     

       1299
       1285
        
           "DeducerExtras" # depends on broken package nlopt

     
···

       1318
       1304
        
           "drsmooth" # depends on broken package nlopt

     

       1319
       1305
        
           "dynlm" # depends on broken package nlopt

     

       1320
       1306
        
           "easyanova" # depends on broken package nlopt

     

       1321
       1321
       -
           "EasyMARK" # broken build

     

       1322
       1307
        
           "ecd" # depends on broken package polynom

     

       1323
       1308
        
           "edge" # depends on broken package nlopt

     

       1324
       1309
        
           "eeptools" # depends on broken package nlopt

     
···

       1370
       1355
        
           "gcmr" # depends on broken package nlopt

     

       1371
       1356
        
           "GDAtools" # depends on broken package nlopt

     

       1372
       1357
        
           "gdtools" # broken build

     

       1373
       1373
       -
           "gemtc" # broken build

     

       1374
       1358
        
           "GENE_E" # depends on broken package rhdf5

     

       1375
       1359
        
           "GENESIS" # broken build

     

       1376
       1360
        
           "genridge" # depends on broken package nlopt

     
···

       1499
       1483
        
           "mlVAR" # depends on broken package nlopt

     

       1500
       1484
        
           "MM" # broken build

     

       1501
       1485
        
           "mongolite" # build is broken

     

       1502
       1502
       -
           "morse" # broken build

     

       1503
       1486
        
           "mosaic" # depends on broken package nlopt

     

       1504
       1487
        
           "mpoly" # broken build

     

       1505
       1488
        
           "mRMRe" # broken build

     
···

       1577
       1560
        
           "PSAboot" # depends on broken package nlopt

     

       1578
       1561
        
           "ptw" # depends on broken nloptr

     

       1579
       1562
        
           "PurBayes" # broken build

     

       1580
       1580
       -
           "PVAClone" # broken build

     

       1581
       1563
        
           "pvca" # depends on broken package nlopt

     

       1582
       1564
        
           "PythonInR" # broken build

     

       1583
       1565
        
           "QFRM" # broken build

     
···

       1664
       1646
        
           "Rgnuplot" # broken build

     

       1665
       1647
        
           "rhdf5" # build is broken

     

       1666
       1648
        
           "rjade" # depends on broken package V8

     

       1667
       1667
       -
           "rjags" # broken build

     

       1668
       1649
        
           "rJPSGCS" # build is broken

     

       1669
       1650
        
           "rLindo" # build is broken

     

       1670
       1651
        
           "RLRsim" # depends on broken package lme4

     
···

       1724
       1705
        
           "seqHMM" # depends on broken package nloptr

     

       1725
       1706
        
           "seqTools" # build is broken

     

       1726
       1707
        
           "SharpeR" # broken build

     

       1727
       1727
       -
           "sharx" # broken build

     

       1728
       1708
        
           "shinyTANDEM" # depends on broken package rTANDEM

     

       1729
       1709
        
           "SIBER" # broken build

     

       1730
       1730
       -
           "simmr" # broken build

     

       1731
       1710
        
           "simPop" # depends on broken package VIM

     

       1732
       1711
        
           "simr" # depends on broken package lme4

     

       1733
       1712
        
           "SJava" # broken build

+5 -7

pkgs/development/tools/analysis/cppcheck/default.nix

···

       1
       1
        
       { stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         pname = "cppcheck";

     

       5
       5
       -
       in

     

       6
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "cppcheck";

     

       5
       5
       +
         version = "1.74";

     

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

     

       8
       8
       -
         version = "1.73";

     

       9
       7
        
       

     

       10
       8
        
         src = fetchurl {

     

       11
       9
        
           url = "mirror://sourceforge/${pname}/${name}.tar.bz2";

     

       12
       12
       -
           sha256 = "0l7yslf311h3kidi91q4zhqj3f3vsjp1gb2z50y20423fda87xin";

     

       10
       10
       +
           sha256 = "0m62byiprabm1m3mc4r2w54p7qyhgi8msipnpm66ychr8rz2yny0";

     

       13
       11
        
         };

     

       14
       12
        
       

     

       15
       13
        
         nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];

     
···

       27
       25
        
         meta = with stdenv.lib; {

     

       28
       26
        
           description = "A static analysis tool for C/C++ code";

     

       29
       27
        
           longDescription = ''

     

       30
       30
       -
             Check C/C++ code for memory leaks, mismatching

     

       31
       31
       -
             allocation-deallocation, buffer overruns and more.

     

       28
       28
       +
             Check C/C++ code for memory leaks, mismatching allocation-deallocation,

     

       29
       29
       +
             buffer overruns and more.

     

       32
       30
        
           '';

     

       33
       31
        
           homepage = http://cppcheck.sourceforge.net/;

     

       34
       32
        
           license = licenses.gpl3Plus;

+5 -5

pkgs/development/tools/continuous-integration/jenkins/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "jenkins-${version}";

     

       5
       5
       -
         version = "2.3";

     

       5
       5
       +
         version = "2.13";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";

     

       9
       9
       -
           sha256 = "0x59dbvh6y25ki5jy51djbfbhf8g2j3yd9f3n66f7bkdfw8p78g1";

     

       9
       9
       +
           sha256 = "0rb3spml2c7cd34zjjc5mwsdcnwmcbcdc784nl8cczayiwz8nq3p";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildCommand = ''

     

       13
       13
       -
           mkdir -p "$out/lib"

     

       14
       14
       -
           cp "$src" "$out/lib/jenkins.war"

     

       13
       13
       +
           mkdir -p "$out/webapps"

     

       14
       14
       +
           cp "$src" "$out/webapps/jenkins.war"

     

       15
       15
        
         '';

     

       16
       16
        
       

     

       17
       17
        
         meta = with stdenv.lib; {

     
···

       19
       19
        
           homepage = http://jenkins-ci.org;

     

       20
       20
        
           license = licenses.mit;

     

       21
       21
        
           platforms = platforms.all;

     

       22
       22
       -
           maintainers = [ maintainers.coconnor ];

     

       22
       22
       +
           maintainers = with maintainers; [ coconnor fpletz ];

     

       23
       23
        
         };

     

       24
       24
        
       }

+23

pkgs/development/tools/doctl/default.nix

···

       1
       1
       +
       { stdenv, buildGoPackage, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoPackage rec {

     

       4
       4
       +
         name = "doctl-${version}";

     

       5
       5
       +
         version = "1.3.1";

     

       6
       6
       +
         rev = "a57555c195d06bc7aa5037af77fde0665ad1231f";

     

       7
       7
       +
         goPackagePath = "github.com/digitalocean/doctl";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "digitalocean";

     

       11
       11
       +
           repo = "doctl";

     

       12
       12
       +
           rev = "${rev}";

     

       13
       13
       +
           sha256 = "03z652fw0a628gv666w8vpi05a4sdilvs1j5scjhcbi82zsbkvma";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           description = "A command line tool for DigitalOcean services";

     

       18
       18
       +
           homepage = "https://github.com/digitalocean/doctl";

     

       19
       19
       +
           license = stdenv.lib.licenses.asl20;

     

       20
       20
       +
           platforms = stdenv.lib.platforms.all;

     

       21
       21
       +
           maintainers = [ stdenv.lib.maintainers.siddharthist ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

pkgs/development/tools/mypy-lang/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python35Packages.buildPythonApplication rec {

     

       4
       4
        
         name = "mypy-lang-${version}";

     

       5
       5
       -
         version = "0.4.2";

     

       5
       5
       +
         version = "0.4.3";

     

       6
       6
        
       

     

       7
       7
        
         # Tests not included in pip package.

     

       8
       8
        
         doCheck = false;

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://pypi/m/mypy-lang/${name}.tar.gz";

     

       12
       12
       -
           sha256 = "12vwgzbpv0n403dvzas5ckw0f62slqk5j3024y65hi9n95r34rws";

     

       12
       12
       +
           sha256 = "11d8195xg8hksyh2qapbv66jvjgfpjwkc61nwljcfq9si144f2nb";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = with python35Packages; [ lxml ];

+2 -2

pkgs/development/tools/scalafmt/default.nix

···

       1
       1
        
       { stdenv, fetchurl, unzip, jre }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.2.5";

     

       4
       4
       +
         version = "0.2.11";

     

       5
       5
        
         baseName = "scalafmt";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";

     

       10
       10
       -
           sha256 = "07l95xdwgdbdfa91pg1sds82aw3c60gxzdcvdhhhk6a7zwrl73cp";

     

       10
       10
       +
           sha256 = "044n00mhrdxij1kc8wplvni7pf8lnninxrsm9v41gicbk73cm2q8";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         unpackPhase = "tar xvzf $src";

+5 -5

pkgs/development/tools/vagrant/default.nix

···

       4
       4
        
       assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         version = "1.8.1";

     

       7
       7
       +
         version = "1.8.4";

     

       8
       8
        
         rake = buildRubyGem {

     

       9
       9
        
           inherit ruby;

     

       10
       10
        
           gemName = "rake";

     
···

       20
       20
        
           if stdenv.system == "x86_64-linux" then

     

       21
       21
        
             fetchurl {

     

       22
       22
        
               url    = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.deb";

     

       23
       23
       -
               sha256 = "0gb999ql4kfxd9473cx3xn6a11094dm4iyrx1dzd9v2sygh1l3pd";

     

       23
       23
       +
               sha256 = "fd38d8e00e494a617201facb42fc2cac627e5021db15e91c2a041eac6a2d8208";

     

       24
       24
        
             }

     

       25
       25
        
           else

     

       26
       26
        
             fetchurl {

     

       27
       27
        
               url    = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_i686.deb";

     

       28
       28
       -
               sha256 = "1nzg6i9i270xgaih381q096lb23rwxkif4ba9j62y3zjmj6az4xf";

     

       28
       28
       +
               sha256 = "555351717cacaa8660821df8988cc40a39923b06b698fca6bb90621008aab06f";

     

       29
       29
        
             };

     

       30
       30
        
       

     

       31
       31
        
         meta = with stdenv.lib; {

     
···

       97
       97
        
       

     

       98
       98
        
         preFixup = ''

     

       99
       99
        
           # 'hide' the template file from shebang-patching

     

       100
       100
       -
           chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.6/lib/bundler/templates/Executable

     

       100
       100
       +
           chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable

     

       101
       101
        
           chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh

     

       102
       102
        
         '';

     

       103
       103
        
       

     

       104
       104
        
         postFixup = ''

     

       105
       105
       -
           chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.6/lib/bundler/templates/Executable

     

       105
       105
       +
           chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable

     

       106
       106
        
           chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh

     

       107
       107
        
         '';

     

       108
       108
        
       }

+1 -1

pkgs/development/web/nodejs/nodejs.nix

···

       52
       52
        
           description = "Event-driven I/O framework for the V8 JavaScript engine";

     

       53
       53
        
           homepage = http://nodejs.org;

     

       54
       54
        
           license = licenses.mit;

     

       55
       55
       -
           maintainers = [ maintainers.goibhniu maintainers.havvy maintainers.gilligan ];

     

       55
       55
       +
           maintainers = [ maintainers.goibhniu maintainers.havvy maintainers.gilligan maintainers.cko ];

     

       56
       56
        
           platforms = platforms.linux ++ platforms.darwin;

     

       57
       57
        
         };

     

       58
       58
        
       }

+2 -2

pkgs/development/web/nodejs/v5.nix

···

       4
       4
        
       }@args:

     

       5
       5
        
       

     

       6
       6
        
       import ./nodejs.nix (args // rec {

     

       7
       7
       -
         version = "5.11.1";

     

       7
       7
       +
         version = "5.12.0";

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";

     

       10
       10
       -
           sha256 = "07v60mhswj77m7516zakj3p1py7ixa5jbgj0m7zlr9vygrrc66zi";

     

       10
       10
       +
           sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe";

     

       11
       11
        
         };

     

       12
       12
        
       })

+54

pkgs/games/commandergenius/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig

     

       2
       2
       +
       , libvorbis, libogg, mesa, boost, curl, zlib, cmake }:

     

       3
       3
       +
       

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         name = "commandergenius-${version}";

     

       7
       7
       +
         version = "194beta";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "gerstrong";

     

       11
       11
       +
           repo = "Commander-Genius";

     

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

     

       13
       13
       +
           sha256 = "0qxqzlmadxklrhxilbqj7y94fmbv0byj6vgpl59lb77lgs4y4x47";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ SDL2 SDL2_image pkgconfig libvorbis libogg mesa boost curl zlib cmake ];

     

       17
       17
       +
       

     

       18
       18
       +
         patchPhase = ''

     

       19
       19
       +
           cat >> lib/GsKit/CMakeLists.txt <<EOF

     

       20
       20
       +
           execute_process(COMMAND sdl2-config --cflags

     

       21
       21
       +
             OUTPUT_VARIABLE CFLAGS)

     

       22
       22
       +
           string(REGEX REPLACE "^-I" "" CFLAGS2 \''${CFLAGS})

     

       23
       23
       +
           string(REGEX REPLACE " .*" "" SDLINC \''${CFLAGS2})

     

       24
       24
       +
           INCLUDE_DIRECTORIES(\''${SDLINC})

     

       25
       25
       +
           EOF

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         configurePhase = ''

     

       29
       29
       +
           cmake -DUSE_SDL2=yes -DBUILD_TARGET=LINUX -DCMAKE_INSTALL_PREFIX:PATH=$out -DCPACK_PACKAGE_INSTALL_DIRECTORY=$out

     

       30
       30
       +
           sed -i 's_/usr/share_$out_g' cmake_install.cmake

     

       31
       31
       +
           sed -i 's_/usr/share_$out_g' src/cmake_install.cmake

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         installTargets = [ ];

     

       35
       35
       +
       

     

       36
       36
       +
         installPhase = ''

     

       37
       37
       +
           mkdir -p $out/bin

     

       38
       38
       +
           cp src/CGeniusExe $out/bin

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = {

     

       42
       42
       +
           description = "Modern Interpreter for the Commander Keen Games";

     

       43
       43
       +
           longdescription = ''

     

       44
       44
       +
             Commander Genius is an open-source clone of

     

       45
       45
       +
             Commander Keen which allows you to play

     

       46
       46
       +
             the games, and some of the mods

     

       47
       47
       +
             made for it. All of the original data files

     

       48
       48
       +
             are required to do so

     

       49
       49
       +
           '';

     

       50
       50
       +
           homepage = "https://github.com/gerstrong/Commander-Genius";

     

       51
       51
       +
           maintainers = with stdenv.lib.maintainers; [ hce ]; 

     

       52
       52
       +
           license = stdenv.lib.licenses.gpl2;

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+1 -1

pkgs/games/d1x-rebirth/default.nix

···

       16
       16
        
         meta = {

     

       17
       17
        
           homepage = http://www.dxx-rebirth.com/;

     

       18
       18
        
           description = "Source Port of the Descent 1 engine";

     

       19
       19
       -
           license = stdenv.lib.licenses.mit;

     

       19
       19
       +
           license = stdenv.lib.licenses.unfree;

     

       20
       20
        
           platforms = with stdenv.lib.platforms; linux;

     

       21
       21
        
           maintainers = with stdenv.lib.maintainers; [viric];

     

       22
       22
        
         };

+1 -1

pkgs/games/d2x-rebirth/default.nix

···

       16
       16
        
         meta = {

     

       17
       17
        
           homepage = http://www.dxx-rebirth.com/;

     

       18
       18
        
           description = "Source Port of the Descent 2 engine";

     

       19
       19
       -
           license = stdenv.lib.licenses.mit;

     

       19
       19
       +
           license = stdenv.lib.licenses.unfree;

     

       20
       20
        
           platforms = with stdenv.lib.platforms; linux;

     

       21
       21
        
           maintainers = with stdenv.lib.maintainers; [viric];

     

       22
       22
        
         };

pkgs/misc/emulators/ppsspp/default.nix

···

       22
       22
        
         buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]

     

       23
       23
        
                       ++ (if withGamepads then [ SDL ] else [ ]);

     

       24
       24
        
       

     

       25
       25
       +
         qmakeFlags = [ "PPSSPPQt.pro" ];

     

       26
       26
       +
       

     

       25
       27
        
         preConfigure = "cd Qt";

     

       26
       28
        
         installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";

     

       27
       29

+8 -6

pkgs/misc/themes/adapta/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, sass, inkscape, glib, which, gtk-engine-murrine }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "adapta-gtk-theme-${version}";

     

       5
       5
       -
         version = "3.21.2";

     

       5
       5
       +
         version = "3.21.3.68";

     

       6
       6
        
       

     

       7
       7
        
         meta = with stdenv.lib; {

     

       8
       8
        
           description = "An adaptive GTK+ theme based on Material Design";

     

       9
       9
        
           homepage = "https://github.com/tista500/Adapta";

     

       10
       10
       -
           license = licenses.gpl2;

     

       10
       10
       +
           license = with licenses; [ gpl2 cc-by-sa-30 ];

     

       11
       11
        
           platforms = platforms.linux;

     

       12
       12
        
           maintainers = [ maintainers.SShrike ];

     

       13
       13
        
         };

     
···

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "tista500";

     

       17
       17
        
           repo = "Adapta";

     

       18
       18
       -
           rev = "c48da995abc46087c22b05d2cdb0975d10774641";

     

       19
       19
       -
           sha256 = "17w9nsrwqwgafswyvhc5h8ld2ggi96ix5fjv6yf1hfz3l1ln9qg7";

     

       18
       18
       +
           rev = version;

     

       19
       19
       +
           sha256 = "0wwsmsyxfdgsc7fj1kn4r9zsgs09prizwkjljmirwrfdm6j3387p";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         preferLocalBuild = true;

     

       23
       23
        
         buildInputs = [ gtk-engine-murrine ];

     

       24
       24
       -
         nativeBuildInputs = [ autoreconfHook ];

     

       24
       24
       +
         nativeBuildInputs = [ autoreconfHook sass inkscape glib.dev which ];

     

       25
       25
       +
       

     

       26
       26
       +
         postPatch = "patchShebangs .";

     

       25
       27
        
       

     

       26
       28
        
         configureFlags = "--enable-chrome --disable-unity";

     

       27
       29
        
       }

+6 -11

pkgs/misc/themes/blackbird/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gtk-engine-murrine }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "Blackbird";

     

       5
       5
       -
         version = "2016-04-10";

     

       5
       5
       +
         version = "2016-07-04";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           repo = "${pname}";

     

       10
       10
        
           owner = "shimmerproject";

     

       11
       11
       -
           rev = "e9f780993c957e3349f97b0e2e6fabdc36ccefb0";

     

       12
       12
       -
           sha256 = "00fdd63lnb2gmsn6cbdkanvh3rvz48jg08gmzg372byhj70m63hi";

     

       11
       11
       +
           rev = "ab4a30ee5110c59241b739e7c54956c3244e5b2a";

     

       12
       12
       +
           sha256 = "1qy32n21bqq3zwn9di01fbiqv67cqr9n7jmbpcmn9v8yb5p572w3";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ gtk-engine-murrine ];

     

       16
       16
       -
         

     

       17
       17
       -
         dontBuild = true;

     

       15
       15
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       18
       16
        
       

     

       19
       19
       -
         installPhase = ''

     

       20
       20
       -
           mkdir -p $out/share/themes/${pname}

     

       21
       21
       -
           cp -a * $out/share/themes/${pname}/

     

       22
       22
       -
         '';

     

       17
       17
       +
         buildInputs = [ gtk-engine-murrine ];

     

       23
       18
        
       

     

       24
       19
        
         meta = {

     

       25
       20
        
           description = "Dark Desktop Suite for Gtk, Xfce and Metacity";

+86 -50

pkgs/misc/vim-plugins/default.nix

···

       173
       173
        
         };

     

       174
       174
        
       

     

       175
       175
        
         Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       176
       176
       -
           name = "Syntastic-2016-07-08";

     

       176
       176
       +
           name = "Syntastic-2016-07-16";

     

       177
       177
        
           src = fetchgit {

     

       178
       178
        
             url = "git://github.com/scrooloose/syntastic";

     

       179
       179
       -
             rev = "87f3e80b443870ce821f82dd1b3dba5bd66b51b2";

     

       180
       180
       -
             sha256 = "09prhzp58470naj8ws2m1pjgj1h675jsiyc6vmfdjsqk6ly2ypg0";

     

       179
       179
       +
             rev = "8ab7705b21cbe5f1c70750dee89bf8b711890a82";

     

       180
       180
       +
             sha256 = "1gk12lzyqgjh4qzq46m3i70h4xzf9whgdahigf6nr0yqxd6w90rw";

     

       181
       181
        
           };

     

       182
       182
        
           dependencies = [];

     

       183
       183
        
       

     
···

       206
       206
        
         };

     

       207
       207
        
       

     

       208
       208
        
         The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       209
       209
       -
           name = "The_NERD_Commenter-2016-06-10";

     

       209
       209
       +
           name = "The_NERD_Commenter-2016-07-14";

     

       210
       210
        
           src = fetchgit {

     

       211
       211
        
             url = "git://github.com/scrooloose/nerdcommenter";

     

       212
       212
       -
             rev = "e2d47bec2662d5fcd324d17e22dc37f38c97bf2d";

     

       213
       213
       -
             sha256 = "099i7jksdp4c4m7imv96xji4lbjscdns37fsr2qgn7zw5pjgjbw4";

     

       212
       212
       +
             rev = "c3d6a2069bb0286c9633fbbffb4983797f7b8822";

     

       213
       213
       +
             sha256 = "0xwnx8ggqpik9jnyb4a69v7z789ffrfnxc3frl644x7bhndgaa1v";

     

       214
       214
        
           };

     

       215
       215
        
           dependencies = [];

     

       216
       216
        
       

     
···

       365
       365
        
         };

     

       366
       366
        
       

     

       367
       367
        
         deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       368
       368
       -
           name = "deoplete-nvim-2016-07-10";

     

       368
       368
       +
           name = "deoplete-nvim-2016-07-14";

     

       369
       369
        
           src = fetchgit {

     

       370
       370
        
             url = "git://github.com/Shougo/deoplete.nvim";

     

       371
       371
       -
             rev = "8102bbb73f942b232b6bcc00b8699fbe3b3f370c";

     

       372
       372
       -
             sha256 = "083056maiscxyyln09659qv3c7kayps2vm697p459yyhfyir742f";

     

       371
       371
       +
             rev = "e3cb71b4053041dffb250733bd9531814bfa4af9";

     

       372
       372
       +
             sha256 = "1wz3q1020f8vb7s9nncdgji045iz2nlqp59j06gbli9cjvgfhg60";

     

       373
       373
        
           };

     

       374
       374
        
           dependencies = [];

     

       375
       375
        
       

     
···

       398
       398
        
         };

     

       399
       399
        
       

     

       400
       400
        
         vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       401
       401
       -
           name = "vim-css-color-2016-06-12";

     

       401
       401
       +
           name = "vim-css-color-2016-07-14";

     

       402
       402
        
           src = fetchgit {

     

       403
       403
        
             url = "git://github.com/ap/vim-css-color";

     

       404
       404
       -
             rev = "ba98bd138ee15dbf6b6dc3b7080c0e65e0657c76";

     

       405
       405
       -
             sha256 = "0l76yqd3cvdm41dx720skbphwqsza51xaf7vi8jlknsqnrb6z1kf";

     

       404
       404
       +
             rev = "86dff1b9c2a549994042c4548a47514350c25b6d";

     

       405
       405
       +
             sha256 = "1wzkcprn6sky03v6yg0dkijmdva3jszrpwzbld1744m8ylbdgf0i";

     

       406
       406
        
           };

     

       407
       407
        
           dependencies = [];

     

       408
       408
        
       

     

       409
       409
        
         };

     

       410
       410
        
       

     

       411
       411
        
         neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       412
       412
       -
           name = "neomake-2016-07-11";

     

       412
       412
       +
           name = "neomake-2016-07-16";

     

       413
       413
        
           src = fetchgit {

     

       414
       414
        
             url = "git://github.com/benekastah/neomake";

     

       415
       415
       -
             rev = "14e894edc35d17b927e5540ceb6d101bbda9f51c";

     

       416
       416
       -
             sha256 = "1ccgfvvxsl213zlgf801yxwg51kpi5z37z175w4gh9cj8953mgxh";

     

       415
       415
       +
             rev = "5560a4dd58a47a0af2ae128d707e822b54c55c72";

     

       416
       416
       +
             sha256 = "01l7ws2m3pm90q5985rrpc7rqcgv93ypg3swy1n1sfn0m0vm1a4l";

     

       417
       417
        
           };

     

       418
       418
        
           dependencies = [];

     

       419
       419
        
       

     
···

       485
       485
        
       

     

       486
       486
        
         };

     

       487
       487
        
       

     

       488
       488
       +
         elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       489
       489
       +
           name = "elm-vim-2016-06-22";

     

       490
       490
       +
           src = fetchgit {

     

       491
       491
       +
             url = "git://github.com/elmcast/elm-vim";

     

       492
       492
       +
             rev = "6527c8a9e1d1af31c81e60b6b40bf3316c7fbdf2";

     

       493
       493
       +
             sha256 = "0aj1cd5dy7z48lf6vzg76r787hgs4z5f11bczvvs1h99qik1rgbc";

     

       494
       494
       +
           };

     

       495
       495
       +
           dependencies = [];

     

       496
       496
       +
       

     

       497
       497
       +
         };

     

       498
       498
       +
       

     

       488
       499
        
         vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       489
       500
        
           name = "vim-localvimrc-2016-06-06";

     

       490
       501
        
           src = fetchgit {

     
···

       519
       530
        
         };

     

       520
       531
        
       

     

       521
       532
        
         vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       522
       522
       -
           name = "vim-go-2016-07-07";

     

       533
       533
       +
           name = "vim-go-2016-07-14";

     

       523
       534
        
           src = fetchgit {

     

       524
       535
        
             url = "git://github.com/fatih/vim-go";

     

       525
       525
       -
             rev = "ab01e7e5a6bf858c1f519a831a4db1d978b92298";

     

       526
       526
       -
             sha256 = "1g76hasdyncjds6yl38dkb5nwp6sb8aqzp9d7xxhwarlnnihj1la";

     

       536
       536
       +
             rev = "789de8e4e8c505c3058f407750165f0148ea1d02";

     

       537
       537
       +
             sha256 = "0hnq3abl6qvwk9rynk8pmi8slfikdaxf5irrx0xvddp38giydws1";

     

       527
       538
        
           };

     

       528
       539
        
           dependencies = [];

     

       529
       540
        
       

     
···

       585
       596
        
         };

     

       586
       597
        
       

     

       587
       598
        
         idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       588
       588
       -
           name = "idris-vim-2016-01-29";

     

       599
       599
       +
           name = "idris-vim-2016-07-15";

     

       589
       600
        
           src = fetchgit {

     

       590
       601
        
             url = "git://github.com/idris-hackers/idris-vim";

     

       591
       591
       -
             rev = "e1711749f5078f5a9fa53cd15a37627ea9d239f2";

     

       592
       592
       -
             sha256 = "0mbywk1mwbx3hjzrv7ypp5m800xjj08hxlfmd0piljg41xwkgk5q";

     

       602
       602
       +
             rev = "aeca73e9432c21da6eb35fceaef957f191b3d56a";

     

       603
       603
       +
             sha256 = "1q38sf4dabirhrr3i89p271ixap90im0x3pf39s3fc9jmb3m2jm8";

     

       593
       604
        
           };

     

       594
       605
        
           dependencies = [];

     

       595
       606
        
       

     
···

       651
       662
        
         };

     

       652
       663
        
       

     

       653
       664
        
         vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       654
       654
       -
           name = "vim-orgmode-2016-07-08";

     

       665
       665
       +
           name = "vim-orgmode-2016-07-12";

     

       655
       666
        
           src = fetchgit {

     

       656
       667
        
             url = "git://github.com/jceb/vim-orgmode";

     

       657
       657
       -
             rev = "54057d58888ad29672cd0cd782be5fc8b1a3a709";

     

       658
       658
       -
             sha256 = "134dsnfpkzq9gd3d8b9pvy7c5yvy9yxjyvidg927ha1lpilf4kp9";

     

       668
       668
       +
             rev = "e76c0f07e9193e08df2b8eeb95ef6240b494797f";

     

       669
       669
       +
             sha256 = "00ys1qf8hbigrdxshs5xvg662xcd6qaiw2g1nr21pfs682qdjsyf";

     

       659
       670
        
           };

     

       660
       671
        
           dependencies = [];

     

       661
       672
        
       

     
···

       794
       805
        
         };

     

       795
       806
        
       

     

       796
       807
        
         vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       797
       797
       -
           name = "vimtex-2016-07-10";

     

       808
       808
       +
           name = "vimtex-2016-07-16";

     

       798
       809
        
           src = fetchgit {

     

       799
       810
        
             url = "git://github.com/lervag/vimtex";

     

       800
       800
       -
             rev = "c16bd147092bfe7ac63f39cd449f36e14e42e948";

     

       801
       801
       -
             sha256 = "18p7vmas0754r9n227v68wry285vr4y90v3kxcnn9hl60xxb3ba9";

     

       811
       811
       +
             rev = "8dd4ed77dbd547a819b1220aa2e298e0ae6e5643";

     

       812
       812
       +
             sha256 = "0n5zbhgf0ks0b166p94m7i3cfkh6v2zc6srci0rp45byi4mwpddz";

     

       802
       813
        
           };

     

       803
       814
        
           dependencies = [];

     

       804
       815
        
       

     
···

       908
       919
        
         };

     

       909
       920
        
       

     

       910
       921
        
         vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       911
       911
       -
           name = "vim-racer-2016-06-27";

     

       922
       922
       +
           name = "vim-racer-2016-07-14";

     

       912
       923
        
           src = fetchgit {

     

       913
       924
        
             url = "git://github.com/racer-rust/vim-racer";

     

       914
       914
       -
             rev = "a72b26bb25cb65be29fd1912e9344eaa860fce5e";

     

       915
       915
       -
             sha256 = "01xg6mmnlx5l37rsb7w0dbgy36pd6zyq7gcigdbj0pgqd39w30fv";

     

       925
       925
       +
             rev = "ea2a41ddc3e1e504a542f6add0f6f2c10d97a099";

     

       926
       926
       +
             sha256 = "1vwxs9mqcvp3haqyx0si5hiw61vg2s2hm1alipb5s69sb38f047s";

     

       916
       927
        
           };

     

       917
       928
        
           dependencies = [];

     

       918
       929
        
       

     
···

       930
       941
        
         };

     

       931
       942
        
       

     

       932
       943
        
         rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       933
       933
       -
           name = "rust-vim-2016-06-21";

     

       944
       944
       +
           name = "rust-vim-2016-07-16";

     

       934
       945
        
           src = fetchgit {

     

       935
       946
        
             url = "git://github.com/rust-lang/rust.vim";

     

       936
       936
       -
             rev = "5dd7ab99103c05a56e059b39ad9f63274d2ae72e";

     

       937
       937
       -
             sha256 = "0az35kfcpavz6sbh6mf0mmv7mp5zbnqmnljpmlm1srn6rr9rah2q";

     

       947
       947
       +
             rev = "a4d6fb2ab526ccc93a6a321a2425a234f9f7665f";

     

       948
       948
       +
             sha256 = "1i2sf5p4d9gfr3hk6nrjar0rz85dmhwgf82d5yfqqmlgil0bljds";

     

       949
       949
       +
           };

     

       950
       950
       +
           dependencies = [];

     

       951
       951
       +
       

     

       952
       952
       +
         };

     

       953
       953
       +
       

     

       954
       954
       +
         neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       955
       955
       +
           name = "neoformat-2016-05-25";

     

       956
       956
       +
           src = fetchgit {

     

       957
       957
       +
             url = "git://github.com/sbdchd/neoformat";

     

       958
       958
       +
             rev = "d74e8d5b338219fe2ab6e8b5bfdaaf653101ed21";

     

       959
       959
       +
             sha256 = "0yiq519x99vhl217504pv57lpfwz916r1fq0m3mr33pv0g1kx6c5";

     

       960
       960
       +
           };

     

       961
       961
       +
           dependencies = [];

     

       962
       962
       +
       

     

       963
       963
       +
         };

     

       964
       964
       +
       

     

       965
       965
       +
         vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       966
       966
       +
           name = "vim-polyglot-2016-07-05";

     

       967
       967
       +
           src = fetchgit {

     

       968
       968
       +
             url = "git://github.com/sheerun/vim-polyglot";

     

       969
       969
       +
             rev = "1422f7a75ce0b382d601238c5979b04473b9021e";

     

       970
       970
       +
             sha256 = "0jqb75lrf75br9wg95cxcy3aal1bk929881gy4ly1n0r6fv96yz1";

     

       938
       971
        
           };

     

       939
       972
        
           dependencies = [];

     

       940
       973
        
       

     
···

       952
       985
        
         };

     

       953
       986
        
       

     

       954
       987
        
         neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       955
       955
       -
           name = "neosnippet-snippets-2016-06-26";

     

       988
       988
       +
           name = "neosnippet-snippets-2016-07-14";

     

       956
       989
        
           src = fetchgit {

     

       957
       990
        
             url = "git://github.com/shougo/neosnippet-snippets";

     

       958
       958
       -
             rev = "17219351bcbec3708295c72c8280471eed12b8fe";

     

       959
       959
       -
             sha256 = "08lrqsl9cqkx42llgv0mc54nsmdrv68bpzip2snr58klaj444nir";

     

       991
       991
       +
             rev = "4d25b4352738ecf34e56701d0172d80daa3bd287";

     

       992
       992
       +
             sha256 = "01lai1gvf30iagh9f7av69ywfzw43vy2igwil882rgnri84y4zjb";

     

       960
       993
        
           };

     

       961
       994
        
           dependencies = [];

     

       962
       995
        
       

     
···

       1113
       1146
        
         };

     

       1114
       1147
        
       

     

       1115
       1148
        
         youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       1116
       1116
       -
           name = "youcompleteme-2016-07-11";

     

       1149
       1149
       +
           name = "youcompleteme-2016-07-12";

     

       1117
       1150
        
           src = fetchgit {

     

       1118
       1151
        
             url = "git://github.com/valloric/youcompleteme";

     

       1119
       1119
       -
             rev = "c44489af16de6ae86294de7dd194bd6e53adaf1e";

     

       1120
       1120
       -
             sha256 = "1m8m6wyics1mlxcxzq83ql8l4vd16cfbhc418vmxflx3178ifr36";

     

       1152
       1152
       +
             rev = "d5610e577c0f1f0bb8bb22d8bbbd25be11327391";

     

       1153
       1153
       +
             sha256 = "1c2001ywj0zczhpzm5iahyb6rg7yjbgljqpnwfr9f7fa3y363cgk";

     

       1121
       1154
        
           };

     

       1122
       1155
        
           dependencies = [];

     

       1123
       1156
        
           buildInputs = [

     
···

       1126
       1159
        
             llvmPackages.llvm

     

       1127
       1160
        
           ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;

     

       1128
       1161
        
       

     

       1129
       1129
       -
           propagatedBuildInputs = [

     

       1130
       1130
       -
             rustracerd

     

       1162
       1162
       +
           propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd;

     

       1163
       1163
       +
       

     

       1164
       1164
       +
           patches = [

     

       1165
       1165
       +
             ./patches/youcompleteme/1-top-cmake.patch

     

       1166
       1166
       +
             ./patches/youcompleteme/2-ycm-cmake.patch

     

       1131
       1167
        
           ];

     

       1132
       1168
        
       

     

       1133
       1169
        
           buildPhase = ''

     
···

       1302
       1338
        
         };

     

       1303
       1339
        
       

     

       1304
       1340
        
         deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       1305
       1305
       -
           name = "deoplete-jedi-2016-07-10";

     

       1341
       1341
       +
           name = "deoplete-jedi-2016-07-12";

     

       1306
       1342
        
           src = fetchgit {

     

       1307
       1343
        
             url = "git://github.com/zchee/deoplete-jedi";

     

       1308
       1308
       -
             rev = "e7f0a94ea64b86d2b4946d30b6cedb38133d6603";

     

       1309
       1309
       -
             sha256 = "05j1lfqxagndglyh337b6v2l4zmpa9fwrkgr0g4kk1s6f0lmla2b";

     

       1344
       1344
       +
             rev = "3eee7e801723d9c174d801b94b2c2ddcee43ac56";

     

       1345
       1345
       +
             sha256 = "0z8766wgam2s2vwp9a3xi9cl5c3sb99iadinzy7c348wx004nkxq";

     

       1310
       1346
        
           };

     

       1311
       1347
        
           dependencies = [];

     

       1312
       1348
        
       

     
···

       1499
       1535
        
         };

     

       1500
       1536
        
       

     

       1501
       1537
        
         vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       1502
       1502
       -
           name = "vim-addon-async-2016-06-15";

     

       1538
       1538
       +
           name = "vim-addon-async-2016-07-12";

     

       1503
       1539
        
           src = fetchgit {

     

       1504
       1540
        
             url = "git://github.com/MarcWeber/vim-addon-async";

     

       1505
       1505
       -
             rev = "4fcdf0c8a0da8b9dc2d5ad25e2cf7692cfbc10f3";

     

       1506
       1506
       -
             sha256 = "1qa8ivh93ln30jbdwm9xg50yinvysvhricrkfjgg4v5nvk5sxj5n";

     

       1541
       1541
       +
             rev = "b14414215b394a0ef887ea301085ae4b80012e38";

     

       1542
       1542
       +
             sha256 = "1gr0rjn1vwqv4p51yb0s65gnpy1r0533lfy5nqbg20j4687yxls5";

     

       1507
       1543
        
           };

     

       1508
       1544
        
           dependencies = ["vim-addon-signs"];

     

       1509
       1545
        
       

     
···

       1741
       1777
        
         };

     

       1742
       1778
        
       

     

       1743
       1779
        
         vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       1744
       1744
       -
           name = "vim-gitgutter-2016-06-27";

     

       1780
       1780
       +
           name = "vim-gitgutter-2016-07-12";

     

       1745
       1781
        
           src = fetchgit {

     

       1746
       1782
        
             url = "git://github.com/airblade/vim-gitgutter";

     

       1747
       1747
       -
             rev = "b5f23e986747a6f4b1dc1196d2a5bd3dc7c8c2b6";

     

       1748
       1748
       -
             sha256 = "0z3f4yamkv3fmqnrr00j86xwrrfv199fiabpjqnk583b5kcbn90j";

     

       1783
       1783
       +
             rev = "26c6b549f287b8ae348eda083e7c77f79f4de28b";

     

       1784
       1784
       +
             sha256 = "1jrz0vqd580y7psszq31jk4v4jdh2cvqvxgcy347simpc5ap16hs";

     

       1749
       1785
        
           };

     

       1750
       1786
        
           dependencies = [];

     

       1751
       1787

+14

pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch

···

       1
       1
       +
       

     

       2
       2
       +
       --- ./third_party/ycmd/cpp/CMakeLists.txt

     

       3
       3
       +
       +++ ./third_party/ycmd/cpp/CMakeLists.txt

     

       4
       4
       +
       @@ -121,8 +121,8 @@

     

       5
       5
       +
            set( CPP11_AVAILABLE true )

     

       6
       6
       +
          endif()

     

       7
       7
       +
        elseif( COMPILER_IS_CLANG )

     

       8
       8
       +
       -  set( CPP11_AVAILABLE true )

     

       9
       9
       +
       -  set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" )

     

       10
       10
       +
       +  #set( CPP11_AVAILABLE true )

     

       11
       11
       +
       +  #  set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" )

     

       12
       12
       +
          set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++" )

     

       13
       13
       +
        endif()

     

       14
       14
       +

+36

pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch

···

       1
       1
       +
       --- ./third_party/ycmd/cpp/ycm/CMakeLists.txt

     

       2
       2
       +
       +++ ./third_party/ycmd/cpp/ycm/CMakeLists.txt

     

       3
       3
       +
       @@ -335,7 +335,7 @@

     

       4
       4
       +
              COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"

     

       5
       5
       +
            )

     

       6
       6
       +
        

     

       7
       7
       +
       -    if( APPLE )

     

       8
       8
       +
       +  #if( APPLE )

     

       9
       9
       +
              # In OS X El Capitan, Apple introduced System Integrity Protection.

     

       10
       10
       +
              # Amongst other things, this introduces features to the dynamic loader

     

       11
       11
       +
              # (dyld) which cause it to "sanitise" (and complain about) embedded

     

       12
       12
       +
       @@ -354,15 +354,15 @@

     

       13
       13
       +
              # simply strip the rpath entry from the dylib.  There's no way any

     

       14
       14
       +
              # @executable_path that python might have could be in any way useful to

     

       15
       15
       +
              # libclang.dylib, so this seems perfectly safe.

     

       16
       16
       +
       -      get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )

     

       17
       17
       +
       -      add_custom_command( TARGET ${PROJECT_NAME}

     

       18
       18
       +
       -                          POST_BUILD

     

       19
       19
       +
       -                          COMMAND install_name_tool

     

       20
       20
       +
       -                          "-delete_rpath"

     

       21
       21
       +
       -                          "@executable_path/../lib"

     

       22
       22
       +
       -                          "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"

     

       23
       23
       +
       -                        )

     

       24
       24
       +
       -    endif()

     

       25
       25
       +
       +      #    get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )

     

       26
       26
       +
       +      #add_custom_command( TARGET ${PROJECT_NAME}

     

       27
       27
       +
       +      #                    POST_BUILD

     

       28
       28
       +
       +      #                    COMMAND install_name_tool

     

       29
       29
       +
       +      #                    "-delete_rpath"

     

       30
       30
       +
       +      #                    "@executable_path/../lib"

     

       31
       31
       +
       +      #                    "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"

     

       32
       32
       +
       +      #                  )

     

       33
       33
       +
       +      # endif()

     

       34
       34
       +
          endif()

     

       35
       35
       +
        endif()

     

       36
       36
       +

pkgs/misc/vim-plugins/vim-plugin-names

···

       21
       21
        
       "ghcmod"

     

       22
       22
        
       "github:Chiel92/vim-autoformat"

     

       23
       23
        
       "github:LnL7/vim-nix"

     

       24
       24
       +
       "github:sbdchd/neoformat"

     

       24
       25
        
       "github:Shougo/deoplete.nvim"

     

       25
       26
        
       "github:ajh17/Spacegray.vim"

     

       26
       27
        
       "github:alvan/vim-closetag"

     
···

       32
       33
        
       "github:ctrlpvim/ctrlp.vim"

     

       33
       34
        
       "github:digitaltoad/vim-jade"

     

       34
       35
        
       "github:eagletmt/neco-ghc"

     

       36
       36
       +
       "github:elmcast/elm-vim"

     

       35
       37
        
       "github:embear/vim-localvimrc"

     

       36
       38
        
       "github:enomsg/vim-haskellConcealPlus"

     

       37
       39
        
       "github:esneider/YUNOcommit.vim"

     
···

       73
       75
        
       "github:racer-rust/vim-racer"

     

       74
       76
        
       "github:raichoo/purescript-vim"

     

       75
       77
        
       "github:rust-lang/rust.vim"

     

       78
       78
       +
       "github:sheerun/vim-polyglot"

     

       76
       79
        
       "github:shougo/neocomplete.vim"

     

       77
       80
        
       "github:shougo/neosnippet-snippets"

     

       78
       81
        
       "github:shougo/neosnippet.vim"

+5 -2

pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme

···

       4
       4
        
             llvmPackages.llvm

     

       5
       5
        
           ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;

     

       6
       6
        
       

     

       7
       7
       -
           propagatedBuildInputs = [

     

       8
       8
       -
             rustracerd

     

       7
       7
       +
           propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd;

     

       8
       8
       +
       

     

       9
       9
       +
           patches = [

     

       10
       10
       +
             ./patches/youcompleteme/1-top-cmake.patch

     

       11
       11
       +
             ./patches/youcompleteme/2-ycm-cmake.patch

     

       9
       12
        
           ];

     

       10
       13
        
       

     

       11
       14
        
           buildPhase = ''

+5 -3

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

···

       1
       1
       -
       { stdenv, fetchurl, musl

     

       1
       1
       +
       { stdenv, lib, fetchurl, glibc, musl

     

       2
       2
        
       , enableStatic ? false

     

       3
       3
        
       , enableMinimal ? false

     

       4
       4
        
       , useMusl ? false

     
···

       50
       50
        
       

     

       51
       51
        
           CONFIG_LFS y

     

       52
       52
        
       

     

       53
       53
       -
           ${stdenv.lib.optionalString enableStatic ''

     

       53
       53
       +
           ${lib.optionalString enableStatic ''

     

       54
       54
        
             CONFIG_STATIC y

     

       55
       55
        
           ''}

     

       56
       56
        
       

     
···

       66
       66
        
           EOF

     

       67
       67
        
       

     

       68
       68
        
           make oldconfig

     

       69
       69
       -
         '' + stdenv.lib.optionalString useMusl ''

     

       69
       69
       +
         '' + lib.optionalString useMusl ''

     

       70
       70
        
           makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")

     

       71
       71
        
         '';

     

       72
       72
       +
       

     

       73
       73
       +
         buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ];

     

       72
       74
        
       

     

       73
       75
        
         crossAttrs = {

     

       74
       76
        
           extraCrossConfig = ''

+4 -4

pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "firmware-linux-nonfree-${version}";

     

       5
       5
       -
         version = "2016-05-18";

     

       5
       5
       +
         version = "2016-07-12";

     

       6
       6
        
       

     

       7
       7
        
         # This repo is built by merging the latest versions of

     

       8
       8
        
         # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/

     
···

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "wkennington";

     

       16
       16
        
           repo = "linux-firmware";

     

       17
       17
       -
           rev = "19495832c6899bd811874439376d513290773c31";

     

       18
       18
       -
           sha256 = "1700a24sfw6xa3q3r8aa5wfhydgix83m57plpfirdmc9qr4isrr0";

     

       17
       17
       +
           rev = "cccb6a0da98372bd66787710249727ad6b0aaf72";

     

       18
       18
       +
           sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         preInstall = ''

     
···

       29
       29
        
           homepage = http://packages.debian.org/sid/firmware-linux-nonfree;

     

       30
       30
        
           license = licenses.unfreeRedistributableFirmware;

     

       31
       31
        
           platforms = platforms.linux;

     

       32
       32
       -
           maintainers = with maintainers; [ wkennington ];

     

       32
       32
       +
           maintainers = with maintainers; [ wkennington fpletz ];

     

       33
       33
        
           priority = 6; # give precedence to kernel firmware

     

       34
       34
        
         };

     

       35
       35

+22

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

···

       1
       1
       +
       { stdenv, lib, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "fnotifystat-${version}";

     

       5
       5
       +
         version = "0.01.14";

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";

     

       8
       8
       +
           sha256 = "1cc3w94v8b4nfpkgr33gfzxpwaf43brqyc0fla9p70gk3hxjqzi5";

     

       9
       9
       +
         };

     

       10
       10
       +
         installFlags = [ "DESTDIR=$(out)" ];

     

       11
       11
       +
         postInstall = ''

     

       12
       12
       +
           mv $out/usr/* $out

     

       13
       13
       +
           rm -r $out/usr

     

       14
       14
       +
         '';

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "File activity monitoring tool";

     

       17
       17
       +
           homepage = http://kernel.ubuntu.com/~cking/fnotifystat/;

     

       18
       18
       +
           license = licenses.gpl2;

     

       19
       19
       +
           platforms = platforms.linux;

     

       20
       20
       +
           maintainers = with maintainers; [ womfoo ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+22

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

···

       1
       1
       +
       { stdenv, lib, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "forkstat-${version}";

     

       5
       5
       +
         version = "0.01.13";

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";

     

       8
       8
       +
           sha256 = "12dmqpv0q3x166sya93rhcj7vs4868x7y7lwfwv9l54hhirpamhq";

     

       9
       9
       +
         };

     

       10
       10
       +
         installFlags = [ "DESTDIR=$(out)" ];

     

       11
       11
       +
         postInstall = ''

     

       12
       12
       +
           mv $out/usr/* $out

     

       13
       13
       +
           rm -r $out/usr

     

       14
       14
       +
         '';

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "Process fork/exec/exit monitoring tool";

     

       17
       17
       +
           homepage = http://kernel.ubuntu.com/~cking/forkstat/;

     

       18
       18
       +
           license = licenses.gpl2;

     

       19
       19
       +
           platforms = platforms.linux;

     

       20
       20
       +
           maintainers = with maintainers; [ womfoo ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

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

···

       18
       18
        
           systemd

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       +
         patchPhase = ''

     

       22
       22
       +
           substituteInPlace Makefile \

     

       23
       23
       +
             --replace "libsystemd-login" "libsystemd"

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       21
       26
        
         installPhase = ''

     

       22
       27
        
           make install prefix=$out bindir=$out/bin docdir=$out/share/doc \

     

       23
       28
        
             mandir=$out/share/man INSTALL="install -c" INSTALLDATA="install -c -m 644"

+2 -2

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

···

       12
       12
        
       with stdenv.lib;

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         name = "lxc-${version}";

     

       15
       15
       -
         version = "2.0.1";

     

       15
       15
       +
         version = "2.0.3";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";

     

       19
       19
       -
           sha256 = "0l4fs6ckvip5akfa0vbjfk34ddvcv0c84mmpj9yrcfl67qwn31z9";

     

       19
       19
       +
           sha256 = "1mp83r1v9bcxjl7a441sm6plipj8aglhnmkxczp3jinlrnh41pw2";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+22

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

···

       1
       1
       +
       { stdenv, lib, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "powerstat-${version}";

     

       5
       5
       +
         version = "0.02.10";

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";

     

       8
       8
       +
           sha256 = "11n2k20h27j7m8j0l524w23xlkjhapsb3ml1qpx1si7gf0pkglcl";

     

       9
       9
       +
         };

     

       10
       10
       +
         installFlags = [ "DESTDIR=$(out)" ];

     

       11
       11
       +
         postInstall = ''

     

       12
       12
       +
           mv $out/usr/* $out

     

       13
       13
       +
           rm -r $out/usr

     

       14
       14
       +
         '';

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "Laptop power measuring tool";

     

       17
       17
       +
           homepage = http://kernel.ubuntu.com/~cking/powerstat/;

     

       18
       18
       +
           license = licenses.gpl2;

     

       19
       19
       +
           platforms = platforms.linux;

     

       20
       20
       +
           maintainers = with maintainers; [ womfoo ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+22

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

···

       1
       1
       +
       { stdenv, lib, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "smemstat-${version}";

     

       5
       5
       +
         version = "0.01.14";

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";

     

       8
       8
       +
           sha256 = "0qkpbg0n40d8m9jzf3ylpdp65zzs344zbjn8khha4plbwg00ijrw";

     

       9
       9
       +
         };

     

       10
       10
       +
         installFlags = [ "DESTDIR=$(out)" ];

     

       11
       11
       +
         postInstall = ''

     

       12
       12
       +
           mv $out/usr/* $out

     

       13
       13
       +
           rm -r $out/usr

     

       14
       14
       +
         '';

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "Memory usage monitoring tool";

     

       17
       17
       +
           homepage = http://kernel.ubuntu.com/~cking/smemstat/;

     

       18
       18
       +
           license = licenses.gpl2;

     

       19
       19
       +
           platforms = platforms.linux;

     

       20
       20
       +
           maintainers = with maintainers; [ womfoo ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+2 -2

pkgs/servers/emby/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "emby-${version}";

     

       5
       5
       -
         version = "3.0.5985";

     

       5
       5
       +
         version = "3.0.5986";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "16p8qr9pf6ww6xdfbsqamnpk70i4dadz30lnvliyxaaslggjbh4b";

     

       9
       9
       +
           sha256 = "0lccyvwk9pm9vn3fg4pa9956f4xn6fcqzlyj8rkxgwf7avzibxix";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = with pkgs; [

+2 -2

pkgs/servers/etcd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "etcd-${version}";

     

       5
       5
       -
         version = "2.3.0";

     

       5
       5
       +
         version = "2.3.7";

     

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

     

       7
       7
        
         

     

       8
       8
        
         goPackagePath = "github.com/coreos/etcd";

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "coreos";

     

       13
       13
        
           repo = "etcd";

     

       14
       14
       -
           sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";

     

       14
       14
       +
           sha256 = "07rdnhcpnvnkxj5pqacxz669rzn5vw2i1zmf6dd4nv7wpfscdw9f";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./deps.json;

+3 -3

pkgs/servers/http/nginx/default.nix pkgs/servers/http/nginx/generic.nix

···

       3
       3
        
       , withStream ? false

     

       4
       4
        
       , modules ? []

     

       5
       5
        
       , hardening ? true

     

       6
       6
       +
       , version, sha256, ...

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       with stdenv.lib;

     

       9
       10
        
       

     

       10
       10
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation {

     

       11
       12
        
         name = "nginx-${version}";

     

       12
       12
       -
         version = "1.10.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "http://nginx.org/download/nginx-${version}.tar.gz";

     

       16
       16
       -
           sha256 = "00d8hxj8453c7989qd7z4f1mjp0k3ib8k29i1qyf11b4ar35ilqz";

     

       16
       16
       +
           inherit sha256;

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19

pkgs/servers/http/nginx/default.upstream pkgs/servers/http/nginx/stable.upstream

pkgs/servers/http/nginx/mainline.nix

···

       1
       1
       +
       { callPackage, ... }@args:

     

       2
       2
       +
       

     

       3
       3
       +
       callPackage ./generic.nix (args // {

     

       4
       4
       +
         version = "1.11.2";

     

       5
       5
       +
         sha256 = "02khwad28ar2jjdfssysx262bgwgirm9967gnfhw9ga7wvipncm0";

     

       6
       6
       +
       })

pkgs/servers/http/nginx/stable.nix

···

       1
       1
       +
       { callPackage, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       callPackage ./generic.nix (args // {

     

       4
       4
       +
         version = "1.10.1";

     

       5
       5
       +
         sha256 = "00d8hxj8453c7989qd7z4f1mjp0k3ib8k29i1qyf11b4ar35ilqz";

     

       6
       6
       +
       })

pkgs/servers/http/nginx/unstable.upstream pkgs/servers/http/nginx/mainline.upstream

+8 -6

pkgs/servers/monitoring/grafana/default.nix

···

       1
       1
       -
       { lib, buildGoPackage, fetchurl, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
       -
         version = "3.0.1";

     

       4
       4
       +
         version = "3.1.0";

     

       5
       5
       +
         ts = "1468321182";

     

       5
       6
        
         name = "grafana-v${version}";

     

       6
       7
        
         goPackagePath = "github.com/grafana/grafana";

     

       7
       8
        
       

     
···

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

     

       10
       11
        
           owner = "grafana";

     

       11
       12
        
           repo = "grafana";

     

       12
       12
       -
           sha256 = "1zykgf8xq7m040d4yljcbz23gh8ppaqnxj50ncj1cjyi5k88i3i9";

     

       13
       13
       +
           sha256 = "1p3qp3p4wsb7m2lvdcrc1wz5mxqwqsj5xfqp28hkbfdqh3lblh42";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         srcStatic = fetchurl {

     

       16
       16
       -
           url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-.linux-x64.tar.gz";

     

       17
       17
       -
           sha256 = "14wq2cbf4djnwbbyfbhnwmwqpfh5g4yp1dckg5zzf2109ymkjrqd";

     

       17
       17
       +
           url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz";

     

       18
       18
       +
           sha256 = "174w0bx5cqriy77dyk9xsnmdskykzmgbyjczwb5kkp6j8vp7b0fs";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

     

       21
       22
        
         postInstall = ''

     

       22
       23
        
           tar -xvf $srcStatic

     

       23
       24
        
           mkdir -p $bin/share/grafana

     

       24
       24
       -
           mv grafana-*/{public,conf} $bin/share/grafana/

     

       25
       25
       +
           mv grafana-*/{public,conf,vendor} $bin/share/grafana/

     

       26
       26
       +
           ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs

     

       25
       27
        
         '';

     

       26
       28
        
       

     

       27
       29
        
         meta = with lib; {

+3 -3

pkgs/servers/monitoring/prometheus/alertmanager.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "alertmanager-${version}";

     

       5
       5
       -
         version = "0.1.0";

     

       6
       6
       -
         rev = "${version}";

     

       5
       5
       +
         version = "0.3.0";

     

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

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/alertmanager";

     

       9
       9
        
       

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "alertmanager";

     

       14
       14
       -
           sha256 = "1ya465bns6cj2lqbipmfm13wz8kxii5h9mm7lc0ba1xv26xx5zs7";

     

       14
       14
       +
           sha256 = "0ychc2qvn3lzs4rg5f5sslil7clvcpzclcmfj83qjqp8krpg72b5";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # Tests exist, but seem to clash with the firewall.

+3 -3

pkgs/servers/monitoring/prometheus/collectd-exporter.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "collectd-exporter-${version}";

     

       5
       5
       -
         version = "0.1.0";

     

       5
       5
       +
         version = "0.3.1";

     

       6
       6
        
         rev = version;

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/collectd_exporter";

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "collectd_exporter";

     

       14
       14
       -
           sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";

     

       14
       14
       +
           sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./collectd-exporter_deps.json;

     

       18
       18
        
       

     

       19
       19
        
         meta = with stdenv.lib; {

     

       20
       20
        
           description = "Relay server for exporting metrics from collectd to Prometheus";

     

       21
       21
       -
           homepage = https://github.com/prometheus/alertmanager;

     

       21
       21
       +
           homepage = https://github.com/prometheus/collectd_exporter;

     

       22
       22
        
           license = licenses.asl20;

     

       23
       23
        
           maintainers = with maintainers; [ benley ];

     

       24
       24
        
           platforms = platforms.unix;

+3 -3

pkgs/servers/monitoring/prometheus/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "prometheus-${version}";

     

       5
       5
       -
         version = "0.17.0";

     

       6
       6
       -
         rev = "${version}";

     

       5
       5
       +
         version = "1.0.0";

     

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

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/prometheus";

     

       9
       9
        
       

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "prometheus";

     

       14
       14
       -
           sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";

     

       14
       14
       +
           sha256 = "0wb6aj2019b2bkaai94mxdy8gr6gs7jpkm7ms8h9n2ms041gdsff";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         docheck = true;

+2 -2

pkgs/servers/monitoring/prometheus/haproxy-exporter.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "haproxy_exporter-${version}";

     

       5
       5
       -
         version = "0.4.0";

     

       5
       5
       +
         version = "0.7.0";

     

       6
       6
        
         rev = version;

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/haproxy_exporter";

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "haproxy_exporter";

     

       14
       14
       -
           sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";

     

       14
       14
       +
           sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./haproxy-exporter_deps.json;

+2 -2

pkgs/servers/monitoring/prometheus/mysqld-exporter.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "mysqld_exporter-${version}";

     

       5
       5
       -
         version = "0.1.0";

     

       5
       5
       +
         version = "0.8.1";

     

       6
       6
        
         rev = version;

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/mysqld_exporter";

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "mysqld_exporter";

     

       14
       14
       -
           sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";

     

       14
       14
       +
           sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./mysqld-exporter_deps.json;

+1 -1

pkgs/servers/monitoring/prometheus/nginx-exporter.nix

···

       4
       4
        
         name = "nginx_exporter-${version}";

     

       5
       5
        
         version = "20160524-${stdenv.lib.strings.substring 0 7 rev}";

     

       6
       6
        
         rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";

     

       7
       7
       -
         

     

       7
       7
       +
       

     

       8
       8
        
         goPackagePath = "github.com/discordianfish/nginx_exporter";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchgit {

+5 -6

pkgs/servers/monitoring/prometheus/node-exporter.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "node_exporter-${version}";

     

       5
       5
       -
         version = "0.11.0";

     

       5
       5
       +
         version = "0.12.0";

     

       6
       6
        
         rev = version;

     

       7
       7
       -
         

     

       7
       7
       +
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/node_exporter";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "node_exporter";

     

       14
       14
       -
           sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";

     

       14
       14
       +
           sha256 = "0ih8w9ji0fw1smsi45jgvrpqfzm3f5bvk9q3nwrl0my5xkksnr8g";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         goDeps = ./node-exporter_deps.json;

     

       18
       18
       -
       

     

       19
       19
       -
         doCheck = true;

     

       17
       17
       +
         # FIXME: megacli test fails

     

       18
       18
       +
         doCheck = false;

     

       20
       19
        
       

     

       21
       20
        
         meta = with stdenv.lib; {

     

       22
       21
        
           description = "Prometheus exporter for machine metrics";

-18

pkgs/servers/monitoring/prometheus/node-exporter_deps.json

···

       1
       1
       -
       [

     

       2
       2
       -
         {

     

       3
       3
       -
           "include": "../../libs.json",

     

       4
       4
       -
           "packages": [

     

       5
       5
       -
             "github.com/soundcloud/go-runit",

     

       6
       6
       -
             "github.com/beevik/ntp",

     

       7
       7
       -
             "github.com/prometheus/client_golang",

     

       8
       8
       -
             "github.com/prometheus/client_model",

     

       9
       9
       -
             "bitbucket.org/ww/goautoneg",

     

       10
       10
       -
             "github.com/Sirupsen/logrus",

     

       11
       11
       -
             "github.com/beorn7/perks",

     

       12
       12
       -
             "github.com/matttproud/golang_protobuf_extensions",

     

       13
       13
       -
             "github.com/prometheus/log",

     

       14
       14
       -
             "github.com/golang/protobuf",

     

       15
       15
       -
             "github.com/prometheus/procfs"

     

       16
       16
       -
           ]

     

       17
       17
       -
         }

     

       18
       18
       -
       ]

+3 -3

pkgs/servers/monitoring/prometheus/pushgateway.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "pushgateway-${version}";

     

       5
       5
       -
         version = "0.1.1";

     

       5
       5
       +
         version = "0.3.0";

     

       6
       6
        
         rev = version;

     

       7
       7
       -
         

     

       7
       7
       +
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/pushgateway";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
        
           repo = "pushgateway";

     

       14
       14
       -
           sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";

     

       14
       14
       +
           sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./pushgateway_deps.json;

+4 -4

pkgs/servers/monitoring/prometheus/statsd-bridge.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "statsd_bridge-${version}";

     

       5
       5
       -
         version = "0.1.0";

     

       5
       5
       +
         version = "0.3.0";

     

       6
       6
        
         rev = version;

     

       7
       7
       -
         

     

       7
       7
       +
       

     

       8
       8
        
         goPackagePath = "github.com/prometheus/statsd_bridge";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "prometheus";

     

       13
       13
       -
           repo = "statsd_bridge";

     

       14
       14
       -
           sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";

     

       13
       13
       +
           repo = "statsd_exporter";

     

       14
       14
       +
           sha256 = "1gg9v224n05khcwy27637w3rwh0cymm7hx6bginfxd7730rmpp2r";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./statsd-bridge_deps.json;

+6 -6

pkgs/servers/plex/default.nix

···

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         plexpkg = if enablePlexPass then {

     

       8
       8
       -
           version = "0.9.16.5.1966";

     

       9
       9
       -
           vsnHash = "81a3bf0";

     

       10
       10
       -
           sha256 = "1sgdd3r067j9ysfp90wjx6zi01s00wzgzs27l8xdlsbnvjr8zmf8";

     

       8
       8
       +
           version = "1.0.1.2396";

     

       9
       9
       +
           vsnHash = "c094d0d";

     

       10
       10
       +
           sha256 = "0bhbpaj88989zn1q590mkcqshcpir87yiac9x1dl0afzpxj09lcz";

     

       11
       11
        
         } else {

     

       12
       12
       -
           version = "0.9.16.4.1911";

     

       13
       13
       -
           vsnHash = "ee6e505";

     

       14
       14
       -
           sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd";

     

       12
       12
       +
           version = "1.0.0.2261";

     

       13
       13
       +
           vsnHash = "a17e99e";

     

       14
       14
       +
           sha256 = "14li33ni6aaa1qwvc02a066k52s1qwhpv55prvlmq3m5jm3iv0lr";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
       in stdenv.mkDerivation rec {

+33

pkgs/servers/sonarr/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "sonarr-${version}";

     

       5
       5
       +
         version = "2.0.0.4230";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";

     

       9
       9
       +
           sha256 = "16nx0v5hpqlwna2hzpcpzvm7qc361yjxbqnwz5bfnnkb0h7ik5m6";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           makeWrapper

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       16
       16
       +
         installPhase = ''

     

       17
       17
       +
           mkdir -p $out/bin

     

       18
       18
       +
           cp -r * $out/bin/

     

       19
       19
       +
       

     

       20
       20
       +
           makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \

     

       21
       21
       +
             --add-flags "$out/bin/NzbDrone.exe" \

     

       22
       22
       +
             --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \

     

       23
       23
       +
             --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib"

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         meta = {

     

       27
       27
       +
           description = "Smart PVR for newsgroup and bittorrent users";

     

       28
       28
       +
           homepage = https://sonarr.tv/;

     

       29
       29
       +
           license = stdenv.lib.licenses.gpl3;

     

       30
       30
       +
           maintainers = [ stdenv.lib.maintainers.fadenb ];

     

       31
       31
       +
           platforms = stdenv.lib.platforms.all;

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+3 -3

pkgs/shells/oh-my-zsh/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         name = "oh-my-zsh-git-${version}";

     

       10
       10
       -
         version = "2016-07-05";

     

       10
       10
       +
         version = "2016-07-15";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchgit {

     

       13
       13
        
           url = "https://github.com/robbyrussell/oh-my-zsh";

     

       14
       14
       -
           rev = "644bc641ad48c74c88631d79d48ec9b6f3f5a3e5";

     

       15
       15
       -
           sha256 = "1lmblfcd68pnc38bn6yjqs7sap5qinj37xv881a1rx4q0w38an07";

     

       14
       14
       +
           rev = "96a2092e377139fbcd95d7b7ac703b740daa22f6";

     

       15
       15
       +
           sha256 = "0v3hzpfj98mfz0y06qch2hf14iz0vpb9pfysw8hc4mnp0jzh5vz1";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         phases = "installPhase";

+2 -4

pkgs/tools/archivers/p7zip/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         version = "15.14.1";

     

       5
       5
       -
       in

     

       6
       3
        
       stdenv.mkDerivation rec {

     

       7
       4
        
         name = "p7zip-${version}";

     

       5
       5
       +
         version = "16.02";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchurl {

     

       10
       8
        
           url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2";

     

       11
       11
       -
           sha256 = "1m15iwglyjpiw82m7dbpykz8s55imch34w20w09l34116vdb97b9";

     

       9
       9
       +
           sha256 = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f";

     

       12
       10
        
         };

     

       13
       11
        
       

     

       14
       12
        
         preConfigure = ''

+9 -7

pkgs/tools/archivers/xarchiver/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gtk2, pkgconfig, intltool }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, gtk, pkgconfig, intltool }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.5.4";

     

       4
       4
       +
         version = "0.5.4.6";

     

       5
       5
        
         name = "xarchiver-${version}";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://sourceforge/xarchiver/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "1x1f8m71cvv2p1364rz99iqs2caxj7yrb46aikz6xigwg4wsfgz6";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "ib";

     

       9
       9
       +
           repo = "xarchiver";

     

       10
       10
       +
           rev = "${name}";

     

       11
       11
       +
           sha256 = "1w6b4cchd4prswrn981a7bkq44ad51xm2qiwlpzy43ynql14q877";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       12
       -
         buildInputs = [ gtk2 pkgconfig intltool ];

     

       14
       14
       +
         buildInputs = [ gtk pkgconfig intltool ];

     

       13
       15
        
       

     

       14
       16
        
         meta = {

     

       15
       15
       -
           description = "GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";

     

       17
       17
       +
           description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";

     

       16
       18
        
           homepage = http://sourceforge.net/projects/xarchiver/;

     

       17
       19
        
           maintainers = [ stdenv.lib.maintainers.domenkozar ];

     

       18
       20
        
           license = stdenv.lib.licenses.gpl2;

+4 -4

pkgs/tools/graphics/nip2/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome,

     

       2
       2
       -
       fftw, gsl, goffice_0_8, libgsf }:

     

       2
       2
       +
       fftw, gsl, goffice, libgsf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "nip2-8.0";

     

       5
       5
       +
         name = "nip2-8.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "10ybac0qrz63x1yk1d0gpv9z1vzpadyii2qhrai6lllplzw6jqx7";

     

       9
       9
       +
           sha256 = "0vr12gyfvhxx2a28y74lzfg379d1fk0g9isc69k0vdgpn4y1i8aa";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs =

     

       13
       13
        
         [ pkgconfig glib libxml2 flex bison vips

     

       14
       14
       -
           gnome.gtk fftw gsl goffice_0_8 libgsf

     

       14
       14
       +
           gnome.gtk fftw gsl goffice libgsf

     

       15
       15
        
         ];

     

       16
       16
        
       

     

       17
       17
        
         meta = with stdenv.lib; {

+2 -2

pkgs/tools/graphics/vips/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "vips-8.2.2";

     

       7
       7
       +
         name = "vips-8.3.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "12b319aicr129cpi5sixwd3q91y97vwwva6b044zy54px4s8ls0g";

     

       11
       11
       +
           sha256 = "01hh1baar2r474kny24fcq6ddshcvq104207mqxnkis0as6pzjq9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs =

+7 -2

pkgs/tools/misc/disper/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, python}:

     

       1
       1
       +
       {stdenv, fetchurl, python, xorg, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "disper-0.3.1";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [python];

     

       6
       6
       +
         buildInputs = [python makeWrapper];

     

       7
       7
        
       

     

       8
       8
        
         preConfigure = ''

     

       9
       9
        
           export makeFlags="PREFIX=$out"

     

       10
       10
       +
         '';

     

       11
       11
       +
       

     

       12
       12
       +
         postInstall = ''

     

       13
       13
       +
             wrapProgram $out/bin/disper \

     

       14
       14
       +
               --prefix "LD_LIBRARY_PATH" : "${xorg.libXrandr.out}/lib:${xorg.libX11.out}/lib"

     

       10
       15
        
         '';

     

       11
       16
        
       

     

       12
       17
        
         src = fetchurl {

+3 -2

pkgs/tools/misc/ethtool/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "ethtool-4.5";

     

       4
       4
       +
         name = "ethtool-${version}";

     

       5
       5
       +
         version = "4.6";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "0fyakzpcrjb7hkaj9ccpcgza7r2im17qzxy9w6xzbiss5hrk8a5v";

     

       9
       9
       +
           sha256 = "e90589a9349d008cce8c0510ac4e8878efdc0ddb1b732a9a4cc333b101313415";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       12
        
         meta = with stdenv.lib; {

+10 -3

pkgs/tools/misc/fzf/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "fzf-${version}";

     

       5
       5
       -
         version = "0.13.2";

     

       5
       5
       +
         version = "0.13.3";

     

       6
       6
        
         rev = "${version}";

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/junegunn/fzf";

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "junegunn";

     

       13
       13
        
           repo = "fzf";

     

       14
       14
       -
           sha256 = "12dr0wib2ajs64a8d3l3zmgj2y8rklkc3xrvgscxgiv29lrlmvfz";

     

       14
       14
       +
           sha256 = "0mfrlb91akzrj0qpjpaa9bkp6m9z95z56glamry73qy21vbnj58m";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ ncurses ];

     

       18
       18
        
       

     

       19
       19
        
         goDeps = ./deps.json;

     

       20
       20
       -
         

     

       20
       20
       +
       

     

       21
       21
        
         patchPhase = ''

     

       22
       22
        
           sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim

     

       23
       23
        
           sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim

     
···

       28
       28
        
           mkdir -p $out/share/vim-plugins

     

       29
       29
        
           ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}

     

       30
       30
        
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with stdenv.lib; {

     

       33
       33
       +
           homepage = https://github.com/junegunn/fzf;

     

       34
       34
       +
           description = "A command-line fuzzy finder written in Go";

     

       35
       35
       +
           license = licenses.mit;

     

       36
       36
       +
           platforms = platforms.unix;

     

       37
       37
       +
         };

     

       31
       38
        
       }

pkgs/tools/misc/gti/default.nix

···

       11
       11
        
           sha256 = "1wki7d61kcmv9s3xayky9cz84qa773x3y1z88y768hq8ifwadcbn";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         prePatch = ''

     

       15
       15
       +
           substituteInPlace Makefile --replace gcc cc

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       14
       18
        
         installPhase = ''

     

       15
       19
        
           mkdir -p $out/bin $out/share/man/man6

     

       16
       20
        
           cp gti $out/bin

+2 -2

pkgs/tools/misc/youtube-dl/default.nix

···

       12
       12
        
       buildPythonApplication rec {

     

       13
       13
        
       

     

       14
       14
        
         name = "youtube-dl-${version}";

     

       15
       15
       -
         version = "2016.07.09.2";

     

       15
       15
       +
         version = "2016.07.16";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";

     

       19
       19
       -
           sha256 = "0qs99ss1w22apx3n2173j5mly7h0ngfgkkgz07bn30235saf0fd3";

     

       19
       19
       +
           sha256 = "017x2hqc2bacypjmn9ac9f91y9y6afydl0z7dich5l627494hvfg";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ makeWrapper zip pandoc ];

+4 -3

pkgs/tools/networking/ndjbdns/default.nix

···

       1
       1
        
       { stdenv, fetchurl, systemd, pkgconfig }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "1.05.9";

     

       4
       4
       +
         version = "1.06";

     

       5
       5
        
         name = "ndjbdns-${version}";

     

       6
       6
       +
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "http://pjp.dgplug.org/ndjbdns/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0gf3hlmr6grcn6dzflf83lqqfp6hk3ldhbc7z0a1rrh059m93ap5";

     

       9
       9
       +
           sha256 = "09qi5a9abqm08iqmxj74fzzq9x1w5lzr1jlbzj2hl8hz0g2sgraw";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       12
        
         buildInputs = [ pkgconfig systemd ];

     
···

       21
       22
        
           platforms = platforms.linux;

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       24
       -
       }
     

       25
       25
       +
       }

+3 -5

pkgs/tools/networking/openssh/default.nix

···

       45
       45
        
             ./locale_archive.patch

     

       46
       46
        
             ./fix-host-key-algorithms-plus.patch

     

       47
       47
        
             ./CVE-2015-8325.patch

     

       48
       48
       +
       

     

       49
       49
       +
             # See discussion in https://github.com/NixOS/nixpkgs/pull/16966

     

       50
       50
       +
             ./dont_create_privsep_path.patch

     

       48
       51
        
           ]

     

       49
       52
        
           ++ optional withGssapiPatches gssapiSrc;

     

       50
       53
        
       

     
···

       65
       68
        
           ++ optional withKerberos "--with-kerberos5=${kerberos}"

     

       66
       69
        
           ++ optional stdenv.isDarwin "--disable-libutil"

     

       67
       70
        
           ++ optional (!linkOpenssl) "--without-openssl";

     

       68
       68
       -
       

     

       69
       69
       -
         preConfigure = ''

     

       70
       70
       -
           configureFlagsArray+=("--with-privsep-path=$out/empty")

     

       71
       71
       -
           mkdir -p $out/empty

     

       72
       72
       -
         '';

     

       73
       71
        
       

     

       74
       72
        
         enableParallelBuilding = true;

     

       75
       73

+11

pkgs/tools/networking/openssh/dont_create_privsep_path.patch

···

       1
       1
       +
       diff -ur openssh-7.2p2_orig/Makefile.in openssh-7.2p2/Makefile.in

     

       2
       2
       +
       --- openssh-7.2p2_orig/Makefile.in	2016-03-09 19:04:48.000000000 +0100

     

       3
       3
       +
       +++ openssh-7.2p2/Makefile.in	2016-07-16 09:56:05.643903293 +0200

     

       4
       4
       +
       @@ -301,7 +301,6 @@

     

       5
       5
       +
        	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5

     

       6
       6
       +
        	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8

     

       7
       7
       +
        	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)

     

       8
       8
       +
       -	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))

     

       9
       9
       +
        	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)

     

       10
       10
       +
        	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)

     

       11
       11
       +
        	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)

+10 -7

pkgs/tools/networking/proxychains/default.nix

···

       1
       1
       -
       { stdenv, fetchgit } :

     

       2
       2
       -
       stdenv.mkDerivation {

     

       3
       3
       -
         name = "proxychains-4.0.1-head";

     

       4
       4
       -
         src = fetchgit {

     

       5
       5
       -
           url = https://github.com/haad/proxychains.git;

     

       6
       6
       -
           rev = "c9b8ce35b24f9d4e80563242b759dff54867163f";

     

       7
       7
       -
           sha256 = "163h3d3lpglbzjadf8a9kfaf0i1ds25r7si6ll6d5khn1835zik5";

     

       1
       1
       +
       { stdenv, fetchFromGitHub } :

     

       2
       2
       +
       stdenv.mkDerivation rec {

     

       3
       3
       +
         name = "proxychains-${version}";

     

       4
       4
       +
         version = "4.2.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchFromGitHub {

     

       7
       7
       +
           owner = "haad";

     

       8
       8
       +
           repo = "proxychains";

     

       9
       9
       +
           rev = name;

     

       10
       10
       +
           sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc";

     

       8
       11
        
         };

     

       9
       12
        
       

     

       10
       13
        
         meta = {

+27

pkgs/tools/networking/shncpd/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "shncpd-${version}";

     

       5
       5
       +
         version = "2016-06-22";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "jech";

     

       9
       9
       +
           repo = "shncpd";

     

       10
       10
       +
           rev = "62ef688db7a6535ce11e66c8c93ab64a1bb09484";

     

       11
       11
       +
           sha256 = "1sj7a77isc2jmh7gw2naw9l9366kjx6jb909h7spj7daxdwvji8f";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         hardeningEnable = [ "pie" ];

     

       15
       15
       +
       

     

       16
       16
       +
         preConfigure = ''

     

       17
       17
       +
           makeFlags=( "PREFIX=$out" )

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with stdenv.lib; {

     

       21
       21
       +
           description = "Simple, stupid and slow HNCP daemon";

     

       22
       22
       +
           homepage = https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html;

     

       23
       23
       +
           license = licenses.mit;

     

       24
       24
       +
           platforms = platforms.linux;

     

       25
       25
       +
           maintainers = [ maintainers.fpletz ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+8 -2

pkgs/tools/networking/vtun/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, openssl, lzo, zlib, yacc, flex }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "vtun-3.0.3";

     
···

       8
       8
        
           sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         patchPhase = ''

     

       11
       11
       +
         patches = [

     

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

     

       13
       13
       +
                        sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1";

     

       14
       14
       +
                       })

     

       15
       15
       +
         ];

     

       16
       16
       +
       

     

       17
       17
       +
         postPatch = ''

     

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

     

       13
       19
        
           sed -i '/strip/d' Makefile.in

     

       14
       20
        
         '';

+40 -43

pkgs/tools/package-management/packagekit/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, intltool, glib, pkgconfig, polkit, python, sqlite, systemd

     

       2
       2
       +
       , gobjectIntrospection, vala, gtk_doc, autoreconfHook, autoconf-archive

     

       3
       3
       +
       , nix, boost

     

       4
       4
       +
       , enableCommandNotFound ? false

     

       5
       5
       +
       , enableBashCompletion ? false, bashCompletion ? null }:

     

       6
       6
       +
       

     

       7
       7
       +
       with stdenv.lib;

     

       2
       8
        
       

     

       3
       9
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "packagekit-${version}";

     

       5
       5
       -
         version = "1.1.1";

     

       10
       10
       +
         name = "packagekit-2016-06-03";

     

       6
       11
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           sha256 = "1i6an483vmm6y39szr2alq5vf6kfxhk3j5ca79qrshcj9jjlhcs8";

     

       9
       9
       -
           url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "hughsie";

     

       14
       14
       +
           repo = "PackageKit";

     

       15
       15
       +
           rev = "99fd83bbb26badf43c6a17a9f0c6dc054c7484c8";

     

       16
       16
       +
           sha256 = "0y42vl6r1wh57sbjfkn4khjs78q54wshf4p0v4nly9s7hydxpi6a";

     

       10
       17
        
         };

     

       11
       18
        
       

     

       12
       12
       -
         buildInputs = [ glib polkit python ];

     

       13
       13
       -
         propagatedBuildInputs = [ sqlite ];

     

       14
       14
       -
         nativeBuildInputs = [ intltool pkgconfig ];

     

       19
       19
       +
         buildInputs = [ glib polkit systemd python gobjectIntrospection vala ]

     

       20
       20
       +
                         ++ optional enableBashCompletion bashCompletion;

     

       21
       21
       +
         propagatedBuildInputs = [ sqlite nix boost ];

     

       22
       22
       +
         nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

     

       23
       23
       +
       

     

       24
       24
       +
         preAutoreconf = ''

     

       25
       25
       +
           gtkdocize

     

       26
       26
       +
           intltoolize

     

       27
       27
       +
         '';

     

       15
       28
        
       

     

       16
       29
        
         configureFlags = [

     

       17
       17
       -
           "--disable-static"

     

       18
       18
       -
           "--disable-python3"

     

       19
       19
       -
           "--disable-networkmanager"

     

       20
       20
       -
           "--disable-connman"

     

       21
       21
       -
           "--disable-systemd"

     

       22
       22
       -
           "--disable-bash-completion"

     

       23
       23
       -
           "--disable-gstreamer-plugin"

     

       24
       24
       -
           "--disable-gtk-module"

     

       25
       25
       -
           "--disable-command-not-found"

     

       30
       30
       +
           "--enable-systemd"

     

       31
       31
       +
           "--enable-nix"

     

       32
       32
       +
           "--disable-dummy"

     

       26
       33
        
           "--disable-cron"

     

       27
       27
       -
           "--disable-daemon-tests"

     

       28
       28
       -
           "--disable-alpm"

     

       29
       29
       -
           "--disable-aptcc"

     

       30
       30
       -
           "--enable-dummy"

     

       31
       31
       -
           "--disable-entropy"

     

       32
       32
       -
           "--disable-hif"

     

       33
       33
       -
           "--disable-pisi"

     

       34
       34
       -
           "--disable-poldek"

     

       35
       35
       -
           "--disable-portage"

     

       36
       36
       -
           "--disable-ports"

     

       37
       37
       -
           "--disable-katja"

     

       38
       38
       -
           "--disable-urpmi"

     

       39
       39
       -
           "--disable-yum"

     

       40
       40
       -
           "--disable-zypp"

     

       41
       41
       -
         ];

     

       34
       34
       +
           "--disable-introspection"

     

       35
       35
       +
           "--disable-offline-update"

     

       36
       36
       +
           "--localstatedir=/var"

     

       37
       37
       +
           "--sysconfdir=/etc"

     

       38
       38
       +
           "--with-dbus-sys=$(out)/etc/dbus-1/system.d"

     

       39
       39
       +
           "--with-systemdsystemunitdir=$(out)/lib/systemd/system/"

     

       40
       40
       +
         ]

     

       41
       41
       +
         ++ optional (!enableBashCompletion) "--disable-bash-completion"

     

       42
       42
       +
         ++ optional (!enableCommandNotFound) "--disable-command-not-found";

     

       42
       43
        
       

     

       43
       44
        
         enableParallelBuilding = true;

     

       44
       45
        
       

     

       45
       45
       -
         preInstall = ''

     

       46
       46
       -
           # Don't install anything to e.g. $out/var/cache:

     

       47
       47
       -
           for dir in src data; do

     

       48
       48
       -
             substituteInPlace $dir/Makefile \

     

       49
       49
       -
               --replace " install-data-hook" "" \

     

       50
       50
       -
               --replace " install-databaseDATA" ""

     

       51
       51
       -
           done

     

       52
       52
       -
         '';

     

       46
       46
       +
         installFlags = [

     

       47
       47
       +
           "sysconfdir=\${out}/etc"

     

       48
       48
       +
           "localstatedir=\${TMPDIR}"

     

       49
       49
       +
         ];

     

       53
       50
        
       

     

       54
       54
       -
         meta = with stdenv.lib; {

     

       51
       51
       +
         meta = {

     

       55
       52
        
           description = "System to facilitate installing and updating packages";

     

       56
       53
        
           longDescription = ''

     

       57
       54
        
             PackageKit is a system designed to make installing and updating software

     
···

       66
       63
        
           homepage = http://www.packagekit.org/;

     

       67
       64
        
           license = licenses.gpl2Plus;

     

       68
       65
        
           platforms = platforms.linux;

     

       69
       69
       -
           maintainers = with maintainers; [ nckx ];

     

       66
       66
       +
           maintainers = with maintainers; [ nckx matthewbauer ];

     

       70
       67
        
         };

     

       71
       68
        
       }

+28

pkgs/tools/security/keybase/default.nix

···

       1
       1
       +
       { stdenv, buildGoPackage, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoPackage rec {

     

       4
       4
       +
         name = "keybase-${version}";

     

       5
       5
       +
         version = "1.0.16";

     

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

     

       7
       7
       +
       

     

       8
       8
       +
         goPackagePath = "github.com/keybase/client";

     

       9
       9
       +
         subPackages = [ "go/keybase" ];

     

       10
       10
       +
       

     

       11
       11
       +
         dontRenameImports = true;

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "keybase";

     

       15
       15
       +
           repo = "client";

     

       16
       16
       +
           inherit rev;

     

       17
       17
       +
           sha256 = "0p62cqpfgx9b5kfnviqpig27i20yv9bg5mq61am5xrmkp68jk35b";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         buildFlags = [ "-tags production" ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with stdenv.lib; {

     

       23
       23
       +
           homepage = https://www.keybase.io/;

     

       24
       24
       +
           description = "The Keybase official command-line utility and service.";

     

       25
       25
       +
           platforms = platforms.linux;

     

       26
       26
       +
           maintainers = with maintainers; [ carlsverre ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+7 -4

pkgs/tools/security/minisign/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, libsodium }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, libsodium }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "minisign-${version}";

     

       5
       5
        
         version = "0.6";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/jedisct1/minisign/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           repo = "minisign";

     

       9
       9
       +
           owner = "jedisct1";

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "1m71ngxaij3q1dw602kjgj22y5xfjlxrrkjdmx1v4p36y0n6wl92";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         nativeBuildInputs = [ cmake ];

     
···

       22
       24
        
           homepage = https://jedisct1.github.io/minisign/;

     

       23
       25
        
           license = licenses.isc;

     

       24
       26
        
           maintainers = with maintainers; [ joachifm ];

     

       27
       27
       +
           platforms = platforms.unix;

     

       25
       28
        
         };

     

       26
       29
        
       }

pkgs/tools/security/nasty/default.nix

···

       9
       9
        
           sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         # does not apply cleanly with patchPhase/fetchpatch

     

       13
       13
       +
         # https://sources.debian.net/src/nasty/0.6-3/debian/patches/02_add_largefile_support.patch

     

       14
       14
       +
         CFLAGS = "-D_FILE_OFFSET_BITS=64";

     

       15
       15
       +
       

     

       12
       16
        
         buildInputs = [ gpgme ];

     

       13
       17
        
       

     

       14
       18
        
         installPhase = ''

+2 -2

pkgs/tools/security/sslscan/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "sslscan-${version}";

     

       5
       5
       -
         version = "1.11.5";

     

       5
       5
       +
         version = "1.11.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/rbsec/sslscan/archive/${version}-rbsec.tar.gz";

     

       9
       9
       -
           sha256 = "0mcg8hyx1r9sq716bw1r554fcsf512khgcms2ixxb1c31ng6lhq6";

     

       9
       9
       +
           sha256 = "0wygz2gm9asvhpfy44333y4pkdja1sbr41hc6mhkxg7a4ys8f9qs";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ openssl ];

+2 -2

pkgs/tools/security/sudo/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "sudo-1.8.16";

     

       7
       7
       +
         name = "sudo-1.8.17p1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           urls =

     

       11
       11
        
             [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"

     

       12
       12
        
               "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"

     

       13
       13
        
             ];

     

       14
       14
       -
           sha256 = "0k86sm9ilhxhvnfwq3092zhfxazj3kddn0y2mirz0nqjqmpq50rd";

     

       14
       14
       +
           sha256 = "c690d707fb561b3ecdf6a6de5563bc0b769388eff201c851edbace408bb155cc";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         configureFlags = [

+3 -3

pkgs/tools/text/platinum-searcher/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "the_platinum_searcher-${version}";

     

       5
       5
       -
         version = "2.1.1";

     

       6
       6
       -
         rev = "v2.1.1";

     

       5
       5
       +
         version = "2.1.3";

     

       6
       6
       +
         rev = "v2.1.3";

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/monochromegane/the_platinum_searcher";

     

       9
       9
        
       

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "monochromegane";

     

       13
       13
        
           repo = "the_platinum_searcher";

     

       14
       14
       -
           sha256 = "06cs936w3l64ikszcysdm9ijn52kwgi1ffjxkricxbdb677gsk23";

     

       14
       14
       +
           sha256 = "09pkdfh7fqn3x4l9zaw5wzk20k7nfdwry7br9vfy3vv3fwv61ynp";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./deps.json;

+17

pkgs/tools/virtualization/nixos-container/default.nix

···

       1
       1
       +
       { substituteAll, perl, perlPackages, shadow, utillinux }:

     

       2
       2
       +
       

     

       3
       3
       +
       substituteAll {

     

       4
       4
       +
           name = "nixos-container";

     

       5
       5
       +
           dir = "bin";

     

       6
       6
       +
           isExecutable = true;

     

       7
       7
       +
           src = ./nixos-container.pl;

     

       8
       8
       +
           perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl";

     

       9
       9
       +
           su = "${shadow.su}/bin/su";

     

       10
       10
       +
           inherit utillinux;

     

       11
       11
       +
       

     

       12
       12
       +
           postInstall = ''

     

       13
       13
       +
             t=$out/etc/bash_completion.d

     

       14
       14
       +
             mkdir -p $t

     

       15
       15
       +
             cp ${./nixos-container-completion.sh} $t/nixos-container

     

       16
       16
       +
           '';

     

       17
       17
       +
       }

+81 -25

pkgs/top-level/all-packages.nix

···

       167
       167
        
       

     

       168
       168
        
         fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});

     

       169
       169
        
       

     

       170
       170
       +
         fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };

     

       171
       171
       +
       

     

       170
       172
        
         packer = callPackage ../development/tools/packer { };

     

       171
       173
        
       

     

       172
       174
        
         fetchpatch = callPackage ../build-support/fetchpatch { };

     
···

       2166
       2168
        
       

     

       2167
       2169
        
         keybase = callPackage ../applications/misc/keybase { };

     

       2168
       2170
        
       

     

       2171
       2171
       +
         keybase-go = callPackage ../tools/security/keybase { };

     

       2172
       2172
       +
       

     

       2169
       2173
        
         keychain = callPackage ../tools/misc/keychain { };

     

       2170
       2174
        
       

     

       2171
       2175
        
         keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };

     
···

       2888
       2892
        
       

     

       2889
       2893
        
         p7zip = callPackage ../tools/archivers/p7zip { };

     

       2890
       2894
        
       

     

       2891
       2891
       -
         packagekit = callPackage ../tools/package-management/packagekit { };

     

       2895
       2895
       +
         packagekit = callPackage ../tools/package-management/packagekit {

     

       2896
       2896
       +
           nix = nixUnstable;

     

       2897
       2897
       +
         };

     

       2892
       2898
        
       

     

       2893
       2899
        
         pal = callPackage ../tools/misc/pal { };

     

       2894
       2900
        
       

     
···

       3466
       3472
        
       

     

       3467
       3473
        
         solvespace = callPackage ../applications/graphics/solvespace { };

     

       3468
       3474
        
       

     

       3475
       3475
       +
         sonarr = callPackage ../servers/sonarr { };

     

       3476
       3476
       +
       

     

       3469
       3477
        
         sonata = callPackage ../applications/audio/sonata {

     

       3470
       3478
        
           inherit (python3Packages) buildPythonApplication python isPy3k dbus pygobject3 mpd2;

     

       3471
       3479
        
         };

     
···

       3913
       3921
        
       

     

       3914
       3922
        
         udunits = callPackage ../development/libraries/udunits { };

     

       3915
       3923
        
       

     

       3924
       3924
       +
         uemacs = callPackage ../applications/editors/uemacs { };

     

       3925
       3925
       +
       

     

       3916
       3926
        
         uhttpmock = callPackage ../development/libraries/uhttpmock { };

     

       3917
       3927
        
       

     

       3918
       3928
        
         uim = callPackage ../tools/inputmethods/uim {

     
···

       3926
       3936
        
         unbound = callPackage ../tools/networking/unbound { };

     

       3927
       3937
        
       

     

       3928
       3938
        
         units = callPackage ../tools/misc/units { };

     

       3939
       3939
       +
       

     

       3940
       3940
       +
         unittest-cpp = callPackage ../development/libraries/unittest-cpp { };

     

       3929
       3941
        
       

     

       3930
       3942
        
         unrar = callPackage ../tools/archivers/unrar { };

     

       3931
       3943
        
       

     
···

       4705
       4717
        
       

     

       4706
       4718
        
         hugs = callPackage ../development/interpreters/hugs { };

     

       4707
       4719
        
       

     

       4708
       4708
       -
         path64 = callPackage ../development/compilers/path64 { };

     

       4709
       4709
       -
       

     

       4710
       4720
        
         openjdk7 =

     

       4711
       4721
        
           if stdenv.isDarwin then

     

       4712
       4722
        
             callPackage ../development/compilers/openjdk-darwin { }

     
···

       4733
       4743
        
       

     

       4734
       4744
        
         jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8;

     

       4735
       4745
        
         jre = if stdenv.isDarwin then self.jre7 else self.jre8;

     

       4746
       4746
       +
       

     

       4747
       4747
       +
         openshot-qt = callPackage ../applications/video/openshot-qt { };

     

       4736
       4748
        
       

     

       4737
       4749
        
         oraclejdk = self.jdkdistro true false;

     

       4738
       4750
        
       

     
···

       5733
       5745
        
           glpk = null;

     

       5734
       5746
        
           suitesparse = null;

     

       5735
       5747
        
           jdk = null;

     

       5736
       5736
       -
           openblas = openblasCompat;

     

       5748
       5748
       +
           openblas = openblas;

     

       5737
       5749
        
         };

     

       5738
       5750
        
         octaveFull = (lowPrio (callPackage ../development/interpreters/octave {

     

       5739
       5751
        
           qt = qt4;

     
···

       5808
       5820
        
           inherit (darwin) CF configd;

     

       5809
       5821
        
           self = python35;

     

       5810
       5822
        
         });

     

       5823
       5823
       +
         python36 = callPackage ../development/interpreters/python/3.6 {

     

       5824
       5824
       +
           inherit (darwin) CF configd;

     

       5825
       5825
       +
           self = python36;

     

       5826
       5826
       +
         };

     

       5811
       5827
        
         pypy = callPackage ../development/interpreters/pypy {

     

       5812
       5828
        
           self = pypy;

     

       5813
       5829
        
         };

     
···

       6240
       6256
        
       

     

       6241
       6257
        
         docutils = pythonPackages.docutils;

     

       6242
       6258
        
       

     

       6259
       6259
       +
         doctl = callPackage ../development/tools/doctl { };

     

       6260
       6260
       +
       

     

       6243
       6261
        
         dot2tex = pythonPackages.dot2tex;

     

       6244
       6262
        
       

     

       6245
       6263
        
         doxygen = callPackage ../development/tools/documentation/doxygen {

     
···

       6563
       6581
        
       

     

       6564
       6582
        
         shellcheck = self.haskellPackages.ShellCheck;

     

       6565
       6583
        
       

     

       6584
       6584
       +
         shncpd = callPackage ../tools/networking/shncpd { };

     

       6585
       6585
       +
       

     

       6566
       6586
        
         sigrok-cli = callPackage ../development/tools/sigrok-cli { };

     

       6567
       6587
        
       

     

       6568
       6588
        
         simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { };

     
···

       8134
       8154
        
       

     

       8135
       8155
        
         libjpeg_original = callPackage ../development/libraries/libjpeg { };

     

       8136
       8156
        
         libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };

     

       8157
       8157
       +
         libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };

     

       8137
       8158
        
         libjpeg = if stdenv.isLinux then self.libjpeg_turbo else self.libjpeg_original; # some problems, both on FreeBSD and Darwin

     

       8138
       8159
        
       

     

       8139
       8160
        
         libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix {

     
···

       8385
       8406
        
         libu2f-host = callPackage ../development/libraries/libu2f-host { };

     

       8386
       8407
        
       

     

       8387
       8408
        
         libu2f-server = callPackage ../development/libraries/libu2f-server { };

     

       8409
       8409
       +
       

     

       8410
       8410
       +
         libui = callPackage ../development/libraries/libui { };

     

       8388
       8411
        
       

     

       8389
       8412
        
         libunity = callPackage ../development/libraries/libunity { };

     

       8390
       8413
        
       

     
···

       8672
       8695
        
       

     

       8673
       8696
        
         notify-sharp = callPackage ../development/libraries/notify-sharp { };

     

       8674
       8697
        
       

     

       8675
       8675
       -
         ncurses = callPackage ../development/libraries/ncurses { };

     

       8698
       8698
       +
         ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; };

     

       8699
       8699
       +
         ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; };

     

       8700
       8700
       +
         ncurses = if stdenv.isDarwin then ncurses5 else ncurses6;

     

       8676
       8701
        
       

     

       8677
       8702
        
         neardal = callPackage ../development/libraries/neardal { };

     

       8678
       8703
        
       

     
···

       9843
       9868
        
         python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix {

     

       9844
       9869
        
           python = python35;

     

       9845
       9870
        
           self = python35Packages;

     

       9871
       9871
       +
         });

     

       9872
       9872
       +
       

     

       9873
       9873
       +
         python36Packages = (callPackage ./python-packages.nix {

     

       9874
       9874
       +
           python = python36;

     

       9875
       9875
       +
           self = python36Packages;

     

       9846
       9876
        
         });

     

       9847
       9877
        
       

     

       9848
       9878
        
         pypyPackages = callPackage ./python-packages.nix {

     
···

       10156
       10186
        
       

     

       10157
       10187
        
         neard = callPackage ../servers/neard { };

     

       10158
       10188
        
       

     

       10159
       10159
       -
         nginx = callPackage ../servers/http/nginx {

     

       10189
       10189
       +
         nginx = callPackage ../servers/http/nginx/stable.nix {

     

       10160
       10190
        
           # We don't use `with` statement here on purpose!

     

       10161
       10191
        
           # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334

     

       10162
       10192
        
           modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];

     

       10163
       10193
        
         };

     

       10164
       10164
       -
         # nginxUnstable currently points to stable because that's newest:

     

       10165
       10165
       -
         nginxUnstable = nginx;

     

       10194
       10194
       +
       

     

       10195
       10195
       +
         nginxMainline = callPackage ../servers/http/nginx/mainline.nix {

     

       10196
       10196
       +
           # We don't use `with` statement here on purpose!

     

       10197
       10197
       +
           # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334

     

       10198
       10198
       +
           modules = [ nginxModules.dav nginxModules.moreheaders ];

     

       10199
       10199
       +
         };

     

       10200
       10200
       +
       

     

       10201
       10201
       +
         nginxUnstable = nginxMainline;

     

       10166
       10202
        
       

     

       10167
       10203
        
         nginxModules = callPackage ../servers/http/nginx/modules.nix { };

     

       10168
       10204
        
       

     
···

       10727
       10763
        
       

     

       10728
       10764
        
         firejail = callPackage ../os-specific/linux/firejail {};

     

       10729
       10765
        
       

     

       10766
       10766
       +
         fnotifystat = callPackage ../os-specific/linux/fnotifystat { };

     

       10767
       10767
       +
       

     

       10768
       10768
       +
         forkstat = callPackage ../os-specific/linux/forkstat { };

     

       10769
       10769
       +
       

     

       10730
       10770
        
         freefall = callPackage ../os-specific/linux/freefall {

     

       10731
       10771
        
           inherit (linuxPackages) kernel;

     

       10732
       10772
        
         };

     
···

       10827
       10867
        
         openiscsi = callPackage ../os-specific/linux/open-iscsi { };

     

       10828
       10868
        
       

     

       10829
       10869
        
         openisns = callPackage ../os-specific/linux/open-isns { };

     

       10870
       10870
       +
       

     

       10871
       10871
       +
         powerstat = callPackage ../os-specific/linux/powerstat { };

     

       10872
       10872
       +
       

     

       10873
       10873
       +
         smemstat = callPackage ../os-specific/linux/smemstat { };

     

       10830
       10874
        
       

     

       10831
       10875
        
         tgt = callPackage ../tools/networking/tgt { };

     

       10832
       10876
        
       

     
···

       11148
       11192
        
         linux_grsec_nixos = callPackage ../build-support/grsecurity {

     

       11149
       11193
        
           inherit (lib) overrideDerivation;

     

       11150
       11194
        
           kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {

     

       11151
       11151
       -
             inherit (self.linux_4_5) kernelPatches;

     

       11195
       11195
       +
             kernelPatches = with self.kernelPatches; [ bridge_stp_helper qat_common_Makefile ]

     

       11196
       11196
       +
               ++ lib.optionals ((platform.kernelArch or null) == "mips")

     

       11197
       11197
       +
               [ kernelPatches.mips_fpureg_emu

     

       11198
       11198
       +
                 kernelPatches.mips_fpu_sigill

     

       11199
       11199
       +
                 kernelPatches.mips_ext3_n32

     

       11200
       11200
       +
               ];

     

       11152
       11201
        
           };

     

       11153
       11202
        
           grsecPatch = self.kernelPatches.grsecurity_testing;

     

       11154
       11203
        
           kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ];

     
···

       11809
       11858
        
         liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { };

     

       11810
       11859
        
         liberation_ttf = self.liberation_ttf_binary;

     

       11811
       11860
        
       

     

       11861
       11861
       +
         liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };

     

       11862
       11862
       +
         liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { };

     

       11863
       11863
       +
       

     

       11812
       11864
        
         libertine = callPackage ../data/fonts/libertine { };

     

       11813
       11865
        
       

     

       11814
       11866
        
         lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};

     
···

       12175
       12227
        
         };

     

       12176
       12228
        
       

     

       12177
       12229
        
         bibletime = callPackage ../applications/misc/bibletime { };

     

       12230
       12230
       +
       

     

       12231
       12231
       +
         bitkeeper = callPackage ../applications/version-management/bitkeeper { };

     

       12178
       12232
        
       

     

       12179
       12233
        
         bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };

     

       12180
       12234
        
         bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };

     
···

       12747
       12801
        
       

     

       12748
       12802
        
         evopedia = callPackage ../applications/misc/evopedia { };

     

       12749
       12803
        
       

     

       12804
       12804
       +
         gpg-mdp = callPackage ../applications/misc/gpg-mdp { };

     

       12805
       12805
       +
       

     

       12750
       12806
        
         keepassx = callPackage ../applications/misc/keepassx { };

     

       12751
       12807
        
         keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };

     

       12752
       12808
        
       

     
···

       12891
       12947
        
         };

     

       12892
       12948
        
       

     

       12893
       12949
        
         firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {

     

       12894
       12894
       -
           channel = "beta";

     

       12950
       12950
       +
           generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;

     

       12895
       12951
        
           gconf = pkgs.gnome.GConf;

     

       12896
       12952
        
           inherit (pkgs.gnome) libgnome libgnomeui;

     

       12897
       12953
        
           inherit (pkgs.gnome3) defaultIconTheme;

     
···

       12904
       12960
        
           desktopName = "Firefox Beta";

     

       12905
       12961
        
         };

     

       12906
       12962
        
       

     

       12907
       12907
       -
         firefox-developer-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {

     

       12908
       12908
       -
           channel = "developer";

     

       12909
       12909
       -
           gconf = pkgs.gnome.GConf;

     

       12910
       12910
       -
           inherit (pkgs.gnome) libgnome libgnomeui;

     

       12911
       12911
       -
           inherit (pkgs.gnome3) defaultIconTheme;

     

       12912
       12912
       -
         };

     

       12913
       12913
       -
       

     

       12914
       12914
       -
         firefox-developer-bin = self.wrapFirefox firefox-developer-bin-unwrapped {

     

       12915
       12915
       -
           browserName = "firefox";

     

       12916
       12916
       -
           name = "firefox-developer-bin-" +

     

       12917
       12917
       -
             (builtins.parseDrvName firefox-developer-bin-unwrapped.name).version;

     

       12918
       12918
       -
           desktopName = "Firefox Developer Edition";

     

       12919
       12919
       -
         };

     

       12920
       12920
       -
       

     

       12921
       12963
        
         firestr = qt5.callPackage ../applications/networking/p2p/firestr

     

       12922
       12964
        
           { boost = boost155;

     

       12923
       12965
        
           };

     
···

       13208
       13250
        
         };

     

       13209
       13251
        
       

     

       13210
       13252
        
         hugin = callPackage ../applications/graphics/hugin { };

     

       13253
       13253
       +
       

     

       13254
       13254
       +
         hugo = callPackage ../applications/misc/hugo { };

     

       13211
       13255
        
       

     

       13212
       13256
        
         hydrogen = callPackage ../applications/audio/hydrogen { };

     

       13213
       13257
        
       

     
···

       13810
       13854
        
       

     

       13811
       13855
        
         pijul = callPackage ../applications/version-management/pijul { };

     

       13812
       13856
        
       

     

       13857
       13857
       +
         planner = callPackage ../applications/office/planner { };

     

       13858
       13858
       +
       

     

       13813
       13859
        
         playonlinux = callPackage ../applications/misc/playonlinux {

     

       13814
       13860
        
            stdenv = stdenv_32bit;

     

       13815
       13861
        
         };

     
···

       13983
       14029
        
         };

     

       13984
       14030
        
       

     

       13985
       14031
        
         pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { };

     

       14032
       14032
       +
       

     

       14033
       14033
       +
         pekwm = callPackage ../applications/window-managers/pekwm { };

     

       13986
       14034
        
       

     

       13987
       14035
        
         pencil = callPackage ../applications/graphics/pencil {

     

       13988
       14036
        
           xulrunner = firefox-unwrapped;

     
···

       14828
       14876
        
       

     

       14829
       14877
        
         vym = callPackage ../applications/misc/vym { };

     

       14830
       14878
        
       

     

       14831
       14831
       -
         w3m = callPackage ../applications/networking/browsers/w3m { 

     

       14879
       14879
       +
         w3m = callPackage ../applications/networking/browsers/w3m {

     

       14832
       14880
        
           graphicsSupport = !stdenv.isDarwin;

     

       14833
       14881
        
         };

     

       14834
       14882
        
       

     
···

       15308
       15356
        
         ckan = callPackage ../games/ckan { };

     

       15309
       15357
        
       

     

       15310
       15358
        
         cockatrice = qt5.callPackage ../games/cockatrice {  };

     

       15359
       15359
       +
       

     

       15360
       15360
       +
         commandergenius = callPackage ../games/commandergenius { };

     

       15311
       15361
        
       

     

       15312
       15362
        
         confd = callPackage ../tools/system/confd { };

     

       15313
       15363
        
       

     
···

       16911
       16961
        
       

     

       16912
       16962
        
         nixos-artwork = callPackage ../data/misc/nixos-artwork { };

     

       16913
       16963
        
       

     

       16964
       16964
       +
         nixos-container = callPackage ../tools/virtualization/nixos-container { };

     

       16965
       16965
       +
       

     

       16914
       16966
        
         norwester-font = callPackage ../data/fonts/norwester  {};

     

       16915
       16967
        
       

     

       16916
       16968
        
         nut = callPackage ../applications/misc/nut { };

     
···

       17180
       17232
        
         wcalc = callPackage ../applications/misc/wcalc { };

     

       17181
       17233
        
       

     

       17182
       17234
        
         webfs = callPackage ../servers/http/webfs { };

     

       17235
       17235
       +
       

     

       17236
       17236
       +
         wikicurses = callPackage ../applications/misc/wikicurses {

     

       17237
       17237
       +
           pythonPackages = python3Packages;

     

       17238
       17238
       +
         };

     

       17183
       17239
        
       

     

       17184
       17240
        
         wineMinimal = callPackage ../misc/emulators/wine {

     

       17185
       17241
        
           wineRelease = config.wine.release or "stable";

+3 -16

pkgs/top-level/default.nix

···

       6
       6
        
       

     

       7
       7
        
       

     

       8
       8
        
       { # The system (e.g., `i686-linux') for which to build the packages.

     

       9
       9
       -
         system ? builtins.currentSystem

     

       9
       9
       +
         system

     

       10
       10
        
       

     

       11
       11
        
       , # The standard environment to use.  Only used for bootstrapping.  If

     

       12
       12
        
         # null, the default standard environment is used.

     
···

       19
       19
        
                      && system != "x86_64-solaris"

     

       20
       20
        
                      && system != "x86_64-kfreebsd-gnu")

     

       21
       21
        
       

     

       22
       22
       -
       , # Allow a configuration attribute set to be passed in as an

     

       23
       23
       -
         # argument.  Otherwise, it's read from $NIXPKGS_CONFIG or

     

       24
       24
       -
         # ~/.nixpkgs/config.nix.

     

       25
       25
       -
         #

     

       26
       26
       -
         # [For NixOS (nixos-rebuild), use nixpkgs.config option to set.]

     

       27
       27
       -
         config ? let

     

       28
       28
       -
             inherit (builtins) getEnv pathExists;

     

       29
       29
       -
       

     

       30
       30
       -
             configFile = getEnv "NIXPKGS_CONFIG";

     

       31
       31
       -
             homeDir = getEnv "HOME";

     

       32
       32
       -
             configFile2 = homeDir + "/.nixpkgs/config.nix";

     

       33
       33
       -
           in

     

       34
       34
       -
             if configFile != "" && pathExists configFile then import configFile

     

       35
       35
       -
             else if homeDir != "" && pathExists configFile2 then import configFile2

     

       36
       36
       -
             else {}

     

       22
       22
       +
       , # Allow a configuration attribute set to be passed in as an argument.

     

       23
       23
       +
         config ? {}

     

       37
       24
        
       

     

       38
       25
        
       , crossSystem ? null

     

       39
       26
        
       , platform ? null

+24

pkgs/top-level/impure.nix

···

       1
       1
       +
       /* Impure default args for `pkgs/top-level/default.nix`. See that file

     

       2
       2
       +
          for the meaning of each argument. */

     

       3
       3
       +
       

     

       4
       4
       +
       { # Fallback: Assume we are building packages for the current (host, in GNU

     

       5
       5
       +
         # Autotools parlance) system.

     

       6
       6
       +
         system ? builtins.currentSystem

     

       7
       7
       +
       

     

       8
       8
       +
       , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or

     

       9
       9
       +
         # $HOME/.nixpkgs/config.nix.

     

       10
       10
       +
         config ? let

     

       11
       11
       +
             inherit (builtins) getEnv pathExists;

     

       12
       12
       +
       

     

       13
       13
       +
             configFile = getEnv "NIXPKGS_CONFIG";

     

       14
       14
       +
             homeDir = getEnv "HOME";

     

       15
       15
       +
             configFile2 = homeDir + "/.nixpkgs/config.nix";

     

       16
       16
       +
           in

     

       17
       17
       +
             if configFile != "" && pathExists configFile then import configFile

     

       18
       18
       +
             else if homeDir != "" && pathExists configFile2 then import configFile2

     

       19
       19
       +
             else {}

     

       20
       20
       +
       

     

       21
       21
       +
       , ...

     

       22
       22
       +
       } @ args:

     

       23
       23
       +
       

     

       24
       24
       +
       import ./. (args // { inherit system config; })

+1 -1

pkgs/top-level/make-tarball.nix

···

       40
       40
        
           echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix

     

       41
       41
        
       

     

       42
       42
        
           # Make sure that Nixpkgs does not use <nixpkgs>

     

       43
       43
       -
           if grep -r '<nixpkgs\/' pkgs; then

     

       43
       43
       +
           if (find pkgs -type f -name '*.nix' -print | xargs grep '<nixpkgs\/'); then

     

       44
       44
        
               echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."

     

       45
       45
        
               exit 1

     

       46
       46
        
           fi

+2 -2

pkgs/top-level/php-packages.nix

···

       209
       209
        
       

     

       210
       210
        
         composer = pkgs.stdenv.mkDerivation rec {

     

       211
       211
        
           name = "composer-${version}";

     

       212
       212
       -
           version = "1.0.0-alpha11";

     

       212
       212
       +
           version = "1.2.0";

     

       213
       213
        
       

     

       214
       214
        
           src = pkgs.fetchurl {

     

       215
       215
        
             url = "https://getcomposer.org/download/${version}/composer.phar";

     

       216
       216
       -
             sha256 = "1b41ad352p4296c2j7cdq27wp06w28080bjxnjpmw536scb7yd27";

     

       216
       216
       +
             sha256 = "15chwfsqmwmhry3bv13a5y4ih1vzb0j8h1dfd49pnzzd8lai706w";

     

       217
       217
        
           };

     

       218
       218
        
       

     

       219
       219
        
           phases = [ "installPhase" ];

+43 -7

pkgs/top-level/python-packages.nix

···

       10
       10
        
         isPy33 = python.majorVersion == "3.3";

     

       11
       11
        
         isPy34 = python.majorVersion == "3.4";

     

       12
       12
        
         isPy35 = python.majorVersion == "3.5";

     

       13
       13
       +
         isPy36 = python.majorVersion == "3.6";

     

       13
       14
        
         isPyPy = python.executable == "pypy";

     

       14
       15
        
         isPy3k = strings.substring 0 1 python.majorVersion == "3";

     

       15
       16
        
       

     
···

       30
       31
        
           if isPy33 then "python33" else

     

       31
       32
        
           if isPy34 then "python34" else

     

       32
       33
        
           if isPy35 then "python35" else

     

       34
       34
       +
           if isPy36 then "python36" else

     

       33
       35
        
           if isPyPy then "pypy" else "";

     

       34
       36
        
       

     

       35
       37
        
         modules = python.modules or {

     
···

       42
       44
        
       

     

       43
       45
        
       in modules // {

     

       44
       46
        
       

     

       45
       45
       -
         inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication;

     

       47
       47
       +
         inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication;

     

       46
       48
        
       

     

       47
       49
        
         # helpers

     

       48
       50
        
       

     
···

       4373
       4375
        
           propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];

     

       4374
       4376
        
           buildInputs = with self; [ pytest ];

     

       4375
       4377
        
       

     

       4378
       4378
       +
           patchPhase = ''

     

       4379
       4379
       +
             substituteInPlace testing/cffi0/test_ownlib.py --replace "gcc" "cc"

     

       4380
       4380
       +
           '';

     

       4381
       4381
       +
       

     

       4382
       4382
       +
           NIX_CFLAGS_COMPILE="-Wno-shift-negative-value";

     

       4383
       4383
       +
       

     

       4376
       4384
        
           checkPhase = ''

     

       4377
       4385
        
             py.test

     

       4378
       4386
        
           '';

     
···

       7050
       7058
        
           };

     

       7051
       7059
        
         };

     

       7052
       7060
        
       

     

       7061
       7061
       +
         jupyterlab = buildPythonPackage rec {

     

       7062
       7062
       +
           name = "jupyterlab-${version}";

     

       7063
       7063
       +
           version = "0.1.1";

     

       7064
       7064
       +
       

     

       7065
       7065
       +
           src = pkgs.fetchurl {

     

       7066
       7066
       +
             url = "mirror://pypi/j/jupyterlab/${name}.tar.gz";

     

       7067
       7067
       +
             sha256 = "c1a08f4d1b2bb1bf06db090db30df988a22ffbfa05606e7eb026e364969388da";

     

       7068
       7068
       +
           };

     

       7069
       7069
       +
       

     

       7070
       7070
       +
           propagatedBuildInputs = with self; [ notebook ];

     

       7071
       7071
       +
       

     

       7072
       7072
       +
           # No tests in archive

     

       7073
       7073
       +
           doCheck = false;

     

       7074
       7074
       +
       

     

       7075
       7075
       +
           meta = {

     

       7076
       7076
       +
             description = "Jupyter lab environment notebook server extension.";

     

       7077
       7077
       +
             license = with licenses; [ bsd3 ];

     

       7078
       7078
       +
             homepage = "http://jupyter.org/";

     

       7079
       7079
       +
           };

     

       7080
       7080
       +
         };

     

       7081
       7081
       +
       

     

       7053
       7082
        
         lti = let

     

       7054
       7083
        
           self' = (self.override {self = self';}) // {pytest = self.pytest_27;};

     

       7055
       7084
        
           mock_1_0_1 = self'.mock.overrideDerivation (_: rec {

     
···

       9331
       9360
        
       

     

       9332
       9361
        
           # Only test dependencies

     

       9333
       9362
        
           buildInputs = with self; [ pkgs.git gevent geventhttpclient pkgs.glibcLocales mock fastimport ];

     

       9363
       9363
       +
       

     

       9364
       9364
       +
           doCheck = !stdenv.isDarwin;

     

       9334
       9365
        
       

     

       9335
       9366
        
           meta = {

     

       9336
       9367
        
             description = "Simple Python implementation of the Git file formats and protocols";

     
···

       12390
       12421
        
           propagatedBuildInputs = with self; [ pkgs.file ];

     

       12391
       12422
        
       

     

       12392
       12423
        
           patchPhase = ''

     

       12393
       12393
       -
             substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic.so'"

     

       12424
       12424
       +
             substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'"

     

       12394
       12425
        
           '';

     

       12395
       12426
        
       

     

       12396
       12427
        
           doCheck = false;

     
···

       12427
       12458
        
       

     

       12428
       12459
        
       

     

       12429
       12460
        
         m2crypto = buildPythonPackage rec {

     

       12430
       12430
       -
           version = "0.23.0";

     

       12461
       12461
       +
           version = "0.24.0";

     

       12431
       12462
        
           name = "m2crypto-${version}";

     

       12432
       12463
        
       

     

       12433
       12464
        
           src = pkgs.fetchurl {

     

       12434
       12465
        
             url = "mirror://pypi/M/M2Crypto/M2Crypto-${version}.tar.gz";

     

       12435
       12435
       -
             sha256 = "1ac3b6eafa5ff7e2a0796675316d7569b28aada45a7ab74042ad089d15a9567f";

     

       12466
       12466
       +
             sha256 = "1s2y0pf2zg7xf4nfwrw7zhwbk615r5a7bgi5wwkwzh6jl50n99c0";

     

       12436
       12467
        
           };

     

       12437
       12468
        
       

     

       12438
       12469
        
           buildInputs = with self; [ pkgs.swig2 pkgs.openssl ];

     
···

       20465
       20496
        
         });

     

       20466
       20497
        
       

     

       20467
       20498
        
         rpy2 = buildPythonPackage rec {

     

       20468
       20468
       -
           name = "rpy2-2.5.6";

     

       20499
       20499
       +
           name = "rpy2-2.8.2";

     

       20469
       20500
        
           disabled = isPyPy;

     

       20470
       20501
        
           src = pkgs.fetchurl {

     

       20471
       20502
        
             url = "mirror://pypi/r/rpy2/${name}.tar.gz";

     

       20472
       20472
       -
             sha256 = "d0d584c435b5ed376925a95a4525dbe87de7fa9260117e9f208029e0c919ad06";

     

       20503
       20503
       +
             sha256 = "2c1a313df4e64236dcfe1078ce847b8e3c180656c894928d3a4b391aacb9b24c";

     

       20473
       20504
        
           };

     

       20474
       20505
        
           buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ];

     

       20475
       20475
       -
           propagatedBuildInputs = [ self.singledispatch ];

     

       20506
       20506
       +
           propagatedBuildInputs = with self; [ singledispatch six ];

     

       20507
       20507
       +
       

     

       20508
       20508
       +
           # According to manual this is how the testsuite should be invoked

     

       20509
       20509
       +
           checkPhase = ''

     

       20510
       20510
       +
             ${python.interpreter}  -m rpy2.tests

     

       20511
       20511
       +
           '';

     

       20476
       20512
        
           meta = {

     

       20477
       20513
        
             homepage = http://rpy.sourceforge.net/rpy2;

     

       20478
       20514
        
             description = "Python interface to R";