commit f89e74dbcc1398d1747039313b1f5f89110d9db8 · pyrox.dev/nixpkgs

+5

flake.nix

···

       39
       39
        
                           modules = modules ++ [

     

       40
       40
        
                             ./nixos/modules/virtualisation/qemu-vm.nix

     

       41
       41
        
                             { virtualisation.useBootLoader = true; }

     

       42
       42
       +
                             ({ config, ... }: {

     

       43
       43
       +
                               virtualisation.useEFIBoot =

     

       44
       44
       +
                                 config.boot.loader.systemd-boot.enable ||

     

       45
       45
       +
                                 config.boot.loader.efi.canTouchEfiVariables;

     

       46
       46
       +
                             })

     

       42
       47
        
                           ];

     

       43
       48
        
                         })).config;

     

       44
       49
        
                     in

+5

nixos/default.nix

···

       22
       22
        
             [ configuration

     

       23
       23
        
               ./modules/virtualisation/qemu-vm.nix

     

       24
       24
        
               { virtualisation.useBootLoader = true; }

     

       25
       25
       +
               ({ config, ... }: {

     

       26
       26
       +
                 virtualisation.useEFIBoot =

     

       27
       27
       +
                   config.boot.loader.systemd-boot.enable ||

     

       28
       28
       +
                   config.boot.loader.efi.canTouchEfiVariables;

     

       29
       29
       +
               })

     

       25
       30
        
             ];

     

       26
       31
        
         }).config;

     

       27
       32

+29 -2

nixos/modules/services/ttys/getty.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         cfg = config.services.getty;

     

       6
       7
        
       

     

       7
       7
       -
         autologinArg = optionalString (config.services.getty.autologinUser != null) "--autologin ${config.services.getty.autologinUser}";

     

       8
       8
       -
         gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";

     

       8
       8
       +
         loginArgs = [

     

       9
       9
       +
           "--login-program" "${pkgs.shadow}/bin/login"

     

       10
       10
       +
         ] ++ optionals (cfg.autologinUser != null) [

     

       11
       11
       +
           "--autologin" cfg.autologinUser

     

       12
       12
       +
         ] ++ optionals (cfg.loginOptions != null) [

     

       13
       13
       +
           "--login-options" cfg.loginOptions

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       16
       16
       +
         gettyCmd = extraArgs:

     

       17
       17
       +
           "@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} "

     

       18
       18
       +
             + extraArgs;

     

       9
       19
        
       

     

       10
       20
        
       in

     

       11
       21
        
       

     
···

       28
       38
        
                 Username of the account that will be automatically logged in at the console.

     

       29
       39
        
                 If unspecified, a login prompt is shown as usual.

     

       30
       40
        
               '';

     

       41
       41
       +
             };

     

       42
       42
       +
       

     

       43
       43
       +
             loginOptions = mkOption {

     

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

     

       45
       45
       +
               default = null;

     

       46
       46
       +
               description = ''

     

       47
       47
       +
                 Template for arguments to be passed to

     

       48
       48
       +
                 <citerefentry><refentrytitle>login</refentrytitle>

     

       49
       49
       +
                 <manvolnum>1</manvolnum></citerefentry>.

     

       50
       50
       +
       

     

       51
       51
       +
                 See <citerefentry><refentrytitle>agetty</refentrytitle>

     

       52
       52
       +
                 <manvolnum>1</manvolnum></citerefentry> for details,

     

       53
       53
       +
                 including security considerations.  If unspecified, agetty

     

       54
       54
       +
                 will not be invoked with a <option>--login-options</option>

     

       55
       55
       +
                 option.

     

       56
       56
       +
               '';

     

       57
       57
       +
               example = "-h darkstar -- \u";

     

       31
       58
        
             };

     

       32
       59
        
       

     

       33
       60
        
             greetingLine = mkOption {

+11 -9

pkgs/applications/graphics/mtpaint/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub

     

       2
       2
       -
       , pkgconfig

     

       3
       3
       -
       , freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle

     

       2
       2
       +
       , pkg-config

     

       3
       3
       +
       , freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         p_name  = "mtPaint";

     

       8
       8
       -
         ver_maj = "3.49";

     

       9
       9
       -
         ver_min = "12";

     

       8
       8
       +
         ver_maj = "3.50";

     

       9
       9
       +
         ver_min = "01";

     

       10
       10
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "wjaguar";

     

       14
       14
        
           repo = p_name;

     

       15
       15
       -
           rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8";

     

       16
       16
       -
           sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";

     

       15
       15
       +
           rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";

     

       16
       16
       +
           sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       +
         nativeBuildInputs = [ pkg-config ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle

     

       21
       21
       +
           freetype giflib gtk3 lcms2 libjpeg libpng libtiff openjpeg gifsicle

     

       22
       22
        
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         configureFlags = [ "gtk3" "intl" "man" ];

     

       23
       25
        
       

     

       24
       26
        
         meta = {

     

       25
       27
        
           description = "A simple GTK painting program";

     
···

       33
       35
        
             GNU/Linux, Windows and older PC hardware.

     

       34
       36
        
           '';

     

       35
       37
        
           homepage = "http://mtpaint.sourceforge.net/";

     

       36
       36
       -
           license = stdenv.lib.licenses.gpl3;

     

       38
       38
       +
           license = stdenv.lib.licenses.gpl3Plus;

     

       37
       39
        
           platforms = stdenv.lib.platforms.linux;

     

       38
       40
        
           maintainers = [ stdenv.lib.maintainers.vklquevs ];

     

       39
       41
        
         };

+3 -3

pkgs/applications/networking/cluster/starboard/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "starboard";

     

       5
       5
       -
         version = "0.7.1";

     

       5
       5
       +
         version = "0.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "aquasecurity";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "0p0c459xih580ix3279fr45mm3q9w887rs7w1yrikh09xpcisdfr";

     

       11
       11
       +
           sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "07cz4p8k927ash5ncw1r56bcn592imgywbyzkvhnn50pap91m0q0";

     

       14
       14
       +
         vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "cmd/starboard" ];

     

       17
       17

+3 -2

pkgs/applications/networking/lieer/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "lieer";

     

       5
       5
       -
         version = "1.2";

     

       5
       5
       +
         version = "1.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gauteh";

     

       9
       9
        
           repo = "lieer";

     

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

     

       11
       11
       -
           sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5";

     

       11
       11
       +
           sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3Packages; [

     
···

       16
       16
        
           oauth2client

     

       17
       17
        
           google_api_python_client

     

       18
       18
        
           tqdm

     

       19
       19
       +
           setuptools

     

       19
       20
        
         ];

     

       20
       21
        
       

     

       21
       22
        
         meta = with stdenv.lib; {

+3 -3

pkgs/applications/version-management/pijul/default.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage rec {

     

       15
       15
        
         pname = "pijul";

     

       16
       16
       -
         version = "1.0.0-alpha.24";

     

       16
       16
       +
         version = "1.0.0-alpha.31";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchCrate {

     

       19
       19
        
           inherit version pname;

     

       20
       20
       -
           sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s";

     

       20
       20
       +
           sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44";

     

       23
       23
       +
         cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA";

     

       24
       24
        
       

     

       25
       25
        
         cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";

     

       26
       26

-1

pkgs/build-support/docker/default.nix

···

       35
       35
        
         system,  # Note: This is the cross system we're compiling for

     

       36
       36
        
       }:

     

       37
       37
        
       

     

       38
       38
       -
       # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.

     

       39
       38
        
       let

     

       40
       39
        
       

     

       41
       40
        
         mkDbExtraCommand = contents: let

+9 -2

pkgs/development/libraries/intel-media-driver/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub

     

       2
       2
        
       , cmake, pkg-config

     

       3
       3
       -
       , libva, libpciaccess, intel-gmmlib, libX11

     

       3
       3
       +
       , libva, libpciaccess, intel-gmmlib

     

       4
       4
       +
       , enableX11 ? true, libX11

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       stdenv.mkDerivation rec {

     
···

       23
       24
        
       

     

       24
       25
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       25
       26
        
       

     

       26
       26
       -
         buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];

     

       27
       27
       +
         buildInputs = [ libva libpciaccess intel-gmmlib ]

     

       28
       28
       +
           ++ stdenv.lib.optional enableX11 libX11;

     

       27
       29
        
       

     

       28
       30
        
         meta = with stdenv.lib; {

     

       29
       31
        
           description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";

     
···

       38
       40
        
           platforms = platforms.linux;

     

       39
       41
        
           maintainers = with maintainers; [ primeos jfrankenau ];

     

       40
       42
        
         };

     

       43
       43
       +
       

     

       44
       44
       +
         postFixup = stdenv.lib.optionalString enableX11 ''

     

       45
       45
       +
           patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11  ]}" \

     

       46
       46
       +
             $out/lib/dri/iHD_drv_video.so

     

       47
       47
       +
         '';

     

       41
       48
        
       }

+3 -2

pkgs/development/libraries/vtk/generic.nix

···

       1
       1
        
       { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:

     

       2
       2
       -
       { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff

     

       2
       2
       +
       { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff

     

       3
       3
        
       , fetchpatch

     

       4
       4
        
       , enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools

     

       5
       5
        
       , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."

     
···

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ cmake ];

     

       26
       26
        
       

     

       27
       27
       -
         buildInputs = [ libtiff ]

     

       27
       27
       +
         buildInputs = [ libpng libtiff ]

     

       28
       28
        
           ++ optionals enableQt [ qtbase qtx11extras qttools ]

     

       29
       29
        
           ++ optionals stdenv.isLinux [

     

       30
       30
        
             libGLU

     
···

       65
       65
        
         cmakeFlags = [

     

       66
       66
        
           "-DCMAKE_C_FLAGS=-fPIC"

     

       67
       67
        
           "-DCMAKE_CXX_FLAGS=-fPIC"

     

       68
       68
       +
           "-DVTK_USE_SYSTEM_PNG=ON"

     

       68
       69
        
           "-DVTK_USE_SYSTEM_TIFF=1"

     

       69
       70
        
           "-DOPENGL_INCLUDE_DIR=${libGL}/include"

     

       70
       71
        
           "-DCMAKE_INSTALL_LIBDIR=lib"

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname =  "boto3";

     

       16
       16
       -
         version = "1.16.50"; # N.B: if you change this, change botocore too

     

       16
       16
       +
         version = "1.16.51"; # N.B: if you change this, change botocore too

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-TVAqhCuB/axLlQ07iKW5BnzhGCE7Eisg9BkgA8sGeYY=";

     

       20
       20
       +
           sha256 = "sha256-EdxJJoLPKk+P85ewoQmDc0Dvk+d8ouZXFc4k7PBDcXw=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "botocore";

     

       15
       15
       -
         version = "1.19.50"; # N.B: if you change this, change boto3 and awscli to a matching version

     

       15
       15
       +
         version = "1.19.51"; # N.B: if you change this, change boto3 and awscli to a matching version

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "sha256-cJCQumG7p9+oMbQ31hy0aahSmNjzzluOEs30G9KyvGE=";

     

       19
       19
       +
           sha256 = "sha256-sgTFtHewQ8f2HLpdtHnGsl9oT3QJtxqOzbWms/V7XLQ=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+3 -3

pkgs/development/tools/golangci-lint/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "golangci-lint";

     

       5
       5
       -
         version = "1.33.0";

     

       5
       5
       +
         version = "1.35.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "golangci";

     

       9
       9
        
           repo = "golangci-lint";

     

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

     

       11
       11
       -
           sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin";

     

       11
       11
       +
           sha256 = "03pg8qfysjdbpxzdcs4y5cn0gshr5k53p7rjqak7q8vdykva60s1";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj";

     

       14
       14
       +
         vendorSha256 = "18dgx087jixwcfcab546qhy5qq1n1ahrsr7i7d7d3v9vklslics8";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+8 -8

pkgs/games/factorio/versions.json

···

       2
       2
        
         "x86_64-linux": {

     

       3
       3
        
           "alpha": {

     

       4
       4
        
             "experimental": {

     

       5
       5
       -
               "name": "factorio_alpha_x64-1.1.7.tar.xz",

     

       5
       5
       +
               "name": "factorio_alpha_x64-1.1.8.tar.xz",

     

       6
       6
        
               "needsAuth": true,

     

       7
       7
       -
               "sha256": "0wqrs5w5giybq47hfv5wwg7c36351kfsa5x06nvxls2znyl43qv8",

     

       7
       7
       +
               "sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m",

     

       8
       8
        
               "tarDirectory": "x64",

     

       9
       9
       -
               "url": "https://factorio.com/get-download/1.1.7/alpha/linux64",

     

       10
       10
       -
               "version": "1.1.7"

     

       9
       9
       +
               "url": "https://factorio.com/get-download/1.1.8/alpha/linux64",

     

       10
       10
       +
               "version": "1.1.8"

     

       11
       11
        
             },

     

       12
       12
        
             "stable": {

     

       13
       13
        
               "name": "factorio_alpha_x64-1.0.0.tar.xz",

     
···

       38
       38
        
           },

     

       39
       39
        
           "headless": {

     

       40
       40
        
             "experimental": {

     

       41
       41
       -
               "name": "factorio_headless_x64-1.1.7.tar.xz",

     

       41
       41
       +
               "name": "factorio_headless_x64-1.1.8.tar.xz",

     

       42
       42
        
               "needsAuth": false,

     

       43
       43
       -
               "sha256": "1s52p6cvd2v0pmj4gppc2pf8r6bpbzkmwpw8451j3ic58fhjvypr",

     

       43
       43
       +
               "sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf",

     

       44
       44
        
               "tarDirectory": "x64",

     

       45
       45
       -
               "url": "https://factorio.com/get-download/1.1.7/headless/linux64",

     

       46
       46
       -
               "version": "1.1.7"

     

       45
       45
       +
               "url": "https://factorio.com/get-download/1.1.8/headless/linux64",

     

       46
       46
       +
               "version": "1.1.8"

     

       47
       47
        
             },

     

       48
       48
        
             "stable": {

     

       49
       49
        
               "name": "factorio_headless_x64-1.0.0.tar.xz",

+12

pkgs/misc/vim-plugins/generated.nix

···

       4453
       4453
        
           meta.homepage = "https://github.com/qpkorr/vim-bufkill/";

     

       4454
       4454
        
         };

     

       4455
       4455
        
       

     

       4456
       4456
       +
         vim-capslock = buildVimPluginFrom2Nix {

     

       4457
       4457
       +
           pname = "vim-capslock";

     

       4458
       4458
       +
           version = "2021-01-07";

     

       4459
       4459
       +
           src = fetchFromGitHub {

     

       4460
       4460
       +
             owner = "tpope";

     

       4461
       4461
       +
             repo = "vim-capslock";

     

       4462
       4462
       +
             rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c";

     

       4463
       4463
       +
             sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja";

     

       4464
       4464
       +
           };

     

       4465
       4465
       +
           meta.homepage = "https://github.com/tpope/vim-capslock/";

     

       4466
       4466
       +
         };

     

       4467
       4467
       +
       

     

       4456
       4468
        
         vim-carbon-now-sh = buildVimPluginFrom2Nix {

     

       4457
       4469
        
           pname = "vim-carbon-now-sh";

     

       4458
       4470
        
           version = "2020-10-28";

+1

pkgs/misc/vim-plugins/vim-plugin-names

···

       550
       550
        
       tomtom/tcomment_vim

     

       551
       551
        
       tomtom/tlib_vim

     

       552
       552
        
       tpope/vim-abolish

     

       553
       553
       +
       tpope/vim-capslock

     

       553
       554
        
       tpope/vim-commentary

     

       554
       555
        
       tpope/vim-dadbod

     

       555
       556
        
       tpope/vim-dispatch

+84

pkgs/misc/vscode-extensions/default.nix

···

       63
       63
        
               };

     

       64
       64
        
             };

     

       65
       65
        
       

     

       66
       66
       +
             brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension {

     

       67
       67
       +
               mktplcRef = {

     

       68
       68
       +
                 name = "nixfmt-vscode";

     

       69
       69
       +
                 publisher = "brettm12345";

     

       70
       70
       +
                 version = "0.0.1";

     

       71
       71
       +
                 sha256 = "07w35c69vk1l6vipnq3qfack36qcszqxn8j3v332bl0w6m02aa7k";

     

       72
       72
       +
               };

     

       73
       73
       +
               meta = with stdenv.lib; {

     

       74
       74
       +
                 license = licenses.mpl20;

     

       75
       75
       +
               };

     

       76
       76
       +
             };

     

       77
       77
       +
       

     

       66
       78
        
             cmschuetz12.wal = buildVscodeMarketplaceExtension {

     

       67
       79
        
               mktplcRef = {

     

       68
       80
        
                 name = "wal";

     
···

       75
       87
        
               };

     

       76
       88
        
             };

     

       77
       89
        
       

     

       90
       90
       +
             coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension {

     

       91
       91
       +
               mktplcRef = {

     

       92
       92
       +
                 name = "bracket-pair-colorizer-2";

     

       93
       93
       +
                 publisher = "CoenraadS";

     

       94
       94
       +
                 version = "0.2.0";

     

       95
       95
       +
                 sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh";

     

       96
       96
       +
               };

     

       97
       97
       +
               meta = with stdenv.lib; {

     

       98
       98
       +
                 license = licenses.mit;

     

       99
       99
       +
               };

     

       100
       100
       +
             };

     

       101
       101
       +
       

     

       78
       102
        
             dhall.dhall-lang = buildVscodeMarketplaceExtension {

     

       79
       103
        
               mktplcRef = {

     

       80
       104
        
                 name = "dhall-lang";

     
···

       107
       131
        
               };

     

       108
       132
        
             };

     

       109
       133
        
       

     

       134
       134
       +
             formulahendry.auto-rename-tag = buildVscodeMarketplaceExtension {

     

       135
       135
       +
               mktplcRef = {

     

       136
       136
       +
                 name = "auto-rename-tag";

     

       137
       137
       +
                 publisher = "formulahendry";

     

       138
       138
       +
                 version = "0.1.6";

     

       139
       139
       +
                 sha256 = "0cqg9mxkyf41brjq2c764w42lzyn6ffphw6ciw7xnqk1h1x8wwbs";

     

       140
       140
       +
               };

     

       141
       141
       +
               meta = {

     

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

     

       143
       143
       +
               };

     

       144
       144
       +
             };

     

       145
       145
       +
       

     

       110
       146
        
             golang.Go = buildVscodeMarketplaceExtension {

     

       111
       147
        
               mktplcRef = {

     

       112
       148
        
                 name = "Go";

     
···

       131
       167
        
               };

     

       132
       168
        
             };

     

       133
       169
        
       

     

       170
       170
       +
             ibm.output-colorizer = buildVscodeMarketplaceExtension {

     

       171
       171
       +
               mktplcRef = {

     

       172
       172
       +
                 name = "output-colorizer";

     

       173
       173
       +
                 publisher = "IBM";

     

       174
       174
       +
                 version = "0.1.2";

     

       175
       175
       +
                 sha256 = "0i9kpnlk3naycc7k8gmcxas3s06d67wxr3nnyv5hxmsnsx5sfvb7";

     

       176
       176
       +
               };

     

       177
       177
       +
               meta = with stdenv.lib; {

     

       178
       178
       +
                 license = licenses.mit;

     

       179
       179
       +
               };

     

       180
       180
       +
             };

     

       181
       181
       +
       

     

       134
       182
        
             james-yu.latex-workshop = buildVscodeMarketplaceExtension {

     

       135
       183
        
               mktplcRef = {

     

       136
       184
        
                 name = "latex-workshop";

     
···

       140
       188
        
               };

     

       141
       189
        
               meta = with stdenv.lib; {

     

       142
       190
        
                 license = licenses.mit;

     

       191
       191
       +
               };

     

       192
       192
       +
             };

     

       193
       193
       +
       

     

       194
       194
       +
             jnoortheen.nix-ide = buildVscodeMarketplaceExtension {

     

       195
       195
       +
               mktplcRef = {

     

       196
       196
       +
                 name = "nix-ide";

     

       197
       197
       +
                 publisher = "jnoortheen";

     

       198
       198
       +
                 version = "0.1.7";

     

       199
       199
       +
                 sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm";

     

       200
       200
       +
               };

     

       201
       201
       +
               meta =  {

     

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

     

       143
       203
        
               };

     

       144
       204
        
             };

     

       145
       205
        
       

     
···

       297
       357
        
               };

     

       298
       358
        
             };

     

       299
       359
        
       

     

       360
       360
       +
             tyriar.sort-lines = buildVscodeMarketplaceExtension {

     

       361
       361
       +
               mktplcRef = {

     

       362
       362
       +
                 name = "sort-lines";

     

       363
       363
       +
                 publisher = "Tyriar";

     

       364
       364
       +
                 version = "1.9.0";

     

       365
       365
       +
                 sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl";

     

       366
       366
       +
               };

     

       367
       367
       +
               meta = {

     

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

     

       369
       369
       +
               };

     

       370
       370
       +
             };

     

       371
       371
       +
       

     

       300
       372
        
             vadimcn.vscode-lldb = callPackage ./vscode-lldb {

     

       301
       373
        
               lldb = llvmPackages_latest.lldb;

     

       374
       374
       +
             };

     

       375
       375
       +
       

     

       376
       376
       +
             vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension {

     

       377
       377
       +
               mktplcRef = {

     

       378
       378
       +
                 name = "highlight-matching-tag";

     

       379
       379
       +
                 publisher = "vincaslt";

     

       380
       380
       +
                 version = "0.10.0";

     

       381
       381
       +
                 sha256 = "1albwz3lc9i20if77inm1ipwws8apigvx24rbag3d1h3p4vwda49";

     

       382
       382
       +
               };

     

       383
       383
       +
               meta = {

     

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

     

       385
       385
       +
               };

     

       302
       386
        
             };

     

       303
       387
        
       

     

       304
       388
        
             ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};

+4 -3

pkgs/servers/sql/postgresql/ext/timescaledb.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "timescaledb";

     

       11
       11
       -
         version = "1.7.4";

     

       11
       11
       +
         version = "2.0.0";

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake ];

     

       14
       14
        
         buildInputs = [ postgresql openssl ];

     
···

       17
       17
        
           owner  = "timescale";

     

       18
       18
        
           repo   = "timescaledb";

     

       19
       19
        
           rev    = "refs/tags/${version}";

     

       20
       20
       -
           sha256 = "0w0sl5izwic3j1k94xhky2y4wkd8l18m5hcknj5vqxq3ryhxaszc";

     

       20
       20
       +
           sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];

     

       23
       23
       +
         # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream

     

       24
       24
       +
         cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DWARNINGS_AS_ERRORS=OFF" ];

     

       24
       25
        
       

     

       25
       26
        
         # Fix the install phase which tries to install into the pgsql extension dir,

     

       26
       27
        
         # and cannot be manually overridden. This is rather fragile but works OK.

+3 -3

pkgs/shells/zsh/oh-my-zsh/default.nix

···

       5
       5
        
       , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         version = "2021-01-05";

     

       8
       8
       +
         version = "2021-01-07";

     

       9
       9
        
         pname = "oh-my-zsh";

     

       10
       10
       -
         rev = "86f805280f6a8cf65d8d0a9380489aae4b72f767";

     

       10
       10
       +
         rev = "c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           inherit rev;

     

       14
       14
        
           owner = "ohmyzsh";

     

       15
       15
        
           repo = "ohmyzsh";

     

       16
       16
       -
           sha256 = "1wf4g1z7fvravsp020xdqvczf4kcw1nh3b22djlsgd97n8qgziaz";

     

       16
       16
       +
           sha256 = "13i4r2bhffdjcln5cml29m9gzw9m39yxcln49h3shpp7s1gl3z4a";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         installPhase = ''

+2 -2

pkgs/tools/admin/awscli/default.nix

···

       28
       28
        
       

     

       29
       29
        
       in with py.pkgs; buildPythonApplication rec {

     

       30
       30
        
         pname = "awscli";

     

       31
       31
       -
         version = "1.18.210"; # N.B: if you change this, change botocore to a matching version too

     

       31
       31
       +
         version = "1.18.211"; # N.B: if you change this, change botocore to a matching version too

     

       32
       32
        
       

     

       33
       33
        
         src = fetchPypi {

     

       34
       34
        
           inherit pname version;

     

       35
       35
       -
           sha256 = "sha256-kt12Dc58UpsdlMen3IeTvRzcZ0HnwArs2q3ojqUBEPw=";

     

       35
       35
       +
           sha256 = "sha256-dkPdr0Q05CjeNg1FKbye4Ndtfakido0wKR22Afls3Mk=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         postPatch = ''