commit 71fa678899b621117dfb03e5e1444a67e454b6f1 · pyrox.dev/nixpkgs

+3 -3

pkgs/applications/misc/navi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "navi";

     

       5
       5
       -
         version = "2.15.0";

     

       5
       5
       +
         version = "2.16.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "denisidoro";

     

       9
       9
        
           repo = "navi";

     

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

     

       11
       11
       -
           sha256 = "sha256-qcfSGV/+FkyWGAApekRZHWGmeB9gIURt11DKn7lEh+o=";

     

       11
       11
       +
           sha256 = "sha256-ngSZFYGE+Varul/qwavMO3xcMIp8w2WETWXc573wYhQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-HpGzDZMIzO0lpussmm+kJNOU7zghcYrQWZo3WZ5FOmA=";

     

       14
       14
       +
         cargoSha256 = "sha256-qtxFTk0iCxPa4Z7H9+QWSii+iYrLUV2LfiAEbePdhOQ=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17

+7 -4

pkgs/applications/misc/obsidian/default.nix

···

       30
       30
        
       

     

       31
       31
        
       in stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "obsidian";

     

       33
       33
       -
         version = "0.11.13";

     

       33
       33
       +
         version = "0.12.3";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchurl {

     

       36
       36
       -
           url =

     

       37
       37
       -
             "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";

     

       38
       38
       -
           sha256 = "0QL1rP37pmdIdGM9eHa7PfW1GVrvn2fX4bQPqQ8FOpI=";

     

       36
       36
       +
           url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";

     

       37
       37
       +
           sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE=";

     

       39
       38
        
         };

     

       40
       39
        
       

     

       41
       40
        
         nativeBuildInputs = [ makeWrapper graphicsmagick ];

     

       42
       41
        
       

     

       43
       42
        
         installPhase = ''

     

       43
       43
       +
           runHook preInstall

     

       44
       44
       +
       

     

       44
       45
        
           mkdir -p $out/bin

     

       45
       46
        
       

     

       46
       47
        
           makeWrapper ${electron}/bin/electron $out/bin/obsidian \

     
···

       56
       57
        
             mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps

     

       57
       58
        
             gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png

     

       58
       59
        
           done

     

       60
       60
       +
       

     

       61
       61
       +
           runHook postInstall

     

       59
       62
        
         '';

     

       60
       63
        
       

     

       61
       64
        
         passthru.updateScript = updateScript;

+14 -4

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

···

       1
       1
       -
       { fetchgit, libcommuni, qtbase, qmake, lib, stdenv }:

     

       1
       1
       +
       { fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "communi";

     
···

       11
       11
        
           fetchSubmodules = true;

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ qmake ];

     

       14
       14
       +
         nativeBuildInputs = [ qmake ]

     

       15
       15
       +
           ++ lib.optional stdenv.isDarwin wrapQtAppsHook;

     

       15
       16
        
       

     

       16
       17
        
         buildInputs = [ libcommuni qtbase ];

     

       17
       18
        
       

     
···

       25
       26
        
       

     

       26
       27
        
         qmakeFlags = [

     

       27
       28
        
           "COMMUNI_INSTALL_PREFIX=${placeholder "out"}"

     

       28
       28
       -
           "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin"

     

       29
       29
        
           "COMMUNI_INSTALL_PLUGINS=${placeholder "out"}/lib/communi/plugins"

     

       30
       30
        
           "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor"

     

       31
       31
        
           "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications"

     

       32
       32
        
           "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes"

     

       33
       33
       +
           (if stdenv.isDarwin

     

       34
       34
       +
             then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ]

     

       35
       35
       +
             else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ])

     

       33
       36
        
         ];

     

       34
       37
        
       

     

       35
       35
       -
         postInstall = lib.optionalString stdenv.isLinux ''

     

       38
       38
       +
         postInstall = if stdenv.isDarwin then ''

     

       39
       39
       +
           # Nix qmake does not add the bundle rpath by default.

     

       40
       40
       +
           install_name_tool \

     

       41
       41
       +
             -add_rpath @executable_path/../Frameworks \

     

       42
       42
       +
             $out/Applications/Communi.app/Contents/MacOS/Communi

     

       43
       43
       +
       

     

       44
       44
       +
           wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi

     

       45
       45
       +
         '' else ''

     

       36
       46
        
           substituteInPlace "$out/share/applications/communi.desktop" \

     

       37
       47
        
             --replace "/usr/bin" "$out/bin"

     

       38
       48
        
         '';

+2 -2

pkgs/applications/video/gnomecast/default.nix

···

       1
       1
       -
       { stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       with python3Packages;

     

       4
       4
        
       buildPythonApplication rec {

     
···

       21
       21
        
         strictDeps = false;

     

       22
       22
        
       

     

       23
       23
        
         preFixup = ''

     

       24
       24
       -
           gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]})

     

       24
       24
       +
           gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]})

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         # no tests

+4 -5

pkgs/desktops/gnome/games/aisleriot/default.nix

···

       1
       1
        
       { lib, stdenv

     

       2
       2
        
       , fetchFromGitLab

     

       3
       3
       +
       , nix-update-script

     

       3
       4
        
       , pkg-config

     

       4
       4
       -
       , gnome

     

       5
       5
        
       , itstool

     

       6
       6
        
       , gtk3

     

       7
       7
        
       , wrapGAppsHook

     
···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "aisleriot";

     

       22
       22
       -
         version = "3.22.13";

     

       22
       22
       +
         version = "3.22.16";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitLab {

     

       25
       25
        
           domain = "gitlab.gnome.org";

     

       26
       26
        
           owner = "GNOME";

     

       27
       27
        
           repo = pname;

     

       28
       28
        
           rev = version;

     

       29
       29
       -
           sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k";

     

       29
       29
       +
           sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     
···

       61
       61
        
         ];

     

       62
       62
        
       

     

       63
       63
        
         passthru = {

     

       64
       64
       -
           updateScript = gnome.updateScript {

     

       65
       65
       -
             packageName = pname;

     

       64
       64
       +
           updateScript = nix-update-script {

     

       66
       65
        
             attrPath = "gnome.${pname}";

     

       67
       66
        
           };

     

       68
       67
        
         };

+1 -1

pkgs/development/compilers/ghdl/default.nix

···

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")

     

       28
       28
       -
           "--with-llvm-config=${llvm}/bin/llvm-config";

     

       28
       28
       +
           "--with-llvm-config=${llvm.dev}/bin/llvm-config";

     

       29
       29
        
       

     

       30
       30
        
         hardeningDisable = [ "format" ];

     

       31
       31

+3 -1

pkgs/development/libraries/libcommuni/default.nix

···

       19
       19
        
         enableParallelBuilding = true;

     

       20
       20
        
       

     

       21
       21
        
         dontUseQmakeConfigure = true;

     

       22
       22
       -
         configureFlags = [ "-config" "release" ];

     

       22
       22
       +
         configureFlags = [ "-config" "release" ]

     

       23
       23
       +
           # Build mixes up dylibs/frameworks if one is not explicitely specified.

     

       24
       24
       +
           ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ];

     

       23
       25
        
       

     

       24
       26
        
         dontWrapQtApps = true;

     

       25
       27

+2 -2

pkgs/development/libraries/libxmlb/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "libxmlb";

     

       18
       18
       -
         version = "0.3.0";

     

       18
       18
       +
         version = "0.3.1";

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];

     

       21
       21
        
       

     
···

       23
       23
        
           owner = "hughsie";

     

       24
       24
        
           repo = "libxmlb";

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c=";

     

       26
       26
       +
           sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         patches = [

+32 -5

pkgs/development/libraries/mapnik/default.nix

···

       23
       23
        
       

     

       24
       24
        
         buildInputs =

     

       25
       25
        
           [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff

     

       26
       26
       -
             libwebp libxml2 proj python sqlite zlib

     

       26
       26
       +
             libwebp proj python sqlite zlib

     

       27
       27
        
       

     

       28
       28
        
             # optional inputs

     

       29
       29
        
             postgresql

     

       30
       30
        
           ];

     

       31
       31
        
       

     

       32
       32
       +
         propagatedBuildInputs = [ libxml2 ];

     

       33
       33
       +
       

     

       32
       34
        
         prefixKey = "PREFIX=";

     

       33
       35
        
       

     

       34
       36
        
         preConfigure = ''

     

       35
       37
        
           patchShebangs ./configure

     

       36
       38
        
         '';

     

       37
       39
        
       

     

       40
       40
       +
         # NOTE: 2021-05-06:

     

       41
       41
       +
         # Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 for backwards compatibility

     

       42
       42
       +
         # with major versions 6 and 7 of proj which are otherwise not compatible

     

       43
       43
       +
         # with mapnik 3.1.0. Note that:

     

       44
       44
       +
         #

     

       45
       45
       +
         # 1. Starting with proj version 8, this workaround will no longer be

     

       46
       46
       +
         #    supported by the upstream proj project.

     

       47
       47
       +
         #

     

       48
       48
       +
         # 2. Without the workaround, mapnik configures itself without proj support.

     

       49
       49
       +
         #

     

       50
       50
       +
         # 3. The master branch of mapnik (after 3.1.0) appears to add native support

     

       51
       51
       +
         #    for the proj 6 api, so this workaround is not likely to be needed in

     

       52
       52
       +
         #    subsequent mapnik releases. At that point, this block comment and the

     

       53
       53
       +
         #    NIX_CFLAGS_COMPILE expression can be removed.

     

       54
       54
       +
       

     

       55
       55
       +
         NIX_CFLAGS_COMPILE =

     

       56
       56
       +
           if version != "3.1.0" && lib.versionAtLeast version "3.1.0"

     

       57
       57
       +
           then throw "The mapnik compatibility workaround for proj 6 may no longer be required. Remove workaround after checking."

     

       58
       58
       +
           else if lib.versionAtLeast (lib.getVersion proj) "8"

     

       59
       59
       +
           then throw ("mapnik currently requires a version of proj less than 8, but proj version is: " + (lib.getVersion proj))

     

       60
       60
       +
           else "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";

     

       61
       61
       +
       

     

       38
       62
        
         configureFlags = [

     

       39
       63
        
           "BOOST_INCLUDES=${boost.dev}/include"

     

       40
       64
        
           "BOOST_LIBS=${boost.out}/lib"

     
···

       51
       75
        
           "JPEG_LIBS=${libjpeg.out}/lib"

     

       52
       76
        
           "PNG_INCLUDES=${libpng.dev}/include"

     

       53
       77
        
           "PNG_LIBS=${libpng.out}/lib"

     

       54
       54
       -
           "PROJ_INCLUDES=${proj}/include"

     

       55
       55
       -
           "PROJ_LIBS=${proj}/lib"

     

       78
       78
       +
           "PROJ_INCLUDES=${proj.dev}/include"

     

       79
       79
       +
           "PROJ_LIBS=${proj.out}/lib"

     

       56
       80
        
           "SQLITE_INCLUDES=${sqlite.dev}/include"

     

       57
       81
        
           "SQLITE_LIBS=${sqlite.out}/lib"

     

       58
       82
        
           "TIFF_INCLUDES=${libtiff.dev}/include"

     

       59
       83
        
           "TIFF_LIBS=${libtiff.out}/lib"

     

       60
       84
        
           "WEBP_INCLUDES=${libwebp}/include"

     

       61
       85
        
           "WEBP_LIBS=${libwebp}/lib"

     

       62
       62
       -
           "XML2_INCLUDES=${libxml2.dev}/include"

     

       63
       63
       -
           "XML2_LIBS=${libxml2.out}/lib"

     

       86
       86
       +
           "XMLPARSER=libxml2"

     

       87
       87
       +
         ];

     

       88
       88
       +
       

     

       89
       89
       +
         buildFlags = [

     

       90
       90
       +
           "JOBS=$(NIX_BUILD_CORES)"

     

       64
       91
        
         ];

     

       65
       92
        
       

     

       66
       93
        
         meta = with lib; {

+2 -2

pkgs/development/libraries/md4c/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "md4c";

     

       10
       10
       -
         version = "0.4.7";

     

       10
       10
       +
         version = "0.4.8";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "mity";

     

       14
       14
        
           repo = pname;

     

       15
       15
        
           rev = "release-${version}";

     

       16
       16
       -
           hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ=";

     

       16
       16
       +
           hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

+4 -2

pkgs/development/libraries/webkitgtk/default.nix

···

       53
       53
        
       , xdg-dbus-proxy

     

       54
       54
        
       , substituteAll

     

       55
       55
        
       , glib

     

       56
       56
       +
       , addOpenGLRunpath

     

       56
       57
        
       }:

     

       57
       58
        
       

     

       58
       59
        
       assert enableGeoLocation -> geoclue2 != null;

     

       59
       60
        
       

     

       60
       61
        
       stdenv.mkDerivation rec {

     

       61
       62
        
         pname = "webkitgtk";

     

       62
       62
       -
         version = "2.32.0";

     

       63
       63
       +
         version = "2.32.1";

     

       63
       64
        
       

     

       64
       65
        
         outputs = [ "out" "dev" ];

     

       65
       66
        
       

     
···

       67
       68
        
       

     

       68
       69
        
         src = fetchurl {

     

       69
       70
        
           url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";

     

       70
       70
       -
           sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";

     

       71
       71
       +
           sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k";

     

       71
       72
        
         };

     

       72
       73
        
       

     

       73
       74
        
         patches = lib.optionals stdenv.isLinux [

     

       74
       75
        
           (substituteAll {

     

       75
       76
        
             src = ./fix-bubblewrap-paths.patch;

     

       76
       77
        
             inherit (builtins) storeDir;

     

       78
       78
       +
             inherit (addOpenGLRunpath) driverLink;

     

       77
       79
        
           })

     

       78
       80
        
           ./libglvnd-headers.patch

     

       79
       81
        
         ];

+3 -11

pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch

···

       1
       1
        
       diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

     

       2
       2
        
       --- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	2019-09-09 04:47:07.000000000 -0400

     

       3
       3
        
       +++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	2019-09-20 21:14:10.537921173 -0400

     

       4
       4
       -
       @@ -585,7 +585,7 @@

     

       5
       5
       -
                { SCMP_SYS(keyctl), nullptr },

     

       6
       6
       -
                { SCMP_SYS(request_key), nullptr },

     

       7
       7
       -
        

     

       8
       8
       -
       -        // Scary VM/NUMA ops 

     

       9
       9
       -
       +        // Scary VM/NUMA ops

     

       10
       10
       -
                { SCMP_SYS(move_pages), nullptr },

     

       11
       11
       -
                { SCMP_SYS(mbind), nullptr },

     

       12
       12
       -
                { SCMP_SYS(get_mempolicy), nullptr },

     

       13
       13
       -
       @@ -724,6 +724,11 @@

     

       4
       4
       +
       @@ -724,6 +724,12 @@

     

       14
       5
        
                "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",

     

       15
       6
        
        

     

       16
       7
        
                "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,

     
···

       18
       9
        
       +        // Nix Directories

     

       19
       10
        
       +        "--ro-bind", "@storeDir@", "@storeDir@",

     

       20
       11
        
       +        "--ro-bind", "/run/current-system", "/run/current-system",

     

       21
       21
       -
       +        "--ro-bind", "/run/opengl-driver", "/run/opengl-driver",

     

       12
       12
       +
       +        "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib",

     

       13
       13
       +
       +        "--ro-bind-try", "@driverLink@/share", "@driverLink@/share",

     

       22
       14
        
            };

     

       23
       15
        
            // We would have to parse ld config files for more info.

     

       24
       16
        
            bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");

+1

pkgs/development/php-packages/apcu_bc/default.nix

···

       15
       15
        
         '';

     

       16
       16
        
       

     

       17
       17
        
         meta.maintainers = lib.teams.php.members;

     

       18
       18
       +
         meta.broken = lib.versionAtLeast php.version "8";

     

       18
       19
        
       }

+3 -5

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "aioasuswrt";

     

       12
       12
       -
         version = "1.3.3";

     

       12
       12
       +
         version = "1.3.4";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "kennedyshead";

     

       16
       16
        
           repo = pname;

     

       17
       17
       -
           rev = "V${version}";

     

       18
       18
       -
           sha256 = "1h1qwc7szgrcwiz4q6x4mlf26is20lj1ds5rcb9i611j26656v6d";

     

       17
       17
       +
           rev = version;

     

       18
       18
       +
           sha256 = "101d76zarvilzfmcy8n3bjqzyars8hsjzr0zc80d4rngv4vhrki1";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

     

       22
       22
       -
           substituteInPlace setup.py \

     

       23
       23
       -
             --replace "cryptography==3.3.2" "cryptography"

     

       24
       22
        
           substituteInPlace setup.cfg \

     

       25
       23
        
             --replace "--cov-report html" "" \

     

       26
       24
        
             --replace "--cov-report term-missing" ""

+25 -54

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

···

       1
       1
       -
       { buildPythonPackage

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , isPy3k

     

       4
       4
       -
       , glibcLocales

     

       5
       5
       -
       , lib

     

       6
       6
       -
       , pythonOlder

     

       7
       7
       -
       

     

       1
       1
       +
       { lib

     

       8
       2
        
       , aiohttp

     

       9
       9
       -
       , aiohttp-swagger

     

       10
       3
        
       , aiohttp-jinja2

     

       4
       4
       +
       , aiohttp-remotes

     

       5
       5
       +
       , aiohttp-swagger

     

       6
       6
       +
       , buildPythonPackage

     

       11
       7
        
       , clickclick

     

       12
       8
        
       , decorator

     

       13
       13
       -
       , flake8

     

       9
       9
       +
       , fetchFromGitHub

     

       14
       10
        
       , flask

     

       15
       15
       -
       , gevent

     

       16
       11
        
       , inflection

     

       17
       12
        
       , jsonschema

     

       18
       18
       -
       , mock

     

       19
       13
        
       , openapi-spec-validator

     

       20
       20
       -
       , pathlib

     

       21
       21
       -
       , pytest

     

       22
       14
        
       , pytest-aiohttp

     

       23
       23
       -
       , pytestcov

     

       15
       15
       +
       , pytestCheckHook

     

       16
       16
       +
       , pythonOlder

     

       24
       17
        
       , pyyaml

     

       25
       18
        
       , requests

     

       26
       26
       -
       , six

     

       27
       19
        
       , swagger-ui-bundle

     

       28
       20
        
       , testfixtures

     

       29
       29
       -
       , typing ? null

     

       30
       30
       -
       , ujson

     

       31
       21
        
       }:

     

       32
       22
        
       

     

       33
       23
        
       buildPythonPackage rec {

     

       34
       24
        
         pname = "connexion";

     

       35
       35
       -
         version = "2.4.0";

     

       25
       25
       +
         version = "2.7.0";

     

       26
       26
       +
         disabled = pythonOlder "3.6";

     

       36
       27
        
       

     

       37
       37
       -
         # we're fetching from GitHub because tests weren't distributed on PyPi

     

       38
       28
        
         src = fetchFromGitHub {

     

       39
       29
        
           owner = "zalando";

     

       40
       30
        
           repo = pname;

     

       41
       31
        
           rev = version;

     

       42
       42
       -
           sha256 = "1b9q027wrks0afl7l3a1wxymz3aick26b9fq2m07pc5wb9np0vvg";

     

       32
       32
       +
           sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj";

     

       43
       33
        
         };

     

       44
       34
        
       

     

       45
       45
       -
         checkInputs = [

     

       46
       46
       -
           decorator

     

       47
       47
       -
           mock

     

       48
       48
       -
           pytest

     

       49
       49
       -
           pytestcov

     

       50
       50
       -
           testfixtures

     

       51
       51
       -
           flask

     

       52
       52
       -
           swagger-ui-bundle

     

       53
       53
       -
         ]

     

       54
       54
       -
         ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ]

     

       55
       55
       -
         ++ lib.optional (pythonOlder "3.7") glibcLocales

     

       56
       56
       -
         ;

     

       57
       35
        
         propagatedBuildInputs = [

     

       36
       36
       +
           aiohttp

     

       37
       37
       +
           aiohttp-jinja2

     

       38
       38
       +
           aiohttp-swagger

     

       58
       39
        
           clickclick

     

       40
       40
       +
           flask

     

       41
       41
       +
           inflection

     

       59
       42
        
           jsonschema

     

       43
       43
       +
           openapi-spec-validator

     

       60
       44
        
           pyyaml

     

       61
       45
        
           requests

     

       62
       62
       -
           six

     

       63
       63
       -
           inflection

     

       64
       64
       -
           openapi-spec-validator

     

       65
       46
        
           swagger-ui-bundle

     

       66
       66
       -
           flask

     

       67
       67
       -
         ]

     

       68
       68
       -
         ++ lib.optional (pythonOlder "3.4") pathlib

     

       69
       69
       -
         ++ lib.optional (pythonOlder "3.6") typing

     

       70
       70
       -
         ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ]

     

       71
       71
       -
         ;

     

       47
       47
       +
         ];

     

       72
       48
        
       

     

       73
       73
       -
         preConfigure = lib.optional (pythonOlder "3.7") ''

     

       74
       74
       -
           export LANG=en_US.UTF-8

     

       75
       75
       -
         '';

     

       49
       49
       +
         checkInputs = [

     

       50
       50
       +
           aiohttp-remotes

     

       51
       51
       +
           decorator

     

       52
       52
       +
           pytest-aiohttp

     

       53
       53
       +
           pytestCheckHook

     

       54
       54
       +
           testfixtures

     

       55
       55
       +
         ];

     

       76
       56
        
       

     

       77
       77
       -
         postPatch = ''

     

       78
       78
       -
           substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'"

     

       79
       79
       -
         '';

     

       80
       80
       -
       

     

       81
       81
       -
         checkPhase = if isPy3k then ''

     

       82
       82
       -
           pytest -k "not test_app_get_root_path and \

     

       83
       83
       -
                      not test_verify_oauth_scopes_remote and \

     

       84
       84
       -
                      not test_verify_oauth_scopes_local and \

     

       85
       85
       -
                      not test_run_with_aiohttp_not_installed"''

     

       86
       86
       -
         else "pytest --ignore=tests/aiohttp";

     

       57
       57
       +
         pythonImportsCheck = [ "connexion" ];

     

       87
       58
        
       

     

       88
       59
        
         meta = with lib; {

     

       89
       60
        
           description = "Swagger/OpenAPI First framework on top of Flask";

+27 -9

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       2
       2
       -
       , tatsu, arrow

     

       3
       3
       -
       , pytestCheckHook, pytest-flakes

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , tatsu

     

       6
       6
       +
       , arrow

     

       7
       7
       +
       , pytestCheckHook

     

       8
       8
       +
       , pytest-flakes

     

       4
       9
        
       }:

     

       5
       10
        
       

     

       6
       11
        
       buildPythonPackage rec {

     
···

       9
       14
        
         disabled = pythonOlder "3.6";

     

       10
       15
        
       

     

       11
       16
        
         src = fetchFromGitHub {

     

       12
       12
       -
           owner = "C4ptainCrunch";

     

       13
       13
       -
           repo = "ics.py";

     

       17
       17
       +
           owner = "ics-py";

     

       18
       18
       +
           repo = "ics-py";

     

       14
       19
        
           rev = "v${version}";

     

       15
       20
        
           sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn";

     

       16
       21
        
         };

     

       17
       22
        
       

     

       18
       18
       -
         propagatedBuildInputs = [ tatsu arrow ];

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           arrow

     

       25
       25
       +
           tatsu

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         checkInputs = [

     

       29
       29
       +
           pytest-flakes

     

       30
       30
       +
           pytestCheckHook

     

       31
       31
       +
         ];

     

       19
       32
        
       

     

       20
       33
        
         postPatch = ''

     

       34
       34
       +
           # 0.8 will move to python-dateutil

     

       21
       35
        
           substituteInPlace requirements.txt \

     

       22
       36
        
             --replace "arrow>=0.11,<0.15" "arrow"

     

       23
       37
        
           substituteInPlace setup.cfg --replace "--pep8" ""

     

       24
       38
        
         '';

     

       25
       39
        
       

     

       26
       26
       -
         checkInputs = [ pytestCheckHook pytest-flakes ];

     

       40
       40
       +
         disabledTests = [

     

       41
       41
       +
           # Failure seems to be related to arrow > 1.0

     

       42
       42
       +
           "test_event"

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         pythonImportsCheck = [ "ics" ];

     

       27
       46
        
       

     

       28
       47
        
         meta = with lib; {

     

       29
       48
        
           description = "Pythonic and easy iCalendar library (RFC 5545)";

     
···

       32
       51
        
             write ics data in a developer friendly way.

     

       33
       52
        
           '';

     

       34
       53
        
           homepage = "http://icspy.readthedocs.org/en/stable/";

     

       35
       35
       -
           changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}";

     

       54
       54
       +
           changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}";

     

       36
       55
        
           license = licenses.asl20;

     

       37
       56
        
           maintainers = with maintainers; [ primeos ];

     

       38
       57
        
         };

     

       39
       39
       -
       

     

       40
       58
        
       }

+6

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

···

       35
       35
        
           export BOOST_PYTHON_LIB="boost_python${pythonVersion}"

     

       36
       36
        
           export BOOST_THREAD_LIB="boost_thread"

     

       37
       37
        
           export BOOST_SYSTEM_LIB="boost_system"

     

       38
       38
       +
           export PYCAIRO=true

     

       38
       39
        
         '';

     

       39
       40
        
       

     

       40
       41
        
         nativeBuildInputs = [

     

       41
       42
        
           mapnik # for mapnik_config

     

       43
       43
       +
           pkgs.pkgconfig

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         patches = [

     

       47
       47
       +
           ./find-pycairo-with-pkg-config.patch

     

       42
       48
        
         ];

     

       43
       49
        
       

     

       44
       50
        
         buildInputs = [

+18

pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch

···

       1
       1
       +
       diff --git a/setup.py b/setup.py

     

       2
       2
       +
       index 82a31d733..1c876a553 100755

     

       3
       3
       +
       --- a/setup.py

     

       4
       4
       +
       +++ b/setup.py

     

       5
       5
       +
       @@ -228,10 +228,9 @@ extra_comp_args = list(filter(lambda arg: arg != "-fvisibility=hidden", extra_co

     

       6
       6
       +
        if os.environ.get("PYCAIRO", "false") == "true":

     

       7
       7
       +
            try:

     

       8
       8
       +
                extra_comp_args.append('-DHAVE_PYCAIRO')

     

       9
       9
       +
       -        print("-I%s/include/pycairo".format(sys.exec_prefix))

     

       10
       10
       +
       -        extra_comp_args.append("-I{0}/include/pycairo".format(sys.exec_prefix))

     

       11
       11
       +
       -        #extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' '))

     

       12
       12
       +
       -        #linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' '))

     

       13
       13
       +
       +        pycairo_name = 'py3cairo' if PYTHON3 else 'pycairo'

     

       14
       14
       +
       +        extra_comp_args.extend(check_output(["pkg-config", '--cflags', pycairo_name]).strip().split(' '))

     

       15
       15
       +
       +        linkflags.extend(check_output(["pkg-config", '--libs', pycairo_name]).strip().split(' '))

     

       16
       16
       +
            except:

     

       17
       17
       +
                raise Exception("Failed to find compiler options for pycairo")

     

       18
       18
       +

+2 -1

pkgs/development/python-modules/pytorch/bin.nix

···

       18
       18
        
         pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;

     

       19
       19
        
         srcs = import ./binary-hashes.nix version;

     

       20
       20
        
         unsupported = throw "Unsupported system";

     

       21
       21
       -
         version = "1.8.0";

     

       21
       21
       +
         version = "1.8.1";

     

       22
       22
        
       in buildPythonPackage {

     

       23
       23
        
         inherit version;

     

       24
       24
        
       

     
···

       64
       64
        
         meta = with lib; {

     

       65
       65
        
           description = "Open source, prototype-to-production deep learning platform";

     

       66
       66
        
           homepage = "https://pytorch.org/";

     

       67
       67
       +
           changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";

     

       67
       68
        
           license = licenses.unfree; # Includes CUDA and Intel MKL.

     

       68
       69
        
           platforms = platforms.linux;

     

       69
       70
        
           maintainers = with maintainers; [ danieldk ];

+9 -6

pkgs/development/python-modules/pytorch/binary-hashes.nix

···

       1
       1
        
       version: {

     

       2
       2
        
         x86_64-linux-37 = {

     

       3
       3
       -
           url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";

     

       4
       4
       -
           hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc=";

     

       3
       3
       +
           name = "torch-${version}-cp37-cp37m-linux_x86_64.whl";

     

       4
       4
       +
           url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp37-cp37m-linux_x86_64.whl";

     

       5
       5
       +
           hash = "sha256-79JK2gGlV5Lhbim7GgPCjk++brwpUQE7g7vsrBu06eE=";

     

       5
       6
        
         };

     

       6
       7
        
         x86_64-linux-38 = {

     

       7
       7
       -
           url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";

     

       8
       8
       -
           hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c=";

     

       8
       8
       +
           name = "torch-${version}-cp38-cp38-linux_x86_64.whl";

     

       9
       9
       +
           url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp38-cp38-linux_x86_64.whl";

     

       10
       10
       +
           hash = "sha256-16h90SdxAgFxmPpgUPA3rBGxs9dtFaCeAgeSpKmtnmQ=";

     

       9
       11
        
         };

     

       10
       12
        
         x86_64-linux-39 = {

     

       11
       11
       -
           url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl";

     

       12
       12
       -
           hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ=";

     

       13
       13
       +
           name = "torch-${version}-cp39-cp39-linux_x86_64.whl";

     

       14
       14
       +
           url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp39-cp39-linux_x86_64.whl";

     

       15
       15
       +
           hash = "sha256-E3RLWpGYbRuKsz0pQv7npmC7WTbdvlYFaxXQYBKT2/8=";

     

       13
       16
        
         };

     

       14
       17
        
       }

+3 -3

pkgs/development/tools/gojsontoyaml/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gojsontoyaml";

     

       5
       5
       -
         version = "unstable-2020-06-02";

     

       5
       5
       +
         version = "unstable-2020-12-16";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "brancz";

     

       9
       9
        
           repo = "gojsontoyaml";

     

       10
       10
       -
           rev = "3697ded27e8cfea8e547eb082ebfbde36f1b5ee6";

     

       11
       11
       -
           sha256 = "07sisadpfnzbylzirs5ski8wl9fl18dm7xhbv8imw6ksxq4v467a";

     

       10
       10
       +
           rev = "202f76bf8c1f8fb74941a845b349941064603185";

     

       11
       11
       +
           sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

+71 -59

pkgs/misc/vim-plugins/generated.nix

···

       269
       269
        
       

     

       270
       270
        
         barbar-nvim = buildVimPluginFrom2Nix {

     

       271
       271
        
           pname = "barbar-nvim";

     

       272
       272
       -
           version = "2021-05-10";

     

       272
       272
       +
           version = "2021-05-11";

     

       273
       273
        
           src = fetchFromGitHub {

     

       274
       274
        
             owner = "romgrk";

     

       275
       275
        
             repo = "barbar.nvim";

     

       276
       276
       -
             rev = "1e7347964ceab49c5ed7e1224de328cdd8b90919";

     

       277
       277
       -
             sha256 = "00p1h7nznrhjfddxzxamyjkf9cgdjw9f8zhzs366k8gfva5fh4r3";

     

       276
       276
       +
             rev = "78ab34de8c77e2e230502945bd4d156af5d54ab8";

     

       277
       277
       +
             sha256 = "0smbf73i0ingvagxyjk6lb6g2axr6mgqk74c8w27504bnvay7y0w";

     

       278
       278
        
           };

     

       279
       279
        
           meta.homepage = "https://github.com/romgrk/barbar.nvim/";

     

       280
       280
        
         };

     
···

       401
       401
        
       

     

       402
       402
        
         chadtree = buildVimPluginFrom2Nix {

     

       403
       403
        
           pname = "chadtree";

     

       404
       404
       -
           version = "2021-05-11";

     

       404
       404
       +
           version = "2021-05-12";

     

       405
       405
        
           src = fetchFromGitHub {

     

       406
       406
        
             owner = "ms-jpq";

     

       407
       407
        
             repo = "chadtree";

     

       408
       408
       -
             rev = "2ccce5fa035176b51fa628ba6c672dedf78813e8";

     

       409
       409
       -
             sha256 = "0nrxxwf4wy6g5222qf4bjbyai8gym1k0b4wdyjpldfk5pdxd81zg";

     

       408
       408
       +
             rev = "4e5d98ff3a243167cafbc48de104a279b42318ac";

     

       409
       409
       +
             sha256 = "006rgvhvnd30qygqdqrlqxbc3yv9qk2ndmr7rkd5fln95g7ib8b5";

     

       410
       410
        
           };

     

       411
       411
        
           meta.homepage = "https://github.com/ms-jpq/chadtree/";

     

       412
       412
        
         };

     
···

       718
       718
        
           src = fetchFromGitHub {

     

       719
       719
        
             owner = "Shougo";

     

       720
       720
        
             repo = "context_filetype.vim";

     

       721
       721
       -
             rev = "39a552866c83946127f244912b6d408525f03364";

     

       722
       722
       -
             sha256 = "0m2w4f3bn8miplxb9q76fcipdkc9lbfyp47193q57s555b1g0x0k";

     

       721
       721
       +
             rev = "62c74b280d5cb0c16ed7a84e5b4eff4336d30d40";

     

       722
       722
       +
             sha256 = "1bwwcf6lnx0drjn7192fnplnq1xw85yf2g2fh7mnab7i5w2lmbw3";

     

       723
       723
        
           };

     

       724
       724
        
           meta.homepage = "https://github.com/Shougo/context_filetype.vim/";

     

       725
       725
        
         };

     
···

       738
       738
        
       

     

       739
       739
        
         Coqtail = buildVimPluginFrom2Nix {

     

       740
       740
        
           pname = "Coqtail";

     

       741
       741
       -
           version = "2021-05-07";

     

       741
       741
       +
           version = "2021-05-11";

     

       742
       742
        
           src = fetchFromGitHub {

     

       743
       743
        
             owner = "whonore";

     

       744
       744
        
             repo = "Coqtail";

     

       745
       745
       -
             rev = "b24f6df45012c2c53743777b306fdb9396dcb5e9";

     

       746
       746
       -
             sha256 = "08xqgkivczp3yciqc3xigdfl1q4c14mfa0i27didwds73i94mqqd";

     

       745
       745
       +
             rev = "2cababf4c1b6cc2e460bbbd63e69ed5d9fc2ee34";

     

       746
       746
       +
             sha256 = "086gqc76ki8jwhhk4ihawjciwjsrq9k13bgwlnjhsp2rhm0vslb7";

     

       747
       747
        
           };

     

       748
       748
        
           meta.homepage = "https://github.com/whonore/Coqtail/";

     

       749
       749
        
         };

     
···

       1280
       1280
        
       

     

       1281
       1281
        
         echodoc-vim = buildVimPluginFrom2Nix {

     

       1282
       1282
        
           pname = "echodoc-vim";

     

       1283
       1283
       -
           version = "2021-04-16";

     

       1283
       1283
       +
           version = "2021-05-11";

     

       1284
       1284
        
           src = fetchFromGitHub {

     

       1285
       1285
        
             owner = "Shougo";

     

       1286
       1286
        
             repo = "echodoc.vim";

     

       1287
       1287
       -
             rev = "63d3c193ccb1652a972ca0def7ab82048bfb6068";

     

       1288
       1288
       -
             sha256 = "0v0fd6n6fza1rj008zpjicvh9d8mcvz3kza8hhby9nx9cjlj2dpc";

     

       1287
       1287
       +
             rev = "7dc1d45d7ffd275c06bf207795cf071ae6c9f1a4";

     

       1288
       1288
       +
             sha256 = "1hxywy423ikfkmcyqm467j741mn0ar4c5k7li0liniygjwpiaxjm";

     

       1289
       1289
        
           };

     

       1290
       1290
        
           meta.homepage = "https://github.com/Shougo/echodoc.vim/";

     

       1291
       1291
        
         };

     
···

       1811
       1811
        
       

     

       1812
       1812
        
         gruvbox-nvim = buildVimPluginFrom2Nix {

     

       1813
       1813
        
           pname = "gruvbox-nvim";

     

       1814
       1814
       -
           version = "2021-05-10";

     

       1814
       1814
       +
           version = "2021-05-12";

     

       1815
       1815
        
           src = fetchFromGitHub {

     

       1816
       1816
        
             owner = "npxbr";

     

       1817
       1817
        
             repo = "gruvbox.nvim";

     

       1818
       1818
       -
             rev = "c26c456a6b36cac79e01f6cf7eebb8cc9231ab16";

     

       1819
       1819
       -
             sha256 = "0kpgkdwkz27xl56yicf8b8zhqg84657s14xl0blh802cm275hz92";

     

       1818
       1818
       +
             rev = "86bc293204a6c13f1650378c39bf248bd5a5a22f";

     

       1819
       1819
       +
             sha256 = "0if2ad8s9r3pwdsqlkl6y82r0a0z86c6vlkdp28m18sxv848psx5";

     

       1820
       1820
        
           };

     

       1821
       1821
        
           meta.homepage = "https://github.com/npxbr/gruvbox.nvim/";

     

       1822
       1822
        
         };

     
···

       2268
       2268
        
       

     

       2269
       2269
        
         LeaderF = buildVimPluginFrom2Nix {

     

       2270
       2270
        
           pname = "LeaderF";

     

       2271
       2271
       -
           version = "2021-05-07";

     

       2271
       2271
       +
           version = "2021-05-11";

     

       2272
       2272
        
           src = fetchFromGitHub {

     

       2273
       2273
        
             owner = "Yggdroot";

     

       2274
       2274
        
             repo = "LeaderF";

     

       2275
       2275
       -
             rev = "e65a9b9b88df503340643d3c086ec1ee53898891";

     

       2276
       2276
       -
             sha256 = "0x1hzbzjw28cisj8xzglp9qhbzzkxv3lg98imxrpswn6xynpdz4n";

     

       2275
       2275
       +
             rev = "1078dcaff8bab986245b79b26891ef592aeb0cbe";

     

       2276
       2276
       +
             sha256 = "032czx26x3118j2bqgcqa4c10nknidg4dzpsk43biw66z7l6x5jf";

     

       2277
       2277
        
           };

     

       2278
       2278
        
           meta.homepage = "https://github.com/Yggdroot/LeaderF/";

     

       2279
       2279
        
         };

     
···

       2448
       2448
        
       

     

       2449
       2449
        
         lsp-trouble-nvim = buildVimPluginFrom2Nix {

     

       2450
       2450
        
           pname = "lsp-trouble-nvim";

     

       2451
       2451
       -
           version = "2021-05-10";

     

       2451
       2451
       +
           version = "2021-05-11";

     

       2452
       2452
        
           src = fetchFromGitHub {

     

       2453
       2453
        
             owner = "folke";

     

       2454
       2454
        
             repo = "lsp-trouble.nvim";

     

       2455
       2455
       -
             rev = "1dd72c22403519c160b0c694762091971bcf191e";

     

       2456
       2456
       -
             sha256 = "1831ywvbl51zd8m5rkpq59dw6s55snsyv94n28vl316cm65q28ji";

     

       2455
       2455
       +
             rev = "0f584688c3dcd6a2cacf2e750da7fe3b5e7f260e";

     

       2456
       2456
       +
             sha256 = "14wfnv98ys0mc9xpfl0d06iv63k4bfhjy8h35sngb0mikb1wb0ns";

     

       2457
       2457
        
           };

     

       2458
       2458
        
           meta.homepage = "https://github.com/folke/lsp-trouble.nvim/";

     

       2459
       2459
        
         };

     
···

       2496
       2496
        
       

     

       2497
       2497
        
         lualine-nvim = buildVimPluginFrom2Nix {

     

       2498
       2498
        
           pname = "lualine-nvim";

     

       2499
       2499
       -
           version = "2021-05-10";

     

       2499
       2499
       +
           version = "2021-05-12";

     

       2500
       2500
        
           src = fetchFromGitHub {

     

       2501
       2501
        
             owner = "hoob3rt";

     

       2502
       2502
        
             repo = "lualine.nvim";

     

       2503
       2503
       -
             rev = "11280b44f2f3812b60e99b7e07e4d37bee418cb0";

     

       2504
       2504
       -
             sha256 = "0ifbkjsgjilczmqn2lpkw4jl648hns06klx07md9y3sc5i5jqjjq";

     

       2503
       2503
       +
             rev = "33aaabe672f120050fd34264719e27a9bf518f18";

     

       2504
       2504
       +
             sha256 = "1zsnhlcch4wgs69zjxdxaczxpi8ypscxgmjc41v2qwk4vmjlqlv1";

     

       2505
       2505
        
           };

     

       2506
       2506
        
           meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";

     

       2507
       2507
        
         };

     
···

       3180
       3180
        
       

     

       3181
       3181
        
         nvim-autopairs = buildVimPluginFrom2Nix {

     

       3182
       3182
        
           pname = "nvim-autopairs";

     

       3183
       3183
       -
           version = "2021-05-09";

     

       3183
       3183
       +
           version = "2021-05-11";

     

       3184
       3184
        
           src = fetchFromGitHub {

     

       3185
       3185
        
             owner = "windwp";

     

       3186
       3186
        
             repo = "nvim-autopairs";

     

       3187
       3187
       -
             rev = "91f3c9fb469527a75163b8460128aade3b34e4a5";

     

       3188
       3188
       -
             sha256 = "19mapmqff6b80g70ybmwp9mc113wal7dgjfsx516dh21gcx3v98h";

     

       3187
       3187
       +
             rev = "cd8a10b9191ead80802100e00e741dcc89304634";

     

       3188
       3188
       +
             sha256 = "06s4q9d18j2hanwxardsbbc4dzjwdb5z5xyrn1h2i5dlvfkyj2dl";

     

       3189
       3189
        
           };

     

       3190
       3190
        
           meta.homepage = "https://github.com/windwp/nvim-autopairs/";

     

       3191
       3191
        
         };

     
···

       3324
       3324
        
       

     

       3325
       3325
        
         nvim-hlslens = buildVimPluginFrom2Nix {

     

       3326
       3326
        
           pname = "nvim-hlslens";

     

       3327
       3327
       -
           version = "2021-04-30";

     

       3327
       3327
       +
           version = "2021-05-12";

     

       3328
       3328
        
           src = fetchFromGitHub {

     

       3329
       3329
        
             owner = "kevinhwang91";

     

       3330
       3330
        
             repo = "nvim-hlslens";

     

       3331
       3331
       -
             rev = "4ce0b6462b33b3857e5cd9c91c9f9ac33ae0357f";

     

       3332
       3332
       -
             sha256 = "0n267lvr5sgn1n135bc1bhfxjlkcf2r1ydiccbcqs4mf8kjsj4hw";

     

       3331
       3331
       +
             rev = "f1fd61642c687f37f14e3f947c840e0f33e4b09a";

     

       3332
       3332
       +
             sha256 = "0d8bz0khmvrrcpcyrnwagykj4hmbr55a8g39qrwm3zkmry5if4qg";

     

       3333
       3333
        
           };

     

       3334
       3334
        
           meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";

     

       3335
       3335
        
         };

     
···

       3444
       3444
        
       

     

       3445
       3445
        
         nvim-toggleterm-lua = buildVimPluginFrom2Nix {

     

       3446
       3446
        
           pname = "nvim-toggleterm-lua";

     

       3447
       3447
       -
           version = "2021-05-04";

     

       3447
       3447
       +
           version = "2021-05-11";

     

       3448
       3448
        
           src = fetchFromGitHub {

     

       3449
       3449
        
             owner = "akinsho";

     

       3450
       3450
        
             repo = "nvim-toggleterm.lua";

     

       3451
       3451
       -
             rev = "53d0820fdacd8a5b3c20397a691b12c84a5a0aaa";

     

       3452
       3452
       -
             sha256 = "190iw5449ybsaz3y9w5yy5kybr06cih4vkf75jg09lp4mx8z2anb";

     

       3451
       3451
       +
             rev = "5bf694fce51f0711e3e005e105992178d87a86c6";

     

       3452
       3452
       +
             sha256 = "1ka3hqcyjbrnawiz4wx35qpql3jxl0vllnskz5vqhqr5gfl9rz5b";

     

       3453
       3453
        
           };

     

       3454
       3454
        
           meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";

     

       3455
       3455
        
         };

     
···

       3468
       3468
        
       

     

       3469
       3469
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       3470
       3470
        
           pname = "nvim-treesitter";

     

       3471
       3471
       -
           version = "2021-05-08";

     

       3471
       3471
       +
           version = "2021-05-11";

     

       3472
       3472
        
           src = fetchFromGitHub {

     

       3473
       3473
        
             owner = "nvim-treesitter";

     

       3474
       3474
        
             repo = "nvim-treesitter";

     

       3475
       3475
       -
             rev = "9e0f764b675d987bbdd45af38531cc864c8cfc4c";

     

       3476
       3476
       -
             sha256 = "1rw9jasxfxghja5dlfz75iiz5rshisjnwffhzdqa9mil0pvahjr8";

     

       3475
       3475
       +
             rev = "efbb1c66d27eb5b4bfbcc1f59d3384e0641c8214";

     

       3476
       3476
       +
             sha256 = "1sfc7890v4lgc7r4a5k922qbnc1lpjp3i8sj1jqqxd4a73x1nsvm";

     

       3477
       3477
        
           };

     

       3478
       3478
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       3479
       3479
        
         };

     
···

       3504
       3504
        
       

     

       3505
       3505
        
         nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

     

       3506
       3506
        
           pname = "nvim-treesitter-textobjects";

     

       3507
       3507
       -
           version = "2021-04-23";

     

       3507
       3507
       +
           version = "2021-05-11";

     

       3508
       3508
        
           src = fetchFromGitHub {

     

       3509
       3509
        
             owner = "nvim-treesitter";

     

       3510
       3510
        
             repo = "nvim-treesitter-textobjects";

     

       3511
       3511
       -
             rev = "522b26a8795994b719a921a03cfacb0d7dcabf78";

     

       3512
       3512
       -
             sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v";

     

       3511
       3511
       +
             rev = "4f1ace57fbeed1f4e5613ea8c9b414ff0833eade";

     

       3512
       3512
       +
             sha256 = "1in2q3igq74m900rkchdcgfcy3h60663b58xn2ydlbjsbzhc7vrn";

     

       3513
       3513
        
           };

     

       3514
       3514
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

     

       3515
       3515
        
         };

     
···

       3861
       3861
        
             sha256 = "0zxsa1agigzb9adrwq54pdyl984drdqzz3kkixaijkq77kkdvj0n";

     

       3862
       3862
        
           };

     

       3863
       3863
        
           meta.homepage = "https://github.com/python-mode/python-mode/";

     

       3864
       3864
       +
         };

     

       3865
       3865
       +
       

     

       3866
       3866
       +
         QFEnter = buildVimPluginFrom2Nix {

     

       3867
       3867
       +
           pname = "QFEnter";

     

       3868
       3868
       +
           version = "2020-10-09";

     

       3869
       3869
       +
           src = fetchFromGitHub {

     

       3870
       3870
       +
             owner = "yssl";

     

       3871
       3871
       +
             repo = "QFEnter";

     

       3872
       3872
       +
             rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb";

     

       3873
       3873
       +
             sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54";

     

       3874
       3874
       +
           };

     

       3875
       3875
       +
           meta.homepage = "https://github.com/yssl/QFEnter/";

     

       3864
       3876
        
         };

     

       3865
       3877
        
       

     

       3866
       3878
        
         quick-scope = buildVimPluginFrom2Nix {

     
···

       4659
       4671
        
       

     

       4660
       4672
        
         telescope-nvim = buildVimPluginFrom2Nix {

     

       4661
       4673
        
           pname = "telescope-nvim";

     

       4662
       4662
       -
           version = "2021-05-09";

     

       4674
       4674
       +
           version = "2021-05-11";

     

       4663
       4675
        
           src = fetchFromGitHub {

     

       4664
       4676
        
             owner = "nvim-telescope";

     

       4665
       4677
        
             repo = "telescope.nvim";

     

       4666
       4666
       -
             rev = "c061c216bfe082384d542a487ce02e9aed6177df";

     

       4667
       4667
       -
             sha256 = "1x4mhxwp9crs63a43wlph4jbl92192sl3hiwchwlim0g1wdar0ky";

     

       4678
       4678
       +
             rev = "22a78a46364b1e79549267c9365a31684689ed08";

     

       4679
       4679
       +
             sha256 = "0y0y37v0qikfi7p9a5c63knil70r4mk249hsyxjjgg2m3di8i29g";

     

       4668
       4680
        
           };

     

       4669
       4681
        
           meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

     

       4670
       4682
        
         };

     
···

       5464
       5476
        
       

     

       5465
       5477
        
         vim-clap = buildVimPluginFrom2Nix {

     

       5466
       5478
        
           pname = "vim-clap";

     

       5467
       5467
       -
           version = "2021-05-06";

     

       5479
       5479
       +
           version = "2021-05-12";

     

       5468
       5480
        
           src = fetchFromGitHub {

     

       5469
       5481
        
             owner = "liuchengxu";

     

       5470
       5482
        
             repo = "vim-clap";

     

       5471
       5471
       -
             rev = "236919da99a534307e5cf2b204ddf1e3c1a1816e";

     

       5472
       5472
       -
             sha256 = "0vajjv8nw41n783vsfqy72z4r3m36s7wkfxs96scpga18v3xgqng";

     

       5483
       5483
       +
             rev = "8c17472d0fe5a515ab3618edd0cad3dd16972e09";

     

       5484
       5484
       +
             sha256 = "15k2agpi832wdfacf289fffkvgg8q2gc01y9fa8qsnhjqnlrqra9";

     

       5473
       5485
        
           };

     

       5474
       5486
        
           meta.homepage = "https://github.com/liuchengxu/vim-clap/";

     

       5475
       5487
        
         };

     
···

       7135
       7147
        
       

     

       7136
       7148
        
         vim-matchup = buildVimPluginFrom2Nix {

     

       7137
       7149
        
           pname = "vim-matchup";

     

       7138
       7138
       -
           version = "2021-05-10";

     

       7150
       7150
       +
           version = "2021-05-12";

     

       7139
       7151
        
           src = fetchFromGitHub {

     

       7140
       7152
        
             owner = "andymass";

     

       7141
       7153
        
             repo = "vim-matchup";

     

       7142
       7142
       -
             rev = "ea2612d87a38ef2261f66063571eef06689bbb8e";

     

       7143
       7143
       -
             sha256 = "0a7dxvl8p3n8kfm1abm1k2r9l6s230585521scgh8y1sh88zkpay";

     

       7154
       7154
       +
             rev = "f30d2d2d3a60905a09b516f843c130232da10060";

     

       7155
       7155
       +
             sha256 = "0fj4hn481n5rg7z9hkybzpa6zv1dqc120i6112c8wasl89rg6xl5";

     

       7144
       7156
        
           };

     

       7145
       7157
        
           meta.homepage = "https://github.com/andymass/vim-matchup/";

     

       7146
       7158
        
         };

     
···

       9044
       9056
        
       

     

       9045
       9057
        
         vimspector = buildVimPluginFrom2Nix {

     

       9046
       9058
        
           pname = "vimspector";

     

       9047
       9047
       -
           version = "2021-05-03";

     

       9059
       9059
       +
           version = "2021-05-11";

     

       9048
       9060
        
           src = fetchFromGitHub {

     

       9049
       9061
        
             owner = "puremourning";

     

       9050
       9062
        
             repo = "vimspector";

     

       9051
       9051
       -
             rev = "4e04a862cb37105acebac8b6ac5b275dc7865815";

     

       9052
       9052
       -
             sha256 = "02z5imcj7dqhkjxizcxswikabnbnfx9fnrbqcwgn0xcnf80c5azg";

     

       9063
       9063
       +
             rev = "2708e8e6ecc00bfd7d9fee923d287345553aba02";

     

       9064
       9064
       +
             sha256 = "173l5rmg12rqcl7f0lq9f5shx94mf7f8793m74ls1v3k06xdcqj2";

     

       9053
       9065
        
             fetchSubmodules = true;

     

       9054
       9066
        
           };

     

       9055
       9067
        
           meta.homepage = "https://github.com/puremourning/vimspector/";

     
···

       9153
       9165
        
       

     

       9154
       9166
        
         which-key-nvim = buildVimPluginFrom2Nix {

     

       9155
       9167
        
           pname = "which-key-nvim";

     

       9156
       9156
       -
           version = "2021-05-09";

     

       9168
       9168
       +
           version = "2021-05-11";

     

       9157
       9169
        
           src = fetchFromGitHub {

     

       9158
       9170
        
             owner = "folke";

     

       9159
       9171
        
             repo = "which-key.nvim";

     

       9160
       9160
       -
             rev = "1ccba9d0b553b08feaca9f432386f9c33bd1656f";

     

       9161
       9161
       -
             sha256 = "0qarcdwyd1pbcaqzzhzq4sh8d278j1xxf90ibp6h1451fcvkymid";

     

       9172
       9172
       +
             rev = "342c8cdb3651967c96c356eb2d79561c0c9273ee";

     

       9173
       9173
       +
             sha256 = "1v1z8yk711gjd3qawj2vmwa5l9jmqqxfj9jjw9zq1m011msp18iv";

     

       9162
       9174
        
           };

     

       9163
       9175
        
           meta.homepage = "https://github.com/folke/which-key.nvim/";

     

       9164
       9176
        
         };

     
···

       9335
       9347
        
       

     

       9336
       9348
        
         zig-vim = buildVimPluginFrom2Nix {

     

       9337
       9349
        
           pname = "zig-vim";

     

       9338
       9338
       -
           version = "2021-04-07";

     

       9350
       9350
       +
           version = "2021-05-12";

     

       9339
       9351
        
           src = fetchFromGitHub {

     

       9340
       9352
        
             owner = "ziglang";

     

       9341
       9353
        
             repo = "zig.vim";

     

       9342
       9342
       -
             rev = "fc32adfada0fac7a2f6088672e177d410c9e3ae1";

     

       9343
       9343
       -
             sha256 = "051l2dig6861xzl6zg41d6a776jhms7v6a86cap1ipd2rxkqh5yh";

     

       9354
       9354
       +
             rev = "9ec189bc76ed2850f916394ed8d6127290f51338";

     

       9355
       9355
       +
             sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s";

     

       9344
       9356
        
           };

     

       9345
       9357
        
           meta.homepage = "https://github.com/ziglang/zig.vim/";

     

       9346
       9358
        
         };

+1

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

···

       772
       772
        
       Yggdroot/indentLine

     

       773
       773
        
       Yggdroot/LeaderF

     

       774
       774
        
       Yilin-Yang/vim-markbar

     

       775
       775
       +
       yssl/QFEnter

     

       775
       776
        
       yuki-yano/ncm2-dictionary

     

       776
       777
        
       yunlingz/ci_dark

     

       777
       778
        
       zah/nim.vim

+22 -9

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

···

       14
       14
        
       , libunwind

     

       15
       15
        
       , elfutils

     

       16
       16
        
       , orc

     

       17
       17
       -
       , python3

     

       17
       17
       +
       , python3Packages

     

       18
       18
        
       , libuuid

     

       19
       19
       +
       , wrapGAppsHook

     

       19
       20
        
       }:

     

       20
       21
        
       

     

       21
       22
        
       stdenv.mkDerivation rec {

     

       22
       23
        
         pname = "tiscamera";

     

       23
       23
       -
         version = "0.11.1";

     

       24
       24
       +
         version = "0.13.1";

     

       24
       25
        
       

     

       25
       26
        
         src = fetchFromGitHub {

     

       26
       27
        
           owner = "TheImagingSource";

     

       27
       28
        
           repo = pname;

     

       28
       29
        
           rev = "v-${pname}-${version}";

     

       29
       29
       -
           sha256 = "07vp6khgl6qd3a4519dmx1s5bfw7pld793p50pjn29fqh91fm93g";

     

       30
       30
       +
           sha256 = "0hpy9yhc4mn6w8gvzwif703smmcys0j2jqbz2xfghqxcyb0ykplj";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       32
       33
        
         nativeBuildInputs = [

     

       33
       34
        
           cmake

     

       34
       35
        
           pkg-config

     

       36
       36
       +
           python3Packages.wrapPython

     

       37
       37
       +
           wrapGAppsHook

     

       35
       38
        
         ];

     

       36
       39
        
       

     

       37
       40
        
         buildInputs = [

     
···

       47
       50
        
           libunwind

     

       48
       51
        
           elfutils

     

       49
       52
        
           orc

     

       50
       50
       -
           python3

     

       51
       53
        
           libuuid

     

       54
       54
       +
           python3Packages.python

     

       55
       55
       +
           python3Packages.pyqt5

     

       52
       56
        
         ];

     

       57
       57
       +
       

     

       58
       58
       +
         pythonPath = with python3Packages; [ pyqt5 pygobject3 ];

     

       59
       59
       +
       

     

       60
       60
       +
         propagatedBuildInputs = pythonPath;

     

       53
       61
        
       

     

       54
       62
        
         cmakeFlags = [

     

       55
       63
        
           "-DBUILD_ARAVIS=OFF" # For GigE support. Won't need it as our camera is usb.

     
···

       57
       65
        
           "-DBUILD_TOOLS=ON"

     

       58
       66
        
           "-DBUILD_V4L2=ON"

     

       59
       67
        
           "-DBUILD_LIBUSB=ON"

     

       68
       68
       +
           "-DBUILD_TESTS=ON"

     

       60
       69
        
           "-DTCAM_INSTALL_UDEV=${placeholder "out"}/lib/udev/rules.d"

     

       61
       70
        
           "-DTCAM_INSTALL_UVCDYNCTRL=${placeholder "out"}/share/uvcdynctrl/data/199e"

     

       62
       71
        
           "-DTCAM_INSTALL_GST_1_0=${placeholder "out"}/lib/gstreamer-1.0"

     

       63
       72
        
           "-DTCAM_INSTALL_GIR=${placeholder "out"}/share/gir-1.0"

     

       64
       73
        
           "-DTCAM_INSTALL_TYPELIB=${placeholder "out"}/lib/girepository-1.0"

     

       65
       74
        
           "-DTCAM_INSTALL_SYSTEMD=${placeholder "out"}/etc/systemd/system"

     

       75
       75
       +
           "-DTCAM_INSTALL_PYTHON3_MODULES=${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages"

     

       76
       76
       +
           "-DGSTREAMER_1.0_INCLUDEDIR=${placeholder "out"}/include/gstreamer-1.0"

     

       66
       77
        
           # There are gobject introspection commands launched as part of the build. Those have a runtime

     

       67
       78
        
           # dependency on `libtcam` (which itself is built as part of this build). In order to allow

     

       68
       79
        
           # that, we set the dynamic linker's path to point on the build time location of the library.

     

       69
       80
        
           "-DCMAKE_SKIP_BUILD_RPATH=OFF"

     

       70
       81
        
         ];

     

       71
       82
        
       

     

       72
       72
       -
         postPatch = ''

     

       73
       73
       -
           substituteInPlace ./src/BackendLoader.cpp \

     

       74
       74
       -
             --replace '"libtcam-v4l2.so"' "\"$out/lib/tcam-0/libtcam-v4l2.so\"" \

     

       75
       75
       -
             --replace '"libtcam-aravis.so"' "\"$out/lib/tcam-0/libtcam-aravis.so\"" \

     

       76
       76
       -
             --replace '"libtcam-libusb.so"' "\"$out/lib/tcam-0/libtcam-libusb.so\""

     

       83
       83
       +
         doCheck = true;

     

       84
       84
       +
       

     

       85
       85
       +
         # gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression.

     

       86
       86
       +
         checkPhase = "ctest --force-new-ctest-process -E gstreamer";

     

       87
       87
       +
       

     

       88
       88
       +
         postFixup = ''

     

       89
       89
       +
           wrapPythonPrograms "$out $pythonPath"

     

       77
       90
        
         '';

     

       78
       91
        
       

     

       79
       92
        
         meta = with lib; {

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "wireguard";

     

       10
       10
       -
         version = "1.0.20210219";

     

       10
       10
       +
         version = "1.0.20210424";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchzip {

     

       13
       13
        
           url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";

     

       14
       14
       -
           sha256 = "sha256-ZYZBnfX8DP0IV3VEBSzg7wnFCnlCzOT6Ql3kFZ0klfQ=";

     

       14
       14
       +
           sha256 = "sha256-VLtIxYh308X28c9EOeHx0eA7HP2aRlekPXRt015/qAg=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         hardeningDisable = [ "pic" ];

+3 -3

pkgs/servers/caddy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "caddy";

     

       5
       5
       -
         version = "2.3.0";

     

       5
       5
       +
         version = "2.4.0";

     

       6
       6
        
       

     

       7
       7
        
         subPackages = [ "cmd/caddy" ];

     

       8
       8
        
       

     
···

       10
       10
        
           owner = "caddyserver";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "03cbbr8z9g156lgx7pyn1p1i4mh8ayhhhv24r1z3h1vgq6y4ka7r";

     

       13
       13
       +
           sha256 = "sha256-gPw6o9B1jV1XQ86zlfrbJqUtVWMWArV8zMHIm6Wkz1M=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "0gpzxjiyv7l1nibh1gas4mvinamiyyfgidd8cy4abz95v6z437lp";

     

       16
       16
       +
         vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco=";

     

       17
       17
        
       

     

       18
       18
        
         passthru.tests = { inherit (nixosTests) caddy; };

     

       19
       19

+3

pkgs/servers/hylafaxplus/default.nix

···

       67
       67
        
           url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";

     

       68
       68
        
           inherit sha256;

     

       69
       69
        
         };

     

       70
       70
       +
         patches = [

     

       71
       71
       +
           ./libtiff-4.2.patch  # adjust configure check to work with libtiff > 4.1

     

       72
       72
       +
         ];

     

       70
       73
        
         # Note that `configure` (and maybe `faxsetup`) are looking

     

       71
       74
        
         # for a couple of standard binaries in the `PATH` and

     

       72
       75
        
         # hardcode their absolute paths in the new package.

+13

pkgs/servers/hylafaxplus/libtiff-4.2.patch

···

       1
       1
       +
       diff --git a/configure b/configure

     

       2
       2
       +
       index 7456dcb..90f0e8d 100755

     

       3
       3
       +
       --- a/configure

     

       4
       4
       +
       +++ b/configure

     

       5
       5
       +
       @@ -2583,7 +2583,7 @@ EOF

     

       6
       6
       +
        				echo '#define TIFFSTRIPBYTECOUNTS uint32'

     

       7
       7
       +
        				echo '#define TIFFVERSION TIFF_VERSION'

     

       8
       8
       +
        				echo '#define TIFFHEADER TIFFHeader';;

     

       9
       9
       +
       -		4.[01])		tiff_runlen_t="uint32"

     

       10
       10
       +
       +		4.[012])	tiff_runlen_t="uint32"

     

       11
       11
       +
        				tiff_offset_t="uint64"

     

       12
       12
       +
        				echo '#define TIFFSTRIPBYTECOUNTS uint64'

     

       13
       13
       +
        				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'

+2 -2

pkgs/servers/matrix-synapse/default.nix

···

       12
       12
        
       in

     

       13
       13
        
       buildPythonApplication rec {

     

       14
       14
        
         pname = "matrix-synapse";

     

       15
       15
       -
         version = "1.33.1";

     

       15
       15
       +
         version = "1.33.2";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE=";

     

       19
       19
       +
           sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         patches = [

+8 -1

pkgs/shells/nushell/default.nix

···

       10
       10
        
       , libiconv

     

       11
       11
        
       , AppKit

     

       12
       12
        
       , Security

     

       13
       13
       +
       , nghttp2

     

       14
       14
       +
       , libgit2

     

       13
       15
        
       , withStableFeatures ? true

     

       14
       16
        
       }:

     

       15
       17
        
       

     
···

       32
       34
        
         buildInputs = [ openssl ]

     

       33
       35
        
           ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]

     

       34
       36
        
           ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]

     

       35
       35
       -
           ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ];

     

       37
       37
       +
           ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];

     

       36
       38
        
       

     

       37
       39
        
         cargoBuildFlags = lib.optional withStableFeatures "--features stable";

     

       40
       40
       +
       

     

       41
       41
       +
         # TODO investigate why tests are broken on darwin

     

       42
       42
       +
         # failures show that tests try to write to paths

     

       43
       43
       +
         # outside of TMPDIR

     

       44
       44
       +
         doCheck = ! stdenv.isDarwin;

     

       38
       45
        
       

     

       39
       46
        
         checkPhase = ''

     

       40
       47
        
           runHook preCheck

+12 -6

pkgs/tools/misc/broot/default.nix

···

       4
       4
        
       , fetchCrate

     

       5
       5
        
       , installShellFiles

     

       6
       6
        
       , makeWrapper

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       , libgit2

     

       9
       9
       +
       , oniguruma

     

       7
       10
        
       , libiconv

     

       8
       8
       -
       , zlib

     

       9
       11
        
       , Security

     

       12
       12
       +
       , zlib

     

       10
       13
        
       }:

     

       11
       14
        
       

     

       12
       15
        
       rustPlatform.buildRustPackage rec {

     

       13
       16
        
         pname = "broot";

     

       14
       14
       -
         version = "1.3.1";

     

       17
       17
       +
         version = "1.4.0";

     

       15
       18
        
       

     

       16
       19
        
         src = fetchCrate {

     

       17
       20
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk=";

     

       21
       21
       +
           sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY=";

     

       19
       22
        
         };

     

       20
       23
        
       

     

       21
       21
       -
         cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE=";

     

       24
       24
       +
         cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk=";

     

       22
       25
        
       

     

       23
       26
        
         nativeBuildInputs = [

     

       27
       27
       +
           installShellFiles

     

       24
       28
        
           makeWrapper

     

       25
       25
       -
           installShellFiles

     

       29
       29
       +
           pkg-config

     

       26
       30
        
         ];

     

       27
       31
        
       

     

       28
       28
       -
         buildInputs = lib.optionals stdenv.isDarwin [

     

       32
       32
       +
         buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [

     

       29
       33
        
           libiconv

     

       30
       34
        
           Security

     

       31
       35
        
           zlib

     

       32
       36
        
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         RUSTONIG_SYSTEM_LIBONIG = true;

     

       33
       39
        
       

     

       34
       40
        
         postPatch = ''

     

       35
       41
        
           # Fill the version stub in the man page. We can't fill the date

+2 -2

pkgs/tools/misc/cpulimit/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cpulimit";

     

       5
       5
       -
         version = "2.6";

     

       5
       5
       +
         version = "2.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

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

     

       9
       9
       -
           sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";

     

       9
       9
       +
           sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildFlags = with stdenv; [ (

+2 -2

pkgs/tools/misc/librespeed-cli/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "librespeed-cli";

     

       8
       8
       -
         version = "1.0.8";

     

       8
       8
       +
         version = "1.0.9";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "librespeed";

     

       12
       12
        
           repo = "speedtest-cli";

     

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

     

       14
       14
       -
           sha256 = "sha256-cbLuAOAGWmYj6xR2AjpwvRXrP3SXfHhjUp5MVLqC0WE=";

     

       14
       14
       +
           sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";

+2 -1

pkgs/tools/misc/swaglyrics/default.nix

···

       19
       19
        
           substituteInPlace setup.py \

     

       20
       20
        
             --replace 'requests>=2.24.0' 'requests~=2.23' \

     

       21
       21
        
             --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \

     

       22
       22
       -
             --replace 'colorama==0.4.3' 'colorama~=0.4'

     

       22
       22
       +
             --replace 'colorama==0.4.3' 'colorama~=0.4' \

     

       23
       23
       +
             --replace 'unidecode==1.1.1' 'unidecode~=1.2'

     

       23
       24
        
         '';

     

       24
       25
        
       

     

       25
       26
        
         preBuild = "export HOME=$NIX_BUILD_TOP";

+3 -3

pkgs/tools/networking/sniffglue/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "sniffglue";

     

       5
       5
       -
         version = "0.12.0";

     

       5
       5
       +
         version = "0.12.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "kpcyrd";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk=";

     

       11
       11
       +
           sha256 = "sha256-2LyCiW1MrAahpbzyxot0INPMzo0Vl/JToMZTinCQdgs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-dxE1o7JqGvWwOtuhHgq0t9Zw1wQt5lt1OJJY992jjjA=";

     

       14
       14
       +
         cargoSha256 = "sha256-AGwiyC7Zf8KHQIHfHByL06sdbS4vEXUyj1wGw7Q1N9I=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17

+2 -2

pkgs/tools/networking/wireguard-tools/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "wireguard-tools";

     

       15
       15
       -
         version = "1.0.20210315";

     

       15
       15
       +
         version = "1.0.20210424";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchzip {

     

       18
       18
        
           url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";

     

       19
       19
       -
           sha256 = "sha256-aCqgjriqhBInK7C7KapoKVfgj+zreGQzacMKwbMF1Og=";

     

       19
       19
       +
           sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         outputs = [ "out" "man" ];

+2 -2

pkgs/tools/typesetting/ted/default.nix

···

       58
       58
        
           runHook postInstall

     

       59
       59
        
         '';

     

       60
       60
        
       

     

       61
       61
       -
         nativeBuildInputs = [ makeWrapper ];

     

       62
       62
       -
         buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];

     

       61
       61
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       62
       62
       +
         buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];

     

       63
       63
        
       

     

       64
       64
        
         meta = with lib; {

     

       65
       65
        
           description = "An easy rich text processor";