commit 09e494f4c296b29755fb8639e3f751f6aa706a45 · pyrox.dev/nixpkgs

+12

maintainers/maintainer-list.nix

···

       10587
       10587
        
           githubId = 251028;

     

       10588
       10588
        
           name = "Shell Turner";

     

       10589
       10589
        
         };

     

       10590
       10590
       +
         shikanime = {

     

       10591
       10591
       +
           name = "William Phetsinorath";

     

       10592
       10592
       +
           email = "deva.shikanime@protonmail.com";

     

       10593
       10593
       +
           github = "shikanime";

     

       10594
       10594
       +
           githubId = 22115108;

     

       10595
       10595
       +
         };

     

       10590
       10596
        
         shlevy = {

     

       10591
       10597
        
           email = "shea@shealevy.com";

     

       10592
       10598
        
           github = "shlevy";

     
···

       13243
       13249
        
           email = "sei40kr@gmail.com";

     

       13244
       13250
        
           github = "sei40kr";

     

       13245
       13251
        
           githubId = 11665236;

     

       13252
       13252
       +
         };

     

       13253
       13253
       +
         vdot0x23 = {

     

       13254
       13254
       +
           name = "Victor Büttner";

     

       13255
       13255
       +
           email = "nix.victor@0x23.dk";

     

       13256
       13256
       +
           github = "vdot0x23";

     

       13257
       13257
       +
           githubId = 40716069;

     

       13246
       13258
        
         };

     

       13247
       13259
        
       }

+2

nixos/modules/programs/sway.nix

···

       123
       123
        
           ];

     

       124
       124
        
           environment = {

     

       125
       125
        
             systemPackages = [ swayPackage ] ++ cfg.extraPackages;

     

       126
       126
       +
             # Needed for the default wallpaper:

     

       127
       127
       +
             pathsToLink = [ "/share/backgrounds/sway" ];

     

       126
       128
        
             etc = {

     

       127
       129
        
               "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";

     

       128
       130
        
               "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''

+13 -4

nixos/modules/services/databases/clickhouse.nix

···

       13
       13
        
       

     

       14
       14
        
             enable = mkEnableOption "ClickHouse database server";

     

       15
       15
        
       

     

       16
       16
       +
             package = mkOption {

     

       17
       17
       +
               type = types.package;

     

       18
       18
       +
               default = pkgs.clickhouse;

     

       19
       19
       +
               defaultText = "pkgs.clickhouse";

     

       20
       20
       +
               description = ''

     

       21
       21
       +
                 ClickHouse package to use.

     

       22
       22
       +
               '';

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       16
       25
        
           };

     

       17
       26
        
       

     

       18
       27
        
         };

     
···

       45
       54
        
               AmbientCapabilities = "CAP_SYS_NICE";

     

       46
       55
        
               StateDirectory = "clickhouse";

     

       47
       56
        
               LogsDirectory = "clickhouse";

     

       48
       48
       -
               ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml";

     

       57
       57
       +
               ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=${cfg.package}/etc/clickhouse-server/config.xml";

     

       49
       58
        
             };

     

       50
       59
        
           };

     

       51
       60
        
       

     

       52
       61
        
           environment.etc = {

     

       53
       62
        
             "clickhouse-server/config.xml" = {

     

       54
       54
       -
               source = "${pkgs.clickhouse}/etc/clickhouse-server/config.xml";

     

       63
       63
       +
               source = "${cfg.package}/etc/clickhouse-server/config.xml";

     

       55
       64
        
             };

     

       56
       65
        
       

     

       57
       66
        
             "clickhouse-server/users.xml" = {

     

       58
       58
       -
               source = "${pkgs.clickhouse}/etc/clickhouse-server/users.xml";

     

       67
       67
       +
               source = "${cfg.package}/etc/clickhouse-server/users.xml";

     

       59
       68
        
             };

     

       60
       69
        
           };

     

       61
       70
        
       

     

       62
       62
       -
           environment.systemPackages = [ pkgs.clickhouse ];

     

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

     

       63
       72
        
       

     

       64
       73
        
           # startup requires a `/etc/localtime` which only if exists if `time.timeZone != null`

     

       65
       74
        
           time.timeZone = mkDefault "UTC";

+2 -1

nixos/modules/services/mail/dovecot.nix

···

       103
       103
        
       

     

       104
       104
        
               plugin {

     

       105
       105
        
                 quota_rule = *:storage=${cfg.quotaGlobalPerUser}

     

       106
       106
       -
                 quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working

     

       106
       106
       +
                 quota = count:User quota # per virtual mail user quota

     

       107
       107
        
                 quota_status_success = DUNNO

     

       108
       108
        
                 quota_status_nouser = DUNNO

     

       109
       109
        
                 quota_status_overquota = "552 5.2.2 Mailbox is full"

     

       110
       110
        
                 quota_grace = 10%%

     

       111
       111
       +
                 quota_vsizes = yes

     

       111
       112
        
               }

     

       112
       113
        
             ''

     

       113
       114
        
           )

+16 -3

nixos/modules/services/networking/nomad.nix

···

       51
       51
        
       

     

       52
       52
        
             extraSettingsPaths = mkOption {

     

       53
       53
        
               type = types.listOf types.path;

     

       54
       54
       -
               default = [];

     

       54
       54
       +
               default = [ ];

     

       55
       55
        
               description = ''

     

       56
       56
        
                 Additional settings paths used to configure nomad. These can be files or directories.

     

       57
       57
        
               '';

     
···

       60
       60
        
               '';

     

       61
       61
        
             };

     

       62
       62
        
       

     

       63
       63
       +
             extraSettingsPlugins = mkOption {

     

       64
       64
       +
               type = types.listOf (types.either types.package types.path);

     

       65
       65
       +
               default = [ ];

     

       66
       66
       +
               description = ''

     

       67
       67
       +
                 Additional plugins dir used to configure nomad.

     

       68
       68
       +
               '';

     

       69
       69
       +
               example = literalExpression ''

     

       70
       70
       +
                 [ "<pluginDir>" "pkgs.<plugins-name>"]

     

       71
       71
       +
               '';

     

       72
       72
       +
             };

     

       73
       73
       +
       

     

       74
       74
       +
       

     

       63
       75
        
             settings = mkOption {

     

       64
       76
        
               type = format.type;

     

       65
       65
       -
               default = {};

     

       77
       77
       +
               default = { };

     

       66
       78
        
               description = ''

     

       67
       79
        
                 Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link>

     

       68
       80
        
                 for supported values.

     
···

       128
       140
        
                 DynamicUser = cfg.dropPrivileges;

     

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

     

       130
       142
        
                 ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" +

     

       131
       131
       -
                   concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths;

     

       143
       143
       +
                   concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths +

     

       144
       144
       +
                   concatMapStrings (path: " -plugin-dir=${path}/bin") cfg.extraSettingsPlugins;

     

       132
       145
        
                 KillMode = "process";

     

       133
       146
        
                 KillSignal = "SIGINT";

     

       134
       147
        
                 LimitNOFILE = 65536;

+8 -1

nixos/modules/services/networking/sabnzbd.nix

···

       17
       17
        
           services.sabnzbd = {

     

       18
       18
        
             enable = mkEnableOption "the sabnzbd server";

     

       19
       19
        
       

     

       20
       20
       +
             package = mkOption {

     

       21
       21
       +
               type = types.package;

     

       22
       22
       +
               default = pkgs.sabnzbd;

     

       23
       23
       +
               defaultText = "pkgs.sabnzbd";

     

       24
       24
       +
               description = "The sabnzbd executable package run by the service.";

     

       25
       25
       +
             };

     

       26
       26
       +
       

     

       20
       27
        
             configFile = mkOption {

     

       21
       28
        
               type = types.path;

     

       22
       29
        
               default = "/var/lib/sabnzbd/sabnzbd.ini";

     
···

       63
       70
        
                 GuessMainPID = "no";

     

       64
       71
        
                 User = "${cfg.user}";

     

       65
       72
        
                 Group = "${cfg.group}";

     

       66
       66
       -
                 ExecStart = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";

     

       73
       73
       +
                 ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}";

     

       67
       74
        
               };

     

       68
       75
        
           };

     

       69
       76
        
         };

+3 -3

nixos/tests/installer.nix

···

       76
       76
        
             def assemble_qemu_flags():

     

       77
       77
        
                 flags = "-cpu max"

     

       78
       78
        
                 ${if (system == "x86_64-linux" || system == "i686-linux")

     

       79
       79
       -
                   then ''flags += " -m 1024"''

     

       80
       80
       -
                   else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''

     

       79
       79
       +
                   then ''flags += " -m 1500"''

     

       80
       80
       +
                   else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"''

     

       81
       81
        
                 }

     

       82
       82
        
                 return flags

     

       83
       83
        
       

     
···

       288
       288
        
                 # builds stuff in the VM, needs more juice

     

       289
       289
        
                 virtualisation.diskSize = 8 * 1024;

     

       290
       290
        
                 virtualisation.cores = 8;

     

       291
       291
       -
                 virtualisation.memorySize = 2048;

     

       291
       291
       +
                 virtualisation.memorySize = 3096;

     

       292
       292
        
       

     

       293
       293
        
                 # Use a small /dev/vdb as the root disk for the

     

       294
       294
        
                 # installer. This ensures the target disk (/dev/vda) is

+68 -26

pkgs/applications/blockchains/bitcoin-knots/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , pkg-config

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
        
       , autoreconfHook

     

       5
       5
       -
       , db5

     

       6
       6
       -
       , openssl

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , util-linux

     

       7
       7
       +
       , hexdump

     

       8
       8
       +
       , autoSignDarwinBinariesHook

     

       9
       9
       +
       , wrapQtAppsHook ? null

     

       7
       10
        
       , boost

     

       11
       11
       +
       , libevent

     

       12
       12
       +
       , miniupnpc

     

       13
       13
       +
       , zeromq

     

       8
       14
        
       , zlib

     

       9
       9
       -
       , miniupnpc

     

       10
       10
       -
       , libevent

     

       11
       11
       -
       , protobuf

     

       12
       12
       -
       , util-linux

     

       15
       15
       +
       , db48

     

       16
       16
       +
       , sqlite

     

       17
       17
       +
       , qrencode

     

       18
       18
       +
       , qtbase ? null

     

       19
       19
       +
       , qttools ? null

     

       20
       20
       +
       , python3

     

       21
       21
       +
       , nixosTests

     

       22
       22
       +
       , withGui

     

       23
       23
       +
       , withWallet ? true

     

       13
       24
        
       }:

     

       14
       25
        
       

     

       26
       26
       +
       with lib;

     

       15
       27
        
       stdenv.mkDerivation rec {

     

       16
       16
       -
         pname = "bitcoind-knots";

     

       17
       17
       -
         version = "0.20.0";

     

       18
       18
       -
         versionDate = "20200614";

     

       28
       28
       +
         pname = if withGui then "bitcoin-knots" else "bitcoind-knots";

     

       29
       29
       +
         version = "22.0.knots20211108";

     

       19
       30
        
       

     

       20
       20
       -
         src = fetchFromGitHub {

     

       21
       21
       -
           owner = "bitcoinknots";

     

       22
       22
       -
           repo = "bitcoin";

     

       23
       23
       -
           rev = "v${version}.knots${versionDate}";

     

       24
       24
       -
           sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj";

     

       31
       31
       +
         src = fetchurl {

     

       32
       32
       +
           url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz";

     

       33
       33
       +
           sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i";

     

       25
       34
        
         };

     

       26
       35
        
       

     

       27
       27
       -
         nativeBuildInputs = [ pkg-config autoreconfHook ];

     

       28
       28
       -
         buildInputs = [ openssl db5 openssl util-linux

     

       29
       29
       -
                         protobuf boost zlib miniupnpc libevent ];

     

       36
       36
       +
         nativeBuildInputs =

     

       37
       37
       +
           [ autoreconfHook pkg-config ]

     

       38
       38
       +
           ++ optionals stdenv.isLinux [ util-linux ]

     

       39
       39
       +
           ++ optionals stdenv.isDarwin [ hexdump ]

     

       40
       40
       +
           ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]

     

       41
       41
       +
           ++ optionals withGui [ wrapQtAppsHook ];

     

       42
       42
       +
       

     

       43
       43
       +
         buildInputs = [ boost libevent miniupnpc zeromq zlib ]

     

       44
       44
       +
           ++ optionals withWallet [ db48 sqlite ]

     

       45
       45
       +
           ++ optionals withGui [ qrencode qtbase qttools ];

     

       46
       46
       +
       

     

       47
       47
       +
         configureFlags = [

     

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

     

       49
       49
       +
           "--disable-bench"

     

       50
       50
       +
         ] ++ optionals (!doCheck) [

     

       51
       51
       +
           "--disable-tests"

     

       52
       52
       +
           "--disable-gui-tests"

     

       53
       53
       +
         ] ++ optionals (!withWallet) [

     

       54
       54
       +
           "--disable-wallet"

     

       55
       55
       +
         ] ++ optionals withGui [

     

       56
       56
       +
           "--with-gui=qt5"

     

       57
       57
       +
           "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"

     

       58
       58
       +
         ];

     

       59
       59
       +
       

     

       60
       60
       +
         checkInputs = [ python3 ];

     

       30
       61
        
       

     

       31
       31
       -
         configureFlags = [ "--with-incompatible-bdb"

     

       32
       32
       -
                            "--with-boost-libdir=${boost.out}/lib" ];

     

       62
       62
       +
         doCheck = true;

     

       63
       63
       +
       

     

       64
       64
       +
         checkFlags =

     

       65
       65
       +
           [ "LC_ALL=en_US.UTF-8" ]

     

       66
       66
       +
           # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.

     

       67
       67
       +
           # See also https://github.com/NixOS/nixpkgs/issues/24256

     

       68
       68
       +
           ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";

     

       69
       69
       +
       

     

       70
       70
       +
         enableParallelBuilding = true;

     

       71
       71
       +
       

     

       72
       72
       +
         passthru.tests = {

     

       73
       73
       +
           smoke-test = nixosTests.bitcoind-knots;

     

       74
       74
       +
         };

     

       33
       75
        
       

     

       34
       34
       -
         meta = with lib; {

     

       35
       35
       -
           description = "An enhanced Bitcoin node software";

     

       76
       76
       +
         meta = {

     

       77
       77
       +
           description = "A derivative of Bitcoin Core with a collection of improvements";

     

       36
       78
        
           homepage = "https://bitcoinknots.org/";

     

       79
       79
       +
           maintainers = with maintainers; [ prusnak mmahut ];

     

       37
       80
        
           license = licenses.mit;

     

       38
       38
       -
           maintainers = [ maintainers.mmahut ];

     

       39
       39
       -
           platforms = platforms.linux;

     

       81
       81
       +
           platforms = platforms.unix;

     

       40
       82
        
         };

     

       41
       83
        
       }

+1 -1

pkgs/applications/blockchains/bitcoin/default.nix

···

       79
       79
        
         doCheck = true;

     

       80
       80
        
       

     

       81
       81
        
         checkFlags =

     

       82
       82
       -
           [ "LC_ALL=C.UTF-8" ]

     

       82
       82
       +
           [ "LC_ALL=en_US.UTF-8" ]

     

       83
       83
        
           # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.

     

       84
       84
        
           # See also https://github.com/NixOS/nixpkgs/issues/24256

     

       85
       85
        
           ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";

+4

pkgs/applications/graphics/hdr-plus/default.nix

···

       22
       22
        
           })

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           sed -i '2a #include <array>' src/InputSource.h

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       25
       29
        
         nativeBuildInputs = [ cmake ];

     

       26
       30
        
       

     

       27
       31
        
         buildInputs = [ halide libpng libjpeg libtiff libraw ];

+1 -1

pkgs/applications/misc/prusa-slicer/super-slicer.nix

···

       6
       6
        
       

     

       7
       7
        
         versions = {

     

       8
       8
        
           stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; };

     

       9
       9
       -
           staging = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };

     

       9
       9
       +
           latest = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         override = { version, sha256 }: super: {

+1 -1

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

···

       23
       23
        
       , pango

     

       24
       24
        
       

     

       25
       25
        
       , audioSupport ? mediaSupport

     

       26
       26
       -
       , pulseaudioSupport ? false

     

       26
       26
       +
       , pulseaudioSupport ? mediaSupport

     

       27
       27
        
       , libpulseaudio

     

       28
       28
        
       , apulse

     

       29
       29

+4

pkgs/applications/networking/droopy/default.nix

···

       18
       18
        
             url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch";

     

       19
       19
        
             sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ=";

     

       20
       20
        
           })

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/31.patch";

     

       23
       23
       +
             sha256 = "1ig054rxn5r0ph4w4fhmrxlh158c97iqqc7dbnc819adn9nw96l5";

     

       24
       24
       +
           })

     

       21
       25
        
         ];

     

       22
       26
        
       

     

       23
       27
        
         nativeBuildInputs = [ wrapPython ];

-19

pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches

···

       1
       1
       -
       0001-rfc6544.patch

     

       2
       2
       -
       0002-rfc2466.patch

     

       3
       3
       -
       0003-add-tcp-keep-alive.patch

     

       4
       4
       -
       0004-multiple_listeners.patch

     

       5
       5
       -
       0005-fix_ebusy_turn.patch

     

       6
       6
       -
       0006-ignore_ipv6_on_transport_check.patch

     

       7
       7
       -
       0007-upnp-srflx-nat-assisted-cand.patch

     

       8
       8
       -
       0008-fix_ioqueue_ipv6_sendto.patch

     

       9
       1
        
       0009-add-config-site.patch

     

       10
       10
       -
       0010-fix-tcp-death-detection.patch

     

       11
       11
       -
       0011-fix-turn-shutdown-crash.patch

     

       12
       12
       -
       0012-ignore-down-interfaces.patch

     

       13
       13
       -
       0013-ignore-addresses-for-RFC7335.patch

     

       14
       14
       -
       0014-fix-socket-leak.patch

     

       15
       15
       -
       0015-fix-socktype-and-duplicate-checking.patch

     

       16
       16
       -
       0016-use-larger-Ta-interval.patch

     

       17
       17
       -
       0017-auto-register-thread.patch

     

       18
       18
       -
       0018-fix-ioqueue-lock-acquire.patch

     

       19
       19
       -
       0019-resort-check-list-after-adding-prflx.patch

     

       20
       20
       -
       0020-avoid-immediate-nominating-triggered-check.patch

+9 -1

pkgs/applications/networking/instant-messengers/jami/daemon.nix

···

       3
       3
        
       , jami-meta

     

       4
       4
        
       , stdenv

     

       5
       5
        
       , lib

     

       6
       6
       +
       , fetchFromGitHub

     

       6
       7
        
       , autoreconfHook

     

       7
       8
        
       , pkg-config

     

       8
       9
        
       , perl # for pod2man

     
···

       57
       58
        
       

     

       58
       59
        
         pjsip-jami = pjsip.overrideAttrs (old:

     

       59
       60
        
           let

     

       61
       61
       +
             src-args = import ./pjproject-src.nix;

     

       62
       62
       +
             version = lib.concatStrings (lib.lists.take 7 (lib.stringToCharacters src-args.rev));

     

       60
       63
        
             patch-src = src + "/daemon/contrib/src/pjproject/";

     

       61
       64
        
           in

     

       62
       65
        
           {

     

       66
       66
       +
             inherit version;

     

       67
       67
       +
       

     

       68
       68
       +
             src = fetchFromGitHub src-args;

     

       69
       69
       +
       

     

       63
       70
        
             patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));

     

       64
       71
        
           });

     

       65
       72
        
       

     
···

       68
       75
        
           enablePushNotifications = true;

     

       69
       76
        
         };

     

       70
       77
        
       

     

       71
       71
       -
       in stdenv.mkDerivation {

     

       78
       78
       +
       in

     

       79
       79
       +
       stdenv.mkDerivation {

     

       72
       80
        
         pname = "jami-daemon";

     

       73
       81
        
         inherit src version;

     

       74
       82
        
         sourceRoot = "source/daemon";

+2 -2

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

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       rec {

     

       11
       11
       -
         version = "20211005.2.251ac7d";

     

       11
       11
       +
         version = "20211104.2.e80361d";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchzip {

     

       14
       14
        
           url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";

     

       15
       15
       -
           sha256 = "12ppbwhnk5zajb73szd04sz80bp17q577bkb9j8p45apvq201db3";

     

       15
       15
       +
           sha256 = "1l48svppshh8mg7y1dymnh0rgwswy4qwdyl7qlg25mmh4y1li21f";

     

       16
       16
        
       

     

       17
       17
        
           stripRoot = false;

     

       18
       18
        
           extraPostFetch = ''

+6

pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         owner = "savoirfairelinux";

     

       3
       3
       +
         repo = "pjproject";

     

       4
       4
       +
         rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a";

     

       5
       5
       +
         sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y=";

     

       6
       6
       +
       }

+9 -1

pkgs/applications/networking/instant-messengers/jami/update.sh

···

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

     

       2
       2
       -
       #!nix-shell -i bash -p coreutils curl gnused common-updater-scripts

     

       2
       2
       +
       #!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch

     

       3
       3
        
       

     

       4
       4
        
       set -e

     

       5
       5
        
       

     
···

       40
       40
        
       pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p')

     

       41
       41
        
       echo -e "Patches for pjsip:\n${pjsip_patches}\n"

     

       42
       42
        
       echo "${pjsip_patches}" > "$config_dir/pjsip_patches"

     

       43
       43
       +
       

     

       44
       44
       +
       # Update pjsip version

     

       45
       45
       +
       pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak)

     

       46
       46
       +
       nix-prefetch fetchFromGitHub \

     

       47
       47
       +
         --owner savoirfairelinux \

     

       48
       48
       +
         --repo pjproject \

     

       49
       49
       +
         --rev ${pjsip_version} \

     

       50
       50
       +
         --output nix > "${jami_dir}/pjproject-src.nix"

+2

pkgs/applications/video/vdr/plugins.nix

···

       62
       62
        
       

     

       63
       63
        
           postPatch = ''

     

       64
       64
        
             substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X

     

       65
       65
       +
             # https://github.com/rofafor/vdr-plugin-vaapidevice/issues/5

     

       66
       66
       +
             substituteInPlace Makefile --replace libva libva-x11

     

       65
       67
        
           '';

     

       66
       68
        
       

     

       67
       69
        
           src = fetchFromGitHub {

+3 -3

pkgs/applications/window-managers/picom/picom-next.nix

···

       2
       2
        
       

     

       3
       3
        
       picom.overrideAttrs (oldAttrs: rec {

     

       4
       4
        
         pname = "picom-next";

     

       5
       5
       -
         version = "unstable-2021-10-31";

     

       5
       5
       +
         version = "unstable-2021-11-19";

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "yshui";

     

       8
       8
        
           repo = "picom";

     

       9
       9
       -
           rev = "fade045eadf171d2c732820d6ebde7d1943a1397";

     

       10
       10
       -
           sha256 = "fPiLZ63+Bw5VCxVNqj9i5had2YLa+jFMMf85MYdqvHU=";

     

       9
       9
       +
           rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce";

     

       10
       10
       +
           sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw=";

     

       11
       11
        
         };

     

       12
       12
        
         meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];

     

       13
       13
        
       })

+9 -13

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

···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         patches = [

     

       25
       25
       -
           ./sway-config-no-nix-store-references.patch

     

       26
       25
        
           ./load-configuration-from-etc.patch

     

       27
       26
        
       

     

       28
       27
        
           (substituteAll {

     

       29
       28
        
             src = ./fix-paths.patch;

     

       30
       29
        
             inherit swaybg;

     

       31
       30
        
           })

     

       31
       31
       +
         ] ++ lib.optionals (!isNixOS) [

     

       32
       32
       +
           # References to /nix/store/... will get GC'ed which causes problems when

     

       33
       33
       +
           # copying the default configuration:

     

       34
       34
       +
           ./sway-config-no-nix-store-references.patch

     

       35
       35
       +
         ] ++ lib.optionals isNixOS [

     

       36
       36
       +
           # Use /run/current-system/sw/share and /etc instead of /nix/store

     

       37
       37
       +
           # references:

     

       38
       38
       +
           ./sway-config-nixos-paths.patch

     

       32
       39
        
         ];

     

       33
       40
        
       

     

       34
       34
       -
         postPatch = lib.optionalString isNixOS ''

     

       35
       35
       -
           echo -e '\ninclude /etc/sway/config.d/*' >> config.in

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         strictDeps = true;

     

       39
       39
       -
       

     

       40
       40
       -
         # Pkg-config binary for machine MachineChoice.BUILD not found. Giving up.

     

       41
       41
       -
         # has to be in both depsBuildBuild and nativeBuildInputs

     

       42
       42
       -
         depsBuildBuild = [ pkg-config scdoc ];

     

       43
       43
       -
       

     

       44
       41
        
         nativeBuildInputs = [

     

       45
       45
       -
           meson ninja pkg-config wayland-scanner

     

       42
       42
       +
           meson ninja pkg-config wayland-scanner scdoc

     

       46
       43
        
         ];

     

       47
       44
        
       

     

       48
       45
        
         buildInputs = [

     
···

       53
       50
        
         ];

     

       54
       51
        
       

     

       55
       52
        
         mesonFlags = [

     

       56
       56
       -
           "-Ddefault-wallpaper=false"

     

       57
       53
        
           "-Dsd-bus-provider=libsystemd"

     

       58
       54
        
         ]

     

       59
       55
        
           ++ lib.optional (!enableXWayland) "-Dxwayland=disabled"

+21

pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch

···

       1
       1
       +
       diff --git a/config.in b/config.in

     

       2
       2
       +
       index 08703bef..f3872730 100644

     

       3
       3
       +
       --- a/config.in

     

       4
       4
       +
       +++ b/config.in

     

       5
       5
       +
       @@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec --

     

       6
       6
       +
        

     

       7
       7
       +
        ### Output configuration

     

       8
       8
       +
        #

     

       9
       9
       +
       -# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)

     

       10
       10
       +
       -output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill

     

       11
       11
       +
       +# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)

     

       12
       12
       +
       +output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill

     

       13
       13
       +
        #

     

       14
       14
       +
        # Example configuration:

     

       15
       15
       +
        #

     

       16
       16
       +
       @@ -214,4 +214,4 @@ bar {

     

       17
       17
       +
            }

     

       18
       18
       +
        }

     

       19
       19
       +
        

     

       20
       20
       +
       -include @sysconfdir@/sway/config.d/*

     

       21
       21
       +
       +include /etc/sway/config.d/*

+17 -17

pkgs/data/themes/nordic/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "nordic";

     

       5
       5
       -
         version = "unstable-2021-08-13";

     

       5
       5
       +
         version = "unstable-2021-11-19";

     

       6
       6
        
       

     

       7
       7
        
         srcs = [

     

       8
       8
        
           (fetchFromGitHub {

     

       9
       9
        
             owner = "EliverLara";

     

       10
       10
        
             repo = pname;

     

       11
       11
       -
             rev = "937ca200e8148a61c73228030ec260abecc27fb2";

     

       12
       12
       -
             sha256 = "0h7z7jh5p0916i9lx4n94r6vbydafnikdi6d9p4djvpyhn5nizgy";

     

       11
       11
       +
             rev = "0112af91943b8819f7a1af9a508cda7fe3d74051";

     

       12
       12
       +
             sha256 = "sha256-ccOA5/jXTx20495NpTgVu7DvsjfTEULqL3IyJ+Pd/ug";

     

       13
       13
        
             name = "Nordic";

     

       14
       14
        
           })

     

       15
       15
        
       

     

       16
       16
        
           (fetchFromGitHub {

     

       17
       17
        
             owner = "EliverLara";

     

       18
       18
        
             repo = pname;

     

       19
       19
       -
             rev = "e736846a130be7907e977b16d0b3a0ab19631015";

     

       20
       20
       -
             sha256 = "0dv7z31zw1r3iac5bvwapf9lm99y5l0xfzaw93hn8msh10w5crx8";

     

       19
       19
       +
             rev = "b30d2c844cc6ef5d020308f1c02791de45b607a7";

     

       20
       20
       +
             sha256 = "sha256-g5yCCFXzipZLmUat+1r6QWHB7DWQvMKhMexHPV/DJHM";

     

       21
       21
        
             name = "Nordic-standard-buttons";

     

       22
       22
        
           })

     

       23
       23
        
       

     

       24
       24
        
           (fetchFromGitHub {

     

       25
       25
        
             owner = "EliverLara";

     

       26
       26
        
             repo = pname;

     

       27
       27
       -
             rev = "8ff12077f28e25f4e57f055a51e5e3b9b1bf53fd";

     

       28
       28
       -
             sha256 = "082k0na39qb97kbvc15g3mdfh8d8ricql84i4wdjy3rjfbfwq0pl";

     

       27
       27
       +
             rev = "6d38d6af363528f42619f663e3ecd4c08dfd2411";

     

       28
       28
       +
             sha256 = "sha256-jaRiSE6yfTltzZ2vr8w4d+YtSz7REOcL7vOOhQvIMlQ";

     

       29
       29
        
             name = "Nordic-darker";

     

       30
       30
        
           })

     

       31
       31
        
       

     

       32
       32
        
           (fetchFromGitHub {

     

       33
       33
        
             owner = "EliverLara";

     

       34
       34
        
             repo = pname;

     

       35
       35
       -
             rev = "8c422e4bfdf5680ff323938f49f411680154d3d6";

     

       36
       36
       -
             sha256 = "1w540zlmsxpwa455wpxy1dpgv2fjr36xwjqbyc8x4y0ya0qfify0";

     

       35
       35
       +
             rev = "4142817c14c27b371d42796445bedc84dc94672c";

     

       36
       36
       +
             sha256 = "sha256-FAb1+EREcwYrfSxAl6LrPaJtkHMt67NV3bG87g1cFT4";

     

       37
       37
        
             name = "Nordic-darker-standard-buttons";

     

       38
       38
        
           })

     

       39
       39
        
       

     

       40
       40
        
           (fetchFromGitHub {

     

       41
       41
        
             owner = "EliverLara";

     

       42
       42
        
             repo = pname;

     

       43
       43
       -
             rev = "ce31d794fe1c6b72d3cff2e9513e08ddce014118";

     

       44
       44
       -
             sha256 = "09d41wllr9hgxshgvpgngx9rlg8pvx5aqgkk5q8jra4jz2a92fhq";

     

       43
       43
       +
             rev = "2a91d6f3db70412b0a80ed33546fbe93075627d8";

     

       44
       44
       +
             sha256 = "sha256-Su+amS7moc2IDONNvqw3bjL6Q0WLJWzHu6WvfcVDcDY";

     

       45
       45
        
             name = "Nordic-bluish-accent";

     

       46
       46
        
           })

     

       47
       47
        
       

     

       48
       48
        
           (fetchFromGitHub {

     

       49
       49
        
             owner = "EliverLara";

     

       50
       50
        
             repo = pname;

     

       51
       51
       -
             rev = "8ca4fe244c31775effacc77f0a25ae10c6bee60c";

     

       52
       52
       -
             sha256 = "1cby8wmaqdqpd9c40wiy7i9wmrazwfhb3h818hg0ni7yfcm2fr58";

     

       51
       51
       +
             rev = "3ebd334f97d638fdc888b16d69851e3ee31131f2";

     

       52
       52
       +
             sha256 = "sha256-h0IXtWcdDvAEVi/1cLZF4Vacdl6VAY+5uo0LGPNe0bg";

     

       53
       53
        
             name = "Nordic-bluish-accent-standard-buttons";

     

       54
       54
        
           })

     

       55
       55
        
       

     

       56
       56
        
           (fetchFromGitHub {

     

       57
       57
        
             owner = "EliverLara";

     

       58
       58
        
             repo = "${pname}-polar";

     

       59
       59
       -
             rev = "a2d1c633ac2bfe261e8f612c8af14af0311c7f67";

     

       60
       60
       -
             sha256 = "05llvix671i6128vbr3jiik8mipaab7bn0v9i89ydwyfhw822n7v";

     

       59
       59
       +
             rev = "803926882f8178c72b433466a377aaa33c5b372a";

     

       60
       60
       +
             sha256 = "sha256-G7Vu03PoFOEU9uxb5JiHR4Tr8qk47fPo7Gg7Vt9Zzns";

     

       61
       61
        
             name = "Nordic-Polar";

     

       62
       62
        
           })

     

       63
       63
        
       

     

       64
       64
        
           (fetchFromGitHub {

     

       65
       65
        
             owner = "EliverLara";

     

       66
       66
        
             repo = "${pname}-polar";

     

       67
       67
       -
             rev = "62a1702a17e7ea96e9b692832d68a0a7f26aabb6";

     

       68
       68
       -
             sha256 = "0r1qn1rj322b44h15hcfbx79hhmb1m4pkv2fpdsn3s2klcxwr1ql";

     

       67
       67
       +
             rev = "988cb8a16ece3901b8b0e7a5b86503400491cb1e";

     

       68
       68
       +
             sha256 = "sha256-Zx1mrzJm5o4wQwOR8ZU2OEcjD3/6UXwLrBYpMtCkQbg";

     

       69
       69
        
             name = "Nordic-Polar-standard-buttons";

     

       70
       70
        
           })

     

       71
       71
        
         ];

+10

pkgs/development/libraries/ctl/default.nix

···

       19
       19
        
           })

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           # Fix include guard name

     

       24
       24
       +
           substituteInPlace lib/dpx/dpx_raw.hh \

     

       25
       25
       +
               --replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE

     

       26
       26
       +
       

     

       27
       27
       +
           # Fix undefined symbols (link with Imath)

     

       28
       28
       +
           substituteInPlace lib/IlmCtlMath/CMakeLists.txt \

     

       29
       29
       +
               --replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)"

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       22
       32
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       23
       33
        
         buildInputs = [ libtiff ilmbase openexr ];

     

       24
       34

+4

pkgs/development/libraries/libqb/default.nix

···

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ libxml2 ];

     

       17
       17
        
       

     

       18
       18
       +
         postPatch = ''

     

       19
       19
       +
           sed -i '/# --enable-new-dtags:/,/--enable-new-dtags is required/ d' configure.ac

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       18
       22
        
         meta = with lib; {

     

       19
       23
        
           homepage = "https://github.com/clusterlabs/libqb";

     

       20
       24
        
           description = "A library providing high performance logging, tracing, ipc, and poll";

+6 -4

pkgs/development/libraries/physics/cernlib/default.nix

···

       23
       23
        
             --replace "# define MakeCmd gmake" "# define MakeCmd make"

     

       24
       24
        
           substituteInPlace 2006/src/config/lnxLib.rules \

     

       25
       25
        
             --replace "# lib" "// lib"

     

       26
       26
       +
           # binutils 2.37 fix

     

       27
       27
       +
           substituteInPlace 2006/src/config/Imake.tmpl --replace "clq" "cq"

     

       26
       28
        
         '';

     

       27
       29
        
       

     

       28
       30
        
         configurePhase = ''

     
···

       39
       41
        
       

     

       40
       42
        
           cd $CERN_ROOT/build

     

       41
       43
        
           $CVSCOSRC/config/imake_boot

     

       42
       42
       -
           make bin/kuipc

     

       43
       43
       -
           make scripts/Makefile

     

       44
       44
       +
           make -j $NIX_BUILD_CORES bin/kuipc

     

       45
       45
       +
           make -j $NIX_BUILD_CORES scripts/Makefile

     

       44
       46
        
           pushd scripts

     

       45
       45
       -
           make install.bin

     

       47
       47
       +
           make -j $NIX_BUILD_CORES install.bin

     

       46
       48
        
           popd

     

       47
       47
       -
           make

     

       49
       49
       +
           make -j $NIX_BUILD_CORES

     

       48
       50
        
         '';

     

       49
       51
        
       

     

       50
       52
        
         installPhase = ''

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "aiopvpc";

     

       18
       18
       -
         version = "2.2.2";

     

       18
       18
       +
         version = "2.2.4";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.8";

     
···

       24
       24
        
           owner = "azogue";

     

       25
       25
        
           repo = pname;

     

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

     

       27
       27
       -
           sha256 = "sha256-wNMHzeKJ1kG0jnoI5fO3d5CBXE0cyoK92BkGunXK3pI=";

     

       27
       27
       +
           sha256 = "sha256-39cGDbaBS5we+WbqvABe6tKwTmbgd+NYLssKQCOuBsc=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-eventhub/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "azure-eventhub";

     

       10
       10
       -
         version = "5.6.0";

     

       10
       10
       +
         version = "5.6.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
        
           extension = "zip";

     

       15
       15
       -
           sha256 = "aa6d9e3e9b8b1a5ad211a828de867b85910720722577a4d51cd5aa6889d1d9e9";

     

       15
       15
       +
           sha256 = "sha256-ssjTesjPFITaB5Uy061podqL14ojeCIVm3LWsF3kY40=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [

+13 -8

pkgs/development/python-modules/azure-servicebus/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , uamqp

     

       5
       2
        
       , azure-common

     

       6
       3
        
       , azure-core

     

       7
       7
       -
       , msrestazure

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , fetchPypi

     

       8
       6
        
       , futures ? null

     

       7
       7
       +
       , isodate

     

       9
       8
        
       , isPy3k

     

       9
       9
       +
       , msrestazure

     

       10
       10
       +
       , uamqp

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       buildPythonPackage rec {

     

       13
       14
        
         pname = "azure-servicebus";

     

       14
       14
       -
         version = "7.3.3";

     

       15
       15
       +
         version = "7.4.0";

     

       16
       16
       +
         format = "setuptools";

     

       15
       17
        
       

     

       16
       18
        
         src = fetchPypi {

     

       17
       19
        
           inherit pname version;

     

       18
       20
        
           extension = "zip";

     

       19
       19
       -
           sha256 = "1c2133909a086bd4329135d6affcc05628e3a7da27afca584a0de8c21fc4e1ac";

     

       21
       21
       +
           sha256 = "sha256-nlt4wNHI613tK7JB85fBW2LE/FOa8+2aLeT6wzP1PQ4=";

     

       20
       22
        
         };

     

       21
       23
        
       

     

       22
       24
        
         propagatedBuildInputs = [

     

       23
       23
       -
           uamqp

     

       24
       25
        
           azure-common

     

       25
       26
        
           azure-core

     

       27
       27
       +
           isodate

     

       26
       28
        
           msrestazure

     

       29
       29
       +
           uamqp

     

       27
       30
        
         ] ++ lib.optionals (!isPy3k) [

     

       28
       31
        
           futures

     

       29
       32
        
         ];

     
···

       32
       35
        
         doCheck = false;

     

       33
       36
        
       

     

       34
       37
        
         # python2 will fail due to pep 420

     

       35
       35
       -
         pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ];

     

       38
       38
       +
         pythonImportsCheck = lib.optionals isPy3k [

     

       39
       39
       +
           "azure.servicebus"

     

       40
       40
       +
         ];

     

       36
       41
        
       

     

       37
       42
        
         meta = with lib; {

     

       38
       43
        
           description = "Microsoft Azure Service Bus Client Library";

+6 -1

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

···

       31
       31
        
       

     

       32
       32
        
         propagatedBuildInputs = [ contextlib2 ];

     

       33
       33
        
       

     

       34
       34
       +
         preConfigure = ''

     

       35
       35
       +
           substituteInPlace setup.py \

     

       36
       36
       +
               --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'"

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       34
       39
        
         preBuild = ''

     

       35
       35
       -
           ${python.interpreter} setup.py build_cython

     

       40
       40
       +
           ${python.pythonForBuild.interpreter} setup.py build_cython

     

       36
       41
        
         '';

     

       37
       42
        
       

     

       38
       43
        
         # On Darwin, the test requires macFUSE to be installed outside of Nix.

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "pyiqvia";

     

       16
       16
       -
         version = "2021.10.0";

     

       16
       16
       +
         version = "2021.11.0";

     

       17
       17
        
         format = "pyproject";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.8";

     
···

       22
       22
        
           owner = "bachya";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           sha256 = "sha256-FCavSy33fkXlboRAmGr0BkEkXLTOzsyGXQkws0LqiJk=";

     

       25
       25
       +
           sha256 = "sha256-Cqc3zRJ2VpKKCGF4y+4IYfvfANblCEmh0sJ3tXH1AAA=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+2 -3

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "pyopenuv";

     

       17
       17
       -
         version = "2021.10.0";

     

       17
       17
       +
         version = "2021.11.0";

     

       18
       18
        
         format = "pyproject";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.6";

     
···

       23
       23
        
           owner = "bachya";

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           sha256 = "sha256-3zTyW3eXOA9frSAy4g7iWhymc1hBo0hrxIgPLMqrLTs=";

     

       26
       26
       +
           sha256 = "sha256-J0YIq00/GcWEL23UHmN98Jp/imOAz8NLzhMdk8WFozk=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     
···

       43
       43
        
           pytestCheckHook

     

       44
       44
        
         ];

     

       45
       45
        
       

     

       46
       46
       -
         # Ignore the examples as they are prefixed with test_

     

       47
       46
        
         disabledTestPaths = [

     

       48
       47
        
           # Ignore the examples as they are prefixed with test_

     

       49
       48
        
           "examples/"

+11 -4

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "pyvesync";

     

       10
       10
       -
         version = "1.4.1";

     

       10
       10
       +
         version = "1.4.2";

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
       +
       

     

       11
       13
        
         disabled = pythonOlder "3.6";

     

       12
       14
        
       

     

       13
       15
        
         src = fetchPypi {

     

       14
       16
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "f8bc6ebbe2c2bf37009b50b16e34747b0cfe35dd249aed4525b68c3af061941f";

     

       17
       17
       +
           sha256 = "sha256-O5zt1FiCQAlCaGaiEyrannqZjm4oGq36d4Fa77ys+HE=";

     

       16
       18
        
         };

     

       17
       19
        
       

     

       18
       18
       -
         propagatedBuildInputs = [ requests ];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           requests

     

       22
       22
       +
         ];

     

       19
       23
        
       

     

       20
       24
        
         # Test are not available (not in PyPI tarball and there are no GitHub releases)

     

       21
       25
        
         doCheck = false;

     

       22
       22
       -
         pythonImportsCheck = [ "pyvesync" ];

     

       26
       26
       +
       

     

       27
       27
       +
         pythonImportsCheck = [

     

       28
       28
       +
           "pyvesync"

     

       29
       29
       +
         ];

     

       23
       30
        
       

     

       24
       31
        
         meta = with lib; {

     

       25
       32
        
           description = "Python library to manage Etekcity Devices and Levoit Air Purifier";

+6 -1

pkgs/development/python-modules/qmk-dotty-dict/default.nix

···

       14
       14
        
         doCheck = false;

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
       +
           homepage = "https://github.com/pawelzny/dotty_dict";

     

       17
       18
        
           description = "Dictionary wrapper for quick access to deeply nested keys";

     

       18
       18
       -
           homepage = "https://github.com/pawelzny/dotty_dict";

     

       19
       19
       +
           longDescription = ''

     

       20
       20
       +
             This is a version of dotty-dict by QMK (https://qmk.fm) since the original

     

       21
       21
       +
             dotty-dict published to pypi has non-ASCII characters that breaks with

     

       22
       22
       +
             some non-UTF8 locale settings.

     

       23
       23
       +
           '';

     

       19
       24
        
           license = licenses.mit;

     

       20
       25
        
           maintainers = with maintainers; [ babariviere ];

     

       21
       26
        
         };

+6 -3

pkgs/development/python-modules/sense-energy/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "sense-energy";

     

       12
       12
       -
         version = "0.9.2";

     

       12
       12
       +
         version = "0.9.3";

     

       13
       13
       +
         format = "setuptools";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchFromGitHub {

     

       15
       16
        
           owner = "scottbonline";

     

       16
       17
        
           repo = "sense";

     

       17
       18
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-XZvx/GWpz49dsiY9pgMfX+6gUfWA8q6IpnzmCRPFHus=";

     

       19
       19
       +
           sha256 = "sha256-LUM7SP03U3mRxCTjgxPRXh/ZLz15R04zBWOxLKnan98=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         propagatedBuildInputs = [

     
···

       28
       29
        
         # no tests implemented

     

       29
       30
        
         doCheck = false;

     

       30
       31
        
       

     

       31
       31
       -
         pythonImportsCheck = [ "sense_energy" ];

     

       32
       32
       +
         pythonImportsCheck = [

     

       33
       33
       +
           "sense_energy"

     

       34
       34
       +
         ];

     

       32
       35
        
       

     

       33
       36
        
         meta = with lib; {

     

       34
       37
        
           description = "API for the Sense Energy Monitor";

+33 -27

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

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , lib

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , fetchPypi

     

       5
       5
       -
       , fetchpatch

     

       6
       6
       -
       , isPy3k

     

       7
       4
        
       , certifi

     

       5
       5
       +
       , CFNetwork

     

       8
       6
        
       , cmake

     

       7
       7
       +
       , CoreFoundation

     

       9
       8
        
       , enum34

     

       9
       9
       +
       , fetchpatch

     

       10
       10
       +
       , fetchPypi

     

       11
       11
       +
       , isPy3k

     

       10
       12
        
       , openssl

     

       11
       11
       -
       , six

     

       12
       12
       -
       , CFNetwork

     

       13
       13
       -
       , CoreFoundation

     

       14
       13
        
       , Security

     

       14
       14
       +
       , six

     

       15
       15
        
       }:

     

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "uamqp";

     

       19
       19
       -
         version = "1.4.1";

     

       19
       19
       +
         version = "1.4.3";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           sha256 = "sha256-JNGlpu2HvwTGV77WnAQFyvJImHesE2R+ZwMAlhlyk2U=";

     

       23
       23
       +
           sha256 = "sha256-L4IQWnxRRL3yopNT91Mk8KKdph9Vg2PHkGH+86uDu7c=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           cmake

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       31
       31
       +
           CoreFoundation

     

       32
       32
       +
           CFNetwork

     

       33
       33
       +
           Security

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         propagatedBuildInputs = [

     

       37
       37
       +
           certifi

     

       38
       38
       +
           openssl

     

       39
       39
       +
           six

     

       40
       40
       +
         ] ++ lib.optionals (!isPy3k) [

     

       41
       41
       +
           enum34

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       26
       44
        
         patches = [

     

       27
       45
        
           (fetchpatch {

     

       28
       46
        
             url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch";

     
···

       32
       50
        
           })

     

       33
       51
        
         ];

     

       34
       52
        
       

     

       35
       35
       -
         buildInputs = [

     

       36
       36
       -
           openssl

     

       37
       37
       -
           certifi

     

       38
       38
       -
           six

     

       39
       39
       -
         ] ++ lib.optionals (!isPy3k) [

     

       40
       40
       -
           enum34

     

       41
       41
       -
         ] ++ lib.optionals stdenv.isDarwin [

     

       42
       42
       -
           CoreFoundation

     

       43
       43
       -
           CFNetwork

     

       44
       44
       -
           Security

     

       45
       45
       -
         ];

     

       46
       46
       -
       

     

       47
       53
        
         dontUseCmakeConfigure = true;

     

       48
       54
        
       

     

       49
       49
       -
         nativeBuildInputs = [

     

       50
       50
       -
           cmake

     

       55
       55
       +
         # Project has no tests

     

       56
       56
       +
         doCheck = false;

     

       57
       57
       +
       

     

       58
       58
       +
         pythonImportsCheck = [

     

       59
       59
       +
           "uamqp"

     

       51
       60
        
         ];

     

       52
       52
       -
       

     

       53
       53
       -
         # has no tests

     

       54
       54
       -
         doCheck = false;

     

       55
       61
        
       

     

       56
       62
        
         meta = with lib; {

     

       57
       63
        
           description = "An AMQP 1.0 client library for Python";

+2 -2

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

···

       56
       56
        
       

     

       57
       57
        
       buildPythonApplication rec {

     

       58
       58
        
         pname = "checkov";

     

       59
       59
       -
         version = "2.0.591";

     

       59
       59
       +
         version = "2.0.594";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchFromGitHub {

     

       62
       62
        
           owner = "bridgecrewio";

     

       63
       63
        
           repo = pname;

     

       64
       64
        
           rev = version;

     

       65
       65
       -
           sha256 = "sha256-p8pEw3vH3W62MmlZsSqWoUKf7QjEQhlV5bSjYr1Wwm0=";

     

       65
       65
       +
           sha256 = "sha256-wbqFEeqe0RXLfiaIIG6UyBLgFOG3kUWKLVoeKoSktuI=";

     

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
        
         nativeBuildInputs = with py.pkgs; [

+16 -9

pkgs/games/2048-in-terminal/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, ncurses }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "2048-in-terminal";

     

       5
       5
       -
         version = "2017-11-29";

     

       5
       5
       +
         version = "2021-09-12";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           sha256 = "1cqv5z1i5zcrvj0w6pdfnnff8m6kjndqxwkwsw5ma9jz503bmyc6";

     

       9
       9
       -
           rev = "4e525066b0ef3442e92d2ba8dd373bdc205ece28";

     

       8
       8
       +
           sha256 = "1jgacyimn59kxqhrk8jp13qayc2mncxhx393spqcxbz0sj6lxq9p";

     

       9
       9
       +
           rev = "466abe827638598e40cb627d2b017fe8f76b3a14";

     

       10
       10
        
           repo = "2048-in-terminal";

     

       11
       11
        
           owner = "alewmoose";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ ncurses ];

     

       14
       14
       +
         # Fix pending upstream inclusion for ncurses-6.3 support:

     

       15
       15
       +
         #  https://github.com/alewmoose/2048-in-terminal/pull/6

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             name = "ncurses-6.3.patch";

     

       19
       19
       +
             url = "https://github.com/alewmoose/2048-in-terminal/commit/b1c78dc4b3cca3a193b1afea1ab85a75966823cf.patch";

     

       20
       20
       +
             sha256 = "05ibpgr83r7zxsak2l0gaf33858bp0sp0mjfdpmcmw745z3jw7q1";

     

       21
       21
       +
           })

     

       22
       22
       +
         ];

     

       15
       23
        
       

     

       16
       16
       -
         prePatch = ''

     

       17
       17
       -
           sed -i '1i#include <fcntl.h>\n' save.c

     

       18
       18
       -
         '';

     

       24
       24
       +
         buildInputs = [ ncurses ];

     

       25
       25
       +
         nativeBuildInputs = [ pkg-config ];

     

       19
       26
        
       

     

       20
       27
        
         enableParallelBuilding = true;

     

       21
       28
        
       

     

       22
       29
        
         preInstall = ''

     

       23
       30
        
           mkdir -p $out/bin

     

       24
       31
        
         '';

     

       25
       25
       -
         installFlags = [ "DESTDIR=$(out)/bin" ];

     

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

     

       26
       33
        
       

     

       27
       34
        
         meta = with lib; {

     

       28
       35
        
           inherit (src.meta) homepage;

+3

pkgs/servers/clickhouse/default.nix

···

       3
       3
        
       , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl

     

       4
       4
        
       , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC

     

       5
       5
        
       , xxHash, zstd

     

       6
       6
       +
       , nixosTests

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       stdenv.mkDerivation rec {

     
···

       63
       64
        
       

     

       64
       65
        
         # Builds in 7+h with 2 cores, and ~20m with a big-parallel builder.

     

       65
       66
        
         requiredSystemFeatures = [ "big-parallel" ];

     

       67
       67
       +
       

     

       68
       68
       +
         passthru.tests.clickhouse = nixosTests.clickhouse;

     

       66
       69
        
       

     

       67
       70
        
         meta = with lib; {

     

       68
       71
        
           homepage = "https://clickhouse.tech/";

+4 -4

pkgs/servers/monitoring/grafana/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGo117Module rec {

     

       4
       4
        
         pname = "grafana";

     

       5
       5
       -
         version = "8.2.4";

     

       5
       5
       +
         version = "8.2.5";

     

       6
       6
        
       

     

       7
       7
        
         excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";

     

       8
       8
        
       

     
···

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

     

       11
       11
        
           owner = "grafana";

     

       12
       12
        
           repo = "grafana";

     

       13
       13
       -
           sha256 = "sha256-dOV22xwdNLt0TnONzyDw0skGKuAYmiHafhFwhtRMN5M=";

     

       13
       13
       +
           sha256 = "sha256-Bi4z8HqKUeVOxbkKXazNIzFBFy7lW0T27ROVC6enrZE=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         srcStatic = fetchurl {

     

       17
       17
        
           url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-nfHUpAnFc2lDGAoHB1fJjF08ndfNlaMJAlsMH+TJNy0=";

     

       18
       18
       +
           sha256 = "sha256-ngQA8580rvH3C04TfuIsdiStbvk7/HRDDtS04gR92M4=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorSha256 = "sha256-VvmSNSChbxeLWEQDE4JPfoZckQZ7nG7ElupNCc175Fk=";

     

       21
       21
       +
         vendorSha256 = "sha256-adWWL2shdsp1hGxhYvxBbr1YFM89Ym1J0kBNGUrj6vc=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ wire ];

     

       24
       24

+5

pkgs/tools/archivers/arj/default.nix

···

       128
       128
        
       

     

       129
       129
        
         nativeBuildInputs = [ autoreconfHook ];

     

       130
       130
        
       

     

       131
       131
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       132
       132
       +
           substituteInPlace environ.c \

     

       133
       133
       +
               --replace "  #include <sys/statfs.h>" "  #include <sys/mount.h>"

     

       134
       134
       +
         '';

     

       135
       135
       +
       

     

       131
       136
        
         preAutoreconf = ''

     

       132
       137
        
           cd gnu

     

       133
       138
        
         '';

+15 -1

pkgs/tools/filesystems/gfs2-utils/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch

     

       2
       2
        
       , autoreconfHook, bison, flex, pkg-config

     

       3
       3
        
       , bzip2, check, ncurses, util-linux, zlib

     

       4
       4
        
       }:

     
···

       11
       11
        
           url = "https://pagure.io/gfs2-utils/archive/${version}/gfs2-utils-${version}.tar.gz";

     

       12
       12
        
           sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI=";

     

       13
       13
        
         };

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           # pull pending upstream inclusion fix for ncurses-6.3: sent upstream over email.

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             name = "ncurses-6.3.patch";

     

       19
       19
       +
             url = "https://pagure.io/fork/slyfox/gfs2-utils/c/c927b635f380cca77665195a3aaae804d92870a4.patch";

     

       20
       20
       +
             sha256 = "sha256-0M1xAqRXoUi2el03WODF/nqEe9JEE5GehMWs776QZNI=";

     

       21
       21
       +
           })

     

       22
       22
       +
         ];

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           # Apply fix for ncurses-6.3. Upstream development branch already reworked the code.

     

       25
       25
       +
           # To be removed on next reelase.

     

       26
       26
       +
           substituteInPlace gfs2/edit/gfs2hex.c --replace 'printw(title);' 'printw("%s",title);'

     

       27
       27
       +
         '';

     

       14
       28
        
       

     

       15
       29
        
         outputs = [ "bin" "doc" "out" "man" ];

     

       16
       30

+10 -10

pkgs/tools/misc/qmk/default.nix

···

       1
       1
       -
       { lib, python3, fetchpatch, writeText }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         inherit (python3.pkgs) buildPythonApplication fetchPypi;

     

       5
       5
       -
         setuppy = writeText "setup.py" ''

     

       6
       6
       -
           from setuptools import setup

     

       7
       7
       -
           setup()

     

       8
       8
       -
         '';

     

       9
       9
       -
       in buildPythonApplication rec {

     

       5
       5
       +
       python3.pkgs.buildPythonApplication rec {

     

       10
       6
        
         pname = "qmk";

     

       11
       7
        
         version = "1.0.0";

     

       12
       8
        
       

     

       13
       13
       -
         src = fetchPypi {

     

       9
       9
       +
         src = python3.pkgs.fetchPypi {

     

       14
       10
        
           inherit pname version;

     

       15
       11
        
           sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co=";

     

       16
       12
        
         };

     
···

       36
       32
        
           pyusb

     

       37
       33
        
         ];

     

       38
       34
        
       

     

       35
       35
       +
         # buildPythonApplication requires setup.py; the setup.py file crafted below

     

       36
       36
       +
         # acts as a wrapper to setup.cfg

     

       39
       37
        
         postConfigure = ''

     

       40
       40
       -
           cp ${setuppy} setup.py

     

       38
       38
       +
           touch setup.py

     

       39
       39
       +
           echo "from setuptools import setup" >> setup.py

     

       40
       40
       +
           echo "setup()" >> setup.py

     

       41
       41
        
         '';

     

       42
       42
        
       

     

       43
       43
        
         # no tests implemented

+26

pkgs/tools/networking/netdiscover/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libpcap, libnet, autoreconfHook }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "netdiscover";

     

       5
       5
       +
         version = "0.8.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "netdiscover-scanner";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "13fp9rfr9vh756m5wck76zbcr0296ir52dahzlqdr52ha9vrswbb";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       15
       15
       +
         buildInputs = [ libpcap libnet ];

     

       16
       16
       +
       

     

       17
       17
       +
         # Running update-oui-database.sh would probably make the build irreproducible

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "A network address discovering tool, developed mainly for those wireless networks without dhcp server, it also works on hub/switched networks";

     

       21
       21
       +
           homepage = "https://github.com/netdiscover-scanner/netdiscover";

     

       22
       22
       +
           license = licenses.gpl3Plus;

     

       23
       23
       +
           maintainers = with maintainers; [ vdot0x23 ];

     

       24
       24
       +
           platforms = platforms.unix;

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+8 -4

pkgs/tools/security/jwt-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "jwt-cli";

     

       5
       5
       -
         version = "4.0.0";

     

       5
       5
       +
         version = "5.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mike-engel";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-82Le0kdt/fnSQwsRRYHy4Jv9rsCPGf5dIWmoZE2cPxY=";

     

       11
       11
       +
           sha256 = "0za4mpzry6i5gki524kp4by0n74pbc96cvzrkq286v8w033wj01i";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-sCauVxc6JPJ4dBi5LOt+v9bdlRW+oF4cd/sfG5Xdv70=";

     

       14
       14
       +
         cargoSha256 = "1l5fhr5c2ygdlnpwsx62fm8di8li0wf15nvvcnnivjcic7f9b5j0";

     

       15
       15
        
       

     

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

     

       17
       17
        
       

     

       18
       18
        
         doInstallCheck = true;

     

       19
       19
       -
         installCheckPhase = "$out/bin/jwt --version";

     

       19
       19
       +
         installCheckPhase = ''

     

       20
       20
       +
           $out/bin/jwt --version > /dev/null

     

       21
       21
       +
           $out/bin/jwt decode eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c \

     

       22
       22
       +
             | grep -q 'John Doe'

     

       23
       23
       +
         '';

     

       20
       24
        
       

     

       21
       25
        
         meta = with lib; {

     

       22
       26
        
           description = "Super fast CLI tool to decode and encode JWTs";

+41 -8

pkgs/tools/text/invoice2data/default.nix

···

       1
       1
       -
       { lib, python3Packages, xpdf, imagemagick, tesseract }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , imagemagick

     

       4
       4
       +
       , python3

     

       5
       5
       +
       , tesseract

     

       6
       6
       +
       , xpdf

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       3
       -
       python3Packages.buildPythonPackage rec {

     

       9
       9
       +
       python3.pkgs.buildPythonApplication rec {

     

       4
       10
        
         pname = "invoice2data";

     

       5
       5
       -
         version = "0.2.93";

     

       11
       11
       +
         version = "0.3.6";

     

       12
       12
       +
         format = "setuptools";

     

       6
       13
        
       

     

       7
       7
       -
         src = python3Packages.fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4";

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "invoice-x";

     

       16
       16
       +
           repo = pname;

     

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

     

       18
       18
       +
           sha256 = "sha256-t1jgLyKtQsLINlnkCdSbVfTM6B/EiD1yGtx9UHjyZVE=";

     

       10
       19
        
         };

     

       11
       20
        
       

     

       12
       12
       -
         makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ imagemagick xpdf tesseract ]) ];

     

       21
       21
       +
         nativeBuildInputs = with python3.pkgs; [

     

       22
       22
       +
           setuptools-git

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       26
       26
       +
           chardet

     

       27
       27
       +
           dateparser

     

       28
       28
       +
           pdfminer

     

       29
       29
       +
           pillow

     

       30
       30
       +
           pyyaml

     

       31
       31
       +
           unidecode

     

       32
       32
       +
         ];

     

       13
       33
        
       

     

       14
       14
       -
         propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ];

     

       34
       34
       +
         postPatch = ''

     

       35
       35
       +
           substituteInPlace setup.cfg \

     

       36
       36
       +
             --replace "pytest-runner" ""

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [

     

       40
       40
       +
           imagemagick

     

       41
       41
       +
           tesseract

     

       42
       42
       +
           xpdf

     

       43
       43
       +
         ])];

     

       15
       44
        
       

     

       16
       45
        
         # Tests fails even when ran manually on my ubuntu machine !!

     

       17
       46
        
         doCheck = false;

     

       47
       47
       +
       

     

       48
       48
       +
         pythonImportsCheck = [

     

       49
       49
       +
           "invoice2data"

     

       50
       50
       +
         ];

     

       18
       51
        
       

     

       19
       52
        
         meta = with lib; {

     

       20
       53
        
           description = "Data extractor for PDF invoices";

+12 -3

pkgs/top-level/all-packages.nix

···

       1281
       1281
        
       

     

       1282
       1282
        
         argyllcms = callPackage ../tools/graphics/argyllcms {};

     

       1283
       1283
        
       

     

       1284
       1284
       -
         arj = callPackage ../tools/archivers/arj { };

     

       1284
       1284
       +
         arj = callPackage ../tools/archivers/arj {

     

       1285
       1285
       +
           stdenv = gccStdenv;

     

       1286
       1286
       +
         };

     

       1285
       1287
        
       

     

       1286
       1288
        
         arp-scan = callPackage ../tools/misc/arp-scan { };

     

       1287
       1289
        
       

     
···

       7812
       7814
        
         netcat = libressl.nc;

     

       7813
       7815
        
       

     

       7814
       7816
        
         netcat-gnu = callPackage ../tools/networking/netcat { };

     

       7817
       7817
       +
       

     

       7818
       7818
       +
         netdiscover = callPackage ../tools/networking/netdiscover { };

     

       7815
       7819
        
       

     

       7816
       7820
        
         nethogs = callPackage ../tools/networking/nethogs { };

     

       7817
       7821
        
       

     
···

       28202
       28206
        
       

     

       28203
       28207
        
         super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };

     

       28204
       28208
        
       

     

       28205
       28205
       -
         super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging;

     

       28209
       28209
       +
         super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest;

     

       28206
       28210
        
       

     

       28207
       28211
        
         snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };

     

       28208
       28212
        
       

     
···

       29562
       29566
        
           inherit (darwin) autoSignDarwinBinariesHook;

     

       29563
       29567
        
         };

     

       29564
       29568
        
       

     

       29565
       29565
       -
         bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; };

     

       29569
       29569
       +
         bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {

     

       29570
       29570
       +
           boost = boost17x;

     

       29571
       29571
       +
           miniupnpc = miniupnpc_2;

     

       29572
       29572
       +
           withGui = false;

     

       29573
       29573
       +
           inherit (darwin) autoSignDarwinBinariesHook;

     

       29574
       29574
       +
         };

     

       29566
       29575
        
       

     

       29567
       29576
        
         cgminer = callPackage ../applications/blockchains/cgminer { };

     

       29568
       29577