commit 7659201d58cd85b215e561068a2c96bf760c002b · pyrox.dev/nixpkgs

+6

maintainers/maintainer-list.nix

···

       8573
       8573
        
           githubId = 1040871;

     

       8574
       8574
        
           name = "Mathis Antony";

     

       8575
       8575
        
         };

     

       8576
       8576
       +
         svrana = {

     

       8577
       8577
       +
           email = "shaw@vranix.com";

     

       8578
       8578
       +
           github = "svrana";

     

       8579
       8579
       +
           githubId = 850665;

     

       8580
       8580
       +
           name = "Shaw Vrana";

     

       8581
       8581
       +
         };

     

       8576
       8582
        
         svsdep = {

     

       8577
       8583
        
           email = "svsdep@gmail.com";

     

       8578
       8584
        
           github = "svsdep";

+4 -1

nixos/modules/system/boot/resolved.nix

···

       1
       1
       -
       { config, lib, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

     
···

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

     

       151
       151
        
             aliases = [ "dbus-org.freedesktop.resolve1.service" ];

     

       152
       152
        
             restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];

     

       153
       153
       +
             # Upstream bug: https://github.com/systemd/systemd/issues/18078

     

       154
       154
       +
             # systemd-resolved without libidn2 is broken

     

       155
       155
       +
             environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib";

     

       153
       156
        
           };

     

       154
       157
        
       

     

       155
       158
        
           environment.etc = {

+4 -3

pkgs/applications/editors/glow/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "glow";

     

       5
       5
       -
         version = "1.2.1";

     

       5
       5
       +
         version = "1.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "charmbracelet";

     

       9
       9
        
           repo = "glow";

     

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

     

       11
       11
       -
           sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh";

     

       11
       11
       +
           sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z";

     

       14
       14
       +
         vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17
        
       

     
···

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           description = "Render markdown on the CLI, with pizzazz!";

     

       22
       22
        
           homepage = "https://github.com/charmbracelet/glow";

     

       23
       23
       +
           changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}";

     

       23
       24
        
           license = licenses.mit;

     

       24
       25
        
           maintainers = with maintainers; [ Br1ght0ne penguwin ];

     

       25
       26
        
         };

+10 -1

pkgs/applications/office/zanshin/default.nix

···

       1
       1
        
       { mkDerivation

     

       2
       2
        
       , lib

     

       3
       3
        
       , fetchurl

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       , extra-cmake-modules

     

       5
       6
        
       , qtbase

     

       6
       7
        
       , boost

     
···

       24
       25
        
           sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";

     

       25
       26
        
         };

     

       26
       27
        
       

     

       28
       28
       +
         patches = [

     

       29
       29
       +
           # Build with kontactinterface >= 5.14.42.

     

       30
       30
       +
           # Remove after next release.

     

       31
       31
       +
           (fetchpatch {

     

       32
       32
       +
             url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";

     

       33
       33
       +
             sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";

     

       34
       34
       +
           })

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       27
       37
        
         nativeBuildInputs = [

     

       28
       38
        
           extra-cmake-modules

     

       29
       39
        
         ];

     
···

       48
       58
        
           maintainers = with maintainers; [ zraexy ];

     

       49
       59
        
           platforms = platforms.linux;

     

       50
       60
        
           license = licenses.gpl2Plus;

     

       51
       51
       -
           broken = true;

     

       52
       61
        
         };

     

       53
       62
        
       }

+4 -4

pkgs/development/interpreters/perl/default.nix

···

       174
       174
        
             priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`

     

       175
       175
        
           };

     

       176
       176
        
         } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {

     

       177
       177
       -
           crossVersion = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020

     

       177
       177
       +
           crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020

     

       178
       178
        
       

     

       179
       179
        
           perl-cross-src = fetchurl {

     

       180
       180
        
             url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";

     

       181
       181
       -
             sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1";

     

       181
       181
       +
             sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb";

     

       182
       182
        
           };

     

       183
       183
        
       

     

       184
       184
        
           depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];

     
···

       214
       214
        
         perldevel = common {

     

       215
       215
        
           perl = pkgs.perldevel;

     

       216
       216
        
           buildPerl = buildPackages.perldevel;

     

       217
       217
       -
           version = "5.33.4";

     

       218
       218
       -
           sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz";

     

       217
       217
       +
           version = "5.33.5";

     

       218
       218
       +
           sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr";

     

       219
       219
        
         };

     

       220
       220
        
       }

+2 -2

pkgs/development/python-modules/jupyterlab-git/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "jupyterlab_git";

     

       13
       13
       -
         version = "0.23.2";

     

       13
       13
       +
         version = "0.23.3";

     

       14
       14
        
         disabled = pythonOlder "3.5";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089";

     

       18
       18
       +
           sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ notebook nbdime git ];

+2 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "runway-python";

     

       22
       22
       -
         version = "0.6.0";

     

       22
       22
       +
         version = "0.6.1";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchPypi {

     

       25
       25
        
           inherit pname version;

     

       26
       26
       -
           sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8";

     

       26
       26
       +
           sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/tools/build-managers/sbt/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "sbt";

     

       6
       6
       -
         version = "1.4.5";

     

       6
       6
       +
         version = "1.4.6";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url =

     

       10
       10
        
             "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";

     

       11
       11
       -
           sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U=";

     

       11
       11
       +
           sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patchPhase = ''

+26

pkgs/development/tools/go-minimock/default.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "go-minimock";

     

       5
       5
       +
         version = "3.0.8";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "gojuno";

     

       9
       9
       +
           repo = "minimock";

     

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

     

       11
       11
       +
           sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc";

     

       15
       15
       +
       

     

       16
       16
       +
         doCheck = true;

     

       17
       17
       +
       

     

       18
       18
       +
         subPackages = [ "cmd/minimock" "." ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           homepage = "https://github.com/gojuno/minimock";

     

       22
       22
       +
           description = "A golang mock generator from interfaces";

     

       23
       23
       +
           license = licenses.mit;

     

       24
       24
       +
           maintainers = with maintainers; [ svrana ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+25

pkgs/tools/misc/code-minimap/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       rustPlatform.buildRustPackage rec {

     

       7
       7
       +
         pname = "code-minimap";

     

       8
       8
       +
         version = "0.4.3";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "wfxr";

     

       12
       12
       +
           repo = pname;

     

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

     

       14
       14
       +
           sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           description = "A high performance code minimap render";

     

       21
       21
       +
           homepage = "https://github.com/wfxr/code-minimap";

     

       22
       22
       +
           license = with licenses; [ asl20 /* or */ mit ];

     

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

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

pkgs/tools/networking/httpstat/default.nix

···

       2
       2
        
       

     

       3
       3
        
       pythonPackages.buildPythonApplication rec {

     

       4
       4
        
         pname = "httpstat";

     

       5
       5
       -
         version = "1.3.0";

     

       5
       5
       +
         version = "1.3.1";

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "reorx";

     

       8
       8
        
           repo = pname;

     

       9
       9
        
           rev = version;

     

       10
       10
       -
           sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1";

     

       10
       10
       +
           sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM=";

     

       11
       11
        
         };

     

       12
       12
        
         doCheck = false; # No tests

     

       13
       13
        
         buildInputs = [ glibcLocales ];

+21 -15

pkgs/top-level/all-packages.nix

···

       1867
       1867
        
       

     

       1868
       1868
        
         cpulimit = callPackage ../tools/misc/cpulimit { };

     

       1869
       1869
        
       

     

       1870
       1870
       +
         code-minimap = callPackage ../tools/misc/code-minimap { };

     

       1871
       1871
       +
       

     

       1870
       1872
        
         codesearch = callPackage ../tools/text/codesearch { };

     

       1871
       1873
        
       

     

       1872
       1874
        
         codec2 = callPackage ../development/libraries/codec2 { };

     
···

       15769
       15771
        
             suffix = "qt5";

     

       15770
       15772
        
           };

     

       15771
       15773
        
       

     

       15774
       15774
       +
           poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {

     

       15775
       15775
       +
             lcms = lcms2;

     

       15776
       15776
       +
             qt5Support = true;

     

       15777
       15777
       +
             suffix = "qt5";

     

       15778
       15778
       +
           };

     

       15779
       15779
       +
       

     

       15772
       15780
        
           pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };

     

       15773
       15781
        
       

     

       15774
       15782
        
           qca-qt5 = callPackage ../development/libraries/qca-qt5 { };

     
···

       19018
       19026
        
       

     

       19019
       19027
        
         go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };

     

       19020
       19028
        
       

     

       19029
       19029
       +
         go-minimock = callPackage ../development/tools/go-minimock { };

     

       19030
       19030
       +
       

     

       19021
       19031
        
         go-protobuf = callPackage ../development/tools/go-protobuf { };

     

       19022
       19032
        
       

     

       19023
       19033
        
         go-symbols = callPackage ../development/tools/go-symbols { };

     
···

       20700
       20710
        
       

     

       20701
       20711
        
         calibre = calibre-py3;

     

       20702
       20712
        
       

     

       20703
       20703
       -
         calligra = libsForQt514.callPackage ../applications/office/calligra {

     

       20713
       20713
       +
         calligra = libsForQt5.callPackage ../applications/office/calligra {

     

       20704
       20714
        
           openjpeg = openjpeg_1;

     

       20705
       20705
       -
           poppler = poppler_0_61.override {

     

       20706
       20706
       -
             qt5Support = true;

     

       20707
       20707
       -
             # Must be using the same qt version as calligra itself.

     

       20708
       20708
       -
             qtbase = qt514.qtbase;

     

       20709
       20709
       -
           };

     

       20715
       20715
       +
           # Must use the same Qt version as Calligra itself:

     

       20716
       20716
       +
           poppler = libsForQt5.poppler_0_61;

     

       20710
       20717
        
         };

     

       20711
       20718
        
       

     

       20712
       20719
        
         perkeep = callPackage ../applications/misc/perkeep { };

     
···

       22383
       22390
        
       

     

       22384
       22391
        
         k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };

     

       22385
       22392
        
       

     

       22386
       22386
       -
         kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };

     

       22393
       22393
       +
         kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };

     

       22387
       22394
        
       

     

       22388
       22388
       -
         kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {

     

       22395
       22395
       +
         kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {

     

       22389
       22396
        
           llvmPackages = llvmPackages_10;

     

       22390
       22397
        
         };

     

       22391
       22398
        
       

     

       22392
       22392
       -
         kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };

     

       22393
       22393
       -
         kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix {

     

       22399
       22399
       +
         kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };

     

       22400
       22400
       +
         kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix {

     

       22394
       22401
        
           python = python3;

     

       22395
       22402
        
         };

     

       22396
       22403
        
       

     
···

       24555
       24562
        
       

     

       24556
       24563
        
         tribler = callPackage ../applications/networking/p2p/tribler { };

     

       24557
       24564
        
       

     

       24558
       24558
       -
         trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };

     

       24565
       24565
       +
         trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };

     

       24559
       24566
        
       

     

       24560
       24567
        
         tudu = callPackage ../applications/office/tudu { };

     

       24561
       24568
        
       

     
···

       25374
       25381
        
       

     

       25375
       25382
        
         zam-plugins = callPackage ../applications/audio/zam-plugins { };

     

       25376
       25383
        
       

     

       25377
       25377
       -
         zanshin = libsForQt514.callPackage ../applications/office/zanshin {

     

       25384
       25384
       +
         zanshin = libsForQt5.callPackage ../applications/office/zanshin {

     

       25378
       25385
        
           boost = boost160;

     

       25379
       25386
        
         };

     

       25380
       25387
        
       

     
···

       25718
       25725
        
       

     

       25719
       25726
        
         dhewm3 = callPackage ../games/dhewm3 {};

     

       25720
       25727
        
       

     

       25721
       25721
       -
         digikam = libsForQt514.callPackage ../applications/graphics/digikam {};

     

       25728
       25728
       +
         digikam = libsForQt5.callPackage ../applications/graphics/digikam {};

     

       25722
       25729
        
       

     

       25723
       25730
        
         displaycal = callPackage ../applications/graphics/displaycal {};

     

       25724
       25731
        
       

     
···

       26607
       26614
        
         lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });

     

       26608
       26615
        
       

     

       26609
       26616
        
         lxqt = recurseIntoAttrs (import ../desktops/lxqt {

     

       26610
       26610
       -
           inherit qt5;

     

       26611
       26611
       -
           inherit libsForQt5;

     

       26612
       26617
        
           inherit pkgs;

     

       26613
       26618
        
           inherit (lib) makeScope;

     

       26619
       26619
       +
           inherit qt5 libsForQt5;

     

       26614
       26620
        
         });

     

       26615
       26621
        
       

     

       26616
       26622
        
         mate = recurseIntoAttrs (callPackage ../desktops/mate { });