commit 40b71c3159786e26785d0fbda27f0e2042c7f764 · pyrox.dev/nixpkgs

+16

pkgs/applications/editors/hexcurse/default.nix

···

       23
       23
        
             url = "https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch";

     

       24
       24
        
             sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix";

     

       25
       25
        
           })

     

       26
       26
       +
       

     

       27
       27
       +
           # Fix pending upstream inclusion for gcc10 -fno-common compatibility:

     

       28
       28
       +
           #  https://github.com/LonnyGomes/hexcurse/pull/28

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             name = "fno-common.patch";

     

       31
       31
       +
             url = "https://github.com/LonnyGomes/hexcurse/commit/9cf7c9dcd012656df949d06f2986b57db3a72bdc.patch";

     

       32
       32
       +
             sha256 = "1awsyxys4pd3gkkgyckgjg3njgqy07223kcmnpfdkidh2xb0s360";

     

       33
       33
       +
           })

     

       34
       34
       +
       

     

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

     

       36
       36
       +
           #  https://github.com/LonnyGomes/hexcurse/pull/40

     

       37
       37
       +
           (fetchpatch {

     

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

     

       39
       39
       +
             url = "https://github.com/LonnyGomes/hexcurse/commit/cb70d4a93a46102f488f471fad31a7cfc9fec025.patch";

     

       40
       40
       +
             sha256 = "19674zhhp7gc097kl4bxvi0gblq6jzjy8cw8961svbq5y3hv1v5y";

     

       41
       41
       +
           })

     

       26
       42
        
         ];

     

       27
       43
        
       

     

       28
       44
        
         meta = with lib; {

+2 -2

pkgs/applications/misc/gpxsee/default.nix

···

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "gpxsee";

     

       5
       5
       -
         version = "9.6";

     

       5
       5
       +
         version = "9.11";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "tumic0";

     

       9
       9
        
           repo = "GPXSee";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-Yj8lR8zgIV+gshea7rzLbMF84n1nyN3DytiIkr3B274=";

     

       11
       11
       +
           sha256 = "sha256-5FGdcmkVOxjDngVQIlXnH3OPRMjaixqJ2Xb239usUuo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = (substituteAll {

+2 -2

pkgs/applications/misc/sfm/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "sfm";

     

       5
       5
       -
         version = "0.3.1";

     

       5
       5
       +
         version = "0.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "afify";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-NmafUezwKK9bYPAWDNhegyjqkb4GY/i1WEtQ9puIaig=";

     

       11
       11
       +
           hash = "sha256-VwPux6n+azpR4qDkzZJia95pJJOaFDBBoz6/VwlC0zw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

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

+5 -4

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

···

       26
       26
        
           xorgproto

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         prePatch = ''substituteInPlace ./Makefile --replace /usr $out \

     

       30
       30
       -
                                                   --replace "CC = gcc" "#CC = gcc"'';

     

       29
       29
       +
         postPatch = ''

     

       30
       30
       +
           substituteInPlace ./Makefile \

     

       31
       31
       +
             --replace /usr $out \

     

       32
       32
       +
             --replace "CC = gcc" "#CC = gcc"

     

       33
       33
       +
         '';

     

       31
       34
        
       

     

       32
       35
        
         # Allow users set their own list of patches

     

       33
       36
        
         inherit patches;

     
···

       35
       38
        
         meta = with lib; {

     

       36
       39
        
           homepage = "http://www.6809.org.uk/evilwm/";

     

       37
       40
        
           description = "Minimalist window manager for the X Window System";

     

       38
       38
       -
       

     

       39
       41
        
           license = {

     

       40
       42
        
             shortName = "evilwm";

     

       41
       43
        
             fullName = "Custom, inherited from aewm and 9wm";

     

       42
       44
        
             url = "http://www.6809.org.uk/evilwm/";

     

       43
       45
        
             free = true;

     

       44
       46
        
           }; # like BSD/MIT, but Share-Alike'y; See README.

     

       45
       45
       -
       

     

       46
       47
        
           maintainers = with maintainers; [ amiloradovsky ];

     

       47
       48
        
           platforms = platforms.all;

     

       48
       49
        
         };

+20 -16

pkgs/applications/window-managers/i3/lock-fancy.nix

···

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
       -
         rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a";

     

       15
       14
        
         pname = "i3lock-fancy";

     

       16
       16
       -
         version = "unstable-2018-11-25_rev${builtins.substring 0 7 rev}";

     

       15
       15
       +
         version = "unstable-2018-11-25";

     

       16
       16
       +
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "meskarune";

     

       19
       19
        
           repo = "i3lock-fancy";

     

       20
       20
       -
           inherit rev;

     

       20
       20
       +
           rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a";

     

       21
       21
        
           sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1";

     

       22
       22
        
         };

     

       23
       23
       -
         patchPhase = ''

     

       24
       24
       -
           sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy

     

       25
       25
       -
           sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy

     

       26
       26
       -
           sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy

     

       27
       27
       -
           sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy

     

       28
       28
       -
           sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy

     

       29
       29
       -
           sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy

     

       30
       30
       -
           sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy

     

       31
       31
       -
           sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy

     

       32
       32
       -
           sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy

     

       33
       33
       -
           sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy

     

       34
       34
       -
           sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy

     

       35
       35
       -
           sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" i3lock-fancy

     

       23
       23
       +
       

     

       24
       24
       +
         postPatch = ''

     

       25
       25
       +
           sed -i i3lock-fancy \

     

       26
       26
       +
             -e "s|mktemp|${coreutils}/bin/mktemp|" \

     

       27
       27
       +
             -e "s|'rm -f |'${coreutils}/bin/rm -f |" \

     

       28
       28
       +
             -e "s|scrot -z |${scrot}/bin/scrot -z |" \

     

       29
       29
       +
             -e "s|convert |${imagemagick.out}/bin/convert |" \

     

       30
       30
       +
             -e "s|awk -F|${gawk}/bin/awk -F|" \

     

       31
       31
       +
             -e "s| awk | ${gawk}/bin/awk |" \

     

       32
       32
       +
             -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" \

     

       33
       33
       +
             -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \

     

       34
       34
       +
             -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' \

     

       35
       35
       +
             -e "s|getopt |${getopt}/bin/getopt |" \

     

       36
       36
       +
             -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" \

     

       37
       37
       +
             -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|"

     

       36
       38
        
           rm Makefile

     

       37
       39
        
         '';

     

       40
       40
       +
       

     

       38
       41
        
         installPhase = ''

     

       39
       42
        
           mkdir -p $out/bin $out/share/i3lock-fancy/icons

     

       40
       43
        
           cp i3lock-fancy $out/bin/i3lock-fancy

     

       41
       44
        
           cp icons/lock*.png $out/share/i3lock-fancy/icons

     

       42
       45
        
         '';

     

       46
       46
       +
       

     

       43
       47
        
         meta = with lib; {

     

       44
       48
        
           description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text";

     

       45
       49
        
           homepage = "https://github.com/meskarune/i3lock-fancy";

+13 -7

pkgs/applications/window-managers/ion-3/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "ion";

     

       4
       4
       +
         pname = "ion";

     

       5
       5
        
         version = "3-20090110";

     

       6
       6
       -
         meta = {

     

       7
       7
       -
           description = "Tiling tabbed window manager designed with keyboard users in mind";

     

       8
       8
       -
           homepage = "http://modeemi.fi/~tuomov/ion";

     

       9
       9
       -
           platforms = with lib.platforms; linux;

     

       10
       10
       -
           license = lib.licenses.lgpl21;

     

       11
       11
       -
         };

     

       6
       6
       +
       

     

       12
       7
        
         src = fetchurl {

     

       13
       8
        
           url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz";

     

       14
       9
        
           sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";

     

       15
       10
        
         };

     

       11
       11
       +
       

     

       16
       12
        
         buildInputs = [ xlibsWrapper lua gettext groff ];

     

       13
       13
       +
       

     

       17
       14
        
         buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];

     

       15
       15
       +
       

     

       18
       16
        
         installFlags = [ "PREFIX=\${out}" ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "Tiling tabbed window manager designed with keyboard users in mind";

     

       20
       20
       +
           homepage = "http://modeemi.fi/~tuomov/ion";

     

       21
       21
       +
           platforms = with platforms; linux;

     

       22
       22
       +
           license = licenses.lgpl21;

     

       23
       23
       +
           maintainers = with maintainers; [ ];

     

       24
       24
       +
         };

     

       19
       25
        
       }

+3 -5

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

···

       1
       1
        
       { lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation {

     

       6
       6
       -
         name = "tabbed";

     

       7
       7
       -
         version = "unstable-20180310";

     

       4
       4
       +
         pname = "tabbed";

     

       5
       5
       +
         version = "unstable-2018-03-10";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchgit {

     

       10
       8
        
           url = "https://git.suckless.org/tabbed";

     
···

       24
       22
        
           "PREFIX=$(out)"

     

       25
       23
        
         ];

     

       26
       24
        
       

     

       27
       27
       -
         meta = {

     

       25
       25
       +
         meta = with lib; {

     

       28
       26
        
           homepage = "https://tools.suckless.org/tabbed";

     

       29
       27
        
           description = "Simple generic tabbed fronted to xembed aware applications";

     

       30
       28
        
           license = licenses.mit;

+5 -4

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

···

       4
       4
        
         pname = "trayer";

     

       5
       5
        
         version = "1.1.8";

     

       6
       6
        
       

     

       7
       7
       -
         nativeBuildInputs = [ pkg-config ];

     

       8
       8
       -
         buildInputs = [ gdk-pixbuf gtk2 ];

     

       9
       9
       -
       

     

       10
       7
        
         src = fetchFromGitHub {

     

       11
       8
        
           owner = "sargon";

     

       12
       9
        
           repo = "trayer-srg";

     
···

       14
       11
        
           sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg";

     

       15
       12
        
         };

     

       16
       13
        
       

     

       17
       17
       -
         preConfigure = ''

     

       14
       14
       +
         postPatch = ''

     

       18
       15
        
           patchShebangs configure

     

       19
       16
        
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [ pkg-config ];

     

       19
       19
       +
       

     

       20
       20
       +
         buildInputs = [ gdk-pixbuf gtk2 ];

     

       20
       21
        
       

     

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

     

       22
       23

+4

pkgs/development/interpreters/clisp/default.nix

···

       82
       82
        
           cd builddir

     

       83
       83
        
         '';

     

       84
       84
        
       

     

       85
       85
       +
         # Fails to build in parallel due to missing gnulib header dependency used in charstrg.d:

     

       86
       86
       +
         #   ../src/charstrg.d:319:10: fatal error: uniwidth.h: No such file or directory

     

       87
       87
       +
         enableParallelBuilding = false;

     

       88
       88
       +
       

     

       85
       89
        
         postInstall =

     

       86
       90
        
           lib.optionalString (withModules != [])

     

       87
       91
        
             (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''

+12 -11

pkgs/development/libraries/nco/default.nix

···

       1
       1
        
       { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "5.0.1";

     

       5
       4
        
         pname = "nco";

     

       6
       6
       -
       

     

       7
       7
       -
         nativeBuildInputs = [ flex which antlr2 ];

     

       8
       8
       -
         buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];

     

       5
       5
       +
         version = "5.0.3";

     

       9
       6
        
       

     

       10
       7
        
         src = fetchzip {

     

       11
       8
        
           url = "https://github.com/nco/nco/archive/${version}.tar.gz";

     

       12
       12
       -
           sha256 = "sha256-Mdnko+0ZuMoKgBp//+rCVsbFJx90Tmrnal7FAmwIKEQ=";

     

       9
       9
       +
           sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw=";

     

       13
       10
        
         };

     

       14
       11
        
       

     

       15
       15
       -
         prePatch = ''

     

       12
       12
       +
         nativeBuildInputs = [ flex which antlr2 ];

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];

     

       15
       15
       +
       

     

       16
       16
       +
         postPatch = ''

     

       16
       17
        
           substituteInPlace src/nco/nco_fl_utl.c \

     

       17
       18
        
             --replace "/bin/cp" "${coreutils}/bin/cp"

     

       18
       19
        
           substituteInPlace src/nco/nco_fl_utl.c \

     

       19
       20
        
             --replace "/bin/mv" "${coreutils}/bin/mv"

     

       20
       21
        
         '';

     

       21
       22
        
       

     

       22
       22
       -
         parallelBuild = true;

     

       23
       23
       +
         enableParallelBuilding = true;

     

       23
       24
        
       

     

       24
       24
       -
         meta = {

     

       25
       25
       +
         meta = with lib; {

     

       25
       26
        
           description = "NetCDF Operator toolkit";

     

       26
       27
        
           longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";

     

       27
       28
        
           homepage = "http://nco.sourceforge.net/";

     

       28
       28
       -
           license = lib.licenses.bsd3;

     

       29
       29
       -
           maintainers = [ lib.maintainers.bzizou ];

     

       30
       30
       -
           platforms = lib.platforms.linux;

     

       29
       29
       +
           license = licenses.bsd3;

     

       30
       30
       +
           maintainers = with maintainers; [ bzizou ];

     

       31
       31
       +
           platforms = platforms.linux;

     

       31
       32
        
         };

     

       32
       33
        
       }

+2 -2

pkgs/development/libraries/wolfssl/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "wolfssl";

     

       9
       9
       -
         version = "4.8.1";

     

       9
       9
       +
         version = "5.0.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "wolfSSL";

     

       13
       13
        
           repo = "wolfssl";

     

       14
       14
        
           rev = "v${version}-stable";

     

       15
       15
       -
           sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h";

     

       15
       15
       +
           sha256 = "sha256-rv9D+P42RMH1O4YLQbZIEkD6KQfs8KgYjhnHeA9vQqE=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "zeroconf";

     

       13
       13
       -
         version = "0.36.11";

     

       13
       13
       +
         version = "0.36.12";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
         disabled = pythonOlder "3.6";

     

       16
       16
        
       

     
···

       19
       19
        
           owner = "jstasiak";

     

       20
       20
        
           repo = "python-zeroconf";

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-MGaikOO4vdBRCR+jYHr38FGOdg2rjypK5z0UY5lThY4=";

     

       22
       22
       +
           sha256 = "sha256-W66tL5uVcOhdahtYDYS8WYKXiz58UL6yEUp0uL9u5SI=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+3 -2

pkgs/development/tools/database/sqlfluff/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "sqlfluff";

     

       8
       8
       -
         version = "0.7.1";

     

       8
       8
       +
         version = "0.8.1";

     

       9
       9
        
         disabled = python3.pythonOlder "3.6";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = pname;

     

       13
       13
        
           repo = pname;

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           sha256 = "sha256-kNoUoelD4EiNWZlXvOrWNPX+wsLCwY3329rJf83l7Wg=";

     

       15
       15
       +
           sha256 = "sha256-p2vRHJ7IDjGpAqWLkAHIjNCFRvUfpkvwVtixz8wWR8I=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = with python3.pkgs; [

     
···

       28
       28
        
           pytest

     

       29
       29
        
           tblib

     

       30
       30
        
           toml

     

       31
       31
       +
           tqdm

     

       31
       32
        
           typing-extensions

     

       32
       33
        
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       33
       34
        
           dataclasses

+3 -3

pkgs/development/tools/parsing/tree-sitter/grammar.nix

···

       51
       51
        
           runHook postInstall

     

       52
       52
        
         '';

     

       53
       53
        
       

     

       54
       54
       -
         # Auto strip cannot detect files missing extension.

     

       55
       55
       -
         fixupPhase = ''

     

       54
       54
       +
         # Strip failed on darwin: strip: error: symbols referenced by indirect symbol table entries that can't be stripped

     

       55
       55
       +
         fixupPhase = lib.optionalString stdenv.isLinux ''

     

       56
       56
        
           runHook preFixup

     

       57
       57
       -
           strip -s $out/parser

     

       57
       57
       +
           $STRIP $out/parser

     

       58
       58
        
           runHook postFixup

     

       59
       59
        
         '';

     

       60
       60
        
       }

+1

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix

···

       3
       3
        
       {

     

       4
       4
        
         tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json;

     

       5
       5
        
         tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;

     

       6
       6
       +
         tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json;

     

       6
       7
        
         tree-sitter-c = lib.importJSON ./tree-sitter-c.json;

     

       7
       8
        
         tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json;

     

       8
       9
        
         tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json;

+10

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/polarmutex/tree-sitter-beancount",

     

       3
       3
       +
         "rev": "79ae7c1f2654a2a6936b0f37bf754e5ff59c9186",

     

       4
       4
       +
         "date": "2021-09-07T00:09:23-04:00",

     

       5
       5
       +
         "path": "/nix/store/adv2yl8kr4pk6430iclkppirhb5ibcqc-tree-sitter-beancount",

     

       6
       6
       +
         "sha256": "1g2p2dnxm50l7npg2cbycwcfz9c9682bj02nrlycyjhwl4may9dn",

     

       7
       7
       +
         "fetchSubmodules": false,

     

       8
       8
       +
         "deepClone": false,

     

       9
       9
       +
         "leaveDotGit": false

     

       10
       10
       +
       }

+4

pkgs/development/tools/parsing/tree-sitter/update.nix

···

       70
       70
        
         # If you need a grammar that already exists in the official orga,

     

       71
       71
        
         # make sure to give it a different name.

     

       72
       72
        
         otherGrammars = {

     

       73
       73
       +
           "tree-sitter-beancount" = {

     

       74
       74
       +
             orga = "polarmutex";

     

       75
       75
       +
             repo = "tree-sitter-beancount";

     

       76
       76
       +
           };

     

       73
       77
        
           "tree-sitter-clojure" = {

     

       74
       78
        
             orga = "sogaiu";

     

       75
       79
        
             repo = "tree-sitter-clojure";

+4 -4

pkgs/misc/vscode-extensions/cpptools/default.nix

···

       50
       50
        
         mktplcRef = {

     

       51
       51
        
           name = "cpptools";

     

       52
       52
        
           publisher = "ms-vscode";

     

       53
       53
       -
           version = "1.0.1";

     

       53
       53
       +
           version = "1.7.1";

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
        
         vsix = fetchurl {

     

       57
       57
        
           name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";

     

       58
       58
        
           url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix";

     

       59
       59
       -
           sha256 = "1lb5pza2ny1ydan19596amabs1np10nq08yqsfbvvfw7zbg4gnyc";

     

       59
       59
       +
           sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk=";

     

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
        
         buildInputs = [

     
···

       77
       77
        
           touch "./install.lock"

     

       78
       78
        
       

     

       79
       79
        
           # Mono runtimes from nix package (used by generated `OpenDebugAD7`).

     

       80
       80
       -
           mv ./debugAdapters/OpenDebugAD7 ./debugAdapters/OpenDebugAD7_orig

     

       81
       81
       -
           cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7"

     

       80
       80
       +
           mv ./debugAdapters/bin/OpenDebugAD7 ./debugAdapters/bin/OpenDebugAD7_orig

     

       81
       81
       +
           cp -p "${openDebugAD7Script}" "./debugAdapters/bin/OpenDebugAD7"

     

       82
       82
        
       

     

       83
       83
        
           # Clang-format from nix package.

     

       84
       84
        
           mv  ./LLVM/ ./LLVM_orig

+2 -2

pkgs/misc/vscode-extensions/python/default.nix

···

       59
       59
        
         mktplcRef = {

     

       60
       60
        
           name = "python";

     

       61
       61
        
           publisher = "ms-python";

     

       62
       62
       -
           version = "2021.5.829140558";

     

       62
       62
       +
           version = "2021.11.1422169775";

     

       63
       63
        
         };

     

       64
       64
        
       

     

       65
       65
        
         vsix = fetchurl {

     

       66
       66
        
           name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";

     

       67
       67
        
           url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";

     

       68
       68
       -
           sha256 = "0y2HN4WGYUUXBfqp8Xb4oaA0hbLZmE3kDUXMBAOjvPQ=";

     

       68
       68
       +
           sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs=";

     

       69
       69
        
         };

     

       70
       70
        
       

     

       71
       71
        
         buildInputs = [

+2 -10

pkgs/misc/vscode-extensions/wakatime/default.nix

···

       8
       8
        
           mktplcRef = {

     

       9
       9
        
             name = "vscode-wakatime";

     

       10
       10
        
             publisher = "WakaTime";

     

       11
       11
       -
             version = "4.0.9";

     

       12
       12
       -
             sha256 = "0sm2fr9zbk1759r52dpnz9r7xbvxladlpinlf2i0hyaa06bhp3b1";

     

       11
       11
       +
             version = "17.1.0";

     

       12
       12
       +
             sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw";

     

       13
       13
        
           };

     

       14
       14
        
       

     

       15
       15
       -
           postPatch = ''

     

       16
       16
       -
             mkdir wakatime-cli

     

       17
       17
       -
             ln -s ${wakatime}/bin/wakatime ./wakatime-cli/wakatime-cli

     

       18
       18
       -
           '';

     

       19
       19
       -
       

     

       20
       15
        
           meta = with lib; {

     

       21
       16
        
             description = ''

     

       22
       17
        
               Visual Studio Code plugin for automatic time tracking and metrics generated

     

       23
       18
        
               from your programming activity

     

       24
       19
        
             '';

     

       25
       20
        
             license = licenses.bsd3;

     

       26
       26
       -
             maintainers = with maintainers; [

     

       27
       27
       -
               eadwu

     

       28
       28
       -
             ];

     

       29
       21
        
           };

     

       30
       22
        
         }

+4 -4

pkgs/tools/backup/gamerbackup/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule {

     

       4
       4
        
         pname = "gb-backup";

     

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

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "leijurv";

     

       9
       9
        
           repo = "gb";

     

       10
       10
       -
           rev = "fa996208d06766bf523686fbe5831628130d80f7";

     

       11
       11
       -
           sha256 = "1vggl8d69sf4z2lmixfndwwd6l9gi0fkkrxga7v4w7a7yr96b1vp";

     

       10
       10
       +
           rev = "61383d445af7b035fb8e1df0cacc424340dd16df";

     

       11
       11
       +
           sha256 = "sha256-YRrD2gW+gzxD2JwadCbF/SBSsHeeGPsa8kKZHHAytVo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx";

     

       14
       14
       +
         vendorSha256 = "sha256-H3Zf4VNJVX9C3GTeqU4YhNqCIQz1R55MfhrygDgJTxc=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17

+7 -16

pkgs/tools/misc/wakatime/default.nix

···

       1
       1
       -
       { lib, python3Packages, fetchFromGitHub, glibcLocales }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       with python3Packages;

     

       4
       4
       -
       buildPythonApplication rec {

     

       3
       3
       +
       buildGoModule rec {

     

       5
       4
        
         pname = "wakatime";

     

       6
       6
       -
         version = "13.0.7";

     

       5
       5
       +
         version = "1.18.7";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchFromGitHub {

     

       9
       8
        
           owner = "wakatime";

     

       10
       10
       -
           repo = "wakatime";

     

       11
       11
       -
           rev = version;

     

       12
       12
       -
           sha256 = "1rnapzaabg962wxrmfcq9lxz0yyqd3mxqbx3dq1ih4w33lf4fi8d";

     

       9
       9
       +
           repo = "wakatime-cli";

     

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

     

       11
       11
       +
           sha256 = "171x4pixmh5ni89iawdjl1fk9gr10bgp5bnslpskhspcqzyl1y5b";

     

       13
       12
        
         };

     

       14
       13
        
       

     

       15
       15
       -
         # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt

     

       16
       16
       -
         # especially nose-capturestderr, which we do not package yet.

     

       17
       17
       -
         doCheck = false;

     

       18
       18
       -
         checkInputs = [ mock testfixtures pytest glibcLocales ];

     

       19
       19
       -
       

     

       20
       20
       -
         checkPhase = ''

     

       21
       21
       -
           export HOME=$(mktemp -d) LC_ALL=en_US.utf-8

     

       22
       22
       -
           pytest tests

     

       23
       23
       -
         '';

     

       14
       14
       +
         vendorSha256 = "01c2vbnafhhm345nyfmvbvj5mga6laf9w46lhh0flq6kdgdw168s";

     

       24
       15
        
       

     

       25
       16
        
         meta = with lib; {

     

       26
       17
        
           inherit (src.meta) homepage;

+9 -3

pkgs/tools/networking/vpn-slice/default.nix

···

       1
       1
       -
       { lib, buildPythonApplication, python3Packages, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildPythonApplication, nix-update-script, python3Packages, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "vpn-slice";

     

       5
       5
       -
         version = "0.14";

     

       5
       5
       +
         version = "0.15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "dlenski";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr";

     

       11
       11
       +
           sha256 = "sha256-9JnRuJkpcgW1cEgJPiqFDYotNSCl7XcmbHS6D4E13gM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ];

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17
       +
       

     

       18
       18
       +
         passthru = {

     

       19
       19
       +
           updateScript = nix-update-script {

     

       20
       20
       +
             attrPath = pname;

     

       21
       21
       +
           };

     

       22
       22
       +
         };

     

       17
       23
        
       

     

       18
       24
        
         meta = with lib; {

     

       19
       25
        
           homepage = "https://github.com/dlenski/vpn-slice";