commit 0397e518b70bce940cf63e04028fc8084af325f7 · pyrox.dev/nixpkgs

+1 -1

.github/PULL_REQUEST_TEMPLATE.md

···

       23
        
       - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))

     

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

     

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

     

       26
       -
       - [21.11 Release Notes](./CONTRIBUTING.md#generating-2111-release-notes)

     

       27
        
         - [ ] (Package updates) Added a release notes entry if the change is major or breaking

     

       28
        
         - [ ] (Module updates) Added a release notes entry if the change is significant

     

       29
        
         - [ ] (Module addition) Added a release notes entry if adding a new NixOS module

···

       23
        
       - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))

     

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

     

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

     

       26
       +
       - [21.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#generating-2111-release-notes)

     

       27
        
         - [ ] (Package updates) Added a release notes entry if the change is major or breaking

     

       28
        
         - [ ] (Module updates) Added a release notes entry if the change is significant

     

       29
        
         - [ ] (Module addition) Added a release notes entry if adding a new NixOS module

-3

doc/contributing/coding-conventions.chapter.md

···

       183
        
       

     

       184
        
       - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.

     

       185
        
       

     

       186
       -
       - The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg.

     

       187
       -
         `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing locally to avoid having to modify the function inputs just to test something out.

     

       188
       -
       

     

       189
        
       ## Package naming {#sec-package-naming}

     

       190
        
       

     

       191
        
       The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way.

···

       183
        
       

     

       184
        
       - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.

     

       185
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       186
        
       ## Package naming {#sec-package-naming}

     

       187
        
       

     

       188
        
       The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way.

+18

maintainers/maintainer-list.nix

···

       300
        
           githubId = 335271;

     

       301
        
           name = "James Alexander Feldman-Crough";

     

       302
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       303
        
         aforemny = {

     

       304
        
           email = "aforemny@posteo.de";

     

       305
        
           github = "aforemny";

     
···

       8431
        
           githubId = 1891350;

     

       8432
        
           name = "Michael Raskin";

     

       8433
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8434
        
         ravloony = {

     

       8435
        
           email = "ravloony@gmail.com";

     

       8436
        
           name = "Tom Macdonald";

     
···

       8642
        
           github = "rixed";

     

       8643
        
           githubId = 449990;

     

       8644
        
           name = "Cedric Cellier";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8645
        
         };

     

       8646
        
         rkoe = {

     

       8647
        
           email = "rk@simple-is-better.org";

···

       300
        
           githubId = 335271;

     

       301
        
           name = "James Alexander Feldman-Crough";

     

       302
        
         };

     

       303
       +
         afontain = {

     

       304
       +
           email = "antoine.fontaine@epfl.ch";

     

       305
       +
           github = "necessarily-equal";

     

       306
       +
           githubId = 59283660;

     

       307
       +
           name = "Antoine Fontaine";

     

       308
       +
         };

     

       309
        
         aforemny = {

     

       310
        
           email = "aforemny@posteo.de";

     

       311
        
           github = "aforemny";

     
···

       8437
        
           githubId = 1891350;

     

       8438
        
           name = "Michael Raskin";

     

       8439
        
         };

     

       8440
       +
         ratsclub = {

     

       8441
       +
           email = "victor@freire.dev.br";

     

       8442
       +
           github = "ratsclub";

     

       8443
       +
           githubId = 25647735;

     

       8444
       +
           name = "Victor Freire";

     

       8445
       +
         };

     

       8446
        
         ravloony = {

     

       8447
        
           email = "ravloony@gmail.com";

     

       8448
        
           name = "Tom Macdonald";

     
···

       8654
        
           github = "rixed";

     

       8655
        
           githubId = 449990;

     

       8656
        
           name = "Cedric Cellier";

     

       8657
       +
         };

     

       8658
       +
         rkitover = {

     

       8659
       +
           email = "rkitover@gmail.com";

     

       8660
       +
           github = "rkitover";

     

       8661
       +
           githubId = 77611;

     

       8662
       +
           name = "Rafael Kitover";

     

       8663
        
         };

     

       8664
        
         rkoe = {

     

       8665
        
           email = "rk@simple-is-better.org";

+25 -20

nixos/modules/i18n/input-method/fcitx5.nix

···

       6
        
         im = config.i18n.inputMethod;

     

       7
        
         cfg = im.fcitx5;

     

       8
        
         fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };

     

       9
       -
       in

     

       10
       -
         {

     

       11
       -
           options = {

     

       12
       -
             i18n.inputMethod.fcitx5 = {

     

       13
       -
               addons = mkOption {

     

       14
       -
                 type = with types; listOf package;

     

       15
       -
                 default = [];

     

       16
       -
                 example = with pkgs; [ fcitx5-rime ];

     

       17
       -
                 description = ''

     

       18
       -
                   Enabled Fcitx5 addons.

     

       19
       -
                 '';

     

       20
       -
               };

     

       21
        
             };

     

       22
        
           };

     

       0
        
       
     

       23
        
       

     

       24
       -
           config = mkIf (im.enabled == "fcitx5") {

     

       25
       -
             i18n.inputMethod.package = fcitx5Package;

     

       26
        
       

     

       27
       -
             environment.variables = {

     

       28
       -
               GTK_IM_MODULE = "fcitx";

     

       29
       -
               QT_IM_MODULE = "fcitx";

     

       30
       -
               XMODIFIERS = "@im=fcitx";

     

       31
       -
             };

     

       32
        
           };

     

       33
       -
         }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       6
        
         im = config.i18n.inputMethod;

     

       7
        
         cfg = im.fcitx5;

     

       8
        
         fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };

     

       9
       +
       in {

     

       10
       +
         options = {

     

       11
       +
           i18n.inputMethod.fcitx5 = {

     

       12
       +
             addons = mkOption {

     

       13
       +
               type = with types; listOf package;

     

       14
       +
               default = [];

     

       15
       +
               example = with pkgs; [ fcitx5-rime ];

     

       16
       +
               description = ''

     

       17
       +
                 Enabled Fcitx5 addons.

     

       18
       +
               '';

     

       0
        
       
     

       0
        
       
     

       19
        
             };

     

       20
        
           };

     

       21
       +
         };

     

       22
        
       

     

       23
       +
         config = mkIf (im.enabled == "fcitx5") {

     

       24
       +
           i18n.inputMethod.package = fcitx5Package;

     

       25
        
       

     

       26
       +
           environment.variables = {

     

       27
       +
             GTK_IM_MODULE = "fcitx";

     

       28
       +
             QT_IM_MODULE = "fcitx";

     

       29
       +
             XMODIFIERS = "@im=fcitx";

     

       0
        
       
     

       30
        
           };

     

       31
       +
       

     

       32
       +
           systemd.user.services.fcitx5-daemon = {

     

       33
       +
             enable = true;

     

       34
       +
             script = "${fcitx5Package}/bin/fcitx5";

     

       35
       +
             wantedBy = [ "graphical-session.target" ];

     

       36
       +
           };

     

       37
       +
         };

     

       38
       +
       }

+2 -2

nixos/modules/services/backup/mysql-backup.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       7
       -
         inherit (pkgs) mysql gzip;

     

       8
        
       

     

       9
        
         cfg = config.services.mysqlBackup;

     

       10
        
         defaultUser = "mysqlbackup";

     
···

       20
        
         '';

     

       21
        
         backupDatabaseScript = db: ''

     

       22
        
           dest="${cfg.location}/${db}.gz"

     

       23
       -
           if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then

     

       24
        
             mv $dest.tmp $dest

     

       25
        
             echo "Backed up to $dest"

     

       26
        
           else

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       7
       +
         inherit (pkgs) mariadb gzip;

     

       8
        
       

     

       9
        
         cfg = config.services.mysqlBackup;

     

       10
        
         defaultUser = "mysqlbackup";

     
···

       20
        
         '';

     

       21
        
         backupDatabaseScript = db: ''

     

       22
        
           dest="${cfg.location}/${db}.gz"

     

       23
       +
           if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then

     

       24
        
             mv $dest.tmp $dest

     

       25
        
             echo "Backed up to $dest"

     

       26
        
           else

+1 -1

nixos/modules/services/databases/mysql.nix

···

       34
        
       

     

       35
        
             package = mkOption {

     

       36
        
               type = types.package;

     

       37
       -
               example = literalExample "pkgs.mysql";

     

       38
        
               description = "

     

       39
        
                 Which MySQL derivation to use. MariaDB packages are supported too.

     

       40
        
               ";

···

       34
        
       

     

       35
        
             package = mkOption {

     

       36
        
               type = types.package;

     

       37
       +
               example = literalExample "pkgs.mariadb";

     

       38
        
               description = "

     

       39
        
                 Which MySQL derivation to use. MariaDB packages are supported too.

     

       40
        
               ";

+1 -1

nixos/modules/services/mail/roundcube.nix

···

       7
        
         fpm = config.services.phpfpm.pools.roundcube;

     

       8
        
         localDB = cfg.database.host == "localhost";

     

       9
        
         user = cfg.database.username;

     

       10
       -
         phpWithPspell = pkgs.php.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);

     

       11
        
       in

     

       12
        
       {

     

       13
        
         options.services.roundcube = {

···

       7
        
         fpm = config.services.phpfpm.pools.roundcube;

     

       8
        
         localDB = cfg.database.host == "localhost";

     

       9
        
         user = cfg.database.username;

     

       10
       +
         phpWithPspell = pkgs.php74.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);

     

       11
        
       in

     

       12
        
       {

     

       13
        
         options.services.roundcube = {

+2 -2

nixos/modules/services/video/epgstation/default.nix

···

       27
        
       

     

       28
        
           # NOTE: Use password authentication, since mysqljs does not yet support auth_socket

     

       29
        
           if [ ! -e /var/lib/epgstation/db-created ]; then

     

       30
       -
             ${pkgs.mysql}/bin/mysql -e \

     

       31
        
               "GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';"

     

       32
        
             touch /var/lib/epgstation/db-created

     

       33
        
           fi

     
···

       224
        
       

     

       225
        
           services.mysql = {

     

       226
        
             enable = mkDefault true;

     

       227
       -
             package = mkDefault pkgs.mysql;

     

       228
        
             ensureDatabases = [ cfg.database.name ];

     

       229
        
             # FIXME: enable once mysqljs supports auth_socket

     

       230
        
             # ensureUsers = [ {

···

       27
        
       

     

       28
        
           # NOTE: Use password authentication, since mysqljs does not yet support auth_socket

     

       29
        
           if [ ! -e /var/lib/epgstation/db-created ]; then

     

       30
       +
             ${pkgs.mariadb}/bin/mysql -e \

     

       31
        
               "GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';"

     

       32
        
             touch /var/lib/epgstation/db-created

     

       33
        
           fi

     
···

       224
        
       

     

       225
        
           services.mysql = {

     

       226
        
             enable = mkDefault true;

     

       227
       +
             package = mkDefault pkgs.mariadb;

     

       228
        
             ensureDatabases = [ cfg.database.name ];

     

       229
        
             # FIXME: enable once mysqljs supports auth_socket

     

       230
        
             # ensureUsers = [ {

+1 -1

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

···

       728
        
       

     

       729
        
               services.postgresql.enable = lib.mkDefault createLocalPostgreSQL;

     

       730
        
               services.mysql.enable = lib.mkDefault createLocalMySQL;

     

       731
       -
               services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql;

     

       732
        
             };

     

       733
        
       

     

       734
        
         meta.doc = ./keycloak.xml;

···

       728
        
       

     

       729
        
               services.postgresql.enable = lib.mkDefault createLocalPostgreSQL;

     

       730
        
               services.mysql.enable = lib.mkDefault createLocalMySQL;

     

       731
       +
               services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb;

     

       732
        
             };

     

       733
        
       

     

       734
        
         meta.doc = ./keycloak.xml;

+1 -1

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

···

       644
        
       

     

       645
        
           services.mysql = mkIf mysqlLocal {

     

       646
        
             enable = true;

     

       647
       -
             package = mkDefault pkgs.mysql;

     

       648
        
             ensureDatabases = [ cfg.database.name ];

     

       649
        
             ensureUsers = [

     

       650
        
               {

···

       644
        
       

     

       645
        
           services.mysql = mkIf mysqlLocal {

     

       646
        
             enable = true;

     

       647
       +
             package = mkDefault pkgs.mariadb;

     

       648
        
             ensureDatabases = [ cfg.database.name ];

     

       649
        
             ensureUsers = [

     

       650
        
               {

+1 -1

nixos/tests/bitwarden.nix

···

       42
        
                       GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';

     

       43
        
                       FLUSH PRIVILEGES;

     

       44
        
                     '';

     

       45
       -
                     package = pkgs.mysql;

     

       46
        
                   };

     

       47
        
       

     

       48
        
                   services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";

···

       42
        
                       GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';

     

       43
        
                       FLUSH PRIVILEGES;

     

       44
        
                     '';

     

       45
       +
                     package = pkgs.mariadb;

     

       46
        
                   };

     

       47
        
       

     

       48
        
                   services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";

+1 -1

nixos/tests/matomo.nix

···

       18
        
             };

     

       19
        
             services.mysql = {

     

       20
        
               enable = true;

     

       21
       -
               package = pkgs.mysql;

     

       22
        
             };

     

       23
        
             services.nginx.enable = true;

     

       24
        
           };

···

       18
        
             };

     

       19
        
             services.mysql = {

     

       20
        
               enable = true;

     

       21
       +
               package = pkgs.mariadb;

     

       22
        
             };

     

       23
        
             services.nginx.enable = true;

     

       24
        
           };

+1 -1

nixos/tests/mysql/mysql-autobackup.nix

···

       8
        
           { pkgs, ... }:

     

       9
        
           {

     

       10
        
             services.mysql.enable = true;

     

       11
       -
             services.mysql.package = pkgs.mysql;

     

       12
        
             services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];

     

       13
        
       

     

       14
        
             services.automysqlbackup.enable = true;

···

       8
        
           { pkgs, ... }:

     

       9
        
           {

     

       10
        
             services.mysql.enable = true;

     

       11
       +
             services.mysql.package = pkgs.mariadb;

     

       12
        
             services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];

     

       13
        
       

     

       14
        
             services.automysqlbackup.enable = true;

+1 -1

nixos/tests/mysql/mysql-backup.nix

···

       10
        
             services.mysql = {

     

       11
        
               enable = true;

     

       12
        
               initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];

     

       13
       -
               package = pkgs.mysql;

     

       14
        
             };

     

       15
        
       

     

       16
        
             services.mysqlBackup = {

···

       10
        
             services.mysql = {

     

       11
        
               enable = true;

     

       12
        
               initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];

     

       13
       +
               package = pkgs.mariadb;

     

       14
        
             };

     

       15
        
       

     

       16
        
             services.mysqlBackup = {

+3 -3

nixos/tests/mysql/mysql-replication.nix

···

       17
        
       

     

       18
        
             {

     

       19
        
               services.mysql.enable = true;

     

       20
       -
               services.mysql.package = pkgs.mysql;

     

       21
        
               services.mysql.replication.role = "master";

     

       22
        
               services.mysql.replication.slaveHost = "%";

     

       23
        
               services.mysql.replication.masterUser = replicateUser;

     
···

       31
        
       

     

       32
        
             {

     

       33
        
               services.mysql.enable = true;

     

       34
       -
               services.mysql.package = pkgs.mysql;

     

       35
        
               services.mysql.replication.role = "slave";

     

       36
        
               services.mysql.replication.serverId = 2;

     

       37
        
               services.mysql.replication.masterHost = nodes.master.config.networking.hostName;

     
···

       44
        
       

     

       45
        
             {

     

       46
        
               services.mysql.enable = true;

     

       47
       -
               services.mysql.package = pkgs.mysql;

     

       48
        
               services.mysql.replication.role = "slave";

     

       49
        
               services.mysql.replication.serverId = 3;

     

       50
        
               services.mysql.replication.masterHost = nodes.master.config.networking.hostName;

···

       17
        
       

     

       18
        
             {

     

       19
        
               services.mysql.enable = true;

     

       20
       +
               services.mysql.package = pkgs.mariadb;

     

       21
        
               services.mysql.replication.role = "master";

     

       22
        
               services.mysql.replication.slaveHost = "%";

     

       23
        
               services.mysql.replication.masterUser = replicateUser;

     
···

       31
        
       

     

       32
        
             {

     

       33
        
               services.mysql.enable = true;

     

       34
       +
               services.mysql.package = pkgs.mariadb;

     

       35
        
               services.mysql.replication.role = "slave";

     

       36
        
               services.mysql.replication.serverId = 2;

     

       37
        
               services.mysql.replication.masterHost = nodes.master.config.networking.hostName;

     
···

       44
        
       

     

       45
        
             {

     

       46
        
               services.mysql.enable = true;

     

       47
       +
               services.mysql.package = pkgs.mariadb;

     

       48
        
               services.mysql.replication.role = "slave";

     

       49
        
               services.mysql.replication.serverId = 3;

     

       50
        
               services.mysql.replication.masterHost = nodes.master.config.networking.hostName;

+1 -1

nixos/tests/sogo.nix

···

       10
        
       

     

       11
        
             services.mysql = {

     

       12
        
               enable = true;

     

       13
       -
               package = pkgs.mysql;

     

       14
        
               ensureDatabases = [ "sogo" ];

     

       15
        
               ensureUsers = [{

     

       16
        
                 name = "sogo";

···

       10
        
       

     

       11
        
             services.mysql = {

     

       12
        
               enable = true;

     

       13
       +
               package = pkgs.mariadb;

     

       14
        
               ensureDatabases = [ "sogo" ];

     

       15
        
               ensureUsers = [{

     

       16
        
                 name = "sogo";

+28

pkgs/applications/audio/boops/default.nix

···

       1
       +
       { stdenv, lib, fetchFromGitHub, xorg, cairo, lv2, libsndfile, pkg-config }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "boops";

     

       5
       +
         version = "1.4.0";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "sjaehn";

     

       9
       +
           repo = "BOops";

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "1kkp6s431pjb1qrg1dq8ak3lj0ksqnxsij9jg6biscpfgbmaqdcq";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         nativeBuildInputs = [ pkg-config ];

     

       15
       +
         buildInputs = [

     

       16
       +
           xorg.libX11 cairo lv2 libsndfile

     

       17
       +
         ];

     

       18
       +
       

     

       19
       +
         installFlags = [ "PREFIX=$(out)" ];

     

       20
       +
       

     

       21
       +
         meta = with lib; {

     

       22
       +
           homepage = "https://github.com/sjaehn/BOops";

     

       23
       +
           description = "Sound glitch effect sequencer LV2 plugin";

     

       24
       +
           maintainers = [ maintainers.magnetophon ];

     

       25
       +
           platforms = platforms.linux;

     

       26
       +
           license = licenses.gpl3Plus;

     

       27
       +
         };

     

       28
       +
       }

+76

pkgs/applications/audio/diopser/default.nix

···

       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config

     

       2
       +
       , libjack2, alsaLib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor

     

       3
       +
       }:

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
       

     

       7
       +
         # Derived from subprojects/function2.wrap

     

       8
       +
         function2 = rec {

     

       9
       +
           version = "4.1.0";

     

       10
       +
           src = fetchFromGitHub {

     

       11
       +
             owner = "Naios";

     

       12
       +
             repo = "function2";

     

       13
       +
             rev = version;

     

       14
       +
             hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk=";

     

       15
       +
           };

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         juce = rec {

     

       19
       +
           version = "unstable-2021-04-07";

     

       20
       +
           src = fetchFromGitHub {

     

       21
       +
             owner = "juce-framework";

     

       22
       +
             repo = "JUCE";

     

       23
       +
             rev = "1a5fb5992a1a4e28e998708ed8dce2cc864a30d7";

     

       24
       +
             sha256= "1ri7w4sz3sy5xilibg53ls9526fx7jwbv8rc54ccrqfhxqyin308";

     

       25
       +
           };

     

       26
       +
         };

     

       27
       +
       

     

       28
       +
       

     

       29
       +
       in  stdenv.mkDerivation rec {

     

       30
       +
         pname = "diopser";

     

       31
       +
         version = "unstable-2021-5-13";

     

       32
       +
       

     

       33
       +
         src = fetchFromGitHub {

     

       34
       +
           owner = "robbert-vdh";

     

       35
       +
           repo = pname;

     

       36
       +
           fetchSubmodules = true;

     

       37
       +
           rev = "d5fdc92f1caf5a828e071dac99e106e58f06d84d";

     

       38
       +
           sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx";

     

       39
       +
         };

     

       40
       +
       

     

       41
       +
         postUnpack = ''

     

       42
       +
           (

     

       43
       +
             cd "$sourceRoot"

     

       44
       +
             cp -R --no-preserve=mode,ownership ${function2.src} function2

     

       45
       +
             cp -R --no-preserve=mode,ownership ${juce.src} JUCE

     

       46
       +
             sed -i 's@CPMAddPackage("gh:juce-framework/JUCE.*@add_subdirectory(JUCE)@g' CMakeLists.txt

     

       47
       +
             sed -i 's@CPMAddPackage("gh:Naios/function2.*@add_subdirectory(function2)@g' CMakeLists.txt

     

       48
       +
             patchShebangs .

     

       49
       +
           )

     

       50
       +
         '';

     

       51
       +
       

     

       52
       +
         installPhase = ''

     

       53
       +
           mkdir -p $out/lib/vst3

     

       54
       +
           cp -r Diopser_artefacts/Release/VST3/Diopser.vst3 $out/lib/vst3

     

       55
       +
         '';

     

       56
       +
       

     

       57
       +
         nativeBuildInputs = [ cmake pkg-config ];

     

       58
       +
       

     

       59
       +
         buildInputs = [

     

       60
       +
           libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext

     

       61
       +
           libXcursor

     

       62
       +
         ];

     

       63
       +
       

     

       64
       +
         cmakeFlags = [

     

       65
       +
           "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar"

     

       66
       +
           "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"

     

       67
       +
         ];

     

       68
       +
       

     

       69
       +
         meta = with lib; {

     

       70
       +
           description = "A totally original phase rotation plugin";

     

       71
       +
           homepage = "https://github.com/robbert-vdh/diopser";

     

       72
       +
           license = licenses.gpl3Plus;

     

       73
       +
           maintainers = with maintainers; [ magnetophon ];

     

       74
       +
           platforms = platforms.all;

     

       75
       +
         };

     

       76
       +
       }

+3 -3

pkgs/applications/audio/faust/faust2.nix

···

       20
        
       

     

       21
        
       let

     

       22
        
       

     

       23
       -
         version = "unstable-2020-08-27";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "grame-cncm";

     

       27
        
           repo = "faust";

     

       28
       -
           rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e";

     

       29
       -
           sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb";

     

       30
        
           fetchSubmodules = true;

     

       31
        
         };

     

       32

···

       20
        
       

     

       21
        
       let

     

       22
        
       

     

       23
       +
         version = "2.30.5";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "grame-cncm";

     

       27
        
           repo = "faust";

     

       28
       +
           rev = version;

     

       29
       +
           sha256 = "0cs52w4rwaj5d8pjak4cxsg02sxvx4y07592nc3ck81clqjmszmm";

     

       30
        
           fetchSubmodules = true;

     

       31
        
         };

     

       32

+10 -7

pkgs/applications/audio/faust/faustlive.nix

···

       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       -
       , llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl

     

       3
       -
       , bc, coreutils, which, libsndfile, pkg-config

     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "faustlive";

     

       8
       -
         version = "unstable-dev-2020-08-03";

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "grame-cncm";

     

       11
        
           repo = "faustlive";

     

       12
       -
           rev = "c16565dc1b616ac0aad7c303c1997fa9e57177ab";

     

       13
       -
           sha256 = "1ys661lp1xwz21vy12kwkg248jvjq1z9w433knkh0ldyy2igvmd5";

     

       14
        
           fetchSubmodules = true;

     

       15
        
         };

     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
        
         buildInputs = [

     

       18
       -
           llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl

     

       19
       -
           bc coreutils which libsndfile pkg-config

     

       20
        
         ];

     

       21
        
       

     

       22
        
         makeFlags = [ "PREFIX=$(out)" ];

     
···

       39
        
           '';

     

       40
        
           homepage = "https://faust.grame.fr/";

     

       41
        
           license = licenses.gpl3;

     

       0
        
       
     

       42
        
         };

     

       43
        
       }

···

       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       +
       , llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl

     

       3
       +
       , bc, coreutils, which, libsndfile, pkg-config, libxcb

     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "faustlive";

     

       8
       +
         version = "2.5.5";

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "grame-cncm";

     

       11
        
           repo = "faustlive";

     

       12
       +
           rev = version;

     

       13
       +
           sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9";

     

       14
        
           fetchSubmodules = true;

     

       15
        
         };

     

       16
       +
       

     

       17
       +
         nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ];

     

       18
        
       

     

       19
        
         buildInputs = [

     

       20
       +
           llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl

     

       21
       +
           bc coreutils which libsndfile libxcb

     

       22
        
         ];

     

       23
        
       

     

       24
        
         makeFlags = [ "PREFIX=$(out)" ];

     
···

       41
        
           '';

     

       42
        
           homepage = "https://faust.grame.fr/";

     

       43
        
           license = licenses.gpl3;

     

       44
       +
           maintainers = with maintainers; [ magnetophon ];

     

       45
        
         };

     

       46
        
       }

+2 -2

pkgs/applications/audio/gwc/default.nix

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "gwc";

     

       15
       -
         version = "0.22-04";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "AlisterH";

     

       19
        
           repo = pname;

     

       20
        
           rev = version;

     

       21
       -
           sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p";

     

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "gwc";

     

       15
       +
         version = "0.22-05";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "AlisterH";

     

       19
        
           repo = pname;

     

       20
        
           rev = version;

     

       21
       +
           sha256 = "sha256-FHKu5qAyRyMxXdWYTCeAc6Q4J+NOaU1SGgoTbe0PiFE=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [

+35

pkgs/applications/audio/songrec/default.nix

···

       1
       +
       { lib

     

       2
       +
       , rustPlatform

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , gtk3

     

       5
       +
       , openssl

     

       6
       +
       , alsaLib

     

       7
       +
       , pkg-config

     

       8
       +
       , ffmpeg

     

       9
       +
       }:

     

       10
       +
       

     

       11
       +
       rustPlatform.buildRustPackage rec {

     

       12
       +
         pname = "songrec";

     

       13
       +
         version = "0.1.8";

     

       14
       +
       

     

       15
       +
         src = fetchFromGitHub {

     

       16
       +
           owner = "marin-m";

     

       17
       +
           repo = pname;

     

       18
       +
           rev = version;

     

       19
       +
           sha256 = "sha256-6siGLegNgvLdP7engwpKmhzWYqBXcMsfaXhJJ1tIqJg=";

     

       20
       +
         };

     

       21
       +
       

     

       22
       +
         cargoSha256 = "sha256-H4qJYcFjip71EVTGw50goj0HjKN9fmjQZqQDhaSKlaQ=";

     

       23
       +
       

     

       24
       +
         nativeBuildInputs = [ pkg-config ];

     

       25
       +
       

     

       26
       +
         buildInputs = [ alsaLib gtk3 openssl ffmpeg ];

     

       27
       +
       

     

       28
       +
         meta = with lib; {

     

       29
       +
           description = "An open-source Shazam client for Linux, written in Rust";

     

       30
       +
           homepage = "https://github.com/marin-m/SongRec";

     

       31
       +
           license = licenses.gpl3Only;

     

       32
       +
           platforms = platforms.linux;

     

       33
       +
           maintainers = with maintainers; [ tcbravo ];

     

       34
       +
         };

     

       35
       +
       }

+5 -5

pkgs/applications/audio/uhhyou.lv2/default.nix

···

       14
        
         # this is what upstream calls the package, see:

     

       15
        
         # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2

     

       16
        
         pname = "uhhyou.lv2";

     

       17
       -
         version = "unstable-2020-07-31";

     

       18
        
       

     

       19
        
         src = fetchFromGitHub {

     

       20
        
           owner = "ryukau";

     

       21
        
           repo =  "LV2Plugins";

     

       22
       -
           rev = "6189be67acaeb95452f8adab73a731d94a7b6f47";

     

       23
        
           fetchSubmodules = true;

     

       24
       -
           sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242";

     

       25
        
         };

     

       26
        
       

     

       27
        
         nativeBuildInputs = [ pkg-config python3 ];

     
···

       31
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       32
        
       

     

       33
        
         prePatch = ''

     

       34
       -
           patchShebangs generate-ttl.sh

     

       35
       -
           cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp

     

       36
        
         '';

     

       37
        
       

     

       38
        
         enableParallelBuilding = true;

     
···

       41
        
           description = "Audio plugins for Linux";

     

       42
        
           longDescription = ''

     

       43
        
             Plugin List:

     

       0
        
       
     

       44
        
             - CubicPadSynth

     

       45
        
             - EnvelopedSine

     

       46
        
             - EsPhaser

···

       14
        
         # this is what upstream calls the package, see:

     

       15
        
         # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2

     

       16
        
         pname = "uhhyou.lv2";

     

       17
       +
         version = "unstable-2021-02-08";

     

       18
        
       

     

       19
        
         src = fetchFromGitHub {

     

       20
        
           owner = "ryukau";

     

       21
        
           repo =  "LV2Plugins";

     

       22
       +
           rev = "df67460fc344f94db4306d4ee21e4207e657bbee";

     

       23
        
           fetchSubmodules = true;

     

       24
       +
           sha256 = "1a23av35cw26zgq93yzmmw35084hsj29cb7sb04j2silv5qisila";

     

       25
        
         };

     

       26
        
       

     

       27
        
         nativeBuildInputs = [ pkg-config python3 ];

     
···

       31
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       32
        
       

     

       33
        
         prePatch = ''

     

       34
       +
           patchShebangs generate-ttl.sh patch.sh patch/apply.sh

     

       0
        
       
     

       35
        
         '';

     

       36
        
       

     

       37
        
         enableParallelBuilding = true;

     
···

       40
        
           description = "Audio plugins for Linux";

     

       41
        
           longDescription = ''

     

       42
        
             Plugin List:

     

       43
       +
             - CollidingCombSynth

     

       44
        
             - CubicPadSynth

     

       45
        
             - EnvelopedSine

     

       46
        
             - EsPhaser

+39

pkgs/applications/blockchains/charge-lnd/default.nix

···

       1
       +
       { lib, fetchFromGitHub, python3Packages }:

     

       2
       +
       

     

       3
       +
       python3Packages.buildPythonApplication rec {

     

       4
       +
         pname = "charge-lnd";

     

       5
       +
         version = "0.1.2";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "accumulator";

     

       9
       +
           repo = pname;

     

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

     

       11
       +
           sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         propagatedBuildInputs = with python3Packages; [

     

       15
       +
           aiorpcx

     

       16
       +
           colorama

     

       17
       +
           googleapis-common-protos

     

       18
       +
           grpcio

     

       19
       +
           protobuf

     

       20
       +
           six

     

       21
       +
           termcolor

     

       22
       +
         ];

     

       23
       +
       

     

       24
       +
         postInstall = ''

     

       25
       +
           install README.md charge.config.example -Dt $out/share/doc/charge-lnd

     

       26
       +
         '';

     

       27
       +
       

     

       28
       +
         doInstallCheck = true;

     

       29
       +
         installCheckPhase = ''

     

       30
       +
           $out/bin/charge-lnd --help > /dev/null

     

       31
       +
         '';

     

       32
       +
       

     

       33
       +
         meta = with lib; {

     

       34
       +
           description = "Simple policy-based fee manager for lightning network daemon";

     

       35
       +
           homepage = "https://github.com/accumulator/charge-lnd";

     

       36
       +
           license = licenses.gpl2Plus;

     

       37
       +
           maintainers = with maintainers; [ mmilata ];

     

       38
       +
         };

     

       39
       +
       }

+26

pkgs/applications/misc/avell-unofficial-control-center/default.nix

···

       1
       +
       { lib, fetchFromGitHub, python3Packages }:

     

       2
       +
       

     

       3
       +
       python3Packages.buildPythonApplication rec {

     

       4
       +
         pname = "avell-unofficial-control-center";

     

       5
       +
         version = "1.0.4";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "rodgomesc";

     

       9
       +
           repo = "avell-unofficial-control-center";

     

       10
       +
           # https://github.com/rodgomesc/avell-unofficial-control-center/issues/58

     

       11
       +
           rev = "e32e243e31223682a95a719bc58141990eef35e6";

     

       12
       +
           sha256 = "1qz1kv7p09nxffndzz9jlkzpfx26ppz66f8603zyamjq9dqdmdin";

     

       13
       +
         };

     

       14
       +
       

     

       15
       +
         # No tests included

     

       16
       +
         doCheck = false;

     

       17
       +
       

     

       18
       +
         propagatedBuildInputs = with python3Packages; [ pyusb elevate ];

     

       19
       +
       

     

       20
       +
         meta = with lib; {

     

       21
       +
           homepage = "https://github.com/rodgomesc/avell-unofficial-control-center";

     

       22
       +
           description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03";

     

       23
       +
           license = licenses.mit;

     

       24
       +
           maintainers = with maintainers; [ rkitover ];

     

       25
       +
         };

     

       26
       +
       }

+34

pkgs/applications/misc/clifm/default.nix

···

       1
       +
       { stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "clifm";

     

       5
       +
         version = "1.1";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "leo-arch";

     

       9
       +
           repo = pname;

     

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

     

       11
       +
           sha256 = "0mf9lrq0l532vyf4ycsikrw8imn4gkavyn3cr42nhjsr1drygrp8";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         buildInputs = [ libcap acl file readline ];

     

       15
       +
       

     

       16
       +
         makeFlags = [

     

       17
       +
           "INSTALLPREFIX=${placeholder "out"}/bin"

     

       18
       +
           "DESKTOPPREFIX=${placeholder "out"}/share"

     

       19
       +
         ];

     

       20
       +
       

     

       21
       +
         preInstall = ''

     

       22
       +
           mkdir -p $out/bin $out/share

     

       23
       +
         '';

     

       24
       +
       

     

       25
       +
         enableParallelBuilding = true;

     

       26
       +
       

     

       27
       +
         meta = with lib; {

     

       28
       +
           homepage = "https://github.com/leo-arch/clifm";

     

       29
       +
           description = "CliFM is a CLI-based, shell-like, and non-curses terminal file manager written in C: simple, fast, extensible, and lightweight as hell";

     

       30
       +
           license = licenses.gpl2Plus;

     

       31
       +
           maintainers = with maintainers; [ vonfry ];

     

       32
       +
           platforms = platforms.unix;

     

       33
       +
         };

     

       34
       +
       }

+9 -4

pkgs/applications/misc/openrgb/default.nix

···

       1
       -
       { lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config }:

     

       2
        
       

     

       3
        
       mkDerivation rec {

     

       4
        
         pname = "openrgb";

     
···

       15
        
         buildInputs = [ libusb1 hidapi ];

     

       16
        
       

     

       17
        
         installPhase = ''

     

       0
        
       
     

       0
        
       
     

       18
        
           mkdir -p $out/bin

     

       19
        
           cp openrgb $out/bin

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
       

     

       21
        
           mkdir -p $out/etc/udev/rules.d

     

       22
        
           cp 60-openrgb.rules $out/etc/udev/rules.d

     

       0
        
       
     

       0
        
       
     

       23
        
         '';

     

       24
        
       

     

       25
        
         doInstallCheck = true;

     
···

       27
        
           HOME=$TMPDIR $out/bin/openrgb --help > /dev/null

     

       28
        
         '';

     

       29
        
       

     

       30
       -
         enableParallelBuilding = true;

     

       31
       -
       

     

       32
        
         meta = with lib; {

     

       33
        
           description = "Open source RGB lighting control";

     

       34
        
           homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";

     

       35
        
           maintainers = with maintainers; [ jonringer ];

     

       36
       -
           license = licenses.gpl2;

     

       37
        
           platforms = platforms.linux;

     

       38
        
         };

     

       39
        
       }

···

       1
       +
       { lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils }:

     

       2
        
       

     

       3
        
       mkDerivation rec {

     

       4
        
         pname = "openrgb";

     
···

       15
        
         buildInputs = [ libusb1 hidapi ];

     

       16
        
       

     

       17
        
         installPhase = ''

     

       18
       +
           runHook preInstall

     

       19
       +
       

     

       20
        
           mkdir -p $out/bin

     

       21
        
           cp openrgb $out/bin

     

       22
       +
       

     

       23
       +
           substituteInPlace 60-openrgb.rules \

     

       24
       +
             --replace /bin/chmod "${coreutils}/bin/chmod"

     

       25
        
       

     

       26
        
           mkdir -p $out/etc/udev/rules.d

     

       27
        
           cp 60-openrgb.rules $out/etc/udev/rules.d

     

       28
       +
       

     

       29
       +
           runHook postInstall

     

       30
        
         '';

     

       31
        
       

     

       32
        
         doInstallCheck = true;

     
···

       34
        
           HOME=$TMPDIR $out/bin/openrgb --help > /dev/null

     

       35
        
         '';

     

       36
        
       

     

       0
        
       
     

       0
        
       
     

       37
        
         meta = with lib; {

     

       38
        
           description = "Open source RGB lighting control";

     

       39
        
           homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";

     

       40
        
           maintainers = with maintainers; [ jonringer ];

     

       41
       +
           license = licenses.gpl2Plus;

     

       42
        
           platforms = platforms.linux;

     

       43
        
         };

     

       44
        
       }

+27

pkgs/applications/misc/sfm/default.nix

···

       1
       +
       { lib, stdenv, fetchFromGitHub, conf ? null }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "sfm";

     

       5
       +
         version = "0.1";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "afify";

     

       9
       +
           repo = pname;

     

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

     

       11
       +
           hash = "sha256-i4WzYaJKityIt+LPWCbd6UsPBaYoaS397l5BInOXQQA=";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf);

     

       15
       +
       

     

       16
       +
         postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";

     

       17
       +
       

     

       18
       +
         installFlags = [ "PREFIX=$(out)" ];

     

       19
       +
       

     

       20
       +
         meta = with lib; {

     

       21
       +
           description = "Simple file manager";

     

       22
       +
           homepage = "https://github.com/afify/sfm";

     

       23
       +
           license = licenses.isc;

     

       24
       +
           platforms = platforms.unix;

     

       25
       +
           maintainers = with maintainers; [ sikmir ];

     

       26
       +
         };

     

       27
       +
       }

+2 -1

pkgs/applications/networking/instant-messengers/discord/base.nix

···

       3
        
       , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig

     

       4
        
       , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid

     

       5
        
       , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext

     

       6
       -
       , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb

     

       7
        
       , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu

     

       8
        
       }:

     

       9
        
       

     
···

       23
        
           libXScrnSaver

     

       24
        
           libXtst

     

       25
        
           libxcb

     

       0
        
       
     

       26
        
           mesa

     

       27
        
           nss

     

       28
        
           wrapGAppsHook

···

       3
        
       , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig

     

       4
        
       , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid

     

       5
        
       , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext

     

       6
       +
       , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence

     

       7
        
       , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu

     

       8
        
       }:

     

       9
        
       

     
···

       23
        
           libXScrnSaver

     

       24
        
           libXtst

     

       25
        
           libxcb

     

       26
       +
           libxshmfence

     

       27
        
           mesa

     

       28
        
           nss

     

       29
        
           wrapGAppsHook

+2 -2

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       27
        
           pname = "discord-canary";

     

       28
        
           binaryName = "DiscordCanary";

     

       29
        
           desktopName = "Discord Canary";

     

       30
       -
           version = "0.0.123";

     

       31
        
           src = fetchurl {

     

       32
        
             url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       33
       -
             sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";

     

       34
        
           };

     

       35
        
         };

     

       36
        
       }.${branch}

···

       27
        
           pname = "discord-canary";

     

       28
        
           binaryName = "DiscordCanary";

     

       29
        
           desktopName = "Discord Canary";

     

       30
       +
           version = "0.0.124";

     

       31
        
           src = fetchurl {

     

       32
        
             url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       33
       +
             sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91";

     

       34
        
           };

     

       35
        
         };

     

       36
        
       }.${branch}

+4 -4

pkgs/applications/networking/instant-messengers/matrix-commander/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
        
         pname = "matrix-commander";

     

       5
       -
         version = "unstable-2021-04-18";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "8go";

     

       9
        
           repo = "matrix-commander";

     

       10
       -
           rev = "3e89a5f4c98dd191880ae371cc63eb9282d7d91f";

     

       11
       -
           sha256 = "08nwwszp1kv5b7bgf6mmfn42slxkyhy98x18xbn4pglc4bj32iql";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [

     
···

       35
        
         meta = with lib; {

     

       36
        
           description = "Simple but convenient CLI-based Matrix client app for sending and receiving";

     

       37
        
           homepage = "https://github.com/8go/matrix-commander";

     

       38
       -
           license = licenses.gpl3Only;

     

       39
        
           platforms = platforms.linux;

     

       40
        
           maintainers = [ maintainers.seb314 ];

     

       41
        
         };

···

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
        
         pname = "matrix-commander";

     

       5
       +
         version = "unstable-2021-05-26";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "8go";

     

       9
        
           repo = "matrix-commander";

     

       10
       +
           rev = "06b4738bc74ee86fb3ac88c04b8230abf82e7421";

     

       11
       +
           sha256 = "1skpq3xfnz11m298qnsw68xv391p5qg47flagzsk86pnzi841vc1";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [

     
···

       35
        
         meta = with lib; {

     

       36
        
           description = "Simple but convenient CLI-based Matrix client app for sending and receiving";

     

       37
        
           homepage = "https://github.com/8go/matrix-commander";

     

       38
       +
           license = licenses.gpl3Plus;

     

       39
        
           platforms = platforms.linux;

     

       40
        
           maintainers = [ maintainers.seb314 ];

     

       41
        
         };

+37

pkgs/applications/networking/irc/senpai/default.nix

···

       1
       +
       { lib, buildGoModule, fetchFromSourcehut, installShellFiles, scdoc }:

     

       2
       +
       

     

       3
       +
       buildGoModule rec {

     

       4
       +
         pname = "senpai";

     

       5
       +
         version = "unstable-2021-05-27";

     

       6
       +
       

     

       7
       +
         src = fetchFromSourcehut {

     

       8
       +
           owner = "~taiite";

     

       9
       +
           repo = "senpai";

     

       10
       +
           rev = "6be718329175c6d11e359f1a366ab6ab22b101d2";

     

       11
       +
           sha256 = "sha256-hW6DHJlDBYEqK8zj5PvGKU54sbeXjx1tdqwKXPXlKHc=";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         vendorSha256 = "sha256-OLi5y1hrYK6+l5WB1SX85QU4y3KjFyGaEzgbE6lnW2k=";

     

       15
       +
       

     

       16
       +
         subPackages = [

     

       17
       +
           "cmd/senpai"

     

       18
       +
         ];

     

       19
       +
       

     

       20
       +
         nativeBuildInputs = [

     

       21
       +
           scdoc

     

       22
       +
           installShellFiles

     

       23
       +
         ];

     

       24
       +
       

     

       25
       +
         postInstall = ''

     

       26
       +
           scdoc < doc/senpai.1.scd > doc/senpai.1

     

       27
       +
           scdoc < doc/senpai.5.scd > doc/senpai.5

     

       28
       +
           installManPage doc/senpai.*

     

       29
       +
         '';

     

       30
       +
       

     

       31
       +
         meta = with lib; {

     

       32
       +
           description = "Your everyday IRC student";

     

       33
       +
           homepage = "https://ellidri.org/senpai";

     

       34
       +
           license = licenses.isc;

     

       35
       +
           maintainers = with maintainers; [ malvo ];

     

       36
       +
         };

     

       37
       +
       }

+4 -4

pkgs/applications/networking/seaweedfs/default.nix

···

       7
        
       

     

       8
        
       buildGoModule rec {

     

       9
        
         pname = "seaweedfs";

     

       10
       -
         version = "2.36";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "chrislusf";

     

       14
        
           repo = "seaweedfs";

     

       15
        
           rev = version;

     

       16
       -
           sha256 = "sha256-BVn+mV5SjyODcT+O8LXfGA42/Si5+GrdkjP0tAPiuTM=";

     

       17
        
         };

     

       18
        
       

     

       19
       -
         vendorSha256 = "sha256-qdgnoh+53o3idCfpkEFGK88aUVb2F6oHlSRZncs2hyY=";

     

       20
        
       

     

       21
        
         subPackages = [ "weed" ];

     

       22
        
       

     
···

       26
        
         meta = with lib; {

     

       27
        
           description = "Simple and highly scalable distributed file system";

     

       28
        
           homepage = "https://github.com/chrislusf/seaweedfs";

     

       29
       -
           maintainers = [ maintainers.raboof ];

     

       30
        
           license = licenses.asl20;

     

       31
        
         };

     

       32
        
       }

···

       7
        
       

     

       8
        
       buildGoModule rec {

     

       9
        
         pname = "seaweedfs";

     

       10
       +
         version = "2.50";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "chrislusf";

     

       14
        
           repo = "seaweedfs";

     

       15
        
           rev = version;

     

       16
       +
           sha256 = "sha256-ai8/XryFw/7GYuWAmLkqHzK97QgTBPyE6m3dflck94w=";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         vendorSha256 = "sha256-gJQDcACMWZWS4CgS2NDALoBzxu7Hh4ZW3f0gUFUALCM=";

     

       20
        
       

     

       21
        
         subPackages = [ "weed" ];

     

       22
        
       

     
···

       26
        
         meta = with lib; {

     

       27
        
           description = "Simple and highly scalable distributed file system";

     

       28
        
           homepage = "https://github.com/chrislusf/seaweedfs";

     

       29
       +
           maintainers = with maintainers; [ cmacrae raboof ];

     

       30
        
           license = licenses.asl20;

     

       31
        
         };

     

       32
        
       }

+8 -5

pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch

···

       1
        
       diff --git a/src/services/log.js b/src/services/log.js

     

       2
       -
       index b4c39e99..4c249154 100644

     

       3
        
       --- a/src/services/log.js

     

       4
        
       +++ b/src/services/log.js

     

       5
        
       @@ -1,14 +1,5 @@

     
···

       17
        
        const SECOND = 1000;

     

       18
        
        const MINUTE = 60 * SECOND;

     

       19
        
        const HOUR = 60 * MINUTE;

     

       20
       -
       @@ -16,41 +7,7 @@ const DAY = 24 * HOUR;

     

       21
        
        

     

       22
        
        const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n';

     

       23
        
        

     
···

       46
        
       -function checkDate(millisSinceMidnight) {

     

       47
        
       -    if (millisSinceMidnight >= DAY) {

     

       48
        
       -        initLogFile();

     

       0
        
       
     

       0
        
       
     

       49
        
       -    }

     

       0
        
       
     

       0
        
       
     

       50
        
       -}

     

       51
        
       -

     

       52
        
        function log(str) {

     

       53
       -
       -    const millisSinceMidnight = Date.now() - todaysMidnight.getTime();

     

       54
        
       -

     

       55
       -
       -    checkDate(millisSinceMidnight);

     

       56
        
       -

     

       57
        
       -    logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);

     

       58
        
       -

     

       59
        
            console.log(str);

     

       60
        
        }

     

       61
       -

···

       1
        
       diff --git a/src/services/log.js b/src/services/log.js

     

       2
       +
       index 1345ce39..a9770516 100644

     

       3
        
       --- a/src/services/log.js

     

       4
        
       +++ b/src/services/log.js

     

       5
        
       @@ -1,14 +1,5 @@

     
···

       17
        
        const SECOND = 1000;

     

       18
        
        const MINUTE = 60 * SECOND;

     

       19
        
        const HOUR = 60 * MINUTE;

     

       20
       +
       @@ -16,45 +7,7 @@ const DAY = 24 * HOUR;

     

       21
        
        

     

       22
        
        const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n';

     

       23
        
        

     
···

       46
        
       -function checkDate(millisSinceMidnight) {

     

       47
        
       -    if (millisSinceMidnight >= DAY) {

     

       48
        
       -        initLogFile();

     

       49
       +
       -

     

       50
       +
       -        millisSinceMidnight =- DAY;

     

       51
        
       -    }

     

       52
       +
       -

     

       53
       +
       -    return millisSinceMidnight;

     

       54
        
       -}

     

       55
        
       -

     

       56
        
        function log(str) {

     

       57
       +
       -    let millisSinceMidnight = Date.now() - todaysMidnight.getTime();

     

       58
        
       -

     

       59
       +
       -    millisSinceMidnight = checkDate(millisSinceMidnight);

     

       60
        
       -

     

       61
        
       -    logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);

     

       62
        
       -

     

       63
        
            console.log(str);

     

       64
        
        }

     

       0

+3 -3

pkgs/applications/office/trilium/default.nix

···

       19
        
           maintainers = with maintainers; [ fliegendewurst ];

     

       20
        
         };

     

       21
        
       

     

       22
       -
         version = "0.47.3";

     

       23
        
       

     

       24
        
         desktopSource = {

     

       25
        
           url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";

     

       26
       -
           sha256 = "05l8yiqbqh2yr4cfbivpmj5q3jyzqz86wni36wcjlcg3rccms0hc";

     

       27
        
         };

     

       28
        
       

     

       29
        
         serverSource = {

     

       30
        
           url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";

     

       31
       -
           sha256 = "03nsvalaa0rch9i1kh6p5ynnsdmidm5zrw42klj70bamviklzsnh";

     

       32
        
         };

     

       33
        
       

     

       34
        
       in {

···

       19
        
           maintainers = with maintainers; [ fliegendewurst ];

     

       20
        
         };

     

       21
        
       

     

       22
       +
         version = "0.47.4";

     

       23
        
       

     

       24
        
         desktopSource = {

     

       25
        
           url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";

     

       26
       +
           sha256 = "0hvp6rpvgda12ficzqkj7kllgmpzc8n4rvpgv0zi6fa5alkr944x";

     

       27
        
         };

     

       28
        
       

     

       29
        
         serverSource = {

     

       30
        
           url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";

     

       31
       +
           sha256 = "01bbg7ssszrq27zk7xzil2mawk1659h1hw68yvk8lbgc4n9phkqk";

     

       32
        
         };

     

       33
        
       

     

       34
        
       in {

+3 -3

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

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "verilator";

     

       7
       -
         version = "4.110";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
       -
           url    = "https://www.veripool.org/ftp/${pname}-${version}.tgz";

     

       11
       -
           sha256 = "sha256-Rxb+AFhmGinWtZyvjnRxsu3b3tbtRO3njcHGUJTs/sw=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         enableParallelBuilding = true;

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "verilator";

     

       7
       +
         version = "4.202";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
       +
           url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";

     

       11
       +
           sha256 = "0ydn4304pminzq8zc1hsrb2fjrfqnb6akr45ky43jd29c4jgznnq";

     

       12
        
         };

     

       13
        
       

     

       14
        
         enableParallelBuilding = true;

+33

pkgs/applications/science/misc/graphia/default.nix

···

       1
       +
       { stdenv, lib, cmake, fetchFromGitHub

     

       2
       +
       , wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects

     

       3
       +
       }:

     

       4
       +
       

     

       5
       +
       stdenv.mkDerivation rec {

     

       6
       +
         pname = "graphia";

     

       7
       +
         version = "2.2";

     

       8
       +
       

     

       9
       +
         src = fetchFromGitHub {

     

       10
       +
           owner = "graphia-app";

     

       11
       +
           repo = "graphia";

     

       12
       +
           rev = version;

     

       13
       +
           sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w";

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
         nativeBuildInputs = [

     

       17
       +
           cmake

     

       18
       +
           wrapQtAppsHook

     

       19
       +
         ];

     

       20
       +
         buildInputs = [

     

       21
       +
           qtbase

     

       22
       +
           qtquickcontrols2

     

       23
       +
           qtgraphicaleffects

     

       24
       +
         ];

     

       25
       +
       

     

       26
       +
         meta = with lib; {

     

       27
       +
           description = "A visualisation tool for the creation and analysis of graphs.";

     

       28
       +
           homepage = "https://graphia.app";

     

       29
       +
           license = licenses.gpl3Only;

     

       30
       +
           maintainers = [ maintainers.bgamari ];

     

       31
       +
           platforms = platforms.all;

     

       32
       +
         };

     

       33
       +
       }

+10

pkgs/applications/terminal-emulators/wezterm/default.nix

···

       2
        
       , rustPlatform

     

       3
        
       , lib

     

       4
        
       , fetchFromGitHub

     

       0
        
       
     

       5
        
       , pkg-config

     

       6
        
       , fontconfig

     

       7
        
       , python3

     
···

       68
        
           fetchSubmodules = true;

     

       69
        
         };

     

       70
        
       

     

       0
        
       
     

       0
        
       
     

       71
        
         postPatch = ''

     

       72
        
           echo ${version} > .tag

     

       73
        
         '';

     
···

       78
        
           pkg-config

     

       79
        
           python3

     

       80
        
           perl

     

       0
        
       
     

       81
        
         ];

     

       82
        
       

     

       83
        
         buildInputs = runtimeDeps;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       84
        
       

     

       85
        
         preFixup = lib.optionalString stdenv.isLinux ''

     

       86
        
           for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do

···

       2
        
       , rustPlatform

     

       3
        
       , lib

     

       4
        
       , fetchFromGitHub

     

       5
       +
       , ncurses

     

       6
        
       , pkg-config

     

       7
        
       , fontconfig

     

       8
        
       , python3

     
···

       69
        
           fetchSubmodules = true;

     

       70
        
         };

     

       71
        
       

     

       72
       +
         outputs = [ "out" "terminfo" ];

     

       73
       +
       

     

       74
        
         postPatch = ''

     

       75
        
           echo ${version} > .tag

     

       76
        
         '';

     
···

       81
        
           pkg-config

     

       82
        
           python3

     

       83
        
           perl

     

       84
       +
           ncurses

     

       85
        
         ];

     

       86
        
       

     

       87
        
         buildInputs = runtimeDeps;

     

       88
       +
       

     

       89
       +
         postInstall = ''

     

       90
       +
           mkdir -p $terminfo/share/terminfo/w $out/nix-support

     

       91
       +
           tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo

     

       92
       +
           echo "$terminfo" >> $out/nix-support/propagated-user-env-packages

     

       93
       +
         '';

     

       94
        
       

     

       95
        
         preFixup = lib.optionalString stdenv.isLinux ''

     

       96
        
           for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do

+2 -1

pkgs/applications/video/lightworks/default.nix

···

       1
        
       { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv

     

       2
        
       , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU

     

       3
       -
       , libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev

     

       4
        
       }:

     

       5
        
       let

     

       6
        
         fullPath = lib.makeLibraryPath [

     
···

       18
        
           openssl

     

       19
        
           libuuid

     

       20
        
           alsaLib

     

       0
        
       
     

       21
        
           udev

     

       22
        
         ];

     

       23

···

       1
        
       { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv

     

       2
        
       , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU

     

       3
       +
       , libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2

     

       4
        
       }:

     

       5
        
       let

     

       6
        
         fullPath = lib.makeLibraryPath [

     
···

       18
        
           openssl

     

       19
        
           libuuid

     

       20
        
           alsaLib

     

       21
       +
           libjack2

     

       22
        
           udev

     

       23
        
         ];

     

       24

+39

pkgs/applications/video/mpv/scripts/youtube-quality.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenvNoCC

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , oscSupport ? false

     

       5
       +
       }:

     

       6
       +
       

     

       7
       +
       stdenvNoCC.mkDerivation rec {

     

       8
       +
         pname = "mpv-playlistmanager";

     

       9
       +
         version = "unstable-2020-02-11";

     

       10
       +
       

     

       11
       +
         src = fetchFromGitHub {

     

       12
       +
           owner = "jgreco";

     

       13
       +
           repo = "mpv-youtube-quality";

     

       14
       +
           rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148";

     

       15
       +
           sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic=";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         dontBuild = true;

     

       19
       +
       

     

       20
       +
         installPhase = ''

     

       21
       +
           runHook preInstall

     

       22
       +
           mkdir -p $out/share/mpv/scripts

     

       23
       +
           cp youtube-quality.lua $out/share/mpv/scripts

     

       24
       +
         '' + lib.optionalString oscSupport ''

     

       25
       +
           cp youtube-quality-osc.lua $out/share/mpv/scripts

     

       26
       +
         '' + ''

     

       27
       +
           runHook postInstall

     

       28
       +
         '';

     

       29
       +
       

     

       30
       +
         passthru.scriptName = "youtube-quality.lua";

     

       31
       +
       

     

       32
       +
         meta = with lib; {

     

       33
       +
           description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";

     

       34
       +
           homepage = "https://github.com/jgreco/mpv-youtube-quality";

     

       35
       +
           license = licenses.unfree;

     

       36
       +
           platforms = platforms.all;

     

       37
       +
           maintainers = with maintainers; [ lunik1 ];

     

       38
       +
         };

     

       39
       +
       }

+3 -1

pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c

···

       43
        
       void pivot_host(const gchar *guest) {

     

       44
        
         g_autofree gchar *point = g_build_filename(guest, "host", NULL);

     

       45
        
         fail_if(g_mkdir(point, 0755));

     

       46
       -
         fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0));

     

       47
        
         fail_if(pivot_root(guest, point));

     

       48
        
       }

     

       49
        
       

     
···

       121
        
       

     

       122
        
             fail("unshare", unshare_errno);

     

       123
        
           }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       124
        
       

     

       125
        
           if (uid != 0) {

     

       126
        
             spit("/proc/self/setgroups", "deny");

···

       43
        
       void pivot_host(const gchar *guest) {

     

       44
        
         g_autofree gchar *point = g_build_filename(guest, "host", NULL);

     

       45
        
         fail_if(g_mkdir(point, 0755));

     

       0
        
       
     

       46
        
         fail_if(pivot_root(guest, point));

     

       47
        
       }

     

       48
        
       

     
···

       120
        
       

     

       121
        
             fail("unshare", unshare_errno);

     

       122
        
           }

     

       123
       +
       

     

       124
       +
           // hide all mounts we do from the parent

     

       125
       +
           fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0));

     

       126
        
       

     

       127
        
           if (uid != 0) {

     

       128
        
             spit("/proc/self/setgroups", "deny");

pkgs/build-support/make-desktopitem/default.nix

···

       12
        
       , mimeType ? null

     

       13
        
       , categories ? null

     

       14
        
       , startupNotify ? null

     

       0
        
       
     

       0
        
       
     

       15
        
       , extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values

     

       16
        
       , extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections

     

       17
        
       , fileValidation ? true # whether to validate resulting desktop file.

     
···

       35
        
           "MimeType" = nullableToString mimeType;

     

       36
        
           "Categories" = nullableToString categories;

     

       37
        
           "StartupNotify" = nullableToString startupNotify;

     

       0
        
       
     

       0
        
       
     

       38
        
         } // extraDesktopEntries;

     

       39
        
       

     

       40
        
         # Map all entries to a list of lines

···

       12
        
       , mimeType ? null

     

       13
        
       , categories ? null

     

       14
        
       , startupNotify ? null

     

       15
       +
       , noDisplay ? null

     

       16
       +
       , prefersNonDefaultGPU ? null

     

       17
        
       , extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values

     

       18
        
       , extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections

     

       19
        
       , fileValidation ? true # whether to validate resulting desktop file.

     
···

       37
        
           "MimeType" = nullableToString mimeType;

     

       38
        
           "Categories" = nullableToString categories;

     

       39
        
           "StartupNotify" = nullableToString startupNotify;

     

       40
       +
           "NoDisplay" = nullableToString noDisplay;

     

       41
       +
           "PrefersNonDefaultGPU" = nullableToString prefersNonDefaultGPU;

     

       42
        
         } // extraDesktopEntries;

     

       43
        
       

     

       44
        
         # Map all entries to a list of lines

+2 -1

pkgs/desktops/gnome/apps/gnome-boxes/default.nix

···

       49
        
       , webkitgtk

     

       50
        
       , vte

     

       51
        
       , glib-networking

     

       0
        
       
     

       52
        
       }:

     

       53
        
       

     

       54
        
       stdenv.mkDerivation rec {

     
···

       120
        
         ];

     

       121
        
       

     

       122
        
         preFixup = ''

     

       123
       -
           gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}")

     

       124
        
         '';

     

       125
        
       

     

       126
        
         postPatch = ''

···

       49
        
       , webkitgtk

     

       50
        
       , vte

     

       51
        
       , glib-networking

     

       52
       +
       , qemu-utils

     

       53
        
       }:

     

       54
        
       

     

       55
        
       stdenv.mkDerivation rec {

     
···

       121
        
         ];

     

       122
        
       

     

       123
        
         preFixup = ''

     

       124
       +
           gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}")

     

       125
        
         '';

     

       126
        
       

     

       127
        
         postPatch = ''

pkgs/development/compilers/cudatoolkit/common.nix

···

       147
        
           mkdir -p $out/nix-support

     

       148
        
           echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook

     

       149
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       150
        
           # Move some libraries to the lib output so that programs that

     

       151
        
           # depend on them don't pull in this entire monstrosity.

     

       152
        
           mkdir -p $lib/lib

···

       147
        
           mkdir -p $out/nix-support

     

       148
        
           echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook

     

       149
        
       

     

       150
       +
           # Set the host compiler to be used by nvcc for CMake-based projects:

     

       151
       +
           # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables

     

       152
       +
           echo "cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin'" >> $out/nix-support/setup-hook

     

       153
       +
       

     

       154
        
           # Move some libraries to the lib output so that programs that

     

       155
        
           # depend on them don't pull in this entire monstrosity.

     

       156
        
           mkdir -p $lib/lib

+22

pkgs/development/compilers/passerine/default.nix

···

       1
       +
       { lib, fetchFromGitHub, rustPlatform }:

     

       2
       +
       

     

       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       +
         pname = "passerine";

     

       5
       +
         version = "0.9.2";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "vrtbl";

     

       9
       +
           repo = "passerine";

     

       10
       +
           rev = "dd8a6f5efc5dcb03d45b102f61cc8a50d46e8e98";

     

       11
       +
           sha256 = "sha256-/QzqKLkxAVqvTY4Uft1qk7nJat6nozykB/4X1YGqu/I=";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         cargoSha256 = "sha256-8WiiDLIJ/abXELF8S+4s+BPA/Lr/rpKmC1NWPCLzQWA=";

     

       15
       +
       

     

       16
       +
         meta = with lib; {

     

       17
       +
           description = "A small extensible programming language designed for concise expression with little code";

     

       18
       +
           homepage = "https://github.com/vrtbl/passerine";

     

       19
       +
           license = licenses.mit;

     

       20
       +
           maintainers = with maintainers; [ siraben ];

     

       21
       +
         };

     

       22
       +
       }

+19 -13

pkgs/development/libraries/libimobiledevice/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls

     

       2
       -
       , libgcrypt, libtasn1, glib, libplist, libusbmuxd }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "libimobiledevice";

     

       6
       -
         version = "1.3.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = pname;

     

       10
        
           repo = pname;

     

       11
       -
           rev = version;

     

       12
       -
           sha256 = "1jkq3hpg4n5a6s1k618ib0s80pwf00nlfcby7xckysq8mnd2pp39";

     

       13
        
         };

     

       14
        
       

     

       15
        
         outputs = [ "out" "dev" ];

     

       16
        
       

     

       17
        
         nativeBuildInputs = [

     

       18
       -
           autoconf

     

       19
       -
           automake

     

       20
        
           libtool

     

       21
        
           pkg-config

     

       22
        
         ];

     

       0
        
       
     

       23
        
         propagatedBuildInputs = [

     

       24
        
           glib

     

       25
        
           gnutls

     
···

       29
        
           libusbmuxd

     

       30
        
         ];

     

       31
        
       

     

       32
       -
         preConfigure = "NOCONFIGURE=1 ./autogen.sh";

     

       33
       -
       

     

       34
       -
         configureFlags = [

     

       35
       -
           "--disable-openssl"

     

       36
       -
           "--without-cython"

     

       37
       -
         ];

     

       38
        
       

     

       39
        
         meta = with lib; {

     

       40
        
           homepage = "https://github.com/libimobiledevice/libimobiledevice";

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , autoreconfHook

     

       5
       +
       , libtool

     

       6
       +
       , pkg-config

     

       7
       +
       , gnutls

     

       8
       +
       , libgcrypt

     

       9
       +
       , libtasn1

     

       10
       +
       , glib

     

       11
       +
       , libplist

     

       12
       +
       , libusbmuxd

     

       13
       +
       }:

     

       14
        
       

     

       15
        
       stdenv.mkDerivation rec {

     

       16
        
         pname = "libimobiledevice";

     

       17
       +
         version = "unstable-2021-06-02";

     

       18
        
       

     

       19
        
         src = fetchFromGitHub {

     

       20
        
           owner = pname;

     

       21
        
           repo = pname;

     

       22
       +
           rev = "ca324155f8b33babf907704828c7903608db0aa2";

     

       23
       +
           sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         outputs = [ "out" "dev" ];

     

       27
        
       

     

       28
        
         nativeBuildInputs = [

     

       29
       +
           autoreconfHook

     

       0
        
       
     

       30
        
           libtool

     

       31
        
           pkg-config

     

       32
        
         ];

     

       33
       +
       

     

       34
        
         propagatedBuildInputs = [

     

       35
        
           glib

     

       36
        
           gnutls

     
···

       40
        
           libusbmuxd

     

       41
        
         ];

     

       42
        
       

     

       43
       +
         configureFlags = [ "--disable-openssl" "--without-cython" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
       

     

       45
        
         meta = with lib; {

     

       46
        
           homepage = "https://github.com/libimobiledevice/libimobiledevice";

+1 -1

pkgs/development/lua-modules/overrides.nix

···

       173
        
             MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql";

     

       174
        
           };

     

       175
        
           buildInputs = [

     

       176
       -
             pkgs.mysql.client

     

       177
        
             pkgs.libmysqlclient

     

       178
        
           ];

     

       179
        
         });

···

       173
        
             MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql";

     

       174
        
           };

     

       175
        
           buildInputs = [

     

       176
       +
             pkgs.mariadb.client

     

       177
        
             pkgs.libmysqlclient

     

       178
        
           ];

     

       179
        
         });

+35

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

···

       1
       +
       { lib, fetchPypi, buildPythonPackage, fetchpatch, setuptools-scm }:

     

       2
       +
       

     

       3
       +
       buildPythonPackage rec {

     

       4
       +
         pname = "elevate";

     

       5
       +
         version = "0.1.3";

     

       6
       +
       

     

       7
       +
         src = fetchPypi {

     

       8
       +
           inherit pname version;

     

       9
       +
           sha256 = "53ad19fa1de301fb1de3f8768fb3a5894215716fd96a475690c4d0ff3b1de209";

     

       10
       +
         };

     

       11
       +
       

     

       12
       +
         patches = [

     

       13
       +
           (fetchpatch {

     

       14
       +
           # This is for not calling shell wrappers through Python, which fails.

     

       15
       +
           url = "https://github.com/rkitover/elevate/commit/148b2bf698203ea39c9fe5d635ecd03cd94051af.patch";

     

       16
       +
           sha256 = "1ky3z1jxl1g28wbwbx8qq8jgx8sa8pr8s3fdcpdhdx1blw28cv61";

     

       17
       +
           })

     

       18
       +
         ];

     

       19
       +
       

     

       20
       +
         nativeBuildInputs = [

     

       21
       +
           setuptools-scm

     

       22
       +
         ];

     

       23
       +
       

     

       24
       +
         # No tests included

     

       25
       +
         doCheck = false;

     

       26
       +
       

     

       27
       +
         pythonImportsCheck = [ "elevate" ];

     

       28
       +
       

     

       29
       +
         meta = with lib; {

     

       30
       +
           description = "Python module for re-launching the current process as super-user";

     

       31
       +
           homepage = "https://github.com/barneygale/elevate";

     

       32
       +
           license = licenses.mit;

     

       33
       +
           maintainers = with maintainers; [ rkitover ];

     

       34
       +
         };

     

       35
       +
       }

+2 -2

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

···

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "haversine";

     

       10
       -
         version = "2.3.0";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "mapado";

     

       14
        
           repo = pname;

     

       15
        
           rev = "v${version}";

     

       16
       -
           sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv";

     

       17
        
         };

     

       18
        
       

     

       19
        
         checkInputs = [

···

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "haversine";

     

       10
       +
         version = "2.3.1";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "mapado";

     

       14
        
           repo = pname;

     

       15
        
           rev = "v${version}";

     

       16
       +
           sha256 = "sha256-1PXPsZd/4pN42TU0lhXWsmyX7uGP1n/xna2cVZPczB4=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         checkInputs = [

+5 -9

pkgs/development/python-modules/influxdb-client/default.nix

···

       14
        
       

     

       15
        
       buildPythonPackage rec {

     

       16
        
         pname = "influxdb-client";

     

       17
       -
         version = "1.15.0";

     

       18
       -
       

     

       19
       -
         disabled = pythonOlder "3.6"; # requires python version >=3.6

     

       20
        
       

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "influxdata";

     

       23
        
           repo = "influxdb-client-python";

     

       24
        
           rev = "v${version}";

     

       25
       -
           sha256 = "1b2xh78v965rgafyj7cdbjm2p96d74f7ifsqllc7242n9wv3k53q";

     

       26
        
         };

     

       27
        
       

     

       28
       -
         # makes test not reproducible

     

       29
       -
         postPatch = ''

     

       30
       -
           sed -i -e '/randomize/d' test-requirements.txt

     

       31
       -
         '';

     

       32
       -
       

     

       33
        
         propagatedBuildInputs = [

     

       34
        
           rx

     

       35
        
           certifi

     
···

       43
        
       

     

       44
        
         # requires influxdb server

     

       45
        
         doCheck = false;

     

       0
        
       
     

       0
        
       
     

       46
        
       

     

       47
        
         meta = with lib; {

     

       48
        
           description = "InfluxDB 2.0 Python client library";

···

       14
        
       

     

       15
        
       buildPythonPackage rec {

     

       16
        
         pname = "influxdb-client";

     

       17
       +
         version = "1.17.0";

     

       18
       +
         disabled = pythonOlder "3.6";

     

       0
        
       
     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "influxdata";

     

       22
        
           repo = "influxdb-client-python";

     

       23
        
           rev = "v${version}";

     

       24
       +
           sha256 = "1xxg8z9zambbhr7nmxhmvmiwkd4578zxr6rl2vhdh2w77idsw29z";

     

       25
        
         };

     

       26
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
         propagatedBuildInputs = [

     

       28
        
           rx

     

       29
        
           certifi

     
···

       37
        
       

     

       38
        
         # requires influxdb server

     

       39
        
         doCheck = false;

     

       40
       +
       

     

       41
       +
         pythonImportsCheck = [ "influxdb_client" ];

     

       42
        
       

     

       43
        
         meta = with lib; {

     

       44
        
           description = "InfluxDB 2.0 Python client library";

+14 -9

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

···

       1
        
       { lib

     

       2
        
       , buildPythonPackage

     

       3
       -
       , fetchPypi

     

       4
        
       , isPy3k

     

       5
       -
       , pythonOlder

     

       6
        
       , setuptools

     

       7
       -
       , aenum

     

       8
        
       , pytest

     

       9
       -
       , pytestcov

     

       10
        
       }:

     

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "pglast";

     

       14
       -
         version = "1.17";

     

       15
        
       

     

       16
       -
         src = fetchPypi {

     

       17
       -
           inherit pname version;

     

       18
       -
           sha256 = "2979b38ca5f72cfa0a5db78af2f62d04db6a7647ee7f03eac7a67f9e86e3f5f9";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
         };

     

       20
        
       

     

       21
        
         disabled = !isPy3k;

     

       22
        
       

     

       23
       -
         propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ];

     

       24
        
       

     

       25
        
         checkInputs = [ pytest pytestcov ];

     

       0
        
       
     

       0
        
       
     

       26
        
       

     

       27
        
         checkPhase = ''

     

       28
        
           pytest

     
···

       31
        
         meta = with lib; {

     

       32
        
           homepage = "https://github.com/lelit/pglast";

     

       33
        
           description = "PostgreSQL Languages AST and statements prettifier";

     

       0
        
       
     

       34
        
           license = licenses.gpl3Plus;

     

       35
        
           maintainers = [ maintainers.marsam ];

     

       36
        
         };

···

       1
        
       { lib

     

       2
        
       , buildPythonPackage

     

       3
       +
       , fetchFromGitHub

     

       4
        
       , isPy3k

     

       0
        
       
     

       5
        
       , setuptools

     

       6
       +
       , pytestcov

     

       7
        
       , pytest

     

       0
        
       
     

       8
        
       }:

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "pglast";

     

       12
       +
         version = "3.0";

     

       13
        
       

     

       14
       +
         # PyPI tarball does not include all the required files

     

       15
       +
         src = fetchFromGitHub {

     

       16
       +
           owner = "lelit";

     

       17
       +
           repo = pname;

     

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

     

       19
       +
           fetchSubmodules = true;

     

       20
       +
           sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd";

     

       21
        
         };

     

       22
        
       

     

       23
        
         disabled = !isPy3k;

     

       24
        
       

     

       25
       +
         propagatedBuildInputs = [ setuptools ];

     

       26
        
       

     

       27
        
         checkInputs = [ pytest pytestcov ];

     

       28
       +
       

     

       29
       +
         pythonImportsCheck = [ "pglast" ];

     

       30
        
       

     

       31
        
         checkPhase = ''

     

       32
        
           pytest

     
···

       35
        
         meta = with lib; {

     

       36
        
           homepage = "https://github.com/lelit/pglast";

     

       37
        
           description = "PostgreSQL Languages AST and statements prettifier";

     

       38
       +
           changelog = "https://github.com/lelit/pglast/raw/v${version}/CHANGES.rst";

     

       39
        
           license = licenses.gpl3Plus;

     

       40
        
           maintainers = [ maintainers.marsam ];

     

       41
        
         };

+2 -2

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

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "userpath";

     

       9
       -
         version = "1.5.0";

     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
       -
           sha256="0fj2lj9vcns5sxv72v3ggrszcl7j1jd9a6ycnsl00218nycliy31";

     

       14
        
         };

     

       15
        
       

     

       16
        
         propagatedBuildInputs = [ click ];

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "userpath";

     

       9
       +
         version = "1.6.0";

     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
       +
           sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj";

     

       14
        
         };

     

       15
        
       

     

       16
        
         propagatedBuildInputs = [ click ];

+4 -4

pkgs/development/tools/analysis/tflint/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "tflint";

     

       5
       -
         version = "0.28.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "terraform-linters";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17
        
       

     
···

       20
        
         meta = with lib; {

     

       21
        
           description = "Terraform linter focused on possible errors, best practices, and so on";

     

       22
        
           homepage = "https://github.com/terraform-linters/tflint";

     

       23
       -
           changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";

     

       24
        
           license = licenses.mpl20;

     

       25
        
           maintainers = [ maintainers.marsam ];

     

       26
        
         };

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "tflint";

     

       5
       +
         version = "0.29.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "terraform-linters";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17
        
       

     
···

       20
        
         meta = with lib; {

     

       21
        
           description = "Terraform linter focused on possible errors, best practices, and so on";

     

       22
        
           homepage = "https://github.com/terraform-linters/tflint";

     

       23
       +
           changelog = "https://github.com/terraform-linters/tflint/raw/v${version}/CHANGELOG.md";

     

       24
        
           license = licenses.mpl20;

     

       25
        
           maintainers = [ maintainers.marsam ];

     

       26
        
         };

+13

pkgs/development/tools/earthly/default.nix

···

       13
        
       

     

       14
        
         vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g=";

     

       15
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         postInstall = ''

     

       17
        
           mv $out/bin/debugger $out/bin/earthly-debugger

     

       18
        
           mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater

···

       13
        
       

     

       14
        
         vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g=";

     

       15
        
       

     

       16
       +
         buildFlagsArray = ''

     

       17
       +
           -ldflags=

     

       18
       +
             -s -w

     

       19
       +
             -X main.Version=v${version}

     

       20
       +
             -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}

     

       21
       +
             -extldflags -static

     

       22
       +
         '';

     

       23
       +
       

     

       24
       +
         BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork";

     

       25
       +
         preBuild = ''

     

       26
       +
           makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}")

     

       27
       +
         '';

     

       28
       +
       

     

       29
        
         postInstall = ''

     

       30
        
           mv $out/bin/debugger $out/bin/earthly-debugger

     

       31
        
           mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater

+191

pkgs/games/unvanquished/default.nix

···

       1
       +
       { lib, stdenv, fetchzip, fetchurl, fetchFromGitHub, buildFHSUserEnv

     

       2
       +
       , runCommandNoCC, makeDesktopItem, copyDesktopItems, gcc, cmake, gmp

     

       3
       +
       , libGL, zlib, ncurses, geoip, lua5, nettle, curl, SDL2, freetype, glew

     

       4
       +
       , openal, libopus, opusfile, libogg, libvorbis, libjpeg, libwebp, libpng

     

       5
       +
       , cacert, aria2 # to download assets

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       let

     

       9
       +
         version = "0.52.0";

     

       10
       +
         binary-deps-version = "5";

     

       11
       +
       

     

       12
       +
         src = fetchFromGitHub {

     

       13
       +
           owner = "Unvanquished";

     

       14
       +
           repo = "Unvanquished";

     

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

     

       16
       +
           fetchSubmodules = true;

     

       17
       +
           sha256 = "1acda1559q6zwmhg3x00nai88hy83i5hcfli2bqfab7slr95lm27";

     

       18
       +
         };

     

       19
       +
       

     

       20
       +
         unvanquished-binary-deps = stdenv.mkDerivation rec {

     

       21
       +
           # DISCLAIMER: this is selected binary crap from the NaCl SDK

     

       22
       +
           name = "unvanquished-binary-deps";

     

       23
       +
           version = binary-deps-version;

     

       24
       +
           src = fetchzip {

     

       25
       +
             url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2";

     

       26
       +
             sha256 = "08bpyavbh5lmyprvqqi59gnm8s1fjmlk9f1785wlv7f52d9f9z1p";

     

       27
       +
           };

     

       28
       +
           dontPatchELF = true;

     

       29
       +
           preFixup = ''

     

       30
       +
             # We are not using the autoPatchelfHook, because it would make

     

       31
       +
             # nacl_bootstrap_helper unable to load nacl_loader:

     

       32
       +
             # "nacl_loader: ELF file has unreasonable e_phnum=13"

     

       33
       +
             interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")"

     

       34
       +
             for f in pnacl/bin/*; do

     

       35
       +
               if [ -f "$f" && -x "$f" ]; then

     

       36
       +
                 echo "Patching $f"

     

       37
       +
                 patchelf --set-interpreter "$interpreter" "$f"

     

       38
       +
               fi

     

       39
       +
             done

     

       40
       +
           '';

     

       41
       +
           preCheck = "pnacl/bin/clang -v"; # check it links correctly

     

       42
       +
           installPhase = ''

     

       43
       +
             runHook preInstall

     

       44
       +
       

     

       45
       +
             mkdir -p $out

     

       46
       +
             cp -R ./* $out/

     

       47
       +
       

     

       48
       +
             runHook postInstall

     

       49
       +
           '';

     

       50
       +
         };

     

       51
       +
       

     

       52
       +
         libstdcpp-preload-for-unvanquished-nacl = stdenv.mkDerivation {

     

       53
       +
           name = "libstdcpp-preload-for-unvanquished-nacl";

     

       54
       +
           buildCommand = ''

     

       55
       +
             mkdir $out/etc -p

     

       56
       +
             echo ${gcc.cc.lib}/lib/libstdc++.so.6 > $out/etc/ld-nix.so.preload

     

       57
       +
           '';

     

       58
       +
           propagatedBuildInputs = [ gcc.cc.lib ];

     

       59
       +
         };

     

       60
       +
       

     

       61
       +
         fhsEnv = buildFHSUserEnv {

     

       62
       +
           name = "unvanquished-fhs-wrapper";

     

       63
       +
           targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ];

     

       64
       +
         };

     

       65
       +
       

     

       66
       +
         wrapBinary = binary: wrappername: ''

     

       67
       +
           cat > $out/lib/${binary}-wrapper <<-EOT

     

       68
       +
           #!/bin/sh

     

       69
       +
           exec $out/lib/${binary} -pakpath ${unvanquished-assets} "\$@"

     

       70
       +
           EOT

     

       71
       +
           chmod +x $out/lib/${binary}-wrapper

     

       72
       +
       

     

       73
       +
           cat > $out/bin/${wrappername} <<-EOT

     

       74
       +
           #!/bin/sh

     

       75
       +
           exec ${fhsEnv}/bin/unvanquished-fhs-wrapper $out/lib/${binary}-wrapper "\$@"

     

       76
       +
           EOT

     

       77
       +
           chmod +x $out/bin/${wrappername}

     

       78
       +
         '';

     

       79
       +
       

     

       80
       +
       

     

       81
       +
         unvanquished-assets = stdenv.mkDerivation {

     

       82
       +
           pname = "unvanquished-assets";

     

       83
       +
           inherit version src;

     

       84
       +
       

     

       85
       +
           outputHash = "sha256:1fy85cjnjk9rrqkhgx5701inff2yv14hnxglzx3209c553gn31n7";

     

       86
       +
           outputHashMode = "recursive";

     

       87
       +
           nativeBuildInputs = [ aria2 cacert ];

     

       88
       +
           buildCommand = "bash $src/download-paks $out";

     

       89
       +
         };

     

       90
       +
       

     

       91
       +
       # this really is the daemon game engine, the game itself is in the assets

     

       92
       +
       in stdenv.mkDerivation rec {

     

       93
       +
         pname = "unvanquished";

     

       94
       +
         inherit version src binary-deps-version;

     

       95
       +
       

     

       96
       +
         preConfigure = ''

     

       97
       +
           mkdir daemon/external_deps/linux64-${binary-deps-version}/

     

       98
       +
           cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/

     

       99
       +
           chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/

     

       100
       +
         '';

     

       101
       +
       

     

       102
       +
         nativeBuildInputs = [ cmake unvanquished-binary-deps copyDesktopItems ];

     

       103
       +
         buildInputs = [

     

       104
       +
           gmp

     

       105
       +
           libGL

     

       106
       +
           zlib

     

       107
       +
           ncurses

     

       108
       +
           geoip

     

       109
       +
           lua5

     

       110
       +
           nettle

     

       111
       +
           curl

     

       112
       +
           SDL2

     

       113
       +
           freetype

     

       114
       +
           glew

     

       115
       +
           openal

     

       116
       +
           libopus

     

       117
       +
           opusfile

     

       118
       +
           libogg

     

       119
       +
           libvorbis

     

       120
       +
           libjpeg

     

       121
       +
           libwebp

     

       122
       +
           libpng

     

       123
       +
         ];

     

       124
       +
       

     

       125
       +
         cmakeFlags = [

     

       126
       +
           "-DBUILD_CGAME=NO"

     

       127
       +
           "-DBUILD_SGAME=NO"

     

       128
       +
           "-DUSE_HARDENING=TRUE"

     

       129
       +
           "-DUSE_LTO=TRUE"

     

       130
       +
         ];

     

       131
       +
       

     

       132
       +
         desktopItems = [

     

       133
       +
           (makeDesktopItem {

     

       134
       +
             name = "net.unvanquished.Unvanquished.desktop";

     

       135
       +
             desktopName = "Unvanquished";

     

       136
       +
             comment = "FPS/RTS Game - Aliens vs. Humans";

     

       137
       +
             icon = "unvanquished";

     

       138
       +
             terminal = false;

     

       139
       +
             exec = "unvanquished";

     

       140
       +
             categories = "Game;ActionGame;StrategyGame;";

     

       141
       +
             # May or may not work

     

       142
       +
             prefersNonDefaultGPU = true;

     

       143
       +
             fileValidation = false; # it doesn't like PrefersNonDefaultGPU

     

       144
       +
             # yes, PrefersNonDefaultGPU is standard:

     

       145
       +
             # https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html

     

       146
       +
           })

     

       147
       +
           (makeDesktopItem {

     

       148
       +
             name = "net.unvanquished.UnvanquishedProtocolHandler.desktop";

     

       149
       +
             desktopName = "Unvanquished (protocol handler)";

     

       150
       +
             noDisplay = true;

     

       151
       +
             terminal = false;

     

       152
       +
             exec = "unvanquished -connect %u";

     

       153
       +
             mimeType = "x-scheme-handler/unv";

     

       154
       +
             # May or may not work

     

       155
       +
             prefersNonDefaultGPU = true;

     

       156
       +
             fileValidation = false; # it doesn't like PrefersNonDefaultGPU

     

       157
       +
           })

     

       158
       +
         ];

     

       159
       +
       

     

       160
       +
         installPhase = ''

     

       161
       +
           runHook preInstall

     

       162
       +
       

     

       163
       +
           for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do

     

       164
       +
             install -Dm0755 -t $out/lib/ $f

     

       165
       +
           done

     

       166
       +
           install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe

     

       167
       +
       

     

       168
       +
           mkdir $out/bin/

     

       169
       +
           ${wrapBinary "daemon"     "unvanquished"}

     

       170
       +
           ${wrapBinary "daemon-tty" "unvanquished-tty"}

     

       171
       +
           ${wrapBinary "daemonded"  "unvanquished-server"}

     

       172
       +
       

     

       173
       +
           for d in ${src}/dist/icons/*; do

     

       174
       +
             install -Dm0644 -t $out/share/icons/hicolor/$(basename $d)/apps/ $d/unvanquished.png

     

       175
       +
           done

     

       176
       +
       

     

       177
       +
           runHook postInstall

     

       178
       +
         '';

     

       179
       +
         meta = {

     

       180
       +
           platforms = [ "x86_64-linux" ];

     

       181
       +
           homepage = "https://unvanquished.net/";

     

       182
       +
           downloadPage = "https://unvanquished.net/download/";

     

       183
       +
           description = "A fast paced, first person strategy game";

     

       184
       +
           maintainers = with lib.maintainers; [ afontain ];

     

       185
       +
           # don't replace the following lib.licenses.zlib with just "zlib",

     

       186
       +
           # or you would end up with the package instead

     

       187
       +
           license = with lib.licenses; [

     

       188
       +
             mit gpl3Only lib.licenses.zlib cc-by-sa-25

     

       189
       +
           ];

     

       190
       +
         };

     

       191
       +
       }

+2 -2

pkgs/misc/screensavers/betterlockscreen/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "betterlockscreen";

     

       8
       -
         version = "3.1.1";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "pavanjadhaw";

     

       12
        
           repo = "betterlockscreen";

     

       13
        
           rev = version;

     

       14
       -
           sha256 = "sha256-TA4YSd/elFuLU1ZMu+dqIOt6hK9pnzgoJudaMpIwh+U=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ makeWrapper ];

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "betterlockscreen";

     

       8
       +
         version = "3.2.0";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "pavanjadhaw";

     

       12
        
           repo = "betterlockscreen";

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ makeWrapper ];

+27

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

···

       1
       +
       { lib, stdenv, fetchFromGitHub, pciutils, cmake }:

     

       2
       +
       stdenv.mkDerivation rec {

     

       3
       +
         pname = "ryzenadj";

     

       4
       +
         version = "0.8.2";

     

       5
       +
       

     

       6
       +
         src = fetchFromGitHub {

     

       7
       +
           owner = "FlyGoat";

     

       8
       +
           repo = "RyzenAdj";

     

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

     

       10
       +
           sha256 = "182l9nchlpl4yr568n86086glkr607rif92wnwc7v3aym62ch6ld";

     

       11
       +
         };

     

       12
       +
       

     

       13
       +
         nativeBuildInputs = [ pciutils cmake ];

     

       14
       +
       

     

       15
       +
         installPhase = ''

     

       16
       +
           install -D libryzenadj.so $out/lib/libryzenadj.so

     

       17
       +
           install -D ryzenadj $out/bin/ryzenadj

     

       18
       +
         '';

     

       19
       +
       

     

       20
       +
         meta = with lib; {

     

       21
       +
           description = "Adjust power management settings for Ryzen Mobile Processors.";

     

       22
       +
           homepage = "https://github.com/FlyGoat/RyzenAdj";

     

       23
       +
           license = licenses.lgpl3Only;

     

       24
       +
           maintainers = with maintainers; [ asbachb ];

     

       25
       +
           platforms = [ "x86_64-linux" ];

     

       26
       +
         };

     

       27
       +
       }

+2 -2

pkgs/servers/jackett/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "jackett";

     

       5
       -
         version = "0.18.225";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";

     

       9
       -
           sha256 = "sha256-EvFu+v1Ltot5zuDWcuG8Z00NHjWjZTrI0JKv+rgVB7U=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "jackett";

     

       5
       +
         version = "0.18.231";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";

     

       9
       +
           sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

pkgs/servers/monitoring/zabbix/agent2.nix

···

       46
        
           '';

     

       47
        
       

     

       48
        
           installPhase = ''

     

       0
        
       
     

       0
        
       
     

       49
        
             install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf

     

       50
        
             install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       51
        
           '';

     

       52
        
       

     

       53
        
           meta = with lib; {

···

       46
        
           '';

     

       47
        
       

     

       48
        
           installPhase = ''

     

       49
       +
             mkdir -p $out/sbin

     

       50
       +
       

     

       51
        
             install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf

     

       52
        
             install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2

     

       53
       +
       

     

       54
       +
             # create a symlink which is compatible with the zabbixAgent module

     

       55
       +
             ln -s $out/bin/zabbix_agent2 $out/sbin/zabbix_agentd

     

       56
        
           '';

     

       57
        
       

     

       58
        
           meta = with lib; {

+3 -3

pkgs/servers/unpackerr/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "unpackerr";

     

       5
       -
         version = "0.9.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "davidnewhall";

     

       9
        
           repo = "unpackerr";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd";

     

       15
        
       

     

       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "unpackerr";

     

       5
       +
         version = "0.9.6";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "davidnewhall";

     

       9
        
           repo = "unpackerr";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "1jyqrfik6fy7d4lr1y0ryp4iz8yn898ksyxwaryvrhykznqivp0y";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z";

     

       15
        
       

     

       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

     

       17

-7

pkgs/stdenv/generic/default.nix

···

       159
        
               inherit lib config stdenv;

     

       160
        
             }) mkDerivation;

     

       161
        
       

     

       162
       -
             # Slated for removal in 21.11

     

       163
       -
             lib = if config.allowAliases or true then builtins.trace

     

       164
       -
               ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release."

     

       165
       -
                + " Please use `lib` instead."

     

       166
       -
                + " For more information see https://github.com/NixOS/nixpkgs/issues/108938")

     

       167
       -
               lib else throw "`stdenv.lib` is a deprecated alias for `lib`";

     

       168
       -
       

     

       169
        
             inherit fetchurlBoot;

     

       170
        
       

     

       171
        
             inherit overrides;

···

       159
        
               inherit lib config stdenv;

     

       160
        
             }) mkDerivation;

     

       161
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       162
        
             inherit fetchurlBoot;

     

       163
        
       

     

       164
        
             inherit overrides;

+2 -6

pkgs/tools/backup/borgmatic/default.nix

···

       2
        
       

     

       3
        
       python3Packages.buildPythonApplication rec {

     

       4
        
         pname = "borgmatic";

     

       5
       -
         version = "1.5.12";

     

       6
        
       

     

       7
        
         src = python3Packages.fetchPypi {

     

       8
        
           inherit pname version;

     

       9
       -
           sha256 = "sha256-XLbBJvNRmH8W9SnOjF7zUbazRYFCMW6SEO2wKN/2VTY=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];

     

       13
        
       

     

       14
        
         # - test_borgmatic_version_matches_news_version

     

       15
        
         # The file NEWS not available on the pypi source, and this test is useless

     

       16
       -
         # - test_collect_configuration_run_summary_logs_outputs_merged_json_results

     

       17
       -
         # Upstream fixed in the next version, see

     

       18
       -
         # https://github.com/witten/borgmatic/commit/ea6cd53067435365a96786b006aec391714501c4

     

       19
        
         disabledTests = [

     

       20
        
           "test_borgmatic_version_matches_news_version"

     

       21
       -
           "test_collect_configuration_run_summary_logs_outputs_merged_json_results"

     

       22
        
         ];

     

       23
        
       

     

       24
        
         propagatedBuildInputs = with python3Packages; [

···

       2
        
       

     

       3
        
       python3Packages.buildPythonApplication rec {

     

       4
        
         pname = "borgmatic";

     

       5
       +
         version = "1.5.13";

     

       6
        
       

     

       7
        
         src = python3Packages.fetchPypi {

     

       8
        
           inherit pname version;

     

       9
       +
           sha256 = "12390ffdg30ncc5k92pvagwbvnsh42xl35a3nagbskznyfd23mw3";

     

       10
        
         };

     

       11
        
       

     

       12
        
         checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];

     

       13
        
       

     

       14
        
         # - test_borgmatic_version_matches_news_version

     

       15
        
         # The file NEWS not available on the pypi source, and this test is useless

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         disabledTests = [

     

       17
        
           "test_borgmatic_version_matches_news_version"

     

       0
        
       
     

       18
        
         ];

     

       19
        
       

     

       20
        
         propagatedBuildInputs = with python3Packages; [

+48

pkgs/tools/cd-dvd/bootiso/default.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenvNoCC

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , bash

     

       5
       +
       , makeWrapper

     

       6
       +
       , bc

     

       7
       +
       , jq

     

       8
       +
       , wimlib

     

       9
       +
       , file

     

       10
       +
       , syslinux

     

       11
       +
       , busybox

     

       12
       +
       , gnugrep # We can't use busybox's 'grep' as it doesn't support perl '-P' expressions.

     

       13
       +
       }:

     

       14
       +
       

     

       15
       +
       stdenvNoCC.mkDerivation rec {

     

       16
       +
         pname = "bootiso";

     

       17
       +
         version = "4.2.0";

     

       18
       +
       

     

       19
       +
         src = fetchFromGitHub {

     

       20
       +
           owner = "jsamr";

     

       21
       +
           repo = pname;

     

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

     

       23
       +
           sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i";

     

       24
       +
         };

     

       25
       +
       

     

       26
       +
         strictDeps = true;

     

       27
       +
         buildInputs = [ bash ];

     

       28
       +
         nativeBuildInputs = [ makeWrapper ];

     

       29
       +
         postPatch = ''

     

       30
       +
           patchShebangs --host bootiso

     

       31
       +
         '';

     

       32
       +
       

     

       33
       +
         makeFlags = [ "prefix=${placeholder "out"}" ];

     

       34
       +
       

     

       35
       +
         postInstall = ''

     

       36
       +
           wrapProgram $out/bin/bootiso \

     

       37
       +
             --prefix PATH : ${lib.makeBinPath [ bc jq wimlib file syslinux gnugrep busybox ]} \

     

       38
       +
             --prefix BOOTISO_SYSLINUX_LIB_ROOT : ${syslinux}/share/syslinux

     

       39
       +
         '';

     

       40
       +
       

     

       41
       +
         meta = with lib; {

     

       42
       +
           description = "Script for securely creating a bootable USB device from one image file";

     

       43
       +
           homepage = "https://github.com/jsamr/bootiso";

     

       44
       +
           license = licenses.gpl3;

     

       45
       +
           maintainers = with maintainers; [ musfay ];

     

       46
       +
           platforms = platforms.all;

     

       47
       +
         };

     

       48
       +
       }

+2 -2

pkgs/tools/graphics/astc-encoder/default.nix

···

       31
        
       

     

       32
        
       gccStdenv.mkDerivation rec {

     

       33
        
         pname = "astc-encoder";

     

       34
       -
         version = "2.5";

     

       35
        
       

     

       36
        
         src = fetchFromGitHub {

     

       37
        
           owner = "ARM-software";

     

       38
        
           repo = "astc-encoder";

     

       39
        
           rev = version;

     

       40
       -
           sha256 = "0ff5jh40w942dz7hmgvznmpa9yhr1j4i9qqj5wy6icm2jb9j4pak";

     

       41
        
         };

     

       42
        
       

     

       43
        
         nativeBuildInputs = [ cmake ];

···

       31
        
       

     

       32
        
       gccStdenv.mkDerivation rec {

     

       33
        
         pname = "astc-encoder";

     

       34
       +
         version = "3.0";

     

       35
        
       

     

       36
        
         src = fetchFromGitHub {

     

       37
        
           owner = "ARM-software";

     

       38
        
           repo = "astc-encoder";

     

       39
        
           rev = version;

     

       40
       +
           sha256 = "sha256-+vYEO2zS144ZuVN8b4/EpvTcakC9U0uc/eV4pB7lHiY=";

     

       41
        
         };

     

       42
        
       

     

       43
        
         nativeBuildInputs = [ cmake ];

+6 -10

pkgs/tools/misc/ethminer/default.nix

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
       -
         clangStdenv,

     

       5
        
         fetchFromGitHub,

     

       6
        
         opencl-headers,

     

       7
        
         cmake,

     
···

       17
        
         openssl,

     

       18
        
         pkg-config,

     

       19
        
         cli11

     

       20
       -
       }@args:

     

       21
        
       

     

       22
       -
       # Note that this requires clang < 9.0 to build, and currently

     

       23
       -
       # clangStdenv provides clang 7.1 which satisfies the requirement.

     

       24
       -
       let stdenv = if cudaSupport then clangStdenv else args.stdenv;

     

       25
       -
       

     

       26
       -
       in stdenv.mkDerivation rec {

     

       27
        
         pname = "ethminer";

     

       28
        
         version = "0.19.0";

     

       29
        
       

     
···

       43
        
           "-DAPICORE=ON"

     

       44
        
           "-DETHDBUS=OFF"

     

       45
        
           "-DCMAKE_BUILD_TYPE=Release"

     

       46
       -
         ] ++ lib.optionals (!cudaSupport) [

     

       0
        
       
     

       0
        
       
     

       47
        
           "-DETHASHCUDA=OFF" # on by default

     

       48
       -
         ];

     

       49
        
       

     

       50
        
         nativeBuildInputs = [

     

       51
        
           cmake

     
···

       81
        
           platforms = [ "x86_64-linux" ];

     

       82
        
           maintainers = with maintainers; [ atemu ];

     

       83
        
           license = licenses.gpl3Only;

     

       84
       -
           broken = cudaSupport;

     

       85
        
         };

     

       86
        
       }

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         stdenv,

     

       0
        
       
     

       4
        
         fetchFromGitHub,

     

       5
        
         opencl-headers,

     

       6
        
         cmake,

     
···

       16
        
         openssl,

     

       17
        
         pkg-config,

     

       18
        
         cli11

     

       19
       +
       }:

     

       20
        
       

     

       21
       +
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         pname = "ethminer";

     

       23
        
         version = "0.19.0";

     

       24
        
       

     
···

       38
        
           "-DAPICORE=ON"

     

       39
        
           "-DETHDBUS=OFF"

     

       40
        
           "-DCMAKE_BUILD_TYPE=Release"

     

       41
       +
         ] ++ (if cudaSupport then [

     

       42
       +
           "-DCUDA_PROPAGATE_HOST_FLAGS=off"

     

       43
       +
         ] else [

     

       44
        
           "-DETHASHCUDA=OFF" # on by default

     

       45
       +
         ]);

     

       46
        
       

     

       47
        
         nativeBuildInputs = [

     

       48
        
           cmake

     
···

       78
        
           platforms = [ "x86_64-linux" ];

     

       79
        
           maintainers = with maintainers; [ atemu ];

     

       80
        
           license = licenses.gpl3Only;

     

       0
        
       
     

       81
        
         };

     

       82
        
       }

+2 -2

pkgs/tools/misc/mmv/default.nix

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "mmv";

     

       6
       -
         version = "2.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "rrthomas";

     

       10
        
           repo = "mmv";

     

       11
        
           rev = "v${version}";

     

       12
       -
           sha256 = "sha256-MmxDk3PBtvK/thrh6x67M+nMdCDlOQQHkREqLmzF2Mk=";

     

       13
        
           fetchSubmodules = true;

     

       14
        
         };

     

       15

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         pname = "mmv";

     

       6
       +
         version = "2.1";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "rrthomas";

     

       10
        
           repo = "mmv";

     

       11
        
           rev = "v${version}";

     

       12
       +
           sha256 = "sha256-3XWXOp30P/bOd+c7PC8duidewX8h0hk9VsEUw05dAE4=";

     

       13
        
           fetchSubmodules = true;

     

       14
        
         };

     

       15

+3 -3

pkgs/tools/misc/plantuml-server/default.nix

···

       1
        
       { lib, stdenv, fetchFromGitHub, maven, jdk8_headless }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "1.2021.6";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "plantuml";

     

       8
        
           repo = "plantuml-server";

     

       9
        
           rev = "v${version}";

     

       10
       -
           sha256 = "sha256:1v69vabdq9pv75wzb6n5s198iy5ijfcx6lgjqwxz7n5ns3blf6sz";

     

       11
        
         };

     

       12
        
       

     

       13
        
         # perform fake build to make a fixed-output derivation out of the files downloaded from maven central

     
···

       28
        
           installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';

     

       29
        
           outputHashAlgo = "sha256";

     

       30
        
           outputHashMode = "recursive";

     

       31
       -
           outputHash = "sha256:1fvir7yvg4a4dc4kiv2d5q081cygj7s2lmxj90j8zzkggyq7v8zh";

     

       32
        
         };

     

       33
        
       in

     

       34

···

       1
        
       { lib, stdenv, fetchFromGitHub, maven, jdk8_headless }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "1.2021.7";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "plantuml";

     

       8
        
           repo = "plantuml-server";

     

       9
        
           rev = "v${version}";

     

       10
       +
           sha256 = "sha256-kY7b3ocm1zudGIf72MNMZDUG2t2FFqucRr3kRaFv7mo=";

     

       11
        
         };

     

       12
        
       

     

       13
        
         # perform fake build to make a fixed-output derivation out of the files downloaded from maven central

     
···

       28
        
           installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';

     

       29
        
           outputHashAlgo = "sha256";

     

       30
        
           outputHashMode = "recursive";

     

       31
       +
           outputHash = "sha256-HzT5rBycrd48KskWKAGtkMKdCDQ8NPYADVWZh8K0ll4=";

     

       32
        
         };

     

       33
        
       in

     

       34

+10 -7

pkgs/tools/networking/ddclient/default.nix

···

       1
       -
       { lib, fetchurl, perlPackages, iproute2, perl }:

     

       2
        
       

     

       3
        
       perlPackages.buildPerlPackage rec {

     

       4
        
         pname = "ddclient";

     

       5
        
         version = "3.9.1";

     

       6
        
       

     

       7
       -
         src = fetchurl {

     

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

     

       9
       -
           sha256 = "0w14qnn72j333i3j7flxkw6bzcg4n31d8jfnvhmwa7s9rharx5p4";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         # perl packages by default get devdoc which isn't present

     
···

       38
        
       

     

       39
        
         meta = with lib; {

     

       40
        
           description = "Client for updating dynamic DNS service entries";

     

       41
       -
           homepage    = "https://sourceforge.net/p/ddclient/wiki/Home/";

     

       42
       -
           license     = licenses.gpl2Plus;

     

       43
        
           # Mostly since `iproute` is Linux only.

     

       44
       -
           platforms   = platforms.linux;

     

       0
        
       
     

       45
        
         };

     

       46
        
       }

···

       1
       +
       { lib, fetchFromGitHub, perlPackages, iproute2, perl }:

     

       2
        
       

     

       3
        
       perlPackages.buildPerlPackage rec {

     

       4
        
         pname = "ddclient";

     

       5
        
         version = "3.9.1";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "ddclient";

     

       9
       +
           repo = "ddclient";

     

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

     

       11
       +
           sha256 = "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w";

     

       12
        
         };

     

       13
        
       

     

       14
        
         # perl packages by default get devdoc which isn't present

     
···

       40
        
       

     

       41
        
         meta = with lib; {

     

       42
        
           description = "Client for updating dynamic DNS service entries";

     

       43
       +
           homepage = "https://ddclient.net/";

     

       44
       +
           license = licenses.gpl2Plus;

     

       45
        
           # Mostly since `iproute` is Linux only.

     

       46
       +
           platforms = platforms.linux;

     

       47
       +
           maintainers = with maintainers; [ SuperSandro2000 ];

     

       48
        
         };

     

       49
        
       }

+14 -7

pkgs/tools/networking/subfinder/default.nix

···

       1
       -
       { lib, buildGoPackage, fetchFromGitHub }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
       -
       buildGoPackage rec {

     

       4
        
         pname = "subfinder";

     

       5
       -
         version = "2.3.0";

     

       6
       -
       

     

       7
       -
         goPackagePath = "github.com/projectdiscovery/subfinder";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "projectdiscovery";

     

       11
        
           repo = pname;

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "1vjxi2h4njakyqkfzwwaacy37kqx66j2y3k5l752z9va73gv7xv1";

     

       14
        
         };

     

       15
        
       

     

       16
       -
         goDeps = ./deps.nix;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           description = "Subdomain discovery tool";

···

       1
       +
       { lib

     

       2
       +
       , buildGoModule

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       }:

     

       5
        
       

     

       6
       +
       buildGoModule rec {

     

       7
        
         pname = "subfinder";

     

       8
       +
         version = "2.4.8";

     

       0
        
       
     

       0
        
       
     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "projectdiscovery";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       +
           sha256 = "1g1j3il1a595g7z8blhvyd5l03h6kccl7mzrx51c33jz74cms5kn";

     

       15
        
         };

     

       16
        
       

     

       17
       +
         vendorSha256 = "1jmik0zmfy1n3g4yjkskiqzd28dpywf0hw6adgz2jshlhka58iw0";

     

       18
       +
       

     

       19
       +
         modRoot = "./v2";

     

       20
       +
       

     

       21
       +
         subPackages = [

     

       22
       +
           "cmd/subfinder/"

     

       23
       +
         ];

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
        
           description = "Subdomain discovery tool";

-165

pkgs/tools/networking/subfinder/deps.nix

···

       1
       -
       # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)

     

       2
       -
       [

     

       3
       -
         {

     

       4
       -
           goPackagePath  = "github.com/davecgh/go-spew";

     

       5
       -
           fetch = {

     

       6
       -
             type = "git";

     

       7
       -
             url = "https://github.com/davecgh/go-spew";

     

       8
       -
             rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";

     

       9
       -
             sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";

     

       10
       -
           };

     

       11
       -
         }

     

       12
       -
         {

     

       13
       -
           goPackagePath  = "github.com/json-iterator/go";

     

       14
       -
           fetch = {

     

       15
       -
             type = "git";

     

       16
       -
             url = "https://github.com/json-iterator/go";

     

       17
       -
             rev =  "03217c3e97663914aec3faafde50d081f197a0a2";

     

       18
       -
             sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss";

     

       19
       -
           };

     

       20
       -
         }

     

       21
       -
         {

     

       22
       -
           goPackagePath  = "github.com/konsorten/go-windows-terminal-sequences";

     

       23
       -
           fetch = {

     

       24
       -
             type = "git";

     

       25
       -
             url = "https://github.com/konsorten/go-windows-terminal-sequences";

     

       26
       -
             rev =  "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e";

     

       27
       -
             sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";

     

       28
       -
           };

     

       29
       -
         }

     

       30
       -
         {

     

       31
       -
           goPackagePath  = "github.com/logrusorgru/aurora";

     

       32
       -
           fetch = {

     

       33
       -
             type = "git";

     

       34
       -
             url = "https://github.com/logrusorgru/aurora";

     

       35
       -
             rev =  "21d75270181e0436fee7bd58b991c212cf309068";

     

       36
       -
             sha256 = "0vc9qdl6jzq7vazfqgz628gcgsvir56bdi2bkhl54pi92cz9cw0p";

     

       37
       -
           };

     

       38
       -
         }

     

       39
       -
         {

     

       40
       -
           goPackagePath  = "github.com/m-mizutani/urlscan-go";

     

       41
       -
           fetch = {

     

       42
       -
             type = "git";

     

       43
       -
             url = "https://github.com/m-mizutani/urlscan-go";

     

       44
       -
             rev =  "21d37c8d3d34d514f2ef49db9b59cc94f335e9c3";

     

       45
       -
             sha256 = "1hpymd4ncp78hgpksnw8k27rp0lh832x1pyk3bhj5dm6xmh79g4c";

     

       46
       -
           };

     

       47
       -
         }

     

       48
       -
         {

     

       49
       -
           goPackagePath  = "github.com/miekg/dns";

     

       50
       -
           fetch = {

     

       51
       -
             type = "git";

     

       52
       -
             url = "https://github.com/miekg/dns";

     

       53
       -
             rev =  "1e224ff5dead8366ed6fcdcb832794be42e73f0e";

     

       54
       -
             sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl";

     

       55
       -
           };

     

       56
       -
         }

     

       57
       -
         {

     

       58
       -
           goPackagePath  = "github.com/modern-go/concurrent";

     

       59
       -
           fetch = {

     

       60
       -
             type = "git";

     

       61
       -
             url = "https://github.com/modern-go/concurrent";

     

       62
       -
             rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";

     

       63
       -
             sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";

     

       64
       -
           };

     

       65
       -
         }

     

       66
       -
         {

     

       67
       -
           goPackagePath  = "github.com/modern-go/reflect2";

     

       68
       -
           fetch = {

     

       69
       -
             type = "git";

     

       70
       -
             url = "https://github.com/modern-go/reflect2";

     

       71
       -
             rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";

     

       72
       -
             sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";

     

       73
       -
           };

     

       74
       -
         }

     

       75
       -
         {

     

       76
       -
           goPackagePath  = "github.com/pkg/errors";

     

       77
       -
           fetch = {

     

       78
       -
             type = "git";

     

       79
       -
             url = "https://github.com/pkg/errors";

     

       80
       -
             rev =  "ba968bfe8b2f7e042a574c888954fccecfa385b4";

     

       81
       -
             sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";

     

       82
       -
           };

     

       83
       -
         }

     

       84
       -
         {

     

       85
       -
           goPackagePath  = "github.com/pmezard/go-difflib";

     

       86
       -
           fetch = {

     

       87
       -
             type = "git";

     

       88
       -
             url = "https://github.com/pmezard/go-difflib";

     

       89
       -
             rev =  "792786c7400a136282c1664665ae0a8db921c6c2";

     

       90
       -
             sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";

     

       91
       -
           };

     

       92
       -
         }

     

       93
       -
         {

     

       94
       -
           goPackagePath  = "github.com/rs/xid";

     

       95
       -
           fetch = {

     

       96
       -
             type = "git";

     

       97
       -
             url = "https://github.com/rs/xid";

     

       98
       -
             rev =  "15d26544def341f036c5f8dca987a4cbe575032c";

     

       99
       -
             sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j";

     

       100
       -
           };

     

       101
       -
         }

     

       102
       -
         {

     

       103
       -
           goPackagePath  = "github.com/sirupsen/logrus";

     

       104
       -
           fetch = {

     

       105
       -
             type = "git";

     

       106
       -
             url = "https://github.com/sirupsen/logrus";

     

       107
       -
             rev =  "839c75faf7f98a33d445d181f3018b5c3409a45e";

     

       108
       -
             sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";

     

       109
       -
           };

     

       110
       -
         }

     

       111
       -
         {

     

       112
       -
           goPackagePath  = "github.com/stretchr/testify";

     

       113
       -
           fetch = {

     

       114
       -
             type = "git";

     

       115
       -
             url = "https://github.com/stretchr/testify";

     

       116
       -
             rev =  "221dbe5ed46703ee255b1da0dec05086f5035f62";

     

       117
       -
             sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";

     

       118
       -
           };

     

       119
       -
         }

     

       120
       -
         {

     

       121
       -
           goPackagePath  = "golang.org/x/crypto";

     

       122
       -
           fetch = {

     

       123
       -
             type = "git";

     

       124
       -
             url = "https://go.googlesource.com/crypto";

     

       125
       -
             rev =  "86a70503ff7e82ffc18c7b0de83db35da4791e6a";

     

       126
       -
             sha256 = "0w7ih86lmll9gs2j0z3nmmy148i2yism9z53yp58zwa6d5pjahfn";

     

       127
       -
           };

     

       128
       -
         }

     

       129
       -
         {

     

       130
       -
           goPackagePath  = "golang.org/x/net";

     

       131
       -
           fetch = {

     

       132
       -
             type = "git";

     

       133
       -
             url = "https://go.googlesource.com/net";

     

       134
       -
             rev =  "5ee1b9f4859acd2e99987ef94ec7a58427c53bef";

     

       135
       -
             sha256 = "0jvzqv6phv64rw4pj86x3j9kp5yx9p34fd38r46rb9464h69ba29";

     

       136
       -
           };

     

       137
       -
         }

     

       138
       -
         {

     

       139
       -
           goPackagePath  = "golang.org/x/sys";

     

       140
       -
           fetch = {

     

       141
       -
             type = "git";

     

       142
       -
             url = "https://go.googlesource.com/sys";

     

       143
       -
             rev =  "ce4227a45e2eb77e5c847278dcc6a626742e2945";

     

       144
       -
             sha256 = "1s43wvqfml6ml5ks7iv2bis9d664g77mq86v7mfmjhn56x856g35";

     

       145
       -
           };

     

       146
       -
         }

     

       147
       -
         {

     

       148
       -
           goPackagePath  = "gopkg.in/yaml.v2";

     

       149
       -
           fetch = {

     

       150
       -
             type = "git";

     

       151
       -
             url = "https://github.com/go-yaml/yaml";

     

       152
       -
             rev =  "1f64d6156d11335c3f22d9330b0ad14fc1e789ce";

     

       153
       -
             sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";

     

       154
       -
           };

     

       155
       -
         }

     

       156
       -
         {

     

       157
       -
           goPackagePath  = "gopkg.in/yaml.v3";

     

       158
       -
           fetch = {

     

       159
       -
             type = "git";

     

       160
       -
             url = "https://github.com/go-yaml/yaml";

     

       161
       -
             rev =  "4206685974f28e3178b35fa198a59899aa4dee3a";

     

       162
       -
             sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";

     

       163
       -
           };

     

       164
       -
         }

     

       165
       -
       ]

+1 -1

pkgs/tools/security/metasploit/Gemfile

···

       1
        
       # frozen_string_literal: true

     

       2
        
       source "https://rubygems.org"

     

       3
        
       

     

       4
       -
       gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.46"

···

       1
        
       # frozen_string_literal: true

     

       2
        
       source "https://rubygems.org"

     

       3
        
       

     

       4
       +
       gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.47"

+12 -12

pkgs/tools/security/metasploit/Gemfile.lock

···

       1
        
       GIT

     

       2
        
         remote: https://github.com/rapid7/metasploit-framework

     

       3
       -
         revision: 7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0

     

       4
       -
         ref: refs/tags/6.0.46

     

       5
        
         specs:

     

       6
       -
           metasploit-framework (6.0.46)

     

       7
        
             actionpack (~> 5.2.2)

     

       8
        
             activerecord (~> 5.2.2)

     

       9
        
             activesupport (~> 5.2.2)

     
···

       125
        
           arel-helpers (2.12.0)

     

       126
        
             activerecord (>= 3.1.0, < 7)

     

       127
        
           aws-eventstream (1.1.1)

     

       128
       -
           aws-partitions (1.464.0)

     

       129
       -
           aws-sdk-core (3.114.0)

     

       130
        
             aws-eventstream (~> 1, >= 1.0.2)

     

       131
        
             aws-partitions (~> 1, >= 1.239.0)

     

       132
        
             aws-sigv4 (~> 1.1)

     

       133
        
             jmespath (~> 1.0)

     

       134
       -
           aws-sdk-ec2 (1.239.0)

     

       135
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       136
        
             aws-sigv4 (~> 1.1)

     

       137
       -
           aws-sdk-iam (1.54.0)

     

       138
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       139
        
             aws-sigv4 (~> 1.1)

     

       140
        
           aws-sdk-kms (1.43.0)

     

       141
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       142
        
             aws-sigv4 (~> 1.1)

     

       143
       -
           aws-sdk-s3 (1.95.1)

     

       144
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       145
        
             aws-sdk-kms (~> 1)

     

       146
        
             aws-sigv4 (~> 1.1)

     
···

       149
        
           bcrypt (3.1.16)

     

       150
        
           bcrypt_pbkdf (1.1.0)

     

       151
        
           bindata (2.4.10)

     

       152
       -
           bson (4.12.0)

     

       153
        
           builder (3.2.4)

     

       154
        
           concurrent-ruby (1.0.5)

     

       155
        
           cookiejar (0.3.3)

     
···

       239
        
             webrick

     

       240
        
           metasploit_payloads-mettle (1.0.9)

     

       241
        
           method_source (1.0.0)

     

       242
       -
           mini_portile2 (2.5.1)

     

       243
        
           minitest (5.14.4)

     

       244
        
           mqtt (0.5.0)

     

       245
        
           msgpack (1.4.2)

     
···

       252
        
           network_interface (0.0.2)

     

       253
        
           nexpose (7.3.0)

     

       254
        
           nio4r (2.5.7)

     

       255
       -
           nokogiri (1.11.6)

     

       256
        
             mini_portile2 (~> 2.5.0)

     

       257
        
             racc (~> 1.4)

     

       258
        
           octokit (4.21.0)

     
···

       352
        
           ruby-macho (2.5.1)

     

       353
        
           ruby-rc4 (0.1.5)

     

       354
        
           ruby2_keywords (0.0.4)

     

       355
       -
           ruby_smb (2.0.9)

     

       356
        
             bindata

     

       357
        
             openssl-ccm

     

       358
        
             openssl-cmac

···

       1
        
       GIT

     

       2
        
         remote: https://github.com/rapid7/metasploit-framework

     

       3
       +
         revision: 6416bc1a2867938dd39705a3daef25bc5dedfd16

     

       4
       +
         ref: refs/tags/6.0.47

     

       5
        
         specs:

     

       6
       +
           metasploit-framework (6.0.47)

     

       7
        
             actionpack (~> 5.2.2)

     

       8
        
             activerecord (~> 5.2.2)

     

       9
        
             activesupport (~> 5.2.2)

     
···

       125
        
           arel-helpers (2.12.0)

     

       126
        
             activerecord (>= 3.1.0, < 7)

     

       127
        
           aws-eventstream (1.1.1)

     

       128
       +
           aws-partitions (1.465.0)

     

       129
       +
           aws-sdk-core (3.114.1)

     

       130
        
             aws-eventstream (~> 1, >= 1.0.2)

     

       131
        
             aws-partitions (~> 1, >= 1.239.0)

     

       132
        
             aws-sigv4 (~> 1.1)

     

       133
        
             jmespath (~> 1.0)

     

       134
       +
           aws-sdk-ec2 (1.240.0)

     

       135
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       136
        
             aws-sigv4 (~> 1.1)

     

       137
       +
           aws-sdk-iam (1.55.0)

     

       138
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       139
        
             aws-sigv4 (~> 1.1)

     

       140
        
           aws-sdk-kms (1.43.0)

     

       141
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       142
        
             aws-sigv4 (~> 1.1)

     

       143
       +
           aws-sdk-s3 (1.96.0)

     

       144
        
             aws-sdk-core (~> 3, >= 3.112.0)

     

       145
        
             aws-sdk-kms (~> 1)

     

       146
        
             aws-sigv4 (~> 1.1)

     
···

       149
        
           bcrypt (3.1.16)

     

       150
        
           bcrypt_pbkdf (1.1.0)

     

       151
        
           bindata (2.4.10)

     

       152
       +
           bson (4.12.1)

     

       153
        
           builder (3.2.4)

     

       154
        
           concurrent-ruby (1.0.5)

     

       155
        
           cookiejar (0.3.3)

     
···

       239
        
             webrick

     

       240
        
           metasploit_payloads-mettle (1.0.9)

     

       241
        
           method_source (1.0.0)

     

       242
       +
           mini_portile2 (2.5.3)

     

       243
        
           minitest (5.14.4)

     

       244
        
           mqtt (0.5.0)

     

       245
        
           msgpack (1.4.2)

     
···

       252
        
           network_interface (0.0.2)

     

       253
        
           nexpose (7.3.0)

     

       254
        
           nio4r (2.5.7)

     

       255
       +
           nokogiri (1.11.7)

     

       256
        
             mini_portile2 (~> 2.5.0)

     

       257
        
             racc (~> 1.4)

     

       258
        
           octokit (4.21.0)

     
···

       352
        
           ruby-macho (2.5.1)

     

       353
        
           ruby-rc4 (0.1.5)

     

       354
        
           ruby2_keywords (0.0.4)

     

       355
       +
           ruby_smb (2.0.10)

     

       356
        
             bindata

     

       357
        
             openssl-ccm

     

       358
        
             openssl-cmac

+2 -2

pkgs/tools/security/metasploit/default.nix

···

       8
        
         };

     

       9
        
       in stdenv.mkDerivation rec {

     

       10
        
         pname = "metasploit-framework";

     

       11
       -
         version = "6.0.46";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "rapid7";

     

       15
        
           repo = "metasploit-framework";

     

       16
        
           rev = version;

     

       17
       -
           sha256 = "sha256-NZksDvlcSts1u66yhJ4BpZu5lvzp5eQxV4MscU7wQ/8=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         nativeBuildInputs = [ makeWrapper ];

···

       8
        
         };

     

       9
        
       in stdenv.mkDerivation rec {

     

       10
        
         pname = "metasploit-framework";

     

       11
       +
         version = "6.0.47";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "rapid7";

     

       15
        
           repo = "metasploit-framework";

     

       16
        
           rev = version;

     

       17
       +
           sha256 = "sha256-lK8FtHc4VLvp6bEYAw7cqHgbjQP2RS5+XxtjaVMiVWg=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         nativeBuildInputs = [ makeWrapper ];

+21 -21

pkgs/tools/security/metasploit/gemset.nix

···

       114
        
           platforms = [];

     

       115
        
           source = {

     

       116
        
             remotes = ["https://rubygems.org"];

     

       117
       -
             sha256 = "0mh8kpwwlc0s5k8yjjn6bvrrv0sqxnwpqsjsfljkjszbv1vcwksc";

     

       118
        
             type = "gem";

     

       119
        
           };

     

       120
       -
           version = "1.464.0";

     

       121
        
         };

     

       122
        
         aws-sdk-core = {

     

       123
        
           groups = ["default"];

     

       124
        
           platforms = [];

     

       125
        
           source = {

     

       126
        
             remotes = ["https://rubygems.org"];

     

       127
       -
             sha256 = "09asbdcg96l165kq4hrks0hsk4hwr16h1qx22az4m7ld0ylvz3jc";

     

       128
        
             type = "gem";

     

       129
        
           };

     

       130
       -
           version = "3.114.0";

     

       131
        
         };

     

       132
        
         aws-sdk-ec2 = {

     

       133
        
           groups = ["default"];

     

       134
        
           platforms = [];

     

       135
        
           source = {

     

       136
        
             remotes = ["https://rubygems.org"];

     

       137
       -
             sha256 = "0995qsi717fdvv2wkpbm0iaz666q370q1a37vn3bn6g66v20m6cy";

     

       138
        
             type = "gem";

     

       139
        
           };

     

       140
       -
           version = "1.239.0";

     

       141
        
         };

     

       142
        
         aws-sdk-iam = {

     

       143
        
           groups = ["default"];

     

       144
        
           platforms = [];

     

       145
        
           source = {

     

       146
        
             remotes = ["https://rubygems.org"];

     

       147
       -
             sha256 = "0mfs2vsiml42xskgslp4iissna5fmjacpvi6sbmlr1b5jh390f3m";

     

       148
        
             type = "gem";

     

       149
        
           };

     

       150
       -
           version = "1.54.0";

     

       151
        
         };

     

       152
        
         aws-sdk-kms = {

     

       153
        
           groups = ["default"];

     
···

       164
        
           platforms = [];

     

       165
        
           source = {

     

       166
        
             remotes = ["https://rubygems.org"];

     

       167
       -
             sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv";

     

       168
        
             type = "gem";

     

       169
        
           };

     

       170
       -
           version = "1.95.1";

     

       171
        
         };

     

       172
        
         aws-sigv4 = {

     

       173
        
           groups = ["default"];

     
···

       214
        
           platforms = [];

     

       215
        
           source = {

     

       216
        
             remotes = ["https://rubygems.org"];

     

       217
       -
             sha256 = "0gny4n34gwfc6x04x7vli5my6cdl90n4i0wsxm758q81hfmkqxd7";

     

       218
        
             type = "gem";

     

       219
        
           };

     

       220
       -
           version = "4.12.0";

     

       221
        
         };

     

       222
        
         builder = {

     

       223
        
           groups = ["default"];

     
···

       574
        
           platforms = [];

     

       575
        
           source = {

     

       576
        
             fetchSubmodules = false;

     

       577
       -
             rev = "7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0";

     

       578
       -
             sha256 = "1zs3y1772b43awqy9rg9zjbbk6x506g89cmfpcsxnjjwz472r69m";

     

       579
        
             type = "git";

     

       580
        
             url = "https://github.com/rapid7/metasploit-framework";

     

       581
        
           };

     

       582
       -
           version = "6.0.46";

     

       583
        
         };

     

       584
        
         metasploit-model = {

     

       585
        
           groups = ["default"];

     
···

       636
        
           platforms = [];

     

       637
        
           source = {

     

       638
        
             remotes = ["https://rubygems.org"];

     

       639
       -
             sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";

     

       640
        
             type = "gem";

     

       641
        
           };

     

       642
       -
           version = "2.5.1";

     

       643
        
         };

     

       644
        
         minitest = {

     

       645
        
           groups = ["default"];

     
···

       756
        
           platforms = [];

     

       757
        
           source = {

     

       758
        
             remotes = ["https://rubygems.org"];

     

       759
       -
             sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";

     

       760
        
             type = "gem";

     

       761
        
           };

     

       762
       -
           version = "1.11.6";

     

       763
        
         };

     

       764
        
         octokit = {

     

       765
        
           groups = ["default"];

     
···

       1226
        
           platforms = [];

     

       1227
        
           source = {

     

       1228
        
             remotes = ["https://rubygems.org"];

     

       1229
       -
             sha256 = "0nvvy2kq26r313ybj5sjr9mpwc1sy535kmmbi8r80kvqfkmd43nv";

     

       1230
        
             type = "gem";

     

       1231
        
           };

     

       1232
       -
           version = "2.0.9";

     

       1233
        
         };

     

       1234
        
         rubyntlm = {

     

       1235
        
           groups = ["default"];

···

       114
        
           platforms = [];

     

       115
        
           source = {

     

       116
        
             remotes = ["https://rubygems.org"];

     

       117
       +
             sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi";

     

       118
        
             type = "gem";

     

       119
        
           };

     

       120
       +
           version = "1.465.0";

     

       121
        
         };

     

       122
        
         aws-sdk-core = {

     

       123
        
           groups = ["default"];

     

       124
        
           platforms = [];

     

       125
        
           source = {

     

       126
        
             remotes = ["https://rubygems.org"];

     

       127
       +
             sha256 = "09ksnsj7jqb339fy4nh6v8zn9gy77vbyjpsiv33r35q82ivi32z2";

     

       128
        
             type = "gem";

     

       129
        
           };

     

       130
       +
           version = "3.114.1";

     

       131
        
         };

     

       132
        
         aws-sdk-ec2 = {

     

       133
        
           groups = ["default"];

     

       134
        
           platforms = [];

     

       135
        
           source = {

     

       136
        
             remotes = ["https://rubygems.org"];

     

       137
       +
             sha256 = "0wqrvs49nzr2n9ilbjz61ac61d4d8wwpmzfaawhhq7l4hmwm4pdr";

     

       138
        
             type = "gem";

     

       139
        
           };

     

       140
       +
           version = "1.240.0";

     

       141
        
         };

     

       142
        
         aws-sdk-iam = {

     

       143
        
           groups = ["default"];

     

       144
        
           platforms = [];

     

       145
        
           source = {

     

       146
        
             remotes = ["https://rubygems.org"];

     

       147
       +
             sha256 = "03vs5wf96qpjl309vnrnr4d8hy4l8bvnflgc806bm9n130cyvs9m";

     

       148
        
             type = "gem";

     

       149
        
           };

     

       150
       +
           version = "1.55.0";

     

       151
        
         };

     

       152
        
         aws-sdk-kms = {

     

       153
        
           groups = ["default"];

     
···

       164
        
           platforms = [];

     

       165
        
           source = {

     

       166
        
             remotes = ["https://rubygems.org"];

     

       167
       +
             sha256 = "1g46v19n6pxa60x7fih2y9zc18q23kdjkb1p2qr33zmi6cz76cc4";

     

       168
        
             type = "gem";

     

       169
        
           };

     

       170
       +
           version = "1.96.0";

     

       171
        
         };

     

       172
        
         aws-sigv4 = {

     

       173
        
           groups = ["default"];

     
···

       214
        
           platforms = [];

     

       215
        
           source = {

     

       216
        
             remotes = ["https://rubygems.org"];

     

       217
       +
             sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc";

     

       218
        
             type = "gem";

     

       219
        
           };

     

       220
       +
           version = "4.12.1";

     

       221
        
         };

     

       222
        
         builder = {

     

       223
        
           groups = ["default"];

     
···

       574
        
           platforms = [];

     

       575
        
           source = {

     

       576
        
             fetchSubmodules = false;

     

       577
       +
             rev = "6416bc1a2867938dd39705a3daef25bc5dedfd16";

     

       578
       +
             sha256 = "0s2m499njqqvbxz2wign0f6iny58vh70665ix7lvnm1qfys0bbwl";

     

       579
        
             type = "git";

     

       580
        
             url = "https://github.com/rapid7/metasploit-framework";

     

       581
        
           };

     

       582
       +
           version = "6.0.47";

     

       583
        
         };

     

       584
        
         metasploit-model = {

     

       585
        
           groups = ["default"];

     
···

       636
        
           platforms = [];

     

       637
        
           source = {

     

       638
        
             remotes = ["https://rubygems.org"];

     

       639
       +
             sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";

     

       640
        
             type = "gem";

     

       641
        
           };

     

       642
       +
           version = "2.5.3";

     

       643
        
         };

     

       644
        
         minitest = {

     

       645
        
           groups = ["default"];

     
···

       756
        
           platforms = [];

     

       757
        
           source = {

     

       758
        
             remotes = ["https://rubygems.org"];

     

       759
       +
             sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";

     

       760
        
             type = "gem";

     

       761
        
           };

     

       762
       +
           version = "1.11.7";

     

       763
        
         };

     

       764
        
         octokit = {

     

       765
        
           groups = ["default"];

     
···

       1226
        
           platforms = [];

     

       1227
        
           source = {

     

       1228
        
             remotes = ["https://rubygems.org"];

     

       1229
       +
             sha256 = "1h8p6ksfr9xhpj9p38b4mjj76zm4d0dg06hhp00ii9hh7vy6mryd";

     

       1230
        
             type = "gem";

     

       1231
        
           };

     

       1232
       +
           version = "2.0.10";

     

       1233
        
         };

     

       1234
        
         rubyntlm = {

     

       1235
        
           groups = ["default"];

+4 -2

pkgs/tools/security/oath-toolkit/default.nix

···

       7
        
       

     

       8
        
       in stdenv.mkDerivation rec {

     

       9
        
         pname = "oath-toolkit";

     

       10
       -
         version = "2.6.6";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";

     

       14
       -
           sha256 = "0v4lrgip08b8xlivsfn3mwql3nv8hmcpzrn6pi3xp88vqwav6s7x";

     

       15
        
         };

     

       16
        
       

     

       17
        
         buildInputs = [ securityDependency ];

     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
        
         meta = with lib; {

     

       20
        
           description = "Components for building one-time password authentication systems";

···

       7
        
       

     

       8
        
       in stdenv.mkDerivation rec {

     

       9
        
         pname = "oath-toolkit";

     

       10
       +
         version = "2.6.7";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";

     

       14
       +
           sha256 = "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n";

     

       15
        
         };

     

       16
        
       

     

       17
        
         buildInputs = [ securityDependency ];

     

       18
       +
       

     

       19
       +
         passthru.updateScript = ./update.sh;

     

       20
        
       

     

       21
        
         meta = with lib; {

     

       22
        
           description = "Components for building one-time password authentication systems";

+50

pkgs/tools/security/oath-toolkit/update.sh

···

       1
       +
       #!/usr/bin/env nix-shell

     

       2
       +
       #!nix-shell -i bash -p curl git gnugrep nix

     

       3
       +
       

     

       4
       +
       set -euo pipefail

     

       5
       +
       

     

       6
       +
       nixfile='default.nix'

     

       7
       +
       release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'

     

       8
       +
       attr='oathToolkit'

     

       9
       +
       command='oathtool --version'

     

       10
       +
       

     

       11
       +
       color() {

     

       12
       +
           printf '%s: \033[%sm%s\033[39m\n' "$0" "$1" "$2" >&2 || true

     

       13
       +
       }

     

       14
       +
       

     

       15
       +
       color 32 "downloading $release_url..."

     

       16
       +
       if ! release_page=$(curl -Lf "$release_url"); then

     

       17
       +
           color 31 "cannot download release page"

     

       18
       +
           exit 1

     

       19
       +
       fi

     

       20
       +
       

     

       21
       +
       tarball_name=$(printf '%s\n' "$release_page" \

     

       22
       +
           | grep -Po '(?<=href=").*?\.tar\.gz(?=")' \

     

       23
       +
           | sort -n | tail -n1)

     

       24
       +
       tarball_version="${tarball_name%.tar.*}"

     

       25
       +
       tarball_version="${tarball_version##*-}"

     

       26
       +
       tarball_url="mirror://savannah${release_url#https://*/releases}$tarball_name"

     

       27
       +
       

     

       28
       +
       color 32 "nix-prefetch-url $tarball_url..."

     

       29
       +
       if ! tarball_sha256=$(nix-prefetch-url --type sha256 "$tarball_url"); then

     

       30
       +
           color 31 "cannot prefetch $tarball_url"

     

       31
       +
           exit 1

     

       32
       +
       fi

     

       33
       +
       

     

       34
       +
       old_version=$(grep -Pom1 '(?<=version = ").*?(?=";)' "$nixfile")

     

       35
       +
       

     

       36
       +
       version=$(printf 'version = "%s";\n' "$tarball_version")

     

       37
       +
       sha256=$(printf 'sha256 = "%s";\n' "$tarball_sha256")

     

       38
       +
       sed -e "s,version = .*,$version," -e "s,sha256 = .*,$sha256," -i "$nixfile"

     

       39
       +
       

     

       40
       +
       if git diff --exit-code "$nixfile" > /dev/stderr; then

     

       41
       +
           printf '\n' >&2 || true

     

       42
       +
           color 32 "$tarball_version is up to date"

     

       43
       +
       else

     

       44
       +
           color 32 "running '$command' with nix-shell..."

     

       45
       +
           nix-shell -p "callPackage ./$nixfile {}" --run "$command"

     

       46
       +
           msg="$attr: $old_version -> $tarball_version"

     

       47
       +
           printf '\n' >&2 || true

     

       48
       +
           color 31 "$msg"

     

       49
       +
           git commit -m "$msg" "$nixfile"

     

       50
       +
       fi

+6 -3

pkgs/tools/security/qdigidoc/default.nix

···

       3
        
       

     

       4
        
       mkDerivation rec {

     

       5
        
         pname = "qdigidoc";

     

       6
       -
         version = "4.2.3";

     

       7
        
       

     

       8
        
         src = fetchgit {

     

       9
        
           url = "https://github.com/open-eid/DigiDoc4-Client";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "1hj49vvg8vrayr9kpz73fafa7k298hmiamkyd8c3ipy6s51xh6q4";

     

       12
        
           fetchSubmodules = true;

     

       13
        
         };

     

       14
        
       

     

       15
        
         tsl = fetchurl {

     

       16
        
           url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";

     

       17
       -
           sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14";

     

       18
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];

     

       21

···

       3
        
       

     

       4
        
       mkDerivation rec {

     

       5
        
         pname = "qdigidoc";

     

       6
       +
         version = "4.2.8";

     

       7
        
       

     

       8
        
         src = fetchgit {

     

       9
        
           url = "https://github.com/open-eid/DigiDoc4-Client";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm";

     

       12
        
           fetchSubmodules = true;

     

       13
        
         };

     

       14
        
       

     

       15
        
         tsl = fetchurl {

     

       16
        
           url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";

     

       17
       +
           sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";

     

       18
        
         };

     

       19
       +
       

     

       20
       +
         # Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914)

     

       21
       +
         patches = [ ./qt5.15.patch ];

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];

     

       24

+39

pkgs/tools/security/qdigidoc/qt5.15.patch

···

       1
       +
       From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Dmitri Smirnov <dmitri@smirnov.ee>

     

       3
       +
       Date: Mon, 8 Mar 2021 14:15:27 +0100

     

       4
       +
       Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?=

     

       5
       +
        =?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?=

     

       6
       +
       MIME-Version: 1.0

     

       7
       +
       Content-Type: text/plain; charset=UTF-8

     

       8
       +
       Content-Transfer-Encoding: 8bit

     

       9
       +
       

     

       10
       +
       Signed-off-by: Dmitri Smirnov <dmitri@smirnov.ee>

     

       11
       +
       ---

     

       12
       +
        client/widgets/CheckBox.cpp   | 1 +

     

       13
       +
        client/widgets/MainAction.cpp | 1 +

     

       14
       +
        2 files changed, 2 insertions(+)

     

       15
       +
       

     

       16
       +
       diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp

     

       17
       +
       index a03b56e5d..725d585b7 100644

     

       18
       +
       --- a/client/widgets/CheckBox.cpp

     

       19
       +
       +++ b/client/widgets/CheckBox.cpp

     

       20
       +
       @@ -22,6 +22,7 @@

     

       21
       +
        #include <QBrush>

     

       22
       +
        #include <QPaintEvent>

     

       23
       +
        #include <QPainter>

     

       24
       +
       +#include <QPainterPath>

     

       25
       +
        #include <QStyleOptionButton>

     

       26
       +
        

     

       27
       +
        CheckBox::CheckBox(QWidget *parent)

     

       28
       +
       diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp

     

       29
       +
       index 4cf4bb1cf..a46c193e3 100644

     

       30
       +
       --- a/client/widgets/MainAction.cpp

     

       31
       +
       +++ b/client/widgets/MainAction.cpp

     

       32
       +
       @@ -24,6 +24,7 @@

     

       33
       +
        

     

       34
       +
        #include <QtCore/QSettings>

     

       35
       +
        #include <QtGui/QPainter>

     

       36
       +
       +#include <QtGui/QPainterPath>

     

       37
       +
        #include <QtGui/QPaintEvent>

     

       38
       +
        

     

       39
       +
        using namespace ria::qdigidoc4;

+27

pkgs/top-level/all-packages.nix

···

       241
        
       

     

       242
        
         chrysalis = callPackage ../applications/misc/chrysalis { };

     

       243
        
       

     

       0
        
       
     

       0
        
       
     

       244
        
         clj-kondo = callPackage ../development/tools/clj-kondo { };

     

       245
        
       

     

       246
        
         cmark = callPackage ../development/libraries/cmark { };

     
···

       1417
        
       

     

       1418
        
         dfmt = callPackage ../tools/text/dfmt { };

     

       1419
        
       

     

       0
        
       
     

       0
        
       
     

       1420
        
         diskonaut = callPackage ../tools/misc/diskonaut { };

     

       1421
        
       

     

       1422
        
         diskus = callPackage ../tools/misc/diskus {

     
···

       1899
        
         bluemix-cli = callPackage ../tools/admin/bluemix-cli { };

     

       1900
        
       

     

       1901
        
         blur-effect = callPackage ../tools/graphics/blur-effect { };

     

       0
        
       
     

       0
        
       
     

       1902
        
       

     

       1903
        
         butane = callPackage ../development/tools/butane { };

     

       1904
        
       

     
···

       7260
        
       

     

       7261
        
         nnn = callPackage ../applications/misc/nnn { };

     

       7262
        
       

     

       0
        
       
     

       0
        
       
     

       7263
        
         shfm = callPackage ../applications/misc/shfm { };

     

       7264
        
       

     

       7265
        
         noise-repellent = callPackage ../applications/audio/noise-repellent { };

     
···

       8500
        
       

     

       8501
        
         sdl-jstest = callPackage ../tools/misc/sdl-jstest { };

     

       8502
        
       

     

       0
        
       
     

       0
        
       
     

       8503
        
         skim = callPackage ../tools/misc/skim { };

     

       8504
        
       

     

       8505
        
         seaweedfs = callPackage ../applications/networking/seaweedfs { };

     
···

       9381
        
         untex = callPackage ../tools/text/untex { };

     

       9382
        
       

     

       9383
        
         untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };

     

       0
        
       
     

       0
        
       
     

       9384
        
       

     

       9385
        
         up = callPackage ../tools/misc/up { };

     

       9386
        
       

     
···

       11651
        
         opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };

     

       11652
        
       

     

       11653
        
         open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { };

     

       0
        
       
     

       0
        
       
     

       11654
        
       

     

       11655
        
         pforth = callPackage ../development/compilers/pforth {};

     

       11656
        
       

     
···

       14983
        
       

     

       14984
        
         ghcid = haskellPackages.ghcid.bin;

     

       14985
        
       

     

       0
        
       
     

       0
        
       
     

       14986
        
         icon-lang = callPackage ../development/interpreters/icon-lang { };

     

       14987
        
       

     

       14988
        
         libgit2 = callPackage ../development/libraries/git2 {

     
···

       22919
        
       

     

       22920
        
         bookworm = callPackage ../applications/office/bookworm { };

     

       22921
        
       

     

       0
        
       
     

       0
        
       
     

       22922
        
         CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { };

     

       22923
        
       

     

       22924
        
         chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});

     
···

       25327
        
           simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};

     

       25328
        
           sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};

     

       25329
        
           thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };

     

       0
        
       
     

       25330
        
         };

     

       25331
        
       

     

       25332
        
         mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };

     
···

       25526
        
         smtube = libsForQt514.callPackage ../applications/video/smtube {};

     

       25527
        
       

     

       25528
        
         softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {};

     

       0
        
       
     

       0
        
       
     

       25529
        
       

     

       25530
        
         spacegun = callPackage ../applications/networking/cluster/spacegun {};

     

       25531
        
       

     
···

       27969
        
       

     

       27970
        
         btcpayserver = callPackage ../applications/blockchains/btcpayserver { };

     

       27971
        
       

     

       0
        
       
     

       0
        
       
     

       27972
        
         cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };

     

       27973
        
       

     

       27974
        
         dashpay = callPackage ../applications/blockchains/dashpay.nix { };

     
···

       30224
        
       

     

       30225
        
         autotiling = python3Packages.callPackage ../misc/autotiling { };

     

       30226
        
       

     

       0
        
       
     

       0
        
       
     

       30227
        
         beep = callPackage ../misc/beep { };

     

       30228
        
       

     

       30229
        
         bees = callPackage ../tools/filesystems/bees { };

     
···

       31744
        
         jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };

     

       31745
        
       

     

       31746
        
         zenstates = callPackage ../os-specific/linux/zenstates {};

     

       0
        
       
     

       0
        
       
     

       31747
        
       

     

       31748
        
         vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {};

     

       31749

···

       241
        
       

     

       242
        
         chrysalis = callPackage ../applications/misc/chrysalis { };

     

       243
        
       

     

       244
       +
         clifm = callPackage ../applications/misc/clifm { };

     

       245
       +
       

     

       246
        
         clj-kondo = callPackage ../development/tools/clj-kondo { };

     

       247
        
       

     

       248
        
         cmark = callPackage ../development/libraries/cmark { };

     
···

       1419
        
       

     

       1420
        
         dfmt = callPackage ../tools/text/dfmt { };

     

       1421
        
       

     

       1422
       +
         diopser = callPackage ../applications/audio/diopser { };

     

       1423
       +
       

     

       1424
        
         diskonaut = callPackage ../tools/misc/diskonaut { };

     

       1425
        
       

     

       1426
        
         diskus = callPackage ../tools/misc/diskus {

     
···

       1903
        
         bluemix-cli = callPackage ../tools/admin/bluemix-cli { };

     

       1904
        
       

     

       1905
        
         blur-effect = callPackage ../tools/graphics/blur-effect { };

     

       1906
       +
       

     

       1907
       +
         bootiso = callPackage ../tools/cd-dvd/bootiso { };

     

       1908
        
       

     

       1909
        
         butane = callPackage ../development/tools/butane { };

     

       1910
        
       

     
···

       7266
        
       

     

       7267
        
         nnn = callPackage ../applications/misc/nnn { };

     

       7268
        
       

     

       7269
       +
         sfm = callPackage ../applications/misc/sfm { };

     

       7270
       +
       

     

       7271
        
         shfm = callPackage ../applications/misc/shfm { };

     

       7272
        
       

     

       7273
        
         noise-repellent = callPackage ../applications/audio/noise-repellent { };

     
···

       8508
        
       

     

       8509
        
         sdl-jstest = callPackage ../tools/misc/sdl-jstest { };

     

       8510
        
       

     

       8511
       +
         senpai = callPackage ../applications/networking/irc/senpai { };

     

       8512
       +
       

     

       8513
        
         skim = callPackage ../tools/misc/skim { };

     

       8514
        
       

     

       8515
        
         seaweedfs = callPackage ../applications/networking/seaweedfs { };

     
···

       9391
        
         untex = callPackage ../tools/text/untex { };

     

       9392
        
       

     

       9393
        
         untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };

     

       9394
       +
       

     

       9395
       +
         unvanquished = callPackage ../games/unvanquished { };

     

       9396
        
       

     

       9397
        
         up = callPackage ../tools/misc/up { };

     

       9398
        
       

     
···

       11663
        
         opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };

     

       11664
        
       

     

       11665
        
         open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { };

     

       11666
       +
       

     

       11667
       +
         passerine = callPackage ../development/compilers/passerine { };

     

       11668
        
       

     

       11669
        
         pforth = callPackage ../development/compilers/pforth {};

     

       11670
        
       

     
···

       14997
        
       

     

       14998
        
         ghcid = haskellPackages.ghcid.bin;

     

       14999
        
       

     

       15000
       +
         graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };

     

       15001
       +
       

     

       15002
        
         icon-lang = callPackage ../development/interpreters/icon-lang { };

     

       15003
        
       

     

       15004
        
         libgit2 = callPackage ../development/libraries/git2 {

     
···

       22935
        
       

     

       22936
        
         bookworm = callPackage ../applications/office/bookworm { };

     

       22937
        
       

     

       22938
       +
         boops = callPackage ../applications/audio/boops { };

     

       22939
       +
       

     

       22940
        
         CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { };

     

       22941
        
       

     

       22942
        
         chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});

     
···

       25345
        
           simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};

     

       25346
        
           sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};

     

       25347
        
           thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };

     

       25348
       +
           youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { };

     

       25349
        
         };

     

       25350
        
       

     

       25351
        
         mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };

     
···

       25545
        
         smtube = libsForQt514.callPackage ../applications/video/smtube {};

     

       25546
        
       

     

       25547
        
         softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {};

     

       25548
       +
       

     

       25549
       +
         songrec = callPackage ../applications/audio/songrec {};

     

       25550
        
       

     

       25551
        
         spacegun = callPackage ../applications/networking/cluster/spacegun {};

     

       25552
        
       

     
···

       27990
        
       

     

       27991
        
         btcpayserver = callPackage ../applications/blockchains/btcpayserver { };

     

       27992
        
       

     

       27993
       +
         charge-lnd = callPackage ../applications/blockchains/charge-lnd { };

     

       27994
       +
       

     

       27995
        
         cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };

     

       27996
        
       

     

       27997
        
         dashpay = callPackage ../applications/blockchains/dashpay.nix { };

     
···

       30247
        
       

     

       30248
        
         autotiling = python3Packages.callPackage ../misc/autotiling { };

     

       30249
        
       

     

       30250
       +
         avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { };

     

       30251
       +
       

     

       30252
        
         beep = callPackage ../misc/beep { };

     

       30253
        
       

     

       30254
        
         bees = callPackage ../tools/filesystems/bees { };

     
···

       31769
        
         jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };

     

       31770
        
       

     

       31771
        
         zenstates = callPackage ../os-specific/linux/zenstates {};

     

       31772
       +
       

     

       31773
       +
         ryzenadj = callPackage ../os-specific/linux/ryzenadj {};

     

       31774
        
       

     

       31775
        
         vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {};

     

       31776

+9 -2

pkgs/top-level/dotnet-packages.nix

···

       33
        
       

     

       34
        
         Fantomas = fetchNuGet {

     

       35
        
           baseName = "Fantomas";

     

       36
       -
           version = "1.6.0";

     

       37
       -
           sha256 = "1b9rd3i76b5xzv0j62dvfr1ksdwvb59vxw6jhzpi018axjn6757q";

     

       38
        
           outputFiles = [ "lib/*" ];

     

       39
        
           dllFiles = [ "Fantomas*.dll" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
         };

     

       41
        
       

     

       42
        
         FSharpCompilerCodeDom = fetchNuGet {

···

       33
        
       

     

       34
        
         Fantomas = fetchNuGet {

     

       35
        
           baseName = "Fantomas";

     

       36
       +
           version = "4.4.0";

     

       37
       +
           sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o=";

     

       38
        
           outputFiles = [ "lib/*" ];

     

       39
        
           dllFiles = [ "Fantomas*.dll" ];

     

       40
       +
       

     

       41
       +
           meta = with lib; {

     

       42
       +
             description = "FSharp source code formatter";

     

       43
       +
             homepage = "https://github.com/fsprojects/fantomas";

     

       44
       +
             license = licenses.asl20;

     

       45
       +
             maintainers = [ maintainers.ratsclub ];

     

       46
       +
           };

     

       47
        
         };

     

       48
        
       

     

       49
        
         FSharpCompilerCodeDom = fetchNuGet {

pkgs/top-level/python-packages.nix

···

       2195
        
       

     

       2196
        
         elementpath = callPackage ../development/python-modules/elementpath { };

     

       2197
        
       

     

       0
        
       
     

       0
        
       
     

       2198
        
         eliot = callPackage ../development/python-modules/eliot { };

     

       2199
        
       

     

       2200
        
         elmax = callPackage ../development/python-modules/elmax { };

···

       2195
        
       

     

       2196
        
         elementpath = callPackage ../development/python-modules/elementpath { };

     

       2197
        
       

     

       2198
       +
         elevate = callPackage ../development/python-modules/elevate { };

     

       2199
       +
       

     

       2200
        
         eliot = callPackage ../development/python-modules/eliot { };

     

       2201
        
       

     

       2202
        
         elmax = callPackage ../development/python-modules/elmax { };