commit defcd5c627783b9a3604f52c7c72bd7550edf181 · pyrox.dev/nixpkgs

+1 -1

CONTRIBUTING.md

···

       51
       51
        
       

     

       52
       52
        
       In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.

     

       53
       53
        
       

     

       54
       54
       -
       For package version upgrades and such a one-line commit message is usually sufficient.

     

       54
       54
       +
       Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message.

     

       55
       55
        
       

     

       56
       56
        
       ## Rebasing between branches (i.e. from master to staging)

     

       57
       57

+8

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       1464
       1464
        
                 are under <literal>programs.firefox</literal>.

     

       1465
       1465
        
               </para>

     

       1466
       1466
        
             </listitem>

     

       1467
       1467
       +
             <listitem>

     

       1468
       1468
       +
               <para>

     

       1469
       1469
       +
                 The option

     

       1470
       1470
       +
                 <literal>services.picom.experimentalBackends</literal> was

     

       1471
       1471
       +
                 removed since it is now the default and the option will cause

     

       1472
       1472
       +
                 <literal>picom</literal> to quit instead.

     

       1473
       1473
       +
               </para>

     

       1474
       1474
       +
             </listitem>

     

       1467
       1475
        
           </itemizedlist>

     

       1468
       1476
        
         </section>

     

       1469
       1477
        
       </section>

+2

nixos/doc/manual/release-notes/rl-2211.section.md

···

       447
       447
        
       

     

       448
       448
        
       - A NixOS module for Firefox has been added which allows preferences and [policies](https://github.com/mozilla/policy-templates/blob/master/README.md) to be set. This also allows extensions to be installed via the `ExtensionSettings` policy. The new options are under `programs.firefox`.

     

       449
       449
        
       

     

       450
       450
       +
       - The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead.

     

       451
       451
       +
       

     

       450
       452
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

+1 -1

nixos/modules/config/power-management.nix

···

       94
       94
        
               after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];

     

       95
       95
        
               script =

     

       96
       96
        
                 ''

     

       97
       97
       -
                   /run/current-system/systemd/bin/systemctl try-restart post-resume.target

     

       97
       97
       +
                   /run/current-system/systemd/bin/systemctl try-restart --no-block post-resume.target

     

       98
       98
        
                   ${cfg.resumeCommands}

     

       99
       99
        
                   ${cfg.powerUpCommands}

     

       100
       100
        
                 '';

+4 -10

nixos/modules/services/x11/picom.nix

···

       47
       47
        
             since picom v6 and was subsequently removed by upstream.

     

       48
       48
        
             See https://github.com/yshui/picom/commit/bcbc410

     

       49
       49
        
           '')

     

       50
       50
       +
           (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] ''

     

       51
       51
       +
             This option was removed by upstream since picom v10.

     

       52
       52
       +
           '')

     

       50
       53
        
         ];

     

       51
       54
        
       

     

       52
       55
        
         options.services.picom = {

     
···

       55
       58
        
             default = false;

     

       56
       59
        
             description = lib.mdDoc ''

     

       57
       60
        
               Whether or not to enable Picom as the X.org composite manager.

     

       58
       58
       -
             '';

     

       59
       59
       -
           };

     

       60
       60
       -
       

     

       61
       61
       -
           experimentalBackends = mkOption {

     

       62
       62
       -
             type = types.bool;

     

       63
       63
       -
             default = false;

     

       64
       64
       -
             description = lib.mdDoc ''

     

       65
       65
       -
               Whether to use the unstable new reimplementation of the backends.

     

       66
       61
        
             '';

     

       67
       62
        
           };

     

       68
       63
        
       

     
···

       306
       301
        
             };

     

       307
       302
        
       

     

       308
       303
        
             serviceConfig = {

     

       309
       309
       -
               ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"

     

       310
       310
       -
                 + (optionalString cfg.experimentalBackends " --experimental-backends");

     

       304
       304
       +
               ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}";

     

       311
       305
        
               RestartSec = 3;

     

       312
       306
        
               Restart = "always";

     

       313
       307
        
             };

+30

pkgs/applications/editors/vscode/extensions/default.nix

···

       537
       537
        
               };

     

       538
       538
        
             };

     

       539
       539
        
       

     

       540
       540
       +
             bmalehorn.vscode-fish = buildVscodeMarketplaceExtension {

     

       541
       541
       +
               mktplcRef = {

     

       542
       542
       +
                 name = "vscode-fish";

     

       543
       543
       +
                 publisher = "bmalehorn";

     

       544
       544
       +
                 version = "1.0.31";

     

       545
       545
       +
                 sha256 = "sha256-jDWW43ozUPIzhK/qQ+a+JSNdDHrjvgosyGe8kzBX6xM=";

     

       546
       546
       +
               };

     

       547
       547
       +
               meta.license = lib.licenses.mit;

     

       548
       548
       +
             };

     

       549
       549
       +
       

     

       540
       550
        
             bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension {

     

       541
       551
        
               mktplcRef = {

     

       542
       552
        
                 name = "vscode-tailwindcss";

     
···

       1668
       1678
        
               };

     

       1669
       1679
        
             };

     

       1670
       1680
        
       

     

       1681
       1681
       +
             matangover.mypy = buildVscodeMarketplaceExtension {

     

       1682
       1682
       +
               mktplcRef = {

     

       1683
       1683
       +
                 name = "mypy";

     

       1684
       1684
       +
                 publisher = "matangover";

     

       1685
       1685
       +
                 version = "0.2.2";

     

       1686
       1686
       +
                 sha256 = "sha256-eaiR30HjPCpOLUKQqiQ2Oqj+XY+JNnV47bM5KD2Mouk=";

     

       1687
       1687
       +
               };

     

       1688
       1688
       +
               meta.license = lib.licenses.mit;

     

       1689
       1689
       +
             };

     

       1690
       1690
       +
       

     

       1671
       1691
        
             mattn.lisp = buildVscodeMarketplaceExtension {

     

       1672
       1692
        
               mktplcRef = {

     

       1673
       1693
        
                 name = "lisp";

     
···

       2596
       2616
        
                 license = licenses.mit;

     

       2597
       2617
        
                 maintainers = with maintainers; [  ];

     

       2598
       2618
        
               };

     

       2619
       2619
       +
             };

     

       2620
       2620
       +
       

     

       2621
       2621
       +
             thenuprojectcontributors.vscode-nushell-lang = buildVscodeMarketplaceExtension {

     

       2622
       2622
       +
               mktplcRef = {

     

       2623
       2623
       +
                 name = "vscode-nushell-lang";

     

       2624
       2624
       +
                 publisher = "thenuprojectcontributors";

     

       2625
       2625
       +
                 version = "0.7.0";

     

       2626
       2626
       +
                 sha256 = "sha256-+AGJkFx/uzgQzuRnRBZ44xGNQ6a/QWt7SNiQgwPTZxo=";

     

       2627
       2627
       +
               };

     

       2628
       2628
       +
               meta.license = lib.licenses.mit;

     

       2599
       2629
        
             };

     

       2600
       2630
        
       

     

       2601
       2631
        
             tiehuis.zig = buildVscodeMarketplaceExtension {

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "sic";

     

       5
       5
       -
         version = "1.2";

     

       5
       5
       +
         version = "1.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";

     

       9
       9
       +
           hash = "sha256-MEePqz68dfLrXQjLtbL+3K9IkRbnWi3XGX4+nHM9ZdI=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         makeFlags = [ "CC:=$(CC)" ];

+5 -23

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

···

       1
       1
        
       { lib, mkDerivation, fetchFromGitHub, pkg-config, cmake

     

       2
       2
       -
       , libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl

     

       3
       3
       -
       , libsigrokdecode4dsl, python3, fetchpatch

     

       2
       2
       +
       , libzip, boost, fftw, qtbase, libusb1

     

       3
       3
       +
       , python3, fetchpatch

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       mkDerivation rec {

     

       7
       7
        
         pname = "dsview";

     

       8
       8
        
       

     

       9
       9
       -
         version = "1.12";

     

       9
       9
       +
         version = "1.2.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
             owner = "DreamSourceLab";

     

       13
       13
        
             repo = "DSView";

     

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

     

       15
       15
       -
             sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U=";

     

       15
       15
       +
             sha256 = "sha256-TE2yfzv2h77GLMkmoVGXmzs7J0l/N+n1eYxyrtnrnGU=";

     

       16
       16
        
         };

     

       17
       17
       -
       

     

       18
       18
       -
         sourceRoot = "source/DSView";

     

       19
       17
        
       

     

       20
       18
        
         patches = [

     

       21
       19
        
           # Fix absolute install paths

     

       22
       20
        
           ./install.patch

     

       23
       23
       -
       

     

       24
       24
       -
           # Fix buld with Qt5.15 already merged upstream for future release

     

       25
       25
       -
           # Using local file instead of content of commit #33e3d896a47 because

     

       26
       26
       -
           # sourceRoot make it unappliable

     

       27
       27
       -
           ./qt515.patch

     

       28
       28
       -
       

     

       29
       29
       -
           # Change from upstream master that removes extern-C scopes which

     

       30
       30
       -
           # cause failures with modern glib. This can likely be removed if

     

       31
       31
       -
           # there is an upstream release >1.12

     

       32
       32
       -
           (fetchpatch {

     

       33
       33
       -
             name = "fix-extern-c.patch";

     

       34
       34
       -
             url = "https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch";

     

       35
       35
       -
             sha256 = "sha256-TLfLQa3sdyNHTpMMvId/V6uUuOFihOZMFJOj9frnDoY=";

     

       36
       36
       -
             stripLen = 2;

     

       37
       37
       -
             extraPrefix = "";

     

       38
       38
       -
           })

     

       39
       21
        
         ];

     

       40
       22
        
       

     

       41
       23
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       42
       24
        
       

     

       43
       25
        
         buildInputs = [

     

       44
       44
       -
           boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl

     

       26
       26
       +
           boost fftw qtbase libusb1 libzip

     

       45
       27
        
           python3

     

       46
       28
        
         ];

     

       47
       29

+19 -11

pkgs/applications/science/electronics/dsview/install.patch

···

       1
       1
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index c1c33e1..208a184 100644

     

       2
       2
       +
       index eb9be42..220817c 100644

     

       3
       3
        
       --- a/CMakeLists.txt

     

       4
       4
        
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -427,8 +427,8 @@

     

       6
       6
       -
        install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)

     

       7
       7
       -
        install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)

     

       8
       8
       -
        install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)

     

       9
       9
       -
       -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)

     

       10
       10
       -
       -install(FILES DSView.desktop DESTINATION /usr/share/applications/)

     

       11
       11
       -
       +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/)

     

       12
       12
       -
       +install(FILES DSView.desktop DESTINATION share/applications/)

     

       5
       5
       +
       @@ -662,16 +662,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/icons/hicolor/scalable/app

     

       6
       6
       +
        install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg)

     

       13
       7
        
        

     

       14
       14
       -
        #===============================================================================

     

       15
       15
       -
        #= Packaging (handled by CPack)

     

       8
       8
       +
        if(CMAKE_SYSTEM_NAME MATCHES "Linux")	

     

       9
       9
       +
       -	install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop)

     

       10
       10
       +
       -	

     

       11
       11
       +
       -	if(IS_DIRECTORY /usr/lib/udev/rules.d)

     

       12
       12
       +
       -		install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules)

     

       13
       13
       +
       -	elseif(IS_DIRECTORY /lib/udev/rules.d)

     

       14
       14
       +
       -		install(FILES DSView/DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules)

     

       15
       15
       +
       -	elseif(IS_DIRECTORY /etc/udev/rules.d)

     

       16
       16
       +
       -		install(FILES DSView/DreamSourceLab.rules DESTINATION /etc/udev/rules.d RENAME 60-dreamsourcelab.rules)

     

       17
       17
       +
       -	endif()

     

       18
       18
       +
       -

     

       19
       19
       +
       +	install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop)

     

       20
       20
       +
       +	install(FILES DSView/DreamSourceLab.rules DESTINATION etc/udev/rules.d RENAME 60-dreamsourcelab.rules)

     

       21
       21
       +
        endif()

     

       22
       22
       +
        

     

       23
       23
       +
        install(FILES NEWS25 DESTINATION share/DSView RENAME NEWS25)

-28

pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix

···

       1
       1
       -
       { lib, stdenv, pkg-config, autoreconfHook,

     

       2
       2
       -
       glib, libzip, libserialport, check, libusb1, libftdi,

     

       3
       3
       -
       systemd, alsa-lib, dsview

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       stdenv.mkDerivation {

     

       7
       7
       -
         inherit (dsview) version src;

     

       8
       8
       -
       

     

       9
       9
       -
         pname = "libsigrok4dsl";

     

       10
       10
       -
       

     

       11
       11
       -
         postUnpack = ''

     

       12
       12
       -
           export sourceRoot=$sourceRoot/libsigrok4DSL

     

       13
       13
       -
         '';

     

       14
       14
       -
       

     

       15
       15
       -
         nativeBuildInputs = [ pkg-config autoreconfHook ];

     

       16
       16
       -
       

     

       17
       17
       -
         buildInputs = [

     

       18
       18
       -
           glib libzip libserialport libusb1 libftdi systemd check alsa-lib

     

       19
       19
       -
         ];

     

       20
       20
       -
       

     

       21
       21
       -
         meta = with lib; {

     

       22
       22
       -
           description = "A fork of the sigrok library for usage with DSView";

     

       23
       23
       -
           homepage = "https://www.dreamsourcelab.com/";

     

       24
       24
       -
           license = licenses.gpl3Plus;

     

       25
       25
       -
           platforms = platforms.linux;

     

       26
       26
       -
           maintainers = [ maintainers.bachp ];

     

       27
       27
       -
         };

     

       28
       28
       -
       }

-27

pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix

···

       1
       1
       -
       { lib, stdenv, pkg-config, autoreconfHook,

     

       2
       2
       -
       glib, check, python3, dsview

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       stdenv.mkDerivation {

     

       6
       6
       -
         inherit (dsview) version src;

     

       7
       7
       -
       

     

       8
       8
       -
         pname = "libsigrokdecode4dsl";

     

       9
       9
       -
       

     

       10
       10
       -
         postUnpack = ''

     

       11
       11
       -
           export sourceRoot=$sourceRoot/libsigrokdecode4DSL

     

       12
       12
       -
         '';

     

       13
       13
       -
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config autoreconfHook ];

     

       15
       15
       -
       

     

       16
       16
       -
         buildInputs = [

     

       17
       17
       -
           python3 glib check

     

       18
       18
       -
         ];

     

       19
       19
       -
       

     

       20
       20
       -
         meta = with lib; {

     

       21
       21
       -
           description = "A fork of the sigrokdecode library for usage with DSView";

     

       22
       22
       -
           homepage = "https://www.dreamsourcelab.com/";

     

       23
       23
       -
           license = licenses.gpl3Plus;

     

       24
       24
       -
           platforms = platforms.linux;

     

       25
       25
       -
           maintainers = [ maintainers.bachp ];

     

       26
       26
       -
         };

     

       27
       27
       -
       }

-13

pkgs/applications/science/electronics/dsview/qt515.patch

···

       1
       1
       -
       diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp

     

       2
       2
       -
       index 921d3db..16cdce9 100755

     

       3
       3
       -
       --- a/pv/view/viewport.cpp

     

       4
       4
       -
       +++ b/pv/view/viewport.cpp

     

       5
       5
       -
       @@ -37,7 +37,7 @@

     

       6
       6
       -
        

     

       7
       7
       -
        #include <QMouseEvent>

     

       8
       8
       -
        #include <QStyleOption>

     

       9
       9
       -
       -

     

       10
       10
       -
       +#include <QPainterPath>

     

       11
       11
       -
        

     

       12
       12
       -
        #include <math.h>

     

       13
       13
       -

+36

pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , rustPlatform

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , DiskArbitration

     

       6
       6
       +
       , Foundation

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       rustPlatform.buildRustPackage rec {

     

       10
       10
       +
         pname = "git-credential-keepassxc";

     

       11
       11
       +
         version = "0.10.1";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "Frederick888";

     

       15
       15
       +
           repo = "git-credential-keepassxc";

     

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

     

       17
       17
       +
           hash = "sha256-zVE3RQlh0SEV4iavz40YhR+MP31oLCvG54H8gqXwL/k=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         cargoHash = "sha256-H75SGbT//02I+umttnPM5BwtFkDVNxEYLf84oULEuEk=";

     

       21
       21
       +
       

     

       22
       22
       +
         buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ];

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with lib; {

     

       25
       25
       +
           description = "Helper that allows Git (and shell scripts) to use KeePassXC as credential store";

     

       26
       26
       +
           longDescription = ''

     

       27
       27
       +
             git-credential-keepassxc is a Git credential helper that allows Git

     

       28
       28
       +
             (and shell scripts) to get/store logins from/to KeePassXC.

     

       29
       29
       +
             It communicates with KeePassXC using keepassxc-protocol which is

     

       30
       30
       +
             originally designed for browser extensions.

     

       31
       31
       +
           '';

     

       32
       32
       +
           homepage = "https://github.com/Frederick888/git-credential-keepassxc";

     

       33
       33
       +
           license = licenses.gpl3Plus;

     

       34
       34
       +
           maintainers = with maintainers; [ fgaz ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+5 -8

pkgs/applications/virtualization/cri-o/wrapper.nix

···

       3
       3
        
       , makeWrapper

     

       4
       4
        
       , lib

     

       5
       5
        
       , extraPackages ? []

     

       6
       6
       -
       , cri-o

     

       7
       6
        
       , runc # Default container runtime

     

       8
       7
        
       , crun # Container runtime (default with cgroups v2 for podman/buildah)

     

       9
       8
        
       , conmon # Container runtime monitor

     
···

       12
       11
        
       }:

     

       13
       12
        
       

     

       14
       13
        
       let

     

       15
       15
       -
         cri-o = cri-o-unwrapped;

     

       16
       16
       -
       

     

       17
       14
        
         binPath = lib.makeBinPath ([

     

       18
       15
        
           runc

     

       19
       16
        
           crun

     
···

       22
       19
        
           iptables

     

       23
       20
        
         ] ++ extraPackages);

     

       24
       21
        
       

     

       25
       25
       -
       in runCommand cri-o.name {

     

       26
       26
       -
         name = "${cri-o.pname}-wrapper-${cri-o.version}";

     

       27
       27
       -
         inherit (cri-o) pname version passthru;

     

       22
       22
       +
       in runCommand cri-o-unwrapped.name {

     

       23
       23
       +
         name = "${cri-o-unwrapped.pname}-wrapper-${cri-o-unwrapped.version}";

     

       24
       24
       +
         inherit (cri-o-unwrapped) pname version passthru;

     

       28
       25
        
       

     

       29
       26
        
         preferLocalBuild = true;

     

       30
       27
        
       

     

       31
       31
       -
         meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ];

     

       28
       28
       +
         meta = builtins.removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ];

     

       32
       29
        
       

     

       33
       30
        
         outputs = [

     

       34
       31
        
           "out"

     
···

       40
       37
        
         ];

     

       41
       38
        
       

     

       42
       39
        
       } ''

     

       43
       43
       -
         ln -s ${cri-o.man} $man

     

       40
       40
       +
         ln -s ${cri-o-unwrapped.man} $man

     

       44
       41
        
       

     

       45
       42
        
         mkdir -p $out/bin

     

       46
       43
        
         ln -s ${cri-o-unwrapped}/share $out/share

+7 -10

pkgs/applications/virtualization/podman/wrapper.nix

···

       5
       5
        
       , lib

     

       6
       6
        
       , stdenv

     

       7
       7
        
       , extraPackages ? []

     

       8
       8
       -
       , podman # Docker compat

     

       9
       8
        
       , runc # Default container runtime

     

       10
       9
        
       , crun # Container runtime (default with cgroups v2 for podman/buildah)

     

       11
       10
        
       , conmon # Container runtime monitor

     
···

       23
       22
        
       # adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests

     

       24
       23
        
       

     

       25
       24
        
       let

     

       26
       26
       -
         podman = podman-unwrapped;

     

       27
       27
       -
       

     

       28
       25
        
         binPath = lib.makeBinPath ([

     

       29
       26
        
         ] ++ lib.optionals stdenv.isLinux [

     

       30
       27
        
           runc

     
···

       38
       35
        
         ] ++ extraPackages);

     

       39
       36
        
       

     

       40
       37
        
         helpersBin = symlinkJoin {

     

       41
       41
       -
           name = "${podman.pname}-helper-binary-wrapper-${podman.version}";

     

       38
       38
       +
           name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}";

     

       42
       39
        
       

     

       43
       40
        
           # this only works for some binaries, others may need to be be added to `binPath` or in the modules

     

       44
       41
        
           paths = [

     

       45
       42
        
             gvproxy

     

       46
       43
        
           ] ++ lib.optionals stdenv.isLinux [

     

       47
       44
        
             catatonit # added here for the pause image and also set in `containersConf` for `init_path`

     

       48
       48
       -
             podman.rootlessport

     

       45
       45
       +
             podman-unwrapped.rootlessport

     

       49
       46
        
           ];

     

       50
       47
        
         };

     

       51
       48
        
       

     

       52
       52
       -
       in runCommand podman.name {

     

       53
       53
       -
         name = "${podman.pname}-wrapper-${podman.version}";

     

       54
       54
       -
         inherit (podman) pname version passthru;

     

       49
       49
       +
       in runCommand podman-unwrapped.name {

     

       50
       50
       +
         name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}";

     

       51
       51
       +
         inherit (podman-unwrapped) pname version passthru;

     

       55
       52
        
       

     

       56
       53
        
         preferLocalBuild = true;

     

       57
       54
        
       

     

       58
       58
       -
         meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ];

     

       55
       55
       +
         meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ];

     

       59
       56
        
       

     

       60
       57
        
         outputs = [

     

       61
       58
        
           "out"

     
···

       67
       64
        
         ];

     

       68
       65
        
       

     

       69
       66
        
       } ''

     

       70
       70
       -
         ln -s ${podman.man} $man

     

       67
       67
       +
         ln -s ${podman-unwrapped.man} $man

     

       71
       68
        
       

     

       72
       69
        
         mkdir -p $out/bin

     

       73
       70
        
         ln -s ${podman-unwrapped}/etc $out/etc

+2 -2

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

···

       32
       32
        
       

     

       33
       33
        
       stdenv.mkDerivation rec {

     

       34
       34
        
         pname = "picom";

     

       35
       35
       -
         version = "9.1";

     

       35
       35
       +
         version = "10";

     

       36
       36
        
       

     

       37
       37
        
         src = fetchFromGitHub {

     

       38
       38
        
           owner = "yshui";

     

       39
       39
        
           repo = "picom";

     

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

     

       41
       41
       -
           sha256 = "sha256-Fqk6bPAOg4muxmSP+ezpGUNw6xrMWchZACKemeA08mA=";

     

       41
       41
       +
           sha256 = "sha256-ACQBgAYtJ4OOQIismNYJB3z426GmlyUtXXbH06eRsgg=";

     

       42
       42
        
           fetchSubmodules = true;

     

       43
       43
        
         };

     

       44
       44

-9

pkgs/build-support/make-symlinks/builder.sh

···

       1
       1
       -
       source $stdenv/setup

     

       2
       2
       -
       

     

       3
       3
       -
       mkdir $out

     

       4
       4
       -
       for file in $files

     

       5
       5
       -
       do

     

       6
       6
       -
         subdir=`dirname $file`

     

       7
       7
       -
         mkdir -p $out/$subdir

     

       8
       8
       -
         ln -s $dir/$file $out/$file

     

       9
       9
       -
       done

-7

pkgs/build-support/make-symlinks/default.nix

···

       1
       1
       -
       {name ? "", stdenv, dir, files}:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         inherit dir files;

     

       5
       5
       -
         name = if name == "" then dir.name else name;

     

       6
       6
       -
         builder = ./builder.sh;

     

       7
       7
       -
       }

+4 -6

pkgs/development/interpreters/lunatic/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchFromGitHub, cmake, stdenv, Security }:

     

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, stdenv, Security }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "lunatic";

     

       5
       5
       -
         version = "0.10.1";

     

       5
       5
       +
         version = "0.12.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "lunatic-solutions";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-MQ10WwvUdqU4w9uA4H1+VRM29HXVtLMwfGvbM6VqS90=";

     

       11
       11
       +
           sha256 = "sha256-7fxccufM5tunbutABEtsa6++OLTsS72oA219zvf+KN8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-tNYA3YruI7VENmLbd3rmZr7BkqHp1HNOfzPTkIiixqA=";

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [ cmake ];

     

       14
       14
       +
         cargoSha256 = "sha256-sHSQUvHTwyqMrGmwpblqpS4HfFiWGb+70a1uloDu2wY=";

     

       17
       15
        
       

     

       18
       16
        
         buildInputs = lib.optional stdenv.isDarwin Security;

     

       19
       17

+15 -5

pkgs/development/libraries/duckdb/default.nix

···

       17
       17
        
       in

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "duckdb";

     

       20
       20
       -
         version = "0.5.1";

     

       20
       20
       +
         version = "0.6.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = pname;

     

       24
       24
        
           repo = pname;

     

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

     

       26
       26
       -
           sha256 = "sha256-qzDQFS2ogQ6hqTCddHnttWF365007Labnn4BmHB219k=";

     

       26
       26
       +
           sha256 = "sha256-XCEX2VCynbMUP5xsxWq8PlHnfrBfES5c2fuu2jhM+tI=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       +
         patches = [ ./version.patch ];

     

       30
       30
       +
       

     

       29
       31
        
         postPatch = ''

     

       30
       32
        
           substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"

     

       31
       33
        
         '';

     
···

       42
       44
        
           "-DBUILD_TPCE=ON"

     

       43
       45
        
           "-DBUILD_TPCH_EXTENSION=ON"

     

       44
       46
        
           "-DBUILD_VISUALIZER_EXTENSION=ON"

     

       47
       47
       +
           "-DBUILD_INET_EXTENSION=ON"

     

       45
       48
        
           "-DJDBC_DRIVER=${enableFeature withJdbc}"

     

       46
       49
        
         ];

     

       47
       50
        
       

     
···

       56
       59
        
         installCheckPhase =

     

       57
       60
        
           let

     

       58
       61
        
             excludes = map (pattern: "exclude:'${pattern}'") [

     

       59
       59
       -
               "*test_slow"

     

       60
       60
       -
               "Test file buffers for reading/writing to file"

     

       61
       61
       -
               "[test_slow]"

     

       62
       62
       +
               "[s3]"

     

       63
       63
       +
               "Test closing database during long running query"

     

       62
       64
        
               "test/common/test_cast_hugeint.test"

     

       63
       65
        
               "test/sql/copy/csv/test_csv_remote.test"

     

       64
       66
        
               "test/sql/copy/parquet/test_parquet_remote.test"

     

       65
       67
        
               "test/sql/copy/parquet/test_parquet_remote_foreign_files.test"

     

       68
       68
       +
               "test/sql/storage/compression/chimp/chimp_read.test"

     

       69
       69
       +
               "test/sql/storage/compression/chimp/chimp_read_float.test"

     

       70
       70
       +
               "test/sql/storage/compression/patas/patas_compression_ratio.test_coverage"

     

       71
       71
       +
               "test/sql/storage/compression/patas/patas_read.test"

     

       72
       72
       +
               # these are only hidden if no filters are passed in

     

       73
       73
       +
               "[!hide]"

     

       74
       74
       +
               # this test apparently never terminates

     

       75
       75
       +
               "test/sql/copy/csv/auto/test_csv_auto.test"

     

       66
       76
        
             ] ++ lib.optionals stdenv.isAarch64 [

     

       67
       77
        
               "test/sql/aggregate/aggregates/test_kurtosis.test"

     

       68
       78
        
               "test/sql/aggregate/aggregates/test_skewness.test"

+27 -20

pkgs/development/libraries/duckdb/version.patch

···

       1
       1
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index 92c097228..5f51929f6 100644

     

       2
       2
       +
       index 349af6acf7..7ffec0b4cb 100644

     

       3
       3
        
       --- a/CMakeLists.txt

     

       4
       4
        
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -157,45 +157,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")

     

       5
       5
       +
       @@ -196,52 +196,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")

     

       6
       6
        
          set(SUN TRUE)

     

       7
       7
        
        endif()

     

       8
       8
        
        

     

       9
       9
       -
       -execute_process(

     

       10
       10
       -
       -        COMMAND git log -1 --format=%h

     

       11
       11
       -
       -        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

     

       12
       12
       -
       -        RESULT_VARIABLE GIT_RESULT

     

       13
       13
       -
       -        OUTPUT_VARIABLE GIT_COMMIT_HASH

     

       14
       14
       -
       -        OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       15
       15
       -
       -execute_process(

     

       16
       16
       -
       -        COMMAND git describe --tags --abbrev=0

     

       17
       17
       -
       -        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

     

       18
       18
       -
       -        OUTPUT_VARIABLE GIT_LAST_TAG

     

       19
       19
       -
       -        OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       20
       20
       -
       -execute_process(

     

       21
       21
       -
       -        COMMAND git describe --tags --long

     

       22
       22
       -
       -        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

     

       23
       23
       -
       -        OUTPUT_VARIABLE GIT_ITERATION

     

       24
       24
       -
       -        OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       9
       9
       +
       -find_package(Git)

     

       10
       10
       +
       -if(Git_FOUND)

     

       11
       11
       +
       -  if (NOT DEFINED GIT_COMMIT_HASH)

     

       12
       12
       +
       -    execute_process(

     

       13
       13
       +
       -            COMMAND ${GIT_EXECUTABLE} log -1 --format=%h

     

       14
       14
       +
       -            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

     

       15
       15
       +
       -            RESULT_VARIABLE GIT_RESULT

     

       16
       16
       +
       -            OUTPUT_VARIABLE GIT_COMMIT_HASH

     

       17
       17
       +
       -            OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       18
       18
       +
       -  endif()

     

       19
       19
       +
       -  execute_process(

     

       20
       20
       +
       -          COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0

     

       21
       21
       +
       -          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

     

       22
       22
       +
       -          OUTPUT_VARIABLE GIT_LAST_TAG

     

       23
       23
       +
       -          OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       24
       24
       +
       -  execute_process(

     

       25
       25
       +
       -          COMMAND ${GIT_EXECUTABLE} describe --tags --long

     

       26
       26
       +
       -          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

     

       27
       27
       +
       -          OUTPUT_VARIABLE GIT_ITERATION

     

       28
       28
       +
       -          OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       29
       29
       +
       -else()

     

       30
       30
       +
       -  message("Git NOT FOUND")

     

       31
       31
       +
       -endif()

     

       25
       32
        
       -

     

       26
       33
        
       -if(GIT_RESULT EQUAL "0")

     

       27
       34
        
       -  string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}")

     
···

       47
       54
        
       -endif()

     

       48
       55
        
       +set(DUCKDB_VERSION "@DUCKDB_VERSION@")

     

       49
       56
        
        

     

       50
       50
       -
        option(AMALGAMATION_BUILD

     

       51
       51
       -
               "Build from the amalgamation files, rather than from the normal sources."

     

       57
       57
       +
        message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")

     

       58
       58
       +

+10 -4

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

···

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
       -
         pname = "duckdb";

     

       17
       17
       -
         inherit (duckdb) version src patches;

     

       16
       16
       +
         inherit (duckdb) pname version src patches;

     

       18
       17
        
         format = "setuptools";

     

       19
       18
        
       

     

       20
       20
       -
         preConfigure = ''

     

       19
       19
       +
         # we can't use sourceRoot otherwise patches don't apply, because the patches

     

       20
       20
       +
         # apply to the C++ library

     

       21
       21
       +
         postPatch = ''

     

       21
       22
        
           cd tools/pythonpkg

     

       22
       22
       -
           substituteInPlace setup.py --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"

     

       23
       23
       +
       

     

       24
       24
       +
           # 1. let nix control build cores

     

       25
       25
       +
           # 2. unconstrain setuptools_scm version

     

       26
       26
       +
           substituteInPlace setup.py \

     

       27
       27
       +
             --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" \

     

       28
       28
       +
             --replace "setuptools_scm<7.0.0" "setuptools_scm"

     

       23
       29
        
         '';

     

       24
       30
        
       

     

       25
       31
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+7 -10

pkgs/development/tools/buildah/wrapper.nix

···

       4
       4
        
       , lib

     

       5
       5
        
       , stdenv

     

       6
       6
        
       , extraPackages ? []

     

       7
       7
       -
       , buildah

     

       8
       7
        
       , runc # Default container runtime

     

       9
       8
        
       , crun # Container runtime (default with cgroups v2 for podman/buildah)

     

       10
       9
        
       , conmon # Container runtime monitor

     
···

       15
       14
        
       }:

     

       16
       15
        
       

     

       17
       16
        
       let

     

       18
       18
       -
         buildah = buildah-unwrapped;

     

       19
       19
       -
       

     

       20
       20
       -
         preferLocalBuild = true;

     

       21
       21
       -
       

     

       22
       17
        
         binPath = lib.makeBinPath ([

     

       23
       18
        
         ] ++ lib.optionals stdenv.isLinux [

     

       24
       19
        
           runc

     
···

       30
       25
        
           iptables

     

       31
       26
        
         ] ++ extraPackages);

     

       32
       27
        
       

     

       33
       33
       -
       in runCommand buildah.name {

     

       34
       34
       -
         name = "${buildah.pname}-wrapper-${buildah.version}";

     

       35
       35
       -
         inherit (buildah) pname version;

     

       28
       28
       +
       in runCommand buildah-unwrapped.name {

     

       29
       29
       +
         name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";

     

       30
       30
       +
         inherit (buildah-unwrapped) pname version;

     

       31
       31
       +
       

     

       32
       32
       +
         preferLocalBuild = true;

     

       36
       33
        
       

     

       37
       37
       -
         meta = builtins.removeAttrs buildah.meta [ "outputsToInstall" ];

     

       34
       34
       +
         meta = builtins.removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ];

     

       38
       35
        
       

     

       39
       36
        
         outputs = [

     

       40
       37
        
           "out"

     
···

       46
       43
        
         ];

     

       47
       44
        
       

     

       48
       45
        
       } ''

     

       49
       49
       -
         ln -s ${buildah.man} $man

     

       46
       46
       +
         ln -s ${buildah-unwrapped.man} $man

     

       50
       47
        
       

     

       51
       48
        
         mkdir -p $out/bin

     

       52
       49
        
         ln -s ${buildah-unwrapped}/share $out/share

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "jenkins";

     

       7
       7
       -
         version = "2.361.3";

     

       7
       7
       +
         version = "2.361.4";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";

     

       11
       11
       -
           hash = "sha256-85y40J/RfHLcCWURzlDyRfwwBNECKqr2BCGlNvdAybk=";

     

       11
       11
       +
           hash = "sha256-s4/iGK+1RHsMmm+jCNerdirFpY3YmqaLc1BnrWw3wXs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/development/tools/oh-my-posh/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "oh-my-posh";

     

       5
       5
       -
         version = "12.13.0";

     

       5
       5
       +
         version = "12.13.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jandedobbeleer";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-bGg0UqqplJpsJ2xOHmu6y8ixGxdDkWwZyRrgzrNBlIY=";

     

       11
       11
       +
           sha256 = "sha256-1H3BlKxTthyVXEaLISruZDFIeXEAaeZjGp597clPeLs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

+3 -3

pkgs/development/tools/ruff/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "ruff";

     

       11
       11
       -
         version = "0.0.121";

     

       11
       11
       +
         version = "0.0.122";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "charliermarsh";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-vplpsobc3LFkgJsyXGT0jel8nT6begotEvYGQESiMFI=";

     

       17
       17
       +
           sha256 = "sha256-+CQOQcA7JLHsl6ieDpIEzUdeMBsGyP686mWaYgyweH4=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-gtITHmB9Qd417yWqKcfidjUjAuVz1GNmbX0aL0Bl7jQ=";

     

       20
       20
       +
         cargoSha256 = "sha256-ZxJ7ErGdsI1dZIeUVdYBD4IF0nHHnIJGUXn+rtSBLLY=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       23
       23
        
           CoreServices

+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.154";

     

       6
       6
       +
         version = "5.10.155";

     

       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 = "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6";

     

       16
       16
       +
           sha256 = "1wyla96qsdf50n7qjj4hdf36bj56whv7gc9mgw9bvrsqdi92gc7i";

     

       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.78";

     

       6
       6
       +
         version = "5.15.79";

     

       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 = "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d";

     

       16
       16
       +
           sha256 = "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb";

     

       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.8";

     

       6
       6
       +
         version = "6.0.9";

     

       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 = "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d";

     

       16
       16
       +
           sha256 = "1irip1yk62carcisxlacwcxsiqib4qswx6h5mfhv8f97x04a4531";

     

       17
       17
        
         };

     

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

+2 -2

pkgs/servers/monitoring/icinga2/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "icinga2${nameSuffix}";

     

       12
       12
       -
         version = "2.13.5";

     

       12
       12
       +
         version = "2.13.6";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "icinga";

     

       16
       16
        
           repo = "icinga2";

     

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

     

       18
       18
       -
           sha256 = "sha256-XVA3VIGmj3mXfx2eIJ5X4hfjRrnZaAHYMPRyy9+9QGc=";

     

       18
       18
       +
           sha256 = "sha256-Zrq+pw1dZyKVxpbsXeEPU3hLqcaYj/0wqB9HmYXnd0Y=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         patches = [

+13 -17

pkgs/tools/compression/zfp/default.nix

···

       1
       1
        
       { cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform

     

       2
       2
        
       , enableCfp ? true

     

       3
       3
        
       , enableCuda ? false

     

       4
       4
       -
       , enableExamples ? true

     

       5
       4
        
       , enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms

     

       6
       5
        
       , enableOpenMP ? true

     

       7
       6
        
       , enablePython ? true

     
···

       9
       8
        
       

     

       10
       9
        
       stdenv.mkDerivation rec {

     

       11
       10
        
         pname = "zfp";

     

       12
       12
       -
         version = "0.5.5";

     

       11
       11
       +
         version = "1.0.0";

     

       13
       12
        
       

     

       14
       13
        
         src = fetchFromGitHub {

     

       15
       14
        
           owner = "LLNL";

     

       16
       15
        
           repo = "zfp";

     

       17
       16
        
           rev = version;

     

       18
       18
       -
           sha256 = "19ycflz35qsrzfcvxdyy0mgbykfghfi9y5v684jb4awjp7nf562c";

     

       17
       17
       +
           sha256 = "sha256-E2LI1rWo1HO5O/sxPHAmLDs3Z5xouzlgMj11rQFPNYQ=";

     

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       20
        
         nativeBuildInputs = [ cmake ];

     
···

       24
       23
        
           ++ lib.optional enableFortran gfortran

     

       25
       24
        
           ++ lib.optional enableOpenMP llvmPackages.openmp

     

       26
       25
        
           ++ lib.optionals enablePython (with python3Packages; [ cython numpy python ]);

     

       26
       26
       +
       

     

       27
       27
       +
         # compile CUDA code for all extant GPUs so the binary will work with any GPU

     

       28
       28
       +
         # and driver combination. to be ultimately solved upstream:

     

       29
       29
       +
         # https://github.com/LLNL/zfp/issues/178

     

       30
       30
       +
         # NB: not in cmakeFlags due to https://github.com/NixOS/nixpkgs/issues/114044

     

       31
       31
       +
         preConfigure = lib.optionalString enableCuda ''

     

       32
       32
       +
           cmakeFlagsArray+=(

     

       33
       33
       +
             "-DCMAKE_CUDA_FLAGS=-gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_87,code=sm_87 -gencode=arch=compute_86,code=compute_86"

     

       34
       34
       +
           )

     

       35
       35
       +
         '';

     

       27
       36
        
       

     

       28
       37
        
         cmakeFlags = [

     

       29
       29
       -
           # More tests not enabled by default

     

       30
       30
       -
           ''-DZFP_BINARY_DIR=${placeholder "out"}''

     

       31
       31
       -
           ''-DZFP_BUILD_TESTING_LARGE=ON''

     

       32
       32
       -
         ]

     

       33
       33
       -
           ++ lib.optionals targetPlatform.isDarwin [

     

       34
       34
       -
             "-DCMAKE_INSTALL_BINDIR=bin"

     

       35
       35
       -
             "-DCMAKE_INSTALL_LIBDIR=lib"

     

       36
       36
       -
           ]

     

       37
       37
       -
           ++ lib.optional enableCfp "-DBUILD_CFP=ON"

     

       38
       38
       +
         ] ++ lib.optional enableCfp "-DBUILD_CFP=ON"

     

       38
       39
        
           ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON"

     

       39
       39
       -
           ++ lib.optional enableExamples "-DBUILD_EXAMPLES=ON"

     

       40
       40
        
           ++ lib.optional enableFortran "-DBUILD_ZFORP=ON"

     

       41
       41
        
           ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"

     

       42
       42
        
           ++ lib.optional enablePython "-DBUILD_ZFPY=ON"

     

       43
       43
        
           ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]);

     

       44
       44
       -
       

     

       45
       45
       -
         preCheck = lib.optional targetPlatform.isDarwin ''

     

       46
       46
       -
           export DYLD_LIBRARY_PATH="$out/lib:$DYLD_LIBRARY_PATH"

     

       47
       47
       -
         '';

     

       48
       44
        
       

     

       49
       45
        
         doCheck = true;

     

       50
       46

+4 -4

pkgs/top-level/all-packages.nix

···

       7081
       7081
        
       

     

       7082
       7082
        
         git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { };

     

       7083
       7083
        
       

     

       7084
       7084
       +
         git-credential-keepassxc = callPackage ../applications/version-management/git-and-tools/git-credential-keepassxc {

     

       7085
       7085
       +
           inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;

     

       7086
       7086
       +
         };

     

       7087
       7087
       +
       

     

       7084
       7088
        
         git-crecord = callPackage ../applications/version-management/git-crecord { };

     

       7085
       7089
        
       

     

       7086
       7090
        
         git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { };

     
···

       16818
       16822
        
         };

     

       16819
       16823
        
       

     

       16820
       16824
        
         libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };

     

       16821
       16821
       -
       

     

       16822
       16822
       -
         # special forks used for dsview

     

       16823
       16823
       -
         libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };

     

       16824
       16824
       -
         libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { };

     

       16825
       16825
        
       

     

       16826
       16826
        
         sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { };

     

       16827
       16827