commit a46c8c1b26c8760719191274bc4c01a99afac4dc · pyrox.dev/nixpkgs

+1 -1

doc/doc-support/lib-function-locations.nix

···

       38
       38
        
             substr = builtins.substring prefixLen filenameLen filename;

     

       39
       39
        
             in substr;

     

       40
       40
        
       

     

       41
       41
       -
         removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);

     

       41
       41
       +
         removeNixpkgs = removeFilenamePrefix pkgs.path;

     

       42
       42
        
       

     

       43
       43
        
         liblocations =

     

       44
       44
        
           builtins.filter

+5 -5

lib/sources.nix

···

       140
       140
        
             origSrc = if isFiltered then src.origSrc else src;

     

       141
       141
        
           in lib.cleanSourceWith {

     

       142
       142
        
             filter = (path: type:

     

       143
       143
       -
               let relPath = lib.removePrefix (toString origSrc + "/") (toString path);

     

       143
       143
       +
               let relPath = lib.removePrefix (origSrc + "/") (path);

     

       144
       144
        
               in lib.any (re: match re relPath != null) regexes);

     

       145
       145
        
             inherit src;

     

       146
       146
        
           };

     
···

       175
       175
        
         */

     

       176
       176
        
         commitIdFromGitRepo =

     

       177
       177
        
           let readCommitFromFile = file: path:

     

       178
       178
       -
               let fileName       = toString path + "/" + file;

     

       179
       179
       -
                   packedRefsName = toString path + "/packed-refs";

     

       178
       178
       +
               let fileName       = path + "/" + file;

     

       179
       179
       +
                   packedRefsName = path + "/packed-refs";

     

       180
       180
        
                   absolutePath   = base: path:

     

       181
       181
        
                     if lib.hasPrefix "/" path

     

       182
       182
        
                     then path

     

       183
       183
       -
                     else toString (/. + "${base}/${path}");

     

       183
       183
       +
                     else /. + "${base}/${path}";

     

       184
       184
        
               in if pathIsRegularFile path

     

       185
       185
        
                  # Resolve git worktrees. See gitrepository-layout(5)

     

       186
       186
        
                  then

     
···

       226
       226
        
       

     

       227
       227
        
         pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);

     

       228
       228
        
       

     

       229
       229
       -
         canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));

     

       229
       229
       +
         canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext src);

     

       230
       230
        
       

     

       231
       231
        
         # -------------------------------------------------------------------------- #

     

       232
       232
        
         # Internal functions

+2 -2

lib/trivial.nix

···

       213
       213
        
           # Default value to return if revision can not be determined

     

       214
       214
        
           default:

     

       215
       215
        
           let

     

       216
       216
       -
             revisionFile = "${toString ./..}/.git-revision";

     

       217
       217
       -
             gitRepo      = "${toString ./..}/.git";

     

       216
       216
       +
             revisionFile = ./.. + "/.git-revision";

     

       217
       217
       +
             gitRepo      = ./.. + "/.git";

     

       218
       218
        
           in if lib.pathIsGitRepo gitRepo

     

       219
       219
        
              then lib.commitIdFromGitRepo gitRepo

     

       220
       220
        
              else if lib.pathExists revisionFile then lib.fileContents revisionFile

+1

nixos/tests/all-tests.nix

···

       691
       691
        
         wmderland = handleTest ./wmderland.nix {};

     

       692
       692
        
         wpa_supplicant = handleTest ./wpa_supplicant.nix {};

     

       693
       693
        
         wordpress = handleTest ./wordpress.nix {};

     

       694
       694
       +
         wrappers = handleTest ./wrappers.nix {};

     

       694
       695
        
         writefreely = handleTest ./web-apps/writefreely.nix {};

     

       695
       696
        
         xandikos = handleTest ./xandikos.nix {};

     

       696
       697
        
         xautolock = handleTest ./xautolock.nix {};

+79

nixos/tests/wrappers.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         userUid = 1000;

     

       4
       4
       +
         usersGid = 100;

     

       5
       5
       +
         busybox = pkgs : pkgs.busybox.override {

     

       6
       6
       +
           # Without this, the busybox binary drops euid to ruid for most applets, including id.

     

       7
       7
       +
           # See https://bugs.busybox.net/show_bug.cgi?id=15101

     

       8
       8
       +
           extraConfig = "CONFIG_FEATURE_SUID n";

     

       9
       9
       +
         };

     

       10
       10
       +
       in

     

       11
       11
       +
       {

     

       12
       12
       +
         name = "wrappers";

     

       13
       13
       +
       

     

       14
       14
       +
         nodes.machine = { config, pkgs, ... }: {

     

       15
       15
       +
           ids.gids.users = usersGid;

     

       16
       16
       +
       

     

       17
       17
       +
           users.users = {

     

       18
       18
       +
             regular = {

     

       19
       19
       +
               uid = userUid;

     

       20
       20
       +
               isNormalUser = true;

     

       21
       21
       +
             };

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           security.wrappers = {

     

       25
       25
       +
             suidRoot = {

     

       26
       26
       +
               owner = "root";

     

       27
       27
       +
               group = "root";

     

       28
       28
       +
               setuid = true;

     

       29
       29
       +
               source = "${busybox pkgs}/bin/busybox";

     

       30
       30
       +
               program = "suid_root_busybox";

     

       31
       31
       +
             };

     

       32
       32
       +
             sgidRoot = {

     

       33
       33
       +
               owner = "root";

     

       34
       34
       +
               group = "root";

     

       35
       35
       +
               setgid = true;

     

       36
       36
       +
               source = "${busybox pkgs}/bin/busybox";

     

       37
       37
       +
               program = "sgid_root_busybox";

     

       38
       38
       +
             };

     

       39
       39
       +
             withChown = {

     

       40
       40
       +
               owner = "root";

     

       41
       41
       +
               group = "root";

     

       42
       42
       +
               source = "${pkgs.libcap}/bin/capsh";

     

       43
       43
       +
               program = "capsh_with_chown";

     

       44
       44
       +
               capabilities = "cap_chown+ep";

     

       45
       45
       +
             };

     

       46
       46
       +
           };

     

       47
       47
       +
         };

     

       48
       48
       +
       

     

       49
       49
       +
         testScript =

     

       50
       50
       +
           ''

     

       51
       51
       +
             def cmd_as_regular(cmd):

     

       52
       52
       +
               return "su -l regular -c '{0}'".format(cmd)

     

       53
       53
       +
       

     

       54
       54
       +
             def test_as_regular(cmd, expected):

     

       55
       55
       +
               out = machine.succeed(cmd_as_regular(cmd)).strip()

     

       56
       56
       +
               assert out == expected, "Expected {0} to output {1}, but got {2}".format(cmd, expected, out)

     

       57
       57
       +
       

     

       58
       58
       +
             test_as_regular('${busybox pkgs}/bin/busybox id -u', '${toString userUid}')

     

       59
       59
       +
             test_as_regular('${busybox pkgs}/bin/busybox id -ru', '${toString userUid}')

     

       60
       60
       +
             test_as_regular('${busybox pkgs}/bin/busybox id -g', '${toString usersGid}')

     

       61
       61
       +
             test_as_regular('${busybox pkgs}/bin/busybox id -rg', '${toString usersGid}')

     

       62
       62
       +
       

     

       63
       63
       +
             test_as_regular('/run/wrappers/bin/suid_root_busybox id -u', '0')

     

       64
       64
       +
             test_as_regular('/run/wrappers/bin/suid_root_busybox id -ru', '${toString userUid}')

     

       65
       65
       +
             test_as_regular('/run/wrappers/bin/suid_root_busybox id -g', '${toString usersGid}')

     

       66
       66
       +
             test_as_regular('/run/wrappers/bin/suid_root_busybox id -rg', '${toString usersGid}')

     

       67
       67
       +
       

     

       68
       68
       +
             test_as_regular('/run/wrappers/bin/sgid_root_busybox id -u', '${toString userUid}')

     

       69
       69
       +
             test_as_regular('/run/wrappers/bin/sgid_root_busybox id -ru', '${toString userUid}')

     

       70
       70
       +
             test_as_regular('/run/wrappers/bin/sgid_root_busybox id -g', '0')

     

       71
       71
       +
             test_as_regular('/run/wrappers/bin/sgid_root_busybox id -rg', '${toString usersGid}')

     

       72
       72
       +
       

     

       73
       73
       +
             # We are only testing the permitted set, because it's easiest to look at with capsh.

     

       74
       74
       +
             machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_CHOWN'))

     

       75
       75
       +
             machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_SYS_ADMIN'))

     

       76
       76
       +
             machine.succeed(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_CHOWN'))

     

       77
       77
       +
             machine.fail(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_SYS_ADMIN'))

     

       78
       78
       +
           '';

     

       79
       79
       +
       })

+3 -2

pkgs/applications/audio/espeak/edit.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK32, sox }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "espeakedit";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkg-config unzip ];

     

       13
       13
       -
         buildInputs = [ portaudio wxGTK ];

     

       13
       13
       +
         buildInputs = [ portaudio wxGTK32 ];

     

       14
       14
        
       

     

       15
       15
        
         # TODO:

     

       16
       16
        
         # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought

     
···

       27
       27
        
           ./espeakedit-configurable-sox-path.patch

     

       28
       28
        
           ./espeakedit-configurable-path-espeak-data.patch

     

       29
       29
        
           ./espeakedit-gcc6.patch

     

       30
       30
       +
           ./espeakedit-wxgtk30.patch

     

       30
       31
        
         ];

     

       31
       32
        
       

     

       32
       33
        
         postPatch = ''

+32

pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch

···

       1
       1
       +
       diff -uNr a/src/espeakedit.cpp b/src/espeakedit.cpp

     

       2
       2
       +
       --- a/src/espeakedit.cpp

     

       3
       3
       +
       +++ b/src/espeakedit.cpp

     

       4
       4
       +
       @@ -123,7 +126,7 @@ bool MyApp::OnInit(void)

     

       5
       5
       +
        {//=====================

     

       6
       6
       +
        

     

       7
       7
       +
        int j;

     

       8
       8
       +
       -wxChar *p;

     

       9
       9
       +
       +const wxChar *p;

     

       10
       10
       +
        char param[120];

     

       11
       11
       +
        

     

       12
       12
       +
        

     

       13
       13
       +
       diff -uNr a/src/spect.cpp b/src/spect.cpp

     

       14
       14
       +
       --- a/src/spect.cpp

     

       15
       15
       +
       +++ b/src/spect.cpp

     

       16
       16
       +
       @@ -1,6 +1,7 @@

     

       17
       17
       +
        /***************************************************************************

     

       18
       18
       +
         *   Copyright (C) 2005 to 2007 by Jonathan Duddington                     *

     

       19
       19
       +
         *   email: jonsd@users.sourceforge.net                                    *

     

       20
       20
       +
       + *   Copyright (C) 2013 by Reece H. Dunn                                   *

     

       21
       21
       +
         *                                                                         *

     

       22
       22
       +
         *   This program is free software; you can redistribute it and/or modify  *

     

       23
       23
       +
         *   it under the terms of the GNU General Public License as published by  *

     

       24
       24
       +
       @@ -92,6 +93,8 @@ float SpectTilt(int value, int freq)

     

       25
       25
       +
        

     

       26
       26
       +
        

     

       27
       27
       +
        SpectFrame::SpectFrame(SpectFrame *copy)

     

       28
       28
       +
       +	: FONT_SMALL(8,wxSWISS,wxNORMAL,wxNORMAL)

     

       29
       29
       +
       +	, FONT_MEDIUM(9,wxSWISS,wxNORMAL,wxNORMAL)

     

       30
       30
       +
        {//=====================================

     

       31
       31
       +
        

     

       32
       32
       +
        	int  ix;

+1 -1

pkgs/applications/audio/faust/faust2.nix

···

       34
       34
        
           homepage = "https://faust.grame.fr/";

     

       35
       35
        
           downloadPage = "https://github.com/grame-cncm/faust/";

     

       36
       36
        
           license = licenses.gpl2;

     

       37
       37
       -
           platforms = platforms.linux;

     

       37
       37
       +
           platforms = platforms.unix;

     

       38
       38
        
           maintainers = with maintainers; [ magnetophon pmahoney ];

     

       39
       39
        
         };

     

       40
       40

+37 -10

pkgs/applications/editors/xmlcopyeditor/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , aspell

     

       5
       5
       +
       , boost

     

       6
       6
       +
       , expat

     

       7
       7
       +
       , intltool

     

       8
       8
       +
       , pkg-config

     

       9
       9
       +
       , libxml2

     

       10
       10
       +
       , libxslt

     

       11
       11
       +
       , pcre2

     

       12
       12
       +
       , wxGTK32

     

       13
       13
       +
       , xercesc

     

       14
       14
       +
       , Cocoa

     

       15
       15
       +
       }:

     

       2
       16
        
       

     

       3
       17
        
       stdenv.mkDerivation rec {

     

       4
       18
        
         pname = "xmlcopyeditor";

     

       5
       5
       -
         version = "1.2.1.3";

     

       19
       19
       +
         version = "1.3.1.0";

     

       6
       20
        
       

     

       7
       21
        
         src = fetchurl {

     

       8
       8
       -
           name = "${pname}-${version}.tar.gz";

     

       9
       22
        
           url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v";

     

       23
       23
       +
           sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE=";

     

       11
       24
        
         };

     

       12
       25
        
       

     

       13
       26
        
         patches = [ ./xmlcopyeditor.patch ];

     

       14
       14
       -
         CPLUS_INCLUDE_PATH = "${libxml2.dev}/include/libxml2";

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           intltool

     

       30
       30
       +
           pkg-config

     

       31
       31
       +
         ];

     

       15
       32
        
       

     

       16
       16
       -
         nativeBuildInputs = [ intltool ];

     

       17
       17
       -
         buildInputs = [ aspell boost expat libxml2 libxslt pcre wxGTK xercesc ];

     

       33
       33
       +
         buildInputs = [

     

       34
       34
       +
           aspell

     

       35
       35
       +
           boost

     

       36
       36
       +
           expat

     

       37
       37
       +
           libxml2

     

       38
       38
       +
           libxslt

     

       39
       39
       +
           pcre2

     

       40
       40
       +
           wxGTK32

     

       41
       41
       +
           xercesc

     

       42
       42
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       43
       43
       +
           Cocoa

     

       44
       44
       +
         ];

     

       18
       45
        
       

     

       19
       46
        
         enableParallelBuilding = true;

     

       20
       47
        
       

     

       21
       48
        
         meta = with lib; {

     

       22
       49
        
           description = "A fast, free, validating XML editor";

     

       23
       23
       -
           homepage = "http://xml-copy-editor.sourceforge.net/";

     

       50
       50
       +
           homepage = "https://xml-copy-editor.sourceforge.io/";

     

       24
       51
        
           license = licenses.gpl2Plus;

     

       25
       25
       -
           platforms = platforms.linux;

     

       26
       26
       -
           maintainers = with maintainers; [ candeira ];

     

       52
       52
       +
           platforms = platforms.unix;

     

       53
       53
       +
           maintainers = with maintainers; [ candeira wegank ];

     

       27
       54
        
         };

     

       28
       55
        
       }

+3 -24

pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch

···

       1
       1
       -
       From 626c385ba141c6abcff01bef4451fcad062d232c Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Javier Candeira <javier@candeira.com>

     

       3
       3
       -
       Date: Sat, 7 Apr 2018 20:21:45 +1000

     

       4
       4
       -
       Subject: [PATCH] nixpckgs patches

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        src/Makefile.in | 6 +++---

     

       8
       8
       -
        1 file changed, 3 insertions(+), 3 deletions(-)

     

       9
       9
       -
       

     

       10
       1
        
       diff --git a/src/Makefile.in b/src/Makefile.in

     

       11
       11
       -
       index e75918f..e04703b 100644

     

       2
       2
       +
       index e2b01fc..7f3a21e 100644

     

       12
       3
        
       --- a/src/Makefile.in

     

       13
       4
        
       +++ b/src/Makefile.in

     

       14
       14
       -
       @@ -283,8 +283,8 @@ top_srcdir = @top_srcdir@

     

       5
       5
       +
       @@ -427,8 +427,8 @@ top_srcdir = @top_srcdir@

     

       15
       6
        
        # these are the headers for your project

     

       16
       7
        
        noinst_HEADERS = $(srcdir)/*.h

     

       17
       8
        
        xmlcopyeditordir = ${prefix}/share/xmlcopyeditor

     
···

       21
       12
        
       +applicationsdir = ${prefix}/share/applications

     

       22
       13
        
        

     

       23
       14
        
        # the application source, library search path, and link libraries

     

       24
       24
       -
        xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \

     

       25
       25
       -
       @@ -357,7 +357,7 @@ EXTRA_DIST = \

     

       26
       26
       -
        	$(srcdir)/xmlcopyeditor.rc \

     

       27
       27
       -
        	$(srcdir)/xmlschemaparser.cpp

     

       28
       28
       -
        

     

       29
       29
       -
       -AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS)

     

       30
       30
       -
       +AM_CPPFLAGS = -I$(CPLUS_INCLUDE_PATH) $(ENCHANT_CFLAGS) $(GTK_CFLAGS)

     

       31
       31
       -
        all: all-am

     

       32
       32
       -
        

     

       33
       33
       -
        .SUFFIXES:

     

       34
       34
       -
       -- 

     

       35
       35
       -
       2.16.2

     

       36
       36
       -
       

     

       15
       15
       +
        xmlcopyeditor_SOURCES = aboutdialog.cpp \

+1

pkgs/applications/emulators/wine/base.nix

···

       108
       108
        
         ])

     

       109
       109
        
         ++ lib.optionals waylandSupport (with pkgs; [

     

       110
       110
        
            wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev

     

       111
       111
       +
            mesa # for libgbm

     

       111
       112
        
         ])));

     

       112
       113
        
       

     

       113
       114
        
         patches = [ ]

+4 -3

pkgs/applications/emulators/wine/sources.nix

···

       70
       70
        
         };

     

       71
       71
        
       

     

       72
       72
        
         wayland = fetchFromGitLab rec {

     

       73
       73
       -
           version = "7.0-rc2";

     

       74
       74
       -
           sha256 = "sha256-FU9L8cyIIfFQ+8f/AUg7IT+RxTpyNTuSfL0zBnur0SA=";

     

       73
       73
       +
           # https://gitlab.collabora.com/alf/wine/-/tree/wayland

     

       74
       74
       +
           version = "7.20";

     

       75
       75
       +
           sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY=";

     

       75
       76
        
           domain = "gitlab.collabora.com";

     

       76
       77
        
           owner = "alf";

     

       77
       78
        
           repo = "wine";

     

       78
       78
       -
           rev = "95f0154c96a4b7d81e783ee5ba2f5d9cc7cda351";

     

       79
       79
       +
           rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1";

     

       79
       80
        
       

     

       80
       81
        
           inherit (unstable) gecko32 gecko64;

     

       81
       82

+2 -2

pkgs/applications/misc/privacyidea/default.nix

···

       89
       89
        
       in

     

       90
       90
        
       python3'.pkgs.buildPythonPackage rec {

     

       91
       91
        
         pname = "privacyIDEA";

     

       92
       92
       -
         version = "3.7.3";

     

       92
       92
       +
         version = "3.7.4";

     

       93
       93
        
       

     

       94
       94
        
         src = fetchFromGitHub {

     

       95
       95
        
           owner = pname;

     

       96
       96
        
           repo = pname;

     

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

     

       98
       98
       -
           sha256 = "sha256-odwYUGfgoRrGbLpOh8SuQzYby8Ya6hKSn0rdHp+RS/U=";

     

       98
       98
       +
           sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo=";

     

       99
       99
        
           fetchSubmodules = true;

     

       100
       100
        
         };

     

       101
       101

+11 -5

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

···

       1
       1
       -
       { lib, fetchFromGitHub, buildGoPackage }:

     

       1
       1
       +
       { lib, fetchFromGitHub, buildGoModule }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGoPackage rec {

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
        
         pname = "cni";

     

       5
       5
       -
         version = "0.8.1";

     

       5
       5
       +
         version = "1.1.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "containernetworking";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-vxwNHIc3rFi7HKIEZrBcr7Oxs2iUtFYcfJK7aXDUv3k=";

     

       11
       11
       +
           sha256 = "sha256-g7fVeoqquxPa17AfTu6wnB6PQJDluJ21T3ETrcvWtWg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         goPackagePath = "github.com/containernetworking/cni";

     

       14
       14
       +
         vendorSha256 = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s=";

     

       15
       15
       +
       

     

       16
       16
       +
         subPackages = [

     

       17
       17
       +
           "./cnitool"

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         ldflags = [ "-s" "-w" ];

     

       15
       21
        
       

     

       16
       22
        
         meta = with lib; {

     

       17
       23
        
           description = "Container Network Interface - networking for Linux containers";

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "waypoint";

     

       5
       5
       -
         version = "0.10.2";

     

       5
       5
       +
         version = "0.10.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "hashicorp";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-4RAnGPzXrPXMclDiTd38VrOy7zqvccD/xrm3QpeFubM=";

     

       11
       11
       +
           sha256 = "sha256-+lNeMcSlhmbs1knONnoX2RhEgxTYyCfpdD6WuDTiLx8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-fBsRmUE72lot9Ju/hUqpdSSXvMktRGP+H4WQ0GOCxrY=";

     

       14
       14
       +
         vendorSha256 = "sha256-59rJ30m6eiNIapJUNc1jRJE7IoAj0O+5G8JyKkhcyvY=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ go-bindata installShellFiles ];

     

       17
       17

+27 -11

pkgs/applications/networking/flent/default.nix

···

       1
       1
       -
       { lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python

     

       2
       2
       -
       , pythonPackages, qt5, sphinx, xvfb-run }:

     

       3
       3
       -
       

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonApplication,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         procps,

     

       6
       6
       +
         python,

     

       7
       7
       +
         qt5,

     

       8
       8
       +
         xvfb-run,

     

       9
       9
       +
       }:

     

       4
       10
        
       buildPythonApplication rec {

     

       5
       11
        
         pname = "flent";

     

       6
       6
       -
         version = "2.0.1";

     

       12
       12
       +
         version = "2.1.1";

     

       7
       13
        
         src = fetchPypi {

     

       8
       14
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796";

     

       15
       15
       +
           sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";

     

       10
       16
        
         };

     

       11
       17
        
       

     

       12
       12
       -
         buildInputs = [ sphinx ];

     

       13
       13
       -
         nativeBuildInputs = [ qt5.wrapQtAppsHook ];

     

       14
       14
       -
         propagatedBuildInputs = [ matplotlib procps pyqt5 ];

     

       15
       15
       -
         checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ];

     

       18
       18
       +
         buildInputs = [python.pkgs.sphinx];

     

       19
       19
       +
         nativeBuildInputs = [qt5.wrapQtAppsHook];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           procps

     

       22
       22
       +
           python.pkgs.matplotlib

     

       23
       23
       +
           python.pkgs.pyqt5

     

       24
       24
       +
           python.pkgs.qtpy

     

       25
       25
       +
         ];

     

       26
       26
       +
         checkInputs = [

     

       27
       27
       +
           python.pkgs.mock

     

       28
       28
       +
           xvfb-run

     

       29
       29
       +
         ];

     

       16
       30
        
       

     

       17
       31
        
         checkPhase = ''

     

       32
       32
       +
           # we want the gui tests to always run

     

       33
       33
       +
           sed -i 's|self.skip|pass; #&|' unittests/test_gui.py

     

       34
       34
       +
       

     

       18
       35
        
           cat >test-runner <<EOF

     

       19
       36
        
           #!/bin/sh

     

       20
       20
       -
       

     

       21
       37
        
           ${python.pythonForBuild.interpreter} nix_run_setup test

     

       22
       38
        
           EOF

     

       23
       39
        
           chmod +x test-runner

     
···

       34
       50
        
           homepage = "https://flent.org";

     

       35
       51
        
           license = licenses.gpl3;

     

       36
       52
        
       

     

       37
       37
       -
           maintainers = [ maintainers.mmlb ];

     

       53
       53
       +
           maintainers = [maintainers.mmlb];

     

       38
       54
        
         };

     

       39
       55
        
       }

+2 -2

pkgs/applications/networking/instant-messengers/dino/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "dino";

     

       22
       22
       -
         version = "0.3.0";

     

       22
       22
       +
         version = "0.3.1";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "dino";

     

       26
       26
        
           repo = "dino";

     

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

     

       28
       28
       -
           sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q=";

     

       28
       28
       +
           sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+3 -8

pkgs/applications/science/electronics/kicad/default.nix

···

       2
       2
        
       , fetchFromGitLab

     

       3
       3
        
       , gnome

     

       4
       4
        
       , dconf

     

       5
       5
       -
       , wxGTK31

     

       5
       5
       +
       , wxGTK32

     

       6
       6
        
       , gtk3

     

       7
       7
        
       , makeWrapper

     

       8
       8
        
       , gsettings-desktop-schemas

     
···

       104
       104
        
           if srcOverridep "libVersion" then srcs.libVersion

     

       105
       105
        
           else versionsImport.${baseName}.libVersion.version;

     

       106
       106
        
       

     

       107
       107
       -
         wxGTK = wxGTK31;

     

       107
       107
       +
         wxGTK = wxGTK32;

     

       108
       108
        
         python = python3;

     

       109
       109
       -
         wxPython = python.pkgs.wxPython_4_1;

     

       109
       109
       +
         wxPython = python.pkgs.wxPython_4_2;

     

       110
       110
        
       

     

       111
       111
        
         inherit (lib) concatStringsSep flatten optionalString optionals;

     

       112
       112
        
       in

     
···

       224
       224
        
           maintainers = with lib.maintainers; [ evils kiwi ];

     

       225
       225
        
           # kicad is cross platform

     

       226
       226
        
           platforms = lib.platforms.all;

     

       227
       227
       -
           # despite that, nipkgs' wxGTK for darwin is "wxmac"

     

       228
       228
       -
           # and wxPython_4_0 does not account for this

     

       229
       229
       -
           # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3),

     

       230
       230
       -
           # seems like more trouble than fixing wxPython_4_0 would be

     

       231
       231
       -
           # additionally, libngspice is marked as linux only, though it should support darwin

     

       232
       227
        
       

     

       233
       228
        
           hydraPlatforms = if (with3d) then [ ] else platforms;

     

       234
       229
        
           # We can't download the 3d models on Hydra,

+2 -2

pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "obs-vkcapture";

     

       19
       19
       -
         version = "1.2.0";

     

       19
       19
       +
         version = "1.2.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "nowrep";

     

       23
       23
        
           repo = pname;

     

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

     

       25
       25
       -
           hash = "sha256-yaN0am24p9gC+s64Rop+jQ3952UOtZund/KttnVxP48=";

     

       25
       25
       +
           hash = "sha256-FOyUgsHQlsjVGCct+ky189alVImoG+paqDKmGvnHoXo=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         cmakeFlags = lib.optionals stdenv.isi686 [

+2 -2

pkgs/applications/virtualization/conmon/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "conmon";

     

       14
       14
       -
         version = "2.1.4";

     

       14
       14
       +
         version = "2.1.5";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "containers";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           sha256 = "sha256-d7fXbzbrqhP6zLVZo3gO+FyvZg7Z3AGlNSNLy0PD6EE=";

     

       20
       20
       +
           sha256 = "sha256-zpZ3hVgnh8gkrSghSvhSZnG9uaN+GTKFGHv+MMcs73Q=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkg-config ];

+2 -2

pkgs/development/libraries/aws-c-http/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "aws-c-http";

     

       14
       14
       -
         version = "0.6.22";

     

       14
       14
       +
         version = "0.6.24";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "awslabs";

     

       18
       18
        
           repo = "aws-c-http";

     

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

     

       20
       20
       -
           sha256 = "sha256-wUaKLeIMu7iA+rXO6pVEJtE6Lxc5JIio3vZqhn9PV3M=";

     

       20
       20
       +
           sha256 = "sha256-sY0R9Hn0keX4djkHVXszCCfdqa+rzokTe18e5YH0fqs=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/aws-c-io/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "aws-c-io";

     

       5
       5
       -
         version = "0.13.5";

     

       5
       5
       +
         version = "0.13.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "awslabs";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-7qNJMIG+bshtapm7uj+8ECSN9j0Bd1famSXp+i+67Uw=";

     

       11
       11
       +
           sha256 = "sha256-axFhFGeJhfqb4zu5u9an0pgpVDe+OyT+7A5SlAs502I=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/aws-c-s3/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "aws-c-s3";

     

       17
       17
       -
         version = "0.1.50";

     

       17
       17
       +
         version = "0.1.51";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "awslabs";

     

       21
       21
        
           repo = "aws-c-s3";

     

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

     

       23
       23
       -
           sha256 = "sha256-LFp7GkqdVXjOeeVD/4gOUK5chWcUMiepGoDLoN2XUok=";

     

       23
       23
       +
           sha256 = "sha256-10SDOl0XoALdSxJWHDLDkvX7rArUQKXjjXfAECFy/Vw=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/aws-crt-cpp/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "aws-crt-cpp";

     

       19
       19
       -
         version = "0.18.7";

     

       19
       19
       +
         version = "0.18.9";

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "out" "dev" ];

     

       22
       22
        
       

     
···

       24
       24
        
           owner = "awslabs";

     

       25
       25
        
           repo = "aws-crt-cpp";

     

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

     

       27
       27
       -
           sha256 = "sha256-a5LY5GndhpKl5hFWl5DT5sj8xe24w4CJCkVg97oNA7U=";

     

       27
       27
       +
           sha256 = "sha256-NEsEKUKmADevb8SSc8EFuXLc12fuOf6fXI76yVeDQno=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         patches = [

+2 -2

pkgs/development/libraries/libpulsar/default.nix

···

       51
       51
        
       in

     

       52
       52
        
       stdenv.mkDerivation rec {

     

       53
       53
        
         pname = "libpulsar";

     

       54
       54
       -
         version = "2.10.1";

     

       54
       54
       +
         version = "2.10.2";

     

       55
       55
        
       

     

       56
       56
        
         src = fetchurl {

     

       57
       57
       -
           hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY=";

     

       57
       57
       +
           hash = "sha256-IONnsSDbnX2qz+Xya0taHYSViTOiRI36AfcxmY3dNpo=";

     

       58
       58
        
           url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz";

     

       59
       59
        
         };

     

       60
       60

+1 -1

pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix

···

       2
       2
        
       

     

       3
       3
        
       buildDunePackage {

     

       4
       4
        
         pname = "gettext-camomile";

     

       5
       5
       -
         inherit (ocaml_gettext) src version useDune2;

     

       5
       5
       +
         inherit (ocaml_gettext) src version;

     

       6
       6
        
       

     

       7
       7
        
         propagatedBuildInputs = [ camomile ocaml_gettext ];

     

       8
       8

+3 -4

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

···

       4
       4
        
         pname = "gettext";

     

       5
       5
        
         version = "0.4.2";

     

       6
       6
        
       

     

       7
       7
       -
         minimumOCamlVersion = "4.03";

     

       8
       8
       -
       

     

       9
       9
       -
         useDune2 = true;

     

       7
       7
       +
         minimalOCamlVersion = "4.03";

     

       10
       8
        
       

     

       11
       9
        
         src = fetchurl {

     

       12
       10
        
           url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz";

     
···

       17
       15
        
       

     

       18
       16
        
         propagatedBuildInputs = [ gettext fileutils ];

     

       19
       17
        
       

     

       20
       20
       -
         doCheck = true;

     

       18
       18
       +
         # Tests for version 0.4.2 are not compatible with OUnit 2.2.6

     

       19
       19
       +
         doCheck = false;

     

       21
       20
        
       

     

       22
       21
        
         checkInputs = [ ounit ];

     

       23
       22

+1 -1

pkgs/development/ocaml-modules/ocaml-gettext/stub.nix

···

       4
       4
        
       

     

       5
       5
        
         pname = "gettext-stub";

     

       6
       6
        
       

     

       7
       7
       -
         inherit (ocaml_gettext) src version useDune2;

     

       7
       7
       +
         inherit (ocaml_gettext) src version;

     

       8
       8
        
       

     

       9
       9
        
         buildInputs = [ dune-configurator ];

     

       10
       10

+5 -5

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

···

       1
       1
       -
       { lib, ocaml, buildDunePackage, fetchurl, stdlib-shims, ncurses }:

     

       1
       1
       +
       { lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }:

     

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         minimumOCamlVersion = "4.04";

     

       5
       5
        
       

     

       6
       6
        
         pname = "ounit2";

     

       7
       7
       -
         version = "2.2.4";

     

       7
       7
       +
         version = "2.2.6";

     

       8
       8
        
       

     

       9
       9
        
         useDune2 = lib.versionAtLeast ocaml.version "4.08";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
       -
           url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz";

     

       13
       13
       -
           sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m";

     

       12
       12
       +
           url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz";

     

       13
       13
       +
           sha256 = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         propagatedBuildInputs = [ stdlib-shims ];

     

       16
       16
       +
         propagatedBuildInputs = [ seq stdlib-shims ];

     

       17
       17
        
       

     

       18
       18
        
         doCheck = true;

     

       19
       19
        
         checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;

+6 -16

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

···

       1
       1
       -
       { lib, fetchurl, fetchpatch, buildDunePackage, ocaml, qcheck }:

     

       1
       1
       +
       { lib, fetchurl, buildDunePackage, ocaml, qcheck }:

     

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "stdint";

     

       5
       5
       -
         version = "0.7.0";

     

       5
       5
       +
         version = "0.7.2";

     

       6
       6
        
       

     

       7
       7
       -
         useDune2 = true;

     

       7
       7
       +
         duneVersion = "3";

     

       8
       8
        
       

     

       9
       9
       -
         minimumOCamlVersion = "4.03";

     

       9
       9
       +
         minimalOCamlVersion = "4.03";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://github.com/andrenth/ocaml-stdint/releases/download/${version}/stdint-${version}.tbz";

     

       13
       13
       -
           sha256 = "4fcc66aef58e2b96e7af3bbca9d910aa239e045ba5fb2400aaef67d0041252dc";

     

       13
       13
       +
           sha256 = "sha256-FWAZjYvJx68+qVLEDavoJmZpQhDsw/35u/60MhHpd+Y=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         patches = [

     

       17
       17
       -
           # fix test bug, remove at next release

     

       18
       18
       -
           (fetchpatch {

     

       19
       19
       -
             url = "https://github.com/andrenth/ocaml-stdint/commit/fc64293f99f597cdfd4470954da6fb323988e2af.patch";

     

       20
       20
       -
             sha256 = "0nxck14vfjfzldsf8cdj2jg1cvhnyh37hqnrcxbdkqmpx4rxkbxs";

     

       21
       21
       -
           })

     

       22
       22
       -
         ];

     

       23
       23
       -
       

     

       24
       16
        
         # 1. disable remaining broken tests, see

     

       25
       17
        
         #    https://github.com/andrenth/ocaml-stdint/issues/59

     

       26
       18
        
         # 2. fix tests to liberal test range

     
···

       30
       22
        
             --replace 'test "An integer should perform left-shifts correctly"' \

     

       31
       23
        
                       'skip "An integer should perform left-shifts correctly"' \

     

       32
       24
        
             --replace 'test "Logical shifts must not sign-extend"' \

     

       33
       33
       -
                       'skip "Logical shifts must not sign-extend"' \

     

       34
       34
       -
             --replace 'let pos_int = QCheck.map_same_type abs in_range' \

     

       35
       35
       -
                       'let pos_int = QCheck.int_range 0 maxi'

     

       25
       25
       +
                       'skip "Logical shifts must not sign-extend"'

     

       36
       26
        
         '';

     

       37
       27
        
       

     

       38
       28
        
         doCheck = lib.versionAtLeast ocaml.version "4.08";

+10 -27

pkgs/development/python-modules/flask-restx/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , fetchpatch

     

       4
       4
       +
       , pythonOlder

     

       5
       5
        
       , aniso8601

     

       6
       6
        
       , jsonschema

     

       7
       7
        
       , flask

     

       8
       8
        
       , werkzeug

     

       9
       9
        
       , pytz

     

       10
       10
        
       , faker

     

       11
       11
       -
       , six

     

       12
       11
        
       , mock

     

       13
       12
        
       , blinker

     

       14
       13
        
       , pytest-flask

     
···

       19
       18
        
       

     

       20
       19
        
       buildPythonPackage rec {

     

       21
       20
        
         pname = "flask-restx";

     

       22
       22
       -
         version = "0.5.1";

     

       21
       21
       +
         version = "1.0.3";

     

       22
       22
       +
         format = "setuptools";

     

       23
       23
       +
       

     

       24
       24
       +
         disabled = pythonOlder "3.7";

     

       23
       25
        
       

     

       24
       26
        
         # Tests not included in PyPI tarball

     

       25
       27
        
         src = fetchFromGitHub {

     

       26
       28
        
           owner = "python-restx";

     

       27
       29
        
           repo = pname;

     

       28
       30
        
           rev = version;

     

       29
       29
       -
           sha256 = "18vrmknyxw6adn62pz3kr9kvazfgjgl4pgimdf8527fyyiwcqy15";

     

       31
       31
       +
           sha256 = "sha256-fodoGeVSNw4XZrVt907H20OJQIR8FlfINvEPWOkZQqI=";

     

       30
       32
        
         };

     

       31
       33
        
       

     

       32
       32
       -
         patches = [

     

       33
       33
       -
           # Fixes werkzeug 2.1 compatibility

     

       34
       34
       -
           (fetchpatch {

     

       35
       35
       -
             # https://github.com/python-restx/flask-restx/pull/427

     

       36
       36
       -
             url = "https://github.com/python-restx/flask-restx/commit/bb72a51860ea8a42c928f69bdd44ad20b1f9ee7e.patch";

     

       37
       37
       -
             hash = "sha256-DRH3lI6TV1m0Dq1VyscL7GQS26OOra9g88dXZNrNpmQ=";

     

       38
       38
       -
           })

     

       39
       39
       -
           (fetchpatch {

     

       40
       40
       -
             # https://github.com/python-restx/flask-restx/pull/427

     

       41
       41
       -
             url = "https://github.com/python-restx/flask-restx/commit/bb3e9dd83b9d4c0d0fa0de7d7ff713fae71eccee.patch";

     

       42
       42
       -
             hash = "sha256-HJpjG4aQWzEPCMfbXfkw4mz5TH9d89BCvGH2dE6Jfv0=";

     

       43
       43
       -
           })

     

       44
       44
       -
           # Fixes werkzeug 2.2 compatibility

     

       45
       45
       -
           (fetchpatch {

     

       46
       46
       -
             # https://github.com/python-restx/flask-restx/pull/463

     

       47
       47
       -
             url = "https://github.com/python-restx/flask-restx/commit/82f7340ebb51e5c143b804bc0f20f785e96968c0.patch";

     

       48
       48
       -
             hash = "sha256-GA+UlFDu771ul3qplsukce/mjGvJ3E4Dw/IoJQLevNU=";

     

       49
       49
       -
           })

     

       50
       50
       -
         ];

     

       51
       51
       -
       

     

       52
       34
        
         propagatedBuildInputs = [

     

       53
       35
        
           aniso8601

     

       54
       36
        
           flask

     

       55
       37
        
           jsonschema

     

       56
       38
        
           pytz

     

       57
       57
       -
           six

     

       58
       39
        
           werkzeug

     

       59
       40
        
         ];

     

       60
       41
        
       

     
···

       75
       56
        
           "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level"

     

       76
       57
        
         ];

     

       77
       58
        
       

     

       78
       78
       -
         pythonImportsCheck = [ "flask_restx" ];

     

       59
       59
       +
         pythonImportsCheck = [

     

       60
       60
       +
           "flask_restx"

     

       61
       61
       +
         ];

     

       79
       62
        
       

     

       80
       63
        
         meta = with lib; {

     

       81
       81
       -
           homepage = "https://flask-restx.readthedocs.io/en/${version}/";

     

       82
       64
        
           description = "Fully featured framework for fast, easy and documented API development with Flask";

     

       65
       65
       +
           homepage = "https://github.com/python-restx/flask-restx";

     

       83
       66
        
           changelog = "https://github.com/python-restx/flask-restx/raw/${version}/CHANGELOG.rst";

     

       84
       67
        
           license = licenses.bsd3;

     

       85
       68
        
           maintainers = [ maintainers.marsam ];

+17 -6

pkgs/development/python-modules/pdfminer-six/default.nix

···

       4
       4
        
       , isPy3k

     

       5
       5
        
       , cryptography

     

       6
       6
        
       , charset-normalizer

     

       7
       7
       +
       , pythonOlder

     

       8
       8
       +
       , typing-extensions

     

       7
       9
        
       , pytestCheckHook

     

       8
       10
        
       , ocrmypdf

     

       9
       11
        
       }:

     

       10
       12
        
       

     

       11
       13
        
       buildPythonPackage rec {

     

       12
       14
        
         pname = "pdfminer-six";

     

       13
       13
       -
         version = "20220524";

     

       15
       15
       +
         version = "20221105";

     

       16
       16
       +
         format = "setuptools";

     

       14
       17
        
       

     

       15
       18
        
         disabled = !isPy3k;

     

       16
       19
        
       

     
···

       18
       21
        
           owner = "pdfminer";

     

       19
       22
        
           repo = "pdfminer.six";

     

       20
       23
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-XO9sdHeS/8MgVW0mxbTe2AY5BDfnBSDNzZwLsSKmQh0=";

     

       24
       24
       +
           sha256 = "sha256-OyEeQBuYfj4iEcRt2/daSaUfTOjCVSCyHW2qffal+Bk=";

     

       22
       25
        
         };

     

       23
       26
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ charset-normalizer cryptography ];

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           charset-normalizer

     

       29
       29
       +
           cryptography

     

       30
       30
       +
         ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];

     

       25
       31
        
       

     

       26
       32
        
         postInstall = ''

     

       27
       33
        
           for file in $out/bin/*.py; do

     
···

       30
       36
        
         '';

     

       31
       37
        
       

     

       32
       38
        
         postPatch = ''

     

       33
       33
       -
           # Verion is not stored in repo, gets added by a GitHub action after tag is created

     

       39
       39
       +
           # Version is not stored in repo, gets added by a GitHub action after tag is created

     

       34
       40
        
           # https://github.com/pdfminer/pdfminer.six/pull/727

     

       35
       41
        
           substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version}

     

       36
       42
        
         '';

     

       37
       43
        
       

     

       38
       38
       -
         pythonImportsCheck = [ "pdfminer" ];

     

       44
       44
       +
         pythonImportsCheck = [

     

       45
       45
       +
           "pdfminer"

     

       46
       46
       +
           "pdfminer.high_level"

     

       47
       47
       +
         ];

     

       39
       48
        
       

     

       40
       40
       -
         checkInputs = [ pytestCheckHook ];

     

       49
       49
       +
         checkInputs = [

     

       50
       50
       +
           pytestCheckHook

     

       51
       51
       +
         ];

     

       41
       52
        
       

     

       42
       53
        
         passthru = {

     

       43
       54
        
           tests = {

+9 -3

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

···

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7";

     

       20
       20
       +
           hash = "sha256-XyLnvLlpAGc44apCGcdaMvNMLWLUbcnS+y0+CwKH5Lc=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         patches = [

     
···

       25
       25
        
             # test_Class_params fails in 0.10.0

     

       26
       26
        
             # https://github.com/pdoc3/pdoc/issues/355

     

       27
       27
        
             url = "https://github.com/pdoc3/pdoc/commit/4aa70de2221a34a3003a7e5f52a9b91965f0e359.patch";

     

       28
       28
       -
             sha256 = "07sbf7bh09vgd5z1lbay604rz7rhg88414whs6iy60wwbvkz5c2v";

     

       28
       28
       +
             hash = "sha256-W7Dy516cA+Oj0ZCTQBB6MJ+fCTBeLRp+aW8nANdxSx8=";

     

       29
       29
       +
           })

     

       30
       30
       +
           # https://github.com/pdoc3/pdoc/issues/400

     

       31
       31
       +
           (fetchpatch {

     

       32
       32
       +
             name = "fix-test-for-python310.patch";

     

       33
       33
       +
             url = "https://github.com/pdoc3/pdoc/commit/80af5d40d3ca39e2701c44941c1003ae6a280799.patch";

     

       34
       34
       +
             hash = "sha256-69Cn+BY7feisSHugONIF/PRgEDEfnvnS/RBHWv1P8/w=";

     

       35
       35
       +
             excludes = [".github/workflows/ci.yml"];

     

       29
       36
        
           })

     

       30
       37
        
         ];

     

       31
       38
        
       

     
···

       40
       47
        
         ];

     

       41
       48
        
       

     

       42
       49
        
         meta = with lib; {

     

       43
       43
       -
           broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

     

       44
       50
        
           description = "Auto-generate API documentation for Python projects.";

     

       45
       51
        
           homepage = "https://pdoc3.github.io/pdoc/";

     

       46
       52
        
           license = with licenses; [ agpl3Plus ];

+1 -1

pkgs/development/tools/apksigner/default.nix

···

       87
       87
        
           homepage = "https://developer.android.com/studio/command-line/apksigner";

     

       88
       88
        
           license = licenses.asl20;

     

       89
       89
        
           maintainers = with maintainers; [ linsui ];

     

       90
       90
       -
           platforms = [ "x86_64-linux" ];

     

       90
       90
       +
           platforms = platforms.unix;

     

       91
       91
        
         };

     

       92
       92
        
       }

+2

pkgs/development/tools/continuous-integration/laminar/default.nix

···

       38
       38
        
         # We need both binary from "capnproto" and library files.

     

       39
       39
        
         nativeBuildInputs = [ cmake pandoc capnproto ];

     

       40
       40
        
         buildInputs = [ capnproto sqlite boost zlib rapidjson ];

     

       41
       41
       +
         cmakeFlags = [ "-DLAMINAR_VERSION=${version}" ];

     

       42
       42
       +
       

     

       41
       43
        
         preBuild = ''

     

       42
       44
        
           mkdir -p js css

     

       43
       45
        
           cp  ${js.vue}         js/vue.min.js

+30 -30

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       2
       2
        
           "4.14": {

     

       3
       3
        
               "patch": {

     

       4
       4
        
                   "extra": "-hardened1",

     

       5
       5
       -
                   "name": "linux-hardened-4.14.296-hardened1.patch",

     

       6
       6
       -
                   "sha256": "1shbnrzdl0zpyq1wpd610l5xf0j1nsnbgd6yg88gjacgd2hpx143",

     

       7
       7
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.296-hardened1/linux-hardened-4.14.296-hardened1.patch"

     

       5
       5
       +
                   "name": "linux-hardened-4.14.298-hardened1.patch",

     

       6
       6
       +
                   "sha256": "1gzp5fxyv5s029s6c9zrnvj3wb02blabmdmcziaqvf6k7k178prs",

     

       7
       7
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.298-hardened1/linux-hardened-4.14.298-hardened1.patch"

     

       8
       8
        
               },

     

       9
       9
       -
               "sha256": "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d",

     

       10
       10
       -
               "version": "4.14.296"

     

       9
       9
       +
               "sha256": "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6",

     

       10
       10
       +
               "version": "4.14.298"

     

       11
       11
        
           },

     

       12
       12
        
           "4.19": {

     

       13
       13
        
               "patch": {

     

       14
       14
        
                   "extra": "-hardened1",

     

       15
       15
       -
                   "name": "linux-hardened-4.19.262-hardened1.patch",

     

       16
       16
       -
                   "sha256": "117l4azj4j6jydrgrjs96xgab0g3ail4q75hkyqn85if7bjjnymk",

     

       17
       17
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.262-hardened1/linux-hardened-4.19.262-hardened1.patch"

     

       15
       15
       +
                   "name": "linux-hardened-4.19.264-hardened1.patch",

     

       16
       16
       +
                   "sha256": "08swipghq66lx3nrww1319qwwgw3yipy5m4kvzpsz6mfhkm54aw9",

     

       17
       17
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.264-hardened1/linux-hardened-4.19.264-hardened1.patch"

     

       18
       18
        
               },

     

       19
       19
       -
               "sha256": "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v",

     

       20
       20
       -
               "version": "4.19.262"

     

       19
       19
       +
               "sha256": "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps",

     

       20
       20
       +
               "version": "4.19.264"

     

       21
       21
        
           },

     

       22
       22
        
           "5.10": {

     

       23
       23
        
               "patch": {

     

       24
       24
        
                   "extra": "-hardened1",

     

       25
       25
       -
                   "name": "linux-hardened-5.10.152-hardened1.patch",

     

       26
       26
       -
                   "sha256": "0j5zbmhf1lf9b4xy11h48rl7vcj7jk4bx8phwkk2bvvrapv05r3j",

     

       27
       27
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.152-hardened1/linux-hardened-5.10.152-hardened1.patch"

     

       25
       25
       +
                   "name": "linux-hardened-5.10.153-hardened1.patch",

     

       26
       26
       +
                   "sha256": "02kw33m0j10dnl30n17ppffqh8l8v91jpz1d1pkqipfw3j40j8az",

     

       27
       27
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.153-hardened1/linux-hardened-5.10.153-hardened1.patch"

     

       28
       28
        
               },

     

       29
       29
       -
               "sha256": "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs",

     

       30
       30
       -
               "version": "5.10.152"

     

       29
       29
       +
               "sha256": "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw",

     

       30
       30
       +
               "version": "5.10.153"

     

       31
       31
        
           },

     

       32
       32
        
           "5.15": {

     

       33
       33
        
               "patch": {

     

       34
       34
        
                   "extra": "-hardened1",

     

       35
       35
       -
                   "name": "linux-hardened-5.15.76-hardened1.patch",

     

       36
       36
       -
                   "sha256": "0wrrys0wbjczish6jp3mdcsrqph8bvid27cjfr6r7pvpzw9cwimi",

     

       37
       37
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.76-hardened1/linux-hardened-5.15.76-hardened1.patch"

     

       35
       35
       +
                   "name": "linux-hardened-5.15.77-hardened1.patch",

     

       36
       36
       +
                   "sha256": "0pfa2xi64an716by3rqgn521a4igzb1y2bmbdn87icg8p79qavgx",

     

       37
       37
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.77-hardened1/linux-hardened-5.15.77-hardened1.patch"

     

       38
       38
        
               },

     

       39
       39
       -
               "sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh",

     

       40
       40
       -
               "version": "5.15.76"

     

       39
       39
       +
               "sha256": "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql",

     

       40
       40
       +
               "version": "5.15.77"

     

       41
       41
        
           },

     

       42
       42
        
           "5.4": {

     

       43
       43
        
               "patch": {

     

       44
       44
        
                   "extra": "-hardened1",

     

       45
       45
       -
                   "name": "linux-hardened-5.4.221-hardened1.patch",

     

       46
       46
       -
                   "sha256": "19zp4pn8vbrgcnq1m9wck5ixs7247amwifngzb1630jniqhkrj0n",

     

       47
       47
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.221-hardened1/linux-hardened-5.4.221-hardened1.patch"

     

       45
       45
       +
                   "name": "linux-hardened-5.4.223-hardened1.patch",

     

       46
       46
       +
                   "sha256": "1jsnrxv9a16l5gdhbn7w4rc9ql7arggvcizmkdvnk7ymd6ni6518",

     

       47
       47
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.223-hardened1/linux-hardened-5.4.223-hardened1.patch"

     

       48
       48
        
               },

     

       49
       49
       -
               "sha256": "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7",

     

       50
       50
       -
               "version": "5.4.221"

     

       49
       49
       +
               "sha256": "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y",

     

       50
       50
       +
               "version": "5.4.223"

     

       51
       51
        
           },

     

       52
       52
        
           "6.0": {

     

       53
       53
        
               "patch": {

     

       54
       54
        
                   "extra": "-hardened1",

     

       55
       55
       -
                   "name": "linux-hardened-6.0.6-hardened1.patch",

     

       56
       56
       -
                   "sha256": "1p6l1ysxclp10bl3sd5kvzrp29kdqddk6hvy8dxydni1kysvf2j8",

     

       57
       57
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.6-hardened1/linux-hardened-6.0.6-hardened1.patch"

     

       55
       55
       +
                   "name": "linux-hardened-6.0.7-hardened1.patch",

     

       56
       56
       +
                   "sha256": "0y1g4zahlq28s8grzzpxcccr7sjh6cgbviz880g1wqg7vmqpi1fz",

     

       57
       57
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.7-hardened1/linux-hardened-6.0.7-hardened1.patch"

     

       58
       58
        
               },

     

       59
       59
       -
               "sha256": "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6",

     

       60
       60
       -
               "version": "6.0.6"

     

       59
       59
       +
               "sha256": "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7",

     

       60
       60
       +
               "version": "6.0.7"

     

       61
       61
        
           }

     

       62
       62
        
       }

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.14.296";

     

       6
       6
       +
         version = "4.14.298";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d";

     

       16
       16
       +
           sha256 = "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.19.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.19.262";

     

       6
       6
       +
         version = "4.19.264";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v";

     

       16
       16
       +
           sha256 = "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.9.331";

     

       4
       4
       +
         version = "4.9.332";

     

       5
       5
        
         extraMeta.branch = "4.9";

     

       6
       6
        
         extraMeta.broken = stdenv.isAarch64;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "0v3vv02i9aqgx4g4kw0vpixxsms7w3s5fhry4wlqmsq0gkmqv3j8";

     

       10
       10
       +
           sha256 = "1kiqa9kw4932n5qglkyymsrak849wbbszw9rnq1aygmdinjz4c8i";

     

       11
       11
        
         };

     

       12
       12
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.10.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.10.152";

     

       6
       6
       +
         version = "5.10.153";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs";

     

       16
       16
       +
           sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.15.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.15.76";

     

       6
       6
       +
         version = "5.15.77";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh";

     

       16
       16
       +
           sha256 = "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.4.221";

     

       6
       6
       +
         version = "5.4.223";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7";

     

       16
       16
       +
           sha256 = "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-6.0.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "6.0.6";

     

       6
       6
       +
         version = "6.0.7";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6";

     

       16
       16
       +
           sha256 = "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-libre.nix

···

       1
       1
        
       { stdenv, lib, fetchsvn, linux

     

       2
       2
        
       , scripts ? fetchsvn {

     

       3
       3
        
           url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

     

       4
       4
       -
           rev = "18950";

     

       5
       5
       -
           sha256 = "1k84mqvi71bmd7x0km980z1y7cm71fc6jvnf2rzhxss9pjscrh2j";

     

       4
       4
       +
           rev = "18978";

     

       5
       5
       +
           sha256 = "12mvj5c2k774fpmixcv7i4ciw7xqjaxqd20ryn8xw8vgrnb4h6fi";

     

       6
       6
        
         }

     

       7
       7
        
       , ...

     

       8
       8
        
       }:

+2 -2

pkgs/os-specific/linux/kernel/xanmod-kernels.nix

···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         mainVariant = {

     

       12
       12
       -
           version = "6.0.6";

     

       13
       13
       -
           hash = "sha256-JMfAtiPDgoVF+ypeFXev06PL39ZM2H7m07IxpasjAoM=";

     

       12
       12
       +
           version = "6.0.7";

     

       13
       13
       +
           hash = "sha256-qeM2oswuop42rvyBGlrH6VvODScLCpAOjTc4KR5a2Ec=";

     

       14
       14
        
           variant = "main";

     

       15
       15
        
         };

     

       16
       16

+3 -7

pkgs/os-specific/linux/prl-tools/default.nix

···

       24
       24
        
       assert (!libsOnly) -> kernel != null;

     

       25
       25
        
       

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
       -
         version = "18.0.3-53079";

     

       27
       27
       +
         version = "18.1.0-53311";

     

       28
       28
        
         pname = "prl-tools";

     

       29
       29
        
       

     

       30
       30
        
         # We download the full distribution to extract prl-tools-lin.iso from

     

       31
       31
        
         # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
           url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg";

     

       34
       34
       -
           sha256 = "sha256-z9B2nhcTSZr3L30fa54zYi6WnonQ2wezHoneT2tQWAc=";

     

       34
       34
       +
           sha256 = "sha256-2ROPFIDoV2/sMVsVhcSyn0m1QVMCNb399WzKd/cozws=";

     

       35
       35
        
         };

     

       36
       36
       -
       

     

       37
       37
       -
         patches = lib.optionals (lib.versionAtLeast kernel.version "6.0") [

     

       38
       38
       -
           ./prl-tools-6.0.patch

     

       39
       39
       -
         ];

     

       40
       36
        
       

     

       41
       37
        
         hardeningDisable = [ "pic" "format" ];

     

       42
       38
        
       

     
···

       51
       47
        
         inherit libsOnly;

     

       52
       48
        
       

     

       53
       49
        
         unpackPhase = ''

     

       54
       54
       -
           undmg "${src}"

     

       50
       50
       +
           undmg $src

     

       55
       51
        
           export sourceRoot=prl-tools-build

     

       56
       52
        
           7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot

     

       57
       53
        
           if test -z "$libsOnly"; then

-13

pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch

···

       1
       1
       -
       diff --git a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c

     

       2
       2
       -
       index baa8a19..6788791 100644

     

       3
       3
       -
       --- a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c

     

       4
       4
       -
       +++ b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c

     

       5
       5
       -
       @@ -306,7 +306,7 @@ int seq_show(struct seq_file *file, void *data)

     

       6
       6
       -
        	char buf[BDEVNAME_SIZE];

     

       7
       7
       -
        

     

       8
       8
       -
        	fsb = list_entry((struct list_head*)data, struct frozen_sb, list);

     

       9
       9
       -
       -	bdevname(fsb->sb->s_bdev, buf);

     

       10
       10
       -
       +	snprintf(buf, sizeof(buf), "%pg", fsb->sb->s_bdev);

     

       11
       11
       -
        	seq_printf(file, "%s\n", buf);

     

       12
       12
       -
        	return 0;

     

       13
       13
       -
        }

+4 -2

pkgs/servers/etebase/default.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildPythonPackage, aiofiles, django_3

     

       2
       2
        
       , fastapi, msgpack, pynacl, redis, typing-extensions

     

       3
       3
       -
       , withLdap ? true, python-ldap }:

     

       3
       3
       +
       , withLdap ? true, python-ldap

     

       4
       4
       +
       , withPostgres ? true, psycopg2 }:

     

       4
       5
        
       

     

       5
       6
        
       buildPythonPackage rec {

     

       6
       7
        
         pname = "etebase-server";

     
···

       24
       25
        
           pynacl

     

       25
       26
        
           redis

     

       26
       27
        
           typing-extensions

     

       27
       27
       -
         ] ++ lib.optional withLdap python-ldap;

     

       28
       28
       +
         ] ++ lib.optional withLdap python-ldap

     

       29
       29
       +
           ++ lib.optional withPostgres psycopg2;

     

       28
       30
        
       

     

       29
       31
        
         installPhase = ''

     

       30
       32
        
           mkdir -p $out/bin $out/lib

+4 -4

pkgs/servers/http/tomcat/default.nix

···

       32
       32
        
       in {

     

       33
       33
        
         tomcat9 = common {

     

       34
       34
        
           versionMajor = "9";

     

       35
       35
       -
           versionMinor = "0.53";

     

       36
       36
       -
           sha256 = "1zdnbb0bfbi7762lz69li0wf48jbfz1mv637jzcl42vbsxp4agkv";

     

       35
       35
       +
           versionMinor = "0.68";

     

       36
       36
       +
           sha256 = "sha256-rxsv8zEIIbTel4CqIuncS5pellGwgHamKRa0KgzsOF0=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         tomcat10 = common {

     

       40
       40
        
           versionMajor = "10";

     

       41
       41
       -
           versionMinor = "0.11";

     

       42
       42
       -
           sha256 = "1hjvsxxxavni7bis1hm56281ffmf4x0zdh65zqkrnhqa1rbs0lg2";

     

       41
       41
       +
           versionMinor = "0.27";

     

       42
       42
       +
           sha256 = "sha256-N2atmOdhVrGx88eXOc9Wziq8kn7IWzTeFyFpir/5HLc=";

     

       43
       43
        
         };

     

       44
       44
        
       }

+4 -4

pkgs/servers/monitoring/grafana/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "grafana";

     

       5
       5
       -
         version = "9.2.2";

     

       5
       5
       +
         version = "9.2.3";

     

       6
       6
        
       

     

       7
       7
        
         excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];

     

       8
       8
        
       

     
···

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

     

       11
       11
        
           owner = "grafana";

     

       12
       12
        
           repo = "grafana";

     

       13
       13
       -
           sha256 = "sha256-oXtEAhyCwV9DQfrun9rTPTeTCuzMv2l0sVyi2+pOASw=";

     

       13
       13
       +
           sha256 = "sha256-aqCGFgrODOdSJtvYDTygHsPhi5ON4fkpmFSnPZgR26U=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         srcStatic = fetchurl {

     

       17
       17
        
           url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-trbc2iNDhBa72J15wPZKIlNJHbQUzE6cz/0TmivXJxE=";

     

       18
       18
       +
           sha256 = "sha256-m2pgRXxaXLRRl5iwfPuLqHEsxhuaCfSFCKSAKAYk9J8=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorSha256 = "sha256-021b+Jdk1VUGNSVNef89KLbWLdy4XhhEry4S2S0AhRg=";

     

       21
       21
       +
         vendorSha256 = "sha256-2DO0eAKSJzavOKKHIl3beQhBhuARm7ccwwDODPByL4Y=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ wire ];

     

       24
       24

+2 -2

pkgs/servers/sabnzbd/default.nix

···

       24
       24
        
         ]);

     

       25
       25
        
         path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];

     

       26
       26
        
       in stdenv.mkDerivation rec {

     

       27
       27
       -
         version = "3.6.1";

     

       27
       27
       +
         version = "3.7.0";

     

       28
       28
        
         pname = "sabnzbd";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchFromGitHub {

     

       31
       31
        
           owner = pname;

     

       32
       32
        
           repo = pname;

     

       33
       33
        
           rev = version;

     

       34
       34
       -
           sha256 = "sha256-xaryCwIJ3705T7znnJKQOfC87ceh8D4e00JCY6e/CI0=";

     

       34
       34
       +
           sha256 = "sha256-ngsNDxK3J8acrVqxtEnfoqEOhNsQemOcuaf3ru3eQMw=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ makeWrapper ];

+8 -15

pkgs/tools/backup/duplicacy/default.nix

···

       1
       1
       -
       { lib, buildGoPackage, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGoPackage rec {

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
        
         pname = "duplicacy";

     

       5
       5
       -
         version = "2.7.2";

     

       6
       6
       -
       

     

       7
       7
       -
         goPackagePath = "github.com/gilbertchen/duplicacy";

     

       5
       5
       +
         version = "3.0.1";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchFromGitHub {

     

       10
       8
        
           owner = "gilbertchen";

     

       11
       9
        
           repo = "duplicacy";

     

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

     

       13
       13
       -
           sha256 = "0j37sqicj7rl982czqsl3ipxw7k8k4smcr63s0yklxwz7ch3353c";

     

       11
       11
       +
           sha256 = "sha256-7VCgXUmmAlmv0UwSM3Hs9t586gJWvFWsP/0BJXze1r4=";

     

       14
       12
        
         };

     

       15
       15
       -
         goDeps = ./deps.nix;

     

       16
       16
       -
         buildPhase = ''

     

       17
       17
       -
           cd go/src/${goPackagePath}

     

       18
       18
       -
           go build duplicacy/duplicacy_main.go

     

       19
       19
       -
         '';

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "sha256-3vzx2SCgJAhSwW8DRtkQ6pywquFwwou0HZ6a1dmHhPY=";

     

       20
       15
        
       

     

       21
       21
       -
         installPhase = ''

     

       22
       22
       -
           install -D duplicacy_main $out/bin/duplicacy

     

       23
       23
       -
         '';

     

       16
       16
       +
         doCheck = false;

     

       24
       17
        
       

     

       25
       18
        
         meta = with lib; {

     

       26
       19
        
           homepage = "https://duplicacy.com";

     

       27
       20
        
           description = "A new generation cloud backup tool";

     

       28
       21
        
           platforms = platforms.linux ++ platforms.darwin;

     

       29
       22
        
           license = lib.licenses.unfree;

     

       30
       30
       -
           maintainers = with maintainers; [ ffinkdevs ];

     

       23
       23
       +
           maintainers = with maintainers; [ ffinkdevs devusb ];

     

       31
       24
        
         };

     

       32
       25
        
       }

-408

pkgs/tools/backup/duplicacy/deps.nix

···

       1
       1
       -
       # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)

     

       2
       2
       -
       [

     

       3
       3
       -
         {

     

       4
       4
       -
           goPackagePath  = "cloud.google.com/go";

     

       5
       5
       -
           fetch = {

     

       6
       6
       -
             type = "git";

     

       7
       7
       -
             url = "https://github.com/googleapis/google-cloud-go";

     

       8
       8
       -
             rev =  "2d3a6656c17a60b0815b7e06ab0be04eacb6e613";

     

       9
       9
       -
             sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq";

     

       10
       10
       -
           };

     

       11
       11
       -
         }

     

       12
       12
       -
         {

     

       13
       13
       -
           goPackagePath  = "github.com/Azure/go-autorest";

     

       14
       14
       -
           fetch = {

     

       15
       15
       -
             type = "git";

     

       16
       16
       -
             url = "https://github.com/Azure/go-autorest";

     

       17
       17
       -
             rev =  "9bc4033dd347c7f416fca46b2f42a043dc1fbdf6";

     

       18
       18
       -
             sha256 = "158xbd8wn1bna1k1ichlirz6a1zvlh3rg7klr9cnp72l2q8jwvcl";

     

       19
       19
       -
           };

     

       20
       20
       -
         }

     

       21
       21
       -
         {

     

       22
       22
       -
           goPackagePath  = "github.com/aryann/difflib";

     

       23
       23
       -
           fetch = {

     

       24
       24
       -
             type = "git";

     

       25
       25
       -
             url = "https://github.com/aryann/difflib";

     

       26
       26
       -
             rev =  "e206f873d14a916d3d26c40ab667bca123f365a3";

     

       27
       27
       -
             sha256 = "00zb9sx6l6b2zq614x45zlyshl20zjhwfj8r5krw4f9y0mx3n2dm";

     

       28
       28
       -
           };

     

       29
       29
       -
         }

     

       30
       30
       -
         {

     

       31
       31
       -
           goPackagePath  = "github.com/aws/aws-sdk-go";

     

       32
       32
       -
           fetch = {

     

       33
       33
       -
             type = "git";

     

       34
       34
       -
             url = "https://github.com/aws/aws-sdk-go";

     

       35
       35
       -
             rev =  "851d5ffb66720c2540cc68020d4d8708950686c8";

     

       36
       36
       -
             sha256 = "16qp8ywcf04d2y1ibf3mpglcrxk07x8gak46a2l53lchps2mgcrp";

     

       37
       37
       -
           };

     

       38
       38
       -
         }

     

       39
       39
       -
         {

     

       40
       40
       -
           goPackagePath  = "github.com/bkaradzic/go-lz4";

     

       41
       41
       -
           fetch = {

     

       42
       42
       -
             type = "git";

     

       43
       43
       -
             url = "https://github.com/bkaradzic/go-lz4";

     

       44
       44
       -
             rev =  "74ddf82598bc4745b965729e9c6a463bedd33049";

     

       45
       45
       -
             sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1";

     

       46
       46
       -
           };

     

       47
       47
       -
         }

     

       48
       48
       -
         {

     

       49
       49
       -
           goPackagePath  = "github.com/dgrijalva/jwt-go";

     

       50
       50
       -
           fetch = {

     

       51
       51
       -
             type = "git";

     

       52
       52
       -
             url = "https://github.com/dgrijalva/jwt-go";

     

       53
       53
       -
             rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";

     

       54
       54
       -
             sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";

     

       55
       55
       -
           };

     

       56
       56
       -
         }

     

       57
       57
       -
         {

     

       58
       58
       -
           goPackagePath  = "github.com/gilbertchen/azure-sdk-for-go";

     

       59
       59
       -
           fetch = {

     

       60
       60
       -
             type = "git";

     

       61
       61
       -
             url = "https://github.com/gilbertchen/azure-sdk-for-go";

     

       62
       62
       -
             rev =  "8fd4663cab7c7c1c46d00449291c92ad23b0d0d9";

     

       63
       63
       -
             sha256 = "123fj5jni1pjj8i9adzd4r07n9hnlmfprlcjf5hqb1zjb72xi1p7";

     

       64
       64
       -
           };

     

       65
       65
       -
         }

     

       66
       66
       -
         {

     

       67
       67
       -
           goPackagePath  = "github.com/gilbertchen/cli";

     

       68
       68
       -
           fetch = {

     

       69
       69
       -
             type = "git";

     

       70
       70
       -
             url = "https://github.com/gilbertchen/cli";

     

       71
       71
       -
             rev =  "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98";

     

       72
       72
       -
             sha256 = "00vbyjsn009cqg24sxcizq10rgicnmrv0f8jg3fa1fw6yp5gqdl5";

     

       73
       73
       -
           };

     

       74
       74
       -
         }

     

       75
       75
       -
         {

     

       76
       76
       -
           goPackagePath  = "github.com/gilbertchen/go-dropbox";

     

       77
       77
       -
           fetch = {

     

       78
       78
       -
             type = "git";

     

       79
       79
       -
             url = "https://github.com/gilbertchen/go-dropbox";

     

       80
       80
       -
             rev =  "2233fa1dd846b3a3e8060b6c1ea12883deb9d288";

     

       81
       81
       -
             sha256 = "01fqxad5mm7rs0mp1ipp9aw80ski6sqyqljpf9dgify8dbiffl97";

     

       82
       82
       -
           };

     

       83
       83
       -
         }

     

       84
       84
       -
         {

     

       85
       85
       -
           goPackagePath  = "github.com/gilbertchen/go-ole";

     

       86
       86
       -
           fetch = {

     

       87
       87
       -
             type = "git";

     

       88
       88
       -
             url = "https://github.com/gilbertchen/go-ole";

     

       89
       89
       -
             rev =  "0e87ea779d9deb219633b828a023b32e1244dd57";

     

       90
       90
       -
             sha256 = "1d937b4i9mrwfgs1s17qhbd78dcd97wwm8zsajkarky8d55rz1bw";

     

       91
       91
       -
           };

     

       92
       92
       -
         }

     

       93
       93
       -
         {

     

       94
       94
       -
           goPackagePath  = "github.com/gilbertchen/go.dbus";

     

       95
       95
       -
           fetch = {

     

       96
       96
       -
             type = "git";

     

       97
       97
       -
             url = "https://github.com/gilbertchen/go.dbus";

     

       98
       98
       -
             rev =  "8591994fa32f1dbe3fa9486bc6f4d4361ac16649";

     

       99
       99
       -
             sha256 = "0wg82hwgk4s65ns76x7cby6dfdxsdkc4jyqn9zd7g037fhzh8rk5";

     

       100
       100
       -
           };

     

       101
       101
       -
         }

     

       102
       102
       -
         {

     

       103
       103
       -
           goPackagePath  = "github.com/gilbertchen/goamz";

     

       104
       104
       -
           fetch = {

     

       105
       105
       -
             type = "git";

     

       106
       106
       -
             url = "https://github.com/gilbertchen/goamz";

     

       107
       107
       -
             rev =  "eada9f4e8cc2a45db775dee08a2c37597ce4760a";

     

       108
       108
       -
             sha256 = "0v6i4jdly06wixmm58ygxh284hnlbfxczvcwxvywiyy9bp5qyaid";

     

       109
       109
       -
           };

     

       110
       110
       -
         }

     

       111
       111
       -
         {

     

       112
       112
       -
           goPackagePath  = "github.com/gilbertchen/gopass";

     

       113
       113
       -
           fetch = {

     

       114
       114
       -
             type = "git";

     

       115
       115
       -
             url = "https://github.com/gilbertchen/gopass";

     

       116
       116
       -
             rev =  "bf9dde6d0d2c004a008c27aaee91170c786f6db8";

     

       117
       117
       -
             sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";

     

       118
       118
       -
           };

     

       119
       119
       -
         }

     

       120
       120
       -
         {

     

       121
       121
       -
           goPackagePath  = "github.com/gilbertchen/keyring";

     

       122
       122
       -
           fetch = {

     

       123
       123
       -
             type = "git";

     

       124
       124
       -
             url = "https://github.com/gilbertchen/keyring";

     

       125
       125
       -
             rev =  "8855f5632086e51468cd7ce91056f8da69687ef6";

     

       126
       126
       -
             sha256 = "1ja623dqnhkr1cvynrcai10s8kn2aiq53cvd8yxr47bb8i2a2q1m";

     

       127
       127
       -
           };

     

       128
       128
       -
         }

     

       129
       129
       -
         {

     

       130
       130
       -
           goPackagePath  = "github.com/gilbertchen/xattr";

     

       131
       131
       -
           fetch = {

     

       132
       132
       -
             type = "git";

     

       133
       133
       -
             url = "https://github.com/gilbertchen/xattr";

     

       134
       134
       -
             rev =  "68e7a6806b0137a396d7d05601d7403ae1abac58";

     

       135
       135
       -
             sha256 = "120lq8vasc5yh0ajczsdpi8cfzgi4ymrnphgqdfcar3b9rsvx80b";

     

       136
       136
       -
           };

     

       137
       137
       -
         }

     

       138
       138
       -
         {

     

       139
       139
       -
           goPackagePath  = "github.com/golang/groupcache";

     

       140
       140
       -
           fetch = {

     

       141
       141
       -
             type = "git";

     

       142
       142
       -
             url = "https://github.com/golang/groupcache";

     

       143
       143
       -
             rev =  "8c9f03a8e57eb486e42badaed3fb287da51807ba";

     

       144
       144
       -
             sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh";

     

       145
       145
       -
           };

     

       146
       146
       -
         }

     

       147
       147
       -
         {

     

       148
       148
       -
           goPackagePath  = "github.com/golang/protobuf";

     

       149
       149
       -
           fetch = {

     

       150
       150
       -
             type = "git";

     

       151
       151
       -
             url = "https://github.com/golang/protobuf";

     

       152
       152
       -
             rev =  "84668698ea25b64748563aa20726db66a6b8d299";

     

       153
       153
       -
             sha256 = "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq";

     

       154
       154
       -
           };

     

       155
       155
       -
         }

     

       156
       156
       -
         {

     

       157
       157
       -
           goPackagePath  = "github.com/googleapis/gax-go";

     

       158
       158
       -
           fetch = {

     

       159
       159
       -
             type = "git";

     

       160
       160
       -
             url = "https://github.com/googleapis/gax-go";

     

       161
       161
       -
             rev =  "c8a15bac9b9fe955bd9f900272f9a306465d28cf";

     

       162
       162
       -
             sha256 = "13x3x7agq0b46wpchbd2sqli5l33z6hvfn1qjbiqvsgpbv7wd140";

     

       163
       163
       -
           };

     

       164
       164
       -
         }

     

       165
       165
       -
         {

     

       166
       166
       -
           goPackagePath  = "github.com/jmespath/go-jmespath";

     

       167
       167
       -
           fetch = {

     

       168
       168
       -
             type = "git";

     

       169
       169
       -
             url = "https://github.com/jmespath/go-jmespath";

     

       170
       170
       -
             rev =  "c2b33e84";

     

       171
       171
       -
             sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";

     

       172
       172
       -
           };

     

       173
       173
       -
         }

     

       174
       174
       -
         {

     

       175
       175
       -
           goPackagePath  = "github.com/klauspost/cpuid";

     

       176
       176
       -
           fetch = {

     

       177
       177
       -
             type = "git";

     

       178
       178
       -
             url = "https://github.com/klauspost/cpuid";

     

       179
       179
       -
             rev =  "750c0591dbbd50ef88371c665ad49e426a4b830b";

     

       180
       180
       -
             sha256 = "1yiby4xa12j3kcw5q7dfsbcybhaxjkppvgz6ac2p2lcwha303b1g";

     

       181
       181
       -
           };

     

       182
       182
       -
         }

     

       183
       183
       -
         {

     

       184
       184
       -
           goPackagePath  = "github.com/klauspost/reedsolomon";

     

       185
       185
       -
           fetch = {

     

       186
       186
       -
             type = "git";

     

       187
       187
       -
             url = "https://github.com/klauspost/reedsolomon";

     

       188
       188
       -
             rev =  "7daa20bf74337a939c54f892a2eca9d9b578eb7f";

     

       189
       189
       -
             sha256 = "1xk4wqgrl63l95lqnszzbpa06apzxfmpwfnkrn1n8jb0ws7mi01m";

     

       190
       190
       -
           };

     

       191
       191
       -
         }

     

       192
       192
       -
         {

     

       193
       193
       -
           goPackagePath  = "github.com/kr/fs";

     

       194
       194
       -
           fetch = {

     

       195
       195
       -
             type = "git";

     

       196
       196
       -
             url = "https://github.com/kr/fs";

     

       197
       197
       -
             rev =  "1455def202f6e05b95cc7bfc7e8ae67ae5141eba";

     

       198
       198
       -
             sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q";

     

       199
       199
       -
           };

     

       200
       200
       -
         }

     

       201
       201
       -
         {

     

       202
       202
       -
           goPackagePath  = "github.com/marstr/guid";

     

       203
       203
       -
           fetch = {

     

       204
       204
       -
             type = "git";

     

       205
       205
       -
             url = "https://github.com/marstr/guid";

     

       206
       206
       -
             rev =  "8bd9a64bf37eb297b492a4101fb28e80ac0b290f";

     

       207
       207
       -
             sha256 = "081qrar6wwpmb2pq3swv4byh73r9riyhl2dwv0902d8jg3kwricm";

     

       208
       208
       -
           };

     

       209
       209
       -
         }

     

       210
       210
       -
         {

     

       211
       211
       -
           goPackagePath  = "github.com/minio/blake2b-simd";

     

       212
       212
       -
           fetch = {

     

       213
       213
       -
             type = "git";

     

       214
       214
       -
             url = "https://github.com/minio/blake2b-simd";

     

       215
       215
       -
             rev =  "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";

     

       216
       216
       -
             sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";

     

       217
       217
       -
           };

     

       218
       218
       -
         }

     

       219
       219
       -
         {

     

       220
       220
       -
           goPackagePath  = "github.com/minio/highwayhash";

     

       221
       221
       -
           fetch = {

     

       222
       222
       -
             type = "git";

     

       223
       223
       -
             url = "https://github.com/minio/highwayhash";

     

       224
       224
       -
             rev =  "86a2a969d04373bf05ca722517d30fb1c9a3e4f9";

     

       225
       225
       -
             sha256 = "0kj2hs82sphag0h25xvprvf2fz3zlinmlif89sk9jp8h518aiahf";

     

       226
       226
       -
           };

     

       227
       227
       -
         }

     

       228
       228
       -
         {

     

       229
       229
       -
           goPackagePath  = "github.com/mmcloughlin/avo";

     

       230
       230
       -
           fetch = {

     

       231
       231
       -
             type = "git";

     

       232
       232
       -
             url = "https://github.com/mmcloughlin/avo";

     

       233
       233
       -
             rev =  "443f81d771042b019379ae4bfcd0a591cb47c88a";

     

       234
       234
       -
             sha256 = "1zc95crbyi7ylqq3jwv4ya55lyzn9x730szdm307vdss4gqlx8yn";

     

       235
       235
       -
           };

     

       236
       236
       -
         }

     

       237
       237
       -
         {

     

       238
       238
       -
           goPackagePath  = "github.com/ncw/swift";

     

       239
       239
       -
           fetch = {

     

       240
       240
       -
             type = "git";

     

       241
       241
       -
             url = "https://github.com/ncw/swift";

     

       242
       242
       -
             rev =  "3e1a09f21340e4828e7265aa89f4dc1495fa7ccc";

     

       243
       243
       -
             sha256 = "19gb8xh400hzlbdp3nx1f85jxzs36zk0py39vmjcg3fnvdjzblm2";

     

       244
       244
       -
           };

     

       245
       245
       -
         }

     

       246
       246
       -
         {

     

       247
       247
       -
           goPackagePath  = "github.com/pkg/errors";

     

       248
       248
       -
           fetch = {

     

       249
       249
       -
             type = "git";

     

       250
       250
       -
             url = "https://github.com/pkg/errors";

     

       251
       251
       -
             rev =  "614d223910a179a466c1767a985424175c39b465";

     

       252
       252
       -
             sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";

     

       253
       253
       -
           };

     

       254
       254
       -
         }

     

       255
       255
       -
         {

     

       256
       256
       -
           goPackagePath  = "github.com/pkg/sftp";

     

       257
       257
       -
           fetch = {

     

       258
       258
       -
             type = "git";

     

       259
       259
       -
             url = "https://github.com/pkg/sftp";

     

       260
       260
       -
             rev =  "5616182052227b951e76d9c9b79a616c608bd91b";

     

       261
       261
       -
             sha256 = "1rjlhlkr505a0wvync1ycfn9njfc6bib6bw44qnnm50hlfs59hz2";

     

       262
       262
       -
           };

     

       263
       263
       -
         }

     

       264
       264
       -
         {

     

       265
       265
       -
           goPackagePath  = "github.com/pkg/xattr";

     

       266
       266
       -
           fetch = {

     

       267
       267
       -
             type = "git";

     

       268
       268
       -
             url = "https://github.com/pkg/xattr";

     

       269
       269
       -
             rev =  "dd870b5cfebab49617ea0c1da6176474e8a52bf4";

     

       270
       270
       -
             sha256 = "11ynkc61qrmf853g04sav8vawz8i6a8b73w71f3cq4djb4cnsw0d";

     

       271
       271
       -
           };

     

       272
       272
       -
         }

     

       273
       273
       -
         {

     

       274
       274
       -
           goPackagePath  = "github.com/satori/go.uuid";

     

       275
       275
       -
           fetch = {

     

       276
       276
       -
             type = "git";

     

       277
       277
       -
             url = "https://github.com/satori/go.uuid";

     

       278
       278
       -
             rev =  "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";

     

       279
       279
       -
             sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";

     

       280
       280
       -
           };

     

       281
       281
       -
         }

     

       282
       282
       -
         {

     

       283
       283
       -
           goPackagePath  = "github.com/vaughan0/go-ini";

     

       284
       284
       -
           fetch = {

     

       285
       285
       -
             type = "git";

     

       286
       286
       -
             url = "https://github.com/vaughan0/go-ini";

     

       287
       287
       -
             rev =  "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";

     

       288
       288
       -
             sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";

     

       289
       289
       -
           };

     

       290
       290
       -
         }

     

       291
       291
       -
         {

     

       292
       292
       -
           goPackagePath  = "go.opencensus.io";

     

       293
       293
       -
           fetch = {

     

       294
       294
       -
             type = "git";

     

       295
       295
       -
             url = "https://github.com/census-instrumentation/opencensus-go";

     

       296
       296
       -
             rev =  "d835ff86be02193d324330acdb7d65546b05f814";

     

       297
       297
       -
             sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw";

     

       298
       298
       -
           };

     

       299
       299
       -
         }

     

       300
       300
       -
         {

     

       301
       301
       -
           goPackagePath  = "golang.org/x/crypto";

     

       302
       302
       -
           fetch = {

     

       303
       303
       -
             type = "git";

     

       304
       304
       -
             url = "https://go.googlesource.com/crypto";

     

       305
       305
       -
             rev =  "056763e48d71961566155f089ac0f02f1dda9b5a";

     

       306
       306
       -
             sha256 = "0dcmns62hwid7hk4bmpl22z6ygjh168p23x3arzy320sd1lvap92";

     

       307
       307
       -
           };

     

       308
       308
       -
         }

     

       309
       309
       -
         {

     

       310
       310
       -
           goPackagePath  = "golang.org/x/mod";

     

       311
       311
       -
           fetch = {

     

       312
       312
       -
             type = "git";

     

       313
       313
       -
             url = "https://go.googlesource.com/mod";

     

       314
       314
       -
             rev =  "859b3ef565e237f9f1a0fb6b55385c497545680d";

     

       315
       315
       -
             sha256 = "0ldgbx2zpprbsfn6p8pfgs4nn87gwbfcv2z0fa7n8alwsq2yw78q";

     

       316
       316
       -
           };

     

       317
       317
       -
         }

     

       318
       318
       -
         {

     

       319
       319
       -
           goPackagePath  = "golang.org/x/net";

     

       320
       320
       -
           fetch = {

     

       321
       321
       -
             type = "git";

     

       322
       322
       -
             url = "https://go.googlesource.com/net";

     

       323
       323
       -
             rev =  "d3edc9973b7eb1fb302b0ff2c62357091cea9a30";

     

       324
       324
       -
             sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7";

     

       325
       325
       -
           };

     

       326
       326
       -
         }

     

       327
       327
       -
         {

     

       328
       328
       -
           goPackagePath  = "golang.org/x/oauth2";

     

       329
       329
       -
           fetch = {

     

       330
       330
       -
             type = "git";

     

       331
       331
       -
             url = "https://go.googlesource.com/oauth2";

     

       332
       332
       -
             rev =  "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303";

     

       333
       333
       -
             sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg";

     

       334
       334
       -
           };

     

       335
       335
       -
         }

     

       336
       336
       -
         {

     

       337
       337
       -
           goPackagePath  = "golang.org/x/sys";

     

       338
       338
       -
           fetch = {

     

       339
       339
       -
             type = "git";

     

       340
       340
       -
             url = "https://go.googlesource.com/sys";

     

       341
       341
       -
             rev =  "59c9f1ba88faf592b225274f69c5ef1e4ebacf82";

     

       342
       342
       -
             sha256 = "014iiqjh9sikbcvacqiwhg6mvrsrr1va91wmc9yrnsm11c63yxfa";

     

       343
       343
       -
           };

     

       344
       344
       -
         }

     

       345
       345
       -
         {

     

       346
       346
       -
           goPackagePath  = "golang.org/x/text";

     

       347
       347
       -
           fetch = {

     

       348
       348
       -
             type = "git";

     

       349
       349
       -
             url = "https://go.googlesource.com/text";

     

       350
       350
       -
             rev =  "342b2e1fbaa52c93f31447ad2c6abc048c63e475";

     

       351
       351
       -
             sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";

     

       352
       352
       -
           };

     

       353
       353
       -
         }

     

       354
       354
       -
         {

     

       355
       355
       -
           goPackagePath  = "golang.org/x/tools";

     

       356
       356
       -
           fetch = {

     

       357
       357
       -
             type = "git";

     

       358
       358
       -
             url = "https://go.googlesource.com/tools";

     

       359
       359
       -
             rev =  "5d1fdd8fa3469142b9369713b23d8413d6d83189";

     

       360
       360
       -
             sha256 = "0xp5ggnjnl1gqwi2ks042zimgkfv2qda9a57ar198xpyzdn1bv5s";

     

       361
       361
       -
           };

     

       362
       362
       -
         }

     

       363
       363
       -
         {

     

       364
       364
       -
           goPackagePath  = "golang.org/x/xerrors";

     

       365
       365
       -
           fetch = {

     

       366
       366
       -
             type = "git";

     

       367
       367
       -
             url = "https://go.googlesource.com/xerrors";

     

       368
       368
       -
             rev =  "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca";

     

       369
       369
       -
             sha256 = "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb";

     

       370
       370
       -
           };

     

       371
       371
       -
         }

     

       372
       372
       -
         {

     

       373
       373
       -
           goPackagePath  = "google.golang.org/api";

     

       374
       374
       -
           fetch = {

     

       375
       375
       -
             type = "git";

     

       376
       376
       -
             url = "https://github.com/googleapis/google-api-go-client";

     

       377
       377
       -
             rev =  "52f0532eadbcc6f6b82d6f5edf66e610d10bfde6";

     

       378
       378
       -
             sha256 = "0l7q0mmq0v51wc72bk50nwaz9frl1pqp7gn5jhy1vzxdry930gkc";

     

       379
       379
       -
           };

     

       380
       380
       -
         }

     

       381
       381
       -
         {

     

       382
       382
       -
           goPackagePath  = "google.golang.org/appengine";

     

       383
       383
       -
           fetch = {

     

       384
       384
       -
             type = "git";

     

       385
       385
       -
             url = "https://github.com/golang/appengine";

     

       386
       386
       -
             rev =  "971852bfffca25b069c31162ae8f247a3dba083b";

     

       387
       387
       -
             sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w";

     

       388
       388
       -
           };

     

       389
       389
       -
         }

     

       390
       390
       -
         {

     

       391
       391
       -
           goPackagePath  = "google.golang.org/genproto";

     

       392
       392
       -
           fetch = {

     

       393
       393
       -
             type = "git";

     

       394
       394
       -
             url = "https://github.com/googleapis/go-genproto";

     

       395
       395
       -
             rev =  "baae70f3302d3efdff74db41e48a5d476d036906";

     

       396
       396
       -
             sha256 = "1xacik4i5w2bpkrxzrfm00ggy5vygbzh8jmm2yq4mxiv0lnsh9nk";

     

       397
       397
       -
           };

     

       398
       398
       -
         }

     

       399
       399
       -
         {

     

       400
       400
       -
           goPackagePath  = "google.golang.org/grpc";

     

       401
       401
       -
           fetch = {

     

       402
       402
       -
             type = "git";

     

       403
       403
       -
             url = "https://github.com/grpc/grpc-go";

     

       404
       404
       -
             rev =  "ac54eec90516cee50fc6b9b113b34628a85f976f";

     

       405
       405
       -
             sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq";

     

       406
       406
       -
           };

     

       407
       407
       -
         }

     

       408
       408
       -
       ]

+9 -1

pkgs/tools/graphics/timg/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, graphicsmagick, libjpeg

     

       2
       2
        
       , ffmpeg, zlib, libexif, openslide }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

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

     

       12
       12
        
           sha256 = "1gdwg15fywya6k6pajkx86kv2d8k85pmisnq53b02br5i01y4k41";

     

       13
       13
        
         };

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           (fetchpatch {

     

       17
       17
       +
             url = "https://github.com/hzeller/timg/commit/e9667ea2c811aa9eb399b631aef9bba0d3711834.patch";

     

       18
       18
       +
             sha256 = "sha256-xvbOcnKqX52wYZlzm4Be9dz8Rq+n3s2kKPFr0Y0igAU=";

     

       19
       19
       +
             name = "CVE-2022-43151.patch";

     

       20
       20
       +
           })

     

       21
       21
       +
         ];

     

       14
       22
        
       

     

       15
       23
        
         buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ];

     

       16
       24

+32 -11

pkgs/tools/graphics/wallutils/default.nix

···

       1
       1
       -
       { buildGoPackage, fetchFromGitHub, lib

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       2
       4
        
       , pkg-config

     

       3
       3
       -
       , wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif

     

       5
       5
       +
       , wayland

     

       6
       6
       +
       , libX11

     

       7
       7
       +
       , xbitmaps

     

       8
       8
       +
       , libXcursor

     

       9
       9
       +
       , libXmu

     

       10
       10
       +
       , libXpm

     

       11
       11
       +
       , libheif

     

       4
       12
        
       }:

     

       5
       13
        
       

     

       6
       6
       -
       buildGoPackage rec {

     

       14
       14
       +
       buildGoModule rec {

     

       7
       15
        
         pname = "wallutils";

     

       8
       8
       -
         version = "5.11.1";

     

       16
       16
       +
         version = "5.12.4";

     

       9
       17
        
       

     

       10
       18
        
         src = fetchFromGitHub {

     

       11
       19
        
           owner = "xyproto";

     

       12
       20
        
           repo = "wallutils";

     

       13
       21
        
           rev = version;

     

       14
       14
       -
           sha256 = "sha256-FL66HALXsf7shoUKIZp6HORyuxhOfgTrY+PQAe92yk8=";

     

       22
       22
       +
           sha256 = "sha256-NODG4Lw/7X1aoT+dDSWxWEbDX6EAQzzDJPwsWOLaJEM=";

     

       15
       23
        
         };

     

       16
       24
        
       

     

       17
       17
       -
         goPackagePath = "github.com/xyproto/wallutils";

     

       25
       25
       +
         vendorSha256 = null;

     

       18
       26
        
       

     

       19
       27
        
         patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];

     

       20
       28
        
       

     

       21
       21
       -
         postPatch = ''

     

       22
       22
       -
           # VersionString is sometimes not up-to-date:

     

       23
       23
       -
           sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go

     

       24
       24
       -
         '';

     

       29
       29
       +
         excludedPackages = [

     

       30
       30
       +
           "./pkg/event/cmd" # Development tools

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         ldflags = [ "-s" "-w" ];

     

       25
       34
        
       

     

       26
       35
        
         nativeBuildInputs = [ pkg-config ];

     

       27
       36
        
         buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ];

     

       28
       37
        
       

     

       38
       38
       +
         preCheck =

     

       39
       39
       +
           let skippedTests = [

     

       40
       40
       +
             "TestClosest" # Requiring Wayland or X.

     

       41
       41
       +
             "TestNewSimpleEvent" # Blocking

     

       42
       42
       +
             "TestEveryMinute" # Blocking

     

       43
       43
       +
           ]; in

     

       44
       44
       +
           ''

     

       45
       45
       +
             export XDG_RUNTIME_DIR=`mktemp -d`

     

       46
       46
       +
       

     

       47
       47
       +
             buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")

     

       48
       48
       +
           '';

     

       49
       49
       +
       

     

       29
       50
        
         meta = with lib; {

     

       30
       51
        
           description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";

     

       31
       52
        
           inherit (src.meta) homepage;

     

       32
       32
       -
           license = licenses.mit;

     

       53
       53
       +
           license = licenses.bsd3;

     

       33
       54
        
           maintainers = with maintainers; [ ];

     

       34
       55
        
           platforms = platforms.linux;

     

       35
       56
        
         };

+24 -16

pkgs/tools/networking/httping/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, gettext, libintl, ncurses, openssl

     

       2
       2
       -
       , fftw ? null }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fftw ? null

     

       5
       5
       +
       , gettext

     

       6
       6
       +
       , libintl

     

       7
       7
       +
       , ncurses

     

       8
       8
       +
       , openssl

     

       9
       9
       +
       }:

     

       3
       10
        
       

     

       4
       11
        
       stdenv.mkDerivation rec {

     

       5
       12
        
         pname = "httping";

     

       6
       6
       -
         version = "2.5";

     

       13
       13
       +
         version = "2.9";

     

       7
       14
        
       

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = "https://vanheusden.com/httping/${pname}-${version}.tgz";

     

       10
       10
       -
           sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "folkertvanheusden";

     

       17
       17
       +
           repo = "HTTPing";

     

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

     

       19
       19
       +
           hash = "sha256-aExTXXtW03UKMuMjTMx1k/MUpcRMh1PdSPkDGH+Od70=";

     

       11
       20
        
         };

     

       12
       21
        
       

     

       13
       13
       -
         patches = [

     

       14
       14
       -
           # Upstream fix for ncurses-6.3.

     

       15
       15
       -
           (fetchpatch {

     

       16
       16
       -
             name = "ncurses-6.3.patch";

     

       17
       17
       -
             url = "https://github.com/folkertvanheusden/HTTPing/commit/4ea9d5b78540c972e3fe1bf44db9f7b3f87c0ad0.patch";

     

       18
       18
       -
             sha256 = "0w3kdkq6c6hz1d9jjnw0ldvd6dy39yamj8haf0hvcyb1sb67qjmp";

     

       19
       19
       -
           })

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           gettext

     

       20
       24
        
         ];

     

       21
       25
        
       

     

       22
       22
       -
         buildInputs = [ fftw libintl ncurses openssl ];

     

       23
       23
       -
         nativeBuildInputs = [ gettext ];

     

       26
       26
       +
         buildInputs = [

     

       27
       27
       +
           fftw

     

       28
       28
       +
           libintl

     

       29
       29
       +
           ncurses

     

       30
       30
       +
           openssl

     

       31
       31
       +
         ];

     

       24
       32
        
       

     

       25
       33
        
         makeFlags = [

     

       26
       34
        
           "DESTDIR=$(out)"

     
···

       36
       44
        
             the transmission across the network also takes time! So it measures the

     

       37
       45
        
             latency of the webserver + network. It supports IPv6.

     

       38
       46
        
           '';

     

       39
       39
       -
           license = licenses.agpl3;

     

       47
       47
       +
           license = licenses.agpl3Only;

     

       40
       48
        
           maintainers = [];

     

       41
       49
        
           platforms = platforms.linux ++ platforms.darwin;

     

       42
       50
        
         };

+8 -2

pkgs/tools/security/b2sum/default.nix

···

       13
       13
        
           sha256 = "E60M9oP/Sdfg/L3ZxUcDtUXhFz9oP72IybdtVUJh9Sk=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       +
         # Use the generic C implementation rather than the SSE optimised version on non-x86 platforms

     

       17
       17
       +
         postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''

     

       18
       18
       +
           substituteInPlace makefile \

     

       19
       19
       +
             --replace "#FILES=b2sum.c ../ref/" "FILES=b2sum.c ../ref/" \

     

       20
       20
       +
             --replace "FILES=b2sum.c ../sse/" "#FILES=b2sum.c ../sse/"

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       16
       23
        
         sourceRoot = "source/b2sum";

     

       17
       24
        
       

     

       18
       25
        
         buildInputs = [ openmp ];

     
···

       25
       32
        
           homepage = "https://blake2.net";

     

       26
       33
        
           license = with licenses; [ asl20 cc0 openssl ];

     

       27
       34
        
           maintainers = with maintainers; [ kirelagin ];

     

       28
       28
       -
           # "This code requires at least SSE2."

     

       29
       29
       -
           platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin;

     

       35
       35
       +
           platforms = platforms.unix;

     

       30
       36
        
         };

     

       31
       37
        
       }

+2 -2

pkgs/tools/virtualization/google-guest-agent/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "guest-agent";

     

       7
       7
       -
         version = "20221025.00";

     

       7
       7
       +
         version = "20221104.00";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "GoogleCloudPlatform";

     

       11
       11
        
           repo = pname;

     

       12
       12
        
           rev = version;

     

       13
       13
       -
           sha256 = "sha256-LbpSRQgxAfgaO7UPJD5j/wrMjR383qjD5SD1cVTzWLs=";

     

       13
       13
       +
           sha256 = "sha256-JvI0tj6/+iCu+Q5XB3QOrrfBl6n2/bB6pj9lUDZL8DE=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI=";

+3 -1

pkgs/top-level/all-packages.nix

···

       33177
       33177
        
       

     

       33178
       33178
        
         xmenu = callPackage ../applications/misc/xmenu { };

     

       33179
       33179
        
       

     

       33180
       33180
       -
         xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { };

     

       33180
       33180
       +
         xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor {

     

       33181
       33181
       +
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       33182
       33182
       +
         };

     

       33181
       33183
        
       

     

       33182
       33184
        
         xmp = callPackage ../applications/audio/xmp { };

     

       33183
       33185