commit a28d31ed86c1738efe1d8ab57833b8c7fef544e5 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/searx.nix

···

       108
       108
        
                     "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"

     

       109
       109
        
                 )

     

       110
       110
        
                 fancy.succeed(

     

       111
       111
       -
                     "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2"

     

       111
       111
       +
                     "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2"

     

       112
       112
        
                 )

     

       113
       113
        
           '';

     

       114
       114
        
       })

+2 -1

pkgs/applications/editors/netbeans/default.nix

···

       36
       36
        
           makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \

     

       37
       37
        
             --prefix PATH : ${lib.makeBinPath [ jdk which ]} \

     

       38
       38
        
             --prefix JAVA_HOME : ${jdk.home} \

     

       39
       39
       -
             --add-flags "--jdkhome ${jdk.home}"

     

       39
       39
       +
             --add-flags "--jdkhome ${jdk.home} \

     

       40
       40
       +
             -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true"

     

       40
       41
        
       

     

       41
       42
        
           # Extract pngs from the Apple icon image and create

     

       42
       43
        
           # the missing ones from the 1024x1024 image.

+14 -4

pkgs/applications/misc/dbeaver/default.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , copyDesktopItems

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       +
       , fetchpatch

     

       5
       6
        
       , makeDesktopItem

     

       6
       7
        
       , makeWrapper

     

       7
       8
        
       , fontconfig

     
···

       18
       19
        
       

     

       19
       20
        
       stdenv.mkDerivation rec {

     

       20
       21
        
         pname = "dbeaver-ce";

     

       21
       21
       -
         version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256

     

       22
       22
       +
         version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256

     

       22
       23
        
       

     

       23
       24
        
         src = fetchFromGitHub {

     

       24
       25
        
           owner = "dbeaver";

     

       25
       26
        
           repo = "dbeaver";

     

       26
       27
        
           rev = version;

     

       27
       27
       -
           sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k=";

     

       28
       28
       +
           sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA=";

     

       28
       29
        
         };

     

       29
       30
        
       

     

       30
       31
        
         fetchedMavenDeps = stdenv.mkDerivation {

     

       31
       32
        
           name = "dbeaver-${version}-maven-deps";

     

       32
       32
       -
           inherit src;

     

       33
       33
       +
           inherit src patches;

     

       33
       34
        
       

     

       34
       35
        
           buildInputs = [

     

       35
       36
        
             maven

     
···

       50
       51
        
           dontFixup = true;

     

       51
       52
        
           outputHashAlgo = "sha256";

     

       52
       53
        
           outputHashMode = "recursive";

     

       53
       53
       -
           outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";

     

       54
       54
       +
           outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng=";

     

       54
       55
        
         };

     

       56
       56
       +
       

     

       57
       57
       +
         patches = [

     

       58
       58
       +
           # Fix eclipse-color-theme URL (https://github.com/dbeaver/dbeaver/pull/12133)

     

       59
       59
       +
           # After April 15, 2021 eclipse-color-theme.github.com no longer redirects to eclipse-color-theme.github.io

     

       60
       60
       +
           (fetchpatch {

     

       61
       61
       +
             url = "https://github.com/dbeaver/dbeaver/commit/65d65e2c2c711cc87fddcec425a6915aa80f4ced.patch";

     

       62
       62
       +
             sha256 = "sha256-pxOcRYkV/5o+tHcRhHDZ1TmZSHMnKBmkNTVAlIf9nUE=";

     

       63
       63
       +
           })

     

       64
       64
       +
         ];

     

       55
       65
        
       

     

       56
       66
        
         nativeBuildInputs = [

     

       57
       67
        
           copyDesktopItems

+2 -2

pkgs/applications/office/portfolio/default.nix

···

       24
       24
        
       in

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
        
         pname = "PortfolioPerformance";

     

       27
       27
       -
         version = "0.51.2";

     

       27
       27
       +
         version = "0.52.0";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchurl {

     

       30
       30
        
           url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";

     

       31
       31
       -
           sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";

     

       31
       31
       +
           sha256 = "1pvjckh7z803piqyzrvk54jd43f2vcyx20zjcgmq1va8jc3q69k1";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/terminal-emulators/foot/default.nix

···

       25
       25
        
       }:

     

       26
       26
        
       

     

       27
       27
        
       let

     

       28
       28
       -
         version = "1.7.1";

     

       28
       28
       +
         version = "1.7.2";

     

       29
       29
        
       

     

       30
       30
        
         # build stimuli file for PGO build and the script to generate it

     

       31
       31
        
         # independently of the foot's build, so we can cache the result

     
···

       93
       93
        
       

     

       94
       94
        
         src = fetchzip {

     

       95
       95
        
           url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";

     

       96
       96
       -
           sha256 = "1x6nyhlp0zynnbdjx87c4ybfx6fyr0r53vypkfima56dwbfh98ka";

     

       96
       96
       +
           sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh";

     

       97
       97
        
         };

     

       98
       98
        
       

     

       99
       99
        
         nativeBuildInputs = [

+2 -2

pkgs/development/compilers/sdcc/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "sdcc";

     

       13
       13
       -
         version = "4.0.0";

     

       13
       13
       +
         version = "4.1.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";

     

       17
       17
       -
           sha256 = "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8";

     

       17
       17
       +
           sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ boost gputils texinfo zlib ];

+48

pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch

···

       1
       1
       +
       From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: OPNA2608 <christoph.neidahl@gmail.com>

     

       3
       3
       +
       Date: Sun, 18 Apr 2021 01:45:20 +0200

     

       4
       4
       +
       Subject: [PATCH] pkgconfig darwin

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        Makefile | 4 ----

     

       8
       8
       +
        1 file changed, 4 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/Makefile b/Makefile

     

       11
       11
       +
       index 971c6d6..0f4be0c 100644

     

       12
       12
       +
       --- a/Makefile

     

       13
       13
       +
       +++ b/Makefile

     

       14
       14
       +
       @@ -153,7 +153,6 @@ endif

     

       15
       15
       +
        # -DKISS_FFT_BUILD to TYPEFLAGS

     

       16
       16
       +
        #

     

       17
       17
       +
        

     

       18
       18
       +
       -ifneq ($(shell uname -s),Darwin)

     

       19
       19
       +
        	PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH)

     

       20
       20
       +
        	PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME)

     

       21
       21
       +
        	PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS)

     

       22
       22
       +
       @@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin)

     

       23
       23
       +
        	PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR)

     

       24
       24
       +
          endif

     

       25
       25
       +
        	PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft

     

       26
       26
       +
       -endif

     

       27
       27
       +
        

     

       28
       28
       +
        export TYPEFLAGS

     

       29
       29
       +
        

     

       30
       30
       +
       @@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1)

     

       31
       31
       +
        	ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME)

     

       32
       32
       +
          endif

     

       33
       33
       +
        endif

     

       34
       34
       +
       -ifneq ($(shell uname -s),Darwin)

     

       35
       35
       +
        	mkdir "$(ABS_LIBDIR)/pkgconfig"

     

       36
       36
       +
        	sed \

     

       37
       37
       +
        		-e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \

     

       38
       38
       +
       @@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin)

     

       39
       39
       +
        		-e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \

     

       40
       40
       +
        		-e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \

     

       41
       41
       +
        		kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)"

     

       42
       42
       +
       -endif

     

       43
       43
       +
        ifneq ($(KISSFFT_TOOLS), 0)

     

       44
       44
       +
        	make -C tools install

     

       45
       45
       +
        endif

     

       46
       46
       +
       -- 

     

       47
       47
       +
       2.29.3

     

       48
       48
       +

+61 -26

pkgs/development/libraries/kissfft/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       3
       -
       , fetchpatch

     

       4
       4
       +
       , fftw

     

       5
       5
       +
       , fftwFloat

     

       6
       6
       +
       , python3

     

       7
       7
       +
       , datatype ? "double"

     

       8
       8
       +
       , withTools ? false

     

       9
       9
       +
       , libpng

     

       10
       10
       +
       , enableStatic ? stdenv.hostPlatform.isStatic

     

       11
       11
       +
       , enableOpenmp ? false

     

       12
       12
       +
       , llvmPackages

     

       4
       13
        
       }:

     

       5
       5
       -
       

     

       14
       14
       +
       let

     

       15
       15
       +
         py = python3.withPackages (ps: with ps; [ numpy ]);

     

       16
       16
       +
         option = cond: if cond then "1" else "0";

     

       17
       17
       +
       in

     

       6
       18
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         pname = "kissfft";

     

       8
       8
       -
         version = "131";

     

       19
       19
       +
         pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}";

     

       20
       20
       +
         version = "131.1.0";

     

       9
       21
        
       

     

       10
       22
        
         src = fetchFromGitHub {

     

       11
       23
        
           owner = "mborgerding";

     

       12
       12
       -
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "0axmqav2rclw02mix55cch9xl5py540ac15xbmq7xq6n3k492ng2";

     

       24
       24
       +
           repo = "kissfft";

     

       25
       25
       +
           rev = version;

     

       26
       26
       +
           sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s";

     

       15
       27
        
         };

     

       16
       28
        
       

     

       17
       29
        
         patches = [

     

       18
       18
       -
           # Allow installation into our prefix

     

       19
       19
       -
           # Fix installation on Darwin

     

       20
       20
       -
           # Create necessary directories

     

       21
       21
       -
           # Make datatype configurable

     

       22
       22
       -
           (fetchpatch {

     

       23
       23
       -
             url = "https://github.com/mborgerding/kissfft/pull/38.patch";

     

       24
       24
       -
             sha256 = "0cp1awl7lr2vqmcwm9lfjs4b4dv9da8mg4hfd821r5ryadpyijj6";

     

       25
       25
       -
           })

     

       26
       26
       -
           # Install headers as well

     

       27
       27
       -
           (fetchpatch {

     

       28
       28
       -
             url = "https://github.com/mborgerding/kissfft/commit/71df949992d2dbbe15ce707cf56c3fa1e43b1080.patch";

     

       29
       29
       -
             sha256 = "13h4kzsj388mxxv6napp4gx2ymavz9xk646mnyp1i852dijpmapm";

     

       30
       30
       -
           })

     

       30
       30
       +
           ./0001-pkgconfig-darwin.patch

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       -
         postPatch = ''

     

       34
       34
       -
           substituteInPlace Makefile \

     

       35
       35
       -
             --replace "gcc" "${stdenv.cc.targetPrefix}cc" \

     

       36
       36
       -
             --replace "ar" "${stdenv.cc.targetPrefix}ar"

     

       33
       33
       +
         # https://bugs.llvm.org/show_bug.cgi?id=45034

     

       34
       34
       +
         postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") ''

     

       35
       35
       +
           substituteInPlace test/Makefile \

     

       36
       36
       +
             --replace "-ffast-math" ""

     

       37
       37
       +
         ''

     

       38
       38
       +
         + lib.optionalString (stdenv.hostPlatform.isDarwin) ''

     

       39
       39
       +
           substituteInPlace test/Makefile \

     

       40
       40
       +
             --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"

     

       41
       41
       +
           # Don't know how to make math.h's double long constants available

     

       42
       42
       +
           substituteInPlace test/testcpp.cc \

     

       43
       43
       +
             --replace "M_PIl" "M_PI"

     

       37
       44
        
         '';

     

       45
       45
       +
       

     

       38
       46
        
         makeFlags = [

     

       39
       47
        
           "PREFIX=${placeholder "out"}"

     

       40
       40
       -
           "DATATYPE=double"

     

       48
       48
       +
           "KISSFFT_DATATYPE=${datatype}"

     

       49
       49
       +
           "KISSFFT_TOOLS=${option withTools}"

     

       50
       50
       +
           "KISSFFT_STATIC=${option enableStatic}"

     

       51
       51
       +
           "KISSFFT_OPENMP=${option enableOpenmp}"

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         buildInputs = lib.optionals (withTools && datatype != "simd") [ libpng ]

     

       55
       55
       +
           # TODO: This may mismatch the LLVM version in the stdenv, see #79818.

     

       56
       56
       +
           ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp;

     

       57
       57
       +
       

     

       58
       58
       +
         doCheck = true;

     

       59
       59
       +
       

     

       60
       60
       +
         checkInputs = [

     

       61
       61
       +
           py

     

       62
       62
       +
           (if datatype == "float" then fftwFloat else fftw)

     

       41
       63
        
         ];

     

       64
       64
       +
       

     

       65
       65
       +
         checkFlags = [ "testsingle" ];

     

       66
       66
       +
       

     

       67
       67
       +
         postInstall = ''

     

       68
       68
       +
           ln -s ${pname}.pc $out/lib/pkgconfig/kissfft.pc

     

       69
       69
       +
         '';

     

       70
       70
       +
       

     

       71
       71
       +
         # Tools can't find kissfft libs on Darwin

     

       72
       72
       +
         postFixup = lib.optionalString (withTools && stdenv.hostPlatform.isDarwin) ''

     

       73
       73
       +
           for bin in $out/bin/*; do

     

       74
       74
       +
             install_name_tool -change lib${pname}.dylib $out/lib/lib${pname}.dylib $bin

     

       75
       75
       +
           done

     

       76
       76
       +
         '';

     

       42
       77
        
       

     

       43
       78
        
         meta = with lib; {

     

       44
       79
        
           description = "A mixed-radix Fast Fourier Transform based up on the KISS principle";

+5 -13

pkgs/development/ocaml-modules/x509/default.nix

···

       1
       1
       -
       { lib, fetchurl, buildDunePackage, fetchpatch

     

       1
       1
       +
       { lib, fetchurl, buildDunePackage

     

       2
       2
        
       , alcotest, cstruct-unix

     

       3
       3
       -
       , asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk

     

       3
       3
       +
       , asn1-combinators, domain-name, fmt, gmap, pbkdf, rresult, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk

     

       4
       4
        
       , logs, base64

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       8
       8
        
         minimumOCamlVersion = "4.07";

     

       9
       9
        
       

     

       10
       10
        
         pname = "x509";

     

       11
       11
       -
         version = "0.11.2";

     

       11
       11
       +
         version = "0.12.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";

     

       15
       15
       -
           sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";

     

       15
       15
       +
           sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         patches = [

     

       19
       19
       -
           # fix tests for mirage-crypto >= 0.8.9, can be removed at next release

     

       20
       20
       -
           (fetchpatch {

     

       21
       21
       -
             url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";

     

       22
       22
       -
             sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";

     

       23
       23
       -
           })

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       18
        
         useDune2 = true;

     

       27
       19
        
       

     

       28
       20
        
         buildInputs = [ alcotest cstruct-unix ];

     

       29
       29
       -
         propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult  logs base64 ];

     

       21
       21
       +
         propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf rresult logs base64 ];

     

       30
       22
        
       

     

       31
       23
        
         doCheck = true;

     

       32
       24

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "awkward";

     

       13
       13
       -
         version = "1.1.2";

     

       13
       13
       +
         version = "1.2.2";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "4ae8371d9e6d5bd3e90f3686b433cebc0541c88072655d2c75ec58e79b5d6943";

     

       17
       17
       +
           sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ cmake ];

+3 -3

pkgs/development/python-modules/pytest-subprocess/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pytest-subprocess";

     

       13
       13
       -
         version = "1.0.1";

     

       13
       13
       +
         version = "1.1.0";

     

       14
       14
        
       

     

       15
       15
       -
         disabled = pythonOlder "3.4";

     

       15
       15
       +
         disabled = pythonOlder "3.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "aklajnert";

     

       19
       19
        
           repo = "pytest-subprocess";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "16ghwyv1vy45dd9cysjvcvvpm45958x071id2qrvgaziy2j6yx3j";

     

       21
       21
       +
           sha256 = "sha256-r6WNDdvZAHMG1kPtLJlCwvhbVG1gC1NEvRfta+Chxnk=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "go-task";

     

       5
       5
       -
         version = "3.3.0";

     

       5
       5
       +
         version = "3.4.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = "task";

     

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

     

       11
       11
       -
           sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk=";

     

       11
       11
       +
           sha256 = "sha256-r0AHGgv2huMaZfsbK7o4KKJirNeOff1M3jgG8ZUJoiA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI=";

     

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

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+28 -14

pkgs/servers/web-apps/searx/default.nix

···

       1
       1
       -
       { lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }:

     

       1
       1
       +
       { lib, nixosTests, python3, python3Packages, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       with python3Packages;

     

       4
       4
        
       

     

       5
       5
        
       toPythonModule (buildPythonApplication rec {

     

       6
       6
        
         pname = "searx";

     

       7
       7
       -
         version = "0.18.0";

     

       7
       7
       +
         version = "1.0.0";

     

       8
       8
        
       

     

       9
       9
       -
         # Can not use PyPI because certain test files are missing.

     

       9
       9
       +
         # pypi doesn't receive updates

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "searx";

     

       12
       12
        
           repo = "searx";

     

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

     

       14
       14
       -
           sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn";

     

       14
       14
       +
           sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

     

       18
       18
        
           sed -i 's/==.*$//' requirements.txt

     

       19
       19
       -
           # skip failing test

     

       20
       20
       -
           sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py

     

       21
       19
        
         '';

     

       22
       20
        
       

     

       23
       21
        
         preBuild = ''

     
···

       25
       23
        
         '';

     

       26
       24
        
       

     

       27
       25
        
         propagatedBuildInputs = [

     

       28
       28
       -
           pyyaml lxml grequests flaskbabel flask requests

     

       29
       29
       -
           gevent speaklater Babel pytz dateutil pygments

     

       30
       30
       -
           pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks

     

       31
       31
       -
           jinja2 werkzeug

     

       26
       26
       +
           Babel

     

       27
       27
       +
           certifi

     

       28
       28
       +
           dateutil

     

       29
       29
       +
           flask

     

       30
       30
       +
           flaskbabel

     

       31
       31
       +
           gevent

     

       32
       32
       +
           grequests

     

       33
       33
       +
           jinja2

     

       34
       34
       +
           langdetect

     

       35
       35
       +
           lxml

     

       36
       36
       +
           ndg-httpsclient

     

       37
       37
       +
           pyasn1

     

       38
       38
       +
           pyasn1-modules

     

       39
       39
       +
           pygments

     

       40
       40
       +
           pysocks

     

       41
       41
       +
           pytz

     

       42
       42
       +
           pyyaml

     

       43
       43
       +
           requests

     

       44
       44
       +
           speaklater

     

       45
       45
       +
           werkzeug

     

       32
       46
        
         ];

     

       33
       47
        
       

     

       34
       34
       -
         checkInputs = [

     

       35
       35
       -
           Babel mock nose2 covCore pep8 plone-testing splinter

     

       36
       36
       -
           unittest2 zope_testrunner selenium

     

       37
       37
       -
         ];

     

       48
       48
       +
         # tests try to connect to network

     

       49
       49
       +
         doCheck = false;

     

       50
       50
       +
       

     

       51
       51
       +
         pythonImportsCheck = [ "searx" ];

     

       38
       52
        
       

     

       39
       53
        
         postInstall = ''

     

       40
       54
        
           # Create a symlink for easier access to static data

+3 -3

pkgs/servers/x11/xorg/default.nix

···

       1717
       1717
        
         }) {};

     

       1718
       1718
        
       

     

       1719
       1719
        
         xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {

     

       1720
       1720
       -
           name = "xf86-input-libinput-1.0.0";

     

       1720
       1720
       +
           name = "xf86-input-libinput-1.0.1";

     

       1721
       1721
        
           builder = ./builder.sh;

     

       1722
       1722
        
           src = fetchurl {

     

       1723
       1723
       -
             url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2";

     

       1724
       1724
       -
             sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg";

     

       1723
       1723
       +
             url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2";

     

       1724
       1724
       +
             sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx";

     

       1725
       1725
        
           };

     

       1726
       1726
        
           hardeningDisable = [ "bindnow" "relro" ];

     

       1727
       1727
        
           nativeBuildInputs = [ pkg-config ];

+1 -1

pkgs/servers/x11/xorg/tarballs.list

···

       81
       81
        
       mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2

     

       82
       82
        
       mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2

     

       83
       83
        
       mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2

     

       84
       84
       -
       mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2

     

       84
       84
       +
       mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2

     

       85
       85
        
       mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2

     

       86
       86
        
       mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2

     

       87
       87
        
       mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

+3 -3

pkgs/tools/backup/zrepl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "zrepl";

     

       5
       5
       -
         version = "0.3.1";

     

       5
       5
       +
         version = "0.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "zrepl";

     

       9
       9
        
           repo = "zrepl";

     

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

     

       11
       11
       -
           sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo=";

     

       11
       11
       +
           sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA=";

     

       14
       14
       +
         vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "." ];

     

       17
       17

+2 -2

pkgs/tools/misc/ytfzf/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "ytfzf";

     

       19
       19
       -
         version = "1.1.3";

     

       19
       19
       +
         version = "1.1.4";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "pystardust";

     

       23
       23
        
           repo = "ytfzf";

     

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

     

       25
       25
       -
           sha256 = "sha256-ST6ZSNJW4Pe8fdwRsQ0BLdCd3AE9OTG6is3J+HMdIzs=";

     

       25
       25
       +
           sha256 = "sha256-zRzd+rZxT5IJoFJl9sutTdQC4eMDUCBld5bTGfQWtco=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         patches = [

+2 -2

pkgs/tools/networking/dnsproxy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "dnsproxy";

     

       5
       5
       -
         version = "0.37.0";

     

       5
       5
       +
         version = "0.37.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "AdguardTeam";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-3zsEEq6pVo5yHY4v5TXhZo4jo6htjCYypzxMMv8zQGE=";

     

       11
       11
       +
           sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;