commit 25a77b72106922b055d1e1f1883c164d34b17311 · pyrox.dev/nixpkgs

+3

.github/FUNDING.yml

···

       1
       1
       +
       # These are supported funding model platforms

     

       2
       2
       +
       

     

       3
       3
       +
       custom: https://nixos.org/nixos/foundation.html

+1 -1

.github/PULL_REQUEST_TEMPLATE.md

···

       15
       15
        
       - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`

     

       16
       16
        
       - [ ] Tested execution of all binary files (usually in `./result/bin/`)

     

       17
       17
        
       - [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)

     

       18
       18
       -
       - [ ] Assured whether relevant documentation is up to date

     

       18
       18
       +
       - [ ] Ensured that relevant documentation is up to date

     

       19
       19
        
       - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

     

       20
       20
        
       

     

       21
       21
        
       ---

+12

doc/package-notes.xml

···

       325
       325
        
          elm2nix</link>.

     

       326
       326
        
         </para>

     

       327
       327
        
        </section>

     

       328
       328
       +
        <section xml:id="sec-kakoune">

     

       329
       329
       +
         <title>Kakoune</title>

     

       330
       330
       +
       

     

       331
       331
       +
         <para>

     

       332
       332
       +
          Kakoune can be built to autoload plugins:

     

       333
       333
       +
       <programlisting>(kakoune.override {

     

       334
       334
       +
         configure = {

     

       335
       335
       +
           plugins = with pkgs.kakounePlugins; [ parinfer-rust ];

     

       336
       336
       +
         };

     

       337
       337
       +
       })</programlisting>

     

       338
       338
       +
         </para>

     

       339
       339
       +
        </section>

     

       328
       340
        
        <section xml:id="sec-shell-helpers">

     

       329
       341
        
         <title>Interactive shell helpers</title>

     

       330
       342

+25

maintainers/maintainer-list.nix

···

       681
       681
        
           github = "bergey";

     

       682
       682
        
           name = "Daniel Bergey";

     

       683
       683
        
         };

     

       684
       684
       +
         betaboon = {

     

       685
       685
       +
           email = "betaboon@0x80.ninja";

     

       686
       686
       +
           github = "betaboon";

     

       687
       687
       +
           name = "betaboon";

     

       688
       688
       +
         };

     

       684
       689
        
         bfortz = {

     

       685
       690
        
           email = "bernard.fortz@gmail.com";

     

       686
       691
        
           github = "bfortz";

     
···

       1940
       1945
        
           github = "glenns";

     

       1941
       1946
        
           name = "Glenn Searby";

     

       1942
       1947
        
         };

     

       1948
       1948
       +
         gloaming = {

     

       1949
       1949
       +
           email = "ch9871@gmail.com";

     

       1950
       1950
       +
           github = "gloaming";

     

       1951
       1951
       +
           name = "Craig Hall";

     

       1952
       1952
       +
         };

     

       1943
       1953
        
         globin = {

     

       1944
       1954
        
           email = "mail@glob.in";

     

       1945
       1955
        
           github = "globin";

     
···

       2753
       2763
        
           github = "lasandell";

     

       2754
       2764
        
           name = "Luke Sandell";

     

       2755
       2765
        
         };

     

       2766
       2766
       +
         lambda-11235 = {

     

       2767
       2767
       +
           email = "taranlynn0@gmail.com";

     

       2768
       2768
       +
           github = "lambda-11235";

     

       2769
       2769
       +
           name = "Taran Lynn";

     

       2770
       2770
       +
         };

     

       2756
       2771
        
         lassulus = {

     

       2757
       2772
        
           email = "lassulus@gmail.com";

     

       2758
       2773
        
           github = "Lassulus";

     
···

       3558
       3573
        
           email = "nathan@nathan.gs";

     

       3559
       3574
        
           github = "nathan-gs";

     

       3560
       3575
        
           name = "Nathan Bijnens";

     

       3576
       3576
       +
         };

     

       3577
       3577
       +
         nathyong = {

     

       3578
       3578
       +
           email = "nathyong@noreply.github.com";

     

       3579
       3579
       +
           github = "nathyong";

     

       3580
       3580
       +
           name = "Nathan Yong";

     

       3561
       3581
        
         };

     

       3562
       3582
        
         nckx = {

     

       3563
       3583
        
           email = "github@tobias.gr";

     
···

       4840
       4860
        
           email = "severen@shrike.me";

     

       4841
       4861
        
           github = "severen";

     

       4842
       4862
        
           name = "Severen Redwood";

     

       4863
       4863
       +
         };

     

       4864
       4864
       +
         steell = {

     

       4865
       4865
       +
           email = "steve@steellworks.com";

     

       4866
       4866
       +
           github = "Steell";

     

       4867
       4867
       +
           name = "Steve Elliott";

     

       4843
       4868
        
         };

     

       4844
       4869
        
         stephenmw = {

     

       4845
       4870
        
           email = "stephen@q5comm.com";

+1 -1

nixos/doc/manual/configuration/ipv6-config.xml

···

       39
       39
        
       <xref linkend="opt-networking.defaultGateway6"/> = {

     

       40
       40
        
         address = "fe00::1";

     

       41
       41
        
         interface = "enp0s3";

     

       42
       42
       -
       }

     

       42
       42
       +
       };

     

       43
       43
        
       </programlisting>

     

       44
       44
        
        </para>

     

       45
       45

+1 -1

nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix

···

       22
       22
        
         boot.kernelPackages = pkgs.linuxPackages_rpi;

     

       23
       23
        
       

     

       24
       24
        
         sdImage = {

     

       25
       25
       -
           populateBootCommands = let

     

       25
       25
       +
           populateFirmwareCommands = let

     

       26
       26
        
             configTxt = pkgs.writeText "config.txt" ''

     

       27
       27
        
               # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel

     

       28
       28
        
               # when attempting to show low-voltage or overtemperature warnings.

+1

nixos/modules/module-list.nix

···

       191
       191
        
         ./services/audio/liquidsoap.nix

     

       192
       192
        
         ./services/audio/mpd.nix

     

       193
       193
        
         ./services/audio/mopidy.nix

     

       194
       194
       +
         ./services/audio/roon-server.nix

     

       194
       195
        
         ./services/audio/slimserver.nix

     

       195
       196
        
         ./services/audio/snapserver.nix

     

       196
       197
        
         ./services/audio/squeezelite.nix

+7

nixos/modules/rename.nix

···

       213
       213
        
           (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")

     

       214
       214
        
           (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")

     

       215
       215
        
           (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")

     

       216
       216
       +
           (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")

     

       216
       217
        
       

     

       217
       218
        
           # ZSH

     

       218
       219
        
           (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

     
···

       239
       240
        
       

     

       240
       241
        
           # binfmt

     

       241
       242
        
           (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])

     

       243
       243
       +
       

     

       244
       244
       +
           # PHP-FPM

     

       245
       245
       +
           (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.")

     

       246
       246
       +
           (mkRemovedOptionModule [ "services" "phpfpm" "phpPackage" ] "Use services.phpfpm.pools.<name>.phpPackage instead.")

     

       247
       247
       +
           (mkRemovedOptionModule [ "services" "phpfpm" "phpOptions" ] "Use services.phpfpm.pools.<name>.phpOptions instead.")

     

       248
       248
       +
           (mkRenamedOptionModule [ "services" "phpfpm" "extraConfig" ] [ "services" "phpfpm" "globalExtraConfig" ])

     

       242
       249
        
       

     

       243
       250
        
         ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"

     

       244
       251
        
                          "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"

+5 -5

nixos/modules/services/audio/mopidy.nix

···

       70
       70
        
       

     

       71
       71
        
         config = mkIf cfg.enable {

     

       72
       72
        
       

     

       73
       73
       +
           systemd.tmpfiles.rules = [

     

       74
       74
       +
             "d '${cfg.dataDir}' - mopidy mopidy - -"

     

       75
       75
       +
           ];

     

       76
       76
       +
       

     

       73
       77
        
           systemd.services.mopidy = {

     

       74
       78
        
             wantedBy = [ "multi-user.target" ];

     

       75
       79
        
             after = [ "network.target" "sound.target" ];

     

       76
       80
        
             description = "mopidy music player daemon";

     

       77
       77
       -
             preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy  ${cfg.dataDir}";

     

       78
       81
        
             serviceConfig = {

     

       79
       82
        
               ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";

     

       80
       83
        
               User = "mopidy";

     

       81
       81
       -
               PermissionsStartOnly = true;

     

       82
       84
        
             };

     

       83
       85
        
           };

     

       84
       86
        
       

     

       85
       87
        
           systemd.services.mopidy-scan = {

     

       86
       88
        
             description = "mopidy local files scanner";

     

       87
       87
       -
             preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy  ${cfg.dataDir}";

     

       88
       89
        
             serviceConfig = {

     

       89
       90
        
               ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan";

     

       90
       91
        
               User = "mopidy";

     

       91
       91
       -
               PermissionsStartOnly = true;

     

       92
       92
        
               Type = "oneshot";

     

       93
       93
        
             };

     

       94
       94
        
           };

     
···

       98
       98
        
             group = "mopidy";

     

       99
       99
        
             extraGroups = [ "audio" ];

     

       100
       100
        
             description = "Mopidy daemon user";

     

       101
       101
       -
             home = "${cfg.dataDir}";

     

       101
       101
       +
             home = cfg.dataDir;

     

       102
       102
        
           };

     

       103
       103
        
       

     

       104
       104
        
           users.groups.mopidy.gid = gid;

+49

nixos/modules/services/audio/roon-server.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         name = "roon-server";

     

       7
       7
       +
         cfg = config.services.roon-server;

     

       8
       8
       +
       in {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           services.roon-server = {

     

       11
       11
       +
             enable = mkEnableOption "Roon Server";

     

       12
       12
       +
             openFirewall = mkOption {

     

       13
       13
       +
               type = types.bool;

     

       14
       14
       +
               default = false;

     

       15
       15
       +
               description = ''

     

       16
       16
       +
                 Open ports in the firewall for the server.

     

       17
       17
       +
       

     

       18
       18
       +
                 UDP: 9003

     

       19
       19
       +
                 TCP: 9100 - 9200

     

       20
       20
       +
               '';

     

       21
       21
       +
             };

     

       22
       22
       +
           };

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         config = mkIf cfg.enable {

     

       26
       26
       +
           systemd.services.roon-server = {

     

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

     

       28
       28
       +
             description = "Roon Server";

     

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

     

       30
       30
       +
       

     

       31
       31
       +
             environment.ROON_DATAROOT = "/var/lib/${name}";

     

       32
       32
       +
       

     

       33
       33
       +
             serviceConfig = {

     

       34
       34
       +
               ExecStart = "${pkgs.roon-server}/opt/start.sh";

     

       35
       35
       +
               LimitNOFILE = 8192;

     

       36
       36
       +
               DynamicUser = true;

     

       37
       37
       +
               SupplementaryGroups = "audio";

     

       38
       38
       +
               StateDirectory = name;

     

       39
       39
       +
             };

     

       40
       40
       +
           };

     

       41
       41
       +
           

     

       42
       42
       +
           networking.firewall = mkIf cfg.openFirewall {

     

       43
       43
       +
             allowedTCPPortRanges = [

     

       44
       44
       +
               { from = 9100; to = 9200; }

     

       45
       45
       +
             ];

     

       46
       46
       +
             allowedUDPPorts = [ 9003 ];

     

       47
       47
       +
           };

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+4 -2

nixos/modules/services/audio/slimserver.nix

···

       42
       42
        
       

     

       43
       43
        
         config = mkIf cfg.enable {

     

       44
       44
        
       

     

       45
       45
       +
           systemd.tmpfiles.rules = [

     

       46
       46
       +
             "d '${cfg.dataDir}' - slimserver slimserver - -"

     

       47
       47
       +
           ];

     

       48
       48
       +
       

     

       45
       49
        
           systemd.services.slimserver = {

     

       46
       50
        
             after = [ "network.target" ];

     

       47
       51
        
             description = "Slim Server for Logitech Squeezebox Players";

     

       48
       52
        
             wantedBy = [ "multi-user.target" ];

     

       49
       53
        
       

     

       50
       50
       -
             preStart = "mkdir -p ${cfg.dataDir} && chown -R slimserver:slimserver ${cfg.dataDir}";

     

       51
       54
        
             serviceConfig = {

     

       52
       55
        
               User = "slimserver";

     

       53
       53
       -
               PermissionsStartOnly = true;

     

       54
       56
        
               # Issue 40589: Disable broken image/video support (audio still works!)

     

       55
       57
        
               ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo";

     

       56
       58
        
             };

+1 -5

nixos/modules/services/backup/duplicati.nix

···

       47
       47
        
             wantedBy = [ "multi-user.target" ];

     

       48
       48
        
             serviceConfig = {

     

       49
       49
        
               User = cfg.user;

     

       50
       50
       -
               PermissionsStartOnly = true;

     

       51
       50
        
               Group = "duplicati";

     

       51
       51
       +
               StateDirectory = "duplicati";

     

       52
       52
        
               ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati";

     

       53
       53
        
               Restart = "on-failure";

     

       54
       54
        
             };

     

       55
       55
       -
             preStart = ''

     

       56
       56
       -
               mkdir -p /var/lib/duplicati

     

       57
       57
       -
               chown -R ${cfg.user}:duplicati /var/lib/duplicati

     

       58
       58
       -
             '';

     

       59
       55
        
           };

     

       60
       56
        
       

     

       61
       57
        
           users.users.duplicati = lib.optionalAttrs (cfg.user == "duplicati") {

+4 -5

nixos/modules/services/computing/boinc/client.nix

···

       105
       105
        
               isSystemUser = true;

     

       106
       106
        
             };

     

       107
       107
        
       

     

       108
       108
       +
             systemd.tmpfiles.rules = [

     

       109
       109
       +
               "d '${cfg.dataDir}' - boinc - - -"

     

       110
       110
       +
             ];

     

       111
       111
       +
       

     

       108
       112
        
             systemd.services.boinc = {

     

       109
       113
        
               description = "BOINC Client";

     

       110
       114
        
               after = ["network.target" "local-fs.target"];

     

       111
       115
        
               wantedBy = ["multi-user.target"];

     

       112
       112
       -
               preStart = ''

     

       113
       113
       -
                 mkdir -p ${cfg.dataDir}

     

       114
       114
       -
                 chown boinc ${cfg.dataDir}

     

       115
       115
       -
               '';

     

       116
       116
        
               script = ''

     

       117
       117
        
                 ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}

     

       118
       118
        
               '';

     

       119
       119
        
               serviceConfig = {

     

       120
       120
       -
                 PermissionsStartOnly = true; # preStart must be run as root

     

       121
       120
        
                 User = "boinc";

     

       122
       121
        
                 Nice = 10;

     

       123
       122
        
               };

+7 -7

nixos/modules/services/databases/firebird.nix

···

       95
       95
        
       

     

       96
       96
        
           environment.systemPackages = [cfg.package];

     

       97
       97
        
       

     

       98
       98
       +
           systemd.tmpfiles.rules = [

     

       99
       99
       +
             "d '${dataDir}' 0700 ${cfg.user} - - -"

     

       100
       100
       +
             "d '${systemDir}' 0700 ${cfg.user} - - -"

     

       101
       101
       +
           ];

     

       102
       102
       +
       

     

       98
       103
        
           systemd.services.firebird =

     

       99
       104
        
             { description = "Firebird Super-Server";

     

       100
       105
        
       

     
···

       104
       109
        
               # is a better way

     

       105
       110
        
               preStart =

     

       106
       111
        
                 ''

     

       107
       107
       -
                   mkdir -m 0700 -p \

     

       108
       108
       -
                     "${dataDir}" \

     

       109
       109
       -
                     "${systemDir}" \

     

       110
       110
       -
                     /var/log/firebird

     

       111
       111
       -
       

     

       112
       112
        
                   if ! test -e "${systemDir}/security2.fdb"; then

     

       113
       113
        
                       cp ${firebird}/security2.fdb "${systemDir}"

     

       114
       114
        
                   fi

     

       115
       115
        
       

     

       116
       116
       -
                   chown -R ${cfg.user} "${dataDir}" "${systemDir}" /var/log/firebird

     

       117
       116
        
                   chmod -R 700         "${dataDir}" "${systemDir}" /var/log/firebird

     

       118
       117
        
                 '';

     

       119
       118
        
       

     

       120
       120
       -
               serviceConfig.PermissionsStartOnly = true; # preStart must be run as root

     

       121
       119
        
               serviceConfig.User = cfg.user;

     

       120
       120
       +
               serviceConfig.LogsDirectory = "firebird";

     

       121
       121
       +
               serviceConfig.LogsDirectoryMode = "0700";

     

       122
       122
        
               serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d'';

     

       123
       123
        
       

     

       124
       124
        
               # TODO think about shutdown

+8 -14

nixos/modules/services/databases/foundationdb.nix

···

       359
       359
        
               }

     

       360
       360
        
             ];

     

       361
       361
        
       

     

       362
       362
       +
           systemd.tmpfiles.rules = [

     

       363
       363
       +
             "d /etc/foundationdb 0755 ${cfg.user} ${cfg.group} - -"

     

       364
       364
       +
             "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"

     

       365
       365
       +
             "d '${cfg.logDir}' 0770 ${cfg.user} ${cfg.group} - -"

     

       366
       366
       +
             "F '${cfg.pidFile}' - ${cfg.user} ${cfg.group} - -"

     

       367
       367
       +
           ];

     

       368
       368
       +
       

     

       362
       369
        
           systemd.services.foundationdb = {

     

       363
       370
        
             description             = "FoundationDB Service";

     

       364
       371
        
       

     
···

       396
       403
        
             path = [ pkg pkgs.coreutils ];

     

       397
       404
        
       

     

       398
       405
        
             preStart = ''

     

       399
       399
       -
               rm -f ${cfg.pidfile}   && \

     

       400
       400
       -
                 touch ${cfg.pidfile} && \

     

       401
       401
       -
                 chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile}

     

       402
       402
       -
       

     

       403
       403
       -
               for x in "${cfg.logDir}" "${cfg.dataDir}"; do

     

       404
       404
       -
                 [ ! -d "$x" ] && mkdir -m 0770 -vp "$x";

     

       405
       405
       -
                 chown -R ${cfg.user}:${cfg.group} "$x";

     

       406
       406
       -
               done

     

       407
       407
       -
       

     

       408
       408
       -
               [ ! -d /etc/foundationdb ] && \

     

       409
       409
       -
                 mkdir -m 0775 -vp /etc/foundationdb && \

     

       410
       410
       -
                 chown -R ${cfg.user}:${cfg.group} "/etc/foundationdb"

     

       411
       411
       -
       

     

       412
       406
        
               if [ ! -f /etc/foundationdb/fdb.cluster ]; then

     

       413
       407
        
                   cf=/etc/foundationdb/fdb.cluster

     

       414
       408
        
                   desc=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)

     

       415
       409
        
                   rand=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)

     

       416
       410
        
                   echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf

     

       417
       417
       -
                   chmod 0664 $cf && chown -R ${cfg.user}:${cfg.group} $cf

     

       411
       411
       +
                   chmod 0664 $cf

     

       418
       412
        
                   touch "${cfg.dataDir}/.first_startup"

     

       419
       413
        
               fi

     

       420
       414
        
             '';

+5 -12

nixos/modules/services/databases/hbase.nix

···

       94
       94
        
       

     

       95
       95
        
         config = mkIf config.services.hbase.enable {

     

       96
       96
        
       

     

       97
       97
       +
           systemd.tmpfiles.rules = [

     

       98
       98
       +
             "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"

     

       99
       99
       +
             "d '${cfg.logDir}' - ${cfg.user} ${cfg.group} - -"

     

       100
       100
       +
           ];

     

       101
       101
       +
       

     

       97
       102
        
           systemd.services.hbase = {

     

       98
       103
        
             description = "HBase Server";

     

       99
       104
        
             wantedBy = [ "multi-user.target" ];

     
···

       103
       108
        
               HBASE_LOG_DIR = cfg.logDir;

     

       104
       109
        
             };

     

       105
       110
        
       

     

       106
       106
       -
             preStart =

     

       107
       107
       -
               ''

     

       108
       108
       -
               mkdir -p ${cfg.dataDir};

     

       109
       109
       -
               mkdir -p ${cfg.logDir};

     

       110
       110
       -
       

     

       111
       111
       -
               if [ "$(id -u)" = 0 ]; then

     

       112
       112
       -
                 chown ${cfg.user}:${cfg.group} ${cfg.dataDir}

     

       113
       113
       -
                 chown ${cfg.user}:${cfg.group} ${cfg.logDir}

     

       114
       114
       -
               fi

     

       115
       115
       -
               '';

     

       116
       116
       -
       

     

       117
       111
        
             serviceConfig = {

     

       118
       118
       -
               PermissionsStartOnly = true;

     

       119
       112
        
               User = cfg.user;

     

       120
       113
        
               Group = cfg.group;

     

       121
       114
        
               ExecStart = "${cfg.package}/bin/hbase --config ${configDir} master start";

+87 -102

nixos/modules/services/databases/mysql.nix

···

       204
       204
        
               '';

     

       205
       205
        
             };

     

       206
       206
        
       

     

       207
       207
       -
             # FIXME: remove this option; it's a really bad idea.

     

       208
       208
       -
             rootPassword = mkOption {

     

       209
       209
       -
               default = null;

     

       210
       210
       -
               description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";

     

       211
       211
       -
             };

     

       212
       212
       -
       

     

       213
       207
        
             replication = {

     

       214
       208
        
               role = mkOption {

     

       215
       209
        
                 type = types.enum [ "master" "slave" "none" ];

     
···

       323
       317
        
                 RuntimeDirectoryMode = "0755";

     

       324
       318
        
                 # The last two environment variables are used for starting Galera clusters

     

       325
       319
        
                 ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION";

     

       326
       326
       -
               };

     

       320
       320
       +
                 ExecStartPost =

     

       321
       321
       +
                   let

     

       322
       322
       +
                     setupScript = pkgs.writeShellScript "mysql-setup" ''

     

       323
       323
       +
                       ${optionalString (!hasNotify) ''

     

       324
       324
       +
                         # Wait until the MySQL server is available for use

     

       325
       325
       +
                         count=0

     

       326
       326
       +
                         while [ ! -e /run/mysqld/mysqld.sock ]

     

       327
       327
       +
                         do

     

       328
       328
       +
                             if [ $count -eq 30 ]

     

       329
       329
       +
                             then

     

       330
       330
       +
                                 echo "Tried 30 times, giving up..."

     

       331
       331
       +
                                 exit 1

     

       332
       332
       +
                             fi

     

       333
       333
       +
       

     

       334
       334
       +
                             echo "MySQL daemon not yet started. Waiting for 1 second..."

     

       335
       335
       +
                             count=$((count++))

     

       336
       336
       +
                             sleep 1

     

       337
       337
       +
                         done

     

       338
       338
       +
                       ''}

     

       339
       339
       +
       

     

       340
       340
       +
                       if [ -f /tmp/mysql_init ]

     

       341
       341
       +
                       then

     

       342
       342
       +
                           ${concatMapStrings (database: ''

     

       343
       343
       +
                             # Create initial databases

     

       344
       344
       +
                             if ! test -e "${cfg.dataDir}/${database.name}"; then

     

       345
       345
       +
                                 echo "Creating initial database: ${database.name}"

     

       346
       346
       +
                                 ( echo 'create database `${database.name}`;'

     

       327
       347
        
       

     

       328
       328
       -
               postStart =

     

       329
       329
       -
                 let

     

       330
       330
       -
                   cmdWatchForMysqlSocket = ''

     

       331
       331
       -
                     # Wait until the MySQL server is available for use

     

       332
       332
       -
                     count=0

     

       333
       333
       -
                     while [ ! -e /run/mysqld/mysqld.sock ]

     

       334
       334
       -
                     do

     

       335
       335
       -
                         if [ $count -eq 30 ]

     

       336
       336
       -
                         then

     

       337
       337
       -
                             echo "Tried 30 times, giving up..."

     

       338
       338
       -
                             exit 1

     

       339
       339
       -
                         fi

     

       348
       348
       +
                                   ${optionalString (database.schema != null) ''

     

       349
       349
       +
                                   echo 'use `${database.name}`;'

     

       340
       350
        
       

     

       341
       341
       -
                         echo "MySQL daemon not yet started. Waiting for 1 second..."

     

       342
       342
       -
                         count=$((count++))

     

       343
       343
       -
                         sleep 1

     

       344
       344
       -
                     done

     

       345
       345
       -
                   '';

     

       346
       346
       -
                   cmdInitialDatabases = concatMapStrings (database: ''

     

       347
       347
       -
                     # Create initial databases

     

       348
       348
       -
                     if ! test -e "${cfg.dataDir}/${database.name}"; then

     

       349
       349
       -
                         echo "Creating initial database: ${database.name}"

     

       350
       350
       -
                         ( echo 'create database `${database.name}`;'

     

       351
       351
       +
                                   # TODO: this silently falls through if database.schema does not exist,

     

       352
       352
       +
                                   # we should catch this somehow and exit, but can't do it here because we're in a subshell.

     

       353
       353
       +
                                   if [ -f "${database.schema}" ]

     

       354
       354
       +
                                   then

     

       355
       355
       +
                                       cat ${database.schema}

     

       356
       356
       +
                                   elif [ -d "${database.schema}" ]

     

       357
       357
       +
                                   then

     

       358
       358
       +
                                       cat ${database.schema}/mysql-databases/*.sql

     

       359
       359
       +
                                   fi

     

       360
       360
       +
                                   ''}

     

       361
       361
       +
                                 ) | ${mysql}/bin/mysql -u root -N

     

       362
       362
       +
                             fi

     

       363
       363
       +
                           '') cfg.initialDatabases}

     

       351
       364
        
       

     

       352
       352
       -
                           ${optionalString (database.schema != null) ''

     

       353
       353
       -
                           echo 'use `${database.name}`;'

     

       365
       365
       +
                           ${optionalString (cfg.replication.role == "master")

     

       366
       366
       +
                             ''

     

       367
       367
       +
                               # Set up the replication master

     

       354
       368
        
       

     

       355
       355
       -
                           # TODO: this silently falls through if database.schema does not exist,

     

       356
       356
       -
                           # we should catch this somehow and exit, but can't do it here because we're in a subshell.

     

       357
       357
       -
                           if [ -f "${database.schema}" ]

     

       358
       358
       -
                           then

     

       359
       359
       -
                               cat ${database.schema}

     

       360
       360
       -
                           elif [ -d "${database.schema}" ]

     

       361
       361
       -
                           then

     

       362
       362
       -
                               cat ${database.schema}/mysql-databases/*.sql

     

       363
       363
       -
                           fi

     

       364
       364
       -
                           ''}

     

       365
       365
       -
                         ) | ${mysql}/bin/mysql -u root -N

     

       366
       366
       -
                     fi

     

       367
       367
       -
                   '') cfg.initialDatabases;

     

       368
       368
       -
                 in

     

       369
       369
       +
                               ( echo "use mysql;"

     

       370
       370
       +
                                 echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"

     

       371
       371
       +
                                 echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"

     

       372
       372
       +
                                 echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"

     

       373
       373
       +
                               ) | ${mysql}/bin/mysql -u root -N

     

       374
       374
       +
                             ''}

     

       369
       375
        
       

     

       370
       370
       -
                 lib.optionalString (!hasNotify) cmdWatchForMysqlSocket + ''

     

       371
       371
       -
                   if [ -f /tmp/mysql_init ]

     

       372
       372
       -
                   then

     

       373
       373
       -
                       ${cmdInitialDatabases}

     

       374
       374
       -
                       ${optionalString (cfg.replication.role == "master")

     

       375
       375
       -
                         ''

     

       376
       376
       -
                           # Set up the replication master

     

       376
       376
       +
                           ${optionalString (cfg.replication.role == "slave")

     

       377
       377
       +
                             ''

     

       378
       378
       +
                               # Set up the replication slave

     

       377
       379
        
       

     

       378
       378
       -
                           ( echo "use mysql;"

     

       379
       379
       -
                             echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"

     

       380
       380
       -
                             echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"

     

       381
       381
       -
                             echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"

     

       382
       382
       -
                           ) | ${mysql}/bin/mysql -u root -N

     

       383
       383
       -
                         ''}

     

       380
       380
       +
                               ( echo "stop slave;"

     

       381
       381
       +
                                 echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"

     

       382
       382
       +
                                 echo "start slave;"

     

       383
       383
       +
                               ) | ${mysql}/bin/mysql -u root -N

     

       384
       384
       +
                             ''}

     

       384
       385
        
       

     

       385
       385
       -
                       ${optionalString (cfg.replication.role == "slave")

     

       386
       386
       -
                         ''

     

       387
       387
       -
                           # Set up the replication slave

     

       386
       386
       +
                           ${optionalString (cfg.initialScript != null)

     

       387
       387
       +
                             ''

     

       388
       388
       +
                               # Execute initial script

     

       389
       389
       +
                               # using toString to avoid copying the file to nix store if given as path instead of string,

     

       390
       390
       +
                               # as it might contain credentials

     

       391
       391
       +
                               cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N

     

       392
       392
       +
                             ''}

     

       388
       393
        
       

     

       389
       389
       -
                           ( echo "stop slave;"

     

       390
       390
       -
                             echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"

     

       391
       391
       -
                             echo "start slave;"

     

       392
       392
       -
                           ) | ${mysql}/bin/mysql -u root -N

     

       393
       393
       -
                         ''}

     

       394
       394
       +
                           rm /tmp/mysql_init

     

       395
       395
       +
                       fi

     

       394
       396
        
       

     

       395
       395
       -
                       ${optionalString (cfg.initialScript != null)

     

       396
       396
       -
                         ''

     

       397
       397
       -
                           # Execute initial script

     

       398
       398
       -
                           # using toString to avoid copying the file to nix store if given as path instead of string,

     

       399
       399
       -
                           # as it might contain credentials

     

       400
       400
       -
                           cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N

     

       401
       401
       -
                         ''}

     

       397
       397
       +
                       ${optionalString (cfg.ensureDatabases != []) ''

     

       398
       398
       +
                         (

     

       399
       399
       +
                         ${concatMapStrings (database: ''

     

       400
       400
       +
                           echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"

     

       401
       401
       +
                         '') cfg.ensureDatabases}

     

       402
       402
       +
                         ) | ${mysql}/bin/mysql -u root -N

     

       403
       403
       +
                       ''}

     

       402
       404
        
       

     

       403
       403
       -
                       ${optionalString (cfg.rootPassword != null)

     

       405
       405
       +
                       ${concatMapStrings (user:

     

       404
       406
        
                         ''

     

       405
       405
       -
                           # Change root password

     

       406
       406
       -
       

     

       407
       407
       -
                           ( echo "use mysql;"

     

       408
       408
       -
                             echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"

     

       409
       409
       -
                             echo "flush privileges;"

     

       407
       407
       +
                           ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"

     

       408
       408
       +
                             ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''

     

       409
       409
       +
                               echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"

     

       410
       410
       +
                             '') user.ensurePermissions)}

     

       410
       411
        
                           ) | ${mysql}/bin/mysql -u root -N

     

       411
       411
       -
                         ''}

     

       412
       412
       -
       

     

       413
       413
       -
                     rm /tmp/mysql_init

     

       414
       414
       -
                   fi

     

       415
       415
       -
       

     

       416
       416
       -
                   ${optionalString (cfg.ensureDatabases != []) ''

     

       417
       417
       -
                     (

     

       418
       418
       -
                     ${concatMapStrings (database: ''

     

       419
       419
       -
                       echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"

     

       420
       420
       -
                     '') cfg.ensureDatabases}

     

       421
       421
       -
                     ) | ${mysql}/bin/mysql -u root -N

     

       422
       422
       -
                   ''}

     

       423
       423
       -
       

     

       424
       424
       -
                   ${concatMapStrings (user:

     

       425
       425
       -
                     ''

     

       426
       426
       -
                       ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"

     

       427
       427
       -
                         ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''

     

       428
       428
       -
                         echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"

     

       429
       429
       -
                         '') user.ensurePermissions)}

     

       430
       430
       -
                       ) | ${mysql}/bin/mysql -u root -N

     

       431
       431
       -
                     '') cfg.ensureUsers}

     

       432
       432
       -
       

     

       433
       433
       -
                 ''; # */

     

       412
       412
       +
                         '') cfg.ensureUsers}

     

       413
       413
       +
                     '';

     

       414
       414
       +
                   in

     

       415
       415
       +
                     # ensureDatbases & ensureUsers depends on this script being run as root

     

       416
       416
       +
                     # when the user has secured their mysql install

     

       417
       417
       +
                     "+${setupScript}";

     

       418
       418
       +
               };

     

       434
       419
        
             };

     

       435
       420
        
       

     

       436
       421
        
         };

+4

nixos/modules/services/desktops/deepin/deepin.nix

···

       33
       33
        
             environment.systemPackages = [

     

       34
       34
        
               pkgs.deepin.dde-api

     

       35
       35
        
               pkgs.deepin.dde-calendar

     

       36
       36
       +
               pkgs.deepin.dde-control-center

     

       36
       37
        
               pkgs.deepin.dde-daemon

     

       37
       38
        
               pkgs.deepin.dde-dock

     

       39
       39
       +
               pkgs.deepin.dde-launcher

     

       38
       40
        
               pkgs.deepin.dde-file-manager

     

       39
       41
        
               pkgs.deepin.dde-session-ui

     

       40
       42
        
               pkgs.deepin.deepin-anything

     
···

       45
       47
        
             services.dbus.packages = [

     

       46
       48
        
               pkgs.deepin.dde-api

     

       47
       49
        
               pkgs.deepin.dde-calendar

     

       50
       50
       +
               pkgs.deepin.dde-control-center

     

       48
       51
        
               pkgs.deepin.dde-daemon

     

       49
       52
        
               pkgs.deepin.dde-dock

     

       53
       53
       +
               pkgs.deepin.dde-launcher

     

       50
       54
        
               pkgs.deepin.dde-file-manager

     

       51
       55
        
               pkgs.deepin.dde-session-ui

     

       52
       56
        
               pkgs.deepin.deepin-anything

+5 -7

nixos/modules/services/logging/graylog.nix

···

       134
       134
        
             };

     

       135
       135
        
           };

     

       136
       136
        
       

     

       137
       137
       +
           systemd.tmpfiles.rules = [

     

       138
       138
       +
             "d '${cfg.messageJournalDir}' - ${cfg.user} - - -"

     

       139
       139
       +
           ];

     

       140
       140
       +
       

     

       137
       141
        
           systemd.services.graylog = with pkgs; {

     

       138
       142
        
             description = "Graylog Server";

     

       139
       143
        
             wantedBy = [ "multi-user.target" ];

     
···

       143
       147
        
             };

     

       144
       148
        
             path = [ pkgs.jre_headless pkgs.which pkgs.procps ];

     

       145
       149
        
             preStart = ''

     

       146
       146
       -
               mkdir -p /var/lib/graylog -m 755

     

       147
       147
       -
       

     

       148
       150
        
               rm -rf /var/lib/graylog/plugins || true

     

       149
       151
        
               mkdir -p /var/lib/graylog/plugins -m 755

     

       150
       152
        
       

     
···

       154
       156
        
               for includedplugin in `ls ${cfg.package}/plugin/`; do

     

       155
       157
        
                 ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true

     

       156
       158
        
               done

     

       157
       157
       -
               chown -R ${cfg.user} /var/lib/graylog

     

       158
       158
       -
       

     

       159
       159
       -
               mkdir -p ${cfg.messageJournalDir} -m 755

     

       160
       160
       -
               chown -R ${cfg.user} ${cfg.messageJournalDir}

     

       161
       159
        
             '';

     

       162
       160
        
             serviceConfig = {

     

       163
       161
        
               User="${cfg.user}";

     

       164
       164
       -
               PermissionsStartOnly=true;

     

       162
       162
       +
               StateDirectory = "graylog";

     

       165
       163
        
               ExecStart = "${cfg.package}/bin/graylogctl run";

     

       166
       164
        
             };

     

       167
       165
        
           };

+4 -2

nixos/modules/services/logging/heartbeat.nix

···

       54
       54
        
       

     

       55
       55
        
         config = mkIf cfg.enable {

     

       56
       56
        
       

     

       57
       57
       +
           systemd.tmpfiles.rules = [

     

       58
       58
       +
             "d '${cfg.stateDir}' - nobody nogroup - -"

     

       59
       59
       +
           ];

     

       60
       60
       +
       

     

       57
       61
        
           systemd.services.heartbeat = with pkgs; {

     

       58
       62
        
             description = "heartbeat log shipper";

     

       59
       63
        
             wantedBy = [ "multi-user.target" ];

     

       60
       64
        
             preStart = ''

     

       61
       65
        
               mkdir -p "${cfg.stateDir}"/{data,logs}

     

       62
       62
       -
               chown nobody:nogroup "${cfg.stateDir}"/{data,logs}

     

       63
       66
        
             '';

     

       64
       67
        
             serviceConfig = {

     

       65
       68
        
               User = "nobody";

     

       66
       66
       -
               PermissionsStartOnly = true;

     

       67
       69
        
               AmbientCapabilities = "cap_net_raw";

     

       68
       70
        
               ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";

     

       69
       71
        
             };

+4 -9

nixos/modules/services/mail/dspam.nix

···

       113
       113
        
                 Group = cfg.group;

     

       114
       114
        
                 RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam";

     

       115
       115
        
                 RuntimeDirectoryMode = optional (cfg.domainSocket == defaultSock) "0750";

     

       116
       116
       -
                 PermissionsStartOnly = true;

     

       116
       116
       +
                 StateDirectory = "dspam";

     

       117
       117
       +
                 StateDirectoryMode = "0750";

     

       118
       118
       +
                 LogsDirectory = "dspam";

     

       119
       119
       +
                 LogsDirectoryMode = "0750";

     

       117
       120
        
                 # DSPAM segfaults on just about every error

     

       118
       121
        
                 Restart = "on-abort";

     

       119
       122
        
                 RestartSec = "1s";

     

       120
       123
        
               };

     

       121
       121
       -
       

     

       122
       122
       -
               preStart = ''

     

       123
       123
       -
                 mkdir -m750 -p /var/lib/dspam

     

       124
       124
       -
                 chown -R "${cfg.user}:${cfg.group}" /var/lib/dspam

     

       125
       125
       -
       

     

       126
       126
       -
                 mkdir -m750 -p /var/log/dspam

     

       127
       127
       -
                 chown -R "${cfg.user}:${cfg.group}" /var/log/dspam

     

       128
       128
       -
               '';

     

       129
       124
        
             };

     

       130
       125
        
           }

     

       131
       126

+4 -3

nixos/modules/services/mail/opendkim.nix

···

       101
       101
        
       

     

       102
       102
        
           environment.systemPackages = [ pkgs.opendkim ];

     

       103
       103
        
       

     

       104
       104
       +
           systemd.tmpfiles.rules = [

     

       105
       105
       +
             "d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -"

     

       106
       106
       +
           ];

     

       107
       107
       +
       

     

       104
       108
        
           systemd.services.opendkim = {

     

       105
       109
        
             description = "OpenDKIM signing and verification daemon";

     

       106
       110
        
             after = [ "network.target" ];

     

       107
       111
        
             wantedBy = [ "multi-user.target" ];

     

       108
       112
        
       

     

       109
       113
        
             preStart = ''

     

       110
       110
       -
               mkdir -p "${cfg.keyPath}"

     

       111
       114
        
               cd "${cfg.keyPath}"

     

       112
       115
        
               if ! test -f ${cfg.selector}.private; then

     

       113
       116
        
                 ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key

     
···

       116
       119
        
                 cat ${cfg.selector}.txt

     

       117
       120
        
                 echo "-------------------------------------------------------------"

     

       118
       121
        
               fi

     

       119
       119
       -
               chown ${cfg.user}:${cfg.group} ${cfg.selector}.private

     

       120
       122
        
             '';

     

       121
       123
        
       

     

       122
       124
        
             serviceConfig = {

     
···

       124
       126
        
               User = cfg.user;

     

       125
       127
        
               Group = cfg.group;

     

       126
       128
        
               RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";

     

       127
       127
       -
               PermissionsStartOnly = true;

     

       128
       129
        
             };

     

       129
       130
        
           };

     

       130
       131

+23 -19

nixos/modules/services/mail/roundcube.nix

···

       105
       105
        
                   extraConfig = ''

     

       106
       106
        
                     location ~* \.php$ {

     

       107
       107
        
                       fastcgi_split_path_info ^(.+\.php)(/.+)$;

     

       108
       108
       -
                       fastcgi_pass unix:/run/phpfpm/roundcube;

     

       108
       108
       +
                       fastcgi_pass unix:/run/phpfpm-roundcube/roundcube.sock;

     

       109
       109
        
                       include ${pkgs.nginx}/conf/fastcgi_params;

     

       110
       110
        
                       include ${pkgs.nginx}/conf/fastcgi.conf;

     

       111
       111
        
                     }

     
···

       119
       119
        
             enable = true;

     

       120
       120
        
           };

     

       121
       121
        
       

     

       122
       122
       -
           services.phpfpm.poolConfigs.roundcube = ''

     

       123
       123
       -
             listen = /run/phpfpm/roundcube

     

       124
       124
       -
             listen.owner = nginx

     

       125
       125
       -
             listen.group = nginx

     

       126
       126
       -
             listen.mode = 0660

     

       127
       127
       -
             user = nginx

     

       128
       128
       -
             pm = dynamic

     

       129
       129
       -
             pm.max_children = 75

     

       130
       130
       -
             pm.start_servers = 2

     

       131
       131
       -
             pm.min_spare_servers = 1

     

       132
       132
       -
             pm.max_spare_servers = 20

     

       133
       133
       -
             pm.max_requests = 500

     

       134
       134
       -
             php_admin_value[error_log] = 'stderr'

     

       135
       135
       -
             php_admin_flag[log_errors] = on

     

       136
       136
       -
             php_admin_value[post_max_size] = 25M

     

       137
       137
       -
             php_admin_value[upload_max_filesize] = 25M

     

       138
       138
       -
             catch_workers_output = yes

     

       139
       139
       -
           '';

     

       122
       122
       +
           services.phpfpm.pools.roundcube = {

     

       123
       123
       +
             socketName = "roundcube";

     

       124
       124
       +
             phpPackage = pkgs.php;

     

       125
       125
       +
             user = "${config.services.nginx.user}";

     

       126
       126
       +
             group = "${config.services.nginx.group}";

     

       127
       127
       +
             extraConfig = ''

     

       128
       128
       +
               listen.owner = ${config.services.nginx.user}

     

       129
       129
       +
               listen.group = ${config.services.nginx.group}

     

       130
       130
       +
               listen.mode = 0600

     

       131
       131
       +
               pm = dynamic

     

       132
       132
       +
               pm.max_children = 75

     

       133
       133
       +
               pm.start_servers = 2

     

       134
       134
       +
               pm.min_spare_servers = 1

     

       135
       135
       +
               pm.max_spare_servers = 20

     

       136
       136
       +
               pm.max_requests = 500

     

       137
       137
       +
               php_admin_value[error_log] = 'stderr'

     

       138
       138
       +
               php_admin_flag[log_errors] = on

     

       139
       139
       +
               php_admin_value[post_max_size] = 25M

     

       140
       140
       +
               php_admin_value[upload_max_filesize] = 25M

     

       141
       141
       +
               catch_workers_output = yes

     

       142
       142
       +
             '';

     

       143
       143
       +
           };

     

       140
       144
        
           systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];

     

       141
       145
        
       

     

       142
       146
        
           systemd.services.roundcube-setup = let

+2 -7

nixos/modules/services/misc/apache-kafka.nix

···

       131
       131
        
             home = head cfg.logDirs;

     

       132
       132
        
           };

     

       133
       133
        
       

     

       134
       134
       +
           systemd.tmpfiles.rules = map (logDir: "d '${logDir} 0700 apache-kafka - - -") cfg.logDirs;

     

       135
       135
       +
       

     

       134
       136
        
           systemd.services.apache-kafka = {

     

       135
       137
        
             description = "Apache Kafka Daemon";

     

       136
       138
        
             wantedBy = [ "multi-user.target" ];

     
···

       145
       147
        
                   ${serverConfig}

     

       146
       148
        
               '';

     

       147
       149
        
               User = "apache-kafka";

     

       148
       148
       -
               PermissionsStartOnly = true;

     

       149
       150
        
               SuccessExitStatus = "0 143";

     

       150
       151
        
             };

     

       151
       151
       -
             preStart = ''

     

       152
       152
       -
               mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs}

     

       153
       153
       -
               if [ "$(id -u)" = 0 ]; then

     

       154
       154
       -
                  chown apache-kafka ${concatStringsSep " " cfg.logDirs};

     

       155
       155
       -
               fi

     

       156
       156
       -
             '';

     

       157
       152
        
           };

     

       158
       153
        
       

     

       159
       154
        
         };

+1 -6

nixos/modules/services/misc/couchpotato.nix

···

       19
       19
        
             after = [ "network.target" ];

     

       20
       20
        
             wantedBy = [ "multi-user.target" ];

     

       21
       21
        
       

     

       22
       22
       -
             preStart = ''

     

       23
       23
       -
               mkdir -p /var/lib/couchpotato

     

       24
       24
       -
               chown -R couchpotato:couchpotato /var/lib/couchpotato

     

       25
       25
       -
             '';

     

       26
       26
       -
       

     

       27
       22
        
             serviceConfig = {

     

       28
       23
        
               Type = "simple";

     

       29
       24
        
               User = "couchpotato";

     

       30
       25
        
               Group = "couchpotato";

     

       31
       31
       -
               PermissionsStartOnly = "true";

     

       26
       26
       +
               StateDirectory = "couchpotato";

     

       32
       27
        
               ExecStart = "${pkgs.couchpotato}/bin/couchpotato";

     

       33
       28
        
               Restart = "on-failure";

     

       34
       29
        
             };

+12 -4

nixos/modules/services/misc/gitea.nix

···

       38
       38
        
           HTTP_PORT = ${toString cfg.httpPort}

     

       39
       39
        
           ROOT_URL = ${cfg.rootUrl}

     

       40
       40
        
           STATIC_ROOT_PATH = ${cfg.staticRootPath}

     

       41
       41
       +
           LFS_JWT_SECRET = #jwtsecret#

     

       41
       42
        
       

     

       42
       43
        
           [session]

     

       43
       44
        
           COOKIE_NAME = session

     
···

       326
       327
        
             preStart = let

     

       327
       328
        
               runConfig = "${cfg.stateDir}/custom/conf/app.ini";

     

       328
       329
        
               secretKey = "${cfg.stateDir}/custom/conf/secret_key";

     

       330
       330
       +
               jwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret";

     

       329
       331
        
             in ''

     

       330
       332
        
               # copy custom configuration and generate a random secret key if needed

     

       331
       333
        
               ${optionalString (cfg.useWizard == false) ''

     

       332
       334
        
                 cp -f ${configFile} ${runConfig}

     

       333
       335
        
       

     

       334
       336
        
                 if [ ! -e ${secretKey} ]; then

     

       335
       335
       -
                     head -c 16 /dev/urandom | base64 > ${secretKey}

     

       337
       337
       +
                     ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey}

     

       336
       338
        
                 fi

     

       337
       339
        
       

     

       338
       338
       -
                 KEY=$(head -n1 ${secretKey})

     

       339
       339
       -
                 DBPASS=$(head -n1 ${cfg.database.passwordFile})

     

       340
       340
       +
                 if [ ! -e ${jwtSecret} ]; then

     

       341
       341
       +
                     ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}

     

       342
       342
       +
                 fi

     

       343
       343
       +
       

     

       344
       344
       +
                 KEY="$(head -n1 ${secretKey})"

     

       345
       345
       +
                 DBPASS="$(head -n1 ${cfg.database.passwordFile})"

     

       346
       346
       +
                 JWTSECRET="$(head -n1 ${jwtSecret})"

     

       340
       347
        
                 sed -e "s,#secretkey#,$KEY,g" \

     

       341
       348
        
                     -e "s,#dbpass#,$DBPASS,g" \

     

       349
       349
       +
                     -e "s,#jwtsecet#,$JWTSECET,g" \

     

       342
       350
        
                     -i ${runConfig}

     

       343
       343
       -
                 chmod 640 ${runConfig} ${secretKey}

     

       351
       351
       +
                 chmod 640 ${runConfig} ${secretKey} ${jwtSecret}

     

       344
       352
        
               ''}

     

       345
       353
        
       

     

       346
       354
        
               # update all hooks' binary paths

+6 -9

nixos/modules/services/misc/gollum.nix

···

       75
       75
        
       

     

       76
       76
        
           users.groups.gollum = { };

     

       77
       77
        
       

     

       78
       78
       +
           systemd.tmpfiles.rules = [

     

       79
       79
       +
             "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -"

     

       80
       80
       +
           ];

     

       81
       81
       +
       

     

       78
       82
        
           systemd.services.gollum = {

     

       79
       83
        
             description = "Gollum wiki";

     

       80
       84
        
             after = [ "network.target" ];

     

       81
       85
        
             wantedBy = [ "multi-user.target" ];

     

       82
       86
        
             path = [ pkgs.git ];

     

       83
       87
        
       

     

       84
       84
       -
             preStart = let

     

       85
       85
       -
                 userName = config.users.users.gollum.name;

     

       86
       86
       -
                 groupName = config.users.groups.gollum.name;

     

       87
       87
       -
               in ''

     

       88
       88
       -
               # All of this is safe to be run on an existing repo

     

       89
       89
       -
               mkdir -p ${cfg.stateDir}

     

       88
       88
       +
             preStart = ''

     

       89
       89
       +
               # This is safe to be run on an existing repo

     

       90
       90
        
               git init ${cfg.stateDir}

     

       91
       91
       -
               chmod 755 ${cfg.stateDir}

     

       92
       92
       -
               chown -R ${userName}:${groupName} ${cfg.stateDir}

     

       93
       91
        
             '';

     

       94
       92
        
       

     

       95
       93
        
             serviceConfig = {

     

       96
       94
        
               User = config.users.users.gollum.name;

     

       97
       95
        
               Group = config.users.groups.gollum.name;

     

       98
       98
       -
               PermissionsStartOnly = true;

     

       99
       96
        
               ExecStart = ''

     

       100
       97
        
                 ${pkgs.gollum}/bin/gollum \

     

       101
       98
        
                   --port ${toString cfg.port} \

+8 -1

nixos/modules/services/misc/lidarr.nix

···

       9
       9
        
         options = {

     

       10
       10
        
           services.lidarr = {

     

       11
       11
        
             enable = mkEnableOption "Lidarr";

     

       12
       12
       +
       

     

       13
       13
       +
             package = mkOption {

     

       14
       14
       +
               type = types.package;

     

       15
       15
       +
               default = pkgs.lidarr;

     

       16
       16
       +
               defaultText = "pkgs.lidarr";

     

       17
       17
       +
               description = "The Lidarr package to use";

     

       18
       18
       +
             };

     

       12
       19
        
           };

     

       13
       20
        
         };

     

       14
       21
        
       

     
···

       22
       29
        
               Type = "simple";

     

       23
       30
        
               User = "lidarr";

     

       24
       31
        
               Group = "lidarr";

     

       25
       25
       -
               ExecStart = "${pkgs.lidarr}/bin/Lidarr";

     

       32
       32
       +
               ExecStart = "${cfg.package}/bin/Lidarr";

     

       26
       33
        
               Restart = "on-failure";

     

       27
       34
        
       

     

       28
       35
        
               StateDirectory = "lidarr";

+4 -1

nixos/modules/services/misc/nix-daemon.nix

···

       272
       272
        
       

     

       273
       273
        
             binaryCaches = mkOption {

     

       274
       274
        
               type = types.listOf types.str;

     

       275
       275
       -
               default = [ https://cache.nixos.org/ ];

     

       276
       275
        
               description = ''

     

       277
       276
        
                 List of binary cache URLs used to obtain pre-built binaries

     

       278
       277
        
                 of Nix packages.

     

       278
       278
       +
       

     

       279
       279
       +
                 By default https://cache.nixos.org/ is added,

     

       280
       280
       +
                 to override it use <literal>lib.mkForce []</literal>.

     

       279
       281
        
               '';

     

       280
       282
        
             };

     

       281
       283
        
       

     
···

       386
       388
        
         config = {

     

       387
       389
        
       

     

       388
       390
        
           nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];

     

       391
       391
       +
           nix.binaryCaches = [ "https://cache.nixos.org/" ];

     

       389
       392
        
       

     

       390
       393
        
           environment.etc."nix/nix.conf".source = nixConf;

     

       391
       394

+4 -3

nixos/modules/services/misc/octoprint.nix

···

       97
       97
        
               gid = config.ids.gids.octoprint;

     

       98
       98
        
             });

     

       99
       99
        
       

     

       100
       100
       +
           systemd.tmpfiles.rules = [

     

       101
       101
       +
             "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"

     

       102
       102
       +
           ];

     

       103
       103
       +
       

     

       100
       104
        
           systemd.services.octoprint = {

     

       101
       105
        
             description = "OctoPrint, web interface for 3D printers";

     

       102
       106
        
             wantedBy = [ "multi-user.target" ];

     
···

       105
       109
        
             environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ];

     

       106
       110
        
       

     

       107
       111
        
             preStart = ''

     

       108
       108
       -
               mkdir -p "${cfg.stateDir}"

     

       109
       112
        
               if [ -e "${cfg.stateDir}/config.yaml" ]; then

     

       110
       113
        
                 ${pkgs.yaml-merge}/bin/yaml-merge "${cfg.stateDir}/config.yaml" "${cfgUpdate}" > "${cfg.stateDir}/config.yaml.tmp"

     

       111
       114
        
                 mv "${cfg.stateDir}/config.yaml.tmp" "${cfg.stateDir}/config.yaml"

     
···

       113
       116
        
                 cp "${cfgUpdate}" "${cfg.stateDir}/config.yaml"

     

       114
       117
        
                 chmod 600 "${cfg.stateDir}/config.yaml"

     

       115
       118
        
               fi

     

       116
       116
       -
               chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}"

     

       117
       119
        
             '';

     

       118
       120
        
       

     

       119
       121
        
             serviceConfig = {

     

       120
       122
        
               ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}";

     

       121
       123
        
               User = cfg.user;

     

       122
       124
        
               Group = cfg.group;

     

       123
       123
       -
               PermissionsStartOnly = true;

     

       124
       125
        
             };

     

       125
       126
        
           };

     

       126
       127

+22 -11

nixos/modules/services/misc/zoneminder.nix

···

       19
       19
        
       

     

       20
       20
        
         useCustomDir = cfg.storageDir != null;

     

       21
       21
        
       

     

       22
       22
       -
         socket = "/run/phpfpm/${dirName}.sock";

     

       22
       22
       +
         socket = "/run/phpfpm-zoneminder/zoneminder.sock";

     

       23
       23
        
       

     

       24
       24
        
         zms = "/cgi-bin/zms";

     

       25
       25
        
       

     
···

       50
       50
        
           ZM_DB_TYPE=mysql

     

       51
       51
        
           ZM_DB_HOST=${cfg.database.host}

     

       52
       52
        
           ZM_DB_NAME=${cfg.database.name}

     

       53
       53
       -
           ZM_DB_USER=${if cfg.database.createLocally then user else cfg.database.username}

     

       53
       53
       +
           ZM_DB_USER=${cfg.database.username}

     

       54
       54
        
           ZM_DB_PASS=${cfg.database.password}

     

       55
       55
        
       

     

       56
       56
        
           # Web

     
···

       155
       155
        
                 default = "zmpass";

     

       156
       156
        
                 description = ''

     

       157
       157
        
                   Username for accessing the database.

     

       158
       158
       +
                   Not used if <literal>createLocally</literal> is set.

     

       158
       159
        
                 '';

     

       159
       160
        
               };

     

       160
       161
        
             };

     
···

       189
       190
        
       

     

       190
       191
        
         config = lib.mkIf cfg.enable {

     

       191
       192
        
       

     

       193
       193
       +
           assertions = [

     

       194
       194
       +
             { assertion = cfg.database.createLocally -> cfg.database.username == user;

     

       195
       195
       +
               message = "services.zoneminder.database.username must be set to ${user} if services.zoneminder.database.createLocally is set true";

     

       196
       196
       +
             }

     

       197
       197
       +
           ];

     

       198
       198
       +
       

     

       192
       199
        
           environment.etc = {

     

       193
       200
        
             "zoneminder/60-defaults.conf".source = defaultsFile;

     

       194
       201
        
             "zoneminder/80-nixos.conf".source    = configFile;

     
···

       204
       211
        
             };

     

       205
       212
        
       

     

       206
       213
        
             mysql = lib.mkIf cfg.database.createLocally {

     

       214
       214
       +
               enable = true;

     

       215
       215
       +
               package = lib.mkDefault pkgs.mariadb;

     

       207
       216
        
               ensureDatabases = [ cfg.database.name ];

     

       208
       208
       -
               initialDatabases = [{

     

       209
       209
       -
                 inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql";

     

       210
       210
       -
               }];

     

       211
       217
        
               ensureUsers = [{

     

       212
       218
        
                 name = cfg.database.username;

     

       213
       219
        
                 ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };

     
···

       278
       284
        
       

     

       279
       285
        
             phpfpm = lib.mkIf useNginx {

     

       280
       286
        
               pools.zoneminder = {

     

       281
       281
       -
                 listen = socket;

     

       287
       287
       +
                 socketName = "zoneminder";

     

       288
       288
       +
                 phpPackage = pkgs.php;

     

       289
       289
       +
                 user = "${user}";

     

       290
       290
       +
                 group = "${group}";

     

       282
       291
        
                 phpOptions = ''

     

       283
       292
        
                   date.timezone = "${config.time.timeZone}"

     

       284
       293
        
       

     
···

       286
       295
        
                   "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)}

     

       287
       296
        
                 '';

     

       288
       297
        
                 extraConfig = ''

     

       289
       289
       -
                   user = ${user}

     

       290
       290
       -
                   group = ${group}

     

       291
       291
       -
       

     

       292
       298
        
                   listen.owner = ${user}

     

       293
       299
        
                   listen.group = ${group}

     

       294
       300
        
                   listen.mode = 0660

     
···

       315
       321
        
                 procps

     

       316
       322
        
                 psmisc

     

       317
       323
        
               ];

     

       318
       318
       -
               after = [ "mysql.service" "nginx.service" ];

     

       324
       324
       +
               after = [ "nginx.service" ] ++ lib.optional cfg.database.createLocally "mysql.service";

     

       319
       325
        
               wantedBy = [ "multi-user.target" ];

     

       320
       326
        
               restartTriggers = [ defaultsFile configFile ];

     

       321
       321
       -
               preStart = lib.mkIf useCustomDir ''

     

       327
       327
       +
               preStart = lib.optionalString useCustomDir ''

     

       322
       328
        
                 install -dm775 -o ${user} -g ${group} ${cfg.storageDir}/{${lib.concatStringsSep "," libDirs}}

     

       329
       329
       +
               '' + lib.optionalString cfg.database.createLocally ''

     

       330
       330
       +
                 if ! test -e "/var/lib/${dirName}/db-created"; then

     

       331
       331
       +
                   ${config.services.mysql.package}/bin/mysql < ${pkg}/share/zoneminder/db/zm_create.sql

     

       332
       332
       +
                   touch "/var/lib/${dirName}/db-created"

     

       333
       333
       +
                 fi

     

       323
       334
        
               '';

     

       324
       335
        
               serviceConfig = {

     

       325
       336
        
                 User = user;

+4 -5

nixos/modules/services/monitoring/alerta.nix

···

       83
       83
        
         };

     

       84
       84
        
       

     

       85
       85
        
         config = mkIf cfg.enable {

     

       86
       86
       +
           systemd.tmpfiles.rules = [

     

       87
       87
       +
             "d '${cfg.logDir}' - alerta alerta - -"

     

       88
       88
       +
           ];

     

       89
       89
       +
       

     

       86
       90
        
           systemd.services.alerta = {

     

       87
       91
        
             description = "Alerta Monitoring System";

     

       88
       92
        
             wantedBy = [ "multi-user.target" ];

     
···

       94
       98
        
               ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";

     

       95
       99
        
               User = "alerta";

     

       96
       100
        
               Group = "alerta";

     

       97
       97
       -
               PermissionsStartOnly = true;

     

       98
       101
        
             };

     

       99
       99
       -
             preStart = ''

     

       100
       100
       -
               mkdir -p ${cfg.logDir}

     

       101
       101
       -
               chown alerta:alerta ${cfg.logDir}

     

       102
       102
       -
             '';

     

       103
       102
        
           };

     

       104
       103
        
       

     

       105
       104
        
           environment.systemPackages = [ pkgs.python36Packages.alerta ];

+4 -5

nixos/modules/services/monitoring/kapacitor.nix

···

       163
       163
        
         config = mkIf cfg.enable {

     

       164
       164
        
           environment.systemPackages = [ pkgs.kapacitor ];

     

       165
       165
        
       

     

       166
       166
       +
           systemd.tmpfiles.rules = [

     

       167
       167
       +
             "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"

     

       168
       168
       +
           ];

     

       169
       169
       +
       

     

       166
       170
        
           systemd.services.kapacitor = {

     

       167
       171
        
             description = "Kapacitor Real-Time Stream Processing Engine";

     

       168
       172
        
             wantedBy = [ "multi-user.target" ];

     
···

       171
       175
        
               ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}";

     

       172
       176
        
               User = "kapacitor";

     

       173
       177
        
               Group = "kapacitor";

     

       174
       174
       -
               PermissionsStartOnly = true;

     

       175
       178
        
             };

     

       176
       176
       -
             preStart = ''

     

       177
       177
       -
               mkdir -p ${cfg.dataDir}

     

       178
       178
       -
               chown ${cfg.user}:${cfg.group} ${cfg.dataDir}

     

       179
       179
       -
             '';

     

       180
       179
        
           };

     

       181
       180
        
       

     

       182
       181
        
           users.users.kapacitor = {

-1

nixos/modules/services/monitoring/netdata.nix

···

       143
       143
        
               User = cfg.user;

     

       144
       144
        
               Group = cfg.group;

     

       145
       145
        
               Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules";

     

       146
       146
       -
               PermissionsStartOnly = true;

     

       147
       146
        
               ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}";

     

       148
       147
        
               TimeoutStopSec = 60;

     

       149
       148
        
             };

+5 -3

nixos/modules/services/monitoring/riemann-dash.nix

···

       59
       59
        
             group = "riemanndash";

     

       60
       60
        
           };

     

       61
       61
        
       

     

       62
       62
       +
           systemd.tmpfiles.rules = [

     

       63
       63
       +
             "d '${cfg.dataDir}' - riemanndash riemanndash - -"

     

       64
       64
       +
           ];

     

       65
       65
       +
       

     

       62
       66
        
           systemd.services.riemann-dash = {

     

       63
       67
        
             wantedBy = [ "multi-user.target" ];

     

       64
       68
        
             wants = [ "riemann.service" ];

     

       65
       69
        
             after = [ "riemann.service" ];

     

       66
       70
        
             preStart = ''

     

       67
       67
       -
               mkdir -p ${cfg.dataDir}/config

     

       68
       68
       -
               chown -R riemanndash:riemanndash ${cfg.dataDir}

     

       71
       71
       +
               mkdir -p '${cfg.dataDir}/config'

     

       69
       72
        
             '';

     

       70
       73
        
             serviceConfig = {

     

       71
       74
        
               User = "riemanndash";

     

       72
       75
        
               ExecStart = "${launcher}/bin/riemann-dash";

     

       73
       73
       -
               PermissionsStartOnly = true;

     

       74
       76
        
             };

     

       75
       77
        
           };

     

       76
       78

-1

nixos/modules/services/monitoring/riemann-tools.nix

···

       54
       54
        
             serviceConfig = {

     

       55
       55
        
               User = "riemanntools";

     

       56
       56
        
               ExecStart = "${healthLauncher}/bin/riemann-health";

     

       57
       57
       -
               PermissionsStartOnly = true;

     

       58
       57
        
             };

     

       59
       58
        
           };

     

       60
       59

-1

nixos/modules/services/monitoring/scollector.nix

···

       116
       116
        
             path = [ pkgs.coreutils pkgs.iproute ];

     

       117
       117
        
       

     

       118
       118
        
             serviceConfig = {

     

       119
       119
       -
               PermissionsStartOnly = true;

     

       120
       119
        
               User = cfg.user;

     

       121
       120
        
               Group = cfg.group;

     

       122
       121
        
               ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";

+5 -9

nixos/modules/services/networking/aria2.nix

···

       102
       102
        
       

     

       103
       103
        
           users.groups.aria2.gid = config.ids.gids.aria2;

     

       104
       104
        
       

     

       105
       105
       +
           systemd.tmpfiles.rules = [

     

       106
       106
       +
             "d '${homeDir}' 0770 aria2 aria2 - -"

     

       107
       107
       +
             "d '${config.services.aria2.downloadDir}' 0770 aria2 aria2 - -"

     

       108
       108
       +
           ];

     

       109
       109
       +
       

     

       105
       110
        
           systemd.services.aria2 = {

     

       106
       111
        
             description = "aria2 Service";

     

       107
       112
        
             after = [ "local-fs.target" "network.target" ];

     

       108
       113
        
             wantedBy = [ "multi-user.target" ];

     

       109
       114
        
             preStart = ''

     

       110
       110
       -
               mkdir -m 0770 -p "${homeDir}"

     

       111
       111
       -
               chown aria2:aria2 "${homeDir}"

     

       112
       112
       -
               if [[ ! -d "${config.services.aria2.downloadDir}" ]]

     

       113
       113
       -
               then

     

       114
       114
       -
                 mkdir -m 0770 -p "${config.services.aria2.downloadDir}"

     

       115
       115
       -
                 chown aria2:aria2 "${config.services.aria2.downloadDir}"

     

       116
       116
       -
               fi

     

       117
       115
        
               if [[ ! -e "${sessionFile}" ]]

     

       118
       116
        
               then

     

       119
       117
        
                 touch "${sessionFile}"

     

       120
       120
       -
                 chown aria2:aria2 "${sessionFile}"

     

       121
       118
        
               fi

     

       122
       119
        
               cp -f "${settingsFile}" "${settingsDir}/aria2.conf"

     

       123
       120
        
             '';

     
···

       128
       125
        
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

     

       129
       126
        
               User = "aria2";

     

       130
       127
        
               Group = "aria2";

     

       131
       131
       -
               PermissionsStartOnly = true;

     

       132
       128
        
             };

     

       133
       129
        
           };

     

       134
       130
        
         };

-1

nixos/modules/services/networking/autossh.nix

···

       99
       99
        
       

     

       100
       100
        
                     serviceConfig = {

     

       101
       101
        
                         User = "${s.user}";

     

       102
       102
       -
                         PermissionsStartOnly = true;

     

       103
       102
        
                         # AutoSSH may exit with 0 code if the SSH session was

     

       104
       103
        
                         # gracefully terminated by either local or remote side.

     

       105
       104
        
                         Restart = "on-success";

+4 -5

nixos/modules/services/networking/charybdis.nix

···

       83
       83
        
               gid = config.ids.gids.ircd;

     

       84
       84
        
             };

     

       85
       85
        
       

     

       86
       86
       +
             systemd.tmpfiles.rules = [

     

       87
       87
       +
               "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -"

     

       88
       88
       +
             ];

     

       89
       89
       +
       

     

       86
       90
        
             systemd.services.charybdis = {

     

       87
       91
        
               description = "Charybdis IRC daemon";

     

       88
       92
        
               wantedBy = [ "multi-user.target" ];

     
···

       93
       97
        
                 ExecStart   = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}";

     

       94
       98
        
                 Group = cfg.group;

     

       95
       99
        
                 User = cfg.user;

     

       96
       96
       -
                 PermissionsStartOnly = true; # preStart needs to run with root permissions

     

       97
       100
        
               };

     

       98
       98
       -
               preStart = ''

     

       99
       99
       -
                 ${coreutils}/bin/mkdir -p ${cfg.statedir}

     

       100
       100
       -
                 ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}

     

       101
       101
       -
               '';

     

       102
       101
        
             };

     

       103
       102
        
       

     

       104
       103
        
           }

+12 -2

nixos/modules/services/networking/hostapd.nix

···

       30
       30
        
           ctrl_interface=/run/hostapd

     

       31
       31
        
           ctrl_interface_group=${cfg.group}

     

       32
       32
        
       

     

       33
       33
       -
           ${if cfg.wpa then ''

     

       33
       33
       +
           ${optionalString cfg.wpa ''

     

       34
       34
        
             wpa=2

     

       35
       35
        
             wpa_passphrase=${cfg.wpaPassphrase}

     

       36
       36
       -
             '' else ""}

     

       36
       36
       +
           ''}

     

       37
       37
       +
           ${optionalString cfg.noScan "noscan=1"}

     

       37
       38
        
       

     

       38
       39
        
           ${cfg.extraConfig}

     

       39
       40
        
         '' ;

     
···

       66
       67
        
               example = "wlp2s0";

     

       67
       68
        
               description = ''

     

       68
       69
        
                 The interfaces <command>hostapd</command> will use.

     

       70
       70
       +
               '';

     

       71
       71
       +
             };

     

       72
       72
       +
       

     

       73
       73
       +
             noScan = mkOption {

     

       74
       74
       +
               default = false;

     

       75
       75
       +
               description = ''

     

       76
       76
       +
                 Do not scan for overlapping BSSs in HT40+/- mode.

     

       77
       77
       +
                 Caution: turning this on will violate regulatory requirements!

     

       69
       78
        
               '';

     

       70
       79
        
             };

     

       71
       80
        
       

     
···

       162
       171
        
               after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];

     

       163
       172
        
               bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];

     

       164
       173
        
               requiredBy = [ "network-link-${cfg.interface}.service" ];

     

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

     

       165
       175
        
       

     

       166
       176
        
               serviceConfig =

     

       167
       177
        
                 { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";

+1 -7

nixos/modules/services/networking/minidlna.nix

···

       98
       98
        
               wantedBy = [ "multi-user.target" ];

     

       99
       99
        
               after = [ "network.target" "local-fs.target" ];

     

       100
       100
        
       

     

       101
       101
       -
               preStart =

     

       102
       102
       -
                 ''

     

       103
       103
       -
                   mkdir -p /var/cache/minidlna

     

       104
       104
       -
                   chown -R minidlna:minidlna /var/cache/minidlna

     

       105
       105
       -
                 '';

     

       106
       106
       -
       

     

       107
       101
        
               serviceConfig =

     

       108
       102
        
                 { User = "minidlna";

     

       109
       103
        
                   Group = "minidlna";

     

       110
       110
       -
                   PermissionsStartOnly = true;

     

       104
       104
       +
                   CacheDirectory = "minidlna";

     

       111
       105
        
                   RuntimeDirectory = "minidlna";

     

       112
       106
        
                   PIDFile = "/run/minidlna/pid";

     

       113
       107
        
                   ExecStart =

+4 -6

nixos/modules/services/networking/quassel.nix

···

       104
       104
        
               gid = config.ids.gids.quassel;

     

       105
       105
        
             }];

     

       106
       106
        
       

     

       107
       107
       +
           systemd.tmpfiles.rules = [

     

       108
       108
       +
             "d '${cfg.dataDir}' - ${user} - - -"

     

       109
       109
       +
           ];

     

       110
       110
       +
       

     

       107
       111
        
           systemd.services.quassel =

     

       108
       112
        
             { description = "Quassel IRC client daemon";

     

       109
       113
        
       

     
···

       111
       115
        
               after = [ "network.target" ] ++ optional config.services.postgresql.enable "postgresql.service"

     

       112
       116
        
                                            ++ optional config.services.mysql.enable "mysql.service";

     

       113
       117
        
       

     

       114
       114
       -
               preStart = ''

     

       115
       115
       -
                 mkdir -p ${cfg.dataDir}

     

       116
       116
       -
                 chown ${user} ${cfg.dataDir}

     

       117
       117
       -
               '';

     

       118
       118
       -
       

     

       119
       118
        
               serviceConfig =

     

       120
       119
        
               {

     

       121
       120
        
                 ExecStart = concatStringsSep " " ([

     
···

       126
       125
        
                 ] ++ optional cfg.requireSSL "--require-ssl"

     

       127
       126
        
                   ++ optional (cfg.certificateFile != null) "--ssl-cert=${cfg.certificateFile}");

     

       128
       127
        
                 User = user;

     

       129
       129
       -
                 PermissionsStartOnly = true;

     

       130
       128
        
               };

     

       131
       129
        
             };

     

       132
       130

+1 -2

nixos/modules/services/networking/squid.nix

···

       159
       159
        
             serviceConfig = {

     

       160
       160
        
               Type="forking";

     

       161
       161
        
               PIDFile="/run/squid.pid";

     

       162
       162
       -
               PermissionsStartOnly = true;

     

       163
       162
        
               ExecStart  = "${pkgs.squid}/bin/squid -YCs -f ${squidConfig}";

     

       164
       163
        
             };

     

       165
       164
        
           };

     

       166
       165
        
       

     

       167
       166
        
         };

     

       168
       167
        
       

     

       169
       169
       -
       }
     

       168
       168
       +
       }

+4 -6

nixos/modules/services/networking/teamspeak3.nix

···

       111
       111
        
             gid = config.ids.gids.teamspeak;

     

       112
       112
        
           };

     

       113
       113
        
       

     

       114
       114
       +
           systemd.tmpfiles.rules = [

     

       115
       115
       +
             "d '${cfg.logPath}' - ${user} ${group} - -"

     

       116
       116
       +
           ];

     

       117
       117
       +
       

     

       114
       118
        
           systemd.services.teamspeak3-server = {

     

       115
       119
        
             description = "Teamspeak3 voice communication server daemon";

     

       116
       120
        
             after = [ "network.target" ];

     

       117
       121
        
             wantedBy = [ "multi-user.target" ];

     

       118
       118
       -
       

     

       119
       119
       -
             preStart = ''

     

       120
       120
       -
               mkdir -p ${cfg.logPath}

     

       121
       121
       -
               chown ${user}:${group} ${cfg.logPath}

     

       122
       122
       -
             '';

     

       123
       122
        
       

     

       124
       123
        
             serviceConfig = {

     

       125
       124
        
               ExecStart = ''

     
···

       135
       134
        
               WorkingDirectory = cfg.dataDir;

     

       136
       135
        
               User = user;

     

       137
       136
        
               Group = group;

     

       138
       138
       -
               PermissionsStartOnly = true;

     

       139
       137
        
             };

     

       140
       138
        
           };

     

       141
       139
        
         };

+5 -6

nixos/modules/services/networking/unifi.nix

···

       146
       146
        
               where = where;

     

       147
       147
        
             }) mountPoints;

     

       148
       148
        
       

     

       149
       149
       +
           systemd.tmpfiles.rules = [

     

       150
       150
       +
             "e '${stateDir}' 0700 unifi - - -"

     

       151
       151
       +
             "e '${stateDir}/data' 0700 unifi - - -"

     

       152
       152
       +
           ];

     

       153
       153
       +
       

     

       149
       154
        
           systemd.services.unifi = {

     

       150
       155
        
             description = "UniFi controller daemon";

     

       151
       156
        
             wantedBy = [ "multi-user.target" ];

     
···

       157
       162
        
             environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib";

     

       158
       163
        
       

     

       159
       164
        
             preStart = ''

     

       160
       160
       -
               # Ensure privacy of state and data.

     

       161
       161
       -
               chown unifi "${stateDir}" "${stateDir}/data"

     

       162
       162
       -
               chmod 0700 "${stateDir}" "${stateDir}/data"

     

       163
       163
       -
       

     

       164
       165
        
               # Create the volatile webapps

     

       165
       166
        
               rm -rf "${stateDir}/webapps"

     

       166
       167
        
               mkdir -p "${stateDir}/webapps"

     

       167
       167
       -
               chown unifi "${stateDir}/webapps"

     

       168
       168
        
               ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT"

     

       169
       169
        
             '';

     

       170
       170
        
       

     
···

       177
       177
        
               ExecStart = "${(removeSuffix "\n" cmd)} start";

     

       178
       178
        
               ExecStop = "${(removeSuffix "\n" cmd)} stop";

     

       179
       179
        
               User = "unifi";

     

       180
       180
       -
               PermissionsStartOnly = true;

     

       181
       180
        
               UMask = "0077";

     

       182
       181
        
               WorkingDirectory = "${stateDir}";

     

       183
       182
        
             };

+5 -8

nixos/modules/services/networking/zeronet.nix

···

       86
       86
        
             '';

     

       87
       87
        
           };

     

       88
       88
        
       

     

       89
       89
       +
           systemd.tmpfiles.rules = [

     

       90
       90
       +
             "d '${cfg.dataDir}' 750 zeronet zeronet - -"

     

       91
       91
       +
             "d '${cfg.logDir}' 750 zeronet zeronet - -"

     

       92
       92
       +
           ];

     

       93
       93
       +
       

     

       89
       94
        
           systemd.services.zeronet = {

     

       90
       95
        
             description = "zeronet";

     

       91
       96
        
             after = [ "network.target" (optionalString cfg.tor "tor.service") ];

     

       92
       97
        
             wantedBy = [ "multi-user.target" ];

     

       93
       98
        
       

     

       94
       94
       -
             preStart = ''

     

       95
       95
       -
               # Ensure folder exists or create it and permissions are correct

     

       96
       96
       -
               mkdir -p ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}

     

       97
       97
       -
               chmod 750 ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}

     

       98
       98
       -
               chown zeronet:zeronet ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}

     

       99
       99
       -
             '';

     

       100
       100
       -
       

     

       101
       99
        
             serviceConfig = {

     

       102
       102
       -
               PermissionsStartOnly = true;

     

       103
       100
        
               PrivateTmp = "yes";

     

       104
       101
        
               User = "zeronet";

     

       105
       102
        
               Group = "zeronet";

+11 -7

nixos/modules/services/web-apps/atlassian/confluence.nix

···

       149
       149
        
       

     

       150
       150
        
           users.groups."${cfg.group}" = {};

     

       151
       151
        
       

     

       152
       152
       +
           systemd.tmpfiles.rules = [

     

       153
       153
       +
             "d '${cfg.home}' - ${cfg.user} - - -"

     

       154
       154
       +
             "d /run/confluence - - - - -"

     

       155
       155
       +
       

     

       156
       156
       +
             "L+ /run/confluence/home - - - - ${cfg.home}"

     

       157
       157
       +
             "L+ /run/confluence/logs - - - - ${cfg.home}/logs"

     

       158
       158
       +
             "L+ /run/confluence/temp - - - - ${cfg.home}/temp"

     

       159
       159
       +
             "L+ /run/confluence/work - - - - ${cfg.home}/work"

     

       160
       160
       +
             "L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml"

     

       161
       161
       +
           ];

     

       162
       162
       +
       

     

       152
       163
        
           systemd.services.confluence = {

     

       153
       164
        
             description = "Atlassian Confluence";

     

       154
       165
        
       

     
···

       167
       178
        
             preStart = ''

     

       168
       179
        
               mkdir -p ${cfg.home}/{logs,work,temp,deploy}

     

       169
       180
        
       

     

       170
       170
       -
               mkdir -p /run/confluence

     

       171
       171
       -
               ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/confluence

     

       172
       172
       -
               ln -sf ${cfg.home} /run/confluence/home

     

       173
       173
       -
       

     

       174
       174
       -
               chown ${cfg.user} ${cfg.home}

     

       175
       175
       -
       

     

       176
       181
        
               sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \

     

       177
       182
        
               '' + (lib.optionalString cfg.proxy.enable ''

     

       178
       183
        
                 -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \

     
···

       184
       189
        
               User = cfg.user;

     

       185
       190
        
               Group = cfg.group;

     

       186
       191
        
               PrivateTmp = true;

     

       187
       187
       -
               PermissionsStartOnly = true;

     

       188
       192
        
               ExecStart = "${pkg}/bin/start-confluence.sh -fg";

     

       189
       193
        
               ExecStop = "${pkg}/bin/stop-confluence.sh";

     

       190
       194
        
             };

+10 -7

nixos/modules/services/web-apps/atlassian/crowd.nix

···

       117
       117
        
       

     

       118
       118
        
           users.groups."${cfg.group}" = {};

     

       119
       119
        
       

     

       120
       120
       +
           systemd.tmpfiles.rules = [

     

       121
       121
       +
             "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -"

     

       122
       122
       +
             "d /run/atlassian-crowd - - - - -"

     

       123
       123
       +
       

     

       124
       124
       +
             "L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database"

     

       125
       125
       +
             "L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs"

     

       126
       126
       +
             "L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work"

     

       127
       127
       +
             "L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml"

     

       128
       128
       +
           ];

     

       129
       129
       +
       

     

       120
       130
        
           systemd.services.atlassian-crowd = {

     

       121
       131
        
             description = "Atlassian Crowd";

     

       122
       132
        
       

     
···

       136
       146
        
               rm -rf ${cfg.home}/work

     

       137
       147
        
               mkdir -p ${cfg.home}/{logs,database,work}

     

       138
       148
        
       

     

       139
       139
       -
               mkdir -p /run/atlassian-crowd

     

       140
       140
       -
               ln -sf ${cfg.home}/{database,logs,work,server.xml} /run/atlassian-crowd

     

       141
       141
       -
       

     

       142
       142
       -
               chown ${cfg.user}:${cfg.group} ${cfg.home}

     

       143
       143
       -
               chown ${cfg.user}:${cfg.group} ${cfg.home}/{logs,database,work}

     

       144
       144
       -
       

     

       145
       149
        
               sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \

     

       146
       150
        
               '' + (lib.optionalString cfg.proxy.enable ''

     

       147
       151
        
                 -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \

     
···

       153
       157
        
               User = cfg.user;

     

       154
       158
        
               Group = cfg.group;

     

       155
       159
        
               PrivateTmp = true;

     

       156
       156
       -
               PermissionsStartOnly = true;

     

       157
       160
        
               ExecStart = "${pkg}/start_crowd.sh -fg";

     

       158
       161
        
             };

     

       159
       162
        
           };

+11 -7

nixos/modules/services/web-apps/atlassian/jira.nix

···

       155
       155
        
       

     

       156
       156
        
           users.groups."${cfg.group}" = {};

     

       157
       157
        
       

     

       158
       158
       +
           systemd.tmpfiles.rules = [

     

       159
       159
       +
             "d '${cfg.home}' - ${cfg.user} - - -"

     

       160
       160
       +
             "d /run/atlassian-jira - - - - -"

     

       161
       161
       +
       

     

       162
       162
       +
             "L+ /run/atlassian-jira/home - - - - ${cfg.home}"

     

       163
       163
       +
             "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs"

     

       164
       164
       +
             "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work"

     

       165
       165
       +
             "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp"

     

       166
       166
       +
             "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml"

     

       167
       167
       +
           ];

     

       168
       168
       +
       

     

       158
       169
        
           systemd.services.atlassian-jira = {

     

       159
       170
        
             description = "Atlassian JIRA";

     

       160
       171
        
       

     
···

       174
       185
        
             preStart = ''

     

       175
       186
        
               mkdir -p ${cfg.home}/{logs,work,temp,deploy}

     

       176
       187
        
       

     

       177
       177
       -
               mkdir -p /run/atlassian-jira

     

       178
       178
       -
               ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira

     

       179
       179
       -
               ln -sf ${cfg.home} /run/atlassian-jira/home

     

       180
       180
       -
       

     

       181
       181
       -
               chown ${cfg.user} ${cfg.home}

     

       182
       182
       -
       

     

       183
       188
        
               sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \

     

       184
       189
        
               '' + (lib.optionalString cfg.proxy.enable ''

     

       185
       190
        
                 -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \

     
···

       191
       196
        
               User = cfg.user;

     

       192
       197
        
               Group = cfg.group;

     

       193
       198
        
               PrivateTmp = true;

     

       194
       194
       -
               PermissionsStartOnly = true;

     

       195
       199
        
               ExecStart = "${pkg}/bin/start-jira.sh -fg";

     

       196
       200
        
               ExecStop = "${pkg}/bin/stop-jira.sh";

     

       197
       201
        
             };

+5 -5

nixos/modules/services/web-apps/frab.nix

···

       182
       182
        
       

     

       183
       183
        
           users.groups = [ { name = cfg.group; } ];

     

       184
       184
        
       

     

       185
       185
       +
           systemd.tmpfiles.rules = [

     

       186
       186
       +
             "d '${cfg.statePath}/system/attachments' - ${cfg.user} ${cfg.group} - -"

     

       187
       187
       +
           ];

     

       188
       188
       +
       

     

       185
       189
        
           systemd.services.frab = {

     

       186
       190
        
             after = [ "network.target" "gitlab.service" ];

     

       187
       191
        
             wantedBy = [ "multi-user.target" ];

     

       188
       192
        
             environment = frabEnv;

     

       189
       193
        
       

     

       190
       194
        
             preStart = ''

     

       191
       191
       -
               mkdir -p ${cfg.statePath}/system/attachments

     

       192
       192
       -
               chown ${cfg.user}:${cfg.group} -R ${cfg.statePath}

     

       193
       193
       -
       

     

       194
       194
       -
               mkdir /run/frab -p

     

       195
       195
        
               ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml

     

       196
       196
        
               ln -sf ${cfg.statePath}/system /run/frab/system

     

       197
       197
        
       

     
···

       204
       204
        
             '';

     

       205
       205
        
       

     

       206
       206
        
             serviceConfig = {

     

       207
       207
       -
               PermissionsStartOnly = true;

     

       208
       207
        
               PrivateTmp = true;

     

       209
       208
        
               PrivateDevices = true;

     

       210
       209
        
               Type = "simple";

     
···

       213
       212
        
               TimeoutSec = "300s";

     

       214
       213
        
               Restart = "on-failure";

     

       215
       214
        
               RestartSec = "10s";

     

       215
       215
       +
               RuntimeDirectory = "frab";

     

       216
       216
        
               WorkingDirectory = "${package}/share/frab";

     

       217
       217
        
               ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " +

     

       218
       218
        
                 "--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}";

+21 -15

nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix

···

       1
       1
        
       { config, lib, pkgs, ... }: with lib; let

     

       2
       2
        
         cfg = config.services.icingaweb2;

     

       3
       3
        
         poolName = "icingaweb2";

     

       4
       4
       -
         phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock";

     

       5
       4
        
       

     

       6
       5
        
         defaultConfig = {

     

       7
       6
        
           global = {

     
···

       162
       161
        
         };

     

       163
       162
        
       

     

       164
       163
        
         config = mkIf cfg.enable {

     

       165
       165
       -
           services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {

     

       166
       166
       -
             "${poolName}" = ''

     

       167
       167
       -
               listen = "${phpfpmSocketName}"

     

       168
       168
       -
               listen.owner = nginx

     

       169
       169
       -
               listen.group = nginx

     

       170
       170
       -
               listen.mode = 0600

     

       171
       171
       -
               user = icingaweb2

     

       172
       172
       -
               pm = dynamic

     

       173
       173
       -
               pm.max_children = 75

     

       174
       174
       -
               pm.start_servers = 2

     

       175
       175
       -
               pm.min_spare_servers = 2

     

       176
       176
       -
               pm.max_spare_servers = 10

     

       177
       177
       -
             '';

     

       164
       164
       +
           services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {

     

       165
       165
       +
             "${poolName}" = {

     

       166
       166
       +
               socketName = "${poolName}";

     

       167
       167
       +
               phpPackage = pkgs.php;

     

       168
       168
       +
               user = "icingaweb2";

     

       169
       169
       +
               group = "icingaweb2";

     

       170
       170
       +
               extraConfig = ''

     

       171
       171
       +
                 listen.owner = ${config.services.nginx.user}

     

       172
       172
       +
                 listen.group = ${config.services.nginx.group}

     

       173
       173
       +
                 listen.mode = 0600

     

       174
       174
       +
                 pm = dynamic

     

       175
       175
       +
                 pm.max_children = 75

     

       176
       176
       +
                 pm.start_servers = 2

     

       177
       177
       +
                 pm.min_spare_servers = 2

     

       178
       178
       +
                 pm.max_spare_servers = 10

     

       179
       179
       +
               '';

     

       180
       180
       +
             };

     

       178
       181
        
           };

     

       179
       182
        
       

     

       180
       183
        
           services.phpfpm.phpOptions = mkIf (cfg.pool == "${poolName}")

     
···

       206
       209
        
                   include ${config.services.nginx.package}/conf/fastcgi.conf;

     

       207
       210
        
                   try_files $uri =404;

     

       208
       211
        
                   fastcgi_split_path_info ^(.+\.php)(/.+)$;

     

       209
       209
       -
                   fastcgi_pass unix:${phpfpmSocketName};

     

       212
       212
       +
                   fastcgi_pass unix:/run/phpfpm-${poolName}/${poolName}.sock;

     

       210
       213
        
                   fastcgi_param SCRIPT_FILENAME ${pkgs.icingaweb2}/public/index.php;

     

       211
       214
        
                 '';

     

       212
       215
        
               };

     
···

       238
       241
        
             description = "Icingaweb2 service user";

     

       239
       242
        
             group = "icingaweb2";

     

       240
       243
        
             isSystemUser = true;

     

       244
       244
       +
           };

     

       245
       245
       +
           users.users.nginx = {

     

       246
       246
       +
             extraGroups = [ "icingaweb2" ];

     

       241
       247
        
           };

     

       242
       248
        
         };

     

       243
       249
        
       }

+4 -4

nixos/modules/services/web-apps/limesurvey.nix

···

       202
       202
        
           };

     

       203
       203
        
       

     

       204
       204
        
           services.phpfpm.pools.limesurvey = {

     

       205
       205
       +
             socketName = "limesurvey";

     

       205
       206
        
             phpPackage = php;

     

       206
       206
       -
             listen = "/run/phpfpm/limesurvey.sock";

     

       207
       207
       +
             user = "${user}";

     

       208
       208
       +
             group = "${group}";

     

       207
       209
        
             extraConfig = ''

     

       208
       210
        
               listen.owner = ${config.services.httpd.user};

     

       209
       211
        
               listen.group = ${config.services.httpd.group};

     

       210
       210
       -
               user = ${user};

     

       211
       211
       -
               group = ${group};

     

       212
       212
        
       

     

       213
       213
        
               env[LIMESURVEY_CONFIG] = ${limesurveyConfig}

     

       214
       214
        
       

     
···

       241
       241
        
                   <Directory "${pkg}/share/limesurvey">

     

       242
       242
        
                     <FilesMatch "\.php$">

     

       243
       243
        
                       <If "-f %{REQUEST_FILENAME}">

     

       244
       244
       -
                         SetHandler "proxy:unix:/run/phpfpm/limesurvey.sock|fcgi://localhost/"

     

       244
       244
       +
                         SetHandler "proxy:unix:/run/phpfpm-limesurvey/limesurvey.sock|fcgi://localhost/"

     

       245
       245
        
                       </If>

     

       246
       246
        
                     </FilesMatch>

     

       247
       247

+23 -15

nixos/modules/services/web-apps/matomo.nix

···

       4
       4
        
         cfg = config.services.matomo;

     

       5
       5
        
       

     

       6
       6
        
         user = "matomo";

     

       7
       7
       +
         group = "matomo";

     

       7
       8
        
         dataDir = "/var/lib/${user}";

     

       8
       9
        
         deprecatedDataDir = "/var/lib/piwik";

     

       9
       10
        
       

     

       10
       11
        
         pool = user;

     

       11
       11
       -
         # it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770,

     

       12
       12
       +
         # it's not possible to use /run/phpfpm-${pool}/${pool}.sock because /run/phpfpm/ is root:root 0770,

     

       12
       13
        
         # and therefore is not accessible by the web server.

     

       13
       13
       -
         phpSocket = "/run/phpfpm-${pool}.sock";

     

       14
       14
       +
         phpSocket = "/run/phpfpm-${pool}/${pool}.sock";

     

       14
       15
        
         phpExecutionUnit = "phpfpm-${pool}";

     

       15
       16
        
         databaseService = "mysql.service";

     

       16
       17
        
       

     
···

       137
       138
        
             isSystemUser = true;

     

       138
       139
        
             createHome = true;

     

       139
       140
        
             home = dataDir;

     

       140
       140
       -
             group  = user;

     

       141
       141
       +
             group  = "${group}";

     

       142
       142
       +
           };

     

       143
       143
       +
           users.users.${config.services.nginx.user} = {

     

       144
       144
       +
             extraGroups = [ "${group}" ];

     

       141
       145
        
           };

     

       142
       142
       -
           users.groups.${user} = {};

     

       146
       146
       +
           users.groups.${group} = {};

     

       143
       147
        
       

     

       144
       148
        
           systemd.services.matomo-setup-update = {

     

       145
       149
        
             # everything needs to set up and up to date before Matomo php files are executed

     
···

       169
       173
        
                 echo "Migrating from ${deprecatedDataDir} to ${dataDir}"

     

       170
       174
        
                 mv -T ${deprecatedDataDir} ${dataDir}

     

       171
       175
        
               fi

     

       172
       172
       -
               chown -R ${user}:${user} ${dataDir}

     

       176
       176
       +
               chown -R ${user}:${group} ${dataDir}

     

       173
       177
        
               chmod -R ug+rwX,o-rwx ${dataDir}

     

       174
       178
        
               '';

     

       175
       179
        
             script = ''

     
···

       225
       229
        
             serviceConfig.UMask = "0007";

     

       226
       230
        
           };

     

       227
       231
        
       

     

       228
       228
       -
           services.phpfpm.poolConfigs = let

     

       232
       232
       +
           services.phpfpm.pools = let

     

       229
       233
        
             # workaround for when both are null and need to generate a string,

     

       230
       234
        
             # which is illegal, but as assertions apparently are being triggered *after* config generation,

     

       231
       235
        
             # we have to avoid already throwing errors at this previous stage.

     

       232
       236
        
             socketOwner = if (cfg.nginx != null) then config.services.nginx.user

     

       233
       237
        
             else if (cfg.webServerUser != null) then cfg.webServerUser else "";

     

       234
       238
        
           in {

     

       235
       235
       -
             ${pool} = ''

     

       236
       236
       -
               listen = "${phpSocket}"

     

       237
       237
       -
               listen.owner = ${socketOwner}

     

       238
       238
       -
               listen.group = root

     

       239
       239
       -
               listen.mode = 0600

     

       240
       240
       -
               user = ${user}

     

       241
       241
       -
               env[PIWIK_USER_PATH] = ${dataDir}

     

       242
       242
       -
               ${cfg.phpfpmProcessManagerConfig}

     

       243
       243
       -
             '';

     

       239
       239
       +
             ${pool} = {

     

       240
       240
       +
               socketName = "${pool}";

     

       241
       241
       +
               phpPackage = pkgs.php;

     

       242
       242
       +
               user = "${user}";

     

       243
       243
       +
               group = "${group}";

     

       244
       244
       +
               extraConfig = ''

     

       245
       245
       +
                 listen.owner = ${socketOwner}

     

       246
       246
       +
                 listen.group = ${group}

     

       247
       247
       +
                 listen.mode = 0600

     

       248
       248
       +
                 env[PIWIK_USER_PATH] = ${dataDir}

     

       249
       249
       +
                 ${cfg.phpfpmProcessManagerConfig}

     

       250
       250
       +
               '';

     

       251
       251
       +
             };

     

       244
       252
        
           };

     

       245
       253
        
       

     

       246
       254

+7 -6

nixos/modules/services/web-apps/nextcloud.nix

···

       394
       394
        
                       phpOptions)));

     

       395
       395
        
               in {

     

       396
       396
        
                 phpOptions = phpOptionsExtensions;

     

       397
       397
       +
                 socketName = "nextcloud";

     

       397
       398
        
                 phpPackage = phpPackage;

     

       398
       398
       -
                 listen = "/run/phpfpm/nextcloud";

     

       399
       399
       +
                 user = "nextcloud";

     

       400
       400
       +
                 group = "${config.services.nginx.group}";

     

       399
       401
        
                 extraConfig = ''

     

       400
       400
       -
                   listen.owner = nginx

     

       401
       401
       -
                   listen.group = nginx

     

       402
       402
       -
                   user = nextcloud

     

       403
       403
       -
                   group = nginx

     

       402
       402
       +
                   listen.owner = ${config.services.nginx.user}

     

       403
       403
       +
                   listen.group = ${config.services.nginx.group}

     

       404
       404
       +
                   listen.mode = 0600

     

       404
       405
        
                   ${cfg.poolConfig}

     

       405
       406
        
                   env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config

     

       406
       407
        
                   env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin

     
···

       466
       467
        
                         fastcgi_param HTTPS ${if cfg.https then "on" else "off"};

     

       467
       468
        
                         fastcgi_param modHeadersAvailable true;

     

       468
       469
        
                         fastcgi_param front_controller_active true;

     

       469
       469
       -
                         fastcgi_pass unix:/run/phpfpm/nextcloud;

     

       470
       470
       +
                         fastcgi_pass unix:/run/phpfpm-nextcloud/nextcloud.sock;

     

       470
       471
        
                         fastcgi_intercept_errors on;

     

       471
       472
        
                         fastcgi_request_buffering off;

     

       472
       473
        
                         fastcgi_read_timeout 120s;

+11 -7

nixos/modules/services/web-apps/restya-board.nix

···

       13
       13
        
         runDir = "/run/restya-board";

     

       14
       14
        
       

     

       15
       15
        
         poolName = "restya-board";

     

       16
       16
       -
         phpfpmSocketName = "/run/phpfpm/${poolName}.sock";

     

       16
       16
       +
         phpfpmSocketName = "/run/phpfpm-${poolName}/${poolName}.sock";

     

       17
       17
        
       

     

       18
       18
        
       in

     

       19
       19
        
       

     
···

       178
       178
        
       

     

       179
       179
        
         config = mkIf cfg.enable {

     

       180
       180
        
       

     

       181
       181
       -
           services.phpfpm.poolConfigs = {

     

       181
       181
       +
           services.phpfpm.pools = {

     

       182
       182
        
             "${poolName}" = {

     

       183
       183
       -
               listen = phpfpmSocketName;

     

       183
       183
       +
               socketName = "${poolName}";

     

       184
       184
       +
               phpPackage = pkgs.php;

     

       185
       185
       +
               user = "${cfg.user}";

     

       186
       186
       +
               group = "${cfg.group}";

     

       184
       187
        
               phpOptions = ''

     

       185
       188
        
                 date.timezone = "CET"

     

       186
       189
        
       

     
···

       192
       195
        
                 ''}

     

       193
       196
        
               '';

     

       194
       197
        
               extraConfig = ''

     

       195
       195
       -
                 listen.owner = nginx

     

       196
       196
       -
                 listen.group = nginx

     

       198
       198
       +
                 listen.owner = ${config.services.nginx.user}

     

       199
       199
       +
                 listen.group = ${config.services.nginx.group}

     

       197
       200
        
                 listen.mode = 0600

     

       198
       198
       -
                 user = ${cfg.user}

     

       199
       199
       -
                 group = ${cfg.group}

     

       200
       201
        
                 pm = dynamic

     

       201
       202
        
                 pm.max_children = 75

     

       202
       203
        
                 pm.start_servers = 10

     
···

       365
       366
        
             home = runDir;

     

       366
       367
        
             group  = "restya-board";

     

       367
       368
        
           };

     

       369
       369
       +
           users.users.nginx = {

     

       370
       370
       +
             extraGroups = [ "restya-board" ];

     

       371
       371
       +
            };

     

       368
       372
        
           users.groups.restya-board = {};

     

       369
       373
        
       

     

       370
       374
        
           services.postgresql.enable = mkIf (cfg.database.host == null) true;

+26 -19

nixos/modules/services/web-apps/selfoss.nix

···

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.selfoss;

     

       5
       5
        
       

     

       6
       6
       -
         poolName = "selfoss_pool";

     

       7
       7
       -
         phpfpmSocketName = "/run/phpfpm/${poolName}.sock";

     

       8
       8
       -
       

     

       6
       6
       +
         poolName = "selfoss";

     

       7
       7
       +
         phpfpmSocketName = "/run/phpfpm-${poolName}/${poolName}.sock";

     

       8
       8
       +
         group = "${cfg.user}";

     

       9
       9
        
         dataDir = "/var/lib/selfoss";

     

       10
       10
        
       

     

       11
       11
        
         selfoss-config =

     
···

       116
       116
        
       

     

       117
       117
        
         config = mkIf cfg.enable {

     

       118
       118
        
       

     

       119
       119
       -
           services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {

     

       120
       120
       -
             "${poolName}" = ''

     

       121
       121
       -
               listen = "${phpfpmSocketName}";

     

       122
       122
       -
               listen.owner = nginx

     

       123
       123
       -
               listen.group = nginx

     

       124
       124
       -
               listen.mode = 0600

     

       125
       125
       -
               user = nginx

     

       126
       126
       -
               pm = dynamic

     

       127
       127
       -
               pm.max_children = 75

     

       128
       128
       -
               pm.start_servers = 10

     

       129
       129
       -
               pm.min_spare_servers = 5

     

       130
       130
       -
               pm.max_spare_servers = 20

     

       131
       131
       -
               pm.max_requests = 500

     

       132
       132
       -
               catch_workers_output = 1

     

       133
       133
       -
             '';

     

       119
       119
       +
           services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {

     

       120
       120
       +
             "${poolName}" = {

     

       121
       121
       +
               socketName = "${poolName}";

     

       122
       122
       +
               phpPackage = pkgs.php;

     

       123
       123
       +
               user = "${cfg.user}";

     

       124
       124
       +
               group = "${group}";

     

       125
       125
       +
               extraConfig = ''

     

       126
       126
       +
                 listen.owner = ${config.services.nginx.user}

     

       127
       127
       +
                 listen.group = ${config.services.nginx.group}

     

       128
       128
       +
                 listen.mode = 0600

     

       129
       129
       +
                 pm = dynamic

     

       130
       130
       +
                 pm.max_children = 75

     

       131
       131
       +
                 pm.start_servers = 10

     

       132
       132
       +
                 pm.min_spare_servers = 5

     

       133
       133
       +
                 pm.max_spare_servers = 20

     

       134
       134
       +
                 pm.max_requests = 500

     

       135
       135
       +
                 catch_workers_output = 1

     

       136
       136
       +
               '';

     

       137
       137
       +
             };

     

       134
       138
        
           };

     

       135
       139
        
       

     

       136
       140
        
           systemd.services.selfoss-config = {

     
···

       145
       149
        
               # Create the files

     

       146
       150
        
               cp -r "${pkgs.selfoss}/"* "${dataDir}"

     

       147
       151
        
               ln -sf "${selfoss-config}" "${dataDir}/config.ini"

     

       148
       148
       -
               chown -R "${cfg.user}" "${dataDir}"

     

       152
       152
       +
               chown -R "${cfg.user}":"${group}" "${dataDir}"

     

       149
       153
        
               chmod -R 755 "${dataDir}"

     

       150
       154
        
             '';

     

       151
       155
        
             wantedBy = [ "multi-user.target" ];

     
···

       162
       166
        
       

     

       163
       167
        
           };

     

       164
       168
        
       

     

       169
       169
       +
           users.users.nginx = {

     

       170
       170
       +
             extraGroups = [ "${group}" ];

     

       171
       171
       +
            };

     

       165
       172
        
         };

     

       166
       173
        
       }

+7 -5

nixos/modules/services/web-apps/tt-rss.nix

···

       512
       512
        
       

     

       513
       513
        
           services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {

     

       514
       514
        
             "${poolName}" = {

     

       515
       515
       -
               listen = "/var/run/phpfpm/${poolName}.sock";

     

       515
       515
       +
               socketName = "${poolName}";

     

       516
       516
       +
               phpPackage = pkgs.php;

     

       517
       517
       +
               user = "${config.services.nginx.user}";

     

       518
       518
       +
               group = "${config.services.nginx.group}";

     

       516
       519
        
               extraConfig = ''

     

       517
       517
       -
                 listen.owner = nginx

     

       518
       518
       -
                 listen.group = nginx

     

       520
       520
       +
                 listen.owner = ${config.services.nginx.user}

     

       521
       521
       +
                 listen.group = ${config.services.nginx.group}

     

       519
       522
        
                 listen.mode = 0600

     

       520
       520
       -
                 user = ${cfg.user}

     

       521
       523
        
                 pm = dynamic

     

       522
       524
        
                 pm.max_children = 75

     

       523
       525
        
                 pm.start_servers = 10

     
···

       543
       545
        
                 locations."~ \.php$" = {

     

       544
       546
        
                   extraConfig = ''

     

       545
       547
        
                     fastcgi_split_path_info ^(.+\.php)(/.+)$;

     

       546
       546
       -
                     fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.listen};

     

       548
       548
       +
                     fastcgi_pass unix:/run/phpfpm-${poolName}/${poolName}.sock;

     

       547
       549
        
                     fastcgi_index index.php;

     

       548
       550
        
                   '';

     

       549
       551
        
                 };

+2 -2

nixos/modules/services/web-servers/lighttpd/cgit.nix

···

       42
       42
        
           configText = mkOption {

     

       43
       43
        
             default = "";

     

       44
       44
        
             example = ''

     

       45
       45
       +
               source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py

     

       46
       46
       +
               about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh

     

       45
       47
        
               cache-size=1000

     

       46
       48
        
               scan-path=/srv/git

     

       47
       47
       -
               source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py

     

       48
       48
       -
               about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh

     

       49
       49
        
             '';

     

       50
       50
        
             type = types.lines;

     

       51
       51
        
             description = ''

+95 -88

nixos/modules/services/web-servers/phpfpm/default.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.phpfpm;

     

       7
       7
       -
         enabled = cfg.poolConfigs != {} || cfg.pools != {};

     

       8
       8
       -
       

     

       9
       9
       -
         stateDir = "/run/phpfpm";

     

       7
       7
       +
         enabled = cfg.pools != {};

     

       10
       8
        
       

     

       11
       11
       -
         poolConfigs =

     

       12
       12
       -
           (mapAttrs mapPoolConfig cfg.poolConfigs) //

     

       13
       13
       -
           (mapAttrs mapPool cfg.pools);

     

       14
       14
       -
       

     

       15
       15
       -
         mapPoolConfig = n: p: {

     

       16
       16
       -
           phpPackage = cfg.phpPackage;

     

       17
       17
       -
           phpOptions = cfg.phpOptions;

     

       18
       18
       -
           config = p;

     

       19
       19
       -
         };

     

       9
       9
       +
         poolConfigs = (mapAttrs mapPool cfg.pools);

     

       20
       10
        
       

     

       21
       11
        
         mapPool = n: p: {

     

       22
       12
        
           phpPackage = p.phpPackage;

     

       23
       13
        
           phpOptions = p.phpOptions;

     

       24
       24
       -
           config = ''

     

       25
       25
       -
             listen = ${p.listen}

     

       26
       26
       -
             ${p.extraConfig}

     

       27
       27
       -
           '';

     

       14
       14
       +
           userPool = p.user;

     

       15
       15
       +
           groupPool = p.group;

     

       28
       16
        
         };

     

       29
       17
        
       

     

       30
       18
        
         fpmCfgFile = pool: conf: pkgs.writeText "phpfpm-${pool}.conf" ''

     

       31
       19
        
           [global]

     

       32
       20
        
           error_log = syslog

     

       33
       21
        
           daemonize = no

     

       34
       34
       -
           ${cfg.extraConfig}

     

       22
       22
       +
           ${cfg.globalExtraConfig}

     

       35
       23
        
       

     

       36
       24
        
           [${pool}]

     

       37
       37
       -
           ${conf}

     

       25
       25
       +
           listen = /run/phpfpm-${pool}/${cfg.pools.${pool}.socketName}.sock

     

       26
       26
       +
           ${cfg.pools.${pool}.extraConfig}

     

       38
       27
        
         '';

     

       39
       28
        
       

     

       40
       29
        
         phpIni = pool: pkgs.runCommand "php.ini" {

     
···

       49
       38
        
         '';

     

       50
       39
        
       

     

       51
       40
        
       in {

     

       52
       52
       -
       

     

       53
       41
        
         options = {

     

       54
       42
        
           services.phpfpm = {

     

       55
       55
       -
             extraConfig = mkOption {

     

       43
       43
       +
             globalExtraConfig = mkOption {

     

       56
       44
        
               type = types.lines;

     

       57
       45
        
               default = "";

     

       58
       46
        
               description = ''

     

       59
       59
       -
                 Extra configuration that should be put in the global section of

     

       47
       47
       +
                 Global extra configuration that should be put in the global section of

     

       60
       48
        
                 the PHP-FPM configuration file. Do not specify the options

     

       61
       49
        
                 <literal>error_log</literal> or

     

       62
       62
       -
                 <literal>daemonize</literal> here, since they are generated by

     

       63
       63
       -
                 NixOS.

     

       50
       50
       +
                 <literal>daemonize</literal> here, since they are generated by NixOS.

     

       64
       51
        
               '';

     

       65
       52
        
             };

     

       66
       53
        
       

     

       67
       67
       -
             phpPackage = mkOption {

     

       68
       68
       -
               type = types.package;

     

       69
       69
       -
               default = pkgs.php;

     

       70
       70
       -
               defaultText = "pkgs.php";

     

       71
       71
       -
               description = ''

     

       72
       72
       -
                 The PHP package to use for running the PHP-FPM service.

     

       73
       73
       -
               '';

     

       74
       74
       -
             };

     

       54
       54
       +
             pools = mkOption {

     

       55
       55
       +
               default = {};

     

       56
       56
       +
               type = types.attrsOf (types.submodule {

     

       57
       57
       +
                 options = {

     

       58
       58
       +
                   socketName = mkOption {

     

       59
       59
       +
                     type = types.str;

     

       60
       60
       +
                     example = "php-fpm";

     

       61
       61
       +
                     description = ''

     

       62
       62
       +
                       The address on which to accept FastCGI requests.

     

       63
       63
       +
                     '';

     

       64
       64
       +
                   };

     

       65
       65
       +
       

     

       66
       66
       +
                   phpPackage = mkOption {

     

       67
       67
       +
                     type = types.package;

     

       68
       68
       +
                     default = pkgs.php;

     

       69
       69
       +
                     defaultText = "pkgs.php";

     

       70
       70
       +
                     description = ''

     

       71
       71
       +
                       The PHP package to use for running this PHP-FPM pool.

     

       72
       72
       +
                     '';

     

       73
       73
       +
                   };

     

       74
       74
       +
       

     

       75
       75
       +
                   phpOptions = mkOption {

     

       76
       76
       +
                     type = types.lines;

     

       77
       77
       +
                     default = "";

     

       78
       78
       +
                     description = ''

     

       79
       79
       +
                       Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool.

     

       80
       80
       +
                     '';

     

       81
       81
       +
                   };

     

       82
       82
       +
       

     

       83
       83
       +
                   user = mkOption {

     

       84
       84
       +
                     type = types.string;

     

       85
       85
       +
                     default = "phpfpm";

     

       86
       86
       +
                     description = "User account under which phpfpm runs.";

     

       87
       87
       +
                   };

     

       88
       88
       +
       

     

       89
       89
       +
                   group = mkOption {

     

       90
       90
       +
                     type = types.string;

     

       91
       91
       +
                     default = "phpfpm";

     

       92
       92
       +
                     description = "Group account under which phpfpm runs.";

     

       93
       93
       +
                   };

     

       94
       94
       +
       

     

       95
       95
       +
                   extraConfig = mkOption {

     

       96
       96
       +
                     type = types.lines;

     

       97
       97
       +
                     example = ''

     

       98
       98
       +
                       pm = dynamic

     

       99
       99
       +
                       pm.max_children = 75

     

       100
       100
       +
                       pm.start_servers = 10

     

       101
       101
       +
                       pm.min_spare_servers = 5

     

       102
       102
       +
                       pm.max_spare_servers = 20

     

       103
       103
       +
                       pm.max_requests = 500

     

       104
       104
       +
                     '';

     

       75
       105
        
       

     

       76
       76
       -
             phpOptions = mkOption {

     

       77
       77
       -
               type = types.lines;

     

       78
       78
       -
               default = "";

     

       79
       79
       -
               example =

     

       80
       80
       -
                 ''

     

       81
       81
       -
                   date.timezone = "CET"

     

       82
       82
       -
                 '';

     

       83
       83
       -
               description =

     

       84
       84
       -
                 "Options appended to the PHP configuration file <filename>php.ini</filename>.";

     

       85
       85
       -
             };

     

       106
       106
       +
                     description = ''

     

       107
       107
       +
                       Extra lines that go into the pool configuration.

     

       108
       108
       +
                       See the documentation on <literal>php-fpm.conf</literal> for

     

       109
       109
       +
                       details on configuration directives.

     

       110
       110
       +
                     '';

     

       111
       111
       +
                   };

     

       112
       112
       +
                 };

     

       113
       113
       +
               });

     

       86
       114
        
       

     

       87
       87
       -
             poolConfigs = mkOption {

     

       88
       88
       -
               default = {};

     

       89
       89
       -
               type = types.attrsOf types.lines;

     

       90
       115
        
               example = literalExample ''

     

       91
       91
       -
                 { mypool = '''

     

       92
       92
       -
                     listen = /run/phpfpm/mypool

     

       93
       93
       -
                     user = nobody

     

       94
       94
       -
                     pm = dynamic

     

       95
       95
       -
                     pm.max_children = 75

     

       96
       96
       -
                     pm.start_servers = 10

     

       97
       97
       -
                     pm.min_spare_servers = 5

     

       98
       98
       -
                     pm.max_spare_servers = 20

     

       99
       99
       -
                     pm.max_requests = 500

     

       100
       100
       -
                   ''';

     

       116
       116
       +
                 {

     

       117
       117
       +
                   mypool = {

     

       118
       118
       +
                     socketName = "example";

     

       119
       119
       +
                     phpPackage = pkgs.php;

     

       120
       120
       +
                     user = "phpfpm";

     

       121
       121
       +
                     group = "phpfpm";

     

       122
       122
       +
                     extraConfig = '''

     

       123
       123
       +
                       pm = dynamic

     

       124
       124
       +
                       pm.max_children = 75

     

       125
       125
       +
                       pm.start_servers = 10

     

       126
       126
       +
                       pm.min_spare_servers = 5

     

       127
       127
       +
                       pm.max_spare_servers = 20

     

       128
       128
       +
                       pm.max_requests = 500

     

       129
       129
       +
                     ''';

     

       130
       130
       +
                   }

     

       101
       131
        
                 }

     

       102
       132
        
               '';

     

       103
       133
        
               description = ''

     

       104
       104
       -
                 A mapping between PHP-FPM pool names and their configurations.

     

       105
       105
       -
                 See the documentation on <literal>php-fpm.conf</literal> for

     

       106
       106
       -
                 details on configuration directives. If no pools are defined,

     

       107
       107
       -
                 the phpfpm service is disabled.

     

       108
       108
       -
               '';

     

       109
       109
       -
             };

     

       110
       110
       -
       

     

       111
       111
       -
             pools = mkOption {

     

       112
       112
       -
               type = types.attrsOf (types.submodule (import ./pool-options.nix {

     

       113
       113
       -
                 inherit lib config;

     

       114
       114
       -
               }));

     

       115
       115
       -
               default = {};

     

       116
       116
       -
               example = literalExample ''

     

       117
       117
       -
                {

     

       118
       118
       -
                  mypool = {

     

       119
       119
       -
                    listen = "/path/to/unix/socket";

     

       120
       120
       -
                    phpPackage = pkgs.php;

     

       121
       121
       -
                    extraConfig = '''

     

       122
       122
       -
                      user = nobody

     

       123
       123
       -
                      pm = dynamic

     

       124
       124
       -
                      pm.max_children = 75

     

       125
       125
       -
                      pm.start_servers = 10

     

       126
       126
       -
                      pm.min_spare_servers = 5

     

       127
       127
       -
                      pm.max_spare_servers = 20

     

       128
       128
       -
                      pm.max_requests = 500

     

       129
       129
       -
                    ''';

     

       130
       130
       -
                  }

     

       131
       131
       -
                }'';

     

       132
       132
       -
               description = ''

     

       133
       134
        
                 PHP-FPM pools. If no pools or poolConfigs are defined, the PHP-FPM

     

       134
       135
        
                 service is disabled.

     

       135
       136
        
               '';

     
···

       154
       155
        
               after = [ "network.target" ];

     

       155
       156
        
               wantedBy = [ "phpfpm.target" ];

     

       156
       157
        
               partOf = [ "phpfpm.target" ];

     

       157
       157
       -
               preStart = ''

     

       158
       158
       -
                 mkdir -p ${stateDir}

     

       159
       159
       -
               '';

     

       160
       158
        
               serviceConfig = let

     

       161
       159
        
                 cfgFile = fpmCfgFile pool poolConfig.config;

     

       162
       160
        
                 iniFile = phpIni poolConfig;

     
···

       166
       164
        
                 ProtectSystem = "full";

     

       167
       165
        
                 ProtectHome = true;

     

       168
       166
        
                 # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work

     

       169
       169
       -
                 RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";

     

       167
       167
       +
                 RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];

     

       170
       168
        
                 Type = "notify";

     

       171
       171
       -
                 ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${iniFile}";

     

       169
       169
       +
                 ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y '${cfgFile}' -c '${iniFile}'";

     

       172
       170
        
                 ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";

     

       171
       171
       +
                 # User and group

     

       172
       172
       +
                 User = "${poolConfig.userPool}";

     

       173
       173
       +
                 Group = "${poolConfig.groupPool}";

     

       174
       174
       +
                 # Runtime directory and mode

     

       175
       175
       +
                 RuntimeDirectory = "phpfpm-${pool}";

     

       176
       176
       +
                 RuntimeDirectoryMode = "0750";

     

       177
       177
       +
                 # Capabilities

     

       178
       178
       +
                 AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" "CAP_CHOWN" "CAP_SYS_RESOURCE" ];

     

       179
       179
       +
                 CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" "CAP_CHOWN" "CAP_SYS_RESOURCE" ];

     

       173
       180
        
               };

     

       174
       181
        
             }

     

       175
       182
        
          );

-57

nixos/modules/services/web-servers/phpfpm/pool-options.nix

···

       1
       1
       -
       { lib, config }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         fpmCfg = config.services.phpfpm;

     

       5
       5
       -
       in

     

       6
       6
       -
       

     

       7
       7
       -
       with lib; {

     

       8
       8
       -
       

     

       9
       9
       -
         options = {

     

       10
       10
       -
       

     

       11
       11
       -
           listen = mkOption {

     

       12
       12
       -
             type = types.str;

     

       13
       13
       -
             example = "/path/to/unix/socket";

     

       14
       14
       -
             description = ''

     

       15
       15
       -
               The address on which to accept FastCGI requests.

     

       16
       16
       -
             '';

     

       17
       17
       -
           };

     

       18
       18
       -
       

     

       19
       19
       -
           phpPackage = mkOption {

     

       20
       20
       -
             type = types.package;

     

       21
       21
       -
             default = fpmCfg.phpPackage;

     

       22
       22
       -
             defaultText = "config.services.phpfpm.phpPackage";

     

       23
       23
       -
             description = ''

     

       24
       24
       -
               The PHP package to use for running this PHP-FPM pool.

     

       25
       25
       -
             '';

     

       26
       26
       -
           };

     

       27
       27
       -
       

     

       28
       28
       -
           phpOptions = mkOption {

     

       29
       29
       -
             type = types.lines;

     

       30
       30
       -
             default = fpmCfg.phpOptions;

     

       31
       31
       -
             defaultText = "config.services.phpfpm.phpOptions";

     

       32
       32
       -
             description = ''

     

       33
       33
       -
               "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool."

     

       34
       34
       -
             '';

     

       35
       35
       -
           };

     

       36
       36
       -
       

     

       37
       37
       -
           extraConfig = mkOption {

     

       38
       38
       -
             type = types.lines;

     

       39
       39
       -
             example = ''

     

       40
       40
       -
               user = nobody

     

       41
       41
       -
               pm = dynamic

     

       42
       42
       -
               pm.max_children = 75

     

       43
       43
       -
               pm.start_servers = 10

     

       44
       44
       -
               pm.min_spare_servers = 5

     

       45
       45
       -
               pm.max_spare_servers = 20

     

       46
       46
       -
               pm.max_requests = 500

     

       47
       47
       -
             '';

     

       48
       48
       -
       

     

       49
       49
       -
             description = ''

     

       50
       50
       -
               Extra lines that go into the pool configuration.

     

       51
       51
       -
               See the documentation on <literal>php-fpm.conf</literal> for

     

       52
       52
       -
               details on configuration directives.

     

       53
       53
       -
             '';

     

       54
       54
       -
           };

     

       55
       55
       -
         };

     

       56
       56
       -
       }

     

       57
       57
       -

+64 -40

nixos/modules/virtualisation/libvirtd.nix

···

       23
       23
        
           ''}

     

       24
       24
        
           ${cfg.qemuVerbatimConfig}

     

       25
       25
        
         '';

     

       26
       26
       +
         dirName = "libvirt";

     

       27
       27
       +
         subDirs = list: [ dirName ] ++ map (e: "${dirName}/${e}") list;

     

       26
       28
        
       

     

       27
       29
        
       in {

     

       28
       30
        
       

     

       29
       31
        
         ###### interface

     

       30
       32
        
       

     

       31
       31
       -
         options = {

     

       33
       33
       +
         options.virtualisation.libvirtd = {

     

       32
       34
        
       

     

       33
       33
       -
           virtualisation.libvirtd.enable = mkOption {

     

       35
       35
       +
           enable = mkOption {

     

       34
       36
        
             type = types.bool;

     

       35
       37
        
             default = false;

     

       36
       38
        
             description = ''

     
···

       41
       43
        
             '';

     

       42
       44
        
           };

     

       43
       45
        
       

     

       44
       44
       -
           virtualisation.libvirtd.qemuPackage = mkOption {

     

       46
       46
       +
           qemuPackage = mkOption {

     

       45
       47
        
             type = types.package;

     

       46
       48
        
             default = pkgs.qemu;

     

       47
       49
        
             description = ''

     
···

       51
       53
        
             '';

     

       52
       54
        
           };

     

       53
       55
        
       

     

       54
       54
       -
           virtualisation.libvirtd.extraConfig = mkOption {

     

       56
       56
       +
           extraConfig = mkOption {

     

       55
       57
        
             type = types.lines;

     

       56
       58
        
             default = "";

     

       57
       59
        
             description = ''

     
···

       60
       62
        
             '';

     

       61
       63
        
           };

     

       62
       64
        
       

     

       63
       63
       -
           virtualisation.libvirtd.qemuRunAsRoot = mkOption {

     

       65
       65
       +
           qemuRunAsRoot = mkOption {

     

       64
       66
        
             type = types.bool;

     

       65
       67
        
             default = true;

     

       66
       68
        
             description = ''

     
···

       72
       74
        
             '';

     

       73
       75
        
           };

     

       74
       76
        
       

     

       75
       75
       -
           virtualisation.libvirtd.qemuVerbatimConfig = mkOption {

     

       77
       77
       +
           qemuVerbatimConfig = mkOption {

     

       76
       78
        
             type = types.lines;

     

       77
       79
        
             default = ''

     

       78
       80
        
               namespaces = []

     
···

       84
       86
        
             '';

     

       85
       87
        
           };

     

       86
       88
        
       

     

       87
       87
       -
           virtualisation.libvirtd.qemuOvmf = mkOption {

     

       89
       89
       +
           qemuOvmf = mkOption {

     

       88
       90
        
             type = types.bool;

     

       89
       91
        
             default = true;

     

       90
       92
        
             description = ''

     
···

       93
       95
        
             '';

     

       94
       96
        
           };

     

       95
       97
        
       

     

       96
       96
       -
           virtualisation.libvirtd.extraOptions = mkOption {

     

       98
       98
       +
           extraOptions = mkOption {

     

       97
       99
        
             type = types.listOf types.str;

     

       98
       100
        
             default = [ ];

     

       99
       101
        
             example = [ "--verbose" ];

     
···

       102
       104
        
             '';

     

       103
       105
        
           };

     

       104
       106
        
       

     

       105
       105
       -
           virtualisation.libvirtd.onShutdown = mkOption {

     

       107
       107
       +
           onShutdown = mkOption {

     

       106
       108
        
             type = types.enum ["shutdown" "suspend" ];

     

       107
       109
        
             default = "suspend";

     

       108
       110
        
             description = ''

     
···

       113
       115
        
             '';

     

       114
       116
        
           };

     

       115
       117
        
       

     

       118
       118
       +
           allowedBridges = mkOption {

     

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

     

       120
       120
       +
             default = [ "virbr0" ];

     

       121
       121
       +
             description = ''

     

       122
       122
       +
               List of bridge devices that can be used by qemu:///session

     

       123
       123
       +
             '';

     

       124
       124
       +
           };

     

       125
       125
       +
       

     

       116
       126
        
         };

     

       117
       127
        
       

     

       118
       128
        
       

     
···

       120
       130
        
       

     

       121
       131
        
         config = mkIf cfg.enable {

     

       122
       132
        
       

     

       123
       123
       -
           environment.systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];

     

       133
       133
       +
           environment = {

     

       134
       134
       +
             # this file is expected in /etc/qemu and not sysconfdir (/var/lib)

     

       135
       135
       +
             etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e:

     

       136
       136
       +
               "allow ${e}") cfg.allowedBridges;

     

       137
       137
       +
             systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];

     

       138
       138
       +
           };

     

       124
       139
        
       

     

       125
       140
        
           boot.kernelModules = [ "tun" ];

     

       126
       141
        
       

     
···

       134
       149
        
             group = "qemu-libvirtd";

     

       135
       150
        
           };

     

       136
       151
        
       

     

       137
       137
       -
           systemd.packages = [ pkgs.libvirt ];

     

       138
       138
       -
       

     

       139
       139
       -
           systemd.services.libvirtd = {

     

       140
       140
       -
             description = "Libvirt Virtual Machine Management Daemon";

     

       141
       141
       -
       

     

       142
       142
       -
             wantedBy = [ "multi-user.target" ];

     

       143
       143
       -
             after = [ "systemd-udev-settle.service" ]

     

       144
       144
       -
                     ++ optional vswitch.enable "vswitchd.service";

     

       145
       145
       -
       

     

       146
       146
       -
             environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';

     

       147
       147
       -
       

     

       148
       148
       -
             path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images

     

       149
       149
       -
                    ++ optional vswitch.enable vswitch.package;

     

       150
       150
       -
       

     

       151
       151
       -
             preStart = ''

     

       152
       152
       -
               mkdir -p /var/log/libvirt/qemu -m 755

     

       153
       153
       -
               rm -f /var/run/libvirtd.pid

     

       154
       154
       -
       

     

       155
       155
       -
               mkdir -p /var/lib/libvirt

     

       156
       156
       -
               mkdir -p /var/lib/libvirt/dnsmasq

     

       152
       152
       +
           security.wrappers.qemu-bridge-helper = {

     

       153
       153
       +
             source = "/run/${dirName}/nix-helpers/qemu-bridge-helper";

     

       154
       154
       +
           };

     

       157
       155
        
       

     

       158
       158
       -
               chmod 755 /var/lib/libvirt

     

       159
       159
       -
               chmod 755 /var/lib/libvirt/dnsmasq

     

       156
       156
       +
           systemd.packages = [ pkgs.libvirt ];

     

       160
       157
        
       

     

       158
       158
       +
           systemd.services.libvirtd-config = {

     

       159
       159
       +
             description = "Libvirt Virtual Machine Management Daemon - configuration";

     

       160
       160
       +
             script = ''

     

       161
       161
        
               # Copy default libvirt network config .xml files to /var/lib

     

       162
       162
        
               # Files modified by the user will not be overwritten

     

       163
       163
        
               for i in $(cd ${pkgs.libvirt}/var/lib && echo \

     
···

       169
       169
        
               done

     

       170
       170
        
       

     

       171
       171
        
               # Copy generated qemu config to libvirt directory

     

       172
       172
       -
               cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf

     

       172
       172
       +
               cp -f ${qemuConfigFile} /var/lib/${dirName}/qemu.conf

     

       173
       173
        
       

     

       174
       174
        
               # stable (not GC'able as in /nix/store) paths for using in <emulator> section of xml configs

     

       175
       175
       -
               mkdir -p /run/libvirt/nix-emulators

     

       176
       175
        
               for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do

     

       177
       177
       -
                 ln -s --force "$emulator" /run/libvirt/nix-emulators/

     

       176
       176
       +
                 ln -s --force "$emulator" /run/${dirName}/nix-emulators/

     

       177
       177
       +
               done

     

       178
       178
       +
       

     

       179
       179
       +
               for helper in libexec/qemu-bridge-helper bin/qemu-pr-helper; do

     

       180
       180
       +
                 ln -s --force ${cfg.qemuPackage}/$helper /run/${dirName}/nix-helpers/

     

       178
       181
        
               done

     

       179
       182
        
       

     

       180
       183
        
               ${optionalString cfg.qemuOvmf ''

     

       181
       181
       -
                   mkdir -p /run/libvirt/nix-ovmf

     

       182
       182
       -
                   ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/

     

       183
       183
       -
                   ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/

     

       184
       184
       +
                 ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/

     

       185
       185
       +
                 ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/

     

       184
       186
        
               ''}

     

       185
       187
        
             '';

     

       186
       188
        
       

     

       187
       189
        
             serviceConfig = {

     

       190
       190
       +
               Type = "oneshot";

     

       191
       191
       +
               RuntimeDirectoryPreserve = "yes";

     

       192
       192
       +
               LogsDirectory = subDirs [ "qemu" ];

     

       193
       193
       +
               RuntimeDirectory = subDirs [ "nix-emulators" "nix-helpers" "nix-ovmf" ];

     

       194
       194
       +
               StateDirectory = subDirs [ "dnsmasq" ];

     

       195
       195
       +
             };

     

       196
       196
       +
           };

     

       197
       197
       +
       

     

       198
       198
       +
           systemd.services.libvirtd = {

     

       199
       199
       +
             description = "Libvirt Virtual Machine Management Daemon";

     

       200
       200
       +
       

     

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

     

       202
       202
       +
             requires = [ "libvirtd-config.service" ];

     

       203
       203
       +
             after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]

     

       204
       204
       +
                     ++ optional vswitch.enable "vswitchd.service";

     

       205
       205
       +
       

     

       206
       206
       +
             environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';

     

       207
       207
       +
       

     

       208
       208
       +
             path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images

     

       209
       209
       +
                    ++ optional vswitch.enable vswitch.package;

     

       210
       210
       +
       

     

       211
       211
       +
             serviceConfig = {

     

       188
       212
        
               Type = "notify";

     

       189
       213
        
               KillMode = "process"; # when stopping, leave the VMs alone

     

       190
       214
        
               Restart = "no";

     
···

       203
       227
        
           systemd.sockets.virtlogd = {

     

       204
       228
        
             description = "Virtual machine log manager socket";

     

       205
       229
        
             wantedBy = [ "sockets.target" ];

     

       206
       206
       -
             listenStreams = [ "/run/libvirt/virtlogd-sock" ];

     

       230
       230
       +
             listenStreams = [ "/run/${dirName}/virtlogd-sock" ];

     

       207
       231
        
           };

     

       208
       232
        
       

     

       209
       233
        
           systemd.services.virtlogd = {

     
···

       215
       239
        
           systemd.sockets.virtlockd = {

     

       216
       240
        
             description = "Virtual machine lock manager socket";

     

       217
       241
        
             wantedBy = [ "sockets.target" ];

     

       218
       218
       -
             listenStreams = [ "/run/libvirt/virtlockd-sock" ];

     

       242
       242
       +
             listenStreams = [ "/run/${dirName}/virtlockd-sock" ];

     

       219
       243
        
           };

     

       220
       244
        
       

     

       221
       245
        
           systemd.services.virtlockd = {

+6

nixos/tests/mysql.nix

···

       28
       28
        
             {

     

       29
       29
        
               users.users.testuser = { };

     

       30
       30
        
               services.mysql.enable = true;

     

       31
       31
       +
               services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''

     

       32
       32
       +
                 echo "ALTER USER root@localhost IDENTIFIED WITH unix_socket;"

     

       33
       33
       +
                 echo "DELETE FROM mysql.user WHERE password = ''' AND plugin = ''';"

     

       34
       34
       +
                 echo "DELETE FROM mysql.user WHERE user = ''';"

     

       35
       35
       +
                 echo "FLUSH PRIVILEGES;"

     

       36
       36
       +
               '';

     

       31
       37
        
               services.mysql.ensureDatabases = [ "testdb" ];

     

       32
       38
        
               services.mysql.ensureUsers = [{

     

       33
       39
        
                 name = "testuser";

+3 -3

pkgs/applications/altcoins/parity/beta.nix

···

       1
       1
        
       let

     

       2
       2
       -
         version     = "2.5.1";

     

       3
       3
       -
         sha256      = "0nnrgc2qyqqld3znjigryqpg5jaqh3jnmin4a334dbr4jw50dz3d";

     

       4
       4
       -
         cargoSha256 = "184vfhsalk5dims3k13zrsv4lmm45a7nm3r0b84g72q7hhbl8pkf";

     

       2
       2
       +
         version     = "2.5.3";

     

       3
       3
       +
         sha256      = "04z38ba4f1kmaa3d9b4gqz7dwr5blbppnkngw758xdm56772hfmj";

     

       4
       4
       +
         cargoSha256 = "03dlzl96g8k02lifymwp1xs0b2mrnj5c1xzpwp014ijqlnzcfgsv";

     

       5
       5
        
       in

     

       6
       6
        
         import ./parity.nix { inherit version sha256 cargoSha256; }

+3 -3

pkgs/applications/altcoins/parity/default.nix

···

       1
       1
        
       let

     

       2
       2
       -
         version     = "2.4.6";

     

       3
       3
       -
         sha256      = "0vfq1pyd92n60h9gimn4d5j56xanvl43sgxk9h2kb16amy0mmh3z";

     

       4
       4
       -
         cargoSha256 = "04gi9vddahq1q207f83n3wriwdjnmmnby6mq4crdh7yx1p4b26m9";

     

       2
       2
       +
         version     = "2.4.8";

     

       3
       3
       +
         sha256      = "1kr7hzv27vxa14wafhpaq5a4fv97zh71xjjmwzaqq4gj3k9yj0rm";

     

       4
       4
       +
         cargoSha256 = "1yjyk6mhr3ws73aq6h8z5iabvj03ch7mxhkrfdkmhw3cjj0jgx6j";

     

       5
       5
        
       in

     

       6
       6
        
         import ./parity.nix { inherit version sha256 cargoSha256; }

+4 -2

pkgs/applications/altcoins/parity/parity.nix

···

       5
       5
        
       

     

       6
       6
        
       { stdenv

     

       7
       7
        
       , fetchFromGitHub

     

       8
       8
       -
       , rustPlatform 

     

       8
       8
       +
       , rustPlatform

     

       9
       9
        
       , pkgconfig

     

       10
       10
        
       , openssl

     

       11
       11
        
       , systemd

     
···

       29
       29
        
           systemd.lib systemd.dev openssl openssl.dev

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
       +
         cargoBuildFlags = [ "--features final" ];

     

       33
       33
       +
       

     

       32
       34
        
         # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out

     

       33
       35
        
         doCheck = false;

     

       34
       36
        
       

     

       35
       37
        
         meta = with stdenv.lib; {

     

       36
       38
        
           description = "Fast, light, robust Ethereum implementation";

     

       37
       37
       -
           homepage = http://parity.io;

     

       39
       39
       +
           homepage = "http://parity.io";

     

       38
       40
        
           license = licenses.gpl3;

     

       39
       41
        
           maintainers = [ maintainers.akru ];

     

       40
       42
        
           platforms = platforms.linux;

+2 -2

pkgs/applications/audio/ecasound/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         name = "ecasound-${version}";

     

       18
       18
       -
         version = "2.9.1";

     

       18
       18
       +
         version = "2.9.2";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchurl {

     

       21
       21
        
           url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz";

     

       22
       22
       -
           sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r";

     

       22
       22
       +
           sha256 = "15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];

+1

pkgs/applications/audio/pulseaudio-modules-bt/default.nix

···

       35
       35
        
       

     

       36
       36
        
         patches = [

     

       37
       37
        
           ./fix-install-path.patch

     

       38
       38
       +
           ./fix-aac-defaults.patch

     

       38
       39
        
         ];

     

       39
       40
        
       

     

       40
       41
        
         nativeBuildInputs = [

+15

pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch

···

       1
       1
       +
       diff --git a/src/modules/bluetooth/a2dp/a2dp_aac.c b/src/modules/bluetooth/a2dp/a2dp_aac.c

     

       2
       2
       +
       index 394a7a0..cf5abaf 100644

     

       3
       3
       +
       --- a/src/modules/bluetooth/a2dp/a2dp_aac.c

     

       4
       4
       +
       +++ b/src/modules/bluetooth/a2dp/a2dp_aac.c

     

       5
       5
       +
       @@ -90,8 +90,8 @@ pa_aac_encoder_init(pa_a2dp_source_read_cb_t read_cb, pa_a2dp_source_read_buf_fr

     

       6
       6
       +
            info->read_pcm = read_cb;

     

       7
       7
       +
            info->read_buf_free = free_cb;

     

       8
       8
       +
            info->aacenc_handle_opened = false;

     

       9
       9
       +
       -    info->aac_enc_bitrate_mode = 5;

     

       10
       10
       +
       -    info->aac_afterburner = false;

     

       11
       11
       +
       +    info->aac_enc_bitrate_mode = 0;

     

       12
       12
       +
       +    info->aac_afterburner = true;

     

       13
       13
       +
            info->force_pa_fmt = PA_SAMPLE_INVALID;

     

       14
       14
       +
            return true;

     

       15
       15
       +
        }

+2 -2

pkgs/applications/audio/pulseeffects/default.nix

···

       47
       47
        
         ];

     

       48
       48
        
       in stdenv.mkDerivation rec {

     

       49
       49
        
         pname = "pulseeffects";

     

       50
       50
       -
         version = "4.6.3";

     

       50
       50
       +
         version = "4.6.5";

     

       51
       51
        
       

     

       52
       52
        
         src = fetchFromGitHub {

     

       53
       53
        
           owner = "wwmm";

     

       54
       54
        
           repo = "pulseeffects";

     

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

     

       56
       56
       -
           sha256 = "1gp23hpsnbiymbbhn6hp8sg1pnysgf04bj9k4h9dfinbgshlq6m7";

     

       56
       56
       +
           sha256 = "11ihr29szpqlk9wkscns00ijihyvn5659bj1p7r1ixwgfv708apq";

     

       57
       57
        
         };

     

       58
       58
        
       

     

       59
       59
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/audio/qmmp/default.nix

···

       29
       29
        
       # handle that.

     

       30
       30
        
       

     

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
       -
         name = "qmmp-1.3.2";

     

       32
       32
       +
         name = "qmmp-1.3.3";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchurl {

     

       35
       35
        
           url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";

     

       36
       36
       -
           sha256 = "1rh063kcyg7gs9yj2r4v5irpnq4pjaxaxsgrw30mdr21xhhc15cz";

     

       36
       36
       +
           sha256 = "1777kqgvbkshqlawy00gbgwflxflwmjjidqdq29mhqszs76r6727";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         nativeBuildInputs = [ cmake pkgconfig ];

+3 -3

pkgs/applications/editors/android-studio/default.nix

···

       13
       13
        
           sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30";

     

       14
       14
        
         };

     

       15
       15
        
         betaVersion = {

     

       16
       16
       -
           version = "3.5.0.16"; # "Android Studio 3.5 Beta 4"

     

       17
       17
       -
           build = "191.5619324";

     

       18
       18
       -
           sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z";

     

       16
       16
       +
           version = "3.5.0.17"; # "Android Studio 3.5 Beta 5"

     

       17
       17
       +
           build = "191.5675373";

     

       18
       18
       +
           sha256Hash = "0iw9v2rzr32dhs3z4vgz93zvxcv111q4cvwzi2cb83hn8kl050ip";

     

       19
       19
        
         };

     

       20
       20
        
         latestVersion = { # canary & dev

     

       21
       21
        
           version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"

+1 -1

pkgs/applications/editors/kakoune/default.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       6
       6
       +
         pname = "kakoune-unwrapped";

     

       7
       7
        
         version = "2019.01.20";

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           repo = "kakoune";

+5

pkgs/applications/editors/kakoune/plugins.nix

···

       1
       1
       +
       { parinfer-rust }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         inherit parinfer-rust;

     

       5
       5
       +
       }

+44

pkgs/applications/editors/kakoune/wrapper.nix

···

       1
       1
       +
       { stdenv, bash }:

     

       2
       2
       +
       with stdenv.lib;

     

       3
       3
       +
       

     

       4
       4
       +
       kakoune:

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         getPlugins = { plugins ? [] }: plugins;

     

       8
       8
       +
       

     

       9
       9
       +
         wrapper = { configure ? {} }:

     

       10
       10
       +
         stdenv.mkDerivation rec {

     

       11
       11
       +
           pname = "kakoune";

     

       12
       12
       +
           version = getVersion kakoune;

     

       13
       13
       +
       

     

       14
       14
       +
           src = ./.;

     

       15
       15
       +
           buildCommand = ''

     

       16
       16
       +
             mkdir -p $out/share/kak

     

       17
       17
       +
             for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do

     

       18
       18
       +
               if [[ -d $plugin/share/kak/autoload ]]; then

     

       19
       19
       +
                 find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do

     

       20
       20
       +
                   printf 'source "%s"\n' "$rcfile"

     

       21
       21
       +
                 done

     

       22
       22
       +
               fi

     

       23
       23
       +
             done >>$out/share/kak/plugins.kak

     

       24
       24
       +
       

     

       25
       25
       +
             mkdir -p $out/bin

     

       26
       26
       +
             substitute ${src}/wrapper.sh $out/bin/kak \

     

       27
       27
       +
               --subst-var-by bash "${bash}" \

     

       28
       28
       +
               --subst-var-by kakoune "${kakoune}" \

     

       29
       29
       +
               --subst-var-by out "$out"

     

       30
       30
       +
             chmod +x $out/bin/kak

     

       31
       31
       +
           '';

     

       32
       32
       +
       

     

       33
       33
       +
           preferLocalBuild = true;

     

       34
       34
       +
           buildInputs = [ bash kakoune ];

     

       35
       35
       +
           passthru = { unwrapped = kakoune; };

     

       36
       36
       +
       

     

       37
       37
       +
           meta = kakoune.meta // {

     

       38
       38
       +
             # prefer wrapper over the package

     

       39
       39
       +
             priority = (kakoune.meta.priority or 0) - 1;

     

       40
       40
       +
             hydraPlatforms = [];

     

       41
       41
       +
           };

     

       42
       42
       +
         };

     

       43
       43
       +
       in

     

       44
       44
       +
         makeOverridable wrapper

+30

pkgs/applications/editors/kakoune/wrapper.sh

···

       1
       1
       +
       #!@bash@/bin/bash

     

       2
       2
       +
       

     

       3
       3
       +
       # We use the -E option to load plugins.  This only makes sense when we are

     

       4
       4
       +
       # starting a new session, so we detect that.  Also, Kakoune can only handle

     

       5
       5
       +
       # one -E option, so we prepend loading plugins to an existing one.

     

       6
       6
       +
       args=( "$@" )

     

       7
       7
       +
       loadPlugins=true

     

       8
       8
       +
       EValueOffset=-1

     

       9
       9
       +
       pluginScript='@out@/share/kak/plugins.kak'

     

       10
       10
       +
       

     

       11
       11
       +
       for (( i = 0; i < ${#args[@]}; i++ )); do

     

       12
       12
       +
           case "${args[i]}" in

     

       13
       13
       +
               -n|-c|-l|-p|-clear|-version) loadPlugins=false;;

     

       14
       14
       +
               -E)                          EValueOffset=$(( i + 1 ));;

     

       15
       15
       +
               --)                          break;;

     

       16
       16
       +
           esac

     

       17
       17
       +
           case "${args[i]}" in

     

       18
       18
       +
               -E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));;

     

       19
       19
       +
           esac

     

       20
       20
       +
       done

     

       21
       21
       +
       

     

       22
       22
       +
       if [[ $loadPlugins = true ]]; then

     

       23
       23
       +
           if (( EValueOffset >= 0 )); then

     

       24
       24
       +
               args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}"

     

       25
       25
       +
           else

     

       26
       26
       +
               args=( "-E" "source '$pluginScript'" "${args[@]}" )

     

       27
       27
       +
           fi

     

       28
       28
       +
       fi

     

       29
       29
       +
       

     

       30
       30
       +
       exec @kakoune@/bin/kak "${args[@]}"

+2 -2

pkgs/applications/editors/typora/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "typora";

     

       5
       5
       -
         version = "0.9.70";

     

       5
       5
       +
         version = "0.9.72";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.typora.io/linux/typora_${version}_amd64.deb";

     

       9
       9
       -
           sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2";

     

       9
       9
       +
           sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [

+1

pkgs/applications/editors/vscode/with-extensions.nix

···

       68
       68
        
       

     

       69
       69
        
         ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"

     

       70
       70
        
         ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"

     

       71
       71
       +
         ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"

     

       71
       72
        
         makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''

     

       72
       73
        
           --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"

     

       73
       74
        
         ''}

+2 -2

pkgs/applications/graphics/drawpile/default.nix

···

       59
       59
        
       

     

       60
       60
        
       in stdenv.mkDerivation rec {

     

       61
       61
        
         name = "drawpile-${version}";

     

       62
       62
       -
         version = "2.1.10";

     

       62
       62
       +
         version = "2.1.11";

     

       63
       63
        
       

     

       64
       64
        
         src = fetchurl {

     

       65
       65
        
           url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";

     

       66
       66
       -
           sha256 = "074lp5z5kh6qwar3y4ik7gma5mdgafdsb50q425xcd3pv00gy0hm";

     

       66
       66
       +
           sha256 = "00r5vzracvjk369rri2jxzgfaa1ll4qj5gdmzgflvidz8420bcvm";

     

       67
       67
        
         };

     

       68
       68
        
       

     

       69
       69
        
         nativeBuildInputs = [

+15 -3

pkgs/applications/graphics/geeqie/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool

     

       2
       2
        
       , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida

     

       3
       3
       -
       , wrapGAppsHook

     

       3
       3
       +
       , wrapGAppsHook, fetchpatch

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
           sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         # Do not build the changelog as this requires markdown.

     

       16
       16
       -
         patches = [ ./geeqie-no-changelog.patch ];

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           # Do not build the changelog as this requires markdown.

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             name = "geeqie-1.4-goodbye-changelog.patch";

     

       19
       19
       +
             url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch";

     

       20
       20
       +
             sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn";

     

       21
       21
       +
           })

     

       22
       22
       +
           # Fixes build with exiv2 0.27.1

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             name = "geeqie-exiv2-0.27.patch";

     

       25
       25
       +
             url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d";

     

       26
       26
       +
             sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       17
       29
        
       

     

       18
       30
        
         preConfigure = "./autogen.sh";

     

       19
       31

-14

pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch

···

       1
       1
       -
       --- geeqie-1.4.orig/Makefile.am	2017-12-31 07:31:21.000000000 -0500

     

       2
       2
       -
       +++ geeqie-1.4/Makefile.am	2018-01-01 15:05:58.742068166 -0500

     

       3
       3
       -
       @@ -10,9 +10,9 @@

     

       4
       4
       -
        readmedir = @readmedir@

     

       5
       5
       -
        

     

       6
       6
       -
        if HAVE_MARKDOWN

     

       7
       7
       -
       -readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html

     

       8
       8
       -
       +readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html

     

       9
       9
       -
        else

     

       10
       10
       -
       -readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html

     

       11
       11
       -
       +readme_DATA = README.md COPYING TODO README.lirc AUTHORS

     

       12
       12
       -
        endif

     

       13
       13
       -
        

     

       14
       14
       -
        desktopdir = $(datadir)/applications

+9 -1

pkgs/applications/graphics/hugin/default.nix

···

       1
       1
       -
       { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig

     

       1
       1
       +
       { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch

     

       2
       2
        
       , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext

     

       3
       3
        
       , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi

     

       4
       4
        
       , libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib

     
···

       11
       11
        
           url = "mirror://sourceforge/hugin/${name}.tar.bz2";

     

       12
       12
        
           sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr";

     

       13
       13
        
         };

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           # Fixes build with exiv2 0.27.1

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/hugin-exiv2-0.27.1.patch?h=packages/hugin";

     

       19
       19
       +
             sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r";

     

       20
       20
       +
           })

     

       21
       21
       +
         ];

     

       14
       22
        
       

     

       15
       23
        
         buildInputs = [

     

       16
       24
        
           boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg

+13 -11

pkgs/applications/graphics/luminance-hdr/default.nix

···

       1
       1
       -
       { stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl

     

       1
       1
       +
       { stdenv, cmake, fetchFromGitHub, pkgconfig, boost, exiv2, fftwFloat, gsl

     

       2
       2
        
       , ilmbase, lcms2, libraw, libtiff, openexr

     

       3
       3
       -
       , qtbase, qtdeclarative, qttools, qtwebengine

     

       3
       3
       +
       , qtbase, qtdeclarative, qttools, qtwebengine, eigen

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "luminance-hdr-2.5.1";

     

       7
       7
       +
         pname = "luminance-hdr";

     

       8
       8
       +
         version = "2.6.0";

     

       8
       9
        
       

     

       9
       9
       -
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2";

     

       11
       11
       -
           sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658";

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "LuminanceHDR";

     

       12
       12
       +
           repo = "LuminanceHDR";

     

       13
       13
       +
           rev = "v.${version}";

     

       14
       14
       +
           sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn";

     

       12
       15
        
         };

     

       13
       16
        
       

     

       14
       17
        
         NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

     

       15
       18
        
       

     

       16
       16
       -
         buildInputs =

     

       17
       17
       -
           [

     

       18
       18
       -
             qtbase qtdeclarative qttools qtwebengine

     

       19
       19
       -
             boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr

     

       20
       20
       -
           ];

     

       19
       19
       +
         buildInputs = [

     

       20
       20
       +
           qtbase qtdeclarative qttools qtwebengine eigen

     

       21
       21
       +
           boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr

     

       22
       22
       +
         ];

     

       21
       23
        
       

     

       22
       24
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       23
       25

+4

pkgs/applications/graphics/nomacs/default.nix

···

       27
       27
        
           sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       +
         patches = [

     

       31
       31
       +
           ./nomacs-iostream.patch

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       30
       34
        
         enableParallelBuilding = true;

     

       31
       35
        
       

     

       32
       36
        
         setSourceRoot = ''

+26

pkgs/applications/graphics/nomacs/nomacs-iostream.patch

···

       1
       1
       +
       diff --git a/src/DkCore/DkMetaData.cpp b/src/DkCore/DkMetaData.cpp

     

       2
       2
       +
       index d195757e..affec7be 100644

     

       3
       3
       +
       --- a/src/DkCore/DkMetaData.cpp

     

       4
       4
       +
       +++ b/src/DkCore/DkMetaData.cpp

     

       5
       5
       +
       @@ -42,6 +42,8 @@

     

       6
       6
       +
        #include <QApplication>

     

       7
       7
       +
        #pragma warning(pop)		// no warnings from includes - end

     

       8
       8
       +
       

     

       9
       9
       +
       +#include <iostream>

     

       10
       10
       +
       +

     

       11
       11
       +
        namespace nmc {

     

       12
       12
       +
       

     

       13
       13
       +
        // DkMetaDataT --------------------------------------------------------------------

     

       14
       14
       +
       diff --git a/src/DkGui/DkNoMacs.cpp b/src/DkGui/DkNoMacs.cpp

     

       15
       15
       +
       index 6a412f70..bbfba233 100644

     

       16
       16
       +
       --- a/src/DkGui/DkNoMacs.cpp

     

       17
       17
       +
       +++ b/src/DkGui/DkNoMacs.cpp

     

       18
       18
       +
       @@ -96,6 +96,8 @@

     

       19
       19
       +
        #include <QWinTaskbarButton>

     

       20
       20
       +
        #endif

     

       21
       21
       +
       

     

       22
       22
       +
       +#include <iostream>

     

       23
       23
       +
       +

     

       24
       24
       +
        namespace nmc {

     

       25
       25
       +
       

     

       26
       26
       +
        DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {

+1

pkgs/applications/graphics/photivo/default.nix

···

       37
       37
        
         meta = with stdenv.lib; {

     

       38
       38
        
           platforms = platforms.linux;

     

       39
       39
        
           license = licenses.gpl3;

     

       40
       40
       +
           broken = true; # exiv2 0.27.1 FTBFS

     

       40
       41
        
         };

     

       41
       42
        
       }

+21 -8

pkgs/applications/graphics/photoqt/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw

     

       1
       1
       +
       { stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch

     

       2
       2
        
       , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects

     

       3
       3
       +
       , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       6
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
       -
         version = "1.5.1";

     

       7
       7
       +
         pname = "photoqt";

     

       8
       8
       +
         version = "1.7.1";

     

       8
       9
        
       

     

       9
       10
        
         src = fetchurl {

     

       10
       10
       -
           url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";

     

       11
       11
       +
           url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz";

     

       12
       12
       +
           sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       14
       -
         patches = [ ./photoqt-1.5.1-qt-5.9.patch ];

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           # Fixes build with exiv2 0.27.1

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch";

     

       19
       19
       +
             sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va";

     

       20
       20
       +
           })

     

       21
       21
       +
         ];

     

       15
       22
        
       

     

       16
       16
       -
         nativeBuildInputs = [ cmake ];

     

       23
       23
       +
         nativeBuildInputs = [ cmake extra-cmake-modules qttools ];

     

       17
       24
        
       

     

       18
       25
        
         buildInputs = [

     

       19
       19
       -
           qtbase qtquickcontrols qttools exiv2 graphicsmagick

     

       26
       26
       +
           qtbase qtquickcontrols exiv2 graphicsmagick poppler

     

       20
       27
        
           qtmultimedia qtdeclarative libraw qtgraphicaleffects

     

       28
       28
       +
           kimageformats libarchive

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         cmakeFlags = [

     

       32
       32
       +
           "-DFREEIMAGE=OFF"

     

       33
       33
       +
           "-DDEVIL=OFF"

     

       21
       34
        
         ];

     

       22
       35
        
       

     

       23
       36
        
         preConfigure = ''

-13

pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch

···

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

     

       2
       2
       -
       index 97abcb5..fd4877a 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -50,7 +50,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")

     

       6
       6
       -
        #### FIND REQUIRED PACKAGES ####

     

       7
       7
       -
        ################################

     

       8
       8
       -
        

     

       9
       9
       -
       -FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg REQUIRED)

     

       10
       10
       -
       +FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg Sql Xml REQUIRED)

     

       11
       11
       -
        SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})

     

       12
       12
       -
        FIND_PACKAGE(Magick)

     

       13
       13
       -
        FIND_PACKAGE(Exiv2)

-41

pkgs/applications/graphics/qtpfsgui/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, qt4, qmake4Hook, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "qtpfsgui-1.9.3";

     

       5
       5
       -
       

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://sourceforge/qtpfsgui/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "1mlg9dry4mfnnjlnwsw375hzsiagssdhccfmapx5nh6ykqrslsh1";

     

       9
       9
       -
         };

     

       10
       10
       -
       

     

       11
       11
       -
         buildInputs = [ qt4 exiv2 openexr fftwSinglePrec libtiff ];

     

       12
       12
       -
         nativeBuildInputs = [ qmake4Hook ];

     

       13
       13
       -
       

     

       14
       14
       -
         hardeningDisable = [ "format" ];

     

       15
       15
       -
       

     

       16
       16
       -
         preConfigure = ''

     

       17
       17
       -
           export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH"

     

       18
       18
       -
         '';

     

       19
       19
       -
       

     

       20
       20
       -
         qmakeFlags = [

     

       21
       21
       -
           "EXIV2PATH=${exiv2.dev}/include/exiv2"

     

       22
       22
       -
           "OPENEXRDIR=${openexr.dev}/include/OpenEXR"

     

       23
       23
       -
           "FFTW3DIR=${fftwSinglePrec.dev}/include"

     

       24
       24
       -
           "LIBTIFFDIR=${libtiff.dev}/include"

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       27
       -
         meta = {

     

       28
       28
       -
           homepage = http://qtpfsgui.sourceforge.net/;

     

       29
       29
       -
           description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging";

     

       30
       30
       -
       

     

       31
       31
       -
           longDescription =

     

       32
       32
       -
             '' Qtpfsgui is an open source graphical user interface application that

     

       33
       33
       -
                aims to provide a workflow for high dynamic range (HDR) imaging.

     

       34
       34
       -
             '';

     

       35
       35
       -
       

     

       36
       36
       -
           license = stdenv.lib.licenses.gpl2Plus;

     

       37
       37
       -
       

     

       38
       38
       -
           maintainers = [ ];

     

       39
       39
       -
           platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;

     

       40
       40
       -
         };

     

       41
       41
       -
       }

+9 -1

pkgs/applications/kde/gwenview.nix

···

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
        
         exiv2, lcms2,

     

       5
       5
        
         baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,

     

       6
       6
       -
         phonon, qtimageformats, qtsvg, qtx11extras, kinit

     

       6
       6
       +
         phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       mkDerivation {

     
···

       18
       18
        
           qtimageformats qtsvg qtx11extras

     

       19
       19
        
         ];

     

       20
       20
        
         propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];

     

       21
       21
       +
       

     

       22
       22
       +
         # Fixes build with exiv2-0.27.1. Drop in 19.04.2

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           (fetchpatch {

     

       25
       25
       +
             url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch";

     

       26
       26
       +
             sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       21
       29
        
       }

+4 -4

pkgs/applications/misc/1password/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "1password";

     

       5
       5
       -
         version = "0.5.6-003";

     

       5
       5
       +
         version = "0.5.7";

     

       6
       6
        
         src =

     

       7
       7
        
           if stdenv.hostPlatform.system == "i686-linux" then

     

       8
       8
        
             fetchzip {

     

       9
       9
        
               url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";

     

       10
       10
       -
               sha256 = "11smnx8fh32qm3b82x2ps4y46q29h77x1j1dj3d5vs0vha9b8frj";

     

       10
       10
       +
               sha256 = "1193lq6cvqkv2cy07l6wzb25gb5vb3s3pxm534q3izhzrrz6lisz";

     

       11
       11
        
               stripRoot = false;

     

       12
       12
        
             }

     

       13
       13
        
           else if stdenv.hostPlatform.system == "x86_64-linux" then

     

       14
       14
        
             fetchzip {

     

       15
       15
        
               url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";

     

       16
       16
       -
               sha256 = "1qwxga6qmb3n76h2fl1lxhnz676cqbx8gic1b5c9hw88gnqwykb9";

     

       16
       16
       +
               sha256 = "0hlw1jasxzg31293d2n3ydzj62q7ji7nig7aaighcvzi3c9j7v51";

     

       17
       17
        
               stripRoot = false;

     

       18
       18
        
             }

     

       19
       19
        
           else if stdenv.hostPlatform.system == "x86_64-darwin" then

     

       20
       20
        
             fetchzip {

     

       21
       21
        
               url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";

     

       22
       22
       -
               sha256 = "0gzmwc20liqx2cqply06yarwp228ydfgfb26bmpxbvlp0cq7d07g";

     

       22
       22
       +
               sha256 = "05z5k63fza6v0vhydyiq4sh9xhxnd9rcfxyym7jihv6b3fv3fnx3";

     

       23
       23
        
               stripRoot = false;

     

       24
       24
        
             }

     

       25
       25
        
           else throw "Architecture not supported";

+1 -1

pkgs/applications/misc/alacritty/default.nix

···

       120
       120
        
           homepage = https://github.com/jwilm/alacritty;

     

       121
       121
        
           license = with licenses; [ asl20 ];

     

       122
       122
        
           maintainers = with maintainers; [ mic92 ];

     

       123
       123
       -
           platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];

     

       123
       123
       +
           platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];

     

       124
       124
        
         };

     

       125
       125
        
       }

+2 -2

pkgs/applications/misc/calcurse/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "calcurse-${version}";

     

       5
       5
       -
         version = "4.4.0";

     

       5
       5
       +
         version = "4.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://calcurse.org/files/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd";

     

       9
       9
       +
           sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ];

+2 -2

pkgs/applications/misc/copyq/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

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

     

       8
       8
       -
         version = "3.8.0";

     

       8
       8
       +
         version = "3.9.0";

     

       9
       9
        
       

     

       10
       10
        
         src  = fetchFromGitHub {

     

       11
       11
        
           owner = "hluk";

     

       12
       12
        
           repo = "CopyQ";

     

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

     

       14
       14
       -
           sha256 = "0kbhgg0j6iqfrpixvwl1mk3m0bz5s8bd6npk5xqcgzp1giywdc4i";

     

       14
       14
       +
           sha256 = "1l9f0hg2ggy944sjlyiyglln5mjm9fvgmvwp3pnvmmc6mfbmslq3";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/applications/misc/electron-cash/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "electron-cash";

     

       5
       5
       -
         version = "4.0.2";

     

       5
       5
       +
         version = "4.0.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";

     

       9
       9
        
           # Verified using official SHA-1 and signature from

     

       10
       10
        
           # https://github.com/fyookball/keys-n-hashes

     

       11
       11
       -
           sha256 = "6255cd0493442ec57c10ae70ca2e84c6a29497f90a1393e6ac5772afe7572acf";

     

       11
       11
       +
           sha256 = "d63ef2d52cff0b821b745067d752fd0c7f2902fa23eaf8e9392c54864cae5c77";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3Packages; [

+30 -17

pkgs/applications/misc/gpscorrelate/default.nix

···

       1
       1
       -
       { fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2

     

       2
       2
       -
       , libxslt, docbook_xsl, docbook_xml_dtd_42 }:

     

       1
       1
       +
       { fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3

     

       2
       2
       +
       , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       6
       -
         version = "1.6.1";

     

       5
       5
       +
         pname = "gpscorrelate";

     

       6
       6
       +
         version = "unstable-2019-06-05";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
       -
           owner = "freefoote";

     

       10
       10
       -
           repo = "gpscorrelate";

     

       11
       11
       -
           rev = version;

     

       12
       12
       -
           sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj";

     

       9
       9
       +
           owner = "dfandrich";

     

       10
       10
       +
           repo = pname;

     

       11
       11
       +
           rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85";

     

       12
       12
       +
           sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       +
         nativeBuildInputs = [

     

       16
       16
       +
           desktop-file-utils

     

       17
       17
       +
           docbook_xml_dtd_42

     

       18
       18
       +
           docbook_xsl

     

       19
       19
       +
           libxslt

     

       20
       20
       +
           pkgconfig

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       16
       23
        
         buildInputs = [

     

       17
       17
       -
           exiv2 libxml2 gtk2

     

       18
       18
       -
           libxslt docbook_xsl 

     

       19
       19
       -
           docbook_xml_dtd_42

     

       24
       24
       +
           exiv2

     

       25
       25
       +
           gtk3

     

       26
       26
       +
           libxml2

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         makeFlags = [

     

       30
       30
       +
           "prefix=${placeholder ''out''}"

     

       31
       31
       +
           "GTK=3"

     

       32
       32
       +
           "CC=cc"

     

       33
       33
       +
           "CXX=c++"

     

       20
       34
        
         ];

     

       21
       35
        
       

     

       22
       22
       -
         patchPhase = ''

     

       23
       23
       -
           sed -i "Makefile" \

     

       24
       24
       -
               -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g"

     

       25
       25
       -
         '';

     

       36
       36
       +
         doCheck = true;

     

       37
       37
       +
       

     

       38
       38
       +
         installTargets = [ "install" "install-desktop-file" ];

     

       26
       39
        
       

     

       27
       40
        
         meta = with stdenv.lib; {

     

       28
       41
        
           description = "A GPS photo correlation tool, to add EXIF geotags";

     
···

       44
       57
        
           '';

     

       45
       58
        
       

     

       46
       59
        
           license = licenses.gpl2Plus;

     

       47
       47
       -
           homepage = https://github.com/freefoote/gpscorrelate;

     

       60
       60
       +
           homepage = "https://github.com/dfandrich/gpscorrelate";

     

       48
       61
        
           platforms = platforms.linux;

     

       49
       62
        
         };

     

       50
       63
        
       }

+26 -1

pkgs/applications/misc/jekyll/default.nix

···

       1
       1
        
       { lib, bundlerApp, ruby

     

       2
       2
       +
       , writeShellScriptBin, makeWrapper

     

       2
       3
        
       , withOptionalDependencies ? false

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       5
       -
       bundlerApp rec {

     

       6
       6
       +
       let

     

       7
       7
       +
         rubyWrapper = writeShellScriptBin "ruby" ''

     

       8
       8
       +
           if [[ "$#" -eq 2 ]]; then

     

       9
       9
       +
             if [[ "''${1##*/}" == "bundle" && "$2" == "install" ]]; then

     

       10
       10
       +
               # See https://github.com/NixOS/nixpkgs/issues/58126 for more details.

     

       11
       11
       +
               echo 'Skipping "bundle install" as it fails due to the Nix wrapper.'

     

       12
       12
       +
               echo 'Please enter the new directory and run the following commands to serve the page:'

     

       13
       13
       +
               echo 'nix-shell -p bundler --run "bundle install --gemfile=Gemfile --path vendor/cache"'

     

       14
       14
       +
               echo 'nix-shell -p bundler --run "bundle exec jekyll serve"'

     

       15
       15
       +
               exit 0

     

       16
       16
       +
               # The following nearly works:

     

       17
       17
       +
               unset BUNDLE_FROZEN

     

       18
       18
       +
               exec ${ruby}/bin/ruby "$@" --gemfile=Gemfile --path=vendor/cache

     

       19
       19
       +
             fi

     

       20
       20
       +
           fi

     

       21
       21
       +
           # Else: Don't modify the arguments:

     

       22
       22
       +
           exec ${ruby}/bin/ruby "$@"

     

       23
       23
       +
         '';

     

       24
       24
       +
       in bundlerApp rec {

     

       6
       25
        
         pname = "jekyll";

     

       7
       26
        
         exes = [ "jekyll" ];

     

       8
       27
        
       

     
···

       10
       29
        
         gemdir = if withOptionalDependencies

     

       11
       30
        
           then ./full

     

       12
       31
        
           else ./basic;

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = [ makeWrapper ];

     

       34
       34
       +
       

     

       35
       35
       +
         postBuild = ''

     

       36
       36
       +
           wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin

     

       37
       37
       +
         '';

     

       13
       38
        
       

     

       14
       39
        
         meta = with lib; {

     

       15
       40
        
           description = "A blog-aware, static site generator, written in Ruby";

+2 -2

pkgs/applications/misc/latte-dock/default.nix

···

       3
       3
        
       

     

       4
       4
        
       mkDerivation rec {

     

       5
       5
        
         pname = "latte-dock";

     

       6
       6
       -
         version = "0.8.8";

     

       6
       6
       +
         version = "0.8.9";

     

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

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "137s7rx35a5qrfww3q8bllj4zyjfa7l709snvdfj34y7jbq7p6cd";

     

       11
       11
       +
           sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";

     

       12
       12
        
           name = "${name}.tar.xz";

     

       13
       13
        
         };

     

       14
       14

+1 -1

pkgs/applications/misc/lutris/default.nix

···

       103
       103
        
           perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC

     

       104
       104
        
           samba4 sane-backends openldap opencl-headers ocl-icd utillinux

     

       105
       105
        
       

     

       106
       106
       -
           (wine.override { wineBuild = "wineWow"; })

     

       106
       106
       +
           wineWowPackages.staging

     

       107
       107
        
       

     

       108
       108
        
           # ZDOOM

     

       109
       109
        
           soundfont-fluid bzip2 game-music-emu

+7 -2

pkgs/applications/misc/merkaartor/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj

     

       1
       1
       +
       { stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj

     

       2
       2
        
       , qtbase, qtsvg, qtwebkit }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
           sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ qmake pkgconfig ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper qmake pkgconfig ];

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];

     

       18
       18
        
       

     

       19
       19
        
         enableParallelBuilding = true;

     

       20
       20
       +
       

     

       21
       21
       +
         postInstall = ''

     

       22
       22
       +
           wrapProgram $out/bin/merkaartor \

     

       23
       23
       +
             --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms

     

       24
       24
       +
         '';

     

       20
       25
        
       

     

       21
       26
        
         meta = with stdenv.lib; {

     

       22
       27
        
           description = "OpenStreetMap editor";

+2 -2

pkgs/applications/misc/pdfpc/default.nix

···

       4
       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       6
        
         product = "pdfpc";

     

       7
       7
       -
         version = "4.3.2";

     

       7
       7
       +
         version = "4.3.4";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           repo = product;

     

       11
       11
        
           owner = product;

     

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

     

       13
       13
       -
           sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z";

     

       13
       13
       +
           sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [

+15 -4

pkgs/applications/misc/qmapshack/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "qmapshack-${version}";

     

       5
       5
       -
         version = "1.12.3";

     

       5
       5
       +
         version = "1.13.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "1yp5gw4q4gwiwr9w4dz19am0bhsla9n2l3bdlk98a7f46kxgnkrx";

     

       9
       9
       +
           sha256 = "1cv1f718r8vqyk2l6w3alz2aqjvb4msz8705pm9yr5ndi28qyrba";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ cmake ];

     
···

       15
       15
        
       

     

       16
       16
        
         cmakeFlags = [

     

       17
       17
        
           "-DROUTINO_XML_PATH=${routino}/share/routino"

     

       18
       18
       -
           "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip"

     

       18
       18
       +
           "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5"

     

       19
       19
        
           "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         enableParallelBuilding = true;

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           (fetchpatch {

     

       26
       26
       +
             url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch";

     

       27
       27
       +
             sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99";

     

       28
       28
       +
           })

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch";

     

       31
       31
       +
             sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9";

     

       32
       32
       +
           })

     

       33
       33
       +
         ];

     

       23
       34
        
       

     

       24
       35
        
         meta = with stdenv.lib; {

     

       25
       36
        
           homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;

+2 -2

pkgs/applications/misc/termdown/default.nix

···

       6
       6
        
       buildPythonApplication rec {

     

       7
       7
        
       

     

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

     

       9
       9
       -
         version = "1.14.1";

     

       9
       9
       +
         version = "1.15.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           rev    = version;

     

       13
       13
       -
           sha256 = "0jgjzglna0gwp0j31l48pny69szslczl13aahwjfjypkv9lx8w2a";

     

       13
       13
       +
           sha256 = "08l03yk5jc1g0gps789q1s2knnaqzlidy4s5q5nhwg9g25la19nr";

     

       14
       14
        
           repo   = "termdown";

     

       15
       15
        
           owner  = "trehn";

     

       16
       16
        
         };

+5 -3

pkgs/applications/misc/viking/default.nix

···

       1
       1
        
       { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl

     

       2
       2
        
       , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper

     

       3
       3
       -
       , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }:

     

       3
       3
       +
       , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme

     

       4
       4
       +
       , geoclue2, liboauth }:

     

       4
       5
        
       

     

       5
       6
        
       stdenv.mkDerivation rec {

     

       6
       7
        
         name = "viking-${version}";

     

       7
       7
       -
         version = "1.6.2";

     

       8
       8
       +
         version = "1.7";

     

       8
       9
        
       

     

       9
       10
        
         src = fetchurl {

     

       10
       11
        
           url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";

     

       11
       11
       -
           sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";

     

       12
       12
       +
           sha256 = "092q2dv0rcz12nh2js1z1ralib1553dmzy9pdrvz9nv2vf61wybw";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       16
        
         buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils

     

       16
       17
        
           libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme

     

       18
       18
       +
           geoclue2 liboauth

     

       17
       19
        
         ];

     

       18
       20
        
       

     

       19
       21
        
         configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];

+3 -3

pkgs/applications/misc/zola/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "zola";

     

       5
       5
       -
         version = "0.7.0";

     

       5
       5
       +
         version = "0.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "getzola";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "02lr1n3gf0agj8x451ndyvv16lq7rccazp4nz9zy0pzwxwrlwhra";

     

       11
       11
       +
           sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "003dhh41fh337k3djibpj6hyd16xprbgws3lbp7x37p4lx7qlnfy";

     

       14
       14
       +
         cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       17
       17
        
         buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];

+8 -1

pkgs/applications/networking/browsers/firefox/common.nix

···

       94
       94
        
       

     

       95
       95
        
         browserPatches = [

     

       96
       96
        
           ./env_var_for_system_dir.patch

     

       97
       97
       -
         ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [

     

       97
       97
       +
         ]

     

       98
       98
       +
         ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "69")

     

       99
       99
       +
           (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29

     

       100
       100
       +
             name = "write_error-parallel_make.diff";

     

       101
       101
       +
             url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";

     

       102
       102
       +
             sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y";

     

       103
       103
       +
           })

     

       104
       104
       +
         ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [

     

       98
       105
        
           (fetchpatch {

     

       99
       106
        
             url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch";

     

       100
       107
        
             sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32";

+2 -2

pkgs/applications/networking/browsers/qutebrowser/default.nix

···

       21
       21
        
       

     

       22
       22
        
       in python3Packages.buildPythonApplication rec {

     

       23
       23
        
         pname = "qutebrowser";

     

       24
       24
       -
         version = "1.6.2";

     

       24
       24
       +
         version = "1.6.3";

     

       25
       25
        
       

     

       26
       26
        
         # the release tarballs are different from the git checkout!

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";

     

       29
       29
       -
           sha256 = "1yzwrpqpghlpy2d7pbjgcb73dbngw835l4xbimz5aa90mvqkbwg1";

     

       29
       29
       +
           sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         # Needs tox

+8 -3

pkgs/applications/networking/browsers/vivaldi/default.nix

···

       9
       9
        
       , patchelf, makeWrapper

     

       10
       10
        
       , isSnapshot ? false

     

       11
       11
        
       , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null

     

       12
       12
       +
       , enableWidevine ? false, vivaldi-widevine ? null

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       let

     
···

       50
       51
        
             --set-rpath "${libPath}" \

     

       51
       52
        
             opt/${vivaldiName}/vivaldi-bin

     

       52
       53
        
         '' + stdenv.lib.optionalString proprietaryCodecs ''

     

       53
       53
       -
           sed -i '/^VIVALDI_FFMPEG_FOUND/ a \

     

       54
       54
       -
           checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/${vivaldiName}/vivaldi

     

       54
       54
       +
           sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \

     

       55
       55
       +
             VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName}

     

       55
       56
        
         '' + ''

     

       56
       57
        
           echo "Finished patching Vivaldi binaries"

     

       57
       58
        
         '';

     
···

       76
       77
        
               "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png

     

       77
       78
        
           done

     

       78
       79
        
           wrapProgram "$out/bin/vivaldi" \

     

       79
       79
       -
             --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/

     

       80
       80
       +
             --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \

     

       81
       81
       +
             ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}

     

       82
       82
       +
         '' + stdenv.lib.optionalString enableWidevine ''

     

       83
       83
       +
           rm $out/opt/${vivaldiName}/libwidevinecdm.so

     

       84
       84
       +
           ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so

     

       80
       85
        
         '';

     

       81
       86
        
       

     

       82
       87
        
         meta = with stdenv.lib; {

+11 -32

pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
       -
       , dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss

     

       3
       3
       -
       , pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core

     

       2
       2
       +
       , dpkg

     

       4
       3
        
       }:

     

       5
       4
        
       

     

       6
       5
        
       stdenv.mkDerivation rec {

     

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

     

       8
       8
       -
         product = "vivaldi-ffmpeg-codecs";

     

       9
       9
       -
         version = "72.0.3626.122";

     

       6
       6
       +
         name = "chromium-codecs-ffmpeg";

     

       7
       7
       +
         version = "74.0.3729.169";

     

       10
       8
        
       

     

       11
       9
        
         src = fetchurl {

     

       12
       12
       -
           url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";

     

       13
       13
       -
           sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf";

     

       10
       10
       +
           url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb";

     

       11
       11
       +
           sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       16
       -
         buildInputs = [ ];

     

       14
       14
       +
         buildInputs = [ dpkg ];

     

       17
       15
        
       

     

       18
       18
       -
         nativeBuildInputs = [

     

       19
       19
       -
           gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn

     

       20
       20
       -
           pkgconfig dbus-glib at-spi2-core.dev

     

       21
       21
       -
         ];

     

       22
       22
       -
       

     

       23
       23
       -
         patches = [

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       26
       -
         configurePhase = ''

     

       27
       27
       -
           runHook preConfigure

     

       28
       28
       -
       

     

       29
       29
       -
           local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"

     

       30
       30
       -
           gn gen out/Release -v --args="$args"

     

       31
       31
       -
       

     

       32
       32
       -
           runHook postConfigure

     

       16
       16
       +
         unpackPhase = ''

     

       17
       17
       +
           dpkg-deb -x $src .

     

       18
       18
       +
           find .

     

       33
       19
        
         '';

     

       34
       20
        
       

     

       35
       35
       -
         buildPhase = ''

     

       36
       36
       -
           ninja -C out/Release -v libffmpeg.so

     

       37
       37
       -
         '';

     

       38
       38
       -
       

     

       39
       39
       -
         dontStrip = true;

     

       40
       40
       -
       

     

       41
       21
        
         installPhase = ''

     

       42
       42
       -
           mkdir -p "$out/lib"

     

       43
       43
       -
           cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"

     

       22
       22
       +
           install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so

     

       44
       23
        
         '';

     

       45
       24
        
       

     

       46
       25
        
         meta = with stdenv.lib; {

     

       47
       26
        
           description = "Additional support for proprietary codecs for Vivaldi";

     

       48
       27
        
           homepage    = "https://ffmpeg.org/";

     

       49
       28
        
           license     = licenses.lgpl21;

     

       50
       50
       -
           maintainers = with maintainers; [ lluchs ];

     

       29
       29
       +
           maintainers = with maintainers; [ betaboon lluchs ];

     

       51
       30
        
           platforms   = [ "x86_64-linux" ];

     

       52
       31
        
         };

     

       53
       32
        
       }

+32

pkgs/applications/networking/browsers/vivaldi/widevine.nix

···

       1
       1
       +
       { stdenv, fetchurl

     

       2
       2
       +
       , unzip

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         name = "widevine";

     

       7
       7
       +
         version = "4.10.1196.0";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";

     

       11
       11
       +
           sha256 = "01c7nr7d2xs718jymicbk4ipzfx6q253109qv3lk4lryrrhvw14y";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ unzip ];

     

       15
       15
       +
       

     

       16
       16
       +
         unpackPhase = ''

     

       17
       17
       +
           unzip $src libwidevinecdm.so

     

       18
       18
       +
           find .

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         installPhase = ''

     

       22
       22
       +
           install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with stdenv.lib; {

     

       26
       26
       +
           description = "Widevine support for Vivaldi";

     

       27
       27
       +
           homepage = "https://www.widevine.com";

     

       28
       28
       +
           license = licenses.unfree;

     

       29
       29
       +
           maintainers = with maintainers; [ betaboon ];

     

       30
       30
       +
           platforms   = [ "x86_64-linux" ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+2 -2

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

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "0.77.0"; in

     

       3
       3
       +
       let version = "0.79.3"; in

     

       4
       4
        
       

     

       5
       5
        
       buildGoModule {

     

       6
       6
        
         pname = "helmfile";

     
···

       10
       10
        
           owner = "roboll";

     

       11
       11
        
           repo = "helmfile";

     

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

     

       13
       13
       -
           sha256 = "0nj8gs7aqkxpj6bd80ks7g34qqa4y53a8sim1znbxs6mb678c2x2";

     

       13
       13
       +
           sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         goPackagePath = "github.com/roboll/helmfile";

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "kops-${version}";

     

       5
       5
       -
         version = "1.11.1";

     

       5
       5
       +
         version = "1.12.1";

     

       6
       6
        
       

     

       7
       7
        
         goPackagePath = "k8s.io/kops";

     

       8
       8
        
       

     
···

       10
       10
        
           rev = version;

     

       11
       11
        
           owner = "kubernetes";

     

       12
       12
        
           repo = "kops";

     

       13
       13
       -
           sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj";

     

       13
       13
       +
           sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [go-bindata];

+25

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

···

       1
       1
       +
       { stdenv, buildGoPackage, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoPackage rec {

     

       4
       4
       +
         pname = "kube3d";

     

       5
       5
       +
         version = "1.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         goPackagePath = "github.com/rancher/k3d";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner  = "rancher";

     

       11
       11
       +
           repo   = "k3d";

     

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

     

       13
       13
       +
           sha256 = "180q7a95znpkhfqcaw3asqrq22r6ppw98qsggp2wfm746mllg5pc";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         goDeps = ./deps.nix;

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with stdenv.lib; {

     

       19
       19
       +
           homepage = "https://github.com/rancher/k3d";

     

       20
       20
       +
           description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";

     

       21
       21
       +
           license = licenses.mit;

     

       22
       22
       +
           platforms = platforms.linux;

     

       23
       23
       +
           maintainers = with maintainers; [ kuznero ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+174

pkgs/applications/networking/cluster/kube3d/deps.nix

···

       1
       1
       +
       # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)

     

       2
       2
       +
       [

     

       3
       3
       +
         {

     

       4
       4
       +
           goPackagePath = "github.com/Microsoft/go-winio";

     

       5
       5
       +
           fetch = {

     

       6
       6
       +
             type = "git";

     

       7
       7
       +
             url = "https://github.com/Microsoft/go-winio";

     

       8
       8
       +
             rev = "v0.4.12";

     

       9
       9
       +
             sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";

     

       10
       10
       +
           };

     

       11
       11
       +
         }

     

       12
       12
       +
         {

     

       13
       13
       +
           goPackagePath = "github.com/davecgh/go-spew";

     

       14
       14
       +
           fetch = {

     

       15
       15
       +
             type = "git";

     

       16
       16
       +
             url = "https://github.com/davecgh/go-spew";

     

       17
       17
       +
             rev = "v1.1.0";

     

       18
       18
       +
             sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";

     

       19
       19
       +
           };

     

       20
       20
       +
         }

     

       21
       21
       +
         {

     

       22
       22
       +
           goPackagePath = "github.com/docker/distribution";

     

       23
       23
       +
           fetch = {

     

       24
       24
       +
             type = "git";

     

       25
       25
       +
             url = "https://github.com/docker/distribution";

     

       26
       26
       +
             rev = "v2.7.1";

     

       27
       27
       +
             sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";

     

       28
       28
       +
           };

     

       29
       29
       +
         }

     

       30
       30
       +
         {

     

       31
       31
       +
           goPackagePath = "github.com/docker/docker";

     

       32
       32
       +
           fetch = {

     

       33
       33
       +
             type = "git";

     

       34
       34
       +
             url = "https://github.com/docker/docker";

     

       35
       35
       +
             rev = "v1.13.1";

     

       36
       36
       +
             sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";

     

       37
       37
       +
           };

     

       38
       38
       +
         }

     

       39
       39
       +
         {

     

       40
       40
       +
           goPackagePath = "github.com/docker/go-connections";

     

       41
       41
       +
           fetch = {

     

       42
       42
       +
             type = "git";

     

       43
       43
       +
             url = "https://github.com/docker/go-connections";

     

       44
       44
       +
             rev = "v0.4.0";

     

       45
       45
       +
             sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq";

     

       46
       46
       +
           };

     

       47
       47
       +
         }

     

       48
       48
       +
         {

     

       49
       49
       +
           goPackagePath = "github.com/docker/go-units";

     

       50
       50
       +
           fetch = {

     

       51
       51
       +
             type = "git";

     

       52
       52
       +
             url = "https://github.com/docker/go-units";

     

       53
       53
       +
             rev = "v0.3.3";

     

       54
       54
       +
             sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";

     

       55
       55
       +
           };

     

       56
       56
       +
         }

     

       57
       57
       +
         {

     

       58
       58
       +
           goPackagePath = "github.com/mattn/go-runewidth";

     

       59
       59
       +
           fetch = {

     

       60
       60
       +
             type = "git";

     

       61
       61
       +
             url = "https://github.com/mattn/go-runewidth";

     

       62
       62
       +
             rev = "v0.0.4";

     

       63
       63
       +
             sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";

     

       64
       64
       +
           };

     

       65
       65
       +
         }

     

       66
       66
       +
         {

     

       67
       67
       +
           goPackagePath = "github.com/mitchellh/go-homedir";

     

       68
       68
       +
           fetch = {

     

       69
       69
       +
             type = "git";

     

       70
       70
       +
             url = "https://github.com/mitchellh/go-homedir";

     

       71
       71
       +
             rev = "v1.1.0";

     

       72
       72
       +
             sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";

     

       73
       73
       +
           };

     

       74
       74
       +
         }

     

       75
       75
       +
         {

     

       76
       76
       +
           goPackagePath = "github.com/olekukonko/tablewriter";

     

       77
       77
       +
           fetch = {

     

       78
       78
       +
             type = "git";

     

       79
       79
       +
             url = "https://github.com/olekukonko/tablewriter";

     

       80
       80
       +
             rev = "v0.0.1";

     

       81
       81
       +
             sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";

     

       82
       82
       +
           };

     

       83
       83
       +
         }

     

       84
       84
       +
         {

     

       85
       85
       +
           goPackagePath = "github.com/opencontainers/go-digest";

     

       86
       86
       +
           fetch = {

     

       87
       87
       +
             type = "git";

     

       88
       88
       +
             url = "https://github.com/opencontainers/go-digest";

     

       89
       89
       +
             rev = "v1.0.0-rc1";

     

       90
       90
       +
             sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";

     

       91
       91
       +
           };

     

       92
       92
       +
         }

     

       93
       93
       +
         {

     

       94
       94
       +
           goPackagePath = "github.com/pkg/errors";

     

       95
       95
       +
           fetch = {

     

       96
       96
       +
             type = "git";

     

       97
       97
       +
             url = "https://github.com/pkg/errors";

     

       98
       98
       +
             rev = "v0.8.1";

     

       99
       99
       +
             sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";

     

       100
       100
       +
           };

     

       101
       101
       +
         }

     

       102
       102
       +
         {

     

       103
       103
       +
           goPackagePath = "github.com/pmezard/go-difflib";

     

       104
       104
       +
           fetch = {

     

       105
       105
       +
             type = "git";

     

       106
       106
       +
             url = "https://github.com/pmezard/go-difflib";

     

       107
       107
       +
             rev = "v1.0.0";

     

       108
       108
       +
             sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";

     

       109
       109
       +
           };

     

       110
       110
       +
         }

     

       111
       111
       +
         {

     

       112
       112
       +
           goPackagePath = "github.com/stretchr/objx";

     

       113
       113
       +
           fetch = {

     

       114
       114
       +
             type = "git";

     

       115
       115
       +
             url = "https://github.com/stretchr/objx";

     

       116
       116
       +
             rev = "v0.1.0";

     

       117
       117
       +
             sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";

     

       118
       118
       +
           };

     

       119
       119
       +
         }

     

       120
       120
       +
         {

     

       121
       121
       +
           goPackagePath = "github.com/stretchr/testify";

     

       122
       122
       +
           fetch = {

     

       123
       123
       +
             type = "git";

     

       124
       124
       +
             url = "https://github.com/stretchr/testify";

     

       125
       125
       +
             rev = "v1.3.0";

     

       126
       126
       +
             sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";

     

       127
       127
       +
           };

     

       128
       128
       +
         }

     

       129
       129
       +
         {

     

       130
       130
       +
           goPackagePath = "github.com/urfave/cli";

     

       131
       131
       +
           fetch = {

     

       132
       132
       +
             type = "git";

     

       133
       133
       +
             url = "https://github.com/urfave/cli";

     

       134
       134
       +
             rev = "v1.20.0";

     

       135
       135
       +
             sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";

     

       136
       136
       +
           };

     

       137
       137
       +
         }

     

       138
       138
       +
         {

     

       139
       139
       +
           goPackagePath = "golang.org/x/crypto";

     

       140
       140
       +
           fetch = {

     

       141
       141
       +
             type = "git";

     

       142
       142
       +
             url = "https://go.googlesource.com/crypto";

     

       143
       143
       +
             rev = "c2843e01d9a2";

     

       144
       144
       +
             sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";

     

       145
       145
       +
           };

     

       146
       146
       +
         }

     

       147
       147
       +
         {

     

       148
       148
       +
           goPackagePath = "golang.org/x/net";

     

       149
       149
       +
           fetch = {

     

       150
       150
       +
             type = "git";

     

       151
       151
       +
             url = "https://go.googlesource.com/net";

     

       152
       152
       +
             rev = "b630fd6fe46b";

     

       153
       153
       +
             sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd";

     

       154
       154
       +
           };

     

       155
       155
       +
         }

     

       156
       156
       +
         {

     

       157
       157
       +
           goPackagePath = "golang.org/x/sys";

     

       158
       158
       +
           fetch = {

     

       159
       159
       +
             type = "git";

     

       160
       160
       +
             url = "https://go.googlesource.com/sys";

     

       161
       161
       +
             rev = "d0b11bdaac8a";

     

       162
       162
       +
             sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";

     

       163
       163
       +
           };

     

       164
       164
       +
         }

     

       165
       165
       +
         {

     

       166
       166
       +
           goPackagePath = "golang.org/x/text";

     

       167
       167
       +
           fetch = {

     

       168
       168
       +
             type = "git";

     

       169
       169
       +
             url = "https://go.googlesource.com/text";

     

       170
       170
       +
             rev = "v0.3.0";

     

       171
       171
       +
             sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";

     

       172
       172
       +
           };

     

       173
       173
       +
         }

     

       174
       174
       +
       ]

+5 -5

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

···

       1
       1
        
       { lib, buildGoPackage, fetchFromGitHub, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "0.9.1"; in

     

       3
       3
       +
       let version = "0.12.0"; in

     

       4
       4
        
       

     

       5
       5
        
       buildGoPackage {

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
       -
           owner = "ksonnet";

     

       9
       9
       +
           owner = "bitnami";

     

       10
       10
        
           repo = "kubecfg";

     

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

     

       12
       12
       -
           sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi";

     

       12
       12
       +
           sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         goPackagePath = "github.com/ksonnet/kubecfg";

     

       15
       15
       +
         goPackagePath = "github.com/bitnami/kubecfg";

     

       16
       16
        
       

     

       17
       17
        
         meta = {

     

       18
       18
        
           description = "A tool for managing Kubernetes resources as code";

     

       19
       19
       -
           homepage = https://github.com/ksonnet/kubecfg;

     

       19
       19
       +
           homepage = https://github.com/bitnami/kubecfg;

     

       20
       20
        
           license = lib.licenses.asl20;

     

       21
       21
        
           maintainers = with lib.maintainers; [ benley ];

     

       22
       22
        
           platforms = lib.platforms.unix;

+6 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "nomad-${version}";

     

       5
       5
       -
         version = "0.8.7";

     

       5
       5
       +
         version = "0.9.3";

     

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

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/hashicorp/nomad";

     
···

       12
       12
        
           owner = "hashicorp";

     

       13
       13
        
           repo = "nomad";

     

       14
       14
        
           inherit rev;

     

       15
       15
       -
           sha256 = "0nkqiqkrccfmn7qkbhd48m9m56ix4xb0a3ar0z0pl4sbm25rlj0b";

     

       15
       15
       +
           sha256 = "0hn9rr5v2y2pw0pmn27gz8dx5n964dsaf48sh0jhwc95b5q1rjwr";

     

       16
       16
        
         };

     

       17
       17
       +
       

     

       18
       18
       +
         # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:

     

       19
       19
       +
         # Ref: https://github.com/hashicorp/nomad/issues/5535

     

       20
       20
       +
         buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";

     

       17
       21
        
       

     

       18
       22
        
         meta = with stdenv.lib; {

     

       19
       23
        
           homepage = https://www.nomadproject.io/;

+2 -2

pkgs/applications/networking/instant-messengers/baresip/default.nix

···

       3
       3
        
       , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx

     

       4
       4
        
       }:

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         version = "0.6.2";

     

       6
       6
       +
         version = "0.6.3";

     

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

     

       8
       8
        
         src=fetchurl {

     

       9
       9
        
           url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1qi8im5sc3jbpic1sn46mmd98y0pckpnngf4n8dqdp76m4gf3yp1";

     

       10
       10
       +
           sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";

     

       11
       11
        
         };

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
        
         buildInputs = [zlib openssl libre librem cairo mpg123

+3 -3

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       27
       27
        
           pname = "discord-canary";

     

       28
       28
        
           binaryName = "DiscordCanary";

     

       29
       29
        
           desktopName = "Discord Canary";

     

       30
       30
       -
           version = "0.0.84";

     

       30
       30
       +
           version = "0.0.85";

     

       31
       31
        
           src = fetchurl {

     

       32
       32
       -
             url = "https://dl-canary.discordapp.net/apps/linux/0.0.84/discord-canary-0.0.84.tar.gz";

     

       33
       33
       -
             sha256 = "1s4m7qvwyb0zglgdcixfnp5asachkybfafbmr74c7zrb0scl80s1";

     

       32
       32
       +
             url = "https://dl-canary.discordapp.net/apps/linux/0.0.85/discord-canary-0.0.85.tar.gz";

     

       33
       33
       +
             sha256 = "0kr2mxpghqbj856l09fgw3cmlbdv9h2cd5gxwaymnnywif7czp4j";

     

       34
       34
        
           };

     

       35
       35
        
         };

     

       36
       36
        
       }.${branch}

+9 -1

pkgs/applications/networking/instant-messengers/fractal/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview

     

       2
       2
       -
       , hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:

     

       2
       2
       +
       , hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }:

     

       3
       3
        
       

     

       4
       4
        
       rustPlatform.buildRustPackage rec {

     

       5
       5
        
         version = "4.0.0";

     
···

       19
       19
        
         buildInputs = [

     

       20
       20
        
           glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad

     

       21
       21
        
           gtksourceview hicolor-icon-theme libsecret

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           # Fixes build with >= gstreamer 1.15.1

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch";

     

       28
       28
       +
             sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir";

     

       29
       29
       +
           })

     

       22
       30
        
         ];

     

       23
       31
        
       

     

       24
       32
        
         postPatch = ''

+10 -8

pkgs/applications/networking/instant-messengers/gomuks/default.nix

···

       1
       1
       -
       { stdenv, buildGo110Package, fetchFromGitHub }:

     

       1
       1
       +
       { stdenv, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGo110Package rec {

     

       4
       4
       -
         name = "gomuks-${version}";

     

       5
       5
       -
         version = "2018-07-10";

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "gomuks";

     

       5
       5
       +
         version = "2019-06-28";

     

       6
       6
        
       

     

       7
       7
        
         goPackagePath = "maunium.net/go/gomuks";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "tulir";

     

       11
       11
       -
           repo = "gomuks";

     

       12
       12
       -
           rev = "68db26bcace31297471641fe95f8882e301f5699";

     

       13
       13
       -
           sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6";

     

       11
       11
       +
           repo = pname;

     

       12
       12
       +
           rev = "37df8eb454088e61db7a14f382851205bc1806ad";

     

       13
       13
       +
           sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       +
         modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws";

     

       17
       17
       +
       

     

       16
       18
        
         meta = with stdenv.lib; {

     

       17
       17
       -
           homepage = https://maunium.net/go/gomuks/;

     

       19
       19
       +
           homepage = "https://maunium.net/go/gomuks/";

     

       18
       20
        
           description = "A terminal based Matrix client written in Go";

     

       19
       21
        
           license = licenses.gpl3;

     

       20
       22
        
           maintainers = with maintainers; [ tilpner ];

+1 -1

pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json

···

       2
       2
        
         "name": "riot-web",

     

       3
       3
        
         "productName": "Riot",

     

       4
       4
        
         "main": "src/electron-main.js",

     

       5
       5
       -
         "version": "1.2.1",

     

       5
       5
       +
         "version": "1.2.2",

     

       6
       6
        
         "description": "A feature-rich client for Matrix.org",

     

       7
       7
        
         "author": "New Vector Ltd.",

     

       8
       8
        
         "dependencies": {

+2 -2

pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix

···

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         executableName = "riot-desktop";

     

       10
       10
       -
         version = "1.2.1";

     

       10
       10
       +
         version = "1.2.2";

     

       11
       11
        
         riot-web-src = fetchFromGitHub {

     

       12
       12
        
           owner = "vector-im";

     

       13
       13
        
           repo = "riot-web";

     

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

     

       15
       15
       -
           sha256 = "0l50swqzdzbzbnrlkvwi133d54jgj15cj3awmlc1qdhnfdc3wxbb";

     

       15
       15
       +
           sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
       in mkYarnPackage rec {

+2 -2

pkgs/applications/networking/instant-messengers/riot/riot-web.nix

···

       6
       6
        
       let configFile = writeText "riot-config.json" conf; in

     

       7
       7
        
       stdenv.mkDerivation rec {

     

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

     

       9
       9
       -
         version = "1.2.1";

     

       9
       9
       +
         version = "1.2.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";

     

       13
       13
       -
           sha256 = "1h96c4yy06ag5lmsbm5h2ws1l7sp4qm5dcchw25k3937fdhwq840";

     

       13
       13
       +
           sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

···

       57
       57
        
       

     

       58
       58
        
       in stdenv.mkDerivation rec {

     

       59
       59
        
         name = "signal-desktop-${version}";

     

       60
       60
       -
         version = "1.25.1";

     

       60
       60
       +
         version = "1.25.3";

     

       61
       61
        
       

     

       62
       62
        
         src = fetchurl {

     

       63
       63
        
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       64
       64
       -
           sha256 = "1185psv93amqj0s7rgm8bhl3y4jcxc1945paslvjbmw01vi3p1lp";

     

       64
       64
       +
           sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693";

     

       65
       65
        
         };

     

       66
       66
        
       

     

       67
       67
        
         phases = [ "unpackPhase" "installPhase" ];

+2 -2

pkgs/applications/networking/irc/irssi/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "1.2.0";

     

       4
       4
       +
         version = "1.2.1";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "1sp3fc5fkdx0mmllvag94xaifnqbj1k09nl235pix26vv1gzq39m";

     

       9
       9
       +
           sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+4

pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix

···

       42
       42
        
           maintainers = with maintainers; [ ma27 ];

     

       43
       43
        
           license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53

     

       44
       44
        
           platforms = platforms.unix;

     

       45
       45
       +
       

     

       46
       46
       +
           # As of 2019-06-30, all of the dependencies are available on macOS but the

     

       47
       47
       +
           # package itself does not build.

     

       48
       48
       +
           broken = stdenv.isDarwin;

     

       45
       49
        
         };

     

       46
       50
        
       }

+11 -10

pkgs/applications/networking/p2p/transgui/default.nix

···

       1
       1
       -
       { stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,

     

       2
       2
        
       libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "transgui-5.0.1-svn-r${revision}";

     

       6
       6
       -
         revision = "988";

     

       5
       5
       +
         pname = "transgui";

     

       6
       6
       +
         version = "5.17.0";

     

       7
       7
        
       

     

       8
       8
       -
         src = fetchsvn {

     

       9
       9
       -
           url = "https://svn.code.sf.net/p/transgui/code/trunk/";

     

       10
       10
       -
           rev = revision;

     

       11
       11
       -
           sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "transmission-remote-gui";

     

       10
       10
       +
           repo = "transgui";

     

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

     

       12
       12
       +
           sha256 = "0p76vavny5asi5naa4jn67raxlarsmrkbchfn96y6gh5p2vzwpl7";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       15
        
         nativeBuildInputs = [ pkgconfig ];

     
···

       27
       28
        
           substituteInPlace restranslator.pas --replace /usr/ $out/

     

       28
       29
        
         '';

     

       29
       30
        
       

     

       30
       30
       -
         patches = [

     

       31
       31
       -
           ./r988-compile-fix.patch

     

       32
       32
       -
         ];

     

       31
       31
       +
         preBuild = ''

     

       32
       32
       +
           lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus

     

       33
       33
       +
         '';

     

       33
       34
        
       

     

       34
       35
        
         makeFlags = [

     

       35
       36
        
           "FPC=fpc"

-22

pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch

···

       1
       1
       -
       diff --git a/utils.pas b/utils.pas

     

       2
       2
       -
       index eb8b828..1ff2440 100644

     

       3
       3
       -
       --- a/utils.pas

     

       4
       4
       -
       +++ b/utils.pas

     

       5
       5
       -
       @@ -100,7 +100,7 @@ uses

     

       6
       6
       -
        {$ifdef CALLSTACK}

     

       7
       7
       -
          lineinfo2,

     

       8
       8
       -
        {$endif CALLSTACK}

     

       9
       9
       -
       -  LazFileUtils, LazUtf8, StdCtrls, Graphics;

     

       10
       10
       -
       +  LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil;

     

       11
       11
       -
        

     

       12
       12
       -
        {$ifdef windows}

     

       13
       13
       -
        function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;

     

       14
       14
       -
       @@ -235,7 +235,7 @@ end;

     

       15
       15
       -
        

     

       16
       16
       -
        function ParamStrUTF8(Param: Integer): utf8string;

     

       17
       17
       -
        begin

     

       18
       18
       -
       -  Result:=FileUtil.ParamStrUTF8(Param);

     

       19
       19
       -
       +  Result:=LazUtf8.ParamStrUTF8(Param);

     

       20
       20
       -
        end;

     

       21
       21
       -
        

     

       22
       22
       -
        function ParamCount: integer;

+2 -2

pkgs/applications/networking/znc/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         name = "znc-${version}";

     

       16
       16
       -
         version = "1.7.3";

     

       16
       16
       +
         version = "1.7.4";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://znc.in/releases/archive/${name}.tar.gz";

     

       20
       20
       -
           sha256 = "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y";

     

       20
       20
       +
           sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/applications/office/gnucash/default.nix

···

       25
       25
        
       

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
        
         name = "gnucash-${version}";

     

       28
       28
       -
         version = "3.5";

     

       28
       28
       +
         version = "3.6";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "mirror://sourceforge/gnucash/${name}.tar.bz2";

     

       32
       32
       -
           sha256 = "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp";

     

       32
       32
       +
           sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];

+57

pkgs/applications/office/timetable/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , glib

     

       4
       4
       +
       , gtk3

     

       5
       5
       +
       , hicolor-icon-theme

     

       6
       6
       +
       , json-glib

     

       7
       7
       +
       , libgee

     

       8
       8
       +
       , meson

     

       9
       9
       +
       , ninja

     

       10
       10
       +
       , pkgconfig

     

       11
       11
       +
       , pantheon

     

       12
       12
       +
       , python3

     

       13
       13
       +
       , wrapGAppsHook

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       

     

       17
       17
       +
       stdenv.mkDerivation rec {

     

       18
       18
       +
         pname = "timetable";

     

       19
       19
       +
         version = "1.0.6";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "lainsce";

     

       23
       23
       +
           repo = pname;

     

       24
       24
       +
           rev = version;

     

       25
       25
       +
           sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           meson

     

       30
       30
       +
           ninja

     

       31
       31
       +
           pkgconfig

     

       32
       32
       +
           pantheon.vala

     

       33
       33
       +
           python3

     

       34
       34
       +
           wrapGAppsHook

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         buildInputs = [

     

       38
       38
       +
           glib

     

       39
       39
       +
           gtk3

     

       40
       40
       +
           hicolor-icon-theme

     

       41
       41
       +
           json-glib

     

       42
       42
       +
           libgee

     

       43
       43
       +
           pantheon.granite

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         postPatch = ''

     

       47
       47
       +
           chmod +x meson/post_install.py

     

       48
       48
       +
           patchShebangs meson/post_install.py

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         meta = with stdenv.lib; {

     

       52
       52
       +
           description = "Plot out your own timetable for the week and organize it";

     

       53
       53
       +
           homepage = "https://github.com/lainsce/timetable";

     

       54
       54
       +
           maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers;

     

       55
       55
       +
           license = licenses.gpl2Plus;

     

       56
       56
       +
         };

     

       57
       57
       +
       }

+7 -15

pkgs/applications/office/watson/default.nix

···

       3
       3
        
       with pythonPackages;

     

       4
       4
        
       

     

       5
       5
        
       buildPythonApplication rec {

     

       6
       6
       -
         pname = "td-watson";

     

       7
       7
       -
         version = "1.5.2";

     

       6
       6
       +
         pname = "watson";

     

       7
       7
       +
         version = "1.7.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
       -
           inherit version pname;

     

       11
       11
       -
           sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";

     

       10
       10
       +
           inherit version;

     

       11
       11
       +
           pname = "td-watson";

     

       12
       12
       +
           sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       14
       -
         # uses tox, test invocation fails

     

       15
       15
       -
         doCheck = true;

     

       16
       15
        
         checkPhase = ''

     

       17
       17
       -
           py.test -vs tests

     

       16
       16
       +
           pytest -vs tests

     

       18
       17
        
        '';

     

       19
       18
        
       

     

       20
       20
       -
         patches = [

     

       21
       21
       -
           (fetchpatch {

     

       22
       22
       -
             url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;

     

       23
       23
       -
             sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";

     

       24
       24
       -
           })

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       19
        
         checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];

     

       28
       20
        
         propagatedBuildInputs = [ requests click arrow ];

     

       29
       21
        
       

     
···

       31
       23
        
           homepage = https://tailordev.github.io/Watson/;

     

       32
       24
        
           description = "A wonderful CLI to track your time!";

     

       33
       25
        
           license = licenses.mit;

     

       34
       34
       -
           maintainers = with maintainers; [ mguentner ] ;

     

       26
       26
       +
           maintainers = with maintainers; [ mguentner nathyong ] ;

     

       35
       27
        
         };

     

       36
       28
        
       }

+2 -2

pkgs/applications/radio/soapyuhd/default.nix

···

       3
       3
        
       } :

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         version = "0.3.5";

     

       6
       6
       +
         version = "0.3.6";

     

       7
       7
        
       

     

       8
       8
        
       in stdenv.mkDerivation {

     

       9
       9
        
         name = "soapyuhd-${version}";

     
···

       12
       12
        
           owner = "pothosware";

     

       13
       13
        
           repo = "SoapyUHD";

     

       14
       14
        
           rev = "soapy-uhd-${version}";

     

       15
       15
       -
           sha256 = "07cr4zk42d0l5g03wm7dzl5lmqr104hmzp1fdjqa1z7xq4v9c9b1";

     

       15
       15
       +
           sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake pkgconfig ];

+2 -2

pkgs/applications/radio/urh/default.nix

···

       3
       3
        
       

     

       4
       4
        
       python3Packages.buildPythonApplication rec {

     

       5
       5
        
         pname = "urh";

     

       6
       6
       -
         version = "2.7.0";

     

       6
       6
       +
         version = "2.7.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "jopohl";

     

       10
       10
        
           repo = pname;

     

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

     

       12
       12
       -
           sha256 = "0yxv38p8a2srk9c55jj96vcib6m6pb6m485ysfg2ilwjzipx2ab0";

     

       12
       12
       +
           sha256 = "14027dcq0ag2qjpxcmsb9n1c64ypmi4rycwxzm2hajj7hk2736hv";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ hackrf rtl-sdr airspy limesuite ];

+2 -2

pkgs/applications/science/astronomy/stellarium/default.nix

···

       6
       6
        
       

     

       7
       7
        
       mkDerivation rec {

     

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

     

       9
       9
       -
         version = "0.19.0";

     

       9
       9
       +
         version = "0.19.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "Stellarium";

     

       13
       13
        
           repo = "stellarium";

     

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

     

       15
       15
       -
           sha256 = "1x9s9v9ann93nyqd8n8adwhx66xgq5vp0liyzl1h1ji6qk8jla3c";

     

       15
       15
       +
           sha256 = "0hf1wv2bb5j7ny2xh29mj9m4hjblhn02zylay8gl85w7xlqs7s5r";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake perl ];

+6 -6

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

···

       4
       4
        
         hts-nim = fetchFromGitHub {

     

       5
       5
        
           owner = "brentp";

     

       6
       6
        
           repo = "hts-nim";

     

       7
       7
       -
           rev = "v0.2.5";

     

       8
       8
       -
           sha256 = "1fma99rjqxgg9dihkd10hm1jjp5amsk5wsxnvq1lk4mcsjix5xqb";

     

       7
       7
       +
           rev = "v0.2.14";

     

       8
       8
       +
           sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         docopt = fetchFromGitHub {

     

       12
       12
        
           owner = "docopt";

     

       13
       13
        
           repo = "docopt.nim";

     

       14
       14
       -
           rev = "v0.6.5";

     

       15
       15
       -
           sha256 = "0yx79m4jkdcazwlky55nwf39zj5kdhymrrdrjq29mahiwx83x5zr";

     

       14
       14
       +
           rev = "v0.6.7";

     

       15
       15
       +
           sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
       in stdenv.mkDerivation rec {

     

       19
       19
        
         name = "mosdepth-${version}";

     

       20
       20
       -
         version = "0.2.3";

     

       20
       20
       +
         version = "0.2.6";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "brentp";

     

       24
       24
        
           repo = "mosdepth";

     

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

     

       26
       26
       -
           sha256 = "1b9frrwhcvay3alhn0d02jccc2qlbij1732hzq9nhwnr4kvsvxx7";

     

       26
       26
       +
           sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [ nim ];

+30

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

···

       1
       1
       +
       {stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "octopus";

     

       5
       5
       +
         version = "0.6.3-beta";

     

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

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "luntergroup";

     

       10
       10
       +
           repo = "octopus";

     

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

     

       12
       12
       +
           sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = [ cmake pkg-config ];

     

       16
       16
       +
         buildInputs = [ boost gmp htslib zlib lzma ];

     

       17
       17
       +
       

     

       18
       18
       +
         postInstall = ''

     

       19
       19
       +
           mkdir $out/bin

     

       20
       20
       +
           mv $out/octopus $out/bin

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "Bayesian haplotype-based mutation calling";

     

       25
       25
       +
           license = licenses.mit;

     

       26
       26
       +
           homepage = "https://github.com/luntergroup/octopus";

     

       27
       27
       +
           maintainers = with maintainers; [ jbedo ];

     

       28
       28
       +
           platforms = platforms.x86_64;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name    = "verilator-${version}";

     

       5
       5
       -
         version = "4.014";

     

       5
       5
       +
         version = "4.016";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url    = "https://www.veripool.org/ftp/${name}.tgz";

     

       9
       9
       -
           sha256 = "1srk9a03hbq8rdp4mma817aiq61c2hbrs66qv25zj3dfnfqigxgd";

     

       9
       9
       +
           sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         enableParallelBuilding = true;

+2 -2

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

···

       61
       61
        
       stdenv.mkDerivation rec {

     

       62
       62
        
         pname = "gap";

     

       63
       63
        
         # https://www.gap-system.org/Releases/

     

       64
       64
       -
         version = "4.10.1";

     

       64
       64
       +
         version = "4.10.2";

     

       65
       65
        
       

     

       66
       66
        
         src = fetchurl {

     

       67
       67
        
           url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";

     

       68
       68
       -
           sha256 = "136s0zvhcw41fshj5zgsrjcy2kd58cdh2m3ddp5rdizi4rx54f10";

     

       68
       68
       +
           sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94";

     

       69
       69
        
         };

     

       70
       70
        
       

     

       71
       71
        
         # remove all non-essential packages (which take up a lot of space)

+1 -1

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

···

       130
       130
        
         singular = pkgs.singular.override { inherit flint; };

     

       131
       131
        
       

     

       132
       132
        
         # https://trac.sagemath.org/ticket/26625

     

       133
       133
       -
         maxima-ecl = pkgs.maxima-ecl-5_41;

     

       133
       133
       +
         maxima-ecl = pkgs.maxima-ecl;

     

       134
       134
        
       

     

       135
       135
        
         # *not* to confuse with the python package "pynac"

     

       136
       136
        
         pynac = pkgs.pynac.override { inherit singular flint; };

-26

pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch

···

       1
       1
       -
       diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py

     

       2
       2
       -
       index 3bca15d53b..7cf04ff8d1 100644

     

       3
       3
       -
       --- a/src/sage/misc/package.py

     

       4
       4
       -
       +++ b/src/sage/misc/package.py

     

       5
       5
       -
       @@ -478,16 +478,16 @@ def package_manifest(package):

     

       6
       6
       -
        

     

       7
       7
       -
            EXAMPLES::

     

       8
       8
       -
        

     

       9
       9
       -
       -        sage: from sage.misc.package import package_manifest

     

       10
       10
       -
       -        sage: sagetex_manifest = package_manifest('sagetex')

     

       11
       11
       -
       -        sage: sagetex_manifest['package_name'] == 'sagetex'

     

       12
       12
       -
       +        sage: from sage.misc.package import package_manifest # optional - buildsystem

     

       13
       13
       -
       +        sage: sagetex_manifest = package_manifest('sagetex') # optional - buildsystem

     

       14
       14
       -
       +        sage: sagetex_manifest['package_name'] == 'sagetex' # optional - buildsystem

     

       15
       15
       -
                True

     

       16
       16
       -
       -        sage: 'files' in sagetex_manifest

     

       17
       17
       -
       +        sage: 'files' in sagetex_manifest # optional - buildsystem

     

       18
       18
       -
                True

     

       19
       19
       -
        

     

       20
       20
       -
            Test a nonexistent package::

     

       21
       21
       -
        

     

       22
       22
       -
       -        sage: package_manifest('dummy-package')

     

       23
       23
       -
       +        sage: package_manifest('dummy-package') # optional - buildsystem

     

       24
       24
       -
                Traceback (most recent call last):

     

       25
       25
       -
                ...

     

       26
       26
       -
                KeyError: 'dummy-package'

+57

pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch

···

       1
       1
       +
       diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py

     

       2
       2
       +
       index 0f2700168a..60f71357d2 100644

     

       3
       3
       +
       --- a/src/sage_setup/docbuild/__init__.py

     

       4
       4
       +
       +++ b/src/sage_setup/docbuild/__init__.py

     

       5
       5
       +
       @@ -86,26 +86,6 @@ def builder_helper(type):

     

       6
       6
       +
            """

     

       7
       7
       +
            Returns a function which builds the documentation for

     

       8
       8
       +
            output type ``type``.

     

       9
       9
       +
       -

     

       10
       10
       +
       -    TESTS:

     

       11
       11
       +
       -

     

       12
       12
       +
       -    Check that :trac:`25161` has been resolved::

     

       13
       13
       +
       -

     

       14
       14
       +
       -        sage: from sage_setup.docbuild import DocBuilder, setup_parser

     

       15
       15
       +
       -        sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set

     

       16
       16
       +
       -

     

       17
       17
       +
       -        sage: import sage_setup.docbuild.sphinxbuild

     

       18
       18
       +
       -        sage: def raiseBaseException():

     

       19
       19
       +
       -        ....:     raise BaseException("abort pool operation")

     

       20
       20
       +
       -        sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException

     

       21
       21
       +
       -

     

       22
       22
       +
       -        sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc

     

       23
       23
       +
       -        sage: helper = builder_helper("html")

     

       24
       24
       +
       -        sage: try:

     

       25
       25
       +
       -        ....:     build_many(build_ref_doc, [("docname", "en", "html", {})])

     

       26
       26
       +
       -        ....: except Exception as E:

     

       27
       27
       +
       -        ....:     "Non-exception during docbuild: abort pool operation" in str(E)

     

       28
       28
       +
       -        True

     

       29
       29
       +
            """

     

       30
       30
       +
            def f(self, *args, **kwds):

     

       31
       31
       +
                output_dir = self._output_dir(type)

     

       32
       32
       +
       @@ -127,10 +107,9 @@ def builder_helper(type):

     

       33
       33
       +
                logger.debug(build_command)

     

       34
       34
       +
        

     

       35
       35
       +
                # Run Sphinx with Sage's special logger

     

       36
       36
       +
       -        sys.argv = ["sphinx-build"] + build_command.split()

     

       37
       37
       +
       -        from .sphinxbuild import runsphinx

     

       38
       38
       +
       +        args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split()

     

       39
       39
       +
                try:

     

       40
       40
       +
       -            runsphinx()

     

       41
       41
       +
       +            subprocess.check_call(args)

     

       42
       42
       +
                except Exception:

     

       43
       43
       +
                    if ABORT_ON_ERROR:

     

       44
       44
       +
                        raise

     

       45
       45
       +
       diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py

     

       46
       46
       +
       index 9a2fba79bc..77c8ed3592 100644

     

       47
       47
       +
       --- a/src/sage_setup/docbuild/sphinxbuild.py

     

       48
       48
       +
       +++ b/src/sage_setup/docbuild/sphinxbuild.py

     

       49
       49
       +
       @@ -318,3 +318,8 @@ def runsphinx():

     

       50
       50
       +
                sys.stderr = saved_stderr

     

       51
       51
       +
                sys.stdout.flush()

     

       52
       52
       +
                sys.stderr.flush()

     

       53
       53
       +
       +

     

       54
       54
       +
       +if __name__ == '__main__':

     

       55
       55
       +
       +    import sys

     

       56
       56
       +
       +    sys.argv[0] = "sphinx-build"

     

       57
       57
       +
       +    runsphinx()

+7 -66

pkgs/applications/science/math/sage/sage-src.nix

···

       10
       10
        
       # all get the same sources with the same patches applied.

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
       -
         version = "8.7";

     

       13
       13
       +
         version = "8.8";

     

       14
       14
        
         pname = "sage-src";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "sagemath";

     

       18
       18
        
           repo = "sage";

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "05vvrd6syh0hlmrk6kzjrwd0hpmvxp8vr8p3mkjb0jh5p2kjdd27";

     

       20
       20
       +
           sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # Patches needed because of particularities of nix or the way this is packaged.

     
···

       45
       45
        
           # Fixes a potential race condition which can lead to transient doctest failures.

     

       46
       46
        
           ./patches/fix-ecl-race.patch

     

       47
       47
        
       

     

       48
       48
       -
           # Parallelize docubuild using subprocesses, fixing an isolation issue. See

     

       49
       49
       -
           # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE

     

       50
       50
       -
           (fetchpatch {

     

       51
       51
       -
             name = "sphinx-docbuild-subprocesses.patch";

     

       52
       52
       -
             url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch";

     

       53
       53
       -
             sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n";

     

       54
       54
       -
             stripLen = 1;

     

       55
       55
       -
           })

     

       56
       56
       -
       

     

       57
       57
       -
           # Part of the build system. Should become unnecessary with sage 8.8.

     

       58
       58
       -
           # Upstream discussion here: https://trac.sagemath.org/ticket/27124#comment:33

     

       59
       59
       -
           ./patches/do-not-test-package-manifests.patch

     

       60
       60
       -
       

     

       61
       48
        
           # Not necessary since library location is set explicitly

     

       62
       49
        
           # https://trac.sagemath.org/ticket/27660#ticket

     

       63
       50
        
           ./patches/do-not-test-find-library.patch

     

       64
       51
        
       

     

       65
       65
       -
           # https://trac.sagemath.org/ticket/27697#ticket

     

       66
       66
       -
           (fetchpatch {

     

       67
       67
       -
             name = "pplpy-doc-location-configurable.patch";

     

       68
       68
       -
             url = "https://git.sagemath.org/sage.git/patch/?h=c4d966e7cb0c7b87c55d52dc6f46518433a2a0a2";

     

       69
       69
       -
             sha256 = "0pqbbsx8mriwny422s9mp3z5d095cnam32sm62q4mxk8g8jb9vm9";

     

       70
       70
       -
           })

     

       71
       52
        
       

     

       72
       53
        
           # https://trac.sagemath.org/ticket/28007

     

       73
       54
        
           ./patches/threejs-offline.patch

     

       55
       55
       +
       

     

       56
       56
       +
           # Parallelize docubuild using subprocesses, fixing an isolation issue. See

     

       57
       57
       +
           # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE

     

       58
       58
       +
           ./patches/sphinx-docbuild-subprocesses.patch

     

       74
       59
        
         ];

     

       75
       60
        
       

     

       76
       61
        
         # Since sage unfortunately does not release bugfix releases, packagers must

     

       77
       62
        
         # fix those bugs themselves. This is for critical bugfixes, where "critical"

     

       78
       63
        
         # == "causes (transient) doctest failures / somebody complained".

     

       79
       79
       -
         bugfixPatches = [

     

       80
       80
       -
           # Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py

     

       81
       81
       -
           # https://trac.sagemath.org/ticket/27477

     

       82
       82
       -
           (fetchpatch {

     

       83
       83
       -
             name = "sig_on_in_matrix_sparce.patch";

     

       84
       84
       -
             url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54";

     

       85
       85
       -
             sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17";

     

       86
       86
       -
           })

     

       87
       87
       -
         ];

     

       64
       64
       +
         bugfixPatches = [ ];

     

       88
       65
        
       

     

       89
       66
        
         # Patches needed because of package updates. We could just pin the versions of

     

       90
       67
        
         # dependencies, but that would lead to rebuilds, confusion and the burdons of

     
···

       116
       93
        
             stripLen = 1;

     

       117
       94
        
           })

     

       118
       95
        
       

     

       119
       119
       -
           # https://trac.sagemath.org/ticket/26451

     

       120
       120
       -
           (fetchSageDiff {

     

       121
       121
       -
             name = "sphinx-1.8.patch";

     

       122
       122
       -
             base = "8.7";

     

       123
       123
       -
             rev = "737afd8f314bd1e16feaec562bb4b5efa2effa8b";

     

       124
       124
       -
             sha256 = "0n56ss88ds662bp49j23z5c2i6hsn3jynxw13wv76hyl0h7l1hjh";

     

       125
       125
       -
           })

     

       126
       126
       -
       

     

       127
       127
       -
           # https://trac.sagemath.org/ticket/27653

     

       128
       128
       -
           (fetchpatch {

     

       129
       129
       -
             name = "sympy-1.4.patch";

     

       130
       130
       -
             url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d";

     

       131
       131
       -
             sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir";

     

       132
       132
       -
           })

     

       133
       133
       -
       

     

       134
       134
       -
           # https://trac.sagemath.org/ticket/27094

     

       135
       135
       -
           (fetchpatch {

     

       136
       136
       -
             name = "gap-4.10.1.patch";

     

       137
       137
       -
             url = "https://git.sagemath.org/sage.git/patch?id=d3483110474591ea6cc8e3210cd884f3e0018b3e";

     

       138
       138
       -
             sha256 = "028i6h8l8npwzx5z0ax0rcywl85gc83qw1jf93zf523msdfcsk0n";

     

       139
       139
       -
           })

     

       140
       140
       -
       

     

       141
       141
       -
           # https://trac.sagemath.org/ticket/27738

     

       142
       142
       -
           (fetchpatch {

     

       143
       143
       -
             name = "R-3.6.0.patch";

     

       144
       144
       -
             url = "https://git.sagemath.org/sage.git/patch/?h=8b7dbd0805d02d0e8674a272e161ceb24a637966";

     

       145
       145
       -
             sha256 = "1c81f13z1w62s06yvp43gz6vkp8mxcs289n6l4gj9xj10slimzff";

     

       146
       146
       -
           })

     

       147
       147
       -
       

     

       148
       96
        
           # https://trac.sagemath.org/ticket/26932

     

       149
       97
        
           (fetchSageDiff {

     

       150
       98
        
             name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";

     

       151
       99
        
             base = "8.8.beta4";

     

       152
       100
        
             rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";

     

       153
       101
        
             sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";

     

       154
       154
       -
           })

     

       155
       155
       -
       

     

       156
       156
       -
           # https://trac.sagemath.org/ticket/26718

     

       157
       157
       -
           (fetchpatch {

     

       158
       158
       -
             name = "threejs-r100.patch";

     

       159
       159
       -
             url = "https://git.sagemath.org/sage.git/patch/?h=86c5bb000259e6de5d7c60afc608a4b0d010b690";

     

       160
       160
       -
             sha256 = "0sgqqd4df2bxsq19b6kfy7dvgyxprlpg7f3xx7g3fs8ij937m352";

     

       161
       102
        
           })

     

       162
       103
        
         ];

     

       163
       104

+3 -3

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

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "git-recent-${version}";

     

       8
       8
       -
         version = "1.1.0";

     

       7
       7
       +
         pname = "git-recent";

     

       8
       8
       +
         version = "1.1.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "paulirish";

     

       12
       12
        
           repo = "git-recent";

     

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

     

       14
       14
       -
           sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn";

     

       14
       14
       +
           sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ makeWrapper ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "hub";

     

       5
       5
       -
         version = "2.12.0";

     

       5
       5
       +
         version = "2.12.1";

     

       6
       6
        
       

     

       7
       7
        
         goPackagePath = "github.com/github/hub";

     

       8
       8
        
       

     
···

       13
       13
        
           owner = "github";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "0wv0s0bhl7akyshzcsqlk8ws84cjdjizfpn6m9674lw9vs9rj2sj";

     

       16
       16
       +
           sha256 = "0i9bqcgdidl5zawkpq2fjrimzbb37i1m2fisvj32d27fsp1824bk";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ groff utillinux ];

+2 -2

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

···

       1
       1
        
       { stdenv, python3Packages }:

     

       2
       2
        
       with python3Packages; buildPythonApplication rec {

     

       3
       3
        
         pname = "pre-commit";

     

       4
       4
       -
         version = "1.16.1";

     

       4
       4
       +
         version = "1.17.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchPypi {

     

       7
       7
        
           inherit version;

     

       8
       8
        
           pname = "pre_commit";

     

       9
       9
       -
           sha256 = "6ca409d1f22d444af427fb023a33ca8b69625d508a50e1b7eaabd59247c93043";

     

       9
       9
       +
           sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [

+2 -2

pkgs/applications/video/clipgrab/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

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

     

       8
       8
       -
         version = "3.8.2";

     

       8
       8
       +
         version = "3.8.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
       -
           sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd";

     

       11
       11
       +
           sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf";

     

       12
       12
        
           # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!

     

       13
       13
        
           url = "https://download.clipgrab.org/${name}.tar.gz";

     

       14
       14
        
         };

+10 -1

pkgs/applications/video/mythtv/default.nix

···

       2
       2
        
       , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype

     

       3
       3
        
       , perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm

     

       4
       4
        
       , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2

     

       5
       5
       -
       , linuxHeaders

     

       5
       5
       +
       , linuxHeaders, fetchpatch

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     
···

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

     

       16
       16
        
           sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";

     

       17
       17
        
         };

     

       18
       18
       +
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           # Fixes build with exiv2 0.27.1.

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             name = "004-exiv2.patch";

     

       23
       23
       +
             url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946";

     

       24
       24
       +
             sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8";

     

       25
       25
       +
           })

     

       26
       26
       +
         ];

     

       18
       27
        
       

     

       19
       28
        
         setSourceRoot = ''sourceRoot=$(echo */mythtv)'';

     

       20
       29

+11 -11

pkgs/applications/video/plex-media-player/default.nix

···

       9
       9
        
         # plex-media-player is updated, the versions for these files are changed,

     

       10
       10
        
         # so the build IDs (and SHAs) below will need to be updated!

     

       11
       11
        
         depSrcs = rec {

     

       12
       12
       -
           webClientBuildId = "85-88b3ac67015f76";

     

       13
       13
       -
           webClientDesktopBuildId = "3.77.2-7015f76";

     

       14
       14
       -
           webClientTvBuildId = "3.78.0-88b3ac6";

     

       12
       12
       +
           webClientBuildId = "129-669a5eed7ae231";

     

       13
       13
       +
           webClientDesktopBuildId = "3.100.1-d7ae231";

     

       14
       14
       +
           webClientTvBuildId = "3.105.0-669a5ee";

     

       15
       15
        
       

     

       16
       16
        
           webClient = fetchurl {

     

       17
       17
        
             url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";

     

       18
       18
       -
             sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";

     

       18
       18
       +
             sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk";

     

       19
       19
        
           };

     

       20
       20
        
           webClientDesktopHash = fetchurl {

     

       21
       21
        
             url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";

     

       22
       22
       -
             sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";

     

       22
       22
       +
             sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg";

     

       23
       23
        
           };

     

       24
       24
        
           webClientDesktop = fetchurl {

     

       25
       25
        
             url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";

     

       26
       26
       -
             sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";

     

       26
       26
       +
             sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa";

     

       27
       27
        
           };

     

       28
       28
        
           webClientTvHash = fetchurl {

     

       29
       29
        
             url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";

     

       30
       30
       -
             sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";

     

       30
       30
       +
             sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd";

     

       31
       31
        
           };

     

       32
       32
        
           webClientTv = fetchurl {

     

       33
       33
        
             url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";

     

       34
       34
       -
             sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";

     

       34
       34
       +
             sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk";

     

       35
       35
        
           };

     

       36
       36
        
         };

     

       37
       37
        
       in stdenv.mkDerivation rec {

     

       38
       38
        
         name = "plex-media-player-${version}";

     

       39
       39
       -
         version = "2.23.0.920";

     

       40
       40
       -
         vsnHash = "5bc1a2e5";

     

       39
       39
       +
         version = "2.36.0.988";

     

       40
       40
       +
         vsnHash = "0150ae52";

     

       41
       41
        
       

     

       42
       42
        
         src = fetchFromGitHub {

     

       43
       43
        
           owner = "plexinc";

     

       44
       44
        
           repo = "plex-media-player";

     

       45
       45
        
           rev = "v${version}-${vsnHash}";

     

       46
       46
       -
           sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";

     

       46
       46
       +
           sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0";

     

       47
       47
        
         };

     

       48
       48
        
       

     

       49
       49
        
         nativeBuildInputs = [ pkgconfig cmake python3 ];

+2 -2

pkgs/applications/video/smtube/default.nix

···

       1
       1
        
       { stdenv, fetchurl, qmake, qtscript, qtwebkit }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "18.11.0";

     

       4
       4
       +
         version = "19.6.0";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "0rda7mdsr0awhra9yrmsdzp2c4s6xx5nax107d1fydnk084pygqp";

     

       9
       9
       +
           sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         makeFlags = [

+2 -2

pkgs/applications/virtualization/virt-manager/default.nix

···

       10
       10
        
       

     

       11
       11
        
       python3Packages.buildPythonApplication rec {

     

       12
       12
        
         name = "virt-manager-${version}";

     

       13
       13
       -
         version = "2.1.0";

     

       13
       13
       +
         version = "2.2.0";

     

       14
       14
        
         namePrefix = "";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";

     

       18
       18
       -
           sha256 = "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil";

     

       18
       18
       +
           sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+1 -1

pkgs/applications/virtualization/virtualbox/default.nix

···

       4
       4
        
       , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43

     

       5
       5
        
       , alsaLib, curl, libvpx, nettools, dbus

     

       6
       6
        
       , makeself, perl

     

       7
       7
       -
       , javaBindings ? false, jdk ? null

     

       7
       7
       +
       , javaBindings ? true, jdk ? null # Almost doesn't affect closure size

     

       8
       8
        
       , pythonBindings ? false, python3 ? null

     

       9
       9
        
       , extensionPack ? null, fakeroot ? null

     

       10
       10
        
       , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null

+4 -5

pkgs/applications/window-managers/i3/pystatus.nix

···

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         # i3pystatus moved to rolling release:

     

       5
       5
        
         # https://github.com/enkore/i3pystatus/issues/584

     

       6
       6
       -
         version = "unstable-2019-02-10";

     

       6
       6
       +
         version = "unstable-2019-06-10";

     

       7
       7
        
         pname = "i3pystatus";

     

       8
       8
       -
         disabled = !python3Packages.isPy3k;

     

       9
       8
        
       

     

       10
       9
        
         src = fetchFromGitHub

     

       11
       10
        
         {

     

       12
       11
        
           owner = "enkore";

     

       13
       12
        
           repo = "i3pystatus";

     

       14
       14
       -
           rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e";

     

       15
       15
       -
           sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720";

     

       13
       13
       +
           rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";

     

       14
       14
       +
           sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";

     

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       18
       -
         propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++

     

       17
       17
       +
         propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++

     

       19
       18
        
           [ libpulseaudio ] ++ extraLibs;

     

       20
       19
        
       

     

       21
       20
        
         libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];

+6 -4

pkgs/build-support/build-bazel-package/default.nix

···

       51
       51
        
             rm -rf $bazelOut/external/{local_*,\@local_*}

     

       52
       52
        
       

     

       53
       53
        
             # Patching markers to make them deterministic

     

       54
       54
       -
             sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker

     

       55
       55
       -
             sed -i '/^ENV:TMP.*/d' $bazelOut/external/\@*.marker

     

       54
       54
       +
             find $bazelOut/external -name '@*\.marker' -exec sed -i \

     

       55
       55
       +
               -e 's, -\?[0-9][0-9]*$, 1,' \

     

       56
       56
       +
               -e '/^ENV:TMP.*/d' \

     

       57
       57
       +
               '{}' \;

     

       56
       58
        
       

     

       57
       59
        
             # Remove all vcs files

     

       58
       60
        
             rm -rf $(find $bazelOut/external -type d -name .git)

     
···

       86
       88
        
         '';

     

       87
       89
        
       

     

       88
       90
        
         preConfigure = ''

     

       89
       89
       -
           mkdir -p $bazelOut/external

     

       90
       90
       -
           cp -r $deps/* $bazelOut/external

     

       91
       91
       +
           mkdir -p "$bazelOut"

     

       92
       92
       +
           cp -r $deps $bazelOut/external

     

       91
       93
        
           chmod -R +w $bazelOut

     

       92
       94
        
           find $bazelOut -type l | while read symlink; do

     

       93
       95
        
             ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"

+1 -1

pkgs/build-support/trivial-builders.nix

···

       143
       143
        
          * Automatically includes interpreter above the contents passed.

     

       144
       144
        
          *

     

       145
       145
        
          * Example:

     

       146
       146
       -
          * # Writes my-file to /nix/store/<store path>/my-file and makes executable.

     

       146
       146
       +
          * # Writes my-file to /nix/store/<store path> and makes executable.

     

       147
       147
        
          * writeShellScript "my-file"

     

       148
       148
        
          *   ''

     

       149
       149
        
          *   Contents of File

+27

pkgs/data/fonts/amiri/default.nix

···

       1
       1
       +
       { lib, fetchzip }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         version = "0.111";

     

       5
       5
       +
       

     

       6
       6
       +
       in fetchzip rec {

     

       7
       7
       +
         name = "Amiri-${version}";

     

       8
       8
       +
       

     

       9
       9
       +
         url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip";

     

       10
       10
       +
       

     

       11
       11
       +
         sha256 = "1w3a5na4mazspwy8j2hvpjha10sgd287kamm51p49jcr90cvwbdr";

     

       12
       12
       +
       

     

       13
       13
       +
         postFetch = ''

     

       14
       14
       +
           unzip $downloadedFile

     

       15
       15
       +
           install -m444 -Dt $out/share/fonts/truetype ${name}/*.ttf

     

       16
       16
       +
           install -m444 -Dt $out/share/doc/${name}    ${name}/{*.txt,*.pdf}

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "A classical Arabic typeface in Naskh style";

     

       21
       21
       +
           homepage = "https://www.amirifont.org/";

     

       22
       22
       +
           license = licenses.ofl;

     

       23
       23
       +
           maintainers = [ maintainers.vbgl ];

     

       24
       24
       +
           platforms = platforms.all;

     

       25
       25
       +
         };

     

       26
       26
       +
       }

     

       27
       27
       +

+2 -2

pkgs/data/icons/papirus-icon-theme/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "papirus-icon-theme";

     

       5
       5
       -
         version = "20190521";

     

       5
       5
       +
         version = "20190615";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "PapirusDevelopmentTeam";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "192s14bf2ni46jkiifbsl82qy1miy8fnxs2fpqwf6s6jlv9x4zxs";

     

       11
       11
       +
           sha256 = "1999q6jw4ib8xrw3ydmprnq0mbmzqj8l92rx4rrh22lw9kdvig8w";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+2 -2

pkgs/data/misc/osinfo-db/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "osinfo-db";

     

       5
       5
       -
         version = "20190504";

     

       5
       5
       +
         version = "20190611";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1yik26gbm3y3wviyabfpyx7pnqx72z5j7267hdgfscdvrwwmyi5z";

     

       9
       9
       +
           sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

+3 -3

pkgs/data/themes/matcha/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "matcha-${version}";

     

       5
       5
       -
         version = "2019_05_09";

     

       5
       5
       +
         version = "2019-06-22";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vinceliuice";

     

       9
       9
        
           repo = "matcha";

     

       10
       10
       -
           rev = version;

     

       11
       11
       -
           sha256 = "0xnv89appivrnbppyjqaa35pls120mkz253p2lblyxzbvi5kgn73";

     

       10
       10
       +
           rev = "f42df7a3219d7fbacb7be1b2e0e416d74339865e";

     

       11
       11
       +
           sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ gdk_pixbuf librsvg ];

+112

pkgs/desktops/deepin/dde-control-center/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative,

     

       2
       2
       +
        networkmanager, qtsvg, qtx11extras,  dtkcore, dtkwidget, geoip, gsettings-qt,

     

       3
       3
       +
        dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api,

     

       4
       4
       +
        dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus,

     

       5
       5
       +
        systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which,

     

       6
       6
       +
        substituteAll, wrapGAppsHook, tzdata

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       10
       10
       +
         name = "${pname}-${version}";

     

       11
       11
       +
         pname = "dde-control-center";

     

       12
       12
       +
         version = "4.10.11";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "linuxdeepin";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = version;

     

       18
       18
       +
           sha256 = "1ip8wjwf0n9q8xnqymzh8lz0j5gcnns976n291np6k5kdh2wqhr5";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           cmake

     

       23
       23
       +
           deepin.setupHook

     

       24
       24
       +
           pkgconfig

     

       25
       25
       +
           wrapGAppsHook

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs = [

     

       29
       29
       +
           dde-api

     

       30
       30
       +
           dde-daemon

     

       31
       31
       +
           dde-network-utils

     

       32
       32
       +
           dde-qt-dbus-factory

     

       33
       33
       +
           deepin-desktop-base

     

       34
       34
       +
           deepin-desktop-schemas

     

       35
       35
       +
           dtkcore

     

       36
       36
       +
           dtkwidget

     

       37
       37
       +
           fontconfig

     

       38
       38
       +
           freetype

     

       39
       39
       +
           geoip

     

       40
       40
       +
           glib

     

       41
       41
       +
           gnome3.networkmanager-l2tp

     

       42
       42
       +
           gnome3.networkmanager-openconnect

     

       43
       43
       +
           gnome3.networkmanager-openvpn

     

       44
       44
       +
           gnome3.networkmanager-vpnc

     

       45
       45
       +
           gsettings-qt

     

       46
       46
       +
           mtdev

     

       47
       47
       +
           networkmanager-qt

     

       48
       48
       +
           qt5integration

     

       49
       49
       +
           qtbase

     

       50
       50
       +
           qtdeclarative

     

       51
       51
       +
           qtmultimedia

     

       52
       52
       +
           qtsvg

     

       53
       53
       +
           qttools

     

       54
       54
       +
           qtx11extras

     

       55
       55
       +
           xorg.libX11

     

       56
       56
       +
           xorg.libXext

     

       57
       57
       +
           xorg.libXrandr

     

       58
       58
       +
           xorg.libxcb

     

       59
       59
       +
         ];

     

       60
       60
       +
       

     

       61
       61
       +
         cmakeFlags = [

     

       62
       62
       +
           "-DDISABLE_SYS_UPDATE=YES"

     

       63
       63
       +
           "-DDCC_DISABLE_GRUB=YES"

     

       64
       64
       +
         ];

     

       65
       65
       +
       

     

       66
       66
       +
         patches = [

     

       67
       67
       +
           (substituteAll {

     

       68
       68
       +
             src = ./fix-paths.patch;

     

       69
       69
       +
             nmcli = "${networkmanager}/bin/nmcli";

     

       70
       70
       +
             which = "${which}/bin/which";

     

       71
       71
       +
             # not packaged

     

       72
       72
       +
             # dman = "${deepin-manual}/bin/dman";

     

       73
       73
       +
             inherit tzdata;

     

       74
       74
       +
             # exclusive to deepin linux?

     

       75
       75
       +
             # allows to synchronize configuration files to cloud networks

     

       76
       76
       +
             # deepin_sync = "${deepin-sync}";

     

       77
       77
       +
           })

     

       78
       78
       +
         ];

     

       79
       79
       +
       

     

       80
       80
       +
         postPatch = ''

     

       81
       81
       +
           searchHardCodedPaths

     

       82
       82
       +
       

     

       83
       83
       +
           patchShebangs translate_ts2desktop.sh

     

       84
       84
       +
           patchShebangs translate_generation.sh

     

       85
       85
       +
           patchShebangs translate_desktop2ts.sh

     

       86
       86
       +
       

     

       87
       87
       +
           fixPath $out /usr dde-control-center-autostart.desktop \

     

       88
       88
       +
             com.deepin.dde.ControlCenter.service \

     

       89
       89
       +
             src/frame/widgets/utils.h

     

       90
       90
       +
       

     

       91
       91
       +
           substituteInPlace dde-control-center.desktop \

     

       92
       92
       +
             --replace "dbus-send" "${dbus}/bin/dbus-send"

     

       93
       93
       +
           substituteInPlace com.deepin.controlcenter.addomain.policy \

     

       94
       94
       +
             --replace "/bin/systemctl" "${systemd}/bin/systemctl"

     

       95
       95
       +
         '';

     

       96
       96
       +
       

     

       97
       97
       +
         postFixup = ''

     

       98
       98
       +
           # debuging

     

       99
       99
       +
           searchForUnresolvedDLL $out

     

       100
       100
       +
           searchHardCodedPaths $out

     

       101
       101
       +
         '';

     

       102
       102
       +
       

     

       103
       103
       +
         passthru.updateScript = deepin.updateScript { inherit name; };

     

       104
       104
       +
       

     

       105
       105
       +
         meta = with stdenv.lib; {

     

       106
       106
       +
           description = "Control panel of Deepin Desktop Environment";

     

       107
       107
       +
           homepage = https://github.com/linuxdeepin/dde-control-center;

     

       108
       108
       +
           license = licenses.gpl3;

     

       109
       109
       +
           platforms = platforms.linux;

     

       110
       110
       +
           maintainers = with maintainers; [ romildo worldofpeace ];

     

       111
       111
       +
         };

     

       112
       112
       +
       }

+65

pkgs/desktops/deepin/dde-control-center/fix-paths.patch

···

       1
       1
       +
       diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp

     

       2
       2
       +
       index 90d06f8..7cdad04 100644

     

       3
       3
       +
       --- a/src/frame/frame.cpp

     

       4
       4
       +
       +++ b/src/frame/frame.cpp

     

       5
       5
       +
       @@ -375,7 +375,7 @@ void Frame::keyPressEvent(QKeyEvent *e)

     

       6
       6
       +
        #ifdef QT_DEBUG

     

       7
       7
       +
            case Qt::Key_Escape:        qApp->quit();                               break;

     

       8
       8
       +
        #endif

     

       9
       9
       +
       -    case Qt::Key_F1:            QProcess::startDetached("dman", QStringList("dde"));  break;

     

       10
       10
       +
       +    case Qt::Key_F1:            QProcess::startDetached("@dman@", QStringList("dde"));  break;

     

       11
       11
       +
            default:;

     

       12
       12
       +
            }

     

       13
       13
       +
        }

     

       14
       14
       +
       diff --git a/src/frame/modules/datetime/timezone_dialog/timezone.cpp b/src/frame/modules/datetime/timezone_dialog/timezone.cpp

     

       15
       15
       +
       index 3dd4aad..5f1b363 100644

     

       16
       16
       +
       --- a/src/frame/modules/datetime/timezone_dialog/timezone.cpp

     

       17
       17
       +
       +++ b/src/frame/modules/datetime/timezone_dialog/timezone.cpp

     

       18
       18
       +
       @@ -46,7 +46,7 @@ namespace installer {

     

       19
       19
       +
        namespace {

     

       20
       20
       +
        

     

       21
       21
       +
        // Absolute path to zone.tab file.

     

       22
       22
       +
       -const char kZoneTabFile[] = "/usr/share/zoneinfo/zone.tab";

     

       23
       23
       +
       +const char kZoneTabFile[] = "@tzdata@/share/zoneinfo/zone.tab";

     

       24
       24
       +
        

     

       25
       25
       +
        // Absolute path to backward timezone file.

     

       26
       26
       +
        const char kTimezoneAliasFile[] = "/timezone_alias";

     

       27
       27
       +
       diff --git a/src/frame/modules/network/connectionvpneditpage.cpp b/src/frame/modules/network/connectionvpneditpage.cpp

     

       28
       28
       +
       index e292865..95c5a2b 100644

     

       29
       29
       +
       --- a/src/frame/modules/network/connectionvpneditpage.cpp

     

       30
       30
       +
       +++ b/src/frame/modules/network/connectionvpneditpage.cpp

     

       31
       31
       +
       @@ -215,7 +215,7 @@ void ConnectionVpnEditPage::exportConnConfig()

     

       32
       32
       +
            qDebug() << Q_FUNC_INFO << args;

     

       33
       33
       +
        

     

       34
       34
       +
            QProcess p;

     

       35
       35
       +
       -    p.start("nmcli", args);

     

       36
       36
       +
       +    p.start("@nmcli@", args);

     

       37
       37
       +
            p.waitForFinished();

     

       38
       38
       +
            qDebug() << p.readAllStandardOutput();

     

       39
       39
       +
            qDebug() << p.readAllStandardError();

     

       40
       40
       +
       diff --git a/src/frame/modules/network/vpnpage.cpp b/src/frame/modules/network/vpnpage.cpp

     

       41
       41
       +
       index 521a603..450d1a6 100644

     

       42
       42
       +
       --- a/src/frame/modules/network/vpnpage.cpp

     

       43
       43
       +
       +++ b/src/frame/modules/network/vpnpage.cpp

     

       44
       44
       +
       @@ -224,7 +224,7 @@ void VpnPage::importVPN()

     

       45
       45
       +
            qDebug() << args;

     

       46
       46
       +
        

     

       47
       47
       +
            QProcess p;

     

       48
       48
       +
       -    p.start("nmcli", args);

     

       49
       49
       +
       +    p.start("@nmcli@", args);

     

       50
       50
       +
            p.waitForFinished();

     

       51
       51
       +
            const auto stat = p.exitCode();

     

       52
       52
       +
            const QString output = p.readAllStandardOutput();

     

       53
       53
       +
       diff --git a/src/frame/modules/sync/syncworker.cpp b/src/frame/modules/sync/syncworker.cpp

     

       54
       54
       +
       index 3f929bf..6f240d9 100644

     

       55
       55
       +
       --- a/src/frame/modules/sync/syncworker.cpp

     

       56
       56
       +
       +++ b/src/frame/modules/sync/syncworker.cpp

     

       57
       57
       +
       @@ -24,7 +24,7 @@ SyncWorker::SyncWorker(SyncModel *model, QObject *parent)

     

       58
       58
       +
        

     

       59
       59
       +
            m_model->setSyncIsValid(

     

       60
       60
       +
                QProcess::execute(

     

       61
       61
       +
       -            "which", QStringList() << "/usr/lib/deepin-sync-daemon/deepin-sync-daemon") ==

     

       62
       62
       +
       +            "@which@", QStringList() << "@deepin_sync@/lib/deepin-sync-daemon/deepin-sync-daemon") ==

     

       63
       63
       +
                    0 &&

     

       64
       64
       +
                valueByQSettings<bool>(DCC_CONFIG_FILES, "CloudSync", "AllowCloudSync", false));

     

       65
       65
       +
        }

+8 -3

pkgs/desktops/deepin/dde-daemon/default.nix

···

       4
       4
        
         deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,

     

       5
       5
        
         libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,

     

       6
       6
        
         pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go,

     

       7
       7
       -
         deepin, makeWrapper, wrapGAppsHook }:

     

       7
       7
       +
         deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:

     

       8
       8
        
       

     

       9
       9
        
       buildGoPackage rec {

     

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

     

       11
       11
        
         pname = "dde-daemon";

     

       12
       12
       -
         version = "3.27.2.5";

     

       12
       12
       +
         version = "3.27.2.6";

     

       13
       13
        
       

     

       14
       14
        
         goPackagePath = "pkg.deepin.io/dde/daemon";

     

       15
       15
        
       

     
···

       17
       17
        
           owner = "linuxdeepin";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "117yhsb0axwblncyj02fhcyl4b7jl7vvh1bbx08bscih5lnvjihx";

     

       20
       20
       +
           sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         patches = [

     
···

       63
       63
        
           librsvg

     

       64
       64
        
           pulseaudio

     

       65
       65
        
           tzdata

     

       66
       66
       +
           xkeyboard_config

     

       66
       67
        
         ];

     

       67
       68
        
       

     

       68
       69
        
         postPatch = ''

     
···

       70
       71
        
           patchShebangs network/nm_generator/gen_nm_consts.py

     

       71
       72
        
       

     

       72
       73
        
           fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go

     

       74
       74
       +
           fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go

     

       73
       75
        
           fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile

     

       74
       76
        
           fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go

     

       75
       77
        
           fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go

     

       76
       78
        
           fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go

     

       77
       79
        
           fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go

     

       78
       80
        
           fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go

     

       81
       81
       +
           fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go

     

       82
       82
       +
       

     

       83
       83
       +
           # TODO: deepin-system-monitor comes from dde-extra

     

       79
       84
        
       

     

       80
       85
        
           sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile

     

       81
       86
        
           sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile

+76

pkgs/desktops/deepin/dde-launcher/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,

     

       2
       2
       +
         dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,

     

       3
       3
       +
         dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,

     

       4
       4
       +
         which, xdg_utils, wrapGAppsHook }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         name = "${pname}-${version}";

     

       8
       8
       +
         pname = "dde-launcher";

     

       9
       9
       +
         version = "4.6.13";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "linuxdeepin";

     

       13
       13
       +
           repo = pname;

     

       14
       14
       +
           rev = version;

     

       15
       15
       +
           sha256 = "1lwwn2qjbd4i7wx18mi8n7hzdh832i3kdadrivr10sbafdank7ky";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [

     

       19
       19
       +
           cmake

     

       20
       20
       +
           pkgconfig

     

       21
       21
       +
           qttools

     

       22
       22
       +
           wrapGAppsHook

     

       23
       23
       +
           deepin.setupHook

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildInputs = [

     

       27
       27
       +
           dde-qt-dbus-factory

     

       28
       28
       +
           dde-session-ui

     

       29
       29
       +
           deepin-desktop-schemas

     

       30
       30
       +
           deepin-wallpapers

     

       31
       31
       +
           dtkcore

     

       32
       32
       +
           dtkwidget

     

       33
       33
       +
           gsettings-qt

     

       34
       34
       +
           qtsvg

     

       35
       35
       +
           qtx11extras

     

       36
       36
       +
           which

     

       37
       37
       +
           xdg_utils

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         postPatch = ''

     

       41
       41
       +
           # debugging

     

       42
       42
       +
           searchHardCodedPaths

     

       43
       43
       +
       

     

       44
       44
       +
           substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share"

     

       45
       45
       +
       

     

       46
       46
       +
           substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out"

     

       47
       47
       +
       

     

       48
       48
       +
           substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open"

     

       49
       49
       +
           substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown"

     

       50
       50
       +
           substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which"

     

       51
       51
       +
       

     

       52
       52
       +
           # Uncomment (and remove space after $) after packaging deepin-manual

     

       53
       53
       +
           #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman"

     

       54
       54
       +
       

     

       55
       55
       +
           for f in src/boxframe/*.cpp; do

     

       56
       56
       +
             substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg"

     

       57
       57
       +
           done

     

       58
       58
       +
       

     

       59
       59
       +
           # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0

     

       60
       60
       +
         '';

     

       61
       61
       +
       

     

       62
       62
       +
         postFixup = ''

     

       63
       63
       +
           # debugging

     

       64
       64
       +
           searchHardCodedPaths $out

     

       65
       65
       +
         '';

     

       66
       66
       +
       

     

       67
       67
       +
         passthru.updateScript = deepin.updateScript { inherit name; };

     

       68
       68
       +
       

     

       69
       69
       +
         meta = with stdenv.lib; {

     

       70
       70
       +
           description = "Deepin Desktop Environment launcher module";

     

       71
       71
       +
           homepage = https://github.com/linuxdeepin/dde-launcher;

     

       72
       72
       +
           license = licenses.gpl3;

     

       73
       73
       +
           platforms = platforms.linux;

     

       74
       74
       +
           maintainers = with maintainers; [ romildo ];

     

       75
       75
       +
         };

     

       76
       76
       +
       }

+49

pkgs/desktops/deepin/deepin-calculator/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore,

     

       2
       2
       +
         dtkwidget, deepin }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

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

     

       6
       6
       +
         pname = "deepin-calculator";

     

       7
       7
       +
         version = "1.0.11";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "linuxdeepin";

     

       11
       11
       +
           repo = pname;

     

       12
       12
       +
           rev = version;

     

       13
       13
       +
           sha256 = "10bfq0h8v0a8i46gcbsy79l194g8sc0ysg289ndrra209fhwlidq";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         nativeBuildInputs = [

     

       17
       17
       +
           qmake

     

       18
       18
       +
           pkgconfig

     

       19
       19
       +
           qttools

     

       20
       20
       +
           deepin.setupHook

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         buildInputs = [

     

       24
       24
       +
           dtkcore

     

       25
       25
       +
           dtkwidget

     

       26
       26
       +
           qtsvg

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         postPatch = ''

     

       30
       30
       +
           searchHardCodedPaths  # debugging

     

       31
       31
       +
           patchShebangs translate_generation.sh

     

       32
       32
       +
           fixPath $out /usr deepin-calculator.pro

     

       33
       33
       +
           substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator"

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         postFixup = ''

     

       37
       37
       +
           searchHardCodedPaths $out  # debugging

     

       38
       38
       +
         '';

     

       39
       39
       +
         

     

       40
       40
       +
         passthru.updateScript = deepin.updateScript { inherit name; };

     

       41
       41
       +
       

     

       42
       42
       +
         meta = with stdenv.lib; {

     

       43
       43
       +
           description = "Easy to use calculator for Deepin Desktop Environment";

     

       44
       44
       +
           homepage = https://github.com/linuxdeepin/deepin-calculator;

     

       45
       45
       +
           license = licenses.gpl3;

     

       46
       46
       +
           platforms = platforms.linux;

     

       47
       47
       +
           maintainers = with maintainers; [ romildo ];

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+3

pkgs/desktops/deepin/default.nix

···

       9
       9
        
           dbus-factory = callPackage ./dbus-factory { };

     

       10
       10
        
           dde-api = callPackage ./dde-api { };

     

       11
       11
        
           dde-calendar = callPackage ./dde-calendar { };

     

       12
       12
       +
           dde-control-center = callPackage ./dde-control-center { };

     

       12
       13
        
           dde-daemon = callPackage ./dde-daemon { };

     

       13
       14
        
           dde-dock = callPackage ./dde-dock { };

     

       14
       15
        
           dde-file-manager = callPackage ./dde-file-manager { };

     

       16
       16
       +
           dde-launcher = callPackage ./dde-launcher { };

     

       15
       17
        
           dde-network-utils = callPackage ./dde-network-utils { };

     

       16
       18
        
           dde-polkit-agent = callPackage ./dde-polkit-agent { };

     

       17
       19
        
           dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };

     

       18
       20
        
           dde-session-ui = callPackage ./dde-session-ui { };

     

       19
       21
        
           deepin-anything = callPackage ./deepin-anything { };

     

       22
       22
       +
           deepin-calculator = callPackage ./deepin-calculator { };

     

       20
       23
        
           deepin-desktop-base = callPackage ./deepin-desktop-base { };

     

       21
       24
        
           deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };

     

       22
       25
        
           deepin-gettext-tools = callPackage ./deepin-gettext-tools { };

+4 -1

pkgs/desktops/deepin/dtkcore/default.nix

···

       30
       30
        
           sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"

     

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
       -
         qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ];

     

       33
       33
       +
         qmakeFlags = [

     

       34
       34
       +
           "DTK_VERSION=${version}"

     

       35
       35
       +
           "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs"

     

       36
       36
       +
         ];

     

       34
       37
        
       

     

       35
       38
        
         postFixup = ''

     

       36
       39
        
           chmod +x $out/lib/dtk2/*.py

+2 -2

pkgs/desktops/gnome-3/extensions/appindicator/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "gnome-shell-extension-appindicator-${version}";

     

       5
       5
       -
         version = "28";

     

       5
       5
       +
         version = "29";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Ubuntu";

     

       9
       9
        
           repo = "gnome-shell-extension-appindicator";

     

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

     

       11
       11
       -
           sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl";

     

       11
       11
       +
           sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # This package has a Makefile, but it's used for building a zip for

+5 -4

pkgs/desktops/xfce4-13/exo/default.nix

···

       1
       1
       -
       { mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3

     

       1
       1
       +
       { mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3

     

       2
       2
        
       , libxfce4ui, libxfce4util }:

     

       3
       3
        
       

     

       4
       4
        
       mkXfceDerivation rec {

     

       5
       5
        
         category = "xfce";

     

       6
       6
        
         pname = "exo";

     

       7
       7
       -
         version = "0.12.2";

     

       7
       7
       +
         version = "4.14pre1";

     

       8
       8
       +
         rev = "xfce-4.14pre1";

     

       8
       9
        
       

     

       9
       9
       -
         sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh";

     

       10
       10
       +
         sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw";

     

       10
       11
        
       

     

       11
       12
        
         nativeBuildInputs = [ libxslt perlPackages.URI ];

     

       12
       12
       -
         buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];

     

       13
       13
       +
         buildInputs = [ gtk3 libxfce4ui libxfce4util ];

     

       13
       14
        
       

     

       14
       15
        
         postPatch = ''

     

       15
       16
        
           substituteInPlace docs/reference/Makefile.am \

-37

pkgs/desktops/xfce4-13/garcon/12700.patch

···

       1
       1
       -
       From: Yegor Timoshenko <yegortimoshenko@gmail.com>

     

       2
       2
       -
       Date: Thu, 14 Dec 2017 21:13:02 +0000

     

       3
       3
       -
       Subject: [PATCH] Decrement allocation counter on item unref (#12700)

     

       4
       4
       -
       

     

       5
       5
       -
       diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c

     

       6
       6
       -
       index 2017180..355e520 100644

     

       7
       7
       -
       --- a/garcon/garcon-menu-item-pool.c

     

       8
       8
       -
       +++ b/garcon/garcon-menu-item-pool.c

     

       9
       9
       -
       @@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar    *desktop_id,

     

       10
       10
       -
          g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);

     

       11
       11
       -
          g_return_val_if_fail (node != NULL, FALSE);

     

       12
       12
       -
       

     

       13
       13
       -
       -  return garcon_menu_node_tree_rule_matches (node, item);

     

       14
       14
       -
       +  gboolean matches = garcon_menu_node_tree_rule_matches (node, item);

     

       15
       15
       -
       +

     

       16
       16
       -
       +  if (matches)

     

       17
       17
       -
       +    garcon_menu_item_increment_allocated (item);

     

       18
       18
       -
       +

     

       19
       19
       -
       +  return matches;

     

       20
       20
       -
        }

     

       21
       21
       -
       

     

       22
       22
       -
       

     

       23
       23
       -
       diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c

     

       24
       24
       -
       index ca8cb63..b44acfe 100644

     

       25
       25
       -
       --- a/garcon/garcon-menu-item.c

     

       26
       26
       -
       +++ b/garcon/garcon-menu-item.c

     

       27
       27
       -
       @@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item)

     

       28
       28
       -
        {

     

       29
       29
       -
          g_return_if_fail (GARCON_IS_MENU_ITEM (item));

     

       30
       30
       -
       

     

       31
       31
       -
       +  garcon_menu_item_decrement_allocated (item);

     

       32
       32
       -
       +

     

       33
       33
       -
          /* Decrement the reference counter */

     

       34
       34
       -
          g_object_unref (G_OBJECT (item));

     

       35
       35
       -
        }

     

       36
       36
       -
       --

     

       37
       37
       -
       2.15.1

-75

pkgs/desktops/xfce4-13/garcon/13785.patch

···

       1
       1
       -
       From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Stefan Berzl <stefanberzl@gmail.com>

     

       3
       3
       -
       Date: Mon, 21 Aug 2017 18:39:07 +0300

     

       4
       4
       -
       Subject: [PATCH] fix: some menu icons are too big (Bug #13785)

     

       5
       5
       -
       

     

       6
       6
       -
       Some packages only provide icons in sizes much bigger than the standard

     

       7
       7
       -
       GTK menu size of 16px.

     

       8
       8
       -
       

     

       9
       9
       -
       The clipboard manager qlipper for example provides the following icon:

     

       10
       10
       -
       /usr/share/icons/hicolor/128x128/apps/qlipper.png

     

       11
       11
       -
       

     

       12
       12
       -
       In GTK 3.22.18 the function gtk_image_new_from_icon_name when given

     

       13
       13
       -
       GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128.

     

       14
       14
       -
       

     

       15
       15
       -
       The patch I have supplied uses existing code to scale such an image.

     

       16
       16
       -
       

     

       17
       17
       -
       Signed-off-by: Eric Koegel <eric.koegel@gmail.com>

     

       18
       18
       -
       ---

     

       19
       19
       -
        garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++--------------

     

       20
       20
       -
        1 file changed, 19 insertions(+), 14 deletions(-)

     

       21
       21
       -
       

     

       22
       22
       -
       diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c

     

       23
       23
       -
       index 41990f2..f31a1ed 100644

     

       24
       24
       -
       --- a/garcon-gtk/garcon-gtk-menu.c

     

       25
       25
       -
       +++ b/garcon-gtk/garcon-gtk-menu.c

     

       26
       26
       -
       @@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)

     

       27
       27
       -
          gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);

     

       28
       28
       -
          size = MIN (w, h);

     

       29
       29
       -
        

     

       30
       30
       -
       -  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))

     

       31
       31
       -
       +  if (gtk_icon_theme_has_icon (icon_theme, icon_name))

     

       32
       32
       -
       +    {

     

       33
       33
       -
       +	  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);;

     

       34
       34
       -
       +    }

     

       35
       35
       -
       +  else

     

       36
       36
       -
            {

     

       37
       37
       -
              if (g_path_is_absolute (icon_name))

     

       38
       38
       -
                {

     

       39
       39
       -
       @@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)

     

       40
       40
       -
                      g_free (name);

     

       41
       41
       -
                    }

     

       42
       42
       -
                }

     

       43
       43
       -
       +    }

     

       44
       44
       -
        

     

       45
       45
       -
       -      /* Turn the pixbuf into a gtk_image */

     

       46
       46
       -
       -      if (G_LIKELY (pixbuf))

     

       47
       47
       -
       -        {

     

       48
       48
       -
       -          /* scale the pixbuf down if it needs it */

     

       49
       49
       -
       -          GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);

     

       50
       50
       -
       -          g_object_unref (pixbuf);

     

       51
       51
       -
       -          pixbuf = tmp;

     

       52
       52
       -
       +  /* Turn the pixbuf into a gtk_image */

     

       53
       53
       -
       +  if (G_LIKELY (pixbuf))

     

       54
       54
       -
       +    {

     

       55
       55
       -
       +      /* scale the pixbuf down if it needs it */

     

       56
       56
       -
       +      GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);

     

       57
       57
       -
       +      g_object_unref (G_OBJECT (pixbuf));

     

       58
       58
       -
        

     

       59
       59
       -
       -          image = gtk_image_new_from_pixbuf (pixbuf);

     

       60
       60
       -
       -          g_object_unref (G_OBJECT (pixbuf));

     

       61
       61
       -
       -        }

     

       62
       62
       -
       +      image = gtk_image_new_from_pixbuf (pixbuf_scaled);

     

       63
       63
       -
       +      g_object_unref (G_OBJECT (pixbuf_scaled));

     

       64
       64
       -
       +    }

     

       65
       65
       -
       +  else

     

       66
       66
       -
       +    {

     

       67
       67
       -
       +	  /* display the placeholder at least */

     

       68
       68
       -
       +	  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);

     

       69
       69
       -
            }

     

       70
       70
       -
       -

     

       71
       71
       -
       -  if (image == NULL)

     

       72
       72
       -
       -    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);

     

       73
       73
       -
        

     

       74
       74
       -
          return image;

     

       75
       75
       -
        }

+5 -5

pkgs/desktops/xfce4-13/garcon/default.nix

···

       1
       1
       -
       { mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }:

     

       1
       1
       +
       { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }:

     

       2
       2
        
       

     

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "garcon";

     

       6
       6
       -
         version = "0.6.1";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8";

     

       9
       9
       +
         sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj";

     

       9
       10
        
       

     

       10
       10
       -
         patches = [ ./12700.patch ./13785.patch ];

     

       11
       11
       -
         buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];

     

       11
       11
       +
         buildInputs = [ gtk3 libxfce4ui libxfce4util ];

     

       12
       12
        
       }

+5 -4

pkgs/desktops/xfce4-13/gigolo/default.nix

···

       1
       1
       -
       { mkXfceDerivation, gtk2, libX11 }:

     

       1
       1
       +
       { mkXfceDerivation, exo, gtk3 }:

     

       2
       2
        
       

     

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "apps";

     

       5
       5
        
         pname = "gigolo";

     

       6
       6
       -
         version = "0.4.2";

     

       6
       6
       +
         version = "0.4.91";

     

       7
       7
        
       

     

       8
       8
       -
         sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1";

     

       8
       8
       +
         sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7";

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [ gtk2 libX11 ];

     

       10
       10
       +
         nativeBuildInputs = [ exo ];

     

       11
       11
       +
         buildInputs = [ gtk3 ];

     

       11
       12
        
       }

+3 -2

pkgs/desktops/xfce4-13/libxfce4ui/default.nix

···

       4
       4
        
       mkXfceDerivation rec {

     

       5
       5
        
         category = "xfce";

     

       6
       6
        
         pname = "libxfce4ui";

     

       7
       7
       -
         version = "4.13.4";

     

       7
       7
       +
         version = "4.14pre1";

     

       8
       8
       +
         rev = "xfce-4.14pre1";

     

       8
       9
        
       

     

       9
       9
       -
         sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";

     

       10
       10
       +
         sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y";

     

       10
       11
        
       

     

       11
       12
        
         buildInputs =  [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];

     

       12
       13
        
         propagatedBuildInputs = [ libxfce4util libICE libSM ];

+3 -2

pkgs/desktops/xfce4-13/libxfce4util/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "libxfce4util";

     

       6
       6
       -
         version = "4.13.2";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98";

     

       9
       9
       +
         sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf";

     

       9
       10
        
       

     

       10
       11
        
         buildInputs = [ gobject-introspection ];

     

       11
       12

+2 -2

pkgs/desktops/xfce4-13/parole/default.nix

···

       8
       8
        
       mkXfceDerivation rec {

     

       9
       9
        
         category = "apps";

     

       10
       10
        
         pname = "parole";

     

       11
       11
       -
         version = "1.0.1";

     

       11
       11
       +
         version = "1.0.2";

     

       12
       12
        
       

     

       13
       13
       -
         sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb";

     

       13
       13
       +
         sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl";

     

       14
       14
        
       

     

       15
       15
        
         postPatch = ''

     

       16
       16
        
           substituteInPlace src/plugins/mpris2/Makefile.am \

+2 -2

pkgs/desktops/xfce4-13/ristretto/default.nix

···

       4
       4
        
       mkXfceDerivation rec {

     

       5
       5
        
         category = "apps";

     

       6
       6
        
         pname = "ristretto";

     

       7
       7
       -
         version = "0.8.3";

     

       7
       7
       +
         version = "0.8.4";

     

       8
       8
        
       

     

       9
       9
        
         postPatch = ''

     

       10
       10
        
           automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS

     
···

       14
       14
        
         nativeBuildInputs = [ automakeAddFlags exo ];

     

       15
       15
        
         buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ];

     

       16
       16
        
       

     

       17
       17
       -
         sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx";

     

       17
       17
       +
         sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf";

     

       18
       18
        
       }

+3 -2

pkgs/desktops/xfce4-13/thunar-volman/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "thunar-volman";

     

       6
       6
       -
         version = "0.9.0";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       9
        
         buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];

     

       9
       10
        
       

     

       10
       10
       -
         sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7";

     

       11
       11
       +
         sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv";

     

       11
       12
        
       }

+3 -2

pkgs/desktops/xfce4-13/thunar/default.nix

···

       4
       4
        
       mkXfceDerivation rec {

     

       5
       5
        
         category = "xfce";

     

       6
       6
        
         pname = "thunar";

     

       7
       7
       -
         version = "1.8.1";

     

       7
       7
       +
         version = "4.14pre1";

     

       8
       8
       +
         rev = "xfce-4.14pre1";

     

       8
       9
        
       

     

       9
       9
       -
         sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha";

     

       10
       10
       +
         sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n";

     

       10
       11
        
       

     

       11
       12
        
         postPatch = ''

     

       12
       13
        
           substituteInPlace docs/Makefile.am \

+3 -2

pkgs/desktops/xfce4-13/tumbler/default.nix

···

       6
       6
        
       mkXfceDerivation rec {

     

       7
       7
        
         category = "xfce";

     

       8
       8
        
         pname = "tumbler";

     

       9
       9
       -
         version = "0.2.3";

     

       9
       9
       +
         version = "4.14pre1";

     

       10
       10
       +
         rev = "xfce-4.14pre1";

     

       10
       11
        
       

     

       11
       11
       -
         sha256 = "1gb4dav6q9bn64c2ayi4896cr79lb8k63ja2sm3lwsjxgg1r4hw9";

     

       12
       12
       +
         sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z";

     

       12
       13
        
       

     

       13
       14
        
         buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];

     

       14
       15
        
       }

+3 -2

pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "xfce4-appfinder";

     

       6
       6
       -
         version = "4.13.0";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy";

     

       9
       9
       +
         sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg";

     

       9
       10
        
       

     

       10
       11
        
         nativeBuildInputs = [ exo ];

     

       11
       12
        
         buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];

+2 -2

pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "panel-plugins";

     

       5
       5
        
         pname = "xfce4-battery-plugin";

     

       6
       6
       -
         version = "1.1.0";

     

       6
       6
       +
         version = "1.1.2";

     

       7
       7
        
         rev = version;

     

       8
       8
       -
         sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn";

     

       8
       8
       +
         sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";

     

       9
       9
        
       

     

       10
       10
        
         buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];

     

       11
       11
        
       }

+2 -2

pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "panel-plugins";

     

       5
       5
        
         pname = "xfce4-clipman-plugin";

     

       6
       6
       -
         version = "1.4.2";

     

       6
       6
       +
         version = "1.4.3";

     

       7
       7
        
         rev = version;

     

       8
       8
       -
         sha256 = "1c2h1cs7pycf1rhpirmvb0l0dfvlacb7xgm31q9rxmhihnycd2na";

     

       8
       8
       +
         sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";

     

       9
       9
        
       

     

       10
       10
        
         buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];

     

       11
       11
        
       }

+2 -2

pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "panel-plugins";

     

       5
       5
        
         pname = "xfce4-cpufreq-plugin";

     

       6
       6
       -
         version = "1.2.0";

     

       7
       7
       -
         sha256 = "0zhs7b7py1njczmpnib4532fwpnd3vnpqfhss2r136cfgy72kp6g";

     

       6
       6
       +
         version = "1.2.1";

     

       7
       7
       +
         sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";

     

       8
       8
        
       

     

       9
       9
        
         buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];

     

       10
       10
        
       }

+2 -2

pkgs/desktops/xfce4-13/xfce4-dict/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "apps";

     

       5
       5
        
         pname = "xfce4-dict";

     

       6
       6
       -
         version = "0.8.1";

     

       6
       6
       +
         version = "0.8.2";

     

       7
       7
        
       

     

       8
       8
       -
         sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf";

     

       8
       8
       +
         sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7";

     

       9
       9
        
       

     

       10
       10
        
         patches = [ ./configure-gio.patch ];

     

       11
       11

+2 -2

pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix

···

       4
       4
        
       mkXfceDerivation rec {

     

       5
       5
        
         category = "apps";

     

       6
       6
        
         pname = "xfce4-notifyd";

     

       7
       7
       -
         version = "0.4.2";

     

       7
       7
       +
         version = "0.4.4";

     

       8
       8
        
       

     

       9
       9
       -
         sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9";

     

       9
       9
       +
         sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];

     

       12
       12
        
       }

+3 -2

pkgs/desktops/xfce4-13/xfce4-panel/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "xfce4-panel";

     

       6
       6
       -
         version = "4.13.4";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";

     

       9
       9
       +
         sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al";

     

       9
       10
        
       

     

       10
       11
        
         nativeBuildInputs = [ makeWrapper ];

     

       11
       12
        
         buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];

+3 -2

pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix

···

       4
       4
        
       mkXfceDerivation rec {

     

       5
       5
        
         category = "xfce";

     

       6
       6
        
         pname = "xfce4-power-manager";

     

       7
       7
       -
         version = "1.6.1";

     

       7
       7
       +
         version = "4.14pre1";

     

       8
       8
       +
         rev = "xfce-4.14pre1";

     

       8
       9
        
       

     

       9
       9
       -
         sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3";

     

       10
       10
       +
         sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077";

     

       10
       11
        
       

     

       11
       12
        
         nativeBuildInputs = [ automakeAddFlags exo ];

     

       12
       13
        
         buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];

+2 -2

pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "apps";

     

       5
       5
        
         pname = "xfce4-screenshooter";

     

       6
       6
       -
         version = "1.9.2";

     

       6
       6
       +
         version = "1.9.5";

     

       7
       7
        
       

     

       8
       8
       -
         sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2";

     

       8
       8
       +
         sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";

     

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"

     

       11
       11
        
         buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];

+3 -2

pkgs/desktops/xfce4-13/xfce4-session/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "xfce4-session";

     

       6
       6
       -
         version = "4.13.0";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "0d6h1kgqq6g084jrxx4jxw98h5g0vwsxqrvk0bmapyxh2sbrg07y";

     

       9
       9
       +
         sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk";

     

       9
       10
        
       

     

       10
       11
        
         buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];

     

       11
       12

+3 -2

pkgs/desktops/xfce4-13/xfce4-settings/default.nix

···

       5
       5
        
       mkXfceDerivation rec {

     

       6
       6
        
         category = "xfce";

     

       7
       7
        
         pname = "xfce4-settings";

     

       8
       8
       -
         version = "4.13.4";

     

       8
       8
       +
         version = "4.14pre1";

     

       9
       9
       +
         rev = "xfce-4.14pre1";

     

       9
       10
        
       

     

       10
       10
       -
         sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy";

     

       11
       11
       +
         sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc";

     

       11
       12
        
       

     

       12
       13
        
         postPatch = ''

     

       13
       14
        
           automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS

+5 -11

pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix

···

       1
       1
       -
       { lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         inherit (lib) enableFeature;

     

       5
       5
       -
       in

     

       1
       1
       +
       { lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:

     

       6
       2
        
       

     

       7
       7
       -
       mkXfceDerivation rec {

     

       3
       3
       +
       mkXfceDerivation {

     

       8
       4
        
         category = "apps";

     

       9
       5
        
         pname = "xfce4-taskmanager";

     

       10
       10
       -
         version = "1.2.1";

     

       6
       6
       +
         version = "1.2.2";

     

       11
       7
        
       

     

       12
       12
       -
         sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w";

     

       8
       8
       +
         sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc";

     

       13
       9
        
       

     

       14
       10
        
         nativeBuildInputs = [ exo ];

     

       15
       15
       -
         buildInputs = [ gtk2 gtk3 libwnck3 libXmu ];

     

       16
       16
       -
       

     

       17
       17
       -
         configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];

     

       11
       11
       +
         buildInputs = [ gtk3 libwnck3 libXmu ];

     

       18
       12
        
       }

+2 -2

pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "panel-plugins";

     

       5
       5
        
         pname = "xfce4-whiskermenu-plugin";

     

       6
       6
       -
         version = "2.2.0";

     

       6
       6
       +
         version = "2.3.2";

     

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

     

       8
       8
       -
         sha256 = "1d35xxkdzw8pl3d5ps226mmrrjk0hqczsbvl5smh7l7jbwfambjm";

     

       8
       8
       +
         sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs";

     

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ cmake ];

     

       11
       11

+3 -2

pkgs/desktops/xfce4-13/xfconf/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "xfconf";

     

       6
       6
       -
         version = "4.13.5";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a";

     

       9
       9
       +
         sha256 = "0n9cjiz3mj011p3w4jv0n2ifz38whmykdl888mczc26l1gflxnr3";

     

       9
       10
        
       

     

       10
       11
        
         buildInputs = [ libxfce4util ];

     

       11
       12
        
       }

+3 -2

pkgs/desktops/xfce4-13/xfdesktop/default.nix

···

       3
       3
        
       mkXfceDerivation rec {

     

       4
       4
        
         category = "xfce";

     

       5
       5
        
         pname = "xfdesktop";

     

       6
       6
       -
         version = "4.13.2";

     

       6
       6
       +
         version = "4.14pre1";

     

       7
       7
       +
         rev = "xfce-4.14pre1";

     

       7
       8
        
       

     

       8
       8
       -
         sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl";

     

       9
       9
       +
         sha256 = "1mni8gzgglhwicaw093i2vpk8q2vilmgg5qbr3izbb8ighhr09jl";

     

       9
       10
        
       

     

       10
       11
        
         buildInputs = [

     

       11
       12
        
           exo

+8 -7

pkgs/desktops/xfce4-13/xfwm4/default.nix

···

       1
       1
       -
       { mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage

     

       2
       2
       -
       , libstartup_notification, libxfce4ui, libxfce4util, libwnck

     

       1
       1
       +
       { mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage

     

       2
       2
       +
       , libstartup_notification, libxfce4ui, libxfce4util, libwnck3

     

       3
       3
        
       , libXpresent, xfconf }:

     

       4
       4
        
       

     

       5
       5
        
       mkXfceDerivation rec {

     

       6
       6
        
         category = "xfce";

     

       7
       7
        
         pname = "xfwm4";

     

       8
       8
       -
         version = "4.13.0";

     

       8
       8
       +
         version = "4.14pre1";

     

       9
       9
       +
         rev = "xfce-4.14pre1";

     

       9
       10
        
       

     

       10
       10
       -
         sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9";

     

       11
       11
       +
         sha256 = "0kdlkpb7phcrsqhyhnw82f03fzmd5xb4w9fdj94frfprfja0b468";

     

       11
       12
        
       

     

       12
       12
       -
         nativeBuildInputs = [ exo ];

     

       13
       13
       +
         nativeBuildInputs = [ exo librsvg ];

     

       13
       14
        
       

     

       14
       15
        
         buildInputs = [

     

       15
       16
        
           dbus-glib

     

       16
       17
        
           epoxy

     

       17
       17
       -
           gtk2

     

       18
       18
       +
           gtk3

     

       18
       19
        
           libXdamage

     

       19
       20
        
           libstartup_notification

     

       20
       21
        
           libxfce4ui

     

       21
       22
        
           libxfce4util

     

       22
       22
       -
           libwnck

     

       23
       23
       +
           libwnck3

     

       23
       24
        
           libXpresent

     

       24
       25
        
           xfconf

     

       25
       26
        
         ];

+2 -2

pkgs/development/compilers/chicken/5/chicken.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "5.0.0";

     

       4
       4
       +
         version = "5.1.0";

     

       5
       5
        
         platform = with stdenv;

     

       6
       6
        
           if isDarwin then "macosx"

     

       7
       7
        
           else if isCygwin then "cygwin"

     
···

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";

     

       20
       20
       -
           sha256 = "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8";

     

       20
       20
       +
           sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;

+2 -2

pkgs/development/compilers/kotlin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, jre, unzip }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "1.3.31";

     

       4
       4
       +
         version = "1.3.40";

     

       5
       5
        
       in stdenv.mkDerivation rec {

     

       6
       6
        
         inherit version;

     

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

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";

     

       11
       11
       -
           sha256 = "0sldhjxh2ghzwkabgziyiq4609iws0vninr8zxclzbqmcgajawqh";

     

       11
       11
       +
           sha256 = "14n3x0771d0a1yqncig97lk4bigkx2nvx20khpcnvf873c2b3h28";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ jre ] ;

+3 -1

pkgs/development/compilers/llvm/7/llvm.nix

···

       15
       15
        
       , debugVersion ? false

     

       16
       16
        
       , enableManpages ? false

     

       17
       17
        
       , enableSharedLibraries ? true

     

       18
       18
       -
       , enablePFM ? !stdenv.isDarwin

     

       18
       18
       +
       , enablePFM ? !(stdenv.isDarwin

     

       19
       19
       +
         || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245

     

       20
       20
       +
         )

     

       19
       21
        
       , enablePolly ? false

     

       20
       22
        
       }:

     

       21
       23

+3 -1

pkgs/development/compilers/llvm/8/llvm.nix

···

       14
       14
        
       , debugVersion ? false

     

       15
       15
        
       , enableManpages ? false

     

       16
       16
        
       , enableSharedLibraries ? true

     

       17
       17
       -
       , enablePFM ? !stdenv.isDarwin

     

       17
       17
       +
       , enablePFM ? !(stdenv.isDarwin

     

       18
       18
       +
         || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245

     

       19
       19
       +
       )

     

       18
       20
        
       , enablePolly ? false

     

       19
       21
        
       }:

     

       20
       22

+47 -23

pkgs/development/compilers/nim/default.nix

···

       1
       1
        
       # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml

     

       2
       2
        
       

     

       3
       3
       -
       { stdenv, lib, fetchurl, makeWrapper, nodejs-slim-10_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:

     

       3
       3
       +
       { stdenv, lib, fetchurl, makeWrapper, nodejs-slim-11_x, openssl, pcre, readline,

     

       4
       4
       +
         boehmgc, sfml, tzdata, coreutils, sqlite }:

     

       4
       5
        
       

     

       5
       6
        
       stdenv.mkDerivation rec {

     

       6
       7
        
         name = "nim-${version}";

     

       7
       7
       -
         version = "0.19.4";

     

       8
       8
       +
         version = "0.20.0";

     

       8
       9
        
       

     

       9
       10
        
         src = fetchurl {

     

       10
       11
        
           url = "https://nim-lang.org/download/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl";

     

       12
       12
       +
           sha256 = "144sd7icg2p6qsrr29jdnl11hr34daxq4h16ywwrayz866w7kx2i";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       15
        
         doCheck = !stdenv.isDarwin;

     
···

       20
       21
        
           "-lpcre"

     

       21
       22
        
           "-lreadline"

     

       22
       23
        
           "-lgc"

     

       24
       24
       +
           "-lsqlite3"

     

       23
       25
        
         ];

     

       24
       26
        
       

     

       25
       27
        
         # 1. nodejs is only needed for tests

     
···

       27
       29
        
         #    used for bootstrapping, but koch insists on moving the nim compiler around

     

       28
       30
        
         #    as part of building it, so it cannot be read-only

     

       29
       31
        
       

     

       32
       32
       +
         checkInputs = [

     

       33
       33
       +
           nodejs-slim-11_x tzdata coreutils

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       30
       36
        
         nativeBuildInputs = [

     

       31
       31
       -
           makeWrapper nodejs-slim-10_x tzdata coreutils

     

       37
       37
       +
           makeWrapper

     

       32
       38
        
         ];

     

       33
       39
        
       

     

       34
       40
        
         buildInputs = [

     

       35
       35
       -
           openssl pcre readline boehmgc sfml

     

       41
       41
       +
           openssl pcre readline boehmgc sfml sqlite

     

       36
       42
        
         ];

     

       37
       43
        
       

     

       38
       38
       -
         phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ];

     

       44
       44
       +
         buildPhase = ''

     

       45
       45
       +
           runHook preBuild

     

       39
       46
        
       

     

       40
       40
       -
         buildPhase = ''

     

       41
       41
       -
           # use $CC to trigger the linker since calling ld in build.sh causes an error

     

       42
       42
       -
           LD=$CC

     

       43
       47
        
           # build.sh wants to write to $HOME/.cache

     

       44
       48
        
           HOME=$TMPDIR

     

       45
       49
        
           sh build.sh

     
···

       48
       52
        
                        -d:useGnuReadline \

     

       49
       53
        
                        ${lib.optionals (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"}

     

       50
       54
        
           ./koch tools -d:release

     

       51
       51
       -
         '';

     

       52
       55
        
       

     

       53
       53
       -
         installPhase = ''

     

       54
       54
       -
           install -Dt $out/bin bin/* koch

     

       55
       55
       -
           ./koch install $out

     

       56
       56
       -
           mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin

     

       57
       57
       -
           mv $out/nim/*     $out/     && rmdir $out/nim

     

       58
       58
       -
           wrapProgram $out/bin/nim \

     

       59
       59
       -
             --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}

     

       56
       56
       +
           runHook postBuild

     

       60
       57
        
         '';

     

       61
       58
        
       

     

       62
       62
       -
         patchPhase =

     

       59
       59
       +
         prePatch =

     

       63
       60
        
           let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';

     

       64
       61
        
               disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';

     

       62
       62
       +
               disableCompile = ''sed -i -e 's/^/#/' '';

     

       65
       63
        
           in ''

     

       66
       66
       -
             substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"

     

       67
       64
        
             substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"

     

       68
       65
        
             substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"

     

       69
       66
        
       

     

       70
       70
       -
             # disable tests requiring network access (not available in the build container)

     

       67
       67
       +
             # reported upstream: https://github.com/nim-lang/Nim/issues/11435

     

       68
       68
       +
             ${disableTest} ./tests/misc/tstrace.nim

     

       69
       69
       +
       

     

       70
       70
       +
             # runs out of memory on a machine with 8GB RAM

     

       71
       71
       +
             ${disableTest} ./tests/system/t7894.nim

     

       72
       72
       +
       

     

       73
       73
       +
             # requires network access (not available in the build container)

     

       71
       74
        
             ${disableTest} ./tests/stdlib/thttpclient.nim

     

       72
       75
        
           '' + lib.optionalString stdenv.isAarch64 ''

     

       73
       73
       -
             # disable test supposedly broken on aarch64

     

       76
       76
       +
             # supposedly broken on aarch64

     

       74
       77
        
             ${disableStdLibTest} ./lib/pure/stats.nim

     

       78
       78
       +
       

     

       79
       79
       +
             # reported upstream: https://github.com/nim-lang/Nim/issues/11463

     

       80
       80
       +
             ${disableCompile} ./lib/nimhcr.nim

     

       81
       81
       +
             ${disableTest} ./tests/dll/nimhcr_unit.nim

     

       82
       82
       +
             ${disableTest} ./tests/dll/nimhcr_integration.nim

     

       75
       83
        
           '';

     

       76
       84
        
       

     

       77
       85
        
         checkPhase = ''

     

       78
       78
       -
           PATH=$PATH:$out/bin

     

       79
       79
       -
           ./koch tests

     

       86
       86
       +
           runHook preCheck

     

       87
       87
       +
       

     

       88
       88
       +
           ./koch tests --nim:bin/nim all

     

       89
       89
       +
       

     

       90
       90
       +
           runHook postCheck

     

       91
       91
       +
         '';

     

       92
       92
       +
       

     

       93
       93
       +
         installPhase = ''

     

       94
       94
       +
           runHook preInstall

     

       95
       95
       +
       

     

       96
       96
       +
           install -Dt $out/bin bin/* koch

     

       97
       97
       +
           ./koch install $out

     

       98
       98
       +
           mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin

     

       99
       99
       +
           mv $out/nim/*     $out/     && rmdir $out/nim

     

       100
       100
       +
           wrapProgram $out/bin/nim \

     

       101
       101
       +
             --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}

     

       102
       102
       +
       

     

       103
       103
       +
           runHook postInstall

     

       80
       104
        
         '';

     

       81
       105
        
       

     

       82
       106
        
         meta = with stdenv.lib; {

+2

pkgs/development/compilers/openjdk/11.nix

···

       4
       4
        
       , libjpeg, giflib

     

       5
       5
        
       , setJavaClassPath

     

       6
       6
        
       , minimal ? false

     

       7
       7
       +
       , enableJavaFX ? true, openjfx

     

       7
       8
        
       , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf

     

       8
       9
        
       }:

     

       9
       10
        
       

     
···

       68
       69
        
           ''

     

       69
       70
        
           + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""

     

       70
       71
        
           + lib.optionalString minimal " \"--enable-headless-only\""

     

       72
       72
       +
           + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""

     

       71
       73
        
           + ");"

     

       72
       74
        
           # https://bugzilla.redhat.com/show_bug.cgi?id=1306558

     

       73
       75
        
           # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716

+110

pkgs/development/compilers/openjdk/openjfx/11.nix

···

       1
       1
       +
       { stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf

     

       2
       2
       +
       , gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:

     

       3
       3
       +
       

     

       4
       4
       +
       let

     

       5
       5
       +
         major = "11";

     

       6
       6
       +
         update = ".0.3";

     

       7
       7
       +
         build = "1";

     

       8
       8
       +
         repover = "${major}${update}+${build}";

     

       9
       9
       +
         gradle_ = (gradleGen.override {

     

       10
       10
       +
           jdk = bootjdk;

     

       11
       11
       +
         }).gradle_4_10;

     

       12
       12
       +
       

     

       13
       13
       +
         makePackage = args: stdenv.mkDerivation ({

     

       14
       14
       +
           version = "${major}${update}-${repover}";

     

       15
       15
       +
       

     

       16
       16
       +
           src = fetchurl {

     

       17
       17
       +
             url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";

     

       18
       18
       +
             sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";

     

       19
       19
       +
           };

     

       20
       20
       +
       

     

       21
       21
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];

     

       22
       22
       +
           nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];

     

       23
       23
       +
       

     

       24
       24
       +
           dontUseCmakeConfigure = true;

     

       25
       25
       +
       

     

       26
       26
       +
           config = writeText "gradle.properties" (''

     

       27
       27
       +
             CONF = Release

     

       28
       28
       +
             JDK_HOME = ${bootjdk}/lib/openjdk

     

       29
       29
       +
           '' + args.gradleProperties or "");

     

       30
       30
       +
       

     

       31
       31
       +
           buildPhase = ''

     

       32
       32
       +
             runHook preBuild

     

       33
       33
       +
       

     

       34
       34
       +
             export GRADLE_USER_HOME=$(mktemp -d)

     

       35
       35
       +
             ln -s $config gradle.properties

     

       36
       36
       +
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       37
       37
       +
             gradle --no-daemon $gradleFlags sdk

     

       38
       38
       +
       

     

       39
       39
       +
             runHook postBuild

     

       40
       40
       +
           '';

     

       41
       41
       +
         } // args);

     

       42
       42
       +
       

     

       43
       43
       +
         # Fake build to pre-download deps into fixed-output derivation.

     

       44
       44
       +
         # We run nearly full build because I see no other way to download everything that's needed.

     

       45
       45
       +
         # Anyone who knows a better way?

     

       46
       46
       +
         deps = makePackage {

     

       47
       47
       +
           pname = "openjfx-deps";

     

       48
       48
       +
       

     

       49
       49
       +
           # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)

     

       50
       50
       +
           installPhase = ''

     

       51
       51
       +
             find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \

     

       52
       52
       +
               | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \

     

       53
       53
       +
               | sh

     

       54
       54
       +
             rm -rf $out/tmp

     

       55
       55
       +
           '';

     

       56
       56
       +
       

     

       57
       57
       +
           outputHashAlgo = "sha256";

     

       58
       58
       +
           outputHashMode = "recursive";

     

       59
       59
       +
           outputHash =

     

       60
       60
       +
             # Downloaded AWT jars differ by platform.

     

       61
       61
       +
             if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"

     

       62
       62
       +
             else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"

     

       63
       63
       +
             else throw "Unsupported platform";

     

       64
       64
       +
         };

     

       65
       65
       +
       

     

       66
       66
       +
       in makePackage {

     

       67
       67
       +
         pname = "openjfx-modular-sdk";

     

       68
       68
       +
       

     

       69
       69
       +
         gradleProperties = ''

     

       70
       70
       +
           COMPILE_MEDIA = true

     

       71
       71
       +
           COMPILE_WEBKIT = true

     

       72
       72
       +
         '';

     

       73
       73
       +
       

     

       74
       74
       +
         preBuild = ''

     

       75
       75
       +
           swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"

     

       76
       76
       +
           substituteInPlace build.gradle \

     

       77
       77
       +
             --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \

     

       78
       78
       +
             --replace 'name: SWT_FILE_NAME' "files('$swtJar')"

     

       79
       79
       +
         '';

     

       80
       80
       +
       

     

       81
       81
       +
         installPhase = ''

     

       82
       82
       +
           cp -r build/modular-sdk $out

     

       83
       83
       +
         '';

     

       84
       84
       +
       

     

       85
       85
       +
         stripDebugList = [ "." ];

     

       86
       86
       +
       

     

       87
       87
       +
         postFixup = ''

     

       88
       88
       +
           # Remove references to bootstrap.

     

       89
       89
       +
           find "$out" -name \*.so | while read lib; do

     

       90
       90
       +
             new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"

     

       91
       91
       +
             patchelf --set-rpath "$new_refs" "$lib"

     

       92
       92
       +
           done

     

       93
       93
       +
       

     

       94
       94
       +
           # Test to make sure that we don't depend on the bootstrap

     

       95
       95
       +
           if grep -q -r '${bootjdk}' "$out"; then

     

       96
       96
       +
             echo "Extraneous references to ${bootjdk} detected" >&2

     

       97
       97
       +
             exit 1

     

       98
       98
       +
           fi

     

       99
       99
       +
         '';

     

       100
       100
       +
       

     

       101
       101
       +
         passthru.deps = deps;

     

       102
       102
       +
       

     

       103
       103
       +
         meta = with stdenv.lib; {

     

       104
       104
       +
           homepage = http://openjdk.java.net/projects/openjfx/;

     

       105
       105
       +
           license = openjdk.meta.license;

     

       106
       106
       +
           description = "The next-generation Java client toolkit.";

     

       107
       107
       +
           maintainers = with maintainers; [ abbradar ];

     

       108
       108
       +
           platforms = openjdk.meta.platforms;

     

       109
       109
       +
         };

     

       110
       110
       +
       }

+22

pkgs/development/compilers/qbe/default.nix

···

       1
       1
       +
       { stdenv, fetchgit }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         pname = "qbe";

     

       5
       5
       +
         version = "unstable-2019-05-15";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchgit {

     

       8
       8
       +
           url = "git://c9x.me/qbe.git";

     

       9
       9
       +
           rev = "acc3af47330fd6610cf0fbdb28e9fbd05160888f";

     

       10
       10
       +
           sha256 = "1c8ynqbakgz3hfdcyhwdmz7i1hnyd9m25f9y47sc21bvxwfrbzpi";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       14
       14
       +
         meta = with stdenv.lib; {

     

       15
       15
       +
           homepage = "https://c9x.me/compile/";

     

       16
       16
       +
           description = "A small compiler backend written in C";

     

       17
       17
       +
           maintainers = with maintainers; [ fgaz ];

     

       18
       18
       +
           license = licenses.mit;

     

       19
       19
       +
           platforms = platforms.all;

     

       20
       20
       +
         };

     

       21
       21
       +
       }

     

       22
       22
       +

+4 -19

pkgs/development/compilers/rust/binaryBuild.nix

···

       31
       31
        
             license = [ licenses.mit licenses.asl20 ];

     

       32
       32
        
           };

     

       33
       33
        
       

     

       34
       34
       -
           buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;

     

       34
       34
       +
           buildInputs = [ bash ]

     

       35
       35
       +
             ++ stdenv.lib.optional stdenv.isDarwin Security;

     

       35
       36
        
       

     

       36
       37
        
           postPatch = ''

     

       37
       38
        
             patchShebangs .

     
···

       53
       54
        
                 "$out/bin/cargo"

     

       54
       55
        
             ''}

     

       55
       56
        
       

     

       56
       56
       -
             ${optionalString (stdenv.isDarwin && bootstrapping) ''

     

       57
       57
       -
               install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc"

     

       58
       58
       -
               install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"

     

       59
       59
       -
               install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"

     

       60
       60
       -
               install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"

     

       61
       61
       -
               install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"

     

       62
       62
       -
               for f in $out/lib/lib*.dylib; do

     

       63
       63
       -
                 install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"

     

       64
       64
       -
               done

     

       65
       65
       -
             ''}

     

       66
       66
       -
       

     

       67
       57
        
             # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc

     

       68
       58
        
             # (or similar) here. It causes strange effects where rustc loads

     

       69
       59
        
             # the wrong libraries in a bootstrap-build causing failures that

     
···

       85
       75
        
             license = [ licenses.mit licenses.asl20 ];

     

       86
       76
        
           };

     

       87
       77
        
       

     

       88
       88
       -
           buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;

     

       78
       78
       +
           buildInputs = [ makeWrapper bash ]

     

       79
       79
       +
             ++ stdenv.lib.optional stdenv.isDarwin Security;

     

       89
       80
        
       

     

       90
       81
        
           postPatch = ''

     

       91
       82
        
             patchShebangs .

     
···

       100
       91
        
               patchelf \

     

       101
       92
        
                 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \

     

       102
       93
        
                 "$out/bin/cargo"

     

       103
       103
       -
             ''}

     

       104
       104
       -
       

     

       105
       105
       -
             ${optionalString (stdenv.isDarwin && bootstrapping) ''

     

       106
       106
       -
               install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"

     

       107
       107
       -
               install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"

     

       108
       108
       -
               install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"

     

       109
       94
        
             ''}

     

       110
       95
        
       

     

       111
       96
        
             wrapProgram "$out/bin/cargo" \

+8 -8

pkgs/development/compilers/rust/bootstrap.nix

···

       3
       3
        
       let

     

       4
       4
        
         # Note: the version MUST be one version prior to the version we're

     

       5
       5
        
         # building

     

       6
       6
       -
         version = "1.33.0";

     

       6
       6
       +
         version = "1.34.2";

     

       7
       7
        
       

     

       8
       8
       -
         # fetch hashes by running `print-hashes.sh 1.33.0`

     

       8
       8
       +
         # fetch hashes by running `print-hashes.sh 1.34.2`

     

       9
       9
        
         hashes = {

     

       10
       10
       -
           i686-unknown-linux-gnu = "c379203687d98e60623aa88c4df4992dd5a9548bc30674b9fc8e671a979e9f3a";

     

       11
       11
       -
           x86_64-unknown-linux-gnu = "6623168b9ee9de79deb0d9274c577d741ea92003768660aca184e04fe774393f";

     

       12
       12
       -
           armv7-unknown-linux-gnueabihf = "f6f0ec0a98d922c4bfd79703bc9e9eef439ba347453f33608a87cd63c47e7245";

     

       13
       13
       -
           aarch64-unknown-linux-gnu = "a308044e4076b62f637313ea803fa0a8f340b0f1b53136856f2c43afcabe5387";

     

       14
       14
       -
           i686-apple-darwin = "ed20809d56bbaea041721ce6fc9f10f7ae7a720c5821587f01a537d07a5454b1";

     

       15
       15
       -
           x86_64-apple-darwin = "864e7c074a0b88e38883c87c169513d072300bb52e1d320a067bd34cf14f66bd";

     

       10
       10
       +
           i686-unknown-linux-gnu = "926bafd09eb90ba7d5a0195fcffb8f33dd57e515af4f8987a143459f6b1d3f04";

     

       11
       11
       +
           x86_64-unknown-linux-gnu = "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f";

     

       12
       12
       +
           armv7-unknown-linux-gnueabihf = "70d1057fcc133dc3e44377060a00d2f9d3a134e2670963d3f1d93f3dbfa0548e";

     

       13
       13
       +
           aarch64-unknown-linux-gnu = "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8";

     

       14
       14
       +
           i686-apple-darwin = "b9fc44cbb06050975664f1033d1337bb38d5ea73b503a5d3af5409033397be5c";

     

       15
       15
       +
           x86_64-apple-darwin = "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         platform =

+23 -24

pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch

···

       1
       1
       -
       diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs

     

       2
       2
       -
       index 86ecb10edf..626be0a52d 100644

     

       3
       3
       -
       --- a/src/libstd/net/tcp.rs

     

       4
       4
       -
       +++ b/src/libstd/net/tcp.rs

     

       5
       5
       -
       @@ -955,6 +955,7 @@ mod tests {

     

       1
       1
       +
       diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/src/libstd/net/tcp.rs

     

       2
       2
       +
       --- rustc-1.35.0-src-orig/src/libstd/net/tcp.rs	2019-05-20 14:10:15.000000000 +0200

     

       3
       3
       +
       +++ rustc-1.35.0-src/src/libstd/net/tcp.rs	2019-06-13 19:59:46.740611889 +0200

     

       4
       4
       +
       @@ -973,6 +973,7 @@

     

       6
       5
        
                }

     

       7
       6
        
            }

     

       8
       7
        
        

     
···

       10
       9
        
            #[test]

     

       11
       10
        
            fn listen_localhost() {

     

       12
       11
        
                let socket_addr = next_test_ip4();

     

       13
       13
       -
       @@ -1013,6 +1014,7 @@ mod tests {

     

       12
       12
       +
       @@ -1031,6 +1032,7 @@

     

       14
       13
        
                })

     

       15
       14
        
            }

     

       16
       15
        
        

     
···

       18
       17
        
            #[test]

     

       19
       18
        
            fn read_eof() {

     

       20
       19
        
                each_ip(&mut |addr| {

     

       21
       21
       -
       @@ -1032,6 +1034,7 @@ mod tests {

     

       20
       20
       +
       @@ -1050,6 +1052,7 @@

     

       22
       21
        
                })

     

       23
       22
        
            }

     

       24
       23
        
        

     
···

       26
       25
        
            #[test]

     

       27
       26
        
            fn write_close() {

     

       28
       27
        
                each_ip(&mut |addr| {

     

       29
       29
       -
       @@ -1058,6 +1061,7 @@ mod tests {

     

       28
       28
       +
       @@ -1076,6 +1079,7 @@

     

       30
       29
        
                })

     

       31
       30
        
            }

     

       32
       31
        
        

     
···

       34
       33
        
            #[test]

     

       35
       34
        
            fn multiple_connect_serial() {

     

       36
       35
        
                each_ip(&mut |addr| {

     

       37
       37
       -
       @@ -1080,6 +1084,7 @@ mod tests {

     

       36
       36
       +
       @@ -1098,6 +1102,7 @@

     

       38
       37
        
                })

     

       39
       38
        
            }

     

       40
       39
        
        

     
···

       42
       41
        
            #[test]

     

       43
       42
        
            fn multiple_connect_interleaved_greedy_schedule() {

     

       44
       43
        
                const MAX: usize = 10;

     

       45
       45
       -
       @@ -1116,6 +1121,7 @@ mod tests {

     

       44
       44
       +
       @@ -1134,6 +1139,7 @@

     

       46
       45
        
            }

     

       47
       46
        
        

     

       48
       47
        
            #[test]

     
···

       50
       49
        
            fn multiple_connect_interleaved_lazy_schedule() {

     

       51
       50
        
                const MAX: usize = 10;

     

       52
       51
        
                each_ip(&mut |addr| {

     

       53
       53
       -
       @@ -1394,6 +1400,7 @@ mod tests {

     

       52
       52
       +
       @@ -1467,6 +1473,7 @@

     

       54
       53
        
            }

     

       55
       54
        
        

     

       56
       55
        
            #[test]

     
···

       58
       57
        
            fn clone_while_reading() {

     

       59
       58
        
                each_ip(&mut |addr| {

     

       60
       59
        
                    let accept = t!(TcpListener::bind(&addr));

     

       61
       61
       -
       @@ -1504,7 +1511,10 @@ mod tests {

     

       60
       60
       +
       @@ -1597,7 +1604,10 @@

     

       62
       61
        
        

     

       63
       62
        
            // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code

     

       64
       63
        
            //        no longer has rounding errors.

     
···

       67
       66
        
       +                   target_os = "netbsd",

     

       68
       67
        
       +                   target_os = "openbsd",

     

       69
       68
        
       +                   target_os = "macos"), ignore)]

     

       69
       69
       +
            #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31

     

       70
       70
        
            #[test]

     

       71
       71
        
            fn timeouts() {

     

       72
       72
       -
                let addr = next_test_ip4();

     

       73
       73
       -
       @@ -1591,6 +1601,7 @@ mod tests {

     

       72
       72
       +
       @@ -1643,6 +1653,7 @@

     

       74
       73
        
                drop(listener);

     

       75
       74
        
            }

     

       76
       75
        
        

     

       77
       76
        
       +    #[cfg_attr(target_os = "macos", ignore)]

     

       78
       77
        
            #[test]

     

       79
       79
       -
            fn nodelay() {

     

       80
       80
       -
                let addr = next_test_ip4();

     

       81
       81
       -
       @@ -1605,6 +1616,7 @@ mod tests {

     

       82
       82
       -
                assert_eq!(false, t!(stream.nodelay()));

     

       78
       78
       +
            #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31

     

       79
       79
       +
            fn test_read_with_timeout() {

     

       80
       80
       +
       @@ -1687,6 +1698,7 @@

     

       81
       81
       +
                drop(listener);

     

       83
       82
        
            }

     

       84
       83
        
        

     

       85
       84
        
       +    #[cfg_attr(target_os = "macos", ignore)]

     

       86
       85
        
            #[test]

     

       87
       87
       -
            fn ttl() {

     

       88
       88
       -
                let ttl = 100;

     

       89
       89
       -
       @@ -1642,6 +1654,7 @@ mod tests {

     

       90
       90
       -
                }

     

       86
       86
       +
            #[cfg_attr(target_env = "sgx", ignore)]

     

       87
       87
       +
            fn nodelay() {

     

       88
       88
       +
       @@ -1719,6 +1731,7 @@

     

       89
       89
       +
                assert_eq!(ttl, t!(stream.ttl()));

     

       91
       90
        
            }

     

       92
       91
        
        

     

       93
       92
        
       +    #[cfg_attr(target_os = "macos", ignore)]

     

       94
       93
        
            #[test]

     

       95
       95
       -
            fn peek() {

     

       96
       96
       -
                each_ip(&mut |addr| {

     

       94
       94
       +
            #[cfg_attr(target_env = "sgx", ignore)]

     

       95
       95
       +
            fn set_nonblocking() {

+2 -2

pkgs/development/compilers/rust/rustc.nix

···

       17
       17
        
         llvmShared = llvm_7.override { enableSharedLibraries = true; };

     

       18
       18
        
       in stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "rustc";

     

       20
       20
       -
         version = "1.34.2";

     

       20
       20
       +
         version = "1.35.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";

     

       24
       24
       -
           sha256 = "0mig0prkmlnpbba1cmi17vlsl88ikv5pi26zjy2kcr64l62lm6n6";

     

       24
       24
       +
           sha256 = "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         __darwinAllowLocalNetworking = true;

+1 -1

pkgs/development/coq-modules/gappalib/default.nix

···

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         passthru = {

     

       27
       27
       -
           compatibleCoqVersions = stdenv.lib.flip stdenv.lib.versionAtLeast "8.7";

     

       27
       27
       +
           compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ];

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
       }

+13 -2

pkgs/development/coq-modules/mathcomp/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       with builtins // stdenv.lib;

     

       5
       5
        
       let

     

       6
       6
       +
         ####################################

     

       7
       7
       +
         # CONFIGURATION (please edit this) #

     

       8
       8
       +
         ####################################

     

       6
       9
        
         # sha256 of released mathcomp versions

     

       7
       10
        
         mathcomp-sha256 = {

     

       8
       11
        
           "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";

     
···

       19
       22
        
         };

     

       20
       23
        
         # computes the default version of mathcomp given a version of Coq

     

       21
       24
        
         max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));

     

       22
       22
       -
         default-mathcomp-version = let v = last (naturalSort (["0.0.0"]

     

       23
       23
       -
            ++ (attrNames (filterAttrs (_: vs: vs coq.coq-version) mathcomp-coq-versions))));

     

       25
       25
       +
         # mathcomp prefered version by decreasing order

     

       26
       26
       +
         # (the first version in the list will be tried first)

     

       27
       27
       +
         mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ];

     

       28
       28
       +
       

     

       29
       29
       +
         ##############################################################

     

       30
       30
       +
         # COMPUTED using the configuration above (edit with caution) #

     

       31
       31
       +
         ##############################################################

     

       32
       32
       +
         default-mathcomp-version = let v = head (

     

       33
       33
       +
           filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version)

     

       34
       34
       +
                   mathcomp-version-preference ++ ["0.0.0"]);

     

       24
       35
        
            in if v == "0.0.0" then max-mathcomp-version else v;

     

       25
       36
        
       

     

       26
       37
        
         # list of core mathcomp packages sorted by dependency order

+46 -23

pkgs/development/coq-modules/mathcomp/extra.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, coq, mathcomp, coqPackages,

     

       1
       1
       +
       { stdenv, fetchFromGitHub, coq, ssreflect, coqPackages,

     

       2
       2
        
         recurseIntoAttrs }:

     

       3
       3
        
       with builtins // stdenv.lib;

     

       4
       4
       -
       let current-mathcomp = mathcomp; in

     

       4
       4
       +
       let current-ssreflect = ssreflect; in

     

       5
       5
        
       let

     

       6
       6
        
       # configuring packages

     

       7
       7
        
       param = {

     
···

       20
       20
        
         };

     

       21
       21
        
         multinomials = {

     

       22
       22
        
           version-sha256 = {

     

       23
       23
       +
             "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";

     

       23
       24
        
             "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";

     

       24
       25
        
             "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";

     

       25
       26
        
             "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";

     
···

       32
       33
        
             "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";

     

       33
       34
        
             "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";

     

       34
       35
        
           };

     

       36
       36
       +
           compatibleCoqVersions = flip elem ["8.8" "8.9"];

     

       35
       37
        
           description = "Analysis library compatible with Mathematical Components";

     

       38
       38
       +
           license = stdenv.lib.licenses.cecill-c;

     

       36
       39
        
         };

     

       37
       40
        
         real-closed = {

     

       38
       41
        
           version-sha256 = {

     
···

       42
       45
        
           };

     

       43
       46
        
           description = "Mathematical Components Library on real closed fields";

     

       44
       47
        
         };

     

       48
       48
       +
         coqeal = {

     

       49
       49
       +
           version-sha256 = {

     

       50
       50
       +
             "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii";

     

       51
       51
       +
           };

     

       52
       52
       +
           description = "CoqEAL - The Coq Effective Algebra Library";

     

       53
       53
       +
           owner = "CoqEAL";

     

       54
       54
       +
           compatibleCoqVersions = flip elem ["8.7" "8.8" "8.9"];

     

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

     

       56
       56
       +
         };

     

       45
       57
        
       };

     

       46
       58
        
       versions = {

     

       47
       59
        
         "1.9.0" = {

     
···

       49
       61
        
           bigenough.version = "1.0.0";

     

       50
       62
        
           analysis = {

     

       51
       63
        
             version = "0.2.2";

     

       52
       52
       -
             core-deps = with coqPackages; [ mathcomp_1_9-field ];

     

       64
       64
       +
             core-deps = with coqPackages; [ mathcomp-field_1_9 ];

     

       65
       65
       +
             extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];

     

       66
       66
       +
           };

     

       67
       67
       +
           multinomials = {

     

       68
       68
       +
             version = "1.3";

     

       69
       69
       +
             core-deps = with coqPackages; [ mathcomp-algebra_1_9 ];

     

       53
       70
        
             extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];

     

       54
       71
        
           };

     

       55
       55
       -
           multinomials = {};

     

       56
       72
        
           real-closed = {

     

       57
       73
        
             version = "1.0.3";

     

       58
       58
       -
             core-deps = with coqPackages; [ mathcomp_1_9-field ];

     

       74
       74
       +
             core-deps = with coqPackages; [ mathcomp-field_1_9 ];

     

       59
       75
        
             extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ];

     

       60
       76
        
           };

     

       61
       77
        
         }; 

     
···

       64
       80
        
           bigenough.version = "1.0.0";

     

       65
       81
        
           analysis = {

     

       66
       82
        
             version = "0.2.2";

     

       67
       67
       -
             core-deps = with coqPackages; [ mathcomp_1_8-field ];

     

       83
       83
       +
             core-deps = with coqPackages; [ mathcomp-field_1_8 ];

     

       68
       84
        
             extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];

     

       69
       85
        
           };

     

       70
       86
        
           multinomials = {

     

       71
       71
       -
             version = "1.2";

     

       72
       72
       -
             core-deps = with coqPackages; [ mathcomp_1_8-algebra ];

     

       87
       87
       +
             version = "1.3";

     

       88
       88
       +
             core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];

     

       73
       89
        
             extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];

     

       74
       90
        
           };

     

       75
       91
        
           real-closed = {

     

       76
       92
        
             version = "1.0.3";

     

       77
       77
       -
             core-deps = with coqPackages; [ mathcomp_1_8-field ];

     

       93
       93
       +
             core-deps = with coqPackages; [ mathcomp-field_1_8 ];

     

       78
       94
        
             extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ];

     

       79
       95
        
           };

     

       96
       96
       +
           coqeal = {

     

       97
       97
       +
             version = "1.0.0";

     

       98
       98
       +
             core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];

     

       99
       99
       +
             extra-deps = with coqPackages; [ bignums paramcoq mathcomp_1_8-multinomials ];

     

       100
       100
       +
           };

     

       80
       101
        
         };

     

       81
       102
        
         "1.7.0" = {

     

       82
       103
        
           finmap.version = "1.1.0";

     

       83
       104
        
           bigenough.version = "1.0.0";

     

       84
       105
        
           analysis = {

     

       85
       106
        
             version = "0.1.0";

     

       86
       86
       -
             core-deps = with coqPackages; [ mathcomp_1_7-field ];

     

       107
       107
       +
             core-deps = with coqPackages; [ mathcomp-field_1_7 ];

     

       87
       108
        
             extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ];

     

       88
       109
        
           };

     

       89
       110
        
           multinomials = {

     

       90
       111
        
             version = "1.1";

     

       91
       91
       -
             core-deps = with coqPackages; [ mathcomp_1_7-algebra ];

     

       112
       112
       +
             core-deps = with coqPackages; [ mathcomp-algebra_1_7 ];

     

       92
       113
        
             extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ];

     

       93
       114
        
           };

     

       94
       115
        
           real-closed = {

     

       95
       116
        
             version = "1.0.1";

     

       96
       96
       -
             core-deps = with coqPackages; [ mathcomp_1_8-field ];

     

       97
       97
       -
             extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ];

     

       117
       117
       +
             core-deps = with coqPackages; [ mathcomp-field_1_7 ];

     

       118
       118
       +
             extra-deps = with coqPackages; [ mathcomp_1_7-bigenough ];

     

       98
       119
        
           };

     

       99
       120
        
         };

     

       100
       121
        
       };

     
···

       104
       125
        
         # optional arguments

     

       105
       126
        
         src ? "",

     

       106
       127
        
         owner ? "math-comp",

     

       107
       107
       -
         core-deps ? [ coqPackages.mathcomp-ssreflect ],

     

       108
       128
        
         extra-deps ? [],

     

       109
       109
       -
         mathcomp ? current-mathcomp,

     

       129
       129
       +
         ssreflect ? current-ssreflect,

     

       130
       130
       +
         core-deps ? null,

     

       110
       131
        
         compatibleCoqVersions ? null,

     

       111
       111
       -
         license ? mathcomp.meta.license,

     

       132
       132
       +
         license ? ssreflect.meta.license,

     

       112
       133
        
         # mandatory

     

       113
       134
        
         package, version ? "broken", version-sha256, description

     

       114
       135
        
         }:

     

       115
       136
        
         let

     

       116
       137
        
           theCompatibleCoqVersions = if compatibleCoqVersions == null

     

       117
       117
       -
                                      then mathcomp.compatibleCoqVersions

     

       138
       138
       +
                                      then ssreflect.compatibleCoqVersions

     

       118
       139
        
                                      else compatibleCoqVersions;

     

       140
       140
       +
           mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;

     

       119
       141
        
         in

     

       120
       142
        
         { "${package}" = let from = src; in

     

       121
       143
        
       

     

       122
       144
        
         stdenv.mkDerivation rec {

     

       123
       145
        
           inherit version;

     

       124
       124
       -
           name = "coq${coq.coq-version}-mathcomp-${mathcomp.version}-${package}-${version}";

     

       146
       146
       +
           name = "coq${coq.coq-version}-mathcomp${ssreflect.version}-${package}-${version}";

     

       125
       147
        
       

     

       126
       148
        
           src = if from == "" then fetchFromGitHub {

     

       127
       149
        
             owner = owner;

     
···

       130
       152
        
             sha256 = version-sha256."${version}";

     

       131
       153
        
           } else from;

     

       132
       154
        
       

     

       133
       133
       -
           propagatedBuildInputs = [ coq mathcomp ] ++ extra-deps;

     

       155
       155
       +
           propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;

     

       134
       156
        
       

     

       135
       157
        
           installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";

     

       136
       158
        
       

     
···

       138
       160
        
             inherit description;

     

       139
       161
        
             inherit license;

     

       140
       162
        
             inherit (src.meta) homepage;

     

       141
       141
       -
             inherit (mathcomp.meta) platforms;

     

       163
       163
       +
             inherit (ssreflect.meta) platforms;

     

       142
       164
        
             maintainers = [ stdenv.lib.maintainers.vbgl ];

     

       143
       165
        
             broken = (version == "broken");

     

       144
       166
        
           };

     
···

       151
       173
        
         };

     

       152
       174
        
         };

     

       153
       175
        
       

     

       154
       154
       -
       current-versions = versions."${current-mathcomp.version}" or {};

     

       176
       176
       +
       current-versions = versions."${current-ssreflect.version}" or {};

     

       155
       177
        
       

     

       156
       178
        
       select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);

     

       157
       179
        
       

     

       158
       180
        
       for-version = v: suffix: (mapAttrs' (n: pkg:

     

       159
       181
        
               {name = "mathcomp_${suffix}-${n}";

     

       160
       182
        
                value = (packageGen ({

     

       161
       161
       -
                    mathcomp = coqPackages."mathcomp_${suffix}";

     

       183
       183
       +
                    ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";

     

       162
       184
        
                  } // pkg))."${n}";})

     

       163
       185
        
               (select versions."${v}"));

     

       164
       186
        
       

     
···

       173
       195
        
       mathcompExtraGen = packageGen;

     

       174
       196
        
       mathcomp_1_7-finmap_1_0 =

     

       175
       197
        
         (packageGen (select {finmap = {version = "1.0.0";

     

       176
       176
       -
                                        mathcomp = coqPackages.mathcomp_1_7;};

     

       198
       198
       +
                                        ssreflect = coqPackages.mathcomp-ssreflect_1_7;};

     

       177
       199
        
                             }).finmap).finmap;

     

       178
       200
        
       multinomials = all.mathcomp-multinomials;

     

       201
       201
       +
       coqeal = all.mathcomp-coqeal;

     

       179
       202
        
       } // all

+2 -1

pkgs/development/go-modules/generic/default.nix

···

       125
       125
        
               local type;

     

       126
       126
        
               type="$1"

     

       127
       127
        
               if [ -n "$subPackages" ]; then

     

       128
       128
       -
                 echo "./$subPackages"

     

       128
       128
       +
                 echo "$subPackages" | sed "s,\(^\| \),\1./,g"

     

       129
       129
        
               else

     

       130
       130
        
                 find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique

     

       131
       131
        
               fi

     
···

       144
       144
        
                 export NIX_BUILD_CORES=1

     

       145
       145
        
             fi

     

       146
       146
        
             for pkg in $(getGoDirs ""); do

     

       147
       147
       +
               echo "Building subPackage $pkg"

     

       147
       148
        
               buildGoDir install "$pkg"

     

       148
       149
        
             done

     

       149
       150
        
           '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

+4 -4

pkgs/development/haskell-modules/configuration-common.nix

···

       1262
       1262
        
         # The latest release version is ancient. You really need this tool from git.

     

       1263
       1263
        
         haskell-ci = generateOptparseApplicativeCompletion "haskell-ci"

     

       1264
       1264
        
           (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) {

     

       1265
       1265
       -
             version = "20190307-git";

     

       1265
       1265
       +
             version = "20190625-git";

     

       1266
       1266
        
             src = pkgs.fetchFromGitHub {

     

       1267
       1267
        
               owner = "haskell-CI";

     

       1268
       1268
        
               repo = "haskell-ci";

     

       1269
       1269
       -
               rev = "2baceb59bc2f36e798ff9fb6e8865c449f01d3a2";

     

       1270
       1270
       -
               sha256 = "1wqhqajxni6h9rrj22xj6421d4m0gs8qk2glghpdp307ns5gr2j4";

     

       1269
       1269
       +
               rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01";

     

       1270
       1270
       +
               sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk";

     

       1271
       1271
        
             };

     

       1272
       1272
       -
         }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]));

     

       1272
       1272
       +
         }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary]));

     

       1273
       1273
        
       

     

       1274
       1274
        
         # Fix build with attr-2.4.48 (see #53716)

     

       1275
       1275
        
         xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;

+3 -2

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

···

       1
       1
       -
       { stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         parquet-testing = fetchFromGitHub {

     
···

       32
       32
        
           ./darwin.patch

     

       33
       33
        
           ];

     

       34
       34
        
       

     

       35
       35
       -
         nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ];

     

       35
       35
       +
         nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]

     

       36
       36
       +
           ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

     

       36
       37
        
         buildInputs = [

     

       37
       38
        
           boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson

     

       38
       39
        
           snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy

+2 -2

pkgs/development/libraries/cimg/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
       

     

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

     

       6
       6
       -
         version = "2.6.5";

     

       6
       6
       +
         version = "2.6.6";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "http://cimg.eu/files/CImg_${version}.zip";

     

       10
       10
       -
           sha256 = "1q409xrri67vqhda6f6jfqnvzj1b3b9xlpi27vm9vl10k2lv4m3a";

     

       10
       10
       +
           sha256 = "06a6qgs7q79asfbfp615h5iin23y7g8y1achnmsp3rpkikssskzv";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ unzip ];

+77 -11

pkgs/development/libraries/exiv2/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, zlib, expat, gettext

     

       2
       2
       -
       , autoconf }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , zlib

     

       4
       4
       +
       , expat

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , which

     

       7
       7
       +
       , libxml2

     

       8
       8
       +
       , python3

     

       9
       9
       +
       , gettext

     

       10
       10
       +
       , doxygen

     

       11
       11
       +
       , graphviz

     

       12
       12
       +
       , libxslt

     

       13
       13
       +
       }:

     

       3
       14
        
       

     

       4
       15
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "exiv2-0.26.2018.12.30";

     

       16
       16
       +
         pname = "exiv2";

     

       17
       17
       +
         version = "0.27.1";

     

       6
       18
        
       

     

       7
       7
       -
           #url = "https://www.exiv2.org/builds/${name}-trunk.tar.gz";

     

       8
       19
        
         src = fetchFromGitHub rec {

     

       9
       20
        
           owner = "exiv2";

     

       10
       21
        
           repo  = "exiv2";

     

       11
       11
       -
           rev = "f5d0b25"; # https://github.com/Exiv2/exiv2/commits/0.26

     

       12
       12
       -
           sha256 = "1blaz3g8dlij881g14nv2nsgr984wy6ypbwgi2pixk978p0gm70i";

     

       22
       22
       +
           rev = version;

     

       23
       23
       +
           sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c";

     

       13
       24
        
         };

     

       14
       25
        
       

     

       15
       15
       -
         postPatch = "patchShebangs ./src/svn_version.sh";

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments

     

       28
       28
       +
           ./fix-cmake.patch

     

       29
       29
       +
         ];

     

       16
       30
        
       

     

       17
       17
       -
         preConfigure = "make config"; # needed because not using tarball

     

       31
       31
       +
         cmakeFlags = [

     

       32
       32
       +
           "-DEXIV2_BUILD_PO=ON"

     

       33
       33
       +
           "-DEXIV2_BUILD_DOC=ON"

     

       34
       34
       +
         ];

     

       18
       35
        
       

     

       19
       19
       -
         outputs = [ "out" "dev" ];

     

       36
       36
       +
         outputs = [ "out" "dev" "doc" "man" ];

     

       20
       37
        
       

     

       21
       38
        
         nativeBuildInputs = [

     

       39
       39
       +
           cmake

     

       40
       40
       +
           doxygen

     

       22
       41
        
           gettext

     

       23
       23
       -
           autoconf # needed because not using tarball

     

       42
       42
       +
           graphviz

     

       43
       43
       +
           libxslt

     

       24
       44
        
         ];

     

       25
       25
       -
         propagatedBuildInputs = [ zlib expat ];

     

       45
       45
       +
       

     

       46
       46
       +
         propagatedBuildInputs = [

     

       47
       47
       +
           expat

     

       48
       48
       +
           zlib

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         checkInputs = [

     

       52
       52
       +
           libxml2.bin

     

       53
       53
       +
           python3

     

       54
       54
       +
           which

     

       55
       55
       +
         ];

     

       56
       56
       +
       

     

       57
       57
       +
         buildFlags = [

     

       58
       58
       +
           "doc"

     

       59
       59
       +
         ];

     

       60
       60
       +
       

     

       61
       61
       +
         doCheck = stdenv.isLinux;

     

       62
       62
       +
       

     

       63
       63
       +
         # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.

     

       64
       64
       +
         checkTarget = "tests";

     

       65
       65
       +
       

     

       66
       66
       +
         preCheck = ''

     

       67
       67
       +
           patchShebangs ../test/

     

       68
       68
       +
           mkdir ../test/tmp

     

       69
       69
       +
           export LD_LIBRARY_PATH="$(realpath ../build/lib)"

     

       70
       70
       +
       

     

       71
       71
       +
           # Fix tests on Aarch64

     

       72
       72
       +
           ${stdenv.lib.optionalString stdenv.isAarch64 ''

     

       73
       73
       +
             rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py

     

       74
       74
       +
           ''}

     

       75
       75
       +
         '';

     

       76
       76
       +
       

     

       77
       77
       +
         postCheck = ''

     

       78
       78
       +
           (cd ../tests/ && python3 runner.py)

     

       79
       79
       +
         '';

     

       80
       80
       +
       

     

       81
       81
       +
         # With cmake we have to enable samples or there won't be

     

       82
       82
       +
         # a tests target. This removes them.

     

       83
       83
       +
         postInstall = ''

     

       84
       84
       +
           ( cd "$out/bin"

     

       85
       85
       +
             mv exiv2 .exiv2

     

       86
       86
       +
             rm *

     

       87
       87
       +
             mv .exiv2 exiv2

     

       88
       88
       +
           )

     

       89
       89
       +
         '';

     

       90
       90
       +
       

     

       91
       91
       +
         enableParallelBuilding = true;

     

       26
       92
        
       

     

       27
       93
        
         meta = with stdenv.lib; {

     

       28
       94
        
           homepage = https://www.exiv2.org/;

+16

pkgs/development/libraries/exiv2/fix-cmake.patch

···

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

     

       2
       2
       +
       index 34087004..41b3a068 100644

     

       3
       3
       +
       --- a/src/CMakeLists.txt

     

       4
       4
       +
       +++ b/src/CMakeLists.txt

     

       5
       5
       +
       @@ -239,9 +239,9 @@ install(FILES

     

       6
       6
       +
            ${CMAKE_BINARY_DIR}/exiv2lib_export.h

     

       7
       7
       +
            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)

     

       8
       8
       +
        

     

       9
       9
       +
       -install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")

     

       10
       10
       +
       +install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")

     

       11
       11
       +
        

     

       12
       12
       +
       -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")

     

       13
       13
       +
       +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")

     

       14
       14
       +
        

     

       15
       15
       +
        # ******************************************************************************

     

       16
       16
       +
        # exiv2 application

+2

pkgs/development/libraries/intel-media-driver/default.nix

···

       17
       17
        
         cmakeFlags = [

     

       18
       18
        
           "-DINSTALL_DRIVER_SYSCONF=OFF"

     

       19
       19
        
           "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri"

     

       20
       20
       +
           # Works only on hosts with suitable CPUs.

     

       21
       21
       +
           "-DMEDIA_RUN_TEST_SUITE=OFF"

     

       20
       22
        
         ];

     

       21
       23
        
       

     

       22
       24
        
         nativeBuildInputs = [ cmake pkgconfig ];

+2 -2

pkgs/development/libraries/kerberos/heimdal.nix

···

       7
       7
        
       with stdenv.lib;

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         name = "heimdal-${version}";

     

       10
       10
       -
         version = "7.6.0";

     

       10
       10
       +
         version = "7.7.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "heimdal";

     

       14
       14
        
           repo = "heimdal";

     

       15
       15
        
           rev = "heimdal-${version}";

     

       16
       16
       -
           sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp";

     

       16
       16
       +
           sha256 = "099qn9b8q20invvi5r8d8q9rnwpcm3nr89hx5rj7gj2ah2x5vgxs";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         outputs = [ "out" "dev" "man" "info" ];

+2 -2

pkgs/development/libraries/libcouchbase/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libcouchbase-${version}";

     

       5
       5
       -
         version = "2.10.3";

     

       5
       5
       +
         version = "2.10.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "couchbase";

     

       9
       9
        
           repo = "libcouchbase";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4";

     

       11
       11
       +
           sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         cmakeFlags = "-DLCB_NO_MOCK=ON";

+10 -1

pkgs/development/libraries/libextractor/default.nix

···

       1
       1
        
       { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis

     

       2
       2
       -
       , exiv2, libgsf, rpm, pkgconfig

     

       2
       2
       +
       , exiv2, libgsf, rpm, pkgconfig, fetchpatch

     

       3
       3
        
       , gtkSupport ? true, glib ? null, gtk3 ? null

     

       4
       4
        
       , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}:

     

       5
       5
        
       

     
···

       13
       13
        
           url = "mirror://gnu/libextractor/${name}.tar.gz";

     

       14
       14
        
           sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh";

     

       15
       15
        
         };

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [

     

       18
       18
       +
           # Fixes build with exiv2 0.27

     

       19
       19
       +
           (fetchpatch {

     

       20
       20
       +
             name = "libextractor-exiv2-0.27.patch";

     

       21
       21
       +
             url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";

     

       22
       22
       +
             sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";

     

       23
       23
       +
           })

     

       24
       24
       +
         ];

     

       16
       25
        
       

     

       17
       26
        
         preConfigure =

     

       18
       27
        
           '' echo "patching installation directory in \`extractor.c'..."

+2 -2

pkgs/development/libraries/libhandy/default.nix

···

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         pname = "libhandy";

     

       10
       10
       -
         version = "0.0.9";

     

       10
       10
       +
         version = "0.0.10";

     

       11
       11
        
       in stdenv.mkDerivation rec {

     

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

     

       13
       13
        
       

     
···

       19
       19
        
           owner = "Librem5";

     

       20
       20
        
           repo = pname;

     

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

     

       22
       22
       -
           sha256 = "0smfnvfba6cnxbrcm1vh3zbr1hww43qcxhawka3hzn2hjr06rfzn";

     

       22
       22
       +
           sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/libpqxx/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libpqxx";

     

       5
       5
       -
         version = "6.4.4";

     

       5
       5
       +
         version = "6.4.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jtv";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0l62qlln5q1qhapbnm8n1k0hbzf3287gld1jpcbwr0yj79l9j579";

     

       11
       11
       +
           sha256 = "0djmjr2b5x5nd2a4idv5j8s6w0kdmvil910iv1kyc7x94dirbrni";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gnused python2 ];

+1 -1

pkgs/development/libraries/libressl/default.nix

···

       39
       39
        
           meta = with lib; {

     

       40
       40
        
             description = "Free TLS/SSL implementation";

     

       41
       41
        
             homepage    = "https://www.libressl.org";

     

       42
       42
       -
             license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ];

     

       42
       42
       +
             license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ];

     

       43
       43
        
             platforms   = platforms.all;

     

       44
       44
        
             maintainers = with maintainers; [ thoughtpolice fpletz globin ];

     

       45
       45
        
           };

+2 -2

pkgs/development/libraries/libsass/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libsass";

     

       5
       5
       -
         version = "3.6.0";

     

       5
       5
       +
         version = "3.6.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sass";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a";

     

       11
       11
       +
           sha256 = "1599j2lbsygy3883x9si7rbad1pkjhl6y72aimaapcv90ga5kxkm";

     

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

     

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

     

       14
       14
        
           extraPostFetch = ''

+2 -2

pkgs/development/libraries/libtoxcore/default.nix

···

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
        
         libtoxcore_0_2 = generic {

     

       51
       51
       -
           version = "0.2.9";

     

       52
       52
       -
           sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j";

     

       51
       51
       +
           version = "0.2.10";

     

       52
       52
       +
           sha256 = "0r5j2s5n8ikayvr1zylvv3ai3smbhm2m0yhpa9lfcsxhvyn9phcn";

     

       53
       53
        
         };

     

       54
       54
        
       }

+2 -2

pkgs/development/libraries/liburcu/default.nix

···

       1
       1
        
       { stdenv, fetchurl, perl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.11.0";

     

       4
       4
       +
         version = "0.11.1";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s";

     

       9
       9
       +
           sha256 = "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         checkInputs = [ perl ];

+30 -5

pkgs/development/libraries/libvirt/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchgit

     

       2
       2
       -
       , pkgconfig, makeWrapper, libtool, autoconf, automake

     

       2
       2
       +
       , pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch

     

       3
       3
        
       , coreutils, libxml2, gnutls, perl, python2, attr

     

       4
       4
        
       , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext

     

       5
       5
        
       , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor

     
···

       17
       17
        
         buildFromTarball = stdenv.isDarwin;

     

       18
       18
        
       in stdenv.mkDerivation rec {

     

       19
       19
        
         name = "libvirt-${version}";

     

       20
       20
       -
         version = "4.10.0";

     

       20
       20
       +
         version = "5.4.0";

     

       21
       21
        
       

     

       22
       22
        
         src =

     

       23
       23
        
           if buildFromTarball then

     

       24
       24
        
             fetchurl {

     

       25
       25
        
               url = "http://libvirt.org/sources/${name}.tar.xz";

     

       26
       26
       -
               sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz";

     

       26
       26
       +
               sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";

     

       27
       27
        
             }

     

       28
       28
        
           else

     

       29
       29
        
             fetchgit {

     

       30
       30
        
               url = git://libvirt.org/libvirt.git;

     

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

     

       32
       32
       -
               sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9";

     

       32
       32
       +
               sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";

     

       33
       33
        
               fetchSubmodules = true;

     

       34
       34
        
             };

     

       35
       35
        
       

     

       36
       36
       +
         patches = optionals (!stdenv.isDarwin) [

     

       37
       37
       +
           (fetchpatch {

     

       38
       38
       +
             name = "5.4.0-CVE-2019-10161.patch";

     

       39
       39
       +
             url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";

     

       40
       40
       +
             sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";

     

       41
       41
       +
           })

     

       42
       42
       +
         ] ++ [

     

       43
       43
       +
           (fetchpatch {

     

       44
       44
       +
             name = "5.4.0-CVE-2019-10166.patch";

     

       45
       45
       +
             url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";

     

       46
       46
       +
             sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";

     

       47
       47
       +
           })

     

       48
       48
       +
           (fetchpatch {

     

       49
       49
       +
             name = "5.4.0-CVE-2019-10167.patch";

     

       50
       50
       +
             url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";

     

       51
       51
       +
             sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";

     

       52
       52
       +
           })

     

       53
       53
       +
           (fetchpatch {

     

       54
       54
       +
             name = "5.4.0-CVE-2019-10168.patch";

     

       55
       55
       +
             url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";

     

       56
       56
       +
             sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";

     

       57
       57
       +
           })

     

       58
       58
       +
         ];

     

       59
       59
       +
       

     

       36
       60
        
         nativeBuildInputs = [ makeWrapper pkgconfig ];

     

       37
       61
        
         buildInputs = [

     

       38
       62
        
           libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl

     
···

       76
       100
        
           "--with-esx"

     

       77
       101
        
           "--with-remote"

     

       78
       102
        
         ] ++ optionals stdenv.isLinux [

     

       103
       103
       +
           "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"

     

       104
       104
       +
           "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"

     

       79
       105
        
           "--with-attr"

     

       80
       106
        
           "--with-apparmor"

     

       81
       107
        
           "--with-secdriver-apparmor"

     

       82
       108
        
           "--with-numad"

     

       83
       109
        
           "--with-macvtap"

     

       84
       110
        
           "--with-virtualport"

     

       85
       85
       -
           "--with-init-script=systemd+redhat"

     

       86
       111
        
           "--with-storage-disk"

     

       87
       112
        
         ] ++ optionals (stdenv.isLinux && zfs != null) [

     

       88
       113
        
           "--with-storage-zfs"

+2 -2

pkgs/development/libraries/matio/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         name = "matio-1.5.15";

     

       3
       3
       +
         name = "matio-1.5.16";

     

       4
       4
        
         src = fetchurl {

     

       5
       5
        
           url = "mirror://sourceforge/matio/${name}.tar.gz";

     

       6
       6
       -
           sha256 = "1kxi15ph68nnbi0s1m8icb0685wg8ql8gj7wnkdk20kzpf3lbgr1";

     

       6
       6
       +
           sha256 = "0i2g7jqbb4j8xlf1ly7gfpw5zyxmr245qf57v6w0jmwx4rfkvfj7";

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         meta = with stdenv.lib; {

+4

pkgs/development/libraries/mtxclient/default.nix

···

       27
       27
        
           license = licenses.mit;

     

       28
       28
        
           maintainers = with maintainers; [ fpletz ];

     

       29
       29
        
           platforms = platforms.unix;

     

       30
       30
       +
       

     

       31
       31
       +
           # As of 2019-06-30, all of the dependencies are available on macOS but the

     

       32
       32
       +
           # package itself does not build.

     

       33
       33
       +
           broken = stdenv.isDarwin;

     

       30
       34
        
         };

     

       31
       35
        
       }

+2 -2

pkgs/development/libraries/ogre/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         name = "ogre-${version}";

     

       14
       14
       -
         version = "1.12.0";

     

       14
       14
       +
         version = "1.12.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
            url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";

     

       18
       18
       -
            sha256 = "1hkkg5prixppiq1p5jz7wz1npm5s7kwm1s86079280waccvr2v6x";

     

       18
       18
       +
            sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

+3 -1

pkgs/development/libraries/olm/default.nix

···

       8
       8
        
           description = "Implements double cryptographic ratchet and Megolm ratchet";

     

       9
       9
        
           license = stdenv.lib.licenses.asl20;

     

       10
       10
        
           homepage = https://matrix.org/git/olm/about;

     

       11
       11
       -
           platforms = stdenv.lib.platforms.linux;

     

       11
       11
       +
           platforms = with stdenv.lib.platforms; darwin ++ linux;

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     
···

       21
       21
        
       

     

       22
       22
        
         # requires optimisation but memory operations are compiled with -O0

     

       23
       23
        
         hardeningDisable = ["fortify"];

     

       24
       24
       +
       

     

       25
       25
       +
         makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null;

     

       24
       26
        
       

     

       25
       27
        
         installFlags = "PREFIX=$(out)";

     

       26
       28
        
       }

+9 -1

pkgs/development/libraries/openmpi/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gfortran, perl, libnl

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl

     

       2
       2
        
       , rdma-core, zlib, numactl, libevent, hwloc

     

       3
       3
        
       

     

       4
       4
        
       # Enable the Sun Grid Engine bindings

     
···

       18
       18
        
           url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";

     

       19
       19
        
           sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";

     

       20
       20
        
         };

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             name = "openmpi-mca_btl_vader_component_close-segfault.patch";

     

       25
       25
       +
             url = "https://github.com/open-mpi/ompi/pull/6526.patch";

     

       26
       26
       +
             sha256 = "0s7ac9rkcj3fi6ampkvy76njlj478yyr4zvypjc7licy6dgr595x";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       21
       29
        
       

     

       22
       30
        
         postPatch = ''

     

       23
       31
        
           patchShebangs ./

+2 -2

pkgs/development/libraries/opensubdiv/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

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

     

       9
       9
       -
         version = "3.3.3";

     

       9
       9
       +
         version = "3.4.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "PixarAnimationStudios";

     

       13
       13
        
           repo = "OpenSubdiv";

     

       14
       14
        
           rev = "v${lib.replaceChars ["."] ["_"] version}";

     

       15
       15
       -
           sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z";

     

       15
       15
       +
           sha256 = "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         outputs = [ "out" "dev" ];

+25

pkgs/development/libraries/packr/default.nix

···

       1
       1
       +
       { buildGoModule

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , lib

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildGoModule rec {

     

       7
       7
       +
         pname = "packr";

     

       8
       8
       +
         version = "2.5.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "gobuffalo";

     

       12
       12
       +
           repo = pname;

     

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

     

       14
       14
       +
           sha256 = "070hpnsr5w1r1cg9wl80cafmhkx4z3s29wq04fa7rk49hmwml4jy";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         modSha256 = "0xvpk9jjcqac44s4fp0jwpljxvs0ypjwc5qfg0w90s2r7jn50fxn";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "The simple and easy way to embed static files into Go binaries";

     

       21
       21
       +
           homepage = "https://github.com/gobuffalo/packr";

     

       22
       22
       +
           license = licenses.mit;

     

       23
       23
       +
           maintainers = with maintainers; [ mmahut ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+1 -1

pkgs/development/libraries/physics/rivet/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "rivet-${version}";

     

       5
       5
       -
         version = "2.7.0";

     

       5
       5
       +
         version = "2.7.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";

+2 -2

pkgs/development/libraries/physics/yoda/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "yoda-${version}";

     

       5
       5
       -
         version = "1.7.4";

     

       5
       5
       +
         version = "1.7.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "0w9s3qv87hrmpq4dkrxcrl2hn2vcsbvy8ml99w85404wksw1dwrx";

     

       9
       9
       +
           sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         pythonPath = []; # python wrapper support

+2 -2

pkgs/development/libraries/pyotherside/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "pyotherside";

     

       6
       6
       -
         version = "1.5.6";

     

       6
       6
       +
         version = "1.5.8";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "thp";

     

       10
       10
        
           repo = "pyotherside";

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv";

     

       12
       12
       +
           sha256 = "0dnsvyg990ln3bdjdyc5b4lbb63wcjij0skq8pb4x4jglfy7vz4z";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ qmake ];

+1 -2

pkgs/development/libraries/sqlite/default.nix

···

       9
       9
        
       in

     

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
       -
         pname = "sqlite";

     

       12
       12
       +
         name = "sqlite-${version}";

     

       13
       13
        
         version = "3.28.0";

     

       14
       14
        
       

     

       15
       15
        
         # NB! Make sure to update analyzer.nix src (in the same directory).

     
···

       71
       71
        
           sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/"

     

       72
       72
        
         '';

     

       73
       73
        
       

     

       74
       74
       -
         enableParallelBuilding = true;

     

       75
       74
        
         doCheck = false; # fails to link against tcl

     

       76
       75
        
       

     

       77
       76
        
         meta = {

+23

pkgs/development/libraries/trompeloeil/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       +
         version = "34";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "rollbear";

     

       9
       9
       +
           repo = "trompeloeil";

     

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

     

       11
       11
       +
           sha256 = "0mj3zni18kfm04jrqjaa1p6ii5q0dz6qdm3hi57z9lzygaxbdc97";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ cmake ];

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with stdenv.lib; {

     

       17
       17
       +
           description = "Header only C++14 mocking framework";

     

       18
       18
       +
           homepage = "https://github.com/rollbear/trompeloeil";

     

       19
       19
       +
           license = licenses.boost;

     

       20
       20
       +
           maintainers = [ maintainers.bjornfor ];

     

       21
       21
       +
           platforms = platforms.unix;

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

pkgs/development/libraries/unixODBCDrivers/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, unixODBC, cmake, postgresql, mysql55, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:

     

       1
       1
       +
       { fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:

     

       2
       2
        
       

     

       3
       3
        
       # I haven't done any parameter tweaking.. So the defaults provided here might be bad

     

       4
       4
        
       

     
···

       67
       67
        
           };

     

       68
       68
        
       

     

       69
       69
        
           nativeBuildInputs = [ cmake ];

     

       70
       70
       -
           buildInputs = [ unixODBC mysql55 ];

     

       70
       70
       +
           buildInputs = [ unixODBC mysql ];

     

       71
       71
        
       

     

       72
       72
        
           cmakeFlags = [ "-DWITH_UNIXODBC=1" ];

     

       73
       73

+3 -1

pkgs/development/libraries/vulkan-loader/default.nix

···

       21
       21
        
         buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];

     

       22
       22
        
         enableParallelBuilding = true;

     

       23
       23
        
       

     

       24
       24
       +
         patches = [ ./system-search-path.patch ];

     

       25
       25
       +
       

     

       24
       26
        
         cmakeFlags = [

     

       25
       25
       -
           "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/share"

     

       27
       27
       +
           "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share"

     

       26
       28
        
           "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"

     

       27
       29
        
         ];

     

       28
       30

+45

pkgs/development/libraries/vulkan-loader/system-search-path.patch

···

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

     

       2
       2
       +
       index 9ac5ce835..cbdb0ff56 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -88,6 +88,12 @@ if(UNIX)

     

       6
       6
       +
                    STRING

     

       7
       7
       +
                    "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."

     

       8
       8
       +
                )

     

       9
       9
       +
       +    set(

     

       10
       10
       +
       +        SYSTEM_SEARCH_PATH ""

     

       11
       11
       +
       +        CACHE

     

       12
       12
       +
       +            STRING

     

       13
       13
       +
       +            "Search path to always use, after all other search paths."

     

       14
       14
       +
       +    )

     

       15
       15
       +
        endif()

     

       16
       16
       +
        

     

       17
       17
       +
        if(UNIX AND NOT APPLE) # i.e.: Linux

     

       18
       18
       +
       @@ -184,6 +190,7 @@ if(UNIX)

     

       19
       19
       +
            add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")

     

       20
       20
       +
            add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")

     

       21
       21
       +
            add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")

     

       22
       22
       +
       +    add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}")

     

       23
       23
       +
        

     

       24
       24
       +
            # Make sure /etc is searched by the loader

     

       25
       25
       +
            if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))

     

       26
       26
       +
       diff --git a/loader/loader.c b/loader/loader.c

     

       27
       27
       +
       index 0d3b5a947..abe357004 100644

     

       28
       28
       +
       --- a/loader/loader.c

     

       29
       29
       +
       +++ b/loader/loader.c

     

       30
       30
       +
       @@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e

     

       31
       31
       +
                        search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size);

     

       32
       32
       +
                        search_path_size += DetermineDataFilePathSize(home_root, rel_size);

     

       33
       33
       +
                    }

     

       34
       34
       +
       +            search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size);

     

       35
       35
       +
        #endif

     

       36
       36
       +
                }

     

       37
       37
       +
            }

     

       38
       38
       +
       @@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e

     

       39
       39
       +
                        CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr);

     

       40
       40
       +
                        CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr);

     

       41
       41
       +
                    }

     

       42
       42
       +
       +            CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr);

     

       43
       43
       +
                }

     

       44
       44
       +
        

     

       45
       45
       +
                // Remove the last path separator

+14

pkgs/development/lua-modules/bit32.patch

···

       1
       1
       +
       diff -Naur lua-compat-5.2/c-api/compat-5.2.h lua-compat-5.2-patched/c-api/compat-5.2.h

     

       2
       2
       +
       --- lua-compat-5.2/c-api/compat-5.2.h	2015-02-19 09:23:42.000000000 +1100

     

       3
       3
       +
       +++ lua-compat-5.2-patched/c-api/compat-5.2.h	2019-06-17 17:58:13.585361793 +1000

     

       4
       4
       +
       @@ -146,8 +146,10 @@

     

       5
       5
       +
        #define lua_pushglobaltable(L) \

     

       6
       6
       +
          lua_pushvalue(L, LUA_GLOBALSINDEX)

     

       7
       7
       +
        

     

       8
       8
       +
       +#if !defined(luaL_newlib)

     

       9
       9
       +
        #define luaL_newlib(L, l) \

     

       10
       10
       +
          (lua_newtable((L)),luaL_setfuncs((L), (l), 0))

     

       11
       11
       +
       +#endif

     

       12
       12
       +
        

     

       13
       13
       +
        void luaL_checkversion (lua_State *L);

     

       14
       14
       +

+6 -4

pkgs/development/lua-modules/overrides.nix

···

       6
       6
        
         #### manual fixes for generated packages

     

       7
       7
        
         ##########################################3

     

       8
       8
        
         bit32 = super.bit32.override({

     

       9
       9
       -
           disabled = !isLua51;

     

       10
       10
       -
           # Theoretically works with luajit, but it does redefine at least one Lua

     

       11
       11
       -
           # 5.2 function that Luajit 2.1 provides, see:

     

       12
       12
       -
           # https://github.com/LuaJIT/LuaJIT/issues/325

     

       9
       9
       +
           # Small patch in order to no longer redefine a Lua 5.2 function that Luajit

     

       10
       10
       +
           # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for

     

       11
       11
       +
           # more

     

       12
       12
       +
           patches = [

     

       13
       13
       +
             ./bit32.patch

     

       14
       14
       +
           ];

     

       13
       15
        
         });

     

       14
       16
        
       

     

       15
       17
        
         busted = super.busted.override({

+10 -22

pkgs/development/ocaml-modules/elpi/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, ocaml, findlib, camlp5

     

       1
       1
       +
       { lib, fetchFromGitHub, buildDunePackage, camlp5

     

       2
       2
        
       , ppx_tools_versioned, ppx_deriving, re

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       if !stdenv.lib.versionAtLeast ocaml.version "4.03"

     

       6
       6
       -
       then throw "elpi is not available for OCaml ${ocaml.version}"

     

       7
       7
       -
       else

     

       5
       5
       +
       buildDunePackage rec {

     

       6
       6
       +
         pname = "elpi";

     

       7
       7
       +
         version = "1.4.1";

     

       8
       8
        
       

     

       9
       9
       -
       stdenv.mkDerivation rec {

     

       10
       10
       -
         name = "ocaml${ocaml.version}-elpi-${version}";

     

       11
       11
       -
         version = "1.2.0";

     

       12
       9
        
         src = fetchFromGitHub {

     

       13
       10
        
           owner = "LPCIC";

     

       14
       11
        
           repo = "elpi";

     

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

     

       16
       16
       -
           sha256 = "1n4jpidx0vk4y66bhd704ajn8n6f1fd5wsi1shj6wijfmjl14h7s";

     

       13
       13
       +
           sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w";

     

       17
       14
        
         };

     

       18
       15
        
       

     

       19
       19
       -
         buildInputs = [ ocaml findlib ppx_tools_versioned ];

     

       20
       20
       -
       

     

       21
       21
       -
         propagatedBuildInputs = [ camlp5 ppx_deriving re ];

     

       22
       22
       -
       

     

       23
       23
       -
         createFindlibDestdir = true;

     

       16
       16
       +
         minimumOCamlVersion = "4.04";

     

       24
       17
        
       

     

       25
       25
       -
         preInstall = "make byte";

     

       18
       18
       +
         buildInputs = [ ppx_tools_versioned ];

     

       26
       19
        
       

     

       27
       27
       -
         postInstall = ''

     

       28
       28
       -
           mkdir -p $out/bin

     

       29
       29
       -
           make install-bin BIN=$out/bin

     

       30
       30
       -
           make install-bin BYTE=1 BIN=$out/bin

     

       31
       31
       -
         '';

     

       20
       20
       +
         propagatedBuildInputs = [ camlp5 ppx_deriving re ];

     

       32
       21
        
       

     

       33
       22
        
         meta = {

     

       34
       23
        
           description = "Embeddable λProlog Interpreter";

     

       35
       35
       -
           license = stdenv.lib.licenses.lgpl21Plus;

     

       36
       36
       -
           maintainers = [ stdenv.lib.maintainers.vbgl ];

     

       24
       24
       +
           license = lib.licenses.lgpl21Plus;

     

       25
       25
       +
           maintainers = [ lib.maintainers.vbgl ];

     

       37
       26
        
           inherit (src.meta) homepage;

     

       38
       38
       -
           inherit (ocaml.meta) platforms;

     

       39
       27
        
         };

     

       40
       28
        
       }

+15 -10

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
        
       , pytest

     

       5
       5
        
       , gym

     

       6
       6
        
       , scipy

     
···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "baselines";

     

       20
       20
       -
         version = "0.1.5";

     

       20
       20
       +
         version = "0.1.6"; # remember to manually adjust the rev

     

       21
       21
        
       

     

       22
       22
       -
         src = fetchPypi {

     

       23
       23
       -
           inherit pname version;

     

       24
       24
       -
           sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm";

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "openai";

     

       24
       24
       +
           repo = "baselines";

     

       25
       25
       +
           # Unfortunately releases are not tagged. This commit bumps the version in setup.py

     

       26
       26
       +
           rev = "2bca7901f51c88cdef3ca0666c6a87c454a4dbe8";

     

       27
       27
       +
           sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl";

     

       25
       28
        
         };

     

       26
       29
        
       

     

       27
       27
       -
         patches = [

     

       28
       28
       -
           # already fixed upstream

     

       29
       29
       -
           ./fix-dep-names.patch

     

       30
       30
       -
         ];

     

       31
       31
       -
       

     

       32
       30
        
         propagatedBuildInputs = [

     

       33
       31
        
           gym

     

       34
       32
        
           scipy

     
···

       42
       40
        
           tensorflow

     

       43
       41
        
           click

     

       44
       42
        
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         postPatch = ''

     

       45
       45
       +
           # Needed for the atari wrapper, but the gym-atari package is not supported

     

       46
       46
       +
           # in nixos anyways. Since opencv-python is not currently packaged, we

     

       47
       47
       +
           # disable it.

     

       48
       48
       +
           sed -ie '/opencv-python/d' setup.py

     

       49
       49
       +
         '';

     

       45
       50
        
       

     

       46
       51
        
         # fails to create a daemon, probably because of sandboxing

     

       47
       52
        
         doCheck = false;

-18

pkgs/development/python-modules/baselines/fix-dep-names.patch

···

       1
       1
       -
       diff --git a/setup.py b/setup.py

     

       2
       2
       -
       index bf8badc..570be20 100644

     

       3
       3
       -
       --- a/setup.py

     

       4
       4
       -
       +++ b/setup.py

     

       5
       5
       -
       @@ -10,11 +10,11 @@ setup(name='baselines',

     

       6
       6
       -
              packages=[package for package in find_packages()

     

       7
       7
       -
                        if package.startswith('baselines')],

     

       8
       8
       -
              install_requires=[

     

       9
       9
       -
       -          'gym[mujoco,atari,classic_control,robotics]',

     

       10
       10
       -
       +          'gym',

     

       11
       11
       -
                  'scipy',

     

       12
       12
       -
                  'tqdm',

     

       13
       13
       -
                  'joblib',

     

       14
       14
       -
       -          'zmq',

     

       15
       15
       -
       +          'pyzmq',

     

       16
       16
       -
                  'dill',

     

       17
       17
       -
                  'progressbar2',

     

       18
       18
       -
                  'mpi4py',

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "braintree";

     

       9
       9
       -
         version = "3.54.0";

     

       9
       9
       +
         version = "3.55.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "09dbj04r55hnm8zvfz8wbnxkxb1pfy7g43pzcgs4hhh5xh45ppfd";

     

       13
       13
       +
           sha256 = "0l3i0ayzykrsraqf87z4h39qm3kxyfwrm09n81gnkvsn2126izsd";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ requests ];

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "Chameleon";

     

       8
       8
       -
         version = "3.6.1";

     

       8
       8
       +
         version = "3.6.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed";

     

       12
       12
       +
           sha256 = "0aw6cqnychmsxjjgihwr7df92xw6ac1wr4x70mvq28z3iq35x7ls";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "cherrypy";

     

       9
       9
       -
         version = "18.1.1";

     

       9
       9
       +
         version = "18.1.2";

     

       10
       10
        
       

     

       11
       11
        
         disabled = !isPy3k;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           pname = "CherryPy";

     

       15
       15
        
           inherit version;

     

       16
       16
       -
           sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b";

     

       16
       16
       +
           sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       }:

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "cmd2";

     

       9
       9
       -
         version = "0.9.13";

     

       9
       9
       +
         version = "0.9.14";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "b873ade57ebf6c42a9d4e8c705fc2b16777e9d2e53fec5b113914dc65f2eae38";

     

       13
       13
       +
           sha256 = "0rllwc4h89xdivy85nmgqdi2s0sk1zw31mlvrnlr9gz2902cnq93";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         LC_ALL="en_US.UTF-8";

+2 -2

pkgs/development/python-modules/confluent-kafka/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "1.0.0";

     

       4
       4
       +
         version = "1.0.1";

     

       5
       5
        
         pname = "confluent-kafka";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "a7427944af963410479c2aaae27cc9d28db39c9a93299f14dcf16df80092c63a";

     

       9
       9
       +
           sha256 = "04bsnyhldcvscdj0dg3hm5k27vmhfi9k6bwz963sd3q2h7g9k6kg";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "datadog";

     

       7
       7
       -
         version = "0.26.0";

     

       7
       7
       +
         version = "0.29.3";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79";

     

       11
       11
       +
           sha256 = "0p47hy1p2hf233blalyz0yr6nf13iwk9ndkqdk428dmf8b8m2plr";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

+12 -1

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

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       +
       , python

     

       3
       4
        
       , fetchPypi

     

       4
       5
        
       , pythonOlder

     

       6
       6
       +
       , django

     

       7
       7
       +
       , mock

     

       8
       8
       +
       , isort

     

       5
       9
        
       }:

     

       6
       10
        
       

     

       7
       11
        
       buildPythonPackage rec {

     
···

       14
       18
        
           sha256 = "a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce";

     

       15
       19
        
         };

     

       16
       20
        
       

     

       17
       17
       -
         doCheck = false;

     

       21
       21
       +
         propagatedBuildInputs = [ isort django ];

     

       22
       22
       +
       

     

       23
       23
       +
         checkInputs = [ mock ];

     

       24
       24
       +
         checkPhase = ''

     

       25
       25
       +
           # prove we're running tests against installed package, not build dir

     

       26
       26
       +
           rm -r taggit

     

       27
       27
       +
           ${python.interpreter} -m django test --settings=tests.settings

     

       28
       28
       +
         '';

     

       18
       29
        
       

     

       19
       30
        
         meta = with stdenv.lib; {

     

       20
       31
        
           description = "django-taggit is a reusable Django application for simple tagging";

+10 -3

pkgs/development/python-modules/dm-sonnet/default.nix

···

       11
       11
        
       , wrapt

     

       12
       12
        
       , tensorflow

     

       13
       13
        
       , tensorflow-probability

     

       14
       14
       +
       , tensorflow-estimator

     

       14
       15
        
       }:

     

       15
       16
        
       

     

       16
       17
        
       let

     

       17
       17
       -
         version = "1.30";

     

       18
       18
       +
         version = "1.33";

     

       18
       19
        
       

     

       19
       20
        
         # first build all binaries and generate setup.py using bazel

     

       20
       21
        
         bazel-build = buildBazelPackage rec {

     
···

       24
       25
        
             owner = "deepmind";

     

       25
       26
        
             repo = "sonnet";

     

       26
       27
        
             rev = "v${version}";

     

       27
       27
       -
             sha256 = "1dli4a4arx2gmb4p676pfibvnpag9f13znisrk9381g7xpqqmaw6";

     

       28
       28
       +
             sha256 = "1nqsja1s8jrkq6v1whgh7smk17313mjr9vs3k5c1m8px4yblzhqc";

     

       28
       29
        
           };

     

       29
       30
        
       

     

       30
       31
        
           nativeBuildInputs = [

     
···

       35
       36
        
           bazelTarget = ":install";

     

       36
       37
        
       

     

       37
       38
        
           fetchAttrs = {

     

       38
       38
       -
             sha256 = "0q7mz69nzng8i6pn3h0va79q4nh60jfjjj9crric8g6dmdwc3h1i";

     

       39
       39
       +
             sha256 = "0f2rlzrlazmgjrsin8vq3jfv431cc8sx8lxsr6x4wgd4jx5d1zzy";

     

       39
       40
        
           };

     

       40
       41
        
       

     

       42
       42
       +
           bazelFlags = [

     

       43
       43
       +
             # https://github.com/deepmind/sonnet/issues/134

     

       44
       44
       +
             "--incompatible_disable_deprecated_attr_params=false"

     

       45
       45
       +
           ];

     

       46
       46
       +
       

     

       41
       47
        
           buildAttrs = {

     

       42
       48
        
             preBuild = ''

     

       43
       49
        
               patchShebangs .

     
···

       68
       74
        
           wrapt

     

       69
       75
        
           tensorflow

     

       70
       76
        
           tensorflow-probability

     

       77
       77
       +
           tensorflow-estimator

     

       71
       78
        
         ];

     

       72
       79
        
       

     

       73
       80
        
         # not sure how to properly run the real test suite -- through bazel?

+1 -1

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

···

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3";

     

       17
       17
       +
           sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest ];

+26

pkgs/development/python-modules/google-pasta/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , six

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "google-pasta";

     

       9
       9
       +
         version = "0.1.7";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "1zmqfvy28i2509277s6sz098kddd16cx21vpxyc8xml1nclcxlbr";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           six

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = {

     

       21
       21
       +
           description = "An AST-based Python refactoring library";

     

       22
       22
       +
           homepage    = https://github.com/google/pasta;

     

       23
       23
       +
           license     = lib.licenses.asl20;

     

       24
       24
       +
           maintainers = with lib.maintainers; [ timokau ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "libversion";

     

       5
       5
       -
         version = "1.1.3";

     

       5
       5
       +
         version = "1.1.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "1ax1bq5hrbs2pq2krya83yj1s5cm33pcpwalnc15cgj73kmhb5fn";

     

       9
       9
       +
           sha256 = "0xp0wv4s1537s0iqa1ih3kfh1p70s7d1fkwhvrnbj8m98yjij84q";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "libvirt";

     

       5
       5
       -
         version = "4.10.0";

     

       5
       5
       +
         version = "5.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = assert version == libvirt.version; fetchgit {

     

       8
       8
        
           url = git://libvirt.org/libvirt-python.git;

     

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

     

       10
       10
       -
           sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf";

     

       10
       10
       +
           sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "luftdaten";

     

       5
       5
       -
         version = "0.5.0";

     

       5
       5
       +
         version = "0.6.1";

     

       6
       6
        
       

     

       7
       7
        
         disabled = !isPy3k;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c";

     

       11
       11
       +
           sha256 = "0jxp9yfabdgn2d6w69ijrw1bk1d9g897425cyybiyc13zhhs0kwg";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ aiohttp async-timeout ];

+3 -9

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

···

       1
       1
       -
       { stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:

     

       1
       1
       +
       { stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "mpi4py";

     

       5
       5
       -
         version = "3.0.1";

     

       5
       5
       +
         version = "3.0.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5";

     

       9
       9
       +
           sha256 = "1q28xl36difma1wq0acq111cqxjya32kn3lxp6fbidz3wg8jkmpq";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         passthru = {

     

       13
       13
        
           inherit mpi;

     

       14
       14
        
         };

     

       15
       15
       -
       

     

       16
       16
       -
         patches = [ ( fetchpatch {

     

       17
       17
       -
           # Upstream patch to ensure compatibility with openmpi-4.0.1

     

       18
       18
       -
           url = "https://github.com/mpi4py/mpi4py/commit/42f5e35a6a90454516c11131549a08cd766edbb0.patch";

     

       19
       19
       -
           sha256 = "1dm0i3amwj1cddzz1m9ssd7qp655c8rv1wzjs9ww3kzd90fm4w72";

     

       20
       20
       -
         })];

     

       21
       15
        
       

     

       22
       16
        
         postPatch = ''

     

       23
       17
        
           substituteInPlace test/test_spawn.py --replace \

+17 -9

pkgs/development/python-modules/pip-tools/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first

     

       1
       1
       +
       { stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six, first

     

       2
       2
        
       , setuptools_scm, git, glibcLocales, mock }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "pip-tools";

     

       6
       6
       -
         version = "3.3.2";

     

       7
       7
       -
         name = pname + "-" + version;

     

       6
       6
       +
         version = "3.8.0";

     

       8
       7
        
       

     

       9
       9
       -
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://pypi/p/pip-tools/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda";

     

       8
       8
       +
         src = fetchPypi {

     

       9
       9
       +
           inherit pname version;

     

       10
       10
       +
           sha256 = "1vwh3hx4jrzf51yj9h31nk9ji53lqaq63mlqd7n84hcmfwy3rwz4";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       13
        
         LC_ALL = "en_US.UTF-8";

     
···

       17
       16
        
       

     

       18
       17
        
         disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [

     

       19
       18
        
           # Depend on network tests:

     

       19
       19
       +
           "test_allow_unsafe_option" #paramaterized, but all fail

     

       20
       20
       +
           "test_annotate_option" #paramaterized, but all fail

     

       20
       21
        
           "test_editable_package_vcs"

     

       22
       22
       +
           "test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore

     

       23
       23
       +
           "test_filter_pip_markers"

     

       24
       24
       +
           "test_filter_pip_markes"

     

       21
       25
        
           "test_generate_hashes_all_platforms"

     

       26
       26
       +
           "test_generate_hashes_verbose"

     

       27
       27
       +
           "test_generate_hashes_with_editable"

     

       28
       28
       +
           "test_generate_hashes_with_url"

     

       22
       29
        
           "test_generate_hashes_without_interfering_with_each_other"

     

       30
       30
       +
           "test_get_hashes_local_repository_cache_miss"

     

       23
       31
        
           "test_realistic_complex_sub_dependencies"

     

       24
       24
       -
           "test_generate_hashes_with_editable"

     

       25
       25
       -
           "test_filter_pip_markes"

     

       26
       26
       -
           "test_get_hashes_local_repository_cache_miss"

     

       32
       32
       +
           "test_stdin"

     

       33
       33
       +
           "test_upgrade_packages_option"

     

       34
       34
       +
           "test_url_package"

     

       27
       35
        
           # Expect specific version of "six":

     

       28
       36
        
           "test_editable_package"

     

       29
       37
        
           "test_input_file_without_extension"

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytesseract";

     

       5
       5
       -
         version = "0.2.6";

     

       5
       5
       +
         version = "0.2.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi";

     

       9
       9
       +
           sha256 = "0vyv6wnch1l5kcxqzngakx948qz90q604bl5h93x54381lq3ndj6";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = [

+2 -2

pkgs/development/python-modules/pytest-django/default.nix

···

       10
       10
        
       }:

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pytest-django";

     

       13
       13
       -
         version = "3.4.8";

     

       13
       13
       +
         version = "3.5.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "1vj2xfb6jl570zmmwlhvfpj7af5q554z72z51ril07gyfkkq6cjd";

     

       17
       17
       +
           sha256 = "1fynkswykgnqn8wqibavf598md5p005ilcac6sk4hpfv0v2v8kr6";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pytest setuptools_scm ];

+17 -4

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, click, ipython }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
       2
       +
       , click

     

       3
       3
       +
       , ipython

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       , sh

     

       6
       6
       +
       , typing

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       buildPythonPackage rec {

     

       4
       10
        
         pname = "python-dotenv";

     

       5
       5
       -
         version = "0.10.2";

     

       11
       11
       +
         version = "0.10.3";

     

       6
       12
        
       

     

       7
       13
        
         src = fetchPypi {

     

       8
       14
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "6640acd76e6cab84648e4fec16c9d19de6700971f9d91d045e7120622167bfda";

     

       15
       15
       +
           sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi";

     

       10
       16
        
         };

     

       11
       17
        
       

     

       12
       12
       -
         checkInputs = [ click ipython ];

     

       18
       18
       +
         propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];

     

       19
       19
       +
       

     

       20
       20
       +
         checkInputs = [ ipython pytest sh ];

     

       21
       21
       +
       

     

       22
       22
       +
         # cli tests are impure

     

       23
       23
       +
         checkPhase = ''

     

       24
       24
       +
           pytest tests/ -k 'not cli'

     

       25
       25
       +
         '';

     

       13
       26
        
       

     

       14
       27
        
         meta = with lib; {

     

       15
       28
        
           description = "Add .env support to your django/flask apps in development and deployments";

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "QtPy";

     

       5
       5
       -
         version = "1.7.1";

     

       5
       5
       +
         version = "1.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "17pdn4d77gjjrsq7m1i6dz9px0dfi6wgaqz2v3sa3crl15spawp9";

     

       9
       9
       +
           sha256 = "14hws3zc2d548bfkxk1j2xy4ll368rak3z16bz3pdlj9j259jrpb";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # no concrete propagatedBuildInputs as multiple backends are supposed

+2 -1

pkgs/development/python-modules/requests-toolbelt/default.nix

···

       5
       5
        
       , betamax

     

       6
       6
        
       , mock

     

       7
       7
        
       , pytest

     

       8
       8
       +
       , pyopenssl

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       buildPythonPackage rec {

     
···

       16
       17
        
           sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       19
       -
         checkInputs = [ betamax mock pytest ];

     

       20
       20
       +
         checkInputs = [ pyopenssl betamax mock pytest ];

     

       20
       21
        
         propagatedBuildInputs = [ requests ];

     

       21
       22
        
       

     

       22
       23
        
         checkPhase = ''

+2 -2

pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "3.2.0";

     

       4
       4
       +
         version = "3.3.1";

     

       5
       5
        
         pname = "robotframework-seleniumlibrary";

     

       6
       6
        
       

     

       7
       7
        
         # no tests included in PyPI tarball

     
···

       9
       9
        
           owner = "robotframework";

     

       10
       10
        
           repo = "SeleniumLibrary";

     

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

     

       12
       12
       -
           sha256 = "106dl0qgf52wqk1xn4ghj7n2fjhaq0fh2wlnqn29aczbv5q581y3";

     

       12
       12
       +
           sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [ robotframework selenium ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "sabyenc";

     

       5
       5
       -
         version = "3.3.5";

     

       5
       5
       +
         version = "3.3.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0fpvd5mckf1kbn0bhc5ybm08y41ps7sc5f9khz08qyjbikbcww85";

     

       9
       9
       +
           sha256 = "1qbymi1626mmcxnsqdwnz2krxg7jvl4qbh8nwjj54z2p681wvjm4";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # tests are not included in pypi distribution

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "snakeviz";

     

       5
       5
       -
         version = "2.0.0";

     

       5
       5
       +
         version = "2.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa";

     

       9
       9
       +
           sha256 = "11a8cd4g98vq2x61i99ncl5w83clnndwg909ya4y1cdf0k1ckb40";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # Upstream doesn't run tests from setup.py

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "statsmodels";

     

       16
       16
       -
         version = "0.9.0";

     

       16
       16
       +
         version = "0.10.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "6461f93a842c649922c2c9a9bc9d9c4834110b89de8c4af196a791ab8f42ba3b";

     

       20
       20
       +
           sha256 = "1fhsq3bz5ya54ipa0cb8qgfj7gfgxprv4briig0ly4r11rj23wv5";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = with self; [ nose ];

+2 -2

pkgs/development/python-modules/tensorflow-estimator/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "tensorflow-estimator";

     

       9
       9
       -
         version = "1.13.0";

     

       9
       9
       +
         version = "1.14.0";

     

       10
       10
        
         format = "wheel";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           pname = "tensorflow_estimator";

     

       14
       14
        
           inherit version format;

     

       15
       15
       -
           sha256 = "068l4w0w7dj9gqkf8avjclq9zsp7ifwzw4rpf4qjylz3hczamzbw";

     

       15
       15
       +
           sha256 = "14irpsyj14vn2dpwr601f54058wywci1pv0hss8s01rl0rk3y1ya";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ mock numpy absl-py ];

+82 -13

pkgs/development/python-modules/tensorflow-probability/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       +
       , buildBazelPackage

     

       3
       4
        
       , buildPythonPackage

     

       5
       5
       +
       , python

     

       6
       6
       +
       , setuptools

     

       7
       7
       +
       , wheel

     

       4
       8
        
       , tensorflow

     

       9
       9
       +
       , six

     

       10
       10
       +
       , numpy

     

       11
       11
       +
       , decorator

     

       12
       12
       +
       , cloudpickle

     

       13
       13
       +
       , hypothesis

     

       14
       14
       +
       , scipy

     

       15
       15
       +
       , matplotlib

     

       16
       16
       +
       , mock

     

       5
       17
        
       , pytest

     

       6
       18
        
       }:

     

       7
       19
        
       

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "tensorflow-probability";

     

       10
       10
       -
         version = "0.6.0";

     

       20
       20
       +
       let

     

       21
       21
       +
         version = "0.7";

     

       22
       22
       +
         pname = "tensorflow_probability";

     

       23
       23
       +
       

     

       24
       24
       +
         # first build all binaries and generate setup.py using bazel

     

       25
       25
       +
         bazel-wheel = buildBazelPackage {

     

       26
       26
       +
           name = "${pname}-${version}-py2.py3-none-any.whl";

     

       27
       27
       +
       

     

       28
       28
       +
           src = fetchFromGitHub {

     

       29
       29
       +
             owner = "tensorflow";

     

       30
       30
       +
             repo = "probability";

     

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

     

       32
       32
       +
             sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";

     

       33
       33
       +
           };

     

       34
       34
       +
       

     

       35
       35
       +
           nativeBuildInputs = [

     

       36
       36
       +
             # needed to create the output wheel in installPhase

     

       37
       37
       +
             python

     

       38
       38
       +
             setuptools

     

       39
       39
       +
             wheel

     

       40
       40
       +
           ];

     

       41
       41
       +
       

     

       42
       42
       +
           bazelTarget = ":pip_pkg";

     

       43
       43
       +
       

     

       44
       44
       +
           fetchAttrs = {

     

       45
       45
       +
             sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";

     

       46
       46
       +
           };

     

       47
       47
       +
       

     

       48
       48
       +
           buildAttrs = {

     

       49
       49
       +
             preBuild = ''

     

       50
       50
       +
               patchShebangs .

     

       51
       51
       +
             '';

     

       52
       52
       +
       

     

       53
       53
       +
             installPhase = ''

     

       54
       54
       +
               # work around timestamp issues

     

       55
       55
       +
               # https://github.com/NixOS/nixpkgs/issues/270#issuecomment-467583872

     

       56
       56
       +
               export SOURCE_DATE_EPOCH=315532800

     

       11
       57
        
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "tensorflow";

     

       14
       14
       -
           repo = "probability";

     

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

     

       16
       16
       -
           sha256 = "1y210n4asv8j39pk68bdfrz01gddflvzhxbcvj5jw6rjgaagnhvx";

     

       58
       58
       +
               # First build, then move. Otherwise pip_pkg would create the dir $out

     

       59
       59
       +
               # and then put the wheel in that directory. However we want $out to

     

       60
       60
       +
               # point directly to the wheel file.

     

       61
       61
       +
               ./bazel-bin/pip_pkg . --release

     

       62
       62
       +
               mv *.whl "$out"

     

       63
       63
       +
             '';

     

       64
       64
       +
           };

     

       17
       65
        
         };

     

       66
       66
       +
       in buildPythonPackage rec {

     

       67
       67
       +
         inherit version pname;

     

       68
       68
       +
         format = "wheel";

     

       69
       69
       +
       

     

       70
       70
       +
         src = bazel-wheel;

     

       18
       71
        
       

     

       19
       72
        
         propagatedBuildInputs = [

     

       20
       73
        
           tensorflow

     

       74
       74
       +
           six

     

       75
       75
       +
           numpy

     

       76
       76
       +
           decorator

     

       77
       77
       +
           cloudpickle

     

       21
       78
        
         ];

     

       22
       79
        
       

     

       80
       80
       +
         # Listed here:

     

       81
       81
       +
         # https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58

     

       23
       82
        
         checkInputs = [

     

       83
       83
       +
           hypothesis

     

       24
       84
        
           pytest

     

       85
       85
       +
           scipy

     

       86
       86
       +
           matplotlib

     

       87
       87
       +
           mock

     

       25
       88
        
         ];

     

       26
       89
        
       

     

       27
       27
       -
         # Tests have an invalid import (`tensorflow_probability.opensource`), should

     

       28
       28
       -
         # be resolved in the next version with

     

       29
       29
       -
         # https://github.com/tensorflow/probability/commit/77d5957f2f0bdddcb46582799cd9c5c5167a1a40

     

       30
       30
       -
         doCheck = false;

     

       90
       90
       +
         # actual checks currently fail because for some reason

     

       91
       91
       +
         # tf.enable_eager_execution is called too late. Probably because upstream

     

       92
       92
       +
         # intents these tests to be run by bazel, not plain pytest.

     

       93
       93
       +
         # checkPhase = ''

     

       94
       94
       +
         #   # tests need to import from other test files

     

       95
       95
       +
         #   export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH"

     

       96
       96
       +
         #   py.test

     

       97
       97
       +
         # '';

     

       98
       98
       +
       

     

       99
       99
       +
         # sanity check

     

       31
       100
        
         checkPhase = ''

     

       32
       32
       -
           py.test

     

       101
       101
       +
           python -c 'import tensorflow_probability'

     

       33
       102
        
         '';

     

       34
       103
        
       

     

       35
       104
        
         meta = with lib; {

+3 -3

pkgs/development/python-modules/tensorflow-tensorboard/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "tensorflow-tensorboard";

     

       17
       17
       -
         version = "1.13.0";

     

       17
       17
       +
         version = "1.14.0";

     

       18
       18
        
         format = "wheel";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi ({

     
···

       23
       23
        
           format = "wheel";

     

       24
       24
        
         } // (if isPy3k then {

     

       25
       25
        
           python = "py3";

     

       26
       26
       -
           sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2";

     

       26
       26
       +
           sha256 = "1z631614jk5zgasgmwfr33gz8bwv11p9f5llzlwvx3a8rnyv3q2h";

     

       27
       27
        
         } else {

     

       28
       28
        
           python = "py2";

     

       29
       29
       -
           sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf";

     

       29
       29
       +
           sha256 = "1clv29yy942l3mfar2z6wkkk6l18fz7j6mi2dfz24j9dln0scny3";

     

       30
       30
        
         }));

     

       31
       31
        
       

     

       32
       32
        
         propagatedBuildInputs = [

+20 -4

pkgs/development/python-modules/tensorflow/bin.nix

···

       5
       5
        
       , isPy3k, pythonOlder

     

       6
       6
        
       , astor

     

       7
       7
        
       , gast

     

       8
       8
       +
       , google-pasta

     

       9
       9
       +
       , wrapt

     

       8
       10
        
       , numpy

     

       9
       11
        
       , six

     

       10
       12
        
       , termcolor

     
···

       41
       43
        
       

     

       42
       44
        
       in buildPythonPackage rec {

     

       43
       45
        
         pname = "tensorflow";

     

       44
       44
       -
         version = "1.13.1";

     

       46
       46
       +
         version = "1.14.0";

     

       45
       47
        
         format = "wheel";

     

       46
       48
        
       

     

       47
       49
        
         src = let

     
···

       53
       55
        
           dls = import (./. + "/tf${version}-hashes.nix");

     

       54
       56
        
         in fetchurl dls.${key};

     

       55
       57
        
       

     

       56
       56
       -
         propagatedBuildInputs = [  protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ]

     

       57
       57
       -
                        ++ lib.optional (!isPy3k) mock

     

       58
       58
       -
                        ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];

     

       58
       58
       +
         propagatedBuildInputs = [

     

       59
       59
       +
           protobuf

     

       60
       60
       +
           numpy

     

       61
       61
       +
           termcolor

     

       62
       62
       +
           grpcio

     

       63
       63
       +
           six

     

       64
       64
       +
           astor

     

       65
       65
       +
           absl-py

     

       66
       66
       +
           gast

     

       67
       67
       +
           google-pasta

     

       68
       68
       +
           wrapt

     

       69
       69
       +
           tensorflow-estimator

     

       70
       70
       +
           tensorflow-tensorboard

     

       71
       71
       +
           keras-applications

     

       72
       72
       +
           keras-preprocessing

     

       73
       73
       +
         ] ++ lib.optional (!isPy3k) mock

     

       74
       74
       +
           ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];

     

       59
       75
        
       

     

       60
       76
        
         # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow

     

       61
       77
        
         # and the propageted input tensorflow-tensorboard which causes environment collisions.

+1 -1

pkgs/development/python-modules/tensorflow/prefetcher.sh

···

       1
       1
       -
       version=1.13.1

     

       1
       1
       +
       version=1.14.0

     

       2
       2
        
       hashfile=tf${version}-hashes.nix

     

       3
       3
        
       rm -f $hashfile

     

       4
       4
        
       echo "{" >> $hashfile

-42

pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix

···

       1
       1
       -
       {

     

       2
       2
       -
       linux_py_27_cpu = {

     

       3
       3
       -
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp27-none-linux_x86_64.whl";

     

       4
       4
       -
         sha256 = "0y1vd3y5fxcjj5d35qbk8482b0s642nyp0c2sm068vx5wd4sjpcg";

     

       5
       5
       -
       };

     

       6
       6
       -
       linux_py_35_cpu = {

     

       7
       7
       -
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp35-cp35m-linux_x86_64.whl";

     

       8
       8
       -
         sha256 = "0b27swk4c2vaimwzbzl4c7xnccr9cfak5a3848lfqlcavcmbp94j";

     

       9
       9
       -
       };

     

       10
       10
       -
       linux_py_36_cpu = {

     

       11
       11
       -
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl";

     

       12
       12
       -
         sha256 = "087jwjby3bym09z55cjhc587aasf01y6l009p1q2vcpfq7s7ljmk";

     

       13
       13
       -
       };

     

       14
       14
       -
       linux_py_37_cpu = {

     

       15
       15
       -
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp37-cp37m-linux_x86_64.whl";

     

       16
       16
       -
         sha256 = "0as68dp87lh7ffcccb149km6vws15ap04604irxwz35fq9h7grxg";

     

       17
       17
       -
       };

     

       18
       18
       -
       linux_py_27_gpu = {

     

       19
       19
       -
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp27-none-linux_x86_64.whl";

     

       20
       20
       -
         sha256 = "0bf239f2bnsbqs3qh4xdql9pgbsm0zk7j8q1hg0wn0wrq440n0ds";

     

       21
       21
       -
       };

     

       22
       22
       -
       linux_py_35_gpu = {

     

       23
       23
       -
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp35-cp35m-linux_x86_64.whl";

     

       24
       24
       -
         sha256 = "1cqav22a8yz6fzk46z6kv1ha2i28h5wccbd7k66drrfxibmb93j0";

     

       25
       25
       -
       };

     

       26
       26
       -
       linux_py_36_gpu = {

     

       27
       27
       -
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp36-cp36m-linux_x86_64.whl";

     

       28
       28
       -
         sha256 = "1xnbiz36z7nicqrv0cmymfnwb8mdz2hifcv71gh6gnyi1962f2d7";

     

       29
       29
       -
       };

     

       30
       30
       -
       linux_py_37_gpu = {

     

       31
       31
       -
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp37-cp37m-linux_x86_64.whl";

     

       32
       32
       -
         sha256 = "10gcrmd9y5a89wpi4rpp9scc9l2krijv8yjp7iphlykmn54ps74k";

     

       33
       33
       -
       };

     

       34
       34
       -
       mac_py_2_cpu = {

     

       35
       35
       -
         url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py2-none-any.whl";

     

       36
       36
       -
         sha256 = "1a6y5xj2wqkd8qmabn2xjg3q7x2jfixwrz351dgcxlhy8qy5yc0g";

     

       37
       37
       -
       };

     

       38
       38
       -
       mac_py_3_cpu = {

     

       39
       39
       -
         url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py3-none-any.whl";

     

       40
       40
       -
         sha256 = "1klsv18k0isfd61z1wirfz1lnqmx8k73ga8g9s18yand65iycads";

     

       41
       41
       -
       };

     

       42
       42
       -
       }

+42

pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix

···

       1
       1
       +
       {

     

       2
       2
       +
       linux_py_27_cpu = {

     

       3
       3
       +
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl";

     

       4
       4
       +
         sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k";

     

       5
       5
       +
       };

     

       6
       6
       +
       linux_py_35_cpu = {

     

       7
       7
       +
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl";

     

       8
       8
       +
         sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj";

     

       9
       9
       +
       };

     

       10
       10
       +
       linux_py_36_cpu = {

     

       11
       11
       +
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl";

     

       12
       12
       +
         sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44";

     

       13
       13
       +
       };

     

       14
       14
       +
       linux_py_37_cpu = {

     

       15
       15
       +
         url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl";

     

       16
       16
       +
         sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5";

     

       17
       17
       +
       };

     

       18
       18
       +
       linux_py_27_gpu = {

     

       19
       19
       +
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl";

     

       20
       20
       +
         sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5";

     

       21
       21
       +
       };

     

       22
       22
       +
       linux_py_35_gpu = {

     

       23
       23
       +
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl";

     

       24
       24
       +
         sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx";

     

       25
       25
       +
       };

     

       26
       26
       +
       linux_py_36_gpu = {

     

       27
       27
       +
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl";

     

       28
       28
       +
         sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd";

     

       29
       29
       +
       };

     

       30
       30
       +
       linux_py_37_gpu = {

     

       31
       31
       +
         url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl";

     

       32
       32
       +
         sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2";

     

       33
       33
       +
       };

     

       34
       34
       +
       mac_py_2_cpu = {

     

       35
       35
       +
         url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl";

     

       36
       36
       +
         sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26";

     

       37
       37
       +
       };

     

       38
       38
       +
       mac_py_3_cpu = {

     

       39
       39
       +
         url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl";

     

       40
       40
       +
         sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3";

     

       41
       41
       +
       };

     

       42
       42
       +
       }

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "tomlkit";

     

       7
       7
       -
         version = "0.5.3";

     

       7
       7
       +
         version = "0.5.4";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "1hjfzlb6y694pkadygcaq1n63di97pxgq2zpc74in1axc5166l6n";

     

       11
       11
       +
           sha256 = "1pby2lbzwy2pwdbq8xaqi4560b1ih5m0y141mmbc446j3w168fvv";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs =

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "twilio";

     

       6
       6
       -
         version = "6.28.0";

     

       6
       6
       +
         version = "6.29.0";

     

       7
       7
        
         # tests not included in PyPi, so fetch from github instead

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "twilio";

     

       10
       10
        
           repo = "twilio-python";

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "161s4nb4hhqgb8kc5wiq3s4jkv9a3fg9vycf5ga804vzfr04zlki";

     

       12
       12
       +
           sha256 = "1xsg862d68rdrl6m3v9zcq20h42jn6x9cv1bk2ydiizyn6ngqz8w";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ nose mock ];

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "vega";

     

       6
       6
       -
         version = "2.1.0";

     

       6
       6
       +
         version = "2.3.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb";

     

       10
       10
       +
           sha256 = "0f39kfinn297gjhms9jys3ixdlsn0dz3gndgacyimp77jhzir4v1";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ pytest ];

+2 -2

pkgs/development/python-modules/virtual-display/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "PyVirtualDisplay";

     

       5
       5
       -
         version = "0.2.3";

     

       5
       5
       +
         version = "0.2.4";

     

       6
       6
        
       

     

       7
       7
        
         propagatedBuildInputs = [ EasyProcess ];

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "658d03ea2d6727cbe70c30af71e9014d3d39114a3c50bd661b75aad188fdd3aa";

     

       11
       11
       +
           sha256 = "0nybvd7sajig6vya2v3fd20dls6f3nnf12x8anrfxnjs41chgx87";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # requires X server

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "xarray";

     

       13
       13
       -
         version = "0.12.1";

     

       13
       13
       +
         version = "0.12.2";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "ac09a819e791be208ae33fa7ecee19d0fe7b5479906f927d358a61957ce27e10";

     

       17
       17
       +
           sha256 = "0wlpyzxdhcc043g9sjbrflky7xwdyq487v64i532zb2fpjskd59s";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest ];

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "yamllint";

     

       6
       6
       -
         version = "1.15.0";

     

       6
       6
       +
         version = "1.16.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7";

     

       10
       10
       +
           sha256 = "1bw39aiyqspjsxps5m3skaszih8vap8kyialbzg7jjc080nyqkws";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         checkInputs = [ nose ];

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "ZConfig";

     

       11
       11
       -
         version = "3.4.0";

     

       11
       11
       +
         version = "3.5.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998";

     

       15
       15
       +
           sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;

+2 -2

pkgs/development/tools/analysis/checkstyle/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, jre }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "8.21";

     

       4
       4
       +
         version = "8.22";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";

     

       9
       9
       -
           sha256 = "1jd6kbfmvgr3mr8kjhhr1fj1i3j36ysnfi14g5027ngwbq7klm7d";

     

       9
       9
       +
           sha256 = "0lnpzh4c5m8xkdx8dxywp33i3zrnwj1nhgpqnqgx31aw3x0drw40";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/development/tools/analysis/cppcheck/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cppcheck";

     

       5
       5
       -
         version = "1.87";

     

       5
       5
       +
         version = "1.88";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/${pname}/${name}.tar.bz2";

     

       10
       10
       -
           sha256 = "1jl1qlr8la1rix1ffcvl6s4arv2n9fvx85sl4zgp29428xks9c73";

     

       10
       10
       +
           sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ pcre ];

+3 -3

pkgs/development/tools/analysis/tflint/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "tflint";

     

       5
       5
       -
         version = "0.8.3";

     

       5
       5
       +
         version = "0.9.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "wata727";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "0kqlwncsxssi1jchmrg1wmv7dknp0shx33j7kkryy12wdxxcbwyb";

     

       11
       11
       +
           sha256 = "1k050kcgvy21jk01mkgscfl7hlfgaa1621920w111fghqxibssan";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         modSha256 = "1j5hjr4l4ivvhrywk286zczsn9balaaq5l5qx4ga4v0llwspmygm";

     

       14
       14
       +
         modSha256 = "17pm6v34gya8bgz8g5hh1cijjldk78j53x9yvsjpcjnqm7l0clcd";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "." ];

     

       17
       17

+21 -7

pkgs/development/tools/bazel-watcher/default.nix

···

       1
       1
        
       { buildBazelPackage

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       +
       , fetchpatch

     

       3
       4
        
       , git

     

       4
       5
        
       , go

     

       5
       6
        
       , python

     

       6
       7
        
       , stdenv

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       10
       10
       +
       let

     

       11
       11
       +
         patches = [

     

       12
       12
       +
           ./use-go-in-path.patch

     

       13
       13
       +
       

     

       14
       14
       +
           # update rules_go to fix the build. Remove these when updating past 0.10.3

     

       15
       15
       +
           (fetchpatch {

     

       16
       16
       +
             url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch";

     

       17
       17
       +
             sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb";

     

       18
       18
       +
           })

     

       19
       19
       +
           (fetchpatch {

     

       20
       20
       +
             url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch";

     

       21
       21
       +
             sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6";

     

       22
       22
       +
           })

     

       23
       23
       +
         ];

     

       24
       24
       +
       in

     

       9
       25
        
       buildBazelPackage rec {

     

       10
       26
        
         name = "bazel-watcher-${version}";

     

       11
       27
        
         version = "0.10.3";

     
···

       22
       38
        
         bazelTarget = "//ibazel";

     

       23
       39
        
       

     

       24
       40
        
         fetchAttrs = {

     

       41
       41
       +
           inherit patches;

     

       42
       42
       +
       

     

       25
       43
        
           preBuild = ''

     

       26
       44
        
             patchShebangs .

     

       27
       27
       -
       

     

       28
       28
       -
             # tell rules_go to use the Go binary found in the PATH

     

       29
       29
       -
             sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE

     

       30
       45
        
           '';

     

       31
       46
        
       

     

       32
       47
        
           preInstall = ''

     
···

       47
       62
        
             sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker

     

       48
       63
        
           '';

     

       49
       64
        
       

     

       50
       50
       -
           sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny";

     

       65
       65
       +
           sha256 = "01d4m4kb2mhz8fxl9apzsdq0pd7i79w3q49x51rwa524caml9zfv";

     

       51
       66
        
         };

     

       52
       67
        
       

     

       53
       68
        
         buildAttrs = {

     

       69
       69
       +
           inherit patches;

     

       70
       70
       +
       

     

       54
       71
        
           preBuild = ''

     

       55
       72
        
             patchShebangs .

     

       56
       56
       -
       

     

       57
       57
       -
             # tell rules_go to use the Go binary found in the PATH

     

       58
       58
       -
             sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE

     

       59
       73
        
           '';

     

       60
       74
        
       

     

       61
       75
        
           installPhase = ''

+13

pkgs/development/tools/bazel-watcher/use-go-in-path.patch

···

       1
       1
       +
       diff --git a/WORKSPACE b/WORKSPACE

     

       2
       2
       +
       index 51273b6..fcf9ffb 100644

     

       3
       3
       +
       --- a/WORKSPACE

     

       4
       4
       +
       +++ b/WORKSPACE

     

       5
       5
       +
       @@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe

     

       6
       6
       +
        

     

       7
       7
       +
        go_rules_dependencies()

     

       8
       8
       +
        

     

       9
       9
       +
       -go_register_toolchains()

     

       10
       10
       +
       +go_register_toolchains(go_version = "host")

     

       11
       11
       +
        

     

       12
       12
       +
        load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")

     

       13
       13
       +

+7 -4

pkgs/development/tools/bazelisk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "bazelisk";

     

       5
       5
       -
         version = "0.0.7";

     

       5
       5
       +
         version = "0.0.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "philwo";

     

       8
       8
       +
           owner = "bazelbuild";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "177x0mal960gs8578h5ir51vgn1bndm9z091110gqxb9xs9jq8pf";

     

       11
       11
       +
           sha256 = "16jiy71x8zr3x94p3qms3xbl8632avhwi66i82wv03n4ahkyb6qr";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";

     

       15
       15
        
       

     

       16
       16
        
         meta = with stdenv.lib; {

     

       17
       17
        
           description = "A user-friendly launcher for Bazel";

     

       18
       18
       -
           homepage = https://github.com/philwo/bazelisk;

     

       18
       18
       +
           longDescription = ''

     

       19
       19
       +
             BEWARE: This package does not work on NixOS.

     

       20
       20
       +
           '';

     

       21
       21
       +
           homepage = "https://github.com/bazelbuild/bazelisk";

     

       19
       22
        
           license = licenses.asl20;

     

       20
       23
        
           maintainers = with maintainers; [ elasticdog ];

     

       21
       24
        
         };

+49

pkgs/development/tools/build-managers/bazel/cpp-test.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         bazel

     

       3
       3
       +
       , bazelTest

     

       4
       4
       +
       , bazel-examples

     

       5
       5
       +
       , gccStdenv

     

       6
       6
       +
       , lib

     

       7
       7
       +
       , runLocal

     

       8
       8
       +
       , runtimeShell

     

       9
       9
       +
       , writeScript

     

       10
       10
       +
       , writeText

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       let

     

       14
       14
       +
       

     

       15
       15
       +
         toolsBazel = writeScript "bazel" ''

     

       16
       16
       +
           #! ${runtimeShell}

     

       17
       17
       +
       

     

       18
       18
       +
           export CXX='${gccStdenv.cc}/bin/g++'

     

       19
       19
       +
           export LD='${gccStdenv.cc}/bin/ld'

     

       20
       20
       +
           export CC='${gccStdenv.cc}/bin/gcc'

     

       21
       21
       +
       

     

       22
       22
       +
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       23
       23
       +
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       24
       24
       +
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       25
       25
       +
       

     

       26
       26
       +
           exec "$BAZEL_REAL" "$@"

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         workspaceDir = runLocal "our_workspace" {} (''

     

       30
       30
       +
           cp -r ${bazel-examples}/cpp-tutorial/stage3 $out

     

       31
       31
       +
           find $out -type d -exec chmod 755 {} \;

     

       32
       32
       +
         ''

     

       33
       33
       +
         + (lib.optionalString gccStdenv.isDarwin ''

     

       34
       34
       +
           mkdir $out/tools

     

       35
       35
       +
           cp ${toolsBazel} $out/tools/bazel

     

       36
       36
       +
         ''));

     

       37
       37
       +
       

     

       38
       38
       +
         testBazel = bazelTest {

     

       39
       39
       +
           name = "bazel-test-cpp";

     

       40
       40
       +
           inherit workspaceDir;

     

       41
       41
       +
           bazelPkg = bazel;

     

       42
       42
       +
           bazelScript = ''

     

       43
       43
       +
             ${bazel}/bin/bazel \

     

       44
       44
       +
               build --verbose_failures \

     

       45
       45
       +
                 //...

     

       46
       46
       +
           '';

     

       47
       47
       +
         };

     

       48
       48
       +
       

     

       49
       49
       +
       in testBazel

+34 -12

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

···

       1
       1
       -
       { stdenv, callPackage, lib, fetchurl, runCommand, runCommandCC, makeWrapper

     

       1
       1
       +
       { stdenv, callPackage, lib, fetchurl, fetchFromGitHub, runCommand, runCommandCC, makeWrapper

     

       2
       2
        
       # this package (through the fixpoint glass)

     

       3
       3
        
       , bazel

     

       4
       4
        
       , lr, xe, zip, unzip, bash, writeCBin, coreutils

     
···

       94
       94
        
         # however it contains prebuilt java binaries, with wrong interpreter

     

       95
       95
        
         # and libraries path.

     

       96
       96
        
         # We prefetch it, patch it, and override it in a global bazelrc.

     

       97
       97
       -
         system = if stdenv.hostPlatform.isDarwin

     

       98
       98
       -
                  then "darwin" else "linux";

     

       97
       97
       +
         system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";

     

       99
       98
        
       

     

       100
       99
        
         remote_java_tools = stdenv.mkDerivation {

     

       101
       100
        
           name = "remote_java_tools_${system}";

     
···

       133
       132
        
         sourceRoot = ".";

     

       134
       133
        
       

     

       135
       134
        
         patches = [

     

       135
       135
       +
           # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''

     

       136
       136
       +
           # This is breaking the build of any C target. This patch removes the last

     

       137
       137
       +
           # argument if it's found to be an empty string.

     

       138
       138
       +
           ./trim-last-argument-to-gcc-if-empty.patch

     

       139
       139
       +
       

     

       136
       140
        
           ./python-stub-path-fix.patch

     

       137
       141
        
         ] ++ lib.optional enableNixHacks ./nix-hacks.patch;

     

       138
       142
        
       

     
···

       144
       148
        
         # in the nixpkgs checkout root to exercise them locally.

     

       145
       149
        
         passthru.tests =

     

       146
       150
        
           let

     

       147
       147
       -
             runLocal = name: attrs: script: runCommandCC name ({

     

       151
       151
       +
             runLocal = name: attrs: script:

     

       152
       152
       +
             let

     

       153
       153
       +
               attrs' = removeAttrs attrs [ "buildInputs" ];

     

       154
       154
       +
               buildInputs = [ python3 ] ++ (attrs.buildInputs or []);

     

       155
       155
       +
             in

     

       156
       156
       +
             runCommandCC name ({

     

       157
       157
       +
               inherit buildInputs;

     

       148
       158
        
               preferLocalBuild = true;

     

       149
       159
        
               meta.platforms = platforms;

     

       150
       150
       -
               buildInputs = [ python3 ];

     

       151
       151
       -
             } // attrs) script;

     

       160
       160
       +
             } // attrs') script;

     

       152
       161
        
       

     

       153
       162
        
             # bazel wants to extract itself into $install_dir/install every time it runs,

     

       154
       163
        
             # so let’s do that only once.

     
···

       168
       177
        
                   cp -R ${install_dir} $out

     

       169
       178
        
                 '';

     

       170
       179
        
       

     

       171
       171
       -
             bazelTest = { name, bazelScript, workspaceDir, bazelPkg }:

     

       180
       180
       +
             bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:

     

       172
       181
        
               let

     

       173
       182
        
                 be = extracted bazelPkg;

     

       174
       174
       -
               in runLocal name {} (

     

       183
       183
       +
               in runLocal name { inherit buildInputs; } (

     

       175
       184
        
                 # skip extraction caching on Darwin, because nobody knows how Darwin works

     

       176
       185
        
                 (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

     

       177
       186
        
                   # set up home with pre-unpacked bazel

     
···

       198
       207
        
                 '');

     

       199
       208
        
       

     

       200
       209
        
             bazelWithNixHacks = bazel.override { enableNixHacks = true; };

     

       210
       210
       +
       

     

       211
       211
       +
             bazel-examples = fetchFromGitHub {

     

       212
       212
       +
               owner = "bazelbuild";

     

       213
       213
       +
               repo = "examples";

     

       214
       214
       +
               rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc";

     

       215
       215
       +
               sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8";

     

       216
       216
       +
             };

     

       217
       217
       +
       

     

       201
       218
        
           in {

     

       202
       202
       -
             pythonBinPathWithoutNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };

     

       203
       203
       -
             bashToolsWithoutNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };

     

       219
       219
       +
             bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };

     

       220
       220
       +
             cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; };

     

       221
       221
       +
             java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; };

     

       222
       222
       +
             protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; };

     

       223
       223
       +
             pythonBinPath = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };

     

       204
       224
        
       

     

       225
       225
       +
             bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };

     

       226
       226
       +
             cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };

     

       227
       227
       +
             javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };

     

       228
       228
       +
             protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };

     

       205
       229
        
             pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; };

     

       206
       206
       -
             bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };

     

       207
       230
        
           };

     

       208
       231
        
       

     

       209
       232
        
         # update the list of workspace dependencies

     
···

       220
       243
        
         __darwinAllowLocalNetworking = true;

     

       221
       244
        
       

     

       222
       245
        
         # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.

     

       223
       223
       -
       

     

       224
       246
        
         customBash = writeCBin "bash" ''

     

       225
       247
        
           #include <stdio.h>

     

       226
       248
        
           #include <stdlib.h>

+56

pkgs/development/tools/build-managers/bazel/java-test.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         bazel

     

       3
       3
       +
       , bazelTest

     

       4
       4
       +
       , bazel-examples

     

       5
       5
       +
       , gccStdenv

     

       6
       6
       +
       , lib

     

       7
       7
       +
       , openjdk8

     

       8
       8
       +
       , runLocal

     

       9
       9
       +
       , runtimeShell

     

       10
       10
       +
       , writeScript

     

       11
       11
       +
       , writeText

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       let

     

       15
       15
       +
       

     

       16
       16
       +
         toolsBazel = writeScript "bazel" ''

     

       17
       17
       +
           #! ${runtimeShell}

     

       18
       18
       +
       

     

       19
       19
       +
           export CXX='${gccStdenv.cc}/bin/g++'

     

       20
       20
       +
           export LD='${gccStdenv.cc}/bin/ld'

     

       21
       21
       +
           export CC='${gccStdenv.cc}/bin/gcc'

     

       22
       22
       +
       

     

       23
       23
       +
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       24
       24
       +
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       25
       25
       +
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       26
       26
       +
       

     

       27
       27
       +
           exec "$BAZEL_REAL" "$@"

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         workspaceDir = runLocal "our_workspace" {} (''

     

       31
       31
       +
           cp -r ${bazel-examples}/java-tutorial $out

     

       32
       32
       +
           find $out -type d -exec chmod 755 {} \;

     

       33
       33
       +
         ''

     

       34
       34
       +
         + (lib.optionalString gccStdenv.isDarwin ''

     

       35
       35
       +
           mkdir $out/tools

     

       36
       36
       +
           cp ${toolsBazel} $out/tools/bazel

     

       37
       37
       +
         ''));

     

       38
       38
       +
       

     

       39
       39
       +
         testBazel = bazelTest {

     

       40
       40
       +
           name = "bazel-test-cpp";

     

       41
       41
       +
           inherit workspaceDir;

     

       42
       42
       +
           bazelPkg = bazel;

     

       43
       43
       +
           buildInputs = [ openjdk8 ];

     

       44
       44
       +
           bazelScript = ''

     

       45
       45
       +
             ${bazel}/bin/bazel \

     

       46
       46
       +
               run \

     

       47
       47
       +
                 --host_javabase='@local_jdk//:jdk' \

     

       48
       48
       +
                 --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \

     

       49
       49
       +
                 --javabase='@local_jdk//:jdk' \

     

       50
       50
       +
                 --verbose_failures \

     

       51
       51
       +
                 //:ProjectRunner

     

       52
       52
       +
           '';

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
       in testBazel

     

       56
       56
       +

+152

pkgs/development/tools/build-managers/bazel/protobuf-test.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         bazel

     

       3
       3
       +
       , bazelTest

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , fetchurl

     

       6
       6
       +
       , gccStdenv

     

       7
       7
       +
       , lib

     

       8
       8
       +
       , openjdk8

     

       9
       9
       +
       , runLocal

     

       10
       10
       +
       , runtimeShell

     

       11
       11
       +
       , writeScript

     

       12
       12
       +
       , writeText

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       let

     

       16
       16
       +
         com_google_protobuf = fetchFromGitHub {

     

       17
       17
       +
           owner = "protocolbuffers";

     

       18
       18
       +
           repo = "protobuf";

     

       19
       19
       +
           rev = "v3.7.0";

     

       20
       20
       +
           sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         bazel_skylib = fetchFromGitHub {

     

       24
       24
       +
           owner = "bazelbuild";

     

       25
       25
       +
           repo = "bazel-skylib";

     

       26
       26
       +
           rev = "f83cb8dd6f5658bc574ccd873e25197055265d1c";

     

       27
       27
       +
           sha256 = "091fb0ky0956wgv8gghy9ay3yfx6497mb72qvibf0y9dllmxyn9l";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         net_zlib = fetchurl rec {

     

       31
       31
       +
           url = "https://zlib.net/zlib-1.2.11.tar.gz";

     

       32
       32
       +
           sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";

     

       33
       33
       +
       

     

       34
       34
       +
           passthru.sha256 = sha256;

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
         WORKSPACE = writeText "WORKSPACE" ''

     

       38
       38
       +
           workspace(name = "our_workspace")

     

       39
       39
       +
       

     

       40
       40
       +
           load("//:proto-support.bzl", "protobuf_deps")

     

       41
       41
       +
           protobuf_deps()

     

       42
       42
       +
         '';

     

       43
       43
       +
       

     

       44
       44
       +
         protoSupport = writeText "proto-support.bzl" ''

     

       45
       45
       +
           """Load dependencies needed to compile the protobuf library as a 3rd-party consumer."""

     

       46
       46
       +
       

     

       47
       47
       +
           load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

     

       48
       48
       +
       

     

       49
       49
       +
           def protobuf_deps():

     

       50
       50
       +
               """Loads common dependencies needed to compile the protobuf library."""

     

       51
       51
       +
       

     

       52
       52
       +
               if "zlib" not in native.existing_rules():

     

       53
       53
       +
                   # proto_library, cc_proto_library, and java_proto_library rules implicitly

     

       54
       54
       +
                   # depend on @com_google_protobuf for protoc and proto runtimes.

     

       55
       55
       +
                   # This statement defines the @com_google_protobuf repo.

     

       56
       56
       +
                   native.local_repository(

     

       57
       57
       +
                       name = "com_google_protobuf",

     

       58
       58
       +
                       path = "${com_google_protobuf}",

     

       59
       59
       +
                   )

     

       60
       60
       +
                   native.local_repository(

     

       61
       61
       +
                       name = "bazel_skylib",

     

       62
       62
       +
                       path = "${bazel_skylib}",

     

       63
       63
       +
                   )

     

       64
       64
       +
       

     

       65
       65
       +
                   native.bind(

     

       66
       66
       +
                       name = "zlib",

     

       67
       67
       +
                       actual = "@net_zlib//:zlib",

     

       68
       68
       +
                   )

     

       69
       69
       +
                   http_archive(

     

       70
       70
       +
                       name = "net_zlib",

     

       71
       71
       +
                       build_file = "@com_google_protobuf//:third_party/zlib.BUILD",

     

       72
       72
       +
                       sha256 = "${net_zlib.sha256}",

     

       73
       73
       +
                       strip_prefix = "zlib-1.2.11",

     

       74
       74
       +
                       urls = ["file://${net_zlib}"],

     

       75
       75
       +
                   )

     

       76
       76
       +
         '';

     

       77
       77
       +
       

     

       78
       78
       +
         personProto = writeText "person.proto" ''

     

       79
       79
       +
           syntax = "proto3";

     

       80
       80
       +
       

     

       81
       81
       +
           package person;

     

       82
       82
       +
       

     

       83
       83
       +
           message Person {

     

       84
       84
       +
             string name = 1;

     

       85
       85
       +
             int32 id = 2;

     

       86
       86
       +
             string email = 3;

     

       87
       87
       +
           }

     

       88
       88
       +
         '';

     

       89
       89
       +
       

     

       90
       90
       +
         personBUILD = writeText "BUILD" ''

     

       91
       91
       +
           proto_library(

     

       92
       92
       +
               name = "person_proto",

     

       93
       93
       +
               srcs = ["person.proto"],

     

       94
       94
       +
               visibility = ["//visibility:public"],

     

       95
       95
       +
           )

     

       96
       96
       +
       

     

       97
       97
       +
           java_proto_library(

     

       98
       98
       +
               name = "person_java_proto",

     

       99
       99
       +
               deps = [":person_proto"],

     

       100
       100
       +
           )

     

       101
       101
       +
       

     

       102
       102
       +
           cc_proto_library(

     

       103
       103
       +
               name = "person_cc_proto",

     

       104
       104
       +
               deps = [":person_proto"],

     

       105
       105
       +
           )

     

       106
       106
       +
         '';

     

       107
       107
       +
       

     

       108
       108
       +
         toolsBazel = writeScript "bazel" ''

     

       109
       109
       +
           #! ${runtimeShell}

     

       110
       110
       +
       

     

       111
       111
       +
           export CXX='${gccStdenv.cc}/bin/g++'

     

       112
       112
       +
           export LD='${gccStdenv.cc}/bin/ld'

     

       113
       113
       +
           export CC='${gccStdenv.cc}/bin/gcc'

     

       114
       114
       +
       

     

       115
       115
       +
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       116
       116
       +
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       117
       117
       +
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       118
       118
       +
       

     

       119
       119
       +
           exec "$BAZEL_REAL" "$@"

     

       120
       120
       +
         '';

     

       121
       121
       +
       

     

       122
       122
       +
         workspaceDir = runLocal "our_workspace" {} (''

     

       123
       123
       +
           mkdir $out

     

       124
       124
       +
           cp ${WORKSPACE} $out/WORKSPACE

     

       125
       125
       +
           touch $out/BUILD.bazel

     

       126
       126
       +
           cp ${protoSupport} $out/proto-support.bzl

     

       127
       127
       +
           mkdir $out/person

     

       128
       128
       +
           cp ${personProto} $out/person/person.proto

     

       129
       129
       +
           cp ${personBUILD} $out/person/BUILD.bazel

     

       130
       130
       +
         ''

     

       131
       131
       +
         + (lib.optionalString gccStdenv.isDarwin ''

     

       132
       132
       +
           mkdir $out/tools

     

       133
       133
       +
           cp ${toolsBazel} $out/tools/bazel

     

       134
       134
       +
         ''));

     

       135
       135
       +
       

     

       136
       136
       +
         testBazel = bazelTest {

     

       137
       137
       +
           name = "bazel-test-protocol-buffers";

     

       138
       138
       +
           inherit workspaceDir;

     

       139
       139
       +
           bazelPkg = bazel;

     

       140
       140
       +
           buildInputs = [ openjdk8 ];

     

       141
       141
       +
           bazelScript = ''

     

       142
       142
       +
             ${bazel}/bin/bazel \

     

       143
       143
       +
               build \

     

       144
       144
       +
                 --host_javabase='@local_jdk//:jdk' \

     

       145
       145
       +
                 --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \

     

       146
       146
       +
                 --javabase='@local_jdk//:jdk' \

     

       147
       147
       +
                 --verbose_failures \

     

       148
       148
       +
                 //...

     

       149
       149
       +
           '';

     

       150
       150
       +
         };

     

       151
       151
       +
       

     

       152
       152
       +
       in testBazel

-1

pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix

···

       45
       45
        
           bazelScript = ''

     

       46
       46
        
             ${bazel}/bin/bazel \

     

       47
       47
        
               run \

     

       48
       48
       -
                 --host_javabase='@local_jdk//:jdk' \

     

       49
       48
        
                 //python:bin

     

       50
       49
        
           '';

     

       51
       50
        
         };

+37

pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch

···

       1
       1
       +
       From 177b4720d6fbaa7fdd17e5e11b2c79ac8f246786 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>

     

       3
       3
       +
       Date: Thu, 27 Jun 2019 21:08:51 -0700

     

       4
       4
       +
       Subject: [PATCH] Trim last argument to gcc if empty, on Darwin

     

       5
       5
       +
       

     

       6
       6
       +
       On Darwin, the last argument to GCC is coming up as an empty string.

     

       7
       7
       +
       This is breaking the build of proto_library targets. However, I was not

     

       8
       8
       +
       able to reproduce with the example cpp project[0].

     

       9
       9
       +
       

     

       10
       10
       +
       This commit removes the last argument if it's an empty string. This is

     

       11
       11
       +
       not a problem on Linux.

     

       12
       12
       +
       

     

       13
       13
       +
       [0]: https://github.com/bazelbuild/examples/tree/master/cpp-tutorial/stage3

     

       14
       14
       +
       ---

     

       15
       15
       +
        tools/cpp/osx_cc_wrapper.sh.tpl | 6 +++++-

     

       16
       16
       +
        1 file changed, 5 insertions(+), 1 deletion(-)

     

       17
       17
       +
       

     

       18
       18
       +
       diff --git a/tools/cpp/osx_cc_wrapper.sh.tpl b/tools/cpp/osx_cc_wrapper.sh.tpl

     

       19
       19
       +
       index 4c85cd9b6b..6c611e3d25 100644

     

       20
       20
       +
       --- a/tools/cpp/osx_cc_wrapper.sh.tpl

     

       21
       21
       +
       +++ b/tools/cpp/osx_cc_wrapper.sh.tpl

     

       22
       22
       +
       @@ -53,7 +53,11 @@ done

     

       23
       23
       +
        %{env}

     

       24
       24
       +
        

     

       25
       25
       +
        # Call the C++ compiler

     

       26
       26
       +
       -%{cc} "$@"

     

       27
       27
       +
       +if [[ ${*: -1} = "" ]]; then

     

       28
       28
       +
       +    %{cc} "${@:0:$#}"

     

       29
       29
       +
       +else

     

       30
       30
       +
       +    %{cc} "$@"

     

       31
       31
       +
       +fi

     

       32
       32
       +
        

     

       33
       33
       +
        function get_library_path() {

     

       34
       34
       +
            for libdir in ${LIB_DIRS}; do

     

       35
       35
       +
       -- 

     

       36
       36
       +
       2.19.2

     

       37
       37
       +

+27

pkgs/development/tools/drm_info/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub

     

       2
       2
       +
       , libdrm, json_c

     

       3
       3
       +
       , meson, ninja, pkgconfig

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         pname = "drm_info";

     

       8
       8
       +
         version = "2.1.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "ascent12";

     

       12
       12
       +
           repo = "drm_info";

     

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

     

       14
       14
       +
           sha256 = "1i5bzkgqxjjw34jpj1x1gfdl3sz0sl6i7s787a6mjjslsc5g422l";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         nativeBuildInputs = [ meson ninja pkgconfig ];

     

       18
       18
       +
         buildInputs = [ libdrm json_c ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with stdenv.lib; {

     

       21
       21
       +
           description = "Small utility to dump info about DRM devices.";

     

       22
       22
       +
           homepage = "https://github.com/ascent12/drm_info";

     

       23
       23
       +
           license = licenses.mit;

     

       24
       24
       +
           maintainers = with maintainers; [ tadeokondrak ];

     

       25
       25
       +
           platforms = platforms.linux;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

pkgs/development/tools/flatpak-builder/default.nix

···

       43
       43
        
       let

     

       44
       44
        
         installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";

     

       45
       45
        
         installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";

     

       46
       46
       -
         version = "1.0.7";

     

       46
       46
       +
         version = "1.0.8";

     

       47
       47
        
       in stdenv.mkDerivation rec {

     

       48
       48
        
         name = "flatpak-builder-${version}";

     

       49
       49
        
       

     
···

       51
       51
        
       

     

       52
       52
        
         src = fetchurl {

     

       53
       53
        
           url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";

     

       54
       54
       -
           sha256 = "04z9i2kahj4mffzq8ny0jvc4g3ah8kv8ilqv2rx9r1l8fhbq30jj";

     

       54
       54
       +
           sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";

     

       55
       55
        
         };

     

       56
       56
        
       

     

       57
       57
        
         nativeBuildInputs = [

+8 -8

pkgs/development/tools/github/github-release/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, system, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         linuxPredicate = stdenv.hostPlatform.system == "x86_64-linux";

     

       5
       5
       -
         bsdPredicate = stdenv.hostPlatform.system == "x86_64-freebsd";

     

       6
       6
       -
         darwinPredicate = stdenv.hostPlatform.system == "x86_64-darwin";

     

       4
       4
       +
         linuxPredicate = system == "x86_64-linux";

     

       5
       5
       +
         bsdPredicate = system == "x86_64-freebsd";

     

       6
       6
       +
         darwinPredicate = system == "x86_64-darwin";

     

       7
       7
        
         metadata = assert linuxPredicate || bsdPredicate || darwinPredicate;

     

       8
       8
        
           if linuxPredicate then

     

       9
       9
        
             { arch = "linux-amd64";

     

       10
       10
       -
               sha256 = "0b3h0d0qsrjx99kcd2cf71xijh44wm5rpm2sr54snh3f7macj2p1";

     

       10
       10
       +
               sha256 = "0p0qj911nmmdj0r7wx3363gid8g4bm3my6mj3d6s4mwgh9lfisiz";

     

       11
       11
        
               archiveBinaryPath = "linux/amd64"; }

     

       12
       12
        
           else if bsdPredicate then

     

       13
       13
        
             { arch = "freebsd-amd64";

     

       14
       14
       -
               sha256 = "1yydm4ndkh80phiwk41kcf6pizvwrfhsfk3jwrrgr42wsnkkgj0q";

     

       14
       14
       +
               sha256 = "0g618y9n39j11l1cbhyhwlbl2gv5a2a122c1dps3m2wmv7yzq5hk";

     

       15
       15
        
               archiveBinaryPath = "freebsd/amd64"; }

     

       16
       16
        
           else

     

       17
       17
        
             { arch = "darwin-amd64";

     

       18
       18
       -
               sha256 = "1dj74cf1ahihia2dr9ii9ky0cpmywn42z2iq1vkbrrcggjvyrnlf";

     

       18
       18
       +
               sha256 = "0l623fgnsix0y3f960bwx3dgnrqaxs21w5652kvaaal7dhnlgmwj";

     

       19
       19
        
               archiveBinaryPath = "darwin/amd64"; };

     

       20
       20
        
       in stdenv.mkDerivation rec {

     

       21
       21
        
         shortname = "github-release";

     

       22
       22
        
         name = "${shortname}-${version}";

     

       23
       23
       -
         version = "0.6.2";

     

       23
       23
       +
         version = "0.7.2";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchurl {

     

       26
       26
        
           url = "https://github.com/aktau/github-release/releases/download/v${version}/${metadata.arch}-${shortname}.tar.bz2";

+7 -8

pkgs/development/tools/go-protobuf/default.nix

···

       1
       1
       -
       { stdenv, buildGoPackage, fetchFromGitHub }:

     

       1
       1
       +
       { stdenv, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGoPackage rec {

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
        
         name = "go-protobuf-${version}";

     

       5
       5
       -
         version = "2018-01-04";

     

       6
       6
       -
         rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";

     

       7
       7
       -
       

     

       8
       8
       -
         goPackagePath = "github.com/golang/protobuf";

     

       5
       5
       +
         version = "1.3.1";

     

       9
       6
        
       

     

       10
       7
        
         src = fetchFromGitHub {

     

       11
       11
       -
           inherit rev;

     

       12
       8
        
           owner = "golang";

     

       13
       9
        
           repo = "protobuf";

     

       14
       14
       -
           sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";

     

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

     

       11
       11
       +
           sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";

     

       15
       12
        
         };

     

       13
       13
       +
       

     

       14
       14
       +
         modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";

     

       16
       15
        
       

     

       17
       16
        
         meta = with stdenv.lib; {

     

       18
       17
        
           homepage    = "https://github.com/golang/protobuf";

+7 -8

pkgs/development/tools/go-tools/default.nix

···

       1
       1
       -
       { buildGoPackage

     

       1
       1
       +
       { buildGoModule

     

       2
       2
        
       , lib

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       buildGoPackage rec {

     

       7
       7
       -
         name = "go-tools-${version}";

     

       8
       8
       -
         version = "2019.1.1";

     

       6
       6
       +
       buildGoModule rec {

     

       7
       7
       +
         pname = "go-tools";

     

       8
       8
       +
         version = "2019.2.1";

     

       9
       9
        
       

     

       10
       10
        
         goPackagePath = "honnef.co/go/tools";

     

       11
       11
        
         excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';

     
···

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "dominikh";

     

       15
       15
        
           repo = "go-tools";

     

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

     

       17
       17
       -
           sha256 = "1zwh64x3i32p6f6808q609n63xda3bq888n43wl4alpx1b08spha";

     

       16
       16
       +
           rev = version;

     

       17
       17
       +
           sha256 = "1frpy4pl9yp6j00mjj2yss3k8hip0cc7b5i5mz61n3dlw0kga9z1";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         goDeps = ./deps.nix;

     

       20
       20
       +
         modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz";

     

       21
       21
        
       

     

       22
       22
        
         meta = with lib; {

     

       23
       23
        
           description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";

     

       24
       24
        
           homepage = https://staticcheck.io;

     

       25
       25
        
           license = licenses.mit;

     

       26
       26
        
           maintainers = with maintainers; [ rvolosatovs kalbasit ];

     

       27
       27
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       28
       27
        
         };

     

       29
       28
        
       }

-29

pkgs/development/tools/go-tools/deps.nix

···

       1
       1
       -
       [

     

       2
       2
       -
        {

     

       3
       3
       -
           goPackagePath = "github.com/BurntSushi/toml";

     

       4
       4
       -
           fetch = {

     

       5
       5
       -
             type = "git";

     

       6
       6
       -
             url = "https://github.com/BurntSushi/toml";

     

       7
       7
       -
             rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";

     

       8
       8
       -
             sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";

     

       9
       9
       -
           };

     

       10
       10
       -
         }

     

       11
       11
       -
         {

     

       12
       12
       -
           goPackagePath = "github.com/kisielk/gotool";

     

       13
       13
       -
           fetch = {

     

       14
       14
       -
             type = "git";

     

       15
       15
       -
             url = "https://github.com/kisielk/gotool";

     

       16
       16
       -
             rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";

     

       17
       17
       -
             sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";

     

       18
       18
       -
           };

     

       19
       19
       -
         }

     

       20
       20
       -
         {

     

       21
       21
       -
           goPackagePath = "golang.org/x/tools";

     

       22
       22
       -
           fetch = {

     

       23
       23
       -
             type = "git";

     

       24
       24
       -
             url = "https://go.googlesource.com/tools";

     

       25
       25
       -
             rev = "2c0ae70061356820330c96810d9483beb9a6da8e";

     

       26
       26
       -
             sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";

     

       27
       27
       -
           };

     

       28
       28
       -
         }

     

       29
       29
       -
       ]

-29

pkgs/development/tools/haskell/multi-ghc-travis/default.nix

···

       1
       1
       -
       { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers

     

       2
       2
       -
       , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty

     

       3
       3
       -
       , tasty-golden, transformers, fetchFromGitHub

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       mkDerivation {

     

       7
       7
       -
         pname = "haskell-ci";

     

       8
       8
       -
         version = "0";

     

       9
       9
       -
         src = fetchFromGitHub {

     

       10
       10
       -
           owner = "haskell-CI";

     

       11
       11
       -
           repo = "haskell-ci";

     

       12
       12
       -
           rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2";

     

       13
       13
       -
           sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115";

     

       14
       14
       -
         };

     

       15
       15
       -
         isLibrary = true;

     

       16
       16
       -
         isExecutable = true;

     

       17
       17
       -
         libraryHaskellDepends = [

     

       18
       18
       -
           base Cabal containers deepseq directory filepath ShellCheck

     

       19
       19
       -
           transformers

     

       20
       20
       -
         ];

     

       21
       21
       -
         executableHaskellDepends = [ base ];

     

       22
       22
       -
         testHaskellDepends = [

     

       23
       23
       -
           ansi-terminal base bytestring Diff directory filepath tasty

     

       24
       24
       -
           tasty-golden transformers

     

       25
       25
       -
         ];

     

       26
       26
       -
         homepage = "https://github.com/haskell-CI/haskell-ci";

     

       27
       27
       -
         description = "Script generator for Travis-CI";

     

       28
       28
       -
         license = stdenv.lib.licenses.bsd3;

     

       29
       29
       -
       }

+2 -2

pkgs/development/tools/pet/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         name = "pet-${version}";

     

       5
       5
       -
         version = "0.3.4";

     

       5
       5
       +
         version = "0.3.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "knqyf263";

     

       9
       9
        
           repo = "pet";

     

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

     

       11
       11
       -
           sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s";

     

       11
       11
       +
           sha256 = "03fzvvdmb06kf2zglaf8jkqxqv9h1kl7n586ww61z3n3mmp1x4rd";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf";

+30

pkgs/development/tools/protoc-gen-doc/default.nix

···

       1
       1
       +
       { buildGoModule, fetchFromGitHub, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         name = "protoc-gen-doc-unstable-${version}";

     

       5
       5
       +
         version = "2019-04-22";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "pseudomuto";

     

       9
       9
       +
           repo = "protoc-gen-doc";

     

       10
       10
       +
           rev = "f824a8908ce33f213b2dba1bf7be83384c5c51e8";

     

       11
       11
       +
           sha256 = "004axh2gqc4f115mdxxg59d19hph3rr0bq9d08n3nyl315f590kj";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd";

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "Documentation generator plugin for Google Protocol Buffers";

     

       18
       18
       +
           longDescription = ''

     

       19
       19
       +
             This is a documentation generator plugin for the Google Protocol Buffers

     

       20
       20
       +
             compiler (protoc). The plugin can generate HTML, JSON, DocBook and

     

       21
       21
       +
             Markdown documentation from comments in your .proto files.

     

       22
       22
       +
       

     

       23
       23
       +
             It supports proto2 and proto3, and can handle having both in the same

     

       24
       24
       +
             context.

     

       25
       25
       +
           '';

     

       26
       26
       +
           homepage = "https://github.com/pseudomuto/protoc-gen-doc";

     

       27
       27
       +
           license = licenses.mit;

     

       28
       28
       +
           maintainers = with maintainers; [ kalbasit ];

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+33

pkgs/development/tools/prototool/default.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "prototool";

     

       5
       5
       +
         version = "1.8.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "uber";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "0m6g5p3jyf0ja5j9rqmw8mhipdqxk7rcxm0plmh65bxk1n22fzjc";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
       

     

       16
       16
       +
         modSha256 = "0l4nqb1c1lqqk70l9qwib1azavxlwghi2fv5siwrr5zw4jysz5ml";

     

       17
       17
       +
       

     

       18
       18
       +
         postInstall = ''

     

       19
       19
       +
           wrapProgram "$out/bin/prototool" \

     

       20
       20
       +
             --prefix PROTOTOOL_PROTOC_BIN_PATH : "${protobuf}/bin/protoc" \

     

       21
       21
       +
             --prefix PROTOTOOL_PROTOC_WKT_PATH : "${protobuf}/include"

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         subPackages = [ "cmd/prototool" ];

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with lib; {

     

       27
       27
       +
           homepage = "https://github.com/uber/prototool";

     

       28
       28
       +
           description = "Your Swiss Army Knife for Protocol Buffers";

     

       29
       29
       +
           maintainers = [ maintainers.marsam ];

     

       30
       30
       +
           license = licenses.mit;

     

       31
       31
       +
           platforms = platforms.unix;

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+2 -2

pkgs/development/tools/rust/bindgen/default.nix

···

       3
       3
        
       

     

       4
       4
        
       rustPlatform.buildRustPackage rec {

     

       5
       5
        
         pname = "rust-bindgen";

     

       6
       6
       -
         version = "0.49.2";

     

       6
       6
       +
         version = "0.49.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "rust-lang";

     

       10
       10
        
           repo = pname;

     

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

     

       12
       12
       -
           sha256 = "0m9c7zswp87yj7y972ghbx5z7lwbhdxb9qyws5cwiazkl582q0qj";

     

       12
       12
       +
           sha256 = "032sgg27pdxlmas67clqldvamd2ncdiw1hmk1hiprcxng7073f4y";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         cargoSha256 = "1311d0wjjj99m59zd2n6r4aq6lwbbpyj54ha2z9g4yd1hn344r91";

+2 -2

pkgs/development/tools/rust/rustfmt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         name = "rustfmt-${version}";

     

       5
       5
       -
         version = "1.2.1";

     

       5
       5
       +
         version = "1.2.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "rust-lang";

     

       9
       9
        
           repo = "rustfmt";

     

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

     

       11
       11
       -
           sha256 = "153pas7d5fchkmiw6mkbhn75lv3y69k85spzmm5i4lqnq7f0yqap";

     

       11
       11
       +
           sha256 = "1k9p6sp8q87flx9vzg46880ir7likvbydai3g6q76278h86rn0v8";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         cargoSha256 = "08x6vy5v2vgrk3gsw3qcvv52a7hifsgcsnsg1phlk1ikaff21y4z";

+2 -2

pkgs/development/tools/sassc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "sassc";

     

       5
       5
       -
         version = "3.6.0";

     

       5
       5
       +
         version = "3.6.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sass";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2";

     

       11
       11
       +
           sha256 = "1sxm54mkhs9m4vnl7vn11y17mhzamc403hv3966j1c7p2rbzg5pv";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patchPhase = ''

+2 -2

pkgs/development/tools/scalafmt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         baseName = "scalafmt";

     

       5
       5
       -
         version = "2.0.0-RC7";

     

       5
       5
       +
         version = "2.0.0";

     

       6
       6
        
         deps = stdenv.mkDerivation {

     

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

     

       8
       8
        
           buildCommand = ''

     
···

       13
       13
        
           '';

     

       14
       14
        
           outputHashMode = "recursive";

     

       15
       15
        
           outputHashAlgo = "sha256";

     

       16
       16
       -
           outputHash     = "0scz3pp63z6xfj69kvsfr8l3ll9rq95j4xlhlyrzg1vfl1gf41ig";

     

       16
       16
       +
           outputHash     = "18mf23ssy4lwvsi4pg6m4b003paz5yds5vs7nhl0bfcq57xg6qj1";

     

       17
       17
        
         };

     

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation rec {

+7

pkgs/development/tools/vagrant/default.nix

···

       84
       84
        
           fi

     

       85
       85
        
         '';

     

       86
       86
        
       

     

       87
       87
       +
         # `patchShebangsAuto` patches this one script which is intended to run

     

       88
       88
       +
         # on foreign systems.

     

       89
       89
       +
         postFixup = ''

     

       90
       90
       +
           sed -i -e '1c#!/bin/sh -' \

     

       91
       91
       +
             $out/lib/ruby/gems/*/gems/vagrant-*/plugins/provisioners/salt/bootstrap-salt.sh

     

       92
       92
       +
         '';

     

       93
       93
       +
       

     

       87
       94
        
         passthru = {

     

       88
       95
        
           inherit ruby deps;

     

       89
       96
        
         };

+2 -2

pkgs/development/web/nodejs/v12.nix

···

       5
       5
        
       in

     

       6
       6
        
         buildNodejs {

     

       7
       7
        
           inherit enableNpm;

     

       8
       8
       -
           version = "12.4.0";

     

       9
       9
       -
           sha256 = "1qwcv8m1m3293vmb4x2xrpqlpaa1r1951gf0mva60b2hsdk27d90";

     

       8
       8
       +
           version = "12.5.0";

     

       9
       9
       +
           sha256 = "08haqs104lw44l92bxfii18sdn7y1k07cz3p0ni9bhw7kh4vf5c7";

     

       10
       10
        
         }

+2 -2

pkgs/games/factorio/default.nix

···

       53
       53
        
           x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {

     

       54
       54
        
             alpha = {

     

       55
       55
        
               stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };

     

       56
       56
       -
               experimental  = bdist { sha256 = "0xgvvmyh49992y2r8yhafi80j3j4pcsp7pf0fg3rbc6zi1ariwsr"; version = "0.17.32"; withAuth = true; };

     

       56
       56
       +
               experimental  = bdist { sha256 = "1q66chnxsdlaz1bj3al62iikyxvknj1vkwh5bcc46favy4wpqpzz"; version = "0.17.52"; withAuth = true; };

     

       57
       57
        
             };

     

       58
       58
        
             headless = {

     

       59
       59
        
               stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };

     

       60
       60
       -
               experimental  = bdist { sha256 = "1jfjbb0v7yiqpn7nxkr4fcd1rsz59s8k6qcl82d1j320l3y7nl9w"; version = "0.17.32"; };

     

       60
       60
       +
               experimental  = bdist { sha256 = "03nv0qagv5pmqqbisf0hq6cb5rg2ih37lzkvcxihnnw72r78li94"; version = "0.17.52"; };

     

       61
       61
        
             };

     

       62
       62
        
             demo = {

     

       63
       63
        
               stable        = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };

+2 -2

pkgs/games/klavaro/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "klavaro-${version}";

     

       5
       5
       -
         version = "3.07";

     

       5
       5
       +
         version = "3.08";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/klavaro/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "1zz7kr3rhprn1ixmh58x8sdmdfl42lki7vgbina3sgnamx31zia5";

     

       9
       9
       +
           sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ intltool makeWrapper pkgconfig ];

+4 -3

pkgs/games/openjk/default.nix

···

       20
       20
        
           categories = "Game;";

     

       21
       21
        
         };

     

       22
       22
        
       in stdenv.mkDerivation rec {

     

       23
       23
       -
         name = "OpenJK-2018-09-17";

     

       23
       23
       +
         pname = "OpenJK";

     

       24
       24
       +
         version = "2019-06-24";

     

       24
       25
        
       

     

       25
       26
        
         src = fetchFromGitHub {

     

       26
       27
        
           owner = "JACoders";

     

       27
       28
        
           repo = "OpenJK";

     

       28
       28
       -
           rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f";

     

       29
       29
       -
           sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk";

     

       29
       29
       +
           rev = "e8b5c135eccb05ddae67e00ff944001f373fddd4";

     

       30
       30
       +
           sha256 = "0qkbn59swhnb0anvy9gq945rkb58j6axlcfgb7sff0m4swqw2394";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       32
       33
        
         dontAddPrefix = true;

+57

pkgs/games/redeclipse/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, fetchurl, fetchpatch

     

       2
       2
       +
       , curl, ed, pkgconfig, zlib, libX11

     

       3
       3
       +
       , SDL2, SDL2_image, SDL2_mixer

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         pname = "redeclipse";

     

       8
       8
       +
         version = "1.6.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchurl {

     

       11
       11
       +
           url = "https://github.com/red-eclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2";

     

       12
       12
       +
           sha256 = "0j98zk7nivdsap4y50dlqnql17hdila1ikvps6vicwaqb3l4gaa8";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libX11 zlib

     

       17
       17
       +
           SDL2 SDL2_image SDL2_mixer

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [

     

       21
       21
       +
           curl ed pkgconfig

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         makeFlags = [ "-C" "src/" "prefix=$(out)" ];

     

       25
       25
       +
       

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           # "remove gamma name hack" - Can't find `____gammaf128_r_finite` otherwise

     

       28
       28
       +
           # Is likely to be included in next release

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
              url = "https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4.diff";

     

       31
       31
       +
              sha256 = "1bm07qrq60bbmbf5k9255qq115mcyfphfy2f7xl1yx40mb9ns65p";

     

       32
       32
       +
           })

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         enableParallelBuilding = true;

     

       36
       36
       +
       

     

       37
       37
       +
         installTargets = [ "system-install" ];

     

       38
       38
       +
       

     

       39
       39
       +
         postInstall = ''

     

       40
       40
       +
             cp -R -t $out/share/redeclipse/data/ data/*

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         meta = with stdenv.lib; {

     

       44
       44
       +
           description = "A first person arena shooter, featuring parkour, impulse boosts, and more.";

     

       45
       45
       +
           longDescription = ''

     

       46
       46
       +
             Red Eclipse is a fun-filled new take on the first person arena shooter,

     

       47
       47
       +
             featuring parkour, impulse boosts, and more. The development is geared

     

       48
       48
       +
             toward balanced gameplay, with a general theme of agility in a variety of

     

       49
       49
       +
             environments.

     

       50
       50
       +
           '';

     

       51
       51
       +
           homepage = "https://www.redeclipse.net";

     

       52
       52
       +
           license = with licenses; [ licenses.zlib cc-by-sa-30 ];

     

       53
       53
       +
           maintainers = with maintainers; [ lambda-11235 ];

     

       54
       54
       +
           platforms = platforms.linux;

     

       55
       55
       +
           hydraPlatforms = [];

     

       56
       56
       +
         };

     

       57
       57
       +
       }

+2 -2

pkgs/games/tintin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, zlib, pcre }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "tintin-2.01.7";

     

       4
       4
       +
         name = "tintin-2.01.8";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url    = "mirror://sourceforge/tintin/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v";

     

       8
       8
       +
           sha256 = "056g82yi784mf4gbrida9fxqmz347m2l9vad2ksv2fhl7g553y2s";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ zlib pcre ];

+2 -2

pkgs/misc/screensavers/xlockmore/default.nix

···

       2
       2
        
       , libXdmcp, libXt }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "xlockmore-5.56";

     

       5
       5
       +
         name = "xlockmore-5.57";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://sillycycle.com/xlock/${name}.tar.xz";

     

       9
       9
       -
           sha256 = "1dg1n79rnswhxqz36mxnl5lp8p37i9fbibnzzyrqknmvf2s8xpd0";

     

       9
       9
       +
           sha256 = "18r8rh8fzdn9miicbpc3qbdd4mm2g1jpsbcvj29sr66pxydzkb7r";

     

       10
       10
        
           curlOpts = "--user-agent 'Mozilla/5.0'";

     

       11
       11
        
         };

     

       12
       12

+300 -113

pkgs/misc/vim-plugins/generated.nix

···

       61
       61
        
       

     

       62
       62
        
         ale = buildVimPluginFrom2Nix {

     

       63
       63
        
           pname = "ale";

     

       64
       64
       -
           version = "2019-06-21";

     

       64
       64
       +
           version = "2019-06-30";

     

       65
       65
        
           src = fetchFromGitHub {

     

       66
       66
        
             owner = "w0rp";

     

       67
       67
        
             repo = "ale";

     

       68
       68
       -
             rev = "65ba4b85ec3011cccb9ea7135183e7fc8d7a0d69";

     

       68
       68
       +
             rev = "89f7292138087e1410b2430ae6d359d42e7fe31f";

     

       69
       69
        
             sha256 = "00g2yjrq7gbdc9wmj2bpcpx6frvsyk69bbi05a8b43lpdkj5yzz5";

     

       70
       70
        
           };

     

       71
       71
        
         };

     
···

       182
       182
        
       

     

       183
       183
        
         camelcasemotion = buildVimPluginFrom2Nix {

     

       184
       184
        
           pname = "camelcasemotion";

     

       185
       185
       -
           version = "2019-06-06";

     

       185
       185
       +
           version = "2019-06-28";

     

       186
       186
        
           src = fetchFromGitHub {

     

       187
       187
        
             owner = "bkad";

     

       188
       188
        
             repo = "camelcasemotion";

     

       189
       189
       -
             rev = "2a62526721b6a4324bec3408e4ed9f8eebf96f3b";

     

       190
       190
       -
             sha256 = "1pj7q0ic6hs6niflp64izk5v3kdw951ram035v3xv1gjsp1aa5a6";

     

       189
       189
       +
             rev = "406368dea50303884aa321d2cdff714e010f951e";

     

       190
       190
       +
             sha256 = "0a1grafg05cb9mpk69j2y433ifm27ksy29wzlxlm5798dmb473mw";

     

       191
       191
        
           };

     

       192
       192
        
         };

     

       193
       193
        
       

     
···

       248
       248
        
       

     

       249
       249
        
         coc-nvim = buildVimPluginFrom2Nix {

     

       250
       250
        
           pname = "coc-nvim";

     

       251
       251
       -
           version = "2019-06-24";

     

       251
       251
       +
           version = "2019-07-02";

     

       252
       252
        
           src = fetchFromGitHub {

     

       253
       253
        
             owner = "neoclide";

     

       254
       254
        
             repo = "coc.nvim";

     

       255
       255
       -
             rev = "5e9594d9da22e4eb840cb102513bebc77bab7300";

     

       256
       256
       -
             sha256 = "036ig6902vwrqnj052s6631lx4k4m0p5y2238287p8qmxgj7x9d6";

     

       255
       255
       +
             rev = "ac3f1933e331b4170ad59223def8fb10b666cfa5";

     

       256
       256
       +
             sha256 = "0i5y2nciqy1lgl5jbhlry3qnasly8sf1wximf84dq937yk79bxjj";

     

       257
       257
        
           };

     

       258
       258
        
         };

     

       259
       259
        
       

     
···

       270
       270
        
       

     

       271
       271
        
         command-t = buildVimPluginFrom2Nix {

     

       272
       272
        
           pname = "command-t";

     

       273
       273
       -
           version = "2019-05-12";

     

       273
       273
       +
           version = "2019-06-28";

     

       274
       274
        
           src = fetchFromGitHub {

     

       275
       275
        
             owner = "wincent";

     

       276
       276
        
             repo = "command-t";

     

       277
       277
       -
             rev = "57e112c12c99185e062a4330896cfaf422d1ea64";

     

       278
       278
       -
             sha256 = "19ajaxga54kij9ii68cd38frq4y7lr7896wqa5xgs5qq83wh1b1z";

     

       277
       277
       +
             rev = "4f86fcb812b07a3d691d4b617e093b001a6ad839";

     

       278
       278
       +
             sha256 = "06i02632q6rkq7xljfn70shlfb301l31sv8pd738anshf8qwkfff";

     

       279
       279
        
             fetchSubmodules = true;

     

       280
       280
        
           };

     

       281
       281
        
         };

     
···

       401
       401
        
           };

     

       402
       402
        
         };

     

       403
       403
        
       

     

       404
       404
       +
         dart-vim-plugin = buildVimPluginFrom2Nix {

     

       405
       405
       +
           pname = "dart-vim-plugin";

     

       406
       406
       +
           version = "2019-05-04";

     

       407
       407
       +
           src = fetchFromGitHub {

     

       408
       408
       +
             owner = "dart-lang";

     

       409
       409
       +
             repo = "dart-vim-plugin";

     

       410
       410
       +
             rev = "8ffc3e208c282f19afa237d343fa1533146bd2b4";

     

       411
       411
       +
             sha256 = "1ypcn3212d7gzfgvarrsma0pvaial692f3m2c0blyr1q83al1pm8";

     

       412
       412
       +
           };

     

       413
       413
       +
         };

     

       414
       414
       +
       

     

       404
       415
        
         denite-extra = buildVimPluginFrom2Nix {

     

       405
       416
        
           pname = "denite-extra";

     

       406
       417
        
           version = "2019-03-29";

     
···

       425
       436
        
       

     

       426
       437
        
         denite-nvim = buildVimPluginFrom2Nix {

     

       427
       438
        
           pname = "denite-nvim";

     

       428
       428
       -
           version = "2019-06-23";

     

       439
       439
       +
           version = "2019-07-01";

     

       429
       440
        
           src = fetchFromGitHub {

     

       430
       441
        
             owner = "Shougo";

     

       431
       442
        
             repo = "denite.nvim";

     

       432
       432
       -
             rev = "9a5e321ced689771c052f68a8125c0a44ad3389a";

     

       433
       433
       -
             sha256 = "16l85820490h1l44idk3jsz5xyckyvcyi42a88bw0ms70nnh2569";

     

       443
       443
       +
             rev = "90f8367cefbb443ba0d5b363c63be087a5937d43";

     

       444
       444
       +
             sha256 = "164sxi42yyqbj2v4vklmphhjqfq54ci9n21hcl3hwbrfgrh5i67i";

     

       434
       445
        
           };

     

       435
       446
        
         };

     

       436
       447
        
       

     

       437
       448
        
         deol-nvim = buildVimPluginFrom2Nix {

     

       438
       449
        
           pname = "deol-nvim";

     

       439
       439
       -
           version = "2019-06-19";

     

       450
       450
       +
           version = "2019-06-24";

     

       440
       451
        
           src = fetchFromGitHub {

     

       441
       452
        
             owner = "Shougo";

     

       442
       453
        
             repo = "deol.nvim";

     

       443
       443
       -
             rev = "ed807a398fd5120a5dfbff7877517b25cd801bea";

     

       444
       444
       -
             sha256 = "131wzadip0d0wgn32vy38w02mx199kvcg62ldfwr68nyad48j98l";

     

       454
       454
       +
             rev = "85f0e6dde132c670eda32eb98c6a6f3d7b31a984";

     

       455
       455
       +
             sha256 = "154cdczdwzwx24c8ggasll3yf86y1r4z5hb3rld42m2dpbnhcrns";

     

       445
       456
        
           };

     

       446
       457
        
         };

     

       447
       458
        
       

     
···

       482
       493
        
       

     

       483
       494
        
         deoplete-jedi = buildVimPluginFrom2Nix {

     

       484
       495
        
           pname = "deoplete-jedi";

     

       485
       485
       -
           version = "2019-06-22";

     

       496
       496
       +
           version = "2019-06-30";

     

       486
       497
        
           src = fetchFromGitHub {

     

       487
       487
       -
             owner = "zchee";

     

       498
       498
       +
             owner = "deoplete-plugins";

     

       488
       499
        
             repo = "deoplete-jedi";

     

       489
       489
       -
             rev = "afd01dc2204d5003f89f6a93e1d3e1910d31fcd9";

     

       490
       490
       -
             sha256 = "0p70v03wjdvyy8g13m8b2r288262zz5yw3yap11id38npykb0pvv";

     

       500
       500
       +
             rev = "763c7befa7bbe44aa00a0c832916958a16e71254";

     

       501
       501
       +
             sha256 = "1dvw8l8f0k9hkfv4n791lgm1lipf5n2xhjyrwx1px92j1h94i8f1";

     

       491
       502
        
             fetchSubmodules = true;

     

       492
       503
        
           };

     

       493
       504
        
         };

     
···

       500
       511
        
             repo = "deoplete-julia";

     

       501
       512
        
             rev = "d60b976910685c99ca773c974e91c44eeda03a19";

     

       502
       513
        
             sha256 = "0x5cc9g1g1w9myr6p1ahb9gpn2abpbggjdk2bc903f62pkrapvjf";

     

       514
       514
       +
           };

     

       515
       515
       +
         };

     

       516
       516
       +
       

     

       517
       517
       +
         deoplete-lsp = buildVimPluginFrom2Nix {

     

       518
       518
       +
           pname = "deoplete-lsp";

     

       519
       519
       +
           version = "2018-12-05";

     

       520
       520
       +
           src = fetchFromGitHub {

     

       521
       521
       +
             owner = "Shougo";

     

       522
       522
       +
             repo = "deoplete-lsp";

     

       523
       523
       +
             rev = "c4837884f61a7699f328fb05b93bed0b6395dd70";

     

       524
       524
       +
             sha256 = "0ahfffpmc62pqnplm0lmzpam420i578rvyi7zda21nqlir9a53ij";

     

       503
       525
        
           };

     

       504
       526
        
         };

     

       505
       527
        
       

     
···

       527
       549
        
       

     

       528
       550
        
         deoplete-nvim = buildVimPluginFrom2Nix {

     

       529
       551
        
           pname = "deoplete-nvim";

     

       530
       530
       -
           version = "2019-06-22";

     

       552
       552
       +
           version = "2019-06-30";

     

       531
       553
        
           src = fetchFromGitHub {

     

       532
       554
        
             owner = "Shougo";

     

       533
       555
        
             repo = "deoplete.nvim";

     

       534
       534
       -
             rev = "aebaec4adbb65339601063f1ee533eef09220145";

     

       535
       535
       -
             sha256 = "11kd4m3bwp8xn5i6am9am186rz8vw12zdissb3i86xa3dcgv856g";

     

       556
       556
       +
             rev = "2ac0da55367db0b9d8920bb7bcbc051f9b07b90c";

     

       557
       557
       +
             sha256 = "05j2s6332p7gbpwg2hfimvvmk0qaah9danl5d8brq1w34bs79vjd";

     

       536
       558
        
           };

     

       537
       559
        
         };

     

       538
       560
        
       

     
···

       558
       580
        
           };

     

       559
       581
        
         };

     

       560
       582
        
       

     

       583
       583
       +
         DoxygenToolkit-vim = buildVimPluginFrom2Nix {

     

       584
       584
       +
           pname = "DoxygenToolkit-vim";

     

       585
       585
       +
           version = "2010-11-06";

     

       586
       586
       +
           src = fetchFromGitHub {

     

       587
       587
       +
             owner = "vim-scripts";

     

       588
       588
       +
             repo = "DoxygenToolkit.vim";

     

       589
       589
       +
             rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3";

     

       590
       590
       +
             sha256 = "1za8li02j4nhqjjsyxg4p78638h5af4izim37zc0p1x55zr3i85r";

     

       591
       591
       +
           };

     

       592
       592
       +
         };

     

       593
       593
       +
       

     

       561
       594
        
         echodoc-vim = buildVimPluginFrom2Nix {

     

       562
       595
        
           pname = "echodoc-vim";

     

       563
       596
        
           version = "2019-06-12";

     
···

       594
       627
        
       

     

       595
       628
        
         emmet-vim = buildVimPluginFrom2Nix {

     

       596
       629
        
           pname = "emmet-vim";

     

       597
       597
       -
           version = "2019-06-19";

     

       630
       630
       +
           version = "2019-06-24";

     

       598
       631
        
           src = fetchFromGitHub {

     

       599
       632
        
             owner = "mattn";

     

       600
       633
        
             repo = "emmet-vim";

     

       601
       601
       -
             rev = "5a7c7930c675220121e62d8eecfdbee653e95bac";

     

       602
       602
       -
             sha256 = "0ippqmdw2mhi34yvnpfh0v08v59zvn2nq815b8zfq1ci0j2q7smy";

     

       634
       634
       +
             rev = "15ef997d4d683afb4b1ee641d47980972445b61f";

     

       635
       635
       +
             sha256 = "09cm7wzl4gkb6whlfsprap1jd22f1yfp9wykw1aygj0zc5k6a106";

     

       603
       636
        
             fetchSubmodules = true;

     

       604
       637
        
           };

     

       605
       638
        
         };

     
···

       667
       700
        
             repo = "ferret";

     

       668
       701
        
             rev = "f6d7d01de8a92baee83218001c0bdbade8458a72";

     

       669
       702
        
             sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr";

     

       703
       703
       +
           };

     

       704
       704
       +
         };

     

       705
       705
       +
       

     

       706
       706
       +
         file-line = buildVimPluginFrom2Nix {

     

       707
       707
       +
           pname = "file-line";

     

       708
       708
       +
           version = "2016-10-21";

     

       709
       709
       +
           src = fetchFromGitHub {

     

       710
       710
       +
             owner = "bogado";

     

       711
       711
       +
             repo = "file-line";

     

       712
       712
       +
             rev = "559088afaf10124ea663ee0f4f73b1de48fb1632";

     

       713
       713
       +
             sha256 = "1w183g0hj8jvzm6m1jw7m6xz3x1dld8n8342vnycsh6hyzdcg3mg";

     

       670
       714
        
           };

     

       671
       715
        
         };

     

       672
       716
        
       

     
···

       913
       957
        
           };

     

       914
       958
        
         };

     

       915
       959
        
       

     

       960
       960
       +
         ir_black = buildVimPluginFrom2Nix {

     

       961
       961
       +
           pname = "ir_black";

     

       962
       962
       +
           version = "2012-03-05";

     

       963
       963
       +
           src = fetchFromGitHub {

     

       964
       964
       +
             owner = "twerth";

     

       965
       965
       +
             repo = "ir_black";

     

       966
       966
       +
             rev = "4e45f1cbcc9c04cf32c8681c6b3b4534a33610ed";

     

       967
       967
       +
             sha256 = "13g9nqlqsjsxnrq37y33ldh41dw9q9dw07spfi7qwrskiwa0ayk7";

     

       968
       968
       +
           };

     

       969
       969
       +
         };

     

       970
       970
       +
       

     

       916
       971
        
         jdaddy-vim = buildVimPluginFrom2Nix {

     

       917
       972
        
           pname = "jdaddy-vim";

     

       918
       973
        
           version = "2014-02-22";

     
···

       949
       1004
        
       

     

       950
       1005
        
         julia-vim = buildVimPluginFrom2Nix {

     

       951
       1006
        
           pname = "julia-vim";

     

       952
       952
       -
           version = "2019-05-21";

     

       1007
       1007
       +
           version = "2019-06-26";

     

       953
       1008
        
           src = fetchFromGitHub {

     

       954
       1009
        
             owner = "JuliaEditorSupport";

     

       955
       1010
        
             repo = "julia-vim";

     

       956
       956
       -
             rev = "6468c3d4f9ee9c32c9e84c5a8743bff8cb429f45";

     

       957
       957
       -
             sha256 = "18qn0xdxf2ax9qnzib5gbpws1h0gmwfmwalhpismkbwnm8cswipk";

     

       1011
       1011
       +
             rev = "072e4861412e841d308aabc928112ccaedf07135";

     

       1012
       1012
       +
             sha256 = "1250a011mib5na5c769x2djjyz3rwhcdw80rmkvzv1xy7crxf5xn";

     

       1013
       1013
       +
           };

     

       1014
       1014
       +
         };

     

       1015
       1015
       +
       

     

       1016
       1016
       +
         LanguageClient-neovim = buildVimPluginFrom2Nix {

     

       1017
       1017
       +
           pname = "LanguageClient-neovim";

     

       1018
       1018
       +
           version = "2018-08-07";

     

       1019
       1019
       +
           src = fetchFromGitHub {

     

       1020
       1020
       +
             owner = "autozimu";

     

       1021
       1021
       +
             repo = "LanguageClient-neovim";

     

       1022
       1022
       +
             rev = "dd45e31449511152f2127fe862d955237caa130f";

     

       1023
       1023
       +
             sha256 = "1i1c98r9fg1mzyl15b3grk6v7s7frwadh86rr1ggz7aq1gwfy7dq";

     

       958
       1024
        
           };

     

       959
       1025
        
         };

     

       960
       1026
        
       

     
···

       980
       1046
        
           };

     

       981
       1047
        
         };

     

       982
       1048
        
       

     

       1049
       1049
       +
         lh-brackets = buildVimPluginFrom2Nix {

     

       1050
       1050
       +
           pname = "lh-brackets";

     

       1051
       1051
       +
           version = "2019-05-23";

     

       1052
       1052
       +
           src = fetchFromGitHub {

     

       1053
       1053
       +
             owner = "LucHermitte";

     

       1054
       1054
       +
             repo = "lh-brackets";

     

       1055
       1055
       +
             rev = "f3240c3782a97720e9a344b5bd5f6808e156722b";

     

       1056
       1056
       +
             sha256 = "1qyh58xxp6hh86bykk17934pgg72q7xfsngrhrrr3cxb8jpnmx7z";

     

       1057
       1057
       +
           };

     

       1058
       1058
       +
         };

     

       1059
       1059
       +
       

     

       1060
       1060
       +
         lh-vim-lib = buildVimPluginFrom2Nix {

     

       1061
       1061
       +
           pname = "lh-vim-lib";

     

       1062
       1062
       +
           version = "2019-05-24";

     

       1063
       1063
       +
           src = fetchFromGitHub {

     

       1064
       1064
       +
             owner = "LucHermitte";

     

       1065
       1065
       +
             repo = "lh-vim-lib";

     

       1066
       1066
       +
             rev = "113fe7d485a484471b0f8c78cea9acc897728661";

     

       1067
       1067
       +
             sha256 = "1fp3i8mbsb361f5llfxhdryymdzzb4b53sh6gsv49axg34sx4i53";

     

       1068
       1068
       +
           };

     

       1069
       1069
       +
         };

     

       1070
       1070
       +
       

     

       1071
       1071
       +
         lightline-ale = buildVimPluginFrom2Nix {

     

       1072
       1072
       +
           pname = "lightline-ale";

     

       1073
       1073
       +
           version = "2018-06-12";

     

       1074
       1074
       +
           src = fetchFromGitHub {

     

       1075
       1075
       +
             owner = "maximbaz";

     

       1076
       1076
       +
             repo = "lightline-ale";

     

       1077
       1077
       +
             rev = "dd59077f9537b344f7ae80f713c1e4856ec1520c";

     

       1078
       1078
       +
             sha256 = "1f9v6nsksy36s5i27nfx6vmyfyjk27p2w2g6x25cw56b0r3sgxmx";

     

       1079
       1079
       +
           };

     

       1080
       1080
       +
         };

     

       1081
       1081
       +
       

     

       983
       1082
        
         lightline-vim = buildVimPluginFrom2Nix {

     

       984
       1083
        
           pname = "lightline-vim";

     

       985
       1084
        
           version = "2019-06-12";

     
···

       1202
       1301
        
       

     

       1203
       1302
        
         neomake = buildVimPluginFrom2Nix {

     

       1204
       1303
        
           pname = "neomake";

     

       1205
       1205
       -
           version = "2019-06-18";

     

       1304
       1304
       +
           version = "2019-06-28";

     

       1206
       1305
        
           src = fetchFromGitHub {

     

       1207
       1306
        
             owner = "neomake";

     

       1208
       1307
        
             repo = "neomake";

     

       1209
       1209
       -
             rev = "17f199f69fc9c4f93672293fdc2713e5c33987c2";

     

       1210
       1210
       -
             sha256 = "1mvk3v0z7xffn2rigzj8fab4rdvlj9chfwmrshri0i9hza8kp1za";

     

       1308
       1308
       +
             rev = "43007dac3e4c761caee7a5d8c74172da2af08ea6";

     

       1309
       1309
       +
             sha256 = "1bxz0czckmc2cw7kh8cd1rcg0sg2pj7vjdlgwd0bmqr6x9xarp0d";

     

       1211
       1310
        
           };

     

       1212
       1311
        
         };

     

       1213
       1312
        
       

     

       1214
       1313
        
         neomru-vim = buildVimPluginFrom2Nix {

     

       1215
       1314
        
           pname = "neomru-vim";

     

       1216
       1216
       -
           version = "2019-05-30";

     

       1315
       1315
       +
           version = "2019-06-30";

     

       1217
       1316
        
           src = fetchFromGitHub {

     

       1218
       1317
        
             owner = "Shougo";

     

       1219
       1318
        
             repo = "neomru.vim";

     

       1220
       1220
       -
             rev = "57f89922ee03529b34334a82fa502be0e2a26d86";

     

       1221
       1221
       -
             sha256 = "0lx5g9wyjdq99lnmfm1hmi7n62m0gg5kx9m40x2kgx5x5fdnldhy";

     

       1319
       1319
       +
             rev = "53f9cd784b78839e865cabc43f6a7efacc4c8cad";

     

       1320
       1320
       +
             sha256 = "05xss5546n1pinhh1bpp4gmsxjbmdlp08lpzxrrq4gkyqddxdkqd";

     

       1222
       1321
        
           };

     

       1223
       1322
        
         };

     

       1224
       1323
        
       

     
···

       1301
       1400
        
       

     

       1302
       1401
        
         nerdtree = buildVimPluginFrom2Nix {

     

       1303
       1402
        
           pname = "nerdtree";

     

       1304
       1304
       -
           version = "2019-06-20";

     

       1403
       1403
       +
           version = "2019-06-27";

     

       1305
       1404
        
           src = fetchFromGitHub {

     

       1306
       1405
        
             owner = "scrooloose";

     

       1307
       1406
        
             repo = "nerdtree";

     

       1308
       1308
       -
             rev = "33fe2fdf16a95c12e8284364c780ed405dbaad17";

     

       1309
       1309
       -
             sha256 = "01w3a6wkfjg55n27flsv3v0z0aav09nhwm70n2wfb25hgbqkcqxd";

     

       1407
       1407
       +
             rev = "1c803b36f632c151c755456b68101153f407ec5e";

     

       1408
       1408
       +
             sha256 = "1393xzf1j05rspyajbb8k91wp4v23xlj6lzjjqb9rjj032z1i1d1";

     

       1310
       1409
        
           };

     

       1311
       1410
        
         };

     

       1312
       1411
        
       

     
···

       1400
       1499
        
       

     

       1401
       1500
        
         onehalf = buildVimPluginFrom2Nix {

     

       1402
       1501
        
           pname = "onehalf";

     

       1403
       1403
       -
           version = "2019-06-21";

     

       1502
       1502
       +
           version = "2019-06-26";

     

       1404
       1503
        
           src = fetchFromGitHub {

     

       1405
       1504
        
             owner = "sonph";

     

       1406
       1505
        
             repo = "onehalf";

     

       1407
       1407
       -
             rev = "da0ca0b0036f2e9afe1a25592cd1ac41cce61112";

     

       1408
       1408
       -
             sha256 = "0mrv6gmqfqc6lwnwhw788n6lpf36lwbwksbzw0l87rwj104ima9d";

     

       1506
       1506
       +
             rev = "408104a30ae4f220096e591350a72e60cc15f9b3";

     

       1507
       1507
       +
             sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2";

     

       1409
       1508
        
           };

     

       1410
       1509
        
         };

     

       1411
       1510
        
       

     
···

       1631
       1730
        
       

     

       1632
       1731
        
         rust-vim = buildVimPluginFrom2Nix {

     

       1633
       1732
        
           pname = "rust-vim";

     

       1634
       1634
       -
           version = "2019-06-06";

     

       1733
       1733
       +
           version = "2019-06-29";

     

       1635
       1734
        
           src = fetchFromGitHub {

     

       1636
       1735
        
             owner = "rust-lang";

     

       1637
       1736
        
             repo = "rust.vim";

     

       1638
       1638
       -
             rev = "6d6c410d5997bda6b9de065049636be4ad3682f4";

     

       1639
       1639
       -
             sha256 = "1aq66v5j8fckq1bszs793z43fgkrss4w1p44k0x98zx7prx5z5lw";

     

       1737
       1737
       +
             rev = "de998a2014c997d6f8f749a9be195f1cd51aa9c0";

     

       1738
       1738
       +
             sha256 = "0fx9j0l8fjb54c7b1pzwypkmvr3sx39x5wpjbxkwa8a916nlylq2";

     

       1640
       1739
        
           };

     

       1641
       1740
        
         };

     

       1642
       1741
        
       

     
···

       1673
       1772
        
           };

     

       1674
       1773
        
         };

     

       1675
       1774
        
       

     

       1775
       1775
       +
         sky-color-clock-vim = buildVimPluginFrom2Nix {

     

       1776
       1776
       +
           pname = "sky-color-clock-vim";

     

       1777
       1777
       +
           version = "2018-11-03";

     

       1778
       1778
       +
           src = fetchFromGitHub {

     

       1779
       1779
       +
             owner = "mopp";

     

       1780
       1780
       +
             repo = "sky-color-clock.vim";

     

       1781
       1781
       +
             rev = "9d4232cc249083f3c5d2eb4e2848e491b52df4ca";

     

       1782
       1782
       +
             sha256 = "1ln50rahb177vilzr4zc7v9znm8xfid1v8gddl83gr9srdbn2bbz";

     

       1783
       1783
       +
           };

     

       1784
       1784
       +
         };

     

       1785
       1785
       +
       

     

       1676
       1786
        
         sourcemap-vim = buildVimPluginFrom2Nix {

     

       1677
       1787
        
           pname = "sourcemap-vim";

     

       1678
       1788
        
           version = "2012-09-19";

     
···

       1686
       1796
        
       

     

       1687
       1797
        
         SpaceCamp = buildVimPluginFrom2Nix {

     

       1688
       1798
        
           pname = "SpaceCamp";

     

       1689
       1689
       -
           version = "2019-06-13";

     

       1799
       1799
       +
           version = "2019-06-26";

     

       1690
       1800
        
           src = fetchFromGitHub {

     

       1691
       1801
        
             owner = "jaredgorski";

     

       1692
       1802
        
             repo = "SpaceCamp";

     

       1693
       1693
       -
             rev = "e2503139a55f4c2631cca64feb596b44d5b88f73";

     

       1694
       1694
       -
             sha256 = "0zaa2dcgynwbhybyq3i3i9pxdz4hk2q3g0s48vm27sywr2kdzw63";

     

       1803
       1803
       +
             rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8";

     

       1804
       1804
       +
             sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c";

     

       1695
       1805
        
           };

     

       1696
       1806
        
         };

     

       1697
       1807
        
       

     
···

       1849
       1959
        
           };

     

       1850
       1960
        
         };

     

       1851
       1961
        
       

     

       1962
       1962
       +
         tcomment_vim = buildVimPluginFrom2Nix {

     

       1963
       1963
       +
           pname = "tcomment_vim";

     

       1964
       1964
       +
           version = "2019-04-28";

     

       1965
       1965
       +
           src = fetchFromGitHub {

     

       1966
       1966
       +
             owner = "tomtom";

     

       1967
       1967
       +
             repo = "tcomment_vim";

     

       1968
       1968
       +
             rev = "622cc0551bef87a3dfb2846cb339412eeb8ef133";

     

       1969
       1969
       +
             sha256 = "0zd23520hn5lflcz2jpi22x13kvmy6ry7qqzbi438xyw4j4gwpfs";

     

       1970
       1970
       +
           };

     

       1971
       1971
       +
         };

     

       1972
       1972
       +
       

     

       1852
       1973
        
         tender-vim = buildVimPluginFrom2Nix {

     

       1853
       1974
        
           pname = "tender-vim";

     

       1854
       1975
        
           version = "2019-06-15";

     
···

       2366
       2487
        
           };

     

       2367
       2488
        
         };

     

       2368
       2489
        
       

     

       2490
       2490
       +
         vim-bufkill = buildVimPluginFrom2Nix {

     

       2491
       2491
       +
           pname = "vim-bufkill";

     

       2492
       2492
       +
           version = "2018-03-20";

     

       2493
       2493
       +
           src = fetchFromGitHub {

     

       2494
       2494
       +
             owner = "qpkorr";

     

       2495
       2495
       +
             repo = "vim-bufkill";

     

       2496
       2496
       +
             rev = "795dd38f3cff69d0d8fe9e71847907e200860959";

     

       2497
       2497
       +
             sha256 = "1nji86vjjbfjw4xy52yazq53hrlsr7v30xkx2awgiakz7ih0bdxa";

     

       2498
       2498
       +
           };

     

       2499
       2499
       +
         };

     

       2500
       2500
       +
       

     

       2369
       2501
        
         vim-choosewin = buildVimPluginFrom2Nix {

     

       2370
       2502
        
           pname = "vim-choosewin";

     

       2371
       2503
        
           version = "2018-06-11";

     
···

       2489
       2621
        
       

     

       2490
       2622
        
         vim-cursorword = buildVimPluginFrom2Nix {

     

       2491
       2623
        
           pname = "vim-cursorword";

     

       2492
       2492
       -
           version = "2017-10-19";

     

       2624
       2624
       +
           version = "2019-06-28";

     

       2493
       2625
        
           src = fetchFromGitHub {

     

       2494
       2626
        
             owner = "itchyny";

     

       2495
       2627
        
             repo = "vim-cursorword";

     

       2496
       2496
       -
             rev = "4878d6185b99131c5f610cc6ad0e223439ac4601";

     

       2497
       2497
       -
             sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf";

     

       2628
       2628
       +
             rev = "c35c5e686769db02bb9ccf30cc21fc13786f7f14";

     

       2629
       2629
       +
             sha256 = "1115j8ch1p6q5x3y85pmdgib7ya0m0j8j52gblh0mlw823zf3lrf";

     

       2498
       2630
        
           };

     

       2499
       2631
        
         };

     

       2500
       2632
        
       

     
···

       2511
       2643
        
       

     

       2512
       2644
        
         vim-devicons = buildVimPluginFrom2Nix {

     

       2513
       2645
        
           pname = "vim-devicons";

     

       2514
       2514
       -
           version = "2019-06-23";

     

       2646
       2646
       +
           version = "2019-06-30";

     

       2515
       2647
        
           src = fetchFromGitHub {

     

       2516
       2648
        
             owner = "ryanoasis";

     

       2517
       2649
        
             repo = "vim-devicons";

     

       2518
       2518
       -
             rev = "793fda61101f02fed05d30d606671f9b933452fb";

     

       2519
       2519
       -
             sha256 = "0x04rh5jy82g7q7im4lvlh1akz4jl3l5swc3xv82saxymzycpgyw";

     

       2650
       2650
       +
             rev = "4ba84019a5d4c10e01eff62089c7385a39af3be5";

     

       2651
       2651
       +
             sha256 = "0i0wdkhzpmhk6x08xgybc4l0fmlqyqn0ximhyzcxxqafmkv448ap";

     

       2520
       2652
        
           };

     

       2521
       2653
        
         };

     

       2522
       2654
        
       

     
···

       2544
       2676
        
       

     

       2545
       2677
        
         vim-dispatch = buildVimPluginFrom2Nix {

     

       2546
       2678
        
           pname = "vim-dispatch";

     

       2547
       2547
       -
           version = "2019-06-21";

     

       2679
       2679
       +
           version = "2019-06-30";

     

       2548
       2680
        
           src = fetchFromGitHub {

     

       2549
       2681
        
             owner = "tpope";

     

       2550
       2682
        
             repo = "vim-dispatch";

     

       2551
       2551
       -
             rev = "219df23e822206a25e7c40bf4329774aa19f7732";

     

       2552
       2552
       -
             sha256 = "1f7dvdl8wz6g4ikz5gx6rdhxyvcf4z9y0axzlkljs2ixmr48sxbr";

     

       2683
       2683
       +
             rev = "a625661cd1d35b454c9b2a9452dbfec46c4d3e17";

     

       2684
       2684
       +
             sha256 = "1v7qjslkyrrpbb780j1450piv5jb02qbidfh0863g615hz2mbnni";

     

       2553
       2685
        
           };

     

       2554
       2686
        
         };

     

       2555
       2687
        
       

     
···

       2621
       2753
        
       

     

       2622
       2754
        
         vim-elixir = buildVimPluginFrom2Nix {

     

       2623
       2755
        
           pname = "vim-elixir";

     

       2624
       2624
       -
           version = "2019-05-14";

     

       2756
       2756
       +
           version = "2019-06-27";

     

       2625
       2757
        
           src = fetchFromGitHub {

     

       2626
       2758
        
             owner = "elixir-lang";

     

       2627
       2759
        
             repo = "vim-elixir";

     

       2628
       2628
       -
             rev = "38e8bbfd0019033ae53d623e3fd1d9cf6ec2d335";

     

       2629
       2629
       -
             sha256 = "1mbgks1460vm8sl2hkag6hrsvbf9gfvdlswqr5hh8hy3laylh6qf";

     

       2760
       2760
       +
             rev = "a219dc1f702e581878f51746c4c31b8b4805aa4e";

     

       2761
       2761
       +
             sha256 = "1bw8i3nvqwrb8d0dbsz53jy3pvcx7kwz48xy7b9sslrhkf4llwpn";

     

       2630
       2762
        
           };

     

       2631
       2763
        
         };

     

       2632
       2764
        
       

     
···

       2665
       2797
        
       

     

       2666
       2798
        
         vim-fireplace = buildVimPluginFrom2Nix {

     

       2667
       2799
        
           pname = "vim-fireplace";

     

       2668
       2668
       -
           version = "2019-06-23";

     

       2800
       2800
       +
           version = "2019-06-30";

     

       2669
       2801
        
           src = fetchFromGitHub {

     

       2670
       2802
        
             owner = "tpope";

     

       2671
       2803
        
             repo = "vim-fireplace";

     

       2672
       2672
       -
             rev = "e78995b7fc93357c86f66d78b65803e473b8e356";

     

       2673
       2673
       -
             sha256 = "05wbnpqpd65vyvaq5maxaq06dcc5k6z5hc7hbk82slm52avk92lm";

     

       2804
       2804
       +
             rev = "7c8008bfb7d1b1d380252bd115368d4344aef804";

     

       2805
       2805
       +
             sha256 = "10z8xcrf7dx327kiyv6fxkw3fb72c7j5n7qaa8mcapmz9nb2ffz2";

     

       2674
       2806
        
           };

     

       2675
       2807
        
         };

     

       2676
       2808
        
       

     
···

       2707
       2839
        
           };

     

       2708
       2840
        
         };

     

       2709
       2841
        
       

     

       2842
       2842
       +
         vim-flutter = buildVimPluginFrom2Nix {

     

       2843
       2843
       +
           pname = "vim-flutter";

     

       2844
       2844
       +
           version = "2019-06-23";

     

       2845
       2845
       +
           src = fetchFromGitHub {

     

       2846
       2846
       +
             owner = "thosakwe";

     

       2847
       2847
       +
             repo = "vim-flutter";

     

       2848
       2848
       +
             rev = "8d7a9158cca84c4ea2a5ebc066607652fab7a9e8";

     

       2849
       2849
       +
             sha256 = "0kjr7nlqkkzlvh6p9j996bbcgd0frakla591y4ln12qwa7ys0gd1";

     

       2850
       2850
       +
           };

     

       2851
       2851
       +
         };

     

       2852
       2852
       +
       

     

       2710
       2853
        
         vim-ft-diff_fold = buildVimPluginFrom2Nix {

     

       2711
       2854
        
           pname = "vim-ft-diff_fold";

     

       2712
       2855
        
           version = "2013-02-10";

     
···

       2720
       2863
        
       

     

       2721
       2864
        
         vim-fugitive = buildVimPluginFrom2Nix {

     

       2722
       2865
        
           pname = "vim-fugitive";

     

       2723
       2723
       -
           version = "2019-06-08";

     

       2866
       2866
       +
           version = "2019-07-01";

     

       2724
       2867
        
           src = fetchFromGitHub {

     

       2725
       2868
        
             owner = "tpope";

     

       2726
       2869
        
             repo = "vim-fugitive";

     

       2727
       2727
       -
             rev = "6d42c7df44aa20252e5dac747c3ac9fa7450b21b";

     

       2728
       2728
       -
             sha256 = "002s7jsn8m4h98hpbcblhmxywsyxgajz23wm3w96awqqz4chrp0i";

     

       2870
       2870
       +
             rev = "17618402fa793d347d60540b9caf84210128ad49";

     

       2871
       2871
       +
             sha256 = "14algrw25l8fhvmk4lclpw3h1nklqmdkpwjsgci4775ihi9cdlyi";

     

       2729
       2872
        
           };

     

       2730
       2873
        
         };

     

       2731
       2874
        
       

     
···

       2764
       2907
        
       

     

       2765
       2908
        
         vim-gitgutter = buildVimPluginFrom2Nix {

     

       2766
       2909
        
           pname = "vim-gitgutter";

     

       2767
       2767
       -
           version = "2019-06-19";

     

       2910
       2910
       +
           version = "2019-07-01";

     

       2768
       2911
        
           src = fetchFromGitHub {

     

       2769
       2912
        
             owner = "airblade";

     

       2770
       2913
        
             repo = "vim-gitgutter";

     

       2771
       2771
       -
             rev = "8aac968f1a617cc1c346707242af181e6b1f467e";

     

       2772
       2772
       -
             sha256 = "1vvixwlsnsxhrsz0dqg2i0s6a0xdpp60x0592gakjwihzplg4yp5";

     

       2914
       2914
       +
             rev = "91471746fe687ee867877508dfd809460dab5698";

     

       2915
       2915
       +
             sha256 = "0pbjvflhynzanb0hp5yyfiwpsnvv6ndnnrbmxdxk7iqjrc8765km";

     

       2773
       2916
        
           };

     

       2774
       2917
        
         };

     

       2775
       2918
        
       

     
···

       2786
       2929
        
       

     

       2787
       2930
        
         vim-go = buildVimPluginFrom2Nix {

     

       2788
       2931
        
           pname = "vim-go";

     

       2789
       2789
       -
           version = "2019-06-13";

     

       2932
       2932
       +
           version = "2019-06-30";

     

       2790
       2933
        
           src = fetchFromGitHub {

     

       2791
       2934
        
             owner = "fatih";

     

       2792
       2935
        
             repo = "vim-go";

     

       2793
       2793
       -
             rev = "b6a0bde7d4c64a063ea1b6365e3dd24e2d4f4df1";

     

       2794
       2794
       -
             sha256 = "1lnwp4qqbzl6cwy75hhkafnppv2pgbaw2lf5fpbprwyd5aa5qh1q";

     

       2936
       2936
       +
             rev = "c67d72c476ff08bd631588429ef47d0aee75af27";

     

       2937
       2937
       +
             sha256 = "0x717yj7xmc2i8ahaxpzsnyx5ig012x70jysc73yrnwiasrhjim4";

     

       2795
       2938
        
           };

     

       2796
       2939
        
         };

     

       2797
       2940
        
       

     
···

       3017
       3160
        
       

     

       3018
       3161
        
         vim-javascript = buildVimPluginFrom2Nix {

     

       3019
       3162
        
           pname = "vim-javascript";

     

       3020
       3020
       -
           version = "2019-04-16";

     

       3163
       3163
       +
           version = "2019-06-24";

     

       3021
       3164
        
           src = fetchFromGitHub {

     

       3022
       3165
        
             owner = "pangloss";

     

       3023
       3166
        
             repo = "vim-javascript";

     

       3024
       3024
       -
             rev = "ee445807a71ee6933cd6cbcd74940bc288815793";

     

       3025
       3025
       -
             sha256 = "0x4cscpfll8m7f9hvx4fjxff5vscz4kzvs14ai1sdg75b6dngxl0";

     

       3167
       3167
       +
             rev = "8a599c5e84bb064e2345867332ecbcc252e3b04a";

     

       3168
       3168
       +
             sha256 = "1hyn592812hav4n7g488ysmrqw0c2bjkwvfwkzz9xpwj1v25f2yl";

     

       3026
       3169
        
           };

     

       3027
       3170
        
         };

     

       3028
       3171
        
       

     
···

       3128
       3271
        
       

     

       3129
       3272
        
         vim-ledger = buildVimPluginFrom2Nix {

     

       3130
       3273
        
           pname = "vim-ledger";

     

       3131
       3131
       -
           version = "2017-12-12";

     

       3274
       3274
       +
           version = "2019-07-01";

     

       3132
       3275
        
           src = fetchFromGitHub {

     

       3133
       3276
        
             owner = "ledger";

     

       3134
       3277
        
             repo = "vim-ledger";

     

       3135
       3135
       -
             rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d";

     

       3136
       3136
       -
             sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01";

     

       3278
       3278
       +
             rev = "0068e6fd36fbb13b6a9852fc91514df21b5bfb8b";

     

       3279
       3279
       +
             sha256 = "0rff0fd93jlzfq8afjil4qqqg1sga3r7lwqhwgia7xl6mbg7swj8";

     

       3137
       3280
        
           };

     

       3138
       3281
        
         };

     

       3139
       3282
        
       

     
···

       3183
       3326
        
       

     

       3184
       3327
        
         vim-lsc = buildVimPluginFrom2Nix {

     

       3185
       3328
        
           pname = "vim-lsc";

     

       3186
       3186
       -
           version = "2019-06-23";

     

       3329
       3329
       +
           version = "2019-06-25";

     

       3187
       3330
        
           src = fetchFromGitHub {

     

       3188
       3331
        
             owner = "natebosch";

     

       3189
       3332
        
             repo = "vim-lsc";

     

       3190
       3190
       -
             rev = "57f6e1aaed6a89054335b71aac89be9a607faad3";

     

       3191
       3191
       -
             sha256 = "04mfxpszngmqw052h3yb9iq0xj95fg38jr8x7jqxdpgr3i5c5z9r";

     

       3333
       3333
       +
             rev = "c491351fcfdb58d36da739912701d7132a33110e";

     

       3334
       3334
       +
             sha256 = "1wvz493dk011kk113ml82vysr76zfarqrlk0v03hh9la33h23mh6";

     

       3192
       3335
        
           };

     

       3193
       3336
        
         };

     

       3194
       3337
        
       

     
···

       3238
       3381
        
       

     

       3239
       3382
        
         vim-multiple-cursors = buildVimPluginFrom2Nix {

     

       3240
       3383
        
           pname = "vim-multiple-cursors";

     

       3241
       3241
       -
           version = "2019-03-25";

     

       3384
       3384
       +
           version = "2019-06-26";

     

       3242
       3385
        
           src = fetchFromGitHub {

     

       3243
       3386
        
             owner = "terryma";

     

       3244
       3387
        
             repo = "vim-multiple-cursors";

     

       3245
       3245
       -
             rev = "8cb8e83ffb040f25cefa597f21608ca6a64aed70";

     

       3246
       3246
       -
             sha256 = "1mdi0kbc1k4q8mw8f4anl819mgsll1sj38dd2w1a1lscg179j062";

     

       3388
       3388
       +
             rev = "730a11cee6deedc6f4ccc02e2c1d990f8629da25";

     

       3389
       3389
       +
             sha256 = "1m21bjdkah5b7pw5nl5r6lvj1dl4l7yhz05hwzhy43a31nbba2y3";

     

       3247
       3390
        
           };

     

       3248
       3391
        
         };

     

       3249
       3392
        
       

     
···

       3381
       3524
        
       

     

       3382
       3525
        
         vim-pandoc-syntax = buildVimPluginFrom2Nix {

     

       3383
       3526
        
           pname = "vim-pandoc-syntax";

     

       3384
       3384
       -
           version = "2019-05-16";

     

       3527
       3527
       +
           version = "2019-06-25";

     

       3385
       3528
        
           src = fetchFromGitHub {

     

       3386
       3529
        
             owner = "vim-pandoc";

     

       3387
       3530
        
             repo = "vim-pandoc-syntax";

     

       3388
       3388
       -
             rev = "14c778e5bf069a1f13a4645aa8a34e1b46c980a8";

     

       3389
       3389
       -
             sha256 = "1a66f0shycqkl1329lgbvrbbzwdv8pgi9d8zaybw9jddn64rx9r7";

     

       3531
       3531
       +
             rev = "6710d46c8b772f77248f30d650c83f90c68f37ab";

     

       3532
       3532
       +
             sha256 = "1dir9h6s63lr10ffaxlpjar0xfmmjr3nhhgijsaa0vgnghc00r7x";

     

       3390
       3533
        
           };

     

       3391
       3534
        
         };

     

       3392
       3535
        
       

     
···

       3458
       3601
        
       

     

       3459
       3602
        
         vim-polyglot = buildVimPluginFrom2Nix {

     

       3460
       3603
        
           pname = "vim-polyglot";

     

       3461
       3461
       -
           version = "2019-06-16";

     

       3604
       3604
       +
           version = "2019-07-01";

     

       3462
       3605
        
           src = fetchFromGitHub {

     

       3463
       3606
        
             owner = "sheerun";

     

       3464
       3607
        
             repo = "vim-polyglot";

     

       3465
       3465
       -
             rev = "d52700284984ada048ce325404dfa25237271ba1";

     

       3466
       3466
       -
             sha256 = "15ddnf9l9iqqwz8b0k6kpciv2qaqwr4s1k7klbc9qj8r254ys699";

     

       3608
       3608
       +
             rev = "3ddca5da461ebfaa82104f82e3cbf19d1c326ade";

     

       3609
       3609
       +
             sha256 = "0f3l0sknj4zbgmk7yx028f2qz72gdh1lnqra96c2n3xszpdvim22";

     

       3467
       3610
        
           };

     

       3468
       3611
        
         };

     

       3469
       3612
        
       

     
···

       3557
       3700
        
       

     

       3558
       3701
        
         vim-rhubarb = buildVimPluginFrom2Nix {

     

       3559
       3702
        
           pname = "vim-rhubarb";

     

       3560
       3560
       -
           version = "2019-04-24";

     

       3703
       3703
       +
           version = "2019-06-27";

     

       3561
       3704
        
           src = fetchFromGitHub {

     

       3562
       3705
        
             owner = "tpope";

     

       3563
       3706
        
             repo = "vim-rhubarb";

     

       3564
       3564
       -
             rev = "70713ca031f882bd13ac7ffb163fb7e7a0a52b0c";

     

       3565
       3565
       -
             sha256 = "10x1n5jrrmw01rqh0qnyyx7f9l5qmzhfby8gkd5vpjx84kpabzqs";

     

       3707
       3707
       +
             rev = "c509c7eedeea641f5b0bdae708581ff610fbff5b";

     

       3708
       3708
       +
             sha256 = "19zhhnlrnkgsxacykck9q19rhk4gj31qjj6i4sl6bzi086kmf0z9";

     

       3566
       3709
        
           };

     

       3567
       3710
        
         };

     

       3568
       3711
        
       

     
···

       3601
       3744
        
       

     

       3602
       3745
        
         vim-scala = buildVimPluginFrom2Nix {

     

       3603
       3746
        
           pname = "vim-scala";

     

       3604
       3604
       -
           version = "2019-01-21";

     

       3747
       3747
       +
           version = "2019-06-24";

     

       3605
       3748
        
           src = fetchFromGitHub {

     

       3606
       3749
        
             owner = "derekwyatt";

     

       3607
       3750
        
             repo = "vim-scala";

     

       3608
       3608
       -
             rev = "971ac9ab3fe945105ef88587cfe5273fa2c8e988";

     

       3609
       3609
       -
             sha256 = "0n28k3c2jyb4af0ql2sm3ngkcyvd4684c95j5yfvs7jjsvjibqcb";

     

       3751
       3751
       +
             rev = "bbdfea4b98fdb8866a8a6060ec1294643cfeb413";

     

       3752
       3752
       +
             sha256 = "14q8j6vwqad2nwia29d0844v2zdcx04xn9dyicv13sdpivzcm4rb";

     

       3610
       3753
        
           };

     

       3611
       3754
        
         };

     

       3612
       3755
        
       

     
···

       3753
       3896
        
           };

     

       3754
       3897
        
         };

     

       3755
       3898
        
       

     

       3899
       3899
       +
         vim-sourcetrail = buildVimPluginFrom2Nix {

     

       3900
       3900
       +
           pname = "vim-sourcetrail";

     

       3901
       3901
       +
           version = "2018-06-26";

     

       3902
       3902
       +
           src = fetchFromGitHub {

     

       3903
       3903
       +
             owner = "CoatiSoftware";

     

       3904
       3904
       +
             repo = "vim-sourcetrail";

     

       3905
       3905
       +
             rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d";

     

       3906
       3906
       +
             sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg";

     

       3907
       3907
       +
           };

     

       3908
       3908
       +
         };

     

       3909
       3909
       +
       

     

       3756
       3910
        
         vim-speeddating = buildVimPluginFrom2Nix {

     

       3757
       3911
        
           pname = "vim-speeddating";

     

       3758
       3912
        
           version = "2019-02-27";

     
···

       3865
       4019
        
       

     

       3866
       4020
        
         vim-test = buildVimPluginFrom2Nix {

     

       3867
       4021
        
           pname = "vim-test";

     

       3868
       3868
       -
           version = "2019-06-01";

     

       4022
       4022
       +
           version = "2019-06-25";

     

       3869
       4023
        
           src = fetchFromGitHub {

     

       3870
       4024
        
             owner = "janko-m";

     

       3871
       4025
        
             repo = "vim-test";

     

       3872
       3872
       -
             rev = "965704531f09988c7cde6e572741b408015ef4ff";

     

       3873
       3873
       -
             sha256 = "1y4ypg39fh8ys2mqmm2d7xqvq5zjs5x4xjyrn5nazmn5snbvgi86";

     

       4026
       4026
       +
             rev = "3507d31dccde27ea27e2858e00784d5be18565f4";

     

       4027
       4027
       +
             sha256 = "0ap9bbk0qa3cz1rxykgrd5hv582av2n36x6s52awg90d4hx37inp";

     

       4028
       4028
       +
           };

     

       4029
       4029
       +
         };

     

       4030
       4030
       +
       

     

       4031
       4031
       +
         vim-textobj-comment = buildVimPluginFrom2Nix {

     

       4032
       4032
       +
           pname = "vim-textobj-comment";

     

       4033
       4033
       +
           version = "2014-04-11";

     

       4034
       4034
       +
           src = fetchFromGitHub {

     

       4035
       4035
       +
             owner = "glts";

     

       4036
       4036
       +
             repo = "vim-textobj-comment";

     

       4037
       4037
       +
             rev = "58ae4571b76a5bf74850698f23d235eef991dd4b";

     

       4038
       4038
       +
             sha256 = "00wc14chwjfx95gl3yzbxm1ajx88zpzqz0ckl7xvd7gvkrf0mx04";

     

       4039
       4039
       +
           };

     

       4040
       4040
       +
         };

     

       4041
       4041
       +
       

     

       4042
       4042
       +
         vim-textobj-function = buildVimPluginFrom2Nix {

     

       4043
       4043
       +
           pname = "vim-textobj-function";

     

       4044
       4044
       +
           version = "2014-05-03";

     

       4045
       4045
       +
           src = fetchFromGitHub {

     

       4046
       4046
       +
             owner = "kana";

     

       4047
       4047
       +
             repo = "vim-textobj-function";

     

       4048
       4048
       +
             rev = "adb50f38499b1f558cbd58845e3e91117e4538cf";

     

       4049
       4049
       +
             sha256 = "0cwl102si9zhhhpg6c0fjnyq35v6bl5f34p2s7b47isxdn0qvris";

     

       3874
       4050
        
           };

     

       3875
       4051
        
         };

     

       3876
       4052
        
       

     
···

       3882
       4058
        
             repo = "vim-textobj-multiblock";

     

       3883
       4059
        
             rev = "670a5ba57d73fcd793f480e262617c6eb0103355";

     

       3884
       4060
        
             sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf";

     

       4061
       4061
       +
           };

     

       4062
       4062
       +
         };

     

       4063
       4063
       +
       

     

       4064
       4064
       +
         vim-textobj-user = buildVimPluginFrom2Nix {

     

       4065
       4065
       +
           pname = "vim-textobj-user";

     

       4066
       4066
       +
           version = "2018-11-19";

     

       4067
       4067
       +
           src = fetchFromGitHub {

     

       4068
       4068
       +
             owner = "kana";

     

       4069
       4069
       +
             repo = "vim-textobj-user";

     

       4070
       4070
       +
             rev = "074ce2575543f790290b189860597a3dcac1f79d";

     

       4071
       4071
       +
             sha256 = "15wnqkxjjksgn8a7d3lkbf8d97r4w159bajrcf1adpxw8hhli1vc";

     

       3885
       4072
        
           };

     

       3886
       4073
        
         };

     

       3887
       4074
        
       

     
···

       3942
       4129
        
       

     

       3943
       4130
        
         vim-unimpaired = buildVimPluginFrom2Nix {

     

       3944
       4131
        
           pname = "vim-unimpaired";

     

       3945
       3945
       -
           version = "2019-03-21";

     

       4132
       4132
       +
           version = "2019-06-29";

     

       3946
       4133
        
           src = fetchFromGitHub {

     

       3947
       4134
        
             owner = "tpope";

     

       3948
       4135
        
             repo = "vim-unimpaired";

     

       3949
       3949
       -
             rev = "e77923053fbce11323194ed04113b8d966be959c";

     

       3950
       3950
       -
             sha256 = "1cka410c94wa6mz0pr4m8n9j7s9jhqnw513479pkmzx435ffb6ak";

     

       4136
       4136
       +
             rev = "a49c4f2bf05f18a6e4f6572a19763ba7abba52b1";

     

       4137
       4137
       +
             sha256 = "0ivybshm1dvlqsbh153a3fq3dhwj144x049l78ss7zrqnbb70jsw";

     

       3951
       4138
        
           };

     

       3952
       4139
        
         };

     

       3953
       4140
        
       

     
···

       3968
       4155
        
           src = fetchFromGitHub {

     

       3969
       4156
        
             owner = "mg979";

     

       3970
       4157
        
             repo = "vim-visual-multi";

     

       3971
       3971
       -
             rev = "8b1db5d83f1bc04f9e08fd5c57d84323e9007435";

     

       3972
       3972
       -
             sha256 = "0g6b9grd7j1p9rhbb56lvwvv90j9l0cqfsslxyrn9fwxwgkbiis0";

     

       4158
       4158
       +
             rev = "c91e356a33569bc39bb01392362b8747355b356e";

     

       4159
       4159
       +
             sha256 = "07xm2289932j7lrxaf1gx3rxbzx4f059mkx78chj915pndx72q33";

     

       3973
       4160
        
           };

     

       3974
       4161
        
         };

     

       3975
       4162
        
       

     
···

       3997
       4184
        
       

     

       3998
       4185
        
         vim-wakatime = buildVimPluginFrom2Nix {

     

       3999
       4186
        
           pname = "vim-wakatime";

     

       4000
       4000
       -
           version = "2019-05-08";

     

       4187
       4187
       +
           version = "2019-06-24";

     

       4001
       4188
        
           src = fetchFromGitHub {

     

       4002
       4189
        
             owner = "wakatime";

     

       4003
       4190
        
             repo = "vim-wakatime";

     

       4004
       4004
       -
             rev = "40dbc1643088c0b677857cf7eae9354540b5e955";

     

       4005
       4005
       -
             sha256 = "17df8h7jgkl1q6p2g3328mnd21gvfcjks7zpbr8r5qzbyrm1pl5v";

     

       4191
       4191
       +
             rev = "7a544c979ed52042c67a4189687ac53c853f109c";

     

       4192
       4192
       +
             sha256 = "04n2hgyyiq4q9abcj867q30m4vhfz50gxwdvjj3844ppn104smsa";

     

       4006
       4193
        
           };

     

       4007
       4194
        
         };

     

       4008
       4195
        
       

     
···

       4118
       4305
        
       

     

       4119
       4306
        
         vimtex = buildVimPluginFrom2Nix {

     

       4120
       4307
        
           pname = "vimtex";

     

       4121
       4121
       -
           version = "2019-06-22";

     

       4308
       4308
       +
           version = "2019-07-01";

     

       4122
       4309
        
           src = fetchFromGitHub {

     

       4123
       4310
        
             owner = "lervag";

     

       4124
       4311
        
             repo = "vimtex";

     

       4125
       4125
       -
             rev = "4240669fbb31f9bab15abe5e41a8d5a11f3d4ccb";

     

       4126
       4126
       -
             sha256 = "1yldk7pms48d6f82q547r2vy6xb8fa0c2s6f8mp0riwiypiaqj6l";

     

       4312
       4312
       +
             rev = "650b06020043a1b66aac3e478e620b40a2346d97";

     

       4313
       4313
       +
             sha256 = "1qimr20ima638f0s40xpap5hkr6h0fwp7cjfbbgv11njr0dmfzlc";

     

       4127
       4314
        
           };

     

       4128
       4315
        
         };

     

       4129
       4316
        
       

     
···

       4262
       4449
        
       

     

       4263
       4450
        
         youcompleteme = buildVimPluginFrom2Nix {

     

       4264
       4451
        
           pname = "youcompleteme";

     

       4265
       4265
       -
           version = "2019-06-02";

     

       4452
       4452
       +
           version = "2019-06-29";

     

       4266
       4453
        
           src = fetchFromGitHub {

     

       4267
       4454
        
             owner = "valloric";

     

       4268
       4455
        
             repo = "youcompleteme";

     

       4269
       4269
       -
             rev = "59eea79da8acaf4cd01631b15d6c762f9b9bdb14";

     

       4270
       4270
       -
             sha256 = "1v8ich33j2rxifilpzzgj4pw6wnj3ra4rd8mc3m0yy7jrnhzcr13";

     

       4456
       4456
       +
             rev = "d556a43c1af6a4e4075e875934e250f589df0dee";

     

       4457
       4457
       +
             sha256 = "05vl8gri43k8psjmhaybhm27ycm8hdgrdaqcy89sznpww5lm1nx8";

     

       4271
       4458
        
             fetchSubmodules = true;

     

       4272
       4459
        
           };

     

       4273
       4460
        
         };

+22 -5

pkgs/misc/vim-plugins/vim-plugin-names

···

       13
       13
        
       ap/vim-css-color

     

       14
       14
        
       arcticicestudio/nord-vim

     

       15
       15
        
       artur-shaik/vim-javacomplete2

     

       16
       16
       +
       autozimu/LanguageClient-neovim

     

       16
       17
        
       bazelbuild/vim-bazel

     

       17
       18
        
       bbchung/clighter8

     

       18
       19
        
       benmills/vimux

     
···

       20
       21
        
       bitc/vim-hdevtools

     

       21
       22
        
       bkad/camelcasemotion

     

       22
       23
        
       bling/vim-bufferline

     

       24
       24
       +
       bogado/file-line

     

       23
       25
        
       bronson/vim-trailing-whitespace

     

       24
       26
        
       brooth/far.vim

     

       25
       27
        
       carlitux/deoplete-ternjs

     
···

       38
       40
        
       chriskempson/base16-vim

     

       39
       41
        
       christoomey/vim-sort-motion

     

       40
       42
        
       christoomey/vim-tmux-navigator

     

       43
       43
       +
       CoatiSoftware/vim-sourcetrail

     

       41
       44
        
       cocopon/iceberg.vim

     

       42
       45
        
       ctjhoa/spacevim

     

       43
       46
        
       ctrlpvim/ctrlp.vim

     

       47
       47
       +
       dag/vim-fish

     

       44
       48
        
       dag/vim2hs

     

       45
       45
       -
       dag/vim-fish

     

       46
       49
        
       dannyob/quickfixstatus

     

       50
       50
       +
       dart-lang/dart-vim-plugin

     

       47
       51
        
       davidhalter/jedi-vim

     

       52
       52
       +
       deoplete-plugins/deoplete-jedi

     

       48
       53
        
       derekelkins/agda-vim

     

       49
       54
        
       derekwyatt/vim-scala

     

       50
       55
        
       dhruvasagar/vim-table-mode

     
···

       77
       82
        
       floobits/floobits-neovim

     

       78
       83
        
       frigoeu/psc-ide-vim

     

       79
       84
        
       garbas/vim-snipmate

     

       85
       85
       +
       glts/vim-textobj-comment

     

       80
       86
        
       gmarik/vundle

     

       81
       87
        
       godlygeek/csapprox

     

       82
       88
        
       godlygeek/tabular

     
···

       140
       146
        
       kana/vim-operator-replace

     

       141
       147
        
       kana/vim-operator-user

     

       142
       148
        
       kana/vim-tabpagecd

     

       149
       149
       +
       kana/vim-textobj-function

     

       150
       150
       +
       kana/vim-textobj-user

     

       143
       151
        
       kassio/neoterm

     

       144
       152
        
       kchmck/vim-coffee-script

     

       145
       153
        
       KeitaNakamura/neodark.vim

     
···

       156
       164
        
       lervag/vimtex

     

       157
       165
        
       lfilho/cosco.vim

     

       158
       166
        
       LnL7/vim-nix

     

       167
       167
       +
       LucHermitte/lh-vim-lib

     

       168
       168
       +
       LucHermitte/lh-brackets

     

       159
       169
        
       ludovicchabant/vim-gutentags

     

       160
       170
        
       ludovicchabant/vim-lawrencium

     

       161
       171
        
       lukaszkorecki/workflowish

     
···

       188
       198
        
       mattn/emmet-vim

     

       189
       199
        
       mattn/gist-vim

     

       190
       200
        
       mattn/webapi-vim

     

       201
       201
       +
       maximbaz/lightline-ale

     

       191
       202
        
       mbbill/undotree

     

       192
       203
        
       megaannum/forms

     

       193
       204
        
       megaannum/self

     
···

       202
       213
        
       mileszs/ack.vim

     

       203
       214
        
       mindriot101/vim-yapf

     

       204
       215
        
       mkasa/lushtags

     

       216
       216
       +
       mopp/sky-color-clock.vim

     

       205
       217
        
       morhetz/gruvbox

     

       206
       218
        
       motus/pig.vim

     

       207
       219
        
       mpickering/hlint-refactor-vim

     
···

       219
       231
        
       neoclide/coc.nvim

     

       220
       232
        
       neoclide/vim-easygit

     

       221
       233
        
       neomake/neomake

     

       234
       234
       +
       neovim/nvimdev.nvim

     

       222
       235
        
       neovimhaskell/haskell-vim

     

       223
       236
        
       neovimhaskell/nvim-hs.vim

     

       224
       224
       -
       neovim/nvimdev.nvim

     

       225
       237
        
       neutaaaaan/iosvkem

     

       226
       238
        
       nixprime/cpsm

     

       227
       239
        
       NLKNguyen/papercolor-theme

     
···

       246
       258
        
       powerman/vim-plugin-AnsiEsc

     

       247
       259
        
       PProvost/vim-ps1

     

       248
       260
        
       python-mode/python-mode

     

       261
       261
       +
       qpkorr/vim-bufkill

     

       249
       262
        
       Quramy/tsuquyomi

     

       250
       263
        
       racer-rust/vim-racer

     

       251
       264
        
       rafaqz/ranger.vim

     
···

       275
       288
        
       Shougo/context_filetype.vim

     

       276
       289
        
       Shougo/denite.nvim

     

       277
       290
        
       Shougo/deol.nvim

     

       291
       291
       +
       Shougo/deoplete-lsp

     

       278
       292
        
       Shougo/deoplete.nvim

     

       279
       293
        
       Shougo/echodoc.vim

     

       280
       294
        
       Shougo/neco-syntax

     
···

       309
       323
        
       thinca/vim-scouter

     

       310
       324
        
       thinca/vim-themis

     

       311
       325
        
       thinca/vim-visualstar

     

       326
       326
       +
       thosakwe/vim-flutter

     

       312
       327
        
       tomasr/molokai

     

       313
       328
        
       tomlion/vim-solidity

     

       314
       329
        
       tommcdo/vim-lion

     

       330
       330
       +
       tomtom/tcomment_vim

     

       315
       331
        
       tomtom/tlib_vim

     

       316
       332
        
       tpope/vim-abolish

     

       317
       333
        
       tpope/vim-commentary

     
···

       337
       353
        
       tpope/vim-vinegar

     

       338
       354
        
       travitch/hasksyn

     

       339
       355
        
       troydm/zoomwintab.vim

     

       356
       356
       +
       twerth/ir_black

     

       340
       357
        
       twinside/vim-haskellconceal

     

       341
       358
        
       Twinside/vim-hoogle

     

       342
       359
        
       tyru/caw.vim

     
···

       346
       363
        
       vhda/verilog_systemverilog.vim

     

       347
       364
        
       vim-airline/vim-airline

     

       348
       365
        
       vim-airline/vim-airline-themes

     

       349
       349
       -
       vimoutliner/vimoutliner

     

       350
       366
        
       vim-pandoc/vim-pandoc

     

       351
       367
        
       vim-pandoc/vim-pandoc-after

     

       352
       368
        
       vim-pandoc/vim-pandoc-syntax

     

       353
       369
        
       vim-ruby/vim-ruby

     

       370
       370
       +
       vim-scripts/a.vim

     

       354
       371
        
       vim-scripts/align

     

       355
       372
        
       vim-scripts/argtextobj.vim

     

       356
       373
        
       vim-scripts/autoload_cscope.vim

     

       357
       357
       -
       vim-scripts/a.vim

     

       358
       374
        
       vim-scripts/bats.vim

     

       359
       375
        
       vim-scripts/changeColorScheme.vim

     

       360
       376
        
       vim-scripts/Colour-Sampler-Pack

     

       377
       377
       +
       vim-scripts/DoxygenToolkit.vim

     

       361
       378
        
       vim-scripts/emodeline

     

       362
       379
        
       vim-scripts/Improved-AnsiEsc

     

       363
       380
        
       vim-scripts/jdaddy.vim

     
···

       372
       389
        
       vim-scripts/wombat256.vim

     

       373
       390
        
       vim-scripts/YankRing.vim

     

       374
       391
        
       vim-utils/vim-husk

     

       392
       392
       +
       vimoutliner/vimoutliner

     

       375
       393
        
       vimwiki/vimwiki

     

       376
       394
        
       vmchale/dhall-vim

     

       377
       395
        
       w0rp/ale

     
···

       388
       406
        
       zah/nim.vim

     

       389
       407
        
       zchee/deoplete-clang

     

       390
       408
        
       zchee/deoplete-go

     

       391
       391
       -
       zchee/deoplete-jedi

     

       392
       409
        
       zig-lang/zig.vim

+11 -4

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

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:

     

       2
       2
        
       

     

       3
       3
       -
       with stdenv.lib;

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
         name = "hostapd-${version}";

     

       6
       5
        
         version = "2.8";

     
···

       13
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       13
        
         buildInputs = [ libnl openssl sqlite ];

     

       15
       14
        
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           (fetchurl {

     

       17
       17
       +
             # Note: fetchurl seems to be unhappy with openwrt git

     

       18
       18
       +
             # server's URLs containing semicolons. Using the github mirror instead.

     

       19
       19
       +
             url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";

     

       20
       20
       +
             sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";})

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       16
       23
        
         outputs = [ "out" "man" ];

     

       17
       24
        
       

     

       18
       25
        
         extraConfig = ''

     
···

       42
       49
        
           CONFIG_INTERNETWORKING=y

     

       43
       50
        
           CONFIG_HS20=y

     

       44
       51
        
           CONFIG_ACS=y

     

       45
       45
       -
         '' + optionalString (sqlite != null) ''

     

       52
       52
       +
         '' + stdenv.lib.optionalString (sqlite != null) ''

     

       46
       53
        
           CONFIG_SQLITE=y

     

       47
       54
        
         '';

     

       48
       55
        
       

     
···

       61
       68
        
           install -vD hostapd_cli.1 -t $man/share/man/man1

     

       62
       69
        
         '';

     

       63
       70
        
       

     

       64
       64
       -
         meta = {

     

       71
       71
       +
         meta = with stdenv.lib; {

     

       65
       72
        
           homepage = http://hostap.epitest.fi;

     

       66
       73
        
           repositories.git = git://w1.fi/hostap.git;

     

       67
       74
        
           description = "A user space daemon for access point and authentication servers";

     

       68
       75
        
           license = licenses.gpl2;

     

       69
       69
       -
           maintainers = with maintainers; [ phreedom ];

     

       76
       76
       +
           maintainers = with maintainers; [ phreedom ninjatrappeur ];

     

       70
       77
        
           platforms = platforms.linux;

     

       71
       78
        
         };

     

       72
       79
        
       }

+22

pkgs/os-specific/linux/iproute/mptcp.nix

···

       1
       1
       +
       { stdenv, iproute, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       iproute.overrideAttrs (oa: rec {

     

       4
       4
       +
         pname = "iproute_mptcp";

     

       5
       5
       +
         version = "0.95";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "multipath-tcp";

     

       9
       9
       +
           repo = "iproute-mptcp";

     

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

     

       11
       11
       +
           sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         meta = with stdenv.lib; {

     

       15
       15
       +
           homepage = https://github.com/multipath-tcp/iproute-mptcp;

     

       16
       16
       +
           description = "IP-Route extensions for MultiPath TCP";

     

       17
       17
       +
           license = licenses.gpl2;

     

       18
       18
       +
           platforms = platforms.linux;

     

       19
       19
       +
           maintainers = with maintainers; [ teto ];

     

       20
       20
       +
           priority = 2;

     

       21
       21
       +
         };

     

       22
       22
       +
       })

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.14.130";

     

       6
       6
       +
         version = "4.14.131";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "0najfj0m8s61hjyag4ll6bvv1y4d03dbgm137fmvfq4szx891ji9";

     

       16
       16
       +
           sha256 = "1xcg7ij3r6271qmcymaxprqa8qvdddkh5f8m6gza3agl61641xhr";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.4.nix

···

       1
       1
        
       { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.4.183";

     

       4
       4
       +
         version = "4.4.184";

     

       5
       5
        
         extraMeta.branch = "4.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "10ic3ldn3p95y0qrl91j5kjqjp18k30xvpgw7mmc1g7lgi2r8j2h";

     

       9
       9
       +
           sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5";

     

       10
       10
        
         };

     

       11
       11
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
       1
        
       { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.9.183";

     

       4
       4
       +
         version = "4.9.184";

     

       5
       5
        
         extraMeta.branch = "4.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1wv753a9z99nvvw881j6fxd6imk88xm3aq626gly5x6v3jcv0mzx";

     

       9
       9
       +
           sha256 = "1bwzmmpc7k9n7p2s383pipdjc3hvqfbbacaxk7gdw9856pai8c83";

     

       10
       10
        
         };

     

       11
       11
        
       } // (args.argsOverride or {}))

+8 -4

pkgs/os-specific/linux/kernel/linux-testing.nix

···

       1
       1
       -
       { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

     

       1
       1
       +
       { stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       2
       4
        
       

     

       3
       5
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "5.2-rc6";

     

       5
       5
       -
         modDirVersion = "5.2.0-rc6";

     

       6
       6
       +
         version = "5.2-rc7";

     

       6
       7
        
         extraMeta.branch = "5.2";

     

       7
       8
        
       

     

       9
       9
       +
         # modDirVersion needs to be x.y.z, will always add .0

     

       10
       10
       +
         modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;

     

       11
       11
       +
       

     

       8
       12
        
         src = fetchurl {

     

       9
       13
        
           url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "15lwy9596v5sw8c6mhpl9ilfcmm39snvvyajg08ycsg61i2s58v0";

     

       14
       14
       +
           sha256 = "1128jb1y4gia5icv614ycp3c5mkvrb2l2wn20765b3si256g68n4";

     

       11
       15
        
         };

     

       12
       16
        
       

     

       13
       17
        
         # Should the testing kernels ever be built on Hydra?

+33

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

···

       1
       1
       +
       { stdenv, fetchurl, linuxHeaders } :

     

       2
       2
       +
       

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         pname = "linuxptp";

     

       6
       6
       +
         version = "2.0";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz";

     

       10
       10
       +
           sha256 = "0zcw8nllla06451r7bfsa31q4z8jj56j67i07l1azm473r0dj90a";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           substituteInPlace incdefs.sh --replace \

     

       15
       15
       +
              '/usr/include/linux/' "${linuxHeaders}/include/linux/"

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         makeFlags = [ "prefix=" ];

     

       19
       19
       +
       

     

       20
       20
       +
         preInstall = ''

     

       21
       21
       +
           export DESTDIR=$out

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         enableParallelBuilding = true;

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with stdenv.lib; {

     

       27
       27
       +
           description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux";

     

       28
       28
       +
           homepage = "http://linuxptp.sourceforge.net/";

     

       29
       29
       +
           maintainers = [ maintainers.markuskowa ];

     

       30
       30
       +
           license = licenses.gpl2;

     

       31
       31
       +
           platforms = platforms.linux;

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+21

pkgs/os-specific/linux/net-tools/mptcp.nix

···

       1
       1
       +
       { stdenv, nettools, fetchFromGitHub  }:

     

       2
       2
       +
       

     

       3
       3
       +
       nettools.overrideAttrs(oa: rec {

     

       4
       4
       +
         name = "net-tools-mptcp";

     

       5
       5
       +
         version = "0.95";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "multipath-tcp";

     

       9
       9
       +
           repo = "net-tools";

     

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

     

       11
       11
       +
           sha256 = "0i7gr1y699nc7j9qllsx8kicqkpkhw51x4chcmyl5xs06b2mdjri";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         meta = with stdenv.lib; {

     

       15
       15
       +
           homepage = https://github.com/multipath-tcp/net-tools;

     

       16
       16
       +
           description = "A set of tools for controlling the network subsystem in Linux";

     

       17
       17
       +
           license = licenses.gpl2Plus;

     

       18
       18
       +
           platforms = platforms.linux;

     

       19
       19
       +
           maintainers = with maintainers; [ teto ];

     

       20
       20
       +
         };

     

       21
       21
       +
       })

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "nmon-${version}";

     

       5
       5
       -
         version = "16j";

     

       5
       5
       +
         version = "16k";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/nmon/lmon${version}.c";

     

       9
       9
       -
           sha256 = "05a6yc1w421r30qg32a8j0wajjv2ff1mwwsrariv3fz3ng4phf5s";

     

       9
       9
       +
           sha256 = "17nbxrnl7kqiaaxn2hwyi65gphbl3wybbyp9vri2q5ifdis3ssib";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ ncurses ];

+7 -12

pkgs/os-specific/linux/nvidia-x11/default.nix

···

       16
       16
        
       in

     

       17
       17
        
       rec {

     

       18
       18
        
         # Policy: use the highest stable version as the default (on our master).

     

       19
       19
       -
         stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_418 else legacy_390;

     

       19
       19
       +
         stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_430 else legacy_390;

     

       20
       20
        
       

     

       21
       21
        
         # No active beta right now

     

       22
       22
       -
         beta = generic {

     

       23
       23
       -
           version = "430.14";

     

       24
       24
       -
           sha256_64bit = "05qgakc0sqv9zr6j4i49iqrd271nris8pmnv3l431r71ygx6zm00";

     

       25
       25
       -
           settingsSha256 = "1hh07258a6z0g8dl6mxrizdxqcgswv58r4rbamfhhwh9i42fpdgg";

     

       26
       26
       -
           persistencedSha256 = "1wmwmg9ma9rfx03s2qa249f0p7yf0lxdpiadab0raajk1lzlrrc8";

     

       27
       27
       -
         };

     

       22
       22
       +
         beta = stable;

     

       28
       23
        
       

     

       29
       29
       -
         stable_418 = generic {

     

       30
       30
       -
           version = "418.74";

     

       31
       31
       -
           sha256_64bit = "03qj42ppzkc9nphdr9zc12968bb8fc9cpcx5f66y29wnrgg3d1yw";

     

       32
       32
       -
           settingsSha256 = "15mbqdx5wyk7iq13kl2vd99lykpil618izwpi1kfldlabxdxsi9d";

     

       33
       33
       -
           persistencedSha256 = "0442qbby0r1b6l72wyw0b3iwvln6k20s6dn0zqlpxafnia9bvc8c";

     

       24
       24
       +
         stable_430 = generic {

     

       25
       25
       +
           version = "430.26";

     

       26
       26
       +
           sha256_64bit = "1rnfxl4dxa3jjidfdvfjmg1a8nc787ss15cakrp2wwrn8jlr9av6";

     

       27
       27
       +
           settingsSha256 = "0rjsj697s9jfls7iz1hs7aqp36ihf3l82yz1x1w9wdvlw94a3nym";

     

       28
       28
       +
           persistencedSha256 = "1n554i4g37hs49bb631x692ygfncn7a5hzb6mh9kx7hmv69yzazh";

     

       34
       29
        
         };

     

       35
       30
        
       

     

       36
       31
        
         # Last one supporting x86

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, withoutInitTools ? false }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "2.94"; in

     

       3
       3
       +
       let version = "2.95"; in

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "05wshfgrijp3pi9rpfsa0yx4w3bf5v6hlwjqw79nlhz53xjca2by";

     

       10
       10
       +
           sha256 = "1j46dydib9yd2a46w43is9b61lplwrsry46fw7cbmfrn7ywrq0n9";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         prePatch = ''

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
       -
         version = "2.5";

     

       7
       7
       +
         version = "2.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner  = "dyne";

     

       11
       11
        
           repo   = "Tomb";

     

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

     

       13
       13
       -
           sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1";

     

       13
       13
       +
           sha256 = "0pr0lw1byxwkgv857zfmd8yqa03a7mckhzklrf9rkv1l6nisz0z0";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ sudo zsh pinentry ];

+2 -2

pkgs/servers/atlassian/confluence.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "atlassian-confluence-${version}";

     

       8
       8
       -
         version = "6.15.4";

     

       8
       8
       +
         version = "6.15.6";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz";

     

       12
       12
       -
           sha256 = "0br51h8i99v6xc15280ra447c7fkiwf8nqgyzni0llhy1g1qcnmv";

     

       12
       12
       +
           sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildPhase = ''

+2 -2

pkgs/servers/atlassian/jira.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "atlassian-jira-${version}";

     

       8
       8
       -
         version = "8.2.1";

     

       8
       8
       +
         version = "8.2.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";

     

       12
       12
       -
           sha256 = "1556hliywjiz6977249mlgxaq5xzpzq3xm9bcg9vk57s1hsv175i";

     

       12
       12
       +
           sha256 = "1azis5jxrdfviyvvbpzlrpqaayvzs9kggmj4rv9gbsn7ji96i781";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

+2 -2

pkgs/servers/beanstalkd/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         version = "1.10";

     

       3
       3
       +
         version = "1.11";

     

       4
       4
        
         name = "beanstalkd-${version}";

     

       5
       5
        
       

     

       6
       6
        
         installPhase=''make install "PREFIX=$out"'';

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0n9dlmiddcfl7i0f1lwfhqiwyvf26493fxfcmn8jm30nbqciwfwj";

     

       10
       10
       +
           sha256 = "0i65d0pln1p6wxghzwziz2k8vafvdgjq6yc962ayzs80kpj18d2y";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         hardeningDisable = [ "fortify" ];

+2 -2

pkgs/servers/dns/powerdns/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

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

     

       8
       8
       -
         version = "4.1.7";

     

       8
       8
       +
         version = "4.1.9";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";

     

       12
       12
       -
           sha256 = "11c4r0mbq6ybbihm0jbl9hspb01pj1gi6x3m374liw9jij7dw8b4";

     

       12
       12
       +
           sha256 = "1dmx37xzg7qckq166jr7swcnw3m9wjh5169844ad59qhspfzflnk";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

+1 -1

pkgs/servers/headphones/default.nix

···

       27
       27
        
         meta = with stdenv.lib; {

     

       28
       28
        
           description = "Automatic music downloader for SABnzbd";

     

       29
       29
        
           license     = licenses.gpl3;

     

       30
       30
       -
           homepage    = https:/github.com/rembo10/headphones;

     

       30
       30
       +
           homepage    = "https://github.com/rembo10/headphones";

     

       31
       31
        
           maintainers = with stdenv.lib.maintainers; [ rembo10 ];

     

       32
       32
        
         };

     

       33
       33
        
       }

+2 -2

pkgs/servers/http/apache-modules/mod_wsgi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mod_wsgi-${version}";

     

       5
       5
       -
         version = "4.6.6";

     

       5
       5
       +
         version = "4.6.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1ic5lafqlwpld5jz2irj3yws883xhxldjyyh514w1lad1v085sbq";

     

       9
       9
       +
           sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ apacheHttpd python2 ];

+2 -2

pkgs/servers/http/tengine/default.nix

···

       10
       10
        
       with stdenv.lib;

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
       -
         version = "2.3.0";

     

       13
       13
       +
         version = "2.3.1";

     

       14
       14
        
         name = "tengine-${version}";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";

     

       18
       18
       -
           sha256 = "09165sdzad8bjxhnwphbags6yvxnz2rkf14p0w3vgvzssj017kqp";

     

       18
       18
       +
           sha256 = "075blm2d62a0bdixc3vngrxpgr7ngl1s4y8hm20pbvc07f0kzn9x";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs =

+3 -3

pkgs/servers/monitoring/grafana/default.nix

···

       1
       1
        
       { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
       -
         version = "6.2.4";

     

       4
       4
       +
         version = "6.2.5";

     

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

     

       6
       6
        
         goPackagePath = "github.com/grafana/grafana";

     

       7
       7
        
       

     
···

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

     

       12
       12
        
           owner = "grafana";

     

       13
       13
        
           repo = "grafana";

     

       14
       14
       -
           sha256 = "1xfxvjhq96s3hchvigji7ppz777kggf39gh4dcqjzhls5qy6rm3i";

     

       14
       14
       +
           sha256 = "03wign7dkc2a9267mmqicvvzgya0g1i9ygr0dz3jvks2k1yhlv2j";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         srcStatic = fetchurl {

     

       18
       18
        
           url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";

     

       19
       19
       -
           sha256 = "082mmwksv97r2g8ywvsj5f126ycp3jwxjp21jfq0135l8yz73vwh";

     

       19
       19
       +
           sha256 = "19zc9x1gkmdr7ijsrhrlln5cib20iyx0vgk0z79d8qyhq69nxfs8";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+2 -2

pkgs/servers/monitoring/riemann/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "riemann-${version}";

     

       5
       5
       -
         version = "0.3.2";

     

       5
       5
       +
         version = "0.3.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "0vq7yr048sqy8dgs9l3kn1q6s3hhlhs5551hj445cng8z6n4bc4v";

     

       9
       9
       +
           sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/servers/radarr/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "radarr-${version}";

     

       5
       5
       -
         version = "0.2.0.1344";

     

       5
       5
       +
         version = "0.2.0.1358";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";

     

       9
       9
       -
           sha256 = "0zh1p92i61s6mx26s3fvzg1ihsx433b398wsl5p8zafwqq3zfrla";

     

       9
       9
       +
           sha256 = "0lyd9gcrfdp7nc4myg22ardsig30lgkvma03zzdjrwvsngqclmv7";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+65

pkgs/servers/roon-server/default.nix

···

       1
       1
       +
       { alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg, libav, mono, stdenv }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "roon-server";

     

       6
       6
       +
         version = "100600401";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2";

     

       10
       10
       +
           sha256 = "121mmdh35q4bpgsqhcps6a6q1f4ld9v4hq9gp181bf2n779pk8sh";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         installPhase = ''

     

       14
       14
       +
           runHook preInstall

     

       15
       15
       +
       

     

       16
       16
       +
           # Check script

     

       17
       17
       +
           sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg libav ]}' check.sh

     

       18
       18
       +
           sed -i '/check_ulimit$/d' check.sh

     

       19
       19
       +
       

     

       20
       20
       +
           # Start script

     

       21
       21
       +
           sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg libav ]}' start.sh

     

       22
       22
       +
       

     

       23
       23
       +
           # Debug logging

     

       24
       24
       +
           sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance

     

       25
       25
       +
       

     

       26
       26
       +
           # Binaries

     

       27
       27
       +
           sed -i '/# boost ulimit/,+2 d' Appliance/RAATServer

     

       28
       28
       +
           sed -i '/# boost ulimit/,+2 d' Appliance/RoonAppliance

     

       29
       29
       +
           sed -i '/# boost ulimit/,+2 d' Server/RoonServer

     

       30
       30
       +
           sed -i '/ln -sf/ d' Appliance/RAATServer

     

       31
       31
       +
           sed -i '/ln -sf/ d' Appliance/RoonAppliance

     

       32
       32
       +
           sed -i '/ln -sf/ d' Server/RoonServer

     

       33
       33
       +
           mkdir -p $out/opt

     

       34
       34
       +
           mv * $out/opt

     

       35
       35
       +
           ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonServer

     

       36
       36
       +
           ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonAppliance

     

       37
       37
       +
           ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RAATServer

     

       38
       38
       +
       

     

       39
       39
       +
           runHook postInstall

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         preFixup = ''

     

       43
       43
       +
           patchelf \

     

       44
       44
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       45
       45
       +
             --set-rpath "${alsaLib}/lib" \

     

       46
       46
       +
             $out/opt/RoonMono/bin/mono-sgen

     

       47
       47
       +
       

     

       48
       48
       +
           # Checkers

     

       49
       49
       +
           patchelf \

     

       50
       50
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       51
       51
       +
             --set-rpath "${alsaLib}/lib" \

     

       52
       52
       +
             $out/opt/Appliance/check_alsa

     

       53
       53
       +
           patchelf \

     

       54
       54
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       55
       55
       +
             $out/opt/Appliance/check_bincompat

     

       56
       56
       +
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         meta = {

     

       59
       59
       +
           description = "The music player for music lovers.";

     

       60
       60
       +
           homepage    = https://roonlabs.com;

     

       61
       61
       +
           license     = licenses.unfree;

     

       62
       62
       +
           maintainers = with maintainers; [ steell ];

     

       63
       63
       +
           platforms   = platforms.linux;

     

       64
       64
       +
         };

     

       65
       65
       +
       }

+2 -2

pkgs/servers/search/groonga/default.nix

···

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
       

     

       9
       9
        
         name    = "groonga-${version}";

     

       10
       10
       -
         version = "9.0.3";

     

       10
       10
       +
         version = "9.0.4";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";

     

       14
       14
       -
           sha256 = "1sj7vq0b6panh3q1br9r30g5nphxjw7brwncrkyxjyawgw7cc94j";

     

       14
       14
       +
           sha256 = "00cyzvk8303y0xcmb0hiy45wj2j6baqqzrfda9f6fv3zlfna1n2g";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = with stdenv.lib;

+1 -1

pkgs/servers/sickbeard/default.nix

···

       29
       29
        
         meta = with stdenv.lib; {

     

       30
       30
        
           description = "PVR & episode guide that downloads and manages all your TV shows";

     

       31
       31
        
           license     = licenses.gpl3;

     

       32
       32
       -
           homepage    = https:/github.com/midgetspy/Sick-Beard;

     

       32
       32
       +
           homepage    = "https://github.com/midgetspy/Sick-Beard";

     

       33
       33
        
           maintainers = with stdenv.lib.maintainers; [ ];

     

       34
       34
        
         };

     

       35
       35
        
       }

+1 -1

pkgs/servers/sickbeard/sickgear.nix

···

       29
       29
        
         meta = with stdenv.lib; {

     

       30
       30
        
           description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation";

     

       31
       31
        
           license     = licenses.gpl3;

     

       32
       32
       -
           homepage    = https:/github.com/SickGear/SickGear;

     

       32
       32
       +
           homepage    = "https://github.com/SickGear/SickGear";

     

       33
       33
        
           maintainers = with stdenv.lib.maintainers; [ ];

     

       34
       34
        
         };

     

       35
       35
        
       }

-44

pkgs/servers/sql/mysql/5.5.17-cygwin.patch

···

       1
       1
       -
       --- mysql-5.5.17/cmake/install_macros.cmake	2011-10-12 07:10:24.000000000 -0500

     

       2
       2
       -
       +++ mysql-5.5.17/cmake/install_macros.cmake	2011-11-07 23:19:35.772837800 -0600

     

       3
       3
       -
       @@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS)

     

       4
       4
       -
          IF(ARG_COMPONENT)

     

       5
       5
       -
            SET(COMP COMPONENT ${ARG_COMPONENT})

     

       6
       6
       -
          ENDIF()

     

       7
       7
       -
       -  INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})

     

       8
       8
       -
       +  IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}")

     

       9
       9
       -
       +    INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION}

     

       10
       10
       -
       +                               RUNTIME DESTINATION bin

     

       11
       11
       -
       +                               ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP})

     

       12
       12
       -
       +  ELSE()

     

       13
       13
       -
       +    INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})

     

       14
       14
       -
       +  ENDIF()

     

       15
       15
       -
          SET(INSTALL_LOCATION ${ARG_DESTINATION} )

     

       16
       16
       -
          INSTALL_DEBUG_SYMBOLS("${TARGETS}")

     

       17
       17
       -
          SET(INSTALL_LOCATION)

     

       18
       18
       -
       --- mysql-5.5.17/libmysql/CMakeLists.txt	2011-10-12 07:10:24.000000000 -0500

     

       19
       19
       -
       +++ mysql-5.5.17/libmysql/CMakeLists.txt	2011-11-08 03:19:31.379219300 -0600

     

       20
       20
       -
       @@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED)

     

       21
       21
       -
            SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)

     

       22
       22
       -
            SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)

     

       23
       23
       -
        

     

       24
       24
       -
       +    IF(NOT CYGWIN)

     

       25
       25
       -
            # Install links to libmysqlclient.so (client_r)

     

       26
       26
       -
            GET_VERSIONED_LIBNAME(

     

       27
       27
       -
              "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"

     

       28
       28
       -
       @@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED)

     

       29
       29
       -
                linkname)

     

       30
       30
       -
              INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)

     

       31
       31
       -
            ENDFOREACH()

     

       32
       32
       -
       +    ENDIF(NOT CYGWIN)

     

       33
       33
       -
          ENDIF()

     

       34
       34
       -
        ENDIF()

     

       35
       35
       -
       --- mysql-5.5.17/strings/dtoa.c	2011-10-12 07:10:25.000000000 -0500

     

       36
       36
       -
       +++ mysql-5.5.17/strings/dtoa.c	2011-11-07 20:38:05.064690100 -0600

     

       37
       37
       -
       @@ -36,6 +36,7 @@

     

       38
       38
       -
        

     

       39
       39
       -
         ***************************************************************/

     

       40
       40
       -
        

     

       41
       41
       -
       +#define __STRICT_ANSI__

     

       42
       42
       -
        #include <my_base.h> /* for EOVERFLOW on Windows */

     

       43
       43
       -
        #include <my_global.h>

     

       44
       44
       -
        #include <m_string.h>  /* for memcpy and NOT_FIXED_DEC */

-22

pkgs/servers/sql/mysql/5.5.17-export-symbols.patch

···

       1
       1
       -
       --- mysql-5.5.17/libmysql/CMakeLists.txt	2011-10-12 07:10:24.000000000 -0500

     

       2
       2
       -
       +++ mysql-5.5.17/libmysql/CMakeLists.txt	2011-11-08 03:19:31.379219300 -0600

     

       3
       3
       -
       @@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES(

     

       4
       4
       -
        ADD_DEFINITIONS(${SSL_DEFINES})

     

       5
       5
       -
        

     

       6
       6
       -
        SET(CLIENT_API_FUNCTIONS

     

       7
       7
       -
       +dynstr_free

     

       8
       8
       -
       +dynstr_append_mem

     

       9
       9
       -
       +dynstr_append_os_quoted

     

       10
       10
       -
       +dynstr_realloc

     

       11
       11
       -
       +init_dynamic_string

     

       12
       12
       -
        get_tty_password

     

       13
       13
       -
        handle_options

     

       14
       14
       -
        load_defaults

     

       15
       15
       -
       @@ -131,6 +136,7 @@ mysql_server_end

     

       16
       16
       -
        mysql_set_character_set

     

       17
       17
       -
        mysql_get_character_set_info

     

       18
       18
       -
        mysql_stmt_next_result

     

       19
       19
       -
       +strfill

     

       20
       20
       -
        

     

       21
       21
       -
        CACHE INTERNAL "Functions exported by client API"

     

       22
       22
       -

-93

pkgs/servers/sql/mysql/5.5.x.nix

···

       1
       1
       -
       { stdenv, fetchpatch, fetchurl, cmake, bison, ncurses, openssl

     

       2
       2
       -
       , readline, zlib, perl, cctools, CoreServices }:

     

       3
       3
       -
       

     

       4
       4
       -
       # Note: zlib is not required; MySQL can use an internal zlib.

     

       5
       5
       -
       

     

       6
       6
       -
       let

     

       7
       7
       -
       self = stdenv.mkDerivation rec {

     

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

     

       9
       9
       -
         version = "5.5.62";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";

     

       13
       13
       -
           sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         patches =

     

       17
       17
       -
           # Minor type error that is a build failure as of clang 6.

     

       18
       18
       -
           stdenv.lib.optional stdenv.cc.isClang (fetchpatch {

     

       19
       19
       -
             url = "https://svn.freebsd.org/ports/head/databases/mysql55-server/files/patch-sql_sql_partition.cc?rev=469888";

     

       20
       20
       -
             extraPrefix = "";

     

       21
       21
       -
             sha256 = "09sya27z3ir3xy5mrv3x68hm274594y381n0i6r5s627x71jyszf";

     

       22
       22
       -
           }) ++

     

       23
       23
       -
           stdenv.lib.optionals stdenv.isCygwin [

     

       24
       24
       -
             ./5.5.17-cygwin.patch

     

       25
       25
       -
             ./5.5.17-export-symbols.patch

     

       26
       26
       -
           ];

     

       27
       27
       -
       

     

       28
       28
       -
         preConfigure = stdenv.lib.optional stdenv.isDarwin ''

     

       29
       29
       -
           ln -s /bin/ps $TMPDIR/ps

     

       30
       30
       -
           export PATH=$PATH:$TMPDIR

     

       31
       31
       -
         '';

     

       32
       32
       -
       

     

       33
       33
       -
         buildInputs = [ cmake bison ncurses openssl readline zlib ]

     

       34
       34
       -
            ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ];

     

       35
       35
       -
       

     

       36
       36
       -
         enableParallelBuilding = true;

     

       37
       37
       -
       

     

       38
       38
       -
         cmakeFlags = [

     

       39
       39
       -
           "-DWITH_SSL=yes"

     

       40
       40
       -
           "-DWITH_READLINE=yes"

     

       41
       41
       -
           "-DWITH_EMBEDDED_SERVER=yes"

     

       42
       42
       -
           "-DWITH_ZLIB=yes"

     

       43
       43
       -
           "-DHAVE_IPV6=yes"

     

       44
       44
       -
           "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"

     

       45
       45
       -
           "-DMYSQL_DATADIR=/var/lib/mysql"

     

       46
       46
       -
           "-DINSTALL_SYSCONFDIR=etc/mysql"

     

       47
       47
       -
           "-DINSTALL_INFODIR=share/mysql/docs"

     

       48
       48
       -
           "-DINSTALL_MANDIR=share/man"

     

       49
       49
       -
           "-DINSTALL_PLUGINDIR=lib/mysql/plugin"

     

       50
       50
       -
           "-DINSTALL_SCRIPTDIR=bin"

     

       51
       51
       -
           "-DINSTALL_INCLUDEDIR=include/mysql"

     

       52
       52
       -
           "-DINSTALL_DOCREADMEDIR=share/mysql"

     

       53
       53
       -
           "-DINSTALL_SUPPORTFILESDIR=share/mysql"

     

       54
       54
       -
           "-DINSTALL_MYSQLSHAREDIR=share/mysql"

     

       55
       55
       -
           "-DINSTALL_DOCDIR=share/mysql/docs"

     

       56
       56
       -
           "-DINSTALL_SHAREDIR=share/mysql"

     

       57
       57
       -
           "-DINSTALL_MYSQLTESTDIR="

     

       58
       58
       -
           "-DINSTALL_SQLBENCHDIR="

     

       59
       59
       -
         ];

     

       60
       60
       -
       

     

       61
       61
       -
         NIX_CFLAGS_COMPILE =

     

       62
       62
       -
           stdenv.lib.optionals stdenv.cc.isGNU [ "-fpermissive" ] # since gcc-7

     

       63
       63
       -
           ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-c++11-narrowing" ]; # since clang 6

     

       64
       64
       -
       

     

       65
       65
       -
         NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

     

       66
       66
       -
       

     

       67
       67
       -
         prePatch = ''

     

       68
       68
       -
           sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake

     

       69
       69
       -
         '';

     

       70
       70
       -
         postInstall = ''

     

       71
       71
       -
           sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db

     

       72
       72
       -
           rm -r $out/data "$out"/lib/*.a

     

       73
       73
       -
         '';

     

       74
       74
       -
       

     

       75
       75
       -
         passthru = {

     

       76
       76
       -
           client = self;

     

       77
       77
       -
           connector-c = self;

     

       78
       78
       -
           server = self;

     

       79
       79
       -
           mysqlVersion = "5.5";

     

       80
       80
       -
         };

     

       81
       81
       -
       

     

       82
       82
       -
         meta = with stdenv.lib; {

     

       83
       83
       -
           homepage = https://www.mysql.com/;

     

       84
       84
       -
           description = "The world's most popular open source database";

     

       85
       85
       -
           platforms = platforms.unix;

     

       86
       86
       -
           # See https://downloads.mysql.com/docs/licenses/mysqld-5.5-gpl-en.pdf

     

       87
       87
       -
           license = with licenses; [

     

       88
       88
       -
             artistic1 bsd0 bsd2 bsd3 bsdOriginal

     

       89
       89
       -
             gpl2 lgpl2 lgpl21 mit publicDomain  licenses.zlib

     

       90
       90
       -
           ];

     

       91
       91
       -
           broken = stdenv.isAarch64;

     

       92
       92
       -
         };

     

       93
       93
       -
       }; in self

+2 -2

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

···

       18
       18
        
           mkdir -p $out/{lib,share/extension}

     

       19
       19
        
       

     

       20
       20
        
           cp *.so      $out/lib

     

       21
       21
       -
           cp *.sql     $out/share/extension

     

       22
       22
       -
           cp *.control $out/share/extension

     

       21
       21
       +
           cp *.sql     $out/share/postgresql/extension

     

       22
       22
       +
           cp *.control $out/share/postgresql/extension

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+2 -2

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

···

       19
       19
        
         installPhase = ''

     

       20
       20
        
           install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl

     

       21
       21
        
           install -D -t $out/lib src/monitor/pgautofailover.so

     

       22
       22
       -
           install -D -t $out/share/extension src/monitor/*.sql

     

       23
       23
       -
           install -D -t $out/share/extension src/monitor/pgautofailover.control

     

       22
       22
       +
           install -D -t $out/share/postgresql/extension src/monitor/*.sql

     

       23
       23
       +
           install -D -t $out/share/postgresql/extension src/monitor/pgautofailover.control

     

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         meta = with stdenv.lib; {

+2 -2

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

···

       18
       18
        
           mkdir -p $out/{lib,share/extension}

     

       19
       19
        
       

     

       20
       20
        
           cp *.so      $out/lib

     

       21
       21
       -
           cp *.sql     $out/share/extension

     

       22
       22
       -
           cp *.control $out/share/extension

     

       21
       21
       +
           cp *.sql     $out/share/postgresql/extension

     

       22
       22
       +
           cp *.control $out/share/postgresql/extension

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+2 -2

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

···

       18
       18
        
           mkdir -p $out/{lib,share/extension}

     

       19
       19
        
       

     

       20
       20
        
           cp *.so      $out/lib

     

       21
       21
       -
           cp *.sql     $out/share/extension

     

       22
       22
       -
           cp *.control $out/share/extension

     

       21
       21
       +
           cp *.sql     $out/share/postgresql/extension

     

       22
       22
       +
           cp *.control $out/share/postgresql/extension

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+2 -2

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

···

       17
       17
        
           mkdir -p $out/{lib,share/extension}

     

       18
       18
        
       

     

       19
       19
        
           cp *.so      $out/lib

     

       20
       20
       -
           cp *.sql     $out/share/extension

     

       21
       21
       -
           cp *.control $out/share/extension

     

       20
       20
       +
           cp *.sql     $out/share/postgresql/extension

     

       21
       21
       +
           cp *.control $out/share/postgresql/extension

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         meta = with stdenv.lib; {

+3 -3

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

···

       18
       18
        
           mkdir -p $out/{lib,share/extension}

     

       19
       19
        
       

     

       20
       20
        
           cp src/*.so      $out/lib

     

       21
       21
       -
           cp updates/*     $out/share/extension

     

       22
       22
       -
           cp -r sql/*      $out/share/extension

     

       23
       23
       -
           cp *.control     $out/share/extension

     

       21
       21
       +
           cp updates/*     $out/share/postgresql/extension

     

       22
       22
       +
           cp -r sql/*      $out/share/postgresql/extension

     

       23
       23
       +
           cp *.control     $out/share/postgresql/extension

     

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         meta = with stdenv.lib; {

+1 -1

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

···

       16
       16
        
         installPhase = ''

     

       17
       17
        
           install -D bin/pg_repack -t $out/bin/

     

       18
       18
        
           install -D lib/pg_repack.so -t $out/lib/

     

       19
       19
       -
           install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension

     

       19
       19
       +
           install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         meta = with stdenv.lib; {

+1 -1

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

···

       15
       15
        
         installPhase = ''

     

       16
       16
        
           mkdir -p $out/bin   # for buildEnv to setup proper symlinks

     

       17
       17
        
           install -D pg_similarity.so -t $out/lib/

     

       18
       18
       -
           install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension

     

       18
       18
       +
           install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         meta = {

+2 -2

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

···

       17
       17
        
           mkdir -p $out/{lib,share/extension}

     

       18
       18
        
       

     

       19
       19
        
           cp *.so      $out/lib

     

       20
       20
       -
           cp *.sql     $out/share/extension

     

       21
       21
       -
           cp *.control $out/share/extension

     

       20
       20
       +
           cp *.sql     $out/share/postgresql/extension

     

       21
       21
       +
           cp *.control $out/share/postgresql/extension

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         meta = with stdenv.lib; {

+2 -2

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

···

       14
       14
        
         buildPhase = ":";

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           mkdir -p $out/bin  # current postgresql extension mechanism in nixos requires bin directory

     

       17
       17
       -
           mkdir -p $out/share/extension

     

       18
       18
       -
           cp pg*sql *.control $out/share/extension

     

       17
       17
       +
           mkdir -p $out/share/postgresql/extension

     

       18
       18
       +
           cp pg*sql *.control $out/share/postgresql/extension

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         meta = with stdenv.lib; {

+1 -1

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

···

       17
       17
        
         installPhase = ''

     

       18
       18
        
           mkdir -p $out/bin

     

       19
       19
        
           install -D pgroonga.so -t $out/lib/

     

       20
       20
       -
           install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension

     

       20
       20
       +
           install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension

     

       21
       21
        
         '';

     

       22
       22
        
       

     

       23
       23
        
         meta = with stdenv.lib; {

+2 -2

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

···

       17
       17
        
         installPhase = ''

     

       18
       18
        
           mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653

     

       19
       19
        
           install -D lib/*.so                        -t $out/lib

     

       20
       20
       -
           install -D sql/pgrouting--${version}.sql   -t $out/share/extension

     

       21
       21
       -
           install -D sql/common/pgrouting.control    -t $out/share/extension

     

       20
       20
       +
           install -D sql/pgrouting--${version}.sql   -t $out/share/postgresql/extension

     

       21
       21
       +
           install -D sql/common/pgrouting.control    -t $out/share/postgresql/extension

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         meta = with stdenv.lib; {

+1 -1

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

···

       14
       14
        
         nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
       -
           install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension

     

       17
       17
       +
           install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/postgresql/extension

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
        
         meta = with stdenv.lib; {

+1 -1

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

···

       26
       26
        
         installPhase = ''

     

       27
       27
        
           mkdir -p $out/bin

     

       28
       28
        
           install -D -t $out/lib/ pipelinedb.so

     

       29
       29
       -
           install -D -t $out/share/extension {pipelinedb-*.sql,pipelinedb.control}

     

       29
       29
       +
           install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control}

     

       30
       30
        
         '';

     

       31
       31
        
       

     

       32
       32
        
         meta = with stdenv.lib; {

+1 -1

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

···

       25
       25
        
         installPhase = ''

     

       26
       26
        
           mkdir -p $out/bin

     

       27
       27
        
           install -D plv8*.so                                        -t $out/lib

     

       28
       28
       -
           install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension

     

       28
       28
       +
           install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         meta = with stdenv.lib; {

+2 -2

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

···

       31
       31
        
       

     

       32
       32
        
         preConfigure = ''

     

       33
       33
        
           sed -i 's@/usr/bin/file@${file}/bin/file@' configure

     

       34
       34
       -
           configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"

     

       34
       34
       +
           configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"

     

       35
       35
        
       

     

       36
       36
       -
           makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin"

     

       36
       36
       +
           makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin"

     

       37
       37
        
         '';

     

       38
       38
        
         postConfigure = ''

     

       39
       39
        
           sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           install -D tds_fdw.so                  -t $out/lib

     

       18
       18
       -
           install -D sql/tds_fdw--${version}.sql -t $out/share/extension

     

       19
       19
       -
           install -D tds_fdw.control             -t $out/share/extension

     

       18
       18
       +
           install -D sql/tds_fdw--${version}.sql -t $out/share/postgresql/extension

     

       19
       19
       +
           install -D tds_fdw.control             -t $out/share/postgresql/extension

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         meta = with stdenv.lib; {

+2 -2

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

···

       17
       17
        
           mkdir -p $out/{bin,lib,share/extension}

     

       18
       18
        
       

     

       19
       19
        
           cp *.so      $out/lib

     

       20
       20
       -
           cp *.sql     $out/share/extension

     

       21
       21
       -
           cp *.control $out/share/extension

     

       20
       20
       +
           cp *.sql     $out/share/postgresql/extension

     

       21
       21
       +
           cp *.control $out/share/postgresql/extension

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         meta = with stdenv.lib; {

+3 -3

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

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         name = "timescaledb-${version}";

     

       11
       11
       -
         version = "1.3.1";

     

       11
       11
       +
         version = "1.3.2";

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake ];

     

       14
       14
        
         buildInputs = [ postgresql openssl ];

     
···

       17
       17
        
           owner  = "timescale";

     

       18
       18
        
           repo   = "timescaledb";

     

       19
       19
        
           rev    = "refs/tags/${version}";

     

       20
       20
       -
           sha256 = "1q3c4qsy4vb00a4p15km4w5d5xcppigf7rp4mqr3wln7i4d4lvnx";

     

       20
       20
       +
           sha256 = "117az52h8isi15p47r5d6k5y80ng9vj3x8ljq39iavgr364q716c";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];

     
···

       27
       27
        
         patchPhase = ''

     

       28
       28
        
           for x in CMakeLists.txt sql/CMakeLists.txt; do

     

       29
       29
        
             substituteInPlace "$x" \

     

       30
       30
       -
               --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\""

     

       30
       30
       +
               --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/postgresql/extension\""

     

       31
       31
        
           done

     

       32
       32
        
       

     

       33
       33
        
           for x in src/CMakeLists.txt src/loader/CMakeLists.txt tsl/src/CMakeLists.txt; do

+1 -1

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

···

       17
       17
        
         installPhase = ''

     

       18
       18
        
           mkdir -p $out/bin

     

       19
       19
        
           install -D tsearch_extras.so -t $out/lib/

     

       20
       20
       -
           install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension

     

       20
       20
       +
           install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension

     

       21
       21
        
         '';

     

       22
       22
        
       

     

       23
       23
        
         meta = with stdenv.lib; {

+2 -2

pkgs/servers/tautulli/default.nix

···

       1
       1
        
       {stdenv, fetchFromGitHub, python }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "2.1.29";

     

       4
       4
       +
         version = "2.1.32";

     

       5
       5
        
         pname = "Tautulli";

     

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

     

       7
       7
        
       

     
···

       13
       13
        
           owner = "Tautulli";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "1n5kpfcm59qg27xhlan3w2x71dp1h3gycdlp0iyxaqzaaw5splry";

     

       16
       16
       +
           sha256 = "05z6l3qs2m72c1hcl3qd1lm17hsmyqk48f8dcsvrxa5hibmf84j4";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildPhase = ":";

+3 -3

pkgs/shells/zsh/oh-my-zsh/default.nix

···

       4
       4
        
       { stdenv, fetchgit }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         version = "2019-06-15";

     

       7
       7
       +
         version = "2019-07-01";

     

       8
       8
        
         name = "oh-my-zsh-${version}";

     

       9
       9
       -
         rev = "c105c04b6b1ddb917c12eadacb26c252f44ddfad";

     

       9
       9
       +
         rev = "b259cdf7e71ad6c3cc1a66a48c6c79cf63f38590";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchgit { inherit rev;

     

       12
       12
        
           url = "https://github.com/robbyrussell/oh-my-zsh";

     

       13
       13
       -
           sha256 = "0b3mdiygqvxgikaa95ixhnr6rib3wllls54hv7h50g4f86jhj62b";

     

       13
       13
       +
           sha256 = "1vk9misnvjs1lxlwzy4ld30vh67nhghzra1y5ckgxa019l9cvann";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         pathsToLink = [ "/share/oh-my-zsh" ];

+2 -2

pkgs/shells/zsh/zsh-autosuggestions/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "zsh-autosuggestions-${version}";

     

       7
       7
       -
         version = "0.5.2";

     

       7
       7
       +
         version = "0.6.3";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "zsh-users";

     

       11
       11
        
           repo = "zsh-autosuggestions";

     

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

     

       13
       13
       -
           sha256 = "1xhrdv6cgmq9qslb476rcs8ifw8i2vf43yvmmscjcmpz0jac4sbx";

     

       13
       13
       +
           sha256 = "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ zsh ];

+21 -22

pkgs/tools/X11/xtrace/default.nix

···

       1
       1
       -
       { stdenv, autoreconfHook, fetchgit, libX11, xauth, makeWrapper }:

     

       1
       1
       +
       { stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "1.3.1"; in

     

       4
       4
       -
       stdenv.mkDerivation {

     

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

     

       6
       6
       -
         src = fetchgit {

     

       7
       7
       -
           url = "git://git.debian.org/xtrace/xtrace.git";

     

       8
       8
       -
           rev = "refs/tags/xtrace-1.3.1";

     

       9
       9
       -
           sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "xtrace";

     

       5
       5
       +
         version = "1.4.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitLab rec {

     

       8
       8
       +
           domain = "salsa.debian.org";

     

       9
       9
       +
           owner = "debian";

     

       10
       10
       +
           repo = pname;

     

       11
       11
       +
           rev = "xtrace-${version}";

     

       12
       12
       +
           sha256 = "1yff6x847nksciail9jly41mv70sl8sadh0m5d847ypbjmxcwjpq";

     

       10
       13
        
         };

     

       11
       14
        
       

     

       12
       12
       -
         nativeBuildInputs = [ autoreconfHook ];

     

       13
       13
       -
         buildInputs = [ libX11 makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ autoreconfHook makeWrapper ];

     

       16
       16
       +
         buildInputs = [ libX11 ];

     

       14
       17
        
       

     

       15
       15
       -
         preConfigure = ''

     

       16
       16
       -
           ./autogen.sh

     

       18
       18
       +
         postInstall = ''

     

       19
       19
       +
           wrapProgram "$out/bin/xtrace" \

     

       20
       20
       +
               --prefix PATH ':' "${xauth}/bin"

     

       17
       21
        
         '';

     

       18
       22
        
       

     

       19
       19
       -
         postInstall =

     

       20
       20
       -
           '' wrapProgram "$out/bin/xtrace" \

     

       21
       21
       -
                --prefix PATH ':' "${xauth}/bin"

     

       22
       22
       -
           '';

     

       23
       23
       -
       

     

       24
       24
       -
         meta = {

     

       25
       25
       -
           homepage = http://xtrace.alioth.debian.org/;

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           homepage = "https://salsa.debian.org/debian/xtrace";

     

       26
       25
        
           description = "Tool to trace X11 protocol connections";

     

       27
       27
       -
           license = stdenv.lib.licenses.gpl2;

     

       28
       28
       -
           maintainers = with stdenv.lib.maintainers; [viric];

     

       29
       29
       -
           platforms = with stdenv.lib.platforms; linux;

     

       26
       26
       +
           license = licenses.gpl2;

     

       27
       27
       +
           maintainers = with maintainers; [ viric ];

     

       28
       28
       +
           platforms = with platforms; linux;

     

       30
       29
        
         };

     

       31
       30
        
       }

+2 -2

pkgs/tools/admin/dehydrated/default.nix

···

       1
       1
        
       { stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:

     

       2
       2
        
       let

     

       3
       3
        
         pkgName = "dehydrated";

     

       4
       4
       -
         version = "0.6.2";

     

       4
       4
       +
         version = "0.6.5";

     

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = pkgName + "-" + version;

     
···

       10
       10
        
           owner = "lukas2511";

     

       11
       11
        
           repo = "dehydrated";

     

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

     

       13
       13
       -
           sha256 = "19d4kam0dl6l9wfd0v54w4d085jdgi1ljksnqpjj67d6sm23f2l4";

     

       13
       13
       +
           sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ makeWrapper ];

+2 -2

pkgs/tools/filesystems/avfs/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "avfs-${version}";

     

       5
       5
       -
         version = "1.0.6";

     

       5
       5
       +
         version = "1.1.0";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc";

     

       8
       8
       +
           sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/tools/filesystems/f3/default.nix

···

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
        
         pname = "f3";

     

       8
       8
       -
         version = "7.1";

     

       8
       8
       +
         version = "7.2";

     

       9
       9
        
       

     

       10
       10
        
         enableParallelBuilding = true;

     

       11
       11
        
       

     
···

       13
       13
        
           owner = "AltraMayor";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf";

     

       16
       16
       +
           sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ parted udev ];

+2 -2

pkgs/tools/misc/catimg/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "catimg";

     

       7
       7
       -
         version = "2.5.0";

     

       7
       7
       +
         version = "2.6.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "posva";

     

       11
       11
        
           repo = pname;

     

       12
       12
        
           rev = version;

     

       13
       13
       -
           sha256 = "0n74iczzgxrcq3zpa7ndycb9rinm829yvf81c747q4ngv5q6pzcm";

     

       13
       13
       +
           sha256 = "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/tools/misc/mc/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       6
       -
         version = "4.8.22";

     

       6
       6
       +
         version = "4.8.23";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";

     

       10
       10
       -
           sha256 = "060kh3dmk8fmmsibn1l815qjazzfxzbhgqggrhncz604pbbnhy7f";

     

       10
       10
       +
           sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/tools/misc/plantuml/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, jre, graphviz }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "1.2019.6";

     

       4
       4
       +
         version = "1.2019.7";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";

     

       9
       9
       -
           sha256 = "0sxpk7n96a3vwf0dlf62zs0rgm01gf36k62rbr8cyjf62qgf61lb";

     

       9
       9
       +
           sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+31

pkgs/tools/misc/psrecord/default.nix

···

       1
       1
       +
       { lib, buildPythonApplication, fetchPypi, psutil, matplotlib, pytest }:

     

       2
       2
       +
       buildPythonApplication rec {

     

       3
       3
       +
         pname = "psrecord";

     

       4
       4
       +
         version = "1.1";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchPypi {

     

       7
       7
       +
           inherit pname version;

     

       8
       8
       +
           sha256 = "151rynca97v5wq1drl2yfrqmqil1km72cizn3159c2ip14626mp6";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         propagatedBuildInputs = [

     

       12
       12
       +
           psutil matplotlib

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       15
       15
       +
         checkInputs = [

     

       16
       16
       +
           pytest

     

       17
       17
       +
         ];

     

       18
       18
       +
       

     

       19
       19
       +
         checkPhase = ''

     

       20
       20
       +
           runHook preCheck

     

       21
       21
       +
           pytest psrecord

     

       22
       22
       +
           runHook postCheck

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         meta = {

     

       26
       26
       +
           description = "Record the CPU and memory activity of a process";

     

       27
       27
       +
           homepage = "https://github.com/astrofrog/psrecord";

     

       28
       28
       +
           license = lib.licenses.bsd2;

     

       29
       29
       +
           maintainers = with lib.maintainers; [ johnazoidberg ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+14 -5

pkgs/tools/misc/stow/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, perl, perlPackages }:

     

       1
       1
       +
       { stdenv, fetchurl, perl, perlPackages, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "2.2.2";

     

       4
       4
       +
         pname = "stow";

     

       5
       5
       +
         version = "2.3.0";

     

       5
       6
        
       in

     

       6
       7
        
       stdenv.mkDerivation {

     

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

     

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

     

       8
       9
        
       

     

       9
       10
        
         src = fetchurl {

     

       10
       11
        
           url = "mirror://gnu/stow/stow-${version}.tar.bz2";

     

       11
       11
       -
           sha256 = "1zd6g9cm3whvy5f87j81j4npl7q6kxl25f7z7p9ahiqfjqs200m0";

     

       12
       12
       +
           sha256 = "1fnn83wwx3yaxpqkq8xyya3aiibz19fwrfj30nsiikm7igmwgiv5";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       14
       -
         buildInputs = with perlPackages; [ perl IOStringy TestOutput ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = with perlPackages; [ perl IOStringy TestOutput HashMerge Clone CloneChoose ];

     

       17
       17
       +
       

     

       18
       18
       +
         postFixup = ''

     

       19
       19
       +
           wrapProgram "$out"/bin/stow \

     

       20
       20
       +
           --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; makePerlPath [

     

       21
       21
       +
             HashMerge Clone CloneChoose

     

       22
       22
       +
           ]}"

     

       23
       23
       +
         '';

     

       15
       24
        
       

     

       16
       25
        
         doCheck = true;

     

       17
       26

+2 -2

pkgs/tools/misc/youtube-dl/default.nix

···

       18
       18
        
         # The websites youtube-dl deals with are a very moving target. That means that

     

       19
       19
        
         # downloads break constantly. Because of that, updates should always be backported

     

       20
       20
        
         # to the latest stable release.

     

       21
       21
       -
         version = "2019.06.21";

     

       21
       21
       +
         version = "2019.06.27";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";

     

       25
       25
       -
           sha256 = "03a729198zzhixbn7xixi9bprmk3qqh5dsyh3dqhji6lmlijx1w5";

     

       25
       25
       +
           sha256 = "1kxqiyhhgv0n85jc02kai5i6wdjs1696k88q1phq7ik2y6ky3c7y";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/tools/misc/yubikey-manager-qt/default.nix

···

       27
       27
        
       

     

       28
       28
        
       in stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "yubikey-manager-qt";

     

       30
       30
       -
         version = "1.1.1";

     

       30
       30
       +
         version = "1.1.2";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
           url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";

     

       34
       34
       -
           sha256 = "0hcfl0mh4gqy9c8ghmi58asqr8v009n6li0mgcy3r8fyjr7qryvy";

     

       34
       34
       +
           sha256 = "01ax8zjrahs2sjbgsys2ahh57sdcap0ij3y1r1bbvsgzr7xxm2q8";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython qmake ];

+2 -2

pkgs/tools/networking/dhcpcd/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         # when updating this to >=7, check, see previous reverts:

     

       5
       5
        
         # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix

     

       6
       6
       -
         name = "dhcpcd-7.2.2";

     

       6
       6
       +
         name = "dhcpcd-7.2.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://roy/dhcpcd/${name}.tar.xz";

     

       10
       10
       -
           sha256 = "17m0ig9n4p6m98j8wp4dwnl2cfg2rg3v6vqpsahls9x9rccgzdrx";

     

       10
       10
       +
           sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/tools/networking/lldpd/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
       -
         version = "1.0.3";

     

       7
       7
       +
         version = "1.0.4";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "0q63wiaan85a6d204jgk87w6dw5c9x0rb2z7pwb580b8a4wyvz1r";

     

       11
       11
       +
           sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         configureFlags = [

+4

pkgs/tools/networking/shadowsocks-libev/default.nix

···

       22
       22
        
       

     

       23
       23
        
         cmakeFlags = [ "-DWITH_STATIC=OFF"  "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];

     

       24
       24
        
       

     

       25
       25
       +
         postInstall = ''

     

       26
       26
       +
           cp lib/* $out/lib

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       25
       29
        
         meta = with stdenv.lib; {

     

       26
       30
        
           description = "A lightweight secured SOCKS5 proxy";

     

       27
       31
        
           longDescription = ''

+3 -1

pkgs/tools/package-management/cargo-outdated/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libiconv, curl, darwin }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-outdated";

     
···

       17
       17
        
         buildInputs = [ openssl ]

     

       18
       18
        
         ++ stdenv.lib.optionals stdenv.isDarwin [

     

       19
       19
        
           darwin.apple_sdk.frameworks.Security

     

       20
       20
       +
           libiconv

     

       21
       21
       +
           curl

     

       20
       22
        
         ];

     

       21
       23
        
       

     

       22
       24
        
         meta = with stdenv.lib; {

+3 -3

pkgs/tools/package-management/conda/default.nix

···

       28
       28
        
       # $ conda-shell

     

       29
       29
        
       # $ conda install spyder

     

       30
       30
        
       let

     

       31
       31
       -
         version = "4.3.31";

     

       31
       31
       +
         version = "4.6.14";

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
             url = "https://repo.continuum.io/miniconda/Miniconda3-${version}-Linux-x86_64.sh";

     

       34
       34
       -
             sha256 = "1rklq81s9v7xz1q0ha99w2sl6kyc5vhk6b21cza0jr3b8cgz0lam";

     

       34
       34
       +
             sha256 = "1gn43z1y5zw4yv93q1qajwbmmqs83wx5ls5x4i4llaciba4j6sqd";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         conda = runCommand "conda-install" { buildInputs = [ makeWrapper ]; }

     
···

       48
       48
        
           '';

     

       49
       49
        
       in

     

       50
       50
        
         buildFHSUserEnv {

     

       51
       51
       -
           name = "conda-shell-${version}";

     

       51
       51
       +
           name = "conda-shell";

     

       52
       52
        
           targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]);

     

       53
       53
        
           profile = ''

     

       54
       54
        
             # Add conda to PATH

+3 -3

pkgs/tools/package-management/home-manager/default.nix

···

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
       

     

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

     

       9
       9
       -
         version = "2019-05-24";

     

       9
       9
       +
         version = "2019-06-25";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "rycee";

     

       13
       13
        
           repo = "home-manager";

     

       14
       14
       -
           rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe";

     

       15
       15
       -
           sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf";

     

       14
       14
       +
           rev = "95d55b8da152f1efffb7713c82ead83a3fcf476d";

     

       15
       15
       +
           sha256 = "1zbx051rc0b880wjl832m9sliwrhrm1dbdxw8734gvc0pfz6qwn1";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/tools/package-management/nix/default.nix

···

       181
       181
        
       

     

       182
       182
        
         nixUnstable = lib.lowPrio (callPackage common rec {

     

       183
       183
        
           name = "nix-2.3${suffix}";

     

       184
       184
       -
           suffix = "pre6631_e58a7144";

     

       184
       184
       +
           suffix = "pre6779_324a5dc9";

     

       185
       185
        
           src = fetchFromGitHub {

     

       186
       186
        
             owner = "NixOS";

     

       187
       187
        
             repo = "nix";

     

       188
       188
       -
             rev = "e58a71442ad4a538b48fc7a9938c3690628c4741";

     

       189
       189
       -
             sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802";

     

       188
       188
       +
             rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837";

     

       189
       189
       +
             sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r";

     

       190
       190
        
           };

     

       191
       191
        
           fromGit = true;

     

       192
       192

+10 -3

pkgs/tools/security/gnupg/22.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror

     

       2
       2
       -
       , libiconv, npth, gettext, texinfo, pcsclite, sqlite

     

       1
       1
       +
       { fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba

     

       2
       2
       +
       , libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite

     

       3
       3
        
       , buildPackages

     

       4
       4
        
       

     

       5
       5
        
       # Each of the dependencies below are optional.

     
···

       32
       32
        
       

     

       33
       33
        
         patches = [

     

       34
       34
        
           ./fix-libusb-include-path.patch

     

       35
       35
       +
           (fetchpatch {

     

       36
       36
       +
             url = https://files.gnupg.net/file/data/qmxjhc6kuja3orybj7st/PHID-FILE-vvzlnw36427pdnug2amc/file;

     

       37
       37
       +
             sha256 = "13snxkmlgmvn0rgxh5k2sgxkp5mbxqiznzm45sw649nvs3ccghq8";

     

       38
       38
       +
           })

     

       35
       39
        
         ];

     

       36
       36
       -
         postPatch = stdenv.lib.optionalString stdenv.isLinux ''

     

       40
       40
       +
         postPatch = ''

     

       41
       41
       +
           sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \

     

       42
       42
       +
               configure doc/dirmngr.texi doc/gnupg.info-1

     

       43
       43
       +
         '' + stdenv.lib.optionalString stdenv.isLinux ''

     

       37
       44
        
           sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c

     

       38
       45
        
         ''; #" fix Emacs syntax highlighting :-(

     

       39
       46

+2 -2

pkgs/tools/security/lynis/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "lynis";

     

       5
       5
       -
         version = "2.7.4";

     

       5
       5
       +
         version = "2.7.5";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "CISOfy";

     

       10
       10
        
           repo = "${pname}";

     

       11
       11
        
           rev = "${version}";

     

       12
       12
       -
           sha256 = "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k";

     

       12
       12
       +
           sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/tools/security/tpm2-tools/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "tpm2-tools";

     

       6
       6
       -
         version = "3.1.4";

     

       6
       6
       +
         version = "3.2.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0cv09wnf7sw17z1n898w0zmk58y8b1why58m63hqx5d7x4054l9g";

     

       10
       10
       +
           sha256 = "057gg84zly6gjp6ypj6bv6zzmnr77cqsygl8x0147cylwa1ywydd";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pandoc pkgconfig ];

+2 -2

pkgs/tools/system/bfs/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "bfs-${version}";

     

       5
       5
       -
         version = "1.4.1";

     

       5
       5
       +
         version = "1.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           repo = "bfs";

     

       9
       9
        
           owner = "tavianator";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb";

     

       11
       11
       +
           sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];

+3 -3

pkgs/tools/system/netdata/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec{

     

       4
       4
       -
         version = "1.11.1";

     

       4
       4
       +
         version = "1.15.0";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

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

     

       9
       9
       -
           sha256 = "0djph4586cc14vavj6za6k255lscf3b415dx8k45q3nsc2hb4l01";

     

       9
       9
       +
           sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     
···

       20
       20
        
         postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''

     

       21
       21
        
           # rename this plugin so netdata will look for setuid wrapper

     

       22
       22
        
           mv $out/libexec/netdata/plugins.d/apps.plugin \

     

       23
       23
       -
             $out/libexec/netdata/plugins.d/apps.plugin.org

     

       23
       23
       +
              $out/libexec/netdata/plugins.d/apps.plugin.org

     

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         preConfigure = ''

+44 -37

pkgs/tools/system/netdata/no-files-in-etc-and-var.patch

···

       1
       1
       -
       diff -ruN orig/Makefile.am new/Makefile.am

     

       2
       2
       -
       --- orig/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       3
       3
       -
       +++ new/Makefile.am	2018-11-16 10:30:22.000000000 -0500

     

       4
       4
       -
       @@ -99,10 +99,10 @@

     

       1
       1
       +
       diff --git a/Makefile.am b/Makefile.am

     

       2
       2
       +
       index f2087bb..7a70cfb 100644

     

       3
       3
       +
       --- a/Makefile.am

     

       4
       4
       +
       +++ b/Makefile.am

     

       5
       5
       +
       @@ -116,10 +116,10 @@ AM_CFLAGS = \

     

       5
       6
        
        	$(NULL)

     

       6
       7
        
        

     

       7
       8
        
        sbin_PROGRAMS =

     

       8
       8
       -
       -dist_cache_DATA = installer/.keep

     

       9
       9
       -
       -dist_varlib_DATA = installer/.keep

     

       10
       10
       -
       -dist_registry_DATA = installer/.keep

     

       11
       11
       -
       -dist_log_DATA = installer/.keep

     

       9
       9
       +
       -dist_cache_DATA = packaging/installer/.keep

     

       10
       10
       +
       -dist_varlib_DATA = packaging/installer/.keep

     

       11
       11
       +
       -dist_registry_DATA = packaging/installer/.keep

     

       12
       12
       +
       -dist_log_DATA = packaging/installer/.keep

     

       12
       13
        
       +dist_cache_DATA =

     

       13
       14
        
       +dist_varlib_DATA =

     

       14
       15
        
       +dist_registry_DATA =

     
···

       16
       17
        
        plugins_PROGRAMS =

     

       17
       18
        
        

     

       18
       19
        
        LIBNETDATA_FILES = \

     

       19
       19
       -
       diff -ruN orig/collectors/charts.d.plugin/Makefile.am new/collectors/charts.d.plugin/Makefile.am

     

       20
       20
       -
       --- orig/collectors/charts.d.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       21
       21
       -
       +++ new/collectors/charts.d.plugin/Makefile.am	2018-11-16 11:16:47.000000000 -0500

     

       22
       22
       -
       @@ -32,7 +32,6 @@

     

       20
       20
       +
       diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am

     

       21
       21
       +
       index 2989b4b..64de7d6 100644

     

       22
       22
       +
       --- a/collectors/charts.d.plugin/Makefile.am

     

       23
       23
       +
       +++ b/collectors/charts.d.plugin/Makefile.am

     

       24
       24
       +
       @@ -32,7 +32,6 @@ dist_charts_DATA = \

     

       23
       25
        
        

     

       24
       26
        
        userchartsconfigdir=$(configdir)/charts.d

     

       25
       27
        
        dist_userchartsconfig_DATA = \

     

       26
       26
       -
       -    $(top_srcdir)/installer/.keep \

     

       28
       28
       +
       -    .keep \

     

       27
       29
        
            $(NULL)

     

       28
       30
        
        

     

       29
       31
        
        chartsconfigdir=$(libconfigdir)/charts.d

     

       30
       30
       -
       diff -ruN orig/collectors/node.d.plugin/Makefile.am new/collectors/node.d.plugin/Makefile.am

     

       31
       31
       -
       --- orig/collectors/node.d.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       32
       32
       -
       +++ new/collectors/node.d.plugin/Makefile.am	2018-11-16 11:16:42.000000000 -0500

     

       33
       33
       -
       @@ -23,7 +23,6 @@

     

       32
       32
       +
       diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am

     

       33
       33
       +
       index 3b5a0a5..b7abe01 100644

     

       34
       34
       +
       --- a/collectors/node.d.plugin/Makefile.am

     

       35
       35
       +
       +++ b/collectors/node.d.plugin/Makefile.am

     

       36
       36
       +
       @@ -23,7 +23,6 @@ dist_noinst_DATA = \

     

       34
       37
        
        

     

       35
       38
        
        usernodeconfigdir=$(configdir)/node.d

     

       36
       39
        
        dist_usernodeconfig_DATA = \

     

       37
       37
       -
       -    $(top_srcdir)/installer/.keep \

     

       40
       40
       +
       -    .keep \

     

       38
       41
        
            $(NULL)

     

       39
       42
        
        

     

       40
       43
        
        nodeconfigdir=$(libconfigdir)/node.d

     

       41
       41
       -
       diff -ruN orig/collectors/python.d.plugin/Makefile.am new/collectors/python.d.plugin/Makefile.am

     

       42
       42
       -
       --- orig/collectors/python.d.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       43
       43
       -
       +++ new/collectors/python.d.plugin/Makefile.am	2018-11-16 10:56:06.000000000 -0500

     

       44
       44
       -
       @@ -29,7 +29,6 @@

     

       44
       44
       +
       diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am

     

       45
       45
       +
       index 652a35d..cf4b2cc 100644

     

       46
       46
       +
       --- a/collectors/python.d.plugin/Makefile.am

     

       47
       47
       +
       +++ b/collectors/python.d.plugin/Makefile.am

     

       48
       48
       +
       @@ -29,7 +29,6 @@ dist_python_DATA = \

     

       45
       49
        
        

     

       46
       50
        
        userpythonconfigdir=$(configdir)/python.d

     

       47
       51
        
        dist_userpythonconfig_DATA = \

     

       48
       48
       -
       -    $(top_srcdir)/installer/.keep \

     

       52
       52
       +
       -    .keep \

     

       49
       53
        
            $(NULL)

     

       50
       54
        
        

     

       51
       55
        
        pythonconfigdir=$(libconfigdir)/python.d

     

       52
       52
       -
       diff -ruN orig/collectors/statsd.plugin/Makefile.am new/collectors/statsd.plugin/Makefile.am

     

       53
       53
       -
       --- orig/collectors/statsd.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       54
       54
       -
       +++ new/collectors/statsd.plugin/Makefile.am	2018-11-16 10:53:04.000000000 -0500

     

       55
       55
       -
       @@ -15,6 +15,5 @@

     

       56
       56
       +
       diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am

     

       57
       57
       +
       index e63bf98..0f59782 100644

     

       58
       58
       +
       --- a/collectors/statsd.plugin/Makefile.am

     

       59
       59
       +
       +++ b/collectors/statsd.plugin/Makefile.am

     

       60
       60
       +
       @@ -14,6 +14,5 @@ dist_statsdconfig_DATA = \

     

       56
       61
        
        

     

       57
       62
        
        userstatsdconfigdir=$(configdir)/statsd.d

     

       58
       63
        
        dist_userstatsdconfig_DATA = \

     

       59
       59
       -
       -    $(top_srcdir)/installer/.keep \

     

       64
       64
       +
       -    .keep \

     

       60
       65
        
            $(NULL)

     

       61
       66
        
        

     

       62
       62
       -
       diff -ruN orig/health/Makefile.am new/health/Makefile.am

     

       63
       63
       -
       --- orig/health/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       64
       64
       -
       +++ new/health/Makefile.am	2018-11-16 10:56:30.000000000 -0500

     

       65
       65
       -
       @@ -16,7 +16,6 @@

     

       67
       67
       +
       diff --git a/health/Makefile.am b/health/Makefile.am

     

       68
       68
       +
       index 62a4c6d..4d651df 100644

     

       69
       69
       +
       --- a/health/Makefile.am

     

       70
       70
       +
       +++ b/health/Makefile.am

     

       71
       71
       +
       @@ -16,7 +16,6 @@ dist_noinst_DATA = \

     

       66
       72
        
        

     

       67
       73
        
        userhealthconfigdir=$(configdir)/health.d

     

       68
       74
        
        dist_userhealthconfig_DATA = \

     

       69
       69
       -
       -    $(top_srcdir)/installer/.keep \

     

       75
       75
       +
       -    .keep \

     

       70
       76
        
            $(NULL)

     

       71
       77
        
        

     

       72
       78
        
        healthconfigdir=$(libconfigdir)/health.d

     

       73
       73
       -
       diff -ruN orig/system/Makefile.am new/system/Makefile.am

     

       74
       74
       -
       --- orig/system/Makefile.am	2018-11-02 08:56:21.000000000 -0500

     

       75
       75
       -
       +++ new/system/Makefile.am	2018-11-16 10:29:21.000000000 -0500

     

       76
       76
       -
       @@ -17,10 +17,6 @@

     

       79
       79
       +
       diff --git a/system/Makefile.am b/system/Makefile.am

     

       80
       80
       +
       index b085dca..ccfa588 100644

     

       81
       81
       +
       --- a/system/Makefile.am

     

       82
       82
       +
       +++ b/system/Makefile.am

     

       83
       83
       +
       @@ -17,10 +17,6 @@ CLEANFILES = \

     

       77
       84
        
        include $(top_srcdir)/build/subst.inc

     

       78
       85
        
        SUFFIXES = .in

     

       79
       86

+2 -2

pkgs/tools/system/syslog-ng/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

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

     

       14
       14
       -
         version = "3.21.1";

     

       14
       14
       +
         version = "3.22.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";

     

       18
       18
       -
           sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld";

     

       18
       18
       +
           sha256 = "1j3l9pn3lf9w87vvwbnxk098gprbqzmfpfw1rch46mgsfqvl8mh6";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig which ];

+2 -2

pkgs/tools/text/languagetool/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "LanguageTool-${version}";

     

       5
       5
       -
         version = "4.4";

     

       5
       5
       +
         version = "4.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://www.languagetool.org/download/${name}.zip";

     

       9
       9
       -
           sha256 = "0cdrh59jcwrj5zp2lhbi9wp29pzabp35i8f7lbrs6z1wib6mgmp1";

     

       9
       9
       +
           sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg";

     

       10
       10
        
         };

     

       11
       11
        
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
        
         buildInputs = [ jre ];

+1

pkgs/tools/typesetting/asciidoctor/Gemfile

···

       5
       5
        
       gem 'asciidoctor-mathematical'

     

       6
       6
        
       gem 'coderay'

     

       7
       7
        
       gem 'pygments.rb'

     

       8
       8
       +
       gem 'rouge'

+3 -1

pkgs/tools/typesetting/asciidoctor/Gemfile.lock

···

       54
       54
        
           prawn-templates (0.1.1)

     

       55
       55
        
             pdf-reader (~> 2.0)

     

       56
       56
        
             prawn (~> 2.2)

     

       57
       57
       -
           public_suffix (3.1.0)

     

       57
       57
       +
           public_suffix (3.1.1)

     

       58
       58
        
           pygments.rb (1.2.1)

     

       59
       59
        
             multi_json (>= 1.0.0)

     

       60
       60
       +
           rouge (3.5.1)

     

       60
       61
        
           ruby-enum (0.7.2)

     

       61
       62
        
             i18n

     

       62
       63
        
           ruby-rc4 (0.1.5)

     
···

       76
       77
        
         asciidoctor-pdf

     

       77
       78
        
         coderay

     

       78
       79
        
         pygments.rb

     

       80
       80
       +
         rouge

     

       79
       81
        
       

     

       80
       82
        
       BUNDLED WITH

     

       81
       83
        
          1.17.2

+8 -2

pkgs/tools/typesetting/asciidoctor/default.nix

···

       1
       1
       -
       { stdenv, lib, bundlerApp, ruby

     

       1
       1
       +
       { stdenv, lib, bundlerApp, ruby, bundix, mkShell

     

       2
       2
        
         # Dependencies of the 'mathematical' package

     

       3
       3
        
       , cmake, bison, flex, glib, pkgconfig, cairo

     

       4
       4
        
       , pango, gdk_pixbuf, libxml2, python3, patchelf

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       bundlerApp {

     

       7
       7
       +
       bundlerApp rec {

     

       8
       8
        
         inherit ruby;

     

       9
       9
        
         pname = "asciidoctor";

     

       10
       10
        
         gemdir = ./.;

     
···

       41
       41
        
                 "$soPath"

     

       42
       42
        
             '';

     

       43
       43
        
           };

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         passthru.updateShell = mkShell {

     

       47
       47
       +
           buildInputs = (gemConfig.mathematical {}).buildInputs ++ [

     

       48
       48
       +
             bundix

     

       49
       49
       +
           ];

     

       44
       50
        
         };

     

       45
       51
        
       

     

       46
       52
        
         meta = with lib; {

+12 -2

pkgs/tools/typesetting/asciidoctor/gemset.nix

···

       237
       237
        
           platforms = [];

     

       238
       238
        
           source = {

     

       239
       239
        
             remotes = ["https://rubygems.org"];

     

       240
       240
       -
             sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";

     

       240
       240
       +
             sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";

     

       241
       241
        
             type = "gem";

     

       242
       242
        
           };

     

       243
       243
       -
           version = "3.1.0";

     

       243
       243
       +
           version = "3.1.1";

     

       244
       244
        
         };

     

       245
       245
        
         "pygments.rb" = {

     

       246
       246
        
           dependencies = ["multi_json"];

     
···

       252
       252
        
             type = "gem";

     

       253
       253
        
           };

     

       254
       254
        
           version = "1.2.1";

     

       255
       255
       +
         };

     

       256
       256
       +
         rouge = {

     

       257
       257
       +
           groups = ["default"];

     

       258
       258
       +
           platforms = [];

     

       259
       259
       +
           source = {

     

       260
       260
       +
             remotes = ["https://rubygems.org"];

     

       261
       261
       +
             sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";

     

       262
       262
       +
             type = "gem";

     

       263
       263
       +
           };

     

       264
       264
       +
           version = "3.5.1";

     

       255
       265
        
         };

     

       256
       266
        
         ruby-enum = {

     

       257
       267
        
           dependencies = ["i18n"];

+6

pkgs/tools/typesetting/asciidoctor/update.sh

···

       1
       1
       +
       #!/usr/bin/env bash

     

       2
       2
       +
       rm gemset.nix Gemfile.lock

     

       3
       3
       +
       nix-shell ../../../.. -A asciidoctor.updateShell --run '

     

       4
       4
       +
         bundix -m --bundle-pack-path $TMPDIR/asciidoctor-ruby-bundle

     

       5
       5
       +
       '

     

       6
       6
       +
       rm -r .bundle

+1

pkgs/top-level/aliases.nix

···

       280
       280
        
         qt_gstreamer1 = qt-gstreamer1;  # added 2017-02

     

       281
       281
        
         quake3game = ioquake3; # added 2016-01-14

     

       282
       282
        
         qwt6 = libsForQt5.qwt;  # added 2015-12-19

     

       283
       283
       +
         qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26

     

       283
       284
        
         rdiff_backup = rdiff-backup;  # added 2014-11-23

     

       284
       285
        
         rdmd = dtools;  # added 2017-08-19

     

       285
       286
        
         rhc = throw "deprecated in 2019-04-09: abandoned by upstream.";

+50 -21

pkgs/top-level/all-packages.nix

···

       163
       163
        
       

     

       164
       164
        
         proto-contrib = callPackage ../development/tools/proto-contrib {};

     

       165
       165
        
       

     

       166
       166
       +
         protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};

     

       167
       167
       +
       

     

       166
       168
        
         demoit = callPackage ../servers/demoit { };

     

       167
       169
        
       

     

       168
       170
        
         diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;

     
···

       243
       245
        
         graph-easy = callPackage ../tools/graphics/graph-easy { };

     

       244
       246
        
       

     

       245
       247
        
         packer = callPackage ../development/tools/packer { };

     

       248
       248
       +
       

     

       249
       249
       +
         packr = callPackage ../development/libraries/packr { };

     

       246
       250
        
       

     

       247
       251
        
         pet = callPackage ../development/tools/pet { };

     

       248
       252
        
       

     
···

       1669
       1673
        
       

     

       1670
       1674
        
         link-grammar = callPackage ../tools/text/link-grammar { };

     

       1671
       1675
        
       

     

       1676
       1676
       +
         linuxptp = callPackage ../os-specific/linux/linuxptp { };

     

       1677
       1677
       +
       

     

       1672
       1678
        
         loadwatch = callPackage ../tools/system/loadwatch { };

     

       1673
       1679
        
       

     

       1674
       1680
        
         loccount = callPackage ../development/tools/misc/loccount { };

     
···

       1783
       1789
        
         procs = callPackage ../tools/admin/procs {

     

       1784
       1790
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       1785
       1791
        
         };

     

       1792
       1792
       +
       

     

       1793
       1793
       +
         psrecord = python3Packages.callPackage ../tools/misc/psrecord {};

     

       1786
       1794
        
       

     

       1787
       1795
        
         scour = with python3Packages; toPythonApplication scour;

     

       1788
       1796
        
       

     
···

       2661
       2669
        
       

     

       2662
       2670
        
         tridactyl-native = callPackage ../tools/networking/tridactyl-native { };

     

       2663
       2671
        
       

     

       2672
       2672
       +
         trompeloeil = callPackage ../development/libraries/trompeloeil { };

     

       2673
       2673
       +
       

     

       2664
       2674
        
         uudeview = callPackage ../tools/misc/uudeview { };

     

       2665
       2675
        
       

     

       2666
       2676
        
         uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {

     
···

       3947
       3957
        
       

     

       3948
       3958
        
         kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { };

     

       3949
       3959
        
       

     

       3950
       3950
       -
         kakoune = callPackage ../applications/editors/kakoune { };

     

       3960
       3960
       +
         wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { };

     

       3961
       3961
       +
         kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { };

     

       3962
       3962
       +
         kakoune-unwrapped = callPackage ../applications/editors/kakoune { };

     

       3963
       3963
       +
         kakoune = wrapKakoune kakoune-unwrapped { };

     

       3951
       3964
        
       

     

       3952
       3965
        
         kbdd = callPackage ../applications/window-managers/kbdd { };

     

       3953
       3966
        
       

     
···

       4237
       4250
        
         };

     

       4238
       4251
        
         nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {

     

       4239
       4252
        
           openssl = openssl_1_1;

     

       4240
       4240
       -
           icu = icu63;

     

       4241
       4253
        
         };

     

       4242
       4254
        
         nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {

     

       4243
       4255
        
           enableNpm = false;

     

       4244
       4256
        
           openssl = openssl_1_1;

     

       4245
       4245
       -
           icu = icu63;

     

       4246
       4257
        
         };

     

       4247
       4258
        
       

     

       4248
       4259
        
         # Update this when adding the newest nodejs major version!

     
···

       4834
       4845
        
       

     

       4835
       4846
        
         noip = callPackage ../tools/networking/noip { };

     

       4836
       4847
        
       

     

       4837
       4837
       -
         nomad = callPackage ../applications/networking/cluster/nomad {

     

       4838
       4838
       -
           buildGoPackage = buildGo110Package;

     

       4839
       4839
       -
         };

     

       4848
       4848
       +
         nomad = callPackage ../applications/networking/cluster/nomad { };

     

       4840
       4849
        
       

     

       4841
       4850
        
         notable = callPackage ../applications/misc/notable { };

     

       4842
       4851
        
       

     
···

       6213
       6222
        
         timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };

     

       6214
       6223
        
       

     

       6215
       6224
        
         timetrap = callPackage ../applications/office/timetrap { };

     

       6225
       6225
       +
       

     

       6226
       6226
       +
         timetable = callPackage ../applications/office/timetable { };

     

       6216
       6227
        
       

     

       6217
       6228
        
         tzupdate = callPackage ../applications/misc/tzupdate { };

     

       6218
       6229
        
       

     
···

       7672
       7683
        
       

     

       7673
       7684
        
         bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };

     

       7674
       7685
        
       

     

       7686
       7686
       +
         openjfx11 =

     

       7687
       7687
       +
           if stdenv.isDarwin then

     

       7688
       7688
       +
             null

     

       7689
       7689
       +
           else

     

       7690
       7690
       +
             callPackage ../development/compilers/openjdk/openjfx/11.nix {

     

       7691
       7691
       +
               openjdk = openjdk11;

     

       7692
       7692
       +
             };

     

       7693
       7693
       +
       

     

       7675
       7694
        
         openjdk8 =

     

       7676
       7695
        
           if stdenv.isDarwin then

     

       7677
       7696
        
             callPackage ../development/compilers/openjdk/darwin/8.nix { }

     
···

       7686
       7705
        
             callPackage ../development/compilers/openjdk/darwin/11.nix { }

     

       7687
       7706
        
           else

     

       7688
       7707
        
             callPackage ../development/compilers/openjdk/11.nix {

     

       7708
       7708
       +
               openjfx = openjfx11;

     

       7689
       7709
        
               inherit (gnome2) GConf gnome_vfs;

     

       7690
       7710
        
             };

     

       7691
       7711
        
       

     
···

       7996
       8016
        
         };

     

       7997
       8017
        
       

     

       7998
       8018
        
         pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { };

     

       8019
       8019
       +
       

     

       8020
       8020
       +
         qbe = callPackage ../development/compilers/qbe { };

     

       7999
       8021
        
       

     

       8000
       8022
        
         rgbds = callPackage ../development/compilers/rgbds { };

     

       8001
       8023
        
       

     
···

       9181
       9203
        
         drake = callPackage ../development/tools/build-managers/drake { };

     

       9182
       9204
        
       

     

       9183
       9205
        
         drip = callPackage ../development/tools/drip { };

     

       9206
       9206
       +
       

     

       9207
       9207
       +
         drm_info = callPackage ../development/tools/drm_info { };

     

       9184
       9208
        
       

     

       9185
       9209
        
         drush = callPackage ../development/tools/misc/drush { };

     

       9186
       9210
        
       

     
···

       14548
       14572
        
       

     

       14549
       14573
        
         influxdb = callPackage ../servers/nosql/influxdb { };

     

       14550
       14574
        
       

     

       14551
       14551
       -
         mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix {

     

       14552
       14552
       -
           inherit (darwin) cctools;

     

       14553
       14553
       -
           inherit (darwin.apple_sdk.frameworks) CoreServices;

     

       14554
       14554
       -
         };

     

       14555
       14555
       -
       

     

       14556
       14575
        
         mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {

     

       14557
       14576
        
           inherit (darwin) cctools developer_cmds;

     

       14558
       14577
        
           inherit (darwin.apple_sdk.frameworks) CoreServices;

     
···

       14738
       14757
        
             enableStatic = true;

     

       14739
       14758
        
           };

     

       14740
       14759
        
         };

     

       14760
       14760
       +
       

     

       14761
       14761
       +
         roon-server = callPackage ../servers/roon-server { };

     

       14741
       14762
        
       

     

       14742
       14763
        
         s6 = skawarePackages.s6;

     

       14743
       14764
        
       

     
···

       15197
       15218
        
         iotop = callPackage ../os-specific/linux/iotop { };

     

       15198
       15219
        
       

     

       15199
       15220
        
         iproute = callPackage ../os-specific/linux/iproute { };

     

       15221
       15221
       +
       

     

       15222
       15222
       +
         iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { };

     

       15200
       15223
        
       

     

       15201
       15224
        
         iputils = callPackage ../os-specific/linux/iputils { };

     

       15202
       15225
        
       

     
···

       15721
       15744
        
         nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }

     

       15722
       15745
        
                    else unixtools.nettools;

     

       15723
       15746
        
       

     

       15747
       15747
       +
         nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };

     

       15748
       15748
       +
       

     

       15724
       15749
        
         nftables = callPackage ../os-specific/linux/nftables { };

     

       15725
       15750
        
       

     

       15726
       15751
        
         noah = callPackage ../os-specific/darwin/noah {

     
···

       15864
       15889
        
       

     

       15865
       15890
        
         semodule-utils = callPackage ../os-specific/linux/semodule-utils { };

     

       15866
       15891
        
       

     

       15867
       15867
       -
         powerdns = callPackage ../servers/dns/powerdns { };

     

       15892
       15892
       +
         powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; };

     

       15868
       15893
        
       

     

       15869
       15894
        
         dnsdist = callPackage ../servers/dns/dnsdist { };

     

       15870
       15895
        
       

     
···

       15880
       15905
        
                  else unixtools.procps;

     

       15881
       15906
        
       

     

       15882
       15907
        
         procdump = callPackage ../os-specific/linux/procdump { };

     

       15908
       15908
       +
       

     

       15909
       15909
       +
         prototool = callPackage ../development/tools/prototool { };

     

       15883
       15910
        
       

     

       15884
       15911
        
         qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });

     

       15885
       15912
        
       

     
···

       16133
       16160
        
         agave = callPackage ../data/fonts/agave { };

     

       16134
       16161
        
       

     

       16135
       16162
        
         aileron = callPackage ../data/fonts/aileron { };

     

       16163
       16163
       +
       

     

       16164
       16164
       +
         amiri = callPackage ../data/fonts/amiri { };

     

       16136
       16165
        
       

     

       16137
       16166
        
         andagii = callPackage ../data/fonts/andagii { };

     

       16138
       16167
        
       

     
···

       19014
       19043
        
       

     

       19015
       19044
        
         mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });

     

       19016
       19045
        
       

     

       19017
       19017
       -
         merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };

     

       19046
       19046
       +
         merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { };

     

       19018
       19047
        
       

     

       19019
       19048
        
         meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };

     

       19020
       19049
        
       

     
···

       19519
       19548
        
       

     

       19520
       19549
        
         vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};

     

       19521
       19550
        
       

     

       19551
       19551
       +
         vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { };

     

       19552
       19552
       +
       

     

       19522
       19553
        
         openmpt123 = callPackage ../applications/audio/openmpt123 { };

     

       19523
       19554
        
       

     

       19524
       19555
        
         opusfile = callPackage ../applications/audio/opusfile { };

     
···

       19822
       19853
        
         qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };

     

       19823
       19854
        
       

     

       19824
       19855
        
         qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };

     

       19825
       19825
       -
       

     

       19826
       19826
       -
         qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };

     

       19827
       19856
        
       

     

       19828
       19857
        
         qtractor = libsForQt5.callPackage ../applications/audio/qtractor { };

     

       19829
       19858
        
       

     
···

       21808
       21837
        
       

     

       21809
       21838
        
         racer = callPackage ../games/racer { };

     

       21810
       21839
        
       

     

       21840
       21840
       +
         redeclipse = callPackage ../games/redeclipse { };

     

       21841
       21841
       +
       

     

       21811
       21842
        
         residualvm = callPackage ../games/residualvm { };

     

       21812
       21843
        
       

     

       21813
       21844
        
         rftg = callPackage ../games/rftg { };

     
···

       22419
       22450
        
         niftyreg = callPackage ../applications/science/biology/niftyreg { };

     

       22420
       22451
        
       

     

       22421
       22452
        
         niftyseg = callPackage ../applications/science/biology/niftyseg { };

     

       22453
       22453
       +
       

     

       22454
       22454
       +
         octopus-caller = callPackage ../applications/science/biology/octopus { };

     

       22422
       22455
        
       

     

       22423
       22456
        
         paml = callPackage ../applications/science/biology/paml { };

     

       22424
       22457
        
       

     
···

       22945
       22978
        
           ecl-fasl = true;

     

       22946
       22979
        
           sbcl = null;

     

       22947
       22980
        
         };

     

       22948
       22948
       -
         # old version temporarily kept for sage

     

       22949
       22949
       -
         maxima-ecl-5_41 = callPackage ../applications/science/math/maxima/5.41.nix {

     

       22950
       22950
       -
           ecl = ecl_16_1_2;

     

       22951
       22951
       -
           ecl-fasl = true;

     

       22952
       22952
       -
           sbcl = null;

     

       22953
       22953
       -
         };

     

       22954
       22981
        
       

     

       22955
       22982
        
         mxnet = callPackage ../applications/science/math/mxnet {

     

       22956
       22983
        
           inherit (linuxPackages) nvidia_x11;

     
···

       24308
       24335
        
         bemenu = callPackage ../applications/misc/bemenu { };

     

       24309
       24336
        
       

     

       24310
       24337
        
         dapper = callPackage ../development/tools/dapper { };

     

       24338
       24338
       +
       

     

       24339
       24339
       +
         kube3d =  callPackage ../applications/networking/cluster/kube3d {};

     

       24311
       24340
        
       

     

       24312
       24341
        
       }

+3 -3

pkgs/top-level/coq-packages.nix

···

       54
       54
        
               mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9

     

       55
       55
        
               mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9;

     

       56
       56
        
             inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { })

     

       57
       57
       -
               mathcompExtraGen multinomials

     

       57
       57
       +
               mathcompExtraGen multinomials coqeal

     

       58
       58
        
       

     

       59
       59
        
               mathcomp-finmap mathcomp-bigenough mathcomp-analysis

     

       60
       60
       -
               mathcomp-multinomials mathcomp-real-closed

     

       60
       60
       +
               mathcomp-multinomials mathcomp-real-closed mathcomp-coqeal

     

       61
       61
        
       

     

       62
       62
        
               mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis

     

       63
       63
        
               mathcomp_1_7-multinomials mathcomp_1_7-real-closed

     

       64
       64
        
               mathcomp_1_7-finmap_1_0

     

       65
       65
        
       

     

       66
       66
        
               mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis

     

       67
       67
       -
               mathcomp_1_8-multinomials mathcomp_1_8-real-closed

     

       67
       67
       +
               mathcomp_1_8-multinomials mathcomp_1_8-real-closed mathcomp_1_8-coqeal

     

       68
       68
        
       

     

       69
       69
        
               mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis

     

       70
       70
        
               mathcomp_1_9-multinomials mathcomp_1_9-real-closed;

+5 -5

pkgs/top-level/dotnet-packages.nix

···

       305
       305
        
       

     

       306
       306
        
         Boogie = buildDotnetPackage rec {

     

       307
       307
        
           baseName = "Boogie";

     

       308
       308
       -
           version = "2018-05-28";

     

       308
       308
       +
           version = "2019-06-20";

     

       309
       309
        
           name = "${baseName}-unstable-${version}";

     

       310
       310
        
       

     

       311
       311
        
           src = fetchFromGitHub {

     

       312
       312
        
             owner = "boogie-org";

     

       313
       313
        
             repo = "boogie";

     

       314
       314
       -
             rev = "fc97aac639505f46cda7904dae95c9557716d037";

     

       315
       315
       -
             sha256 = "1hjksc5sapw1shxjwg0swja5afman8i15wnv5b6rzkqd4mg8y6nz";

     

       314
       314
       +
             rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e";

     

       315
       315
       +
             sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2";

     

       316
       316
        
           };

     

       317
       317
        
       

     

       318
       318
        
           # emulate `nuget restore Source/Boogie.sln`

     
···

       359
       359
        
       

     

       360
       360
        
         Dafny = buildDotnetPackage rec {

     

       361
       361
        
           baseName = "Dafny";

     

       362
       362
       -
           version = "2.1.0";

     

       362
       362
       +
           version = "2.3.0";

     

       363
       363
        
       

     

       364
       364
        
           src = fetchurl {

     

       365
       365
        
             url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz";

     

       366
       366
       -
             sha256 = "1iyhy0zpi6wvqif7826anzgdipgsy5bk775ds9qqwfw27j7x6fy5";

     

       366
       366
       +
             sha256 = "0s6ihx32kda7400lvdrq60l46c11nki8b6kalir2g4ic508f6ypa";

     

       367
       367
        
           };

     

       368
       368
        
       

     

       369
       369
        
           postPatch = ''

+1 -1

pkgs/top-level/emacs-packages.nix

···

       312
       312
        
           postInstall = ''

     

       313
       313
        
             mkdir -p $out

     

       314
       314
        
             mv $out/share/emacs/site-lisp/elpa/*/server/bin $out

     

       315
       315
       -
             rm -rf $out/share/emacs/site-lisp/*/server

     

       315
       315
       +
             rm -rf $out/share/emacs/site-lisp/elpa/*/server

     

       316
       316
        
           '';

     

       317
       317
        
           preCheck = ''

     

       318
       318
        
             cd source/server

+2 -2

pkgs/top-level/perl-packages.nix

···

       15787
       15787
        
       

     

       15788
       15788
        
         SysVirt = buildPerlModule rec {

     

       15789
       15789
        
           pname = "Sys-Virt";

     

       15790
       15790
       -
           version = "4.10.0";

     

       15790
       15790
       +
           version = "5.4.0";

     

       15791
       15791
        
           src = assert version == pkgs.libvirt.version; pkgs.fetchgit {

     

       15792
       15792
        
             url = git://libvirt.org/libvirt-perl.git;

     

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

     

       15794
       15794
       -
             sha256 = "1dfwq4d46kx18lz27rb3jkxb0g1hirpq70vr4572sc38rybpq59v";

     

       15794
       15794
       +
             sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a";

     

       15795
       15795
        
           };

     

       15796
       15796
        
           nativeBuildInputs = [ pkgs.pkgconfig ];

     

       15797
       15797
        
           buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

+2

pkgs/top-level/python-packages.nix

···

       2099
       2099
        
       

     

       2100
       2100
        
         google-music-utils = callPackage ../development/python-modules/google-music-utils { };

     

       2101
       2101
        
       

     

       2102
       2102
       +
         google-pasta = callPackage ../development/python-modules/google-pasta { };

     

       2103
       2103
       +
       

     

       2102
       2104
        
         gpapi = callPackage ../development/python-modules/gpapi { };

     

       2103
       2105
        
         gplaycli = callPackage ../development/python-modules/gplaycli { };

     

       2104
       2106