commit bab247f2bbbb119a939fbb01879c317130d1bdc2 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/configuration/abstractions.section.md

···

       35
       35
        
       {

     

       36
       36
        
         services.httpd.virtualHosts =

     

       37
       37
        
           { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });

     

       38
       38
       -
             "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; });

     

       38
       38
       +
             "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });

     

       39
       39
        
           };

     

       40
       40
        
       }

     

       41
       41
        
       ```

+26 -46

pkgs/applications/editors/kile/default.nix

···

       1
       1
       -
       { mkDerivation

     

       2
       2
       -
       , lib

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       -
       , extra-cmake-modules

     

       5
       5
       -
       , kdoctools

     

       6
       6
       -
       , wrapGAppsHook3

     

       7
       7
       -
       , qtscript

     

       8
       8
       -
       , kconfig

     

       9
       9
       -
       , kcrash

     

       10
       10
       -
       , kdbusaddons

     

       11
       11
       -
       , kdelibs4support

     

       12
       12
       -
       , kguiaddons

     

       13
       13
       -
       , kiconthemes

     

       14
       14
       -
       , kinit

     

       15
       15
       -
       , khtml

     

       16
       16
       -
       , konsole

     

       17
       17
       -
       , kparts

     

       18
       18
       -
       , ktexteditor

     

       19
       19
       -
       , kwindowsystem

     

       20
       20
       -
       , okular

     

       21
       21
       -
       , poppler

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , kdePackages

     

       6
       6
       +
       , qt6

     

       22
       7
        
       }:

     

       23
       8
        
       

     

       24
       24
       -
       mkDerivation rec {

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       25
       10
        
         pname = "kile";

     

       26
       26
       -
         version = "2.9.93";

     

       11
       11
       +
         version = "2.9.94";

     

       27
       12
        
       

     

       28
       13
        
         src = fetchurl {

     

       29
       14
        
           url = "mirror://sourceforge/kile/kile-${version}.tar.bz2";

     

       30
       30
       -
           sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";

     

       15
       15
       +
           sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o=";

     

       31
       16
        
         };

     

       32
       17
        
       

     

       33
       18
        
         nativeBuildInputs = [

     

       34
       34
       -
           extra-cmake-modules

     

       35
       35
       -
           wrapGAppsHook3

     

       36
       36
       -
           kdoctools

     

       19
       19
       +
           cmake

     

       20
       20
       +
           kdePackages.extra-cmake-modules

     

       21
       21
       +
           qt6.wrapQtAppsHook

     

       22
       22
       +
           kdePackages.kdoctools

     

       37
       23
        
         ];

     

       38
       24
        
       

     

       39
       25
        
         buildInputs = [

     

       40
       40
       -
           kconfig

     

       41
       41
       -
           kcrash

     

       42
       42
       -
           kdbusaddons

     

       43
       43
       -
           kdelibs4support

     

       44
       44
       -
           kguiaddons

     

       45
       45
       -
           kiconthemes

     

       46
       46
       -
           kinit

     

       47
       47
       -
           khtml

     

       48
       48
       -
           kparts

     

       49
       49
       -
           ktexteditor

     

       50
       50
       -
           kwindowsystem

     

       51
       51
       -
           okular

     

       52
       52
       -
           poppler

     

       53
       53
       -
           qtscript

     

       26
       26
       +
           qt6.qtbase

     

       27
       27
       +
           qt6.qtdeclarative

     

       28
       28
       +
           qt6.qt5compat

     

       29
       29
       +
           kdePackages.kconfig

     

       30
       30
       +
           kdePackages.kcrash

     

       31
       31
       +
           kdePackages.kdbusaddons

     

       32
       32
       +
           kdePackages.kguiaddons

     

       33
       33
       +
           kdePackages.kiconthemes

     

       34
       34
       +
           kdePackages.konsole

     

       35
       35
       +
           kdePackages.kparts

     

       36
       36
       +
           kdePackages.ktexteditor

     

       37
       37
       +
           kdePackages.kwindowsystem

     

       38
       38
       +
           kdePackages.okular

     

       39
       39
       +
           kdePackages.poppler

     

       54
       40
        
         ];

     

       55
       55
       -
         dontWrapGApps = true;

     

       56
       56
       -
         preFixup = ''

     

       57
       57
       -
           makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

     

       58
       58
       -
         '';

     

       59
       59
       -
       

     

       60
       60
       -
         propagatedUserEnvPkgs = [ konsole ];

     

       61
       41
        
       

     

       62
       42
        
         meta = {

     

       63
       43
        
           description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment";

pkgs/applications/misc/swaynotificationcenter/default.nix

···

       12
       12
        
       , gobject-introspection

     

       13
       13
        
       , gtk-layer-shell

     

       14
       14
        
       , gtk3

     

       15
       15
       +
       , gvfs

     

       15
       16
        
       , json-glib

     

       16
       17
        
       , libgee

     

       17
       18
        
       , libhandy

     

       19
       19
       +
       , libnotify

     

       18
       20
        
       , libpulseaudio

     

       19
       21
        
       , librsvg

     

       20
       22
        
       , meson

     
···

       65
       67
        
           glib

     

       66
       68
        
           gtk-layer-shell

     

       67
       69
        
           gtk3

     

       70
       70
       +
           gvfs

     

       68
       71
        
           json-glib

     

       69
       72
        
           libgee

     

       70
       73
        
           libhandy

     

       74
       74
       +
           libnotify

     

       71
       75
        
           libpulseaudio

     

       72
       76
        
           librsvg

     

       73
       77
        
           pantheon.granite

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kuttl";

     

       5
       5
       -
         version = "0.15.0";

     

       5
       5
       +
         version = "0.16.0";

     

       6
       6
        
         cli = "kubectl-kuttl";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "kudobuilder";

     

       10
       10
        
           repo = "kuttl";

     

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

     

       12
       12
       -
           sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ=";

     

       12
       12
       +
           sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk=";

     

       15
       15
       +
         vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww=";

     

       16
       16
        
       

     

       17
       17
        
         subPackages = [ "cmd/kubectl-kuttl" ];

     

       18
       18

-147

pkgs/applications/networking/taler/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd

     

       2
       2
       -
       , qrencode, libsodium, libtool, libunistring, pkg-config, postgresql

     

       3
       3
       -
       , autoreconfHook, python3, recutils, wget, jq, gettext, texinfo

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       let

     

       7
       7
       -
         version = "0.10.1";

     

       8
       8
       -
       

     

       9
       9
       -
         taler-wallet-core = fetchgit {

     

       10
       10
       -
           url = "https://git.taler.net/wallet-core.git";

     

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

     

       12
       12
       -
           hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY=";

     

       13
       13
       -
         };

     

       14
       14
       -
       

     

       15
       15
       -
         taler-exchange = stdenv.mkDerivation {

     

       16
       16
       -
           pname = "taler-exchange";

     

       17
       17
       -
           inherit version;

     

       18
       18
       -
       

     

       19
       19
       -
           src = fetchgit {

     

       20
       20
       -
             url = "https://git.taler.net/exchange.git";

     

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

     

       22
       22
       -
             fetchSubmodules = true;

     

       23
       23
       -
             hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg=";

     

       24
       24
       -
       

     

       25
       25
       -
             # When fetching submodules without the .git folder we get the following error:

     

       26
       26
       -
             # "Server does not allow request for unadvertised object"

     

       27
       27
       -
             leaveDotGit = true;

     

       28
       28
       -
             postFetch = ''

     

       29
       29
       -
               rm -rf $out/.git

     

       30
       30
       -
             '';

     

       31
       31
       -
           };

     

       32
       32
       -
       

     

       33
       33
       -
           nativeBuildInputs = [

     

       34
       34
       -
             autoreconfHook

     

       35
       35
       -
             pkg-config

     

       36
       36
       -
           ];

     

       37
       37
       -
           buildInputs = [

     

       38
       38
       -
             libgcrypt

     

       39
       39
       -
             libmicrohttpd

     

       40
       40
       -
             jansson

     

       41
       41
       -
             libsodium

     

       42
       42
       -
             postgresql

     

       43
       43
       -
             curl

     

       44
       44
       -
             recutils

     

       45
       45
       -
             gettext

     

       46
       46
       -
             texinfo # Fix 'makeinfo' is missing on your system.

     

       47
       47
       -
             libunistring

     

       48
       48
       -
             python3.pkgs.jinja2

     

       49
       49
       -
             # jq is necessary for some tests and is checked by configure script

     

       50
       50
       -
             jq

     

       51
       51
       -
           ];

     

       52
       52
       -
           propagatedBuildInputs = [ gnunet ];

     

       53
       53
       -
       

     

       54
       54
       -
           # From ./bootstrap

     

       55
       55
       -
           preAutoreconf = ''

     

       56
       56
       -
             ./contrib/gana-generate.sh

     

       57
       57
       -
             pushd contrib

     

       58
       58
       -
             find wallet-core/aml-backoffice/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext

     

       59
       59
       -
             truncate -s -2 Makefile.am.ext

     

       60
       60
       -
             cat Makefile.am.in Makefile.am.ext >> Makefile.am

     

       61
       61
       -
             popd

     

       62
       62
       -
           '';

     

       63
       63
       -
       

     

       64
       64
       -
           enableParallelBuilding = true;

     

       65
       65
       -
       

     

       66
       66
       -
           nativeCheckInputs = [ wget curl ];

     

       67
       67
       -
           doInstallCheck = true;

     

       68
       68
       -
           checkTarget = "check";

     

       69
       69
       -
       

     

       70
       70
       -
           meta = with lib; {

     

       71
       71
       -
             description = ''

     

       72
       72
       -
               Taler is an electronic payment system providing the ability to pay

     

       73
       73
       -
               anonymously using digital cash.  Taler consists of a network protocol

     

       74
       74
       -
               definition (using a RESTful API over HTTP), a Exchange (which creates

     

       75
       75
       -
               digital coins), a Wallet (which allows customers to manage, store and

     

       76
       76
       -
               spend digital coins), and a Merchant website which allows customers to

     

       77
       77
       -
               spend their digital coins.  Naturally, each Merchant is different, but

     

       78
       78
       -
               Taler includes code examples to help Merchants integrate Taler as a

     

       79
       79
       -
               payment system.

     

       80
       80
       -
             '';

     

       81
       81
       -
             homepage = "https://taler.net/";

     

       82
       82
       -
             license = licenses.agpl3Plus;

     

       83
       83
       -
             maintainers = with maintainers; [ astro ];

     

       84
       84
       -
             platforms = platforms.linux;

     

       85
       85
       -
           };

     

       86
       86
       -
         };

     

       87
       87
       -
       

     

       88
       88
       -
         taler-merchant = stdenv.mkDerivation {

     

       89
       89
       -
           pname = "taler-merchant";

     

       90
       90
       -
           inherit version;

     

       91
       91
       -
       

     

       92
       92
       -
           src = fetchgit {

     

       93
       93
       -
             url = "https://git.taler.net/merchant.git";

     

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

     

       95
       95
       -
             fetchSubmodules = true;

     

       96
       96
       -
             hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y=";

     

       97
       97
       -
           };

     

       98
       98
       -
           postUnpack = ''

     

       99
       99
       -
             ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/

     

       100
       100
       -
           '';

     

       101
       101
       -
       

     

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

     

       103
       103
       -
           buildInputs = taler-exchange.buildInputs ++ [

     

       104
       104
       -
             qrencode

     

       105
       105
       -
             taler-exchange

     

       106
       106
       -
             # for ltdl.h

     

       107
       107
       -
             libtool

     

       108
       108
       -
           ];

     

       109
       109
       -
           propagatedBuildInputs = [ gnunet ];

     

       110
       110
       -
       

     

       111
       111
       -
           # From ./bootstrap

     

       112
       112
       -
           preAutoreconf = ''

     

       113
       113
       -
             pushd contrib

     

       114
       114
       -
             find wallet-core/backoffice/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext

     

       115
       115
       -
             truncate -s -2 Makefile.am.ext

     

       116
       116
       -
             cat Makefile.am.in Makefile.am.ext >> Makefile.am

     

       117
       117
       -
             popd

     

       118
       118
       -
           '';

     

       119
       119
       -
           configureFlags = [

     

       120
       120
       -
             "--with-gnunet=${gnunet}"

     

       121
       121
       -
             "--with-exchange=${taler-exchange}"

     

       122
       122
       -
           ];

     

       123
       123
       -
       

     

       124
       124
       -
           enableParallelBuilding = true;

     

       125
       125
       -
       

     

       126
       126
       -
           nativeCheckInputs = [ jq ];

     

       127
       127
       -
           doInstallCheck = true;

     

       128
       128
       -
           checkTarget = "check";

     

       129
       129
       -
       

     

       130
       130
       -
           meta = with lib; {

     

       131
       131
       -
             description = ''

     

       132
       132
       -
               This is the GNU Taler merchant backend. It provides the logic that should run

     

       133
       133
       -
               at every GNU Taler merchant.  The GNU Taler merchant is a RESTful backend that

     

       134
       134
       -
               can be used to setup orders and process payments.  This component allows

     

       135
       135
       -
               merchants to receive payments without invading the customers' privacy. Of

     

       136
       136
       -
               course, this applies mostly for digital goods, as the merchant does not need

     

       137
       137
       -
               to know the customer's physical address.

     

       138
       138
       -
             '';

     

       139
       139
       -
             homepage = "https://taler.net/";

     

       140
       140
       -
             license = licenses.agpl3Plus;

     

       141
       141
       -
             maintainers = with maintainers; [ astro ];

     

       142
       142
       -
             platforms = platforms.linux;

     

       143
       143
       -
           };

     

       144
       144
       -
         };

     

       145
       145
       -
       in {

     

       146
       146
       -
         inherit taler-exchange taler-merchant;

     

       147
       147
       -
       }

+2 -2

pkgs/applications/networking/xpipe/default.nix

···

       33
       33
        
         }.${system} or throwSystem;

     

       34
       34
        
       

     

       35
       35
        
         hash = {

     

       36
       36
       -
           x86_64-linux = "sha256-s/1XyEXOyvAQNf32ckKotQ4jYdlo/Y+O9PY3wIUs80A=";

     

       36
       36
       +
           x86_64-linux = "sha256-3KMmMDoaYYMKuuqLof/LfdCs1d4I70L2TDxmzvx4Vq0=";

     

       37
       37
        
         }.${system} or throwSystem;

     

       38
       38
        
       

     

       39
       39
        
         displayname = "XPipe";

     

       40
       40
        
       

     

       41
       41
        
       in stdenvNoCC.mkDerivation rec {

     

       42
       42
        
         pname = "xpipe";

     

       43
       43
       -
         version = "8.6";

     

       43
       43
       +
         version = "9.0";

     

       44
       44
        
       

     

       45
       45
        
         src = fetchzip {

     

       46
       46
        
           url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

+36 -22

pkgs/applications/video/makemkv/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , mkDerivation

     

       3
       3
       -
       , fetchurl

     

       4
       4
       -
       , autoPatchelfHook

     

       5
       5
       -
       , pkg-config

     

       6
       6
       -
       , curl

     

       7
       7
       -
       , ffmpeg

     

       8
       8
       -
       , openssl

     

       9
       9
       -
       , qtbase

     

       10
       10
       -
       , zlib

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         autoPatchelfHook,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         curl,

     

       8
       8
       +
         ffmpeg,

     

       9
       9
       +
         openssl,

     

       10
       10
       +
         qtbase,

     

       11
       11
       +
         zlib,

     

       11
       12
        
       

     

       12
       12
       -
       , withJava ? true

     

       13
       13
       -
       , jre_headless

     

       13
       13
       +
         withJava ? true,

     

       14
       14
       +
         jre_headless,

     

       14
       15
        
       }:

     

       15
       16
        
       

     

       16
       17
        
       let

     
···

       30
       31
        
           ];

     

       31
       32
        
           sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM=";

     

       32
       33
        
         };

     

       33
       33
       -
       

     

       34
       34
       -
       in mkDerivation {

     

       34
       34
       +
       in

     

       35
       35
       +
       mkDerivation {

     

       35
       36
        
         pname = "makemkv";

     

       36
       37
        
         inherit version;

     

       37
       38
        
       

     

       38
       38
       -
         srcs = [ src_bin src_oss ];

     

       39
       39
       +
         srcs = [

     

       40
       40
       +
           src_bin

     

       41
       41
       +
           src_oss

     

       42
       42
       +
         ];

     

       39
       43
        
       

     

       40
       44
        
         sourceRoot = "makemkv-oss-${version}";

     

       41
       45
        
       

     
···

       43
       47
        
       

     

       44
       48
        
         enableParallelBuilding = true;

     

       45
       49
        
       

     

       46
       46
       -
         nativeBuildInputs = [ autoPatchelfHook pkg-config ];

     

       50
       50
       +
         nativeBuildInputs = [

     

       51
       51
       +
           autoPatchelfHook

     

       52
       52
       +
           pkg-config

     

       53
       53
       +
         ];

     

       47
       54
        
       

     

       48
       48
       -
         buildInputs = [ ffmpeg openssl qtbase zlib ];

     

       55
       55
       +
         buildInputs = [

     

       56
       56
       +
           ffmpeg

     

       57
       57
       +
           openssl

     

       58
       58
       +
           qtbase

     

       59
       59
       +
           zlib

     

       60
       60
       +
         ];

     

       49
       61
        
       

     

       50
       62
        
         runtimeDependencies = [ (lib.getLib curl) ];

     

       51
       63
        
       

     

       52
       64
        
         qtWrapperArgs =

     

       53
       65
        
           let

     

       54
       66
        
             binPath = lib.makeBinPath [ jre_headless ];

     

       55
       55
       -
           in lib.optionals withJava [

     

       56
       56
       -
             "--prefix PATH : ${binPath}"

     

       57
       57
       -
           ];

     

       67
       67
       +
           in

     

       68
       68
       +
           lib.optionals withJava [ "--prefix PATH : ${binPath}" ];

     

       58
       69
        
       

     

       59
       70
        
         installPhase = ''

     

       60
       71
        
           runHook preInstall

     
···

       84
       95
        
             expiration date.

     

       85
       96
        
           '';

     

       86
       97
        
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       87
       87
       -
           license = [ licenses.unfree licenses.lgpl21 ];

     

       98
       98
       +
           license = [

     

       99
       99
       +
             licenses.unfree

     

       100
       100
       +
             licenses.lgpl21

     

       101
       101
       +
           ];

     

       88
       102
        
           homepage = "http://makemkv.com";

     

       89
       103
        
           platforms = [ "x86_64-linux" ];

     

       90
       90
       -
           maintainers = with maintainers; [ ];

     

       104
       104
       +
           maintainers = with maintainers; [ jchw ];

     

       91
       105
        
         };

     

       92
       106
        
       }

+2 -2

pkgs/applications/video/obs-studio/plugins/input-overlay.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "obs-input-overlay";

     

       16
       16
       -
         version = "5.0.4";

     

       16
       16
       +
         version = "5.0.5";

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "univrsal";

     

       19
       19
        
           repo = "input-overlay";

     

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

     

       21
       21
       -
           sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ=";

     

       21
       21
       +
           sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o=";

     

       22
       22
        
           fetchSubmodules = true;

     

       23
       23
        
         };

     

       24
       24

+61 -22

pkgs/by-name/dx/dxvk/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenvNoCC

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , pkgsCross

     

       5
       5
       -
       , stdenv

     

       6
       6
       -
       , bash

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenvNoCC,

     

       4
       4
       +
         overrideCC,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         pkgsCross,

     

       7
       7
       +
         bash,

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       9
       -
       stdenvNoCC.mkDerivation (finalAttrs:

     

       10
       10
       +
       stdenvNoCC.mkDerivation (

     

       11
       11
       +
         finalAttrs:

     

       10
       12
        
         let

     

       11
       11
       -
           dxvk32 = if stdenv.isDarwin

     

       12
       12
       -
             then pkgsCross.mingw32.dxvk_1.override { enableMoltenVKCompat = true; }

     

       13
       13
       -
             else pkgsCross.mingw32.dxvk_2;

     

       14
       14
       -
           dxvk64 = if stdenv.isDarwin

     

       15
       15
       -
             then pkgsCross.mingwW64.dxvk_1.override { enableMoltenVKCompat = true; }

     

       16
       16
       -
             else pkgsCross.mingwW64.dxvk_2;

     

       13
       13
       +
           useWin32ThreadModel =

     

       14
       14
       +
             stdenv:

     

       15
       15
       +
             overrideCC stdenv (

     

       16
       16
       +
               stdenv.cc.override (old: {

     

       17
       17
       +
                 cc = old.cc.override {

     

       18
       18
       +
                   threadsCross = {

     

       19
       19
       +
                     model = "win32";

     

       20
       20
       +
                     package = null;

     

       21
       21
       +
                   };

     

       22
       22
       +
                 };

     

       23
       23
       +
               })

     

       24
       24
       +
             );

     

       25
       25
       +
       

     

       26
       26
       +
           mingw32Stdenv = useWin32ThreadModel pkgsCross.mingw32.stdenv;

     

       27
       27
       +
           mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv;

     

       28
       28
       +
       

     

       29
       29
       +
           dxvk32 =

     

       30
       30
       +
             if stdenvNoCC.isDarwin then

     

       31
       31
       +
               pkgsCross.mingw32.dxvk_1.override {

     

       32
       32
       +
                 stdenv = mingw32Stdenv;

     

       33
       33
       +
                 enableMoltenVKCompat = true;

     

       34
       34
       +
               }

     

       35
       35
       +
             else

     

       36
       36
       +
               pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; };

     

       37
       37
       +
       

     

       38
       38
       +
           dxvk64 =

     

       39
       39
       +
             if stdenvNoCC.isDarwin then

     

       40
       40
       +
               pkgsCross.mingwW64.dxvk_1.override {

     

       41
       41
       +
                 stdenv = mingwW64Stdenv;

     

       42
       42
       +
                 enableMoltenVKCompat = true;

     

       43
       43
       +
               }

     

       44
       44
       +
             else

     

       45
       45
       +
               pkgsCross.mingwW64.dxvk_2.override { stdenv = mingwW64Stdenv; };

     

       17
       46
        
         in

     

       18
       47
        
         {

     

       19
       48
        
           pname = "dxvk";

     

       20
       49
        
           inherit (dxvk64) version;

     

       21
       50
        
       

     

       22
       22
       -
           outputs = [ "out" "bin" "lib" ];

     

       51
       51
       +
           outputs = [

     

       52
       52
       +
             "out"

     

       53
       53
       +
             "bin"

     

       54
       54
       +
             "lib"

     

       55
       55
       +
           ];

     

       23
       56
        
       

     

       24
       24
       -
           dontUnpack = true;

     

       25
       25
       -
           dontConfigure = true;

     

       26
       26
       -
           dontBuild = true;

     

       57
       57
       +
           strictDeps = true;

     

       27
       58
        
       

     

       28
       28
       -
           installPhase = ''

     

       59
       59
       +
           buildCommand = ''

     

       29
       60
        
             mkdir -p $out/bin $bin $lib

     

       30
       61
        
             substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \

     

       31
       62
        
               --subst-var-by bash ${bash} \

     

       32
       63
        
               --subst-var-by dxvk32 ${dxvk32} \

     

       33
       64
        
               --subst-var-by dxvk64 ${dxvk64} \

     

       34
       34
       -
               --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \

     

       35
       35
       -
               --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}"

     

       65
       65
       +
               --subst-var-by version ${finalAttrs.version}

     

       36
       66
        
             chmod a+x $out/bin/setup_dxvk.sh

     

       37
       67
        
             declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )

     

       38
       68
        
             for arch in "''${!dxvks[@]}"; do

     
···

       41
       71
        
             done

     

       42
       72
        
           '';

     

       43
       73
        
       

     

       74
       74
       +
           passthru = { inherit dxvk32 dxvk64; };

     

       75
       75
       +
       

     

       76
       76
       +
           __structuredAttrs = true;

     

       77
       77
       +
       

     

       44
       78
        
           meta = {

     

       45
       79
        
             description = "Setup script for DXVK";

     

       46
       80
        
             mainProgram = "setup_dxvk.sh";

     
···

       48
       82
        
             changelog = "https://github.com/doitsujin/dxvk/releases";

     

       49
       83
        
             maintainers = [ lib.maintainers.reckenrode ];

     

       50
       84
        
             license = lib.licenses.zlib;

     

       51
       51
       -
             platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ];

     

       85
       85
       +
             platforms = [

     

       86
       86
       +
               "x86_64-darwin"

     

       87
       87
       +
               "i686-linux"

     

       88
       88
       +
               "x86_64-linux"

     

       89
       89
       +
             ];

     

       52
       90
        
           };

     

       53
       53
       -
         })

     

       91
       91
       +
         }

     

       92
       92
       +
       )

+79 -10

pkgs/by-name/dx/dxvk/setup_dxvk.sh

···

       6
       6
        
       {

     

       7
       7
        
           dxvk32_dir=@dxvk32@/bin

     

       8
       8
        
           dxvk64_dir=@dxvk64@/bin

     

       9
       9
       -
       

     

       10
       10
       -
           mcfgthreads32_dir=@mcfgthreads32@/bin

     

       11
       11
       -
           mcfgthreads64_dir=@mcfgthreads64@/bin

     

       12
       9
        
       }

     

       10
       10
       +
       

     

       13
       11
        
       

     

       14
       12
        
       ## Defaults

     

       15
       13
        
       

     
···

       18
       16
        
           [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll"

     

       19
       17
        
           [d3d11]="dxvk/d3d11.dll"

     

       20
       18
        
           [dxgi]="dxvk/dxgi.dll"

     

       19
       19
       +
       )

     

       20
       20
       +
       

     

       21
       21
       +
       declare -A obsolete_dlls=(

     

       21
       22
        
           [mcfgthreads]="mcfgthreads/mcfgthread-12.dll"

     

       22
       23
        
       )

     

       23
       24
        
       

     

       24
       24
       -
       declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1)

     

       25
       25
       +
       declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1)

     

       26
       26
       +
       

     

       27
       27
       +
       

     

       28
       28
       +
       # Option variables

     

       29
       29
       +
       

     

       30
       30
       +
       do_cleanup=false

     

       31
       31
       +
       ignore_obsolete=false

     

       32
       32
       +
       

     

       33
       33
       +
       do_symlink=false

     

       34
       34
       +
       do_makeprefix=false

     

       35
       35
       +
       

     

       25
       36
        
       

     

       26
       37
        
       ## Command-line Parsing

     

       27
       38
        
       

     
···

       46
       57
        
       }

     

       47
       58
        
       

     

       48
       59
        
       case "${1:-}" in

     

       60
       60
       +
           cleanup)

     

       61
       61
       +
               do_cleanup=true

     

       62
       62
       +
               shift

     

       63
       63
       +
               ;;

     

       49
       64
        
           uninstall|install)

     

       50
       65
        
               action=$1

     

       51
       66
        
               shift

     
···

       61
       76
        
               ;;

     

       62
       77
        
       esac

     

       63
       78
        
       

     

       64
       64
       -
       

     

       65
       65
       -
       do_symlink=false

     

       66
       66
       -
       do_makeprefix=false

     

       67
       67
       -
       

     

       68
       79
        
       while [ -n "${1:-}" ]; do

     

       69
       80
        
           case "$1" in

     

       70
       81
        
               --with-dxgi)

     
···

       100
       111
        
                       usage

     

       101
       112
        
                   fi

     

       102
       113
        
                   ;;

     

       114
       114
       +
               --ignore-obsolete)

     

       115
       115
       +
                   shift

     

       116
       116
       +
                   ignore_obsolete=true

     

       117
       117
       +
                   ;;

     

       103
       118
        
               -h|--help)

     

       104
       119
        
                   usage

     

       105
       120
        
                   ;;

     
···

       110
       125
        
           esac

     

       111
       126
        
           shift

     

       112
       127
        
       done

     

       128
       128
       +
       

     

       113
       129
        
       

     

       114
       130
        
       ## Get information on the Wine environment

     

       115
       131
        
       

     
···

       165
       181
        
         exit 1

     

       166
       182
        
       fi

     

       167
       183
        
       

     

       184
       184
       +
       

     

       168
       185
        
       ## Utility functions

     

       169
       186
        
       

     

       170
       187
        
       install_file() {

     
···

       200
       217
        
       uninstall_file() {

     

       201
       218
        
           srcfile=$1

     

       202
       219
        
           dstfile=$2

     

       220
       220
       +
           args=$3

     

       221
       221
       +
       

     

       222
       222
       +
           if [ "${args}" = "-f" ]; then

     

       223
       223
       +
               rm -v "${dstfile}"

     

       224
       224
       +
               [ -e "${dstfile}.old" ] && rm -v "${dstfile}.old"

     

       225
       225
       +
               return 0

     

       226
       226
       +
           fi

     

       203
       227
        
       

     

       204
       228
        
           if [ -f "${srcfile}.so" ]; then

     

       205
       229
        
               srcfile="${srcfile}.so"

     
···

       239
       263
        
           fi

     

       240
       264
        
       }

     

       241
       265
        
       

     

       266
       266
       +
       print_cleanup_message() {

     

       267
       267
       +
           declare -a obsolete_paths=($@)

     

       268
       268
       +
           if ! $ignore_obsolete && [ -n "${obsolete_paths[@]}" ]; then

     

       269
       269
       +
               fold -w $COLUMNS -s <<MSG >&2

     

       270
       270
       +
       Obsolete DLLs detected at the specified Wine prefix. These DLLs are no longer needed \

     

       271
       271
       +
       or managed by the \`setup_dxvk.sh\` script in nixpkgs. You should remove them manually, \

     

       272
       272
       +
       use the cleanup command, or suppress this message using the \`--ignore-obsolete\` option.

     

       273
       273
       +
       MSG

     

       274
       274
       +
               for obspath in "${obsolete_paths[@]}"; do

     

       275
       275
       +
                   if $do_cleanup; then

     

       276
       276
       +
                       cleanup_file "$obspath"

     

       277
       277
       +
                   else

     

       278
       278
       +
                       echo " - ${obspath}"

     

       279
       279
       +
                   fi

     

       280
       280
       +
               done

     

       281
       281
       +
               ! $do_cleanup && echo

     

       282
       282
       +
           fi

     

       283
       283
       +
       }

     

       284
       284
       +
       

     

       285
       285
       +
       

     

       242
       286
        
       ## Perform the requested command

     

       243
       287
        
       

     

       244
       288
        
       declare -A paths

     
···

       260
       304
        
           done

     

       261
       305
        
       done

     

       262
       306
        
       

     

       263
       263
       -
       for srcpath in "${!paths[@]}"; do

     

       264
       264
       -
           "${action}_file" "$srcpath" "${paths["$srcpath"]}"

     

       307
       307
       +
       declare -A obsolete_paths

     

       308
       308
       +
       

     

       309
       309
       +
       for target in "${!obsolete_dlls[@]}"; do

     

       310
       310
       +
           for dll in ${obsolete_dlls[$target]}; do

     

       311
       311
       +
               dllname=$(basename "$dll")

     

       312
       312
       +
               basedir=$(dirname "$dll")

     

       313
       313
       +
       

     

       314
       314
       +
               if [ -e "${win32_sys_path:-}/$dllname" ]; then

     

       315
       315
       +
                   obsolete_paths["${basedir}32_dir/$dllname"]="${win32_sys_path:-}/$dllname"

     

       316
       316
       +
               fi

     

       317
       317
       +
               if [ -e "${win64_sys_path:-}/$dllname" ]; then

     

       318
       318
       +
                   obsolete_paths["${basedir}64_dir/$dllname"]="${win64_sys_path:-}/$dllname"

     

       319
       319
       +
               fi

     

       320
       320
       +
           done

     

       321
       321
       +
       done

     

       322
       322
       +
       

     

       323
       323
       +
       if $do_cleanup; then

     

       324
       324
       +
           declare -n action_paths=obsolete_paths

     

       325
       325
       +
           action=uninstall

     

       326
       326
       +
           args=-f

     

       327
       327
       +
       else

     

       328
       328
       +
           declare -n action_paths=paths

     

       329
       329
       +
           print_cleanup_message "${obsolete_paths[@]}"

     

       330
       330
       +
       fi

     

       331
       331
       +
       

     

       332
       332
       +
       for srcpath in "${!action_paths[@]}"; do

     

       333
       333
       +
           "${action}_file" "$srcpath" "${action_paths["$srcpath"]}" "${args:-}"

     

       265
       334
        
           "${action}_override" "$(basename "$srcpath" .dll)"

     

       266
       335
        
       done

+37 -23

pkgs/by-name/dx/dxvk_1/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , glslang

     

       5
       5
       -
       , meson

     

       6
       6
       -
       , ninja

     

       7
       7
       -
       , windows

     

       8
       8
       -
       , pkgsBuildHost

     

       9
       9
       -
       , enableMoltenVKCompat ? false

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       6
       6
       +
         glslang,

     

       7
       7
       +
         meson,

     

       8
       8
       +
         ninja,

     

       9
       9
       +
         windows,

     

       10
       10
       +
         enableMoltenVKCompat ? false,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       12
       -
       stdenv.mkDerivation (finalAttrs:  {

     

       13
       13
       +
       stdenv.mkDerivation (finalAttrs: {

     

       13
       14
        
         pname = "dxvk";

     

       14
       15
        
         version = "1.10.3";

     

       15
       16
        
       

     
···

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         # These patches are required when using DXVK with Wine on Darwin.

     

       24
       24
       -
         patches = lib.optionals enableMoltenVKCompat [

     

       25
       25
       -
           # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.

     

       26
       26
       -
           # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.

     

       27
       27
       -
           ./darwin-dxvk-compat.patch

     

       28
       28
       -
           # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.

     

       29
       29
       -
           # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/

     

       30
       30
       -
           ./darwin-thread-primitives.patch

     

       31
       31
       -
         ];

     

       25
       25
       +
         patches =

     

       26
       26
       +
           [

     

       27
       27
       +
             # Fixes errors building with GCC 13.

     

       28
       28
       +
             (fetchpatch {

     

       29
       29
       +
               url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";

     

       30
       30
       +
               hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";

     

       31
       31
       +
             })

     

       32
       32
       +
           ]

     

       33
       33
       +
           ++ lib.optionals enableMoltenVKCompat [

     

       34
       34
       +
             # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.

     

       35
       35
       +
             # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.

     

       36
       36
       +
             ./darwin-dxvk-compat.patch

     

       37
       37
       +
             # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.

     

       38
       38
       +
             # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/

     

       39
       39
       +
             ./darwin-thread-primitives.patch

     

       40
       40
       +
           ];

     

       32
       41
        
       

     

       33
       33
       -
         nativeBuildInputs = [ glslang meson ninja ];

     

       42
       42
       +
         strictDeps = true;

     

       43
       43
       +
       

     

       44
       44
       +
         nativeBuildInputs = [

     

       45
       45
       +
           glslang

     

       46
       46
       +
           meson

     

       47
       47
       +
           ninja

     

       48
       48
       +
         ];

     

       34
       49
        
         buildInputs = [ windows.pthreads ];

     

       35
       50
        
       

     

       36
       36
       -
         mesonFlags = [

     

       37
       37
       -
           "--buildtype" "release"

     

       38
       38
       -
           "--prefix" "${placeholder "out"}"

     

       39
       39
       -
         ];

     

       51
       51
       +
         mesonBuildType = "release";

     

       52
       52
       +
       

     

       53
       53
       +
         __structuredAttrs = true;

     

       40
       54
        
       

     

       41
       55
        
         meta = {

     

       42
       56
        
           description = "A Vulkan-based translation layer for Direct3D 9/10/11";

+36 -24

pkgs/by-name/dx/dxvk_2/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , pkgsBuildHost

     

       5
       5
       -
       , glslang

     

       6
       6
       -
       , meson

     

       7
       7
       -
       , ninja

     

       8
       8
       -
       , windows

     

       9
       9
       -
       , spirv-headers

     

       10
       10
       -
       , vulkan-headers

     

       11
       11
       -
       , SDL2

     

       12
       12
       -
       , glfw

     

       13
       13
       -
       , gitUpdater

     

       14
       14
       -
       , sdl2Support ? true

     

       15
       15
       -
       , glfwSupport ? false

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pkgsBuildHost,

     

       6
       6
       +
         glslang,

     

       7
       7
       +
         meson,

     

       8
       8
       +
         ninja,

     

       9
       9
       +
         windows,

     

       10
       10
       +
         spirv-headers,

     

       11
       11
       +
         vulkan-headers,

     

       12
       12
       +
         SDL2,

     

       13
       13
       +
         glfw,

     

       14
       14
       +
         gitUpdater,

     

       15
       15
       +
         sdl2Support ? true,

     

       16
       16
       +
         glfwSupport ? false,

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       # SDL2 and GLFW support are mutually exclusive.

     
···

       21
       22
        
       let

     

       22
       23
        
         isWindows = stdenv.hostPlatform.uname.system == "Windows";

     

       23
       24
        
       in

     

       24
       24
       -
       stdenv.mkDerivation (finalAttrs:  {

     

       25
       25
       +
       stdenv.mkDerivation (finalAttrs: {

     

       25
       26
        
         pname = "dxvk";

     

       26
       26
       -
         version = "2.3";

     

       27
       27
       +
         version = "2.3.1";

     

       27
       28
        
       

     

       28
       29
        
         src = fetchFromGitHub {

     

       29
       30
        
           owner = "doitsujin";

     

       30
       31
        
           repo = "dxvk";

     

       31
       32
        
           rev = "v${finalAttrs.version}";

     

       32
       32
       -
           hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8=";

     

       33
       33
       +
           hash = "sha256-lUzD1NHFLO4UqOg/BUr7PnYMJCMr1KBh3VNx8etbt8c=";

     

       33
       34
        
           fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info

     

       34
       35
        
         };

     

       35
       36
        
       

     
···

       38
       39
        
             --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"

     

       39
       40
        
         '';

     

       40
       41
        
       

     

       41
       41
       -
         nativeBuildInputs = [ glslang meson ninja ];

     

       42
       42
       -
         buildInputs = [ spirv-headers vulkan-headers ]

     

       42
       42
       +
         strictDeps = true;

     

       43
       43
       +
       

     

       44
       44
       +
         nativeBuildInputs = [

     

       45
       45
       +
           glslang

     

       46
       46
       +
           meson

     

       47
       47
       +
           ninja

     

       48
       48
       +
         ];

     

       49
       49
       +
         buildInputs =

     

       50
       50
       +
           [

     

       51
       51
       +
             spirv-headers

     

       52
       52
       +
             vulkan-headers

     

       53
       53
       +
           ]

     

       43
       54
        
           ++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ]

     

       44
       55
        
           ++ lib.optionals (!isWindows && glfwSupport) [ glfw ]

     

       45
       56
        
           ++ lib.optionals isWindows [ windows.pthreads ];

     
···

       50
       61
        
           mkdir -p include/spirv/include include/vulkan/include

     

       51
       62
        
         '';

     

       52
       63
        
       

     

       53
       53
       -
         mesonFlags = [

     

       54
       54
       -
           "--buildtype" "release"

     

       55
       55
       -
           "--prefix" "${placeholder "out"}"

     

       56
       56
       -
         ] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw";

     

       64
       64
       +
         mesonBuildType = "release";

     

       65
       65
       +
       

     

       66
       66
       +
         mesonFlags = lib.optionals glfwSupport [ "-Ddxvk_native_wsi=glfw" ];

     

       57
       67
        
       

     

       58
       68
        
         doCheck = true;

     

       59
       69
        
       

     

       60
       70
        
         passthru.updateScript = gitUpdater { rev-prefix = "v"; };

     

       71
       71
       +
       

     

       72
       72
       +
         __structuredAttrs = true;

     

       61
       73
        
       

     

       62
       74
        
         meta = {

     

       63
       75
        
           description = "A Vulkan-based translation layer for Direct3D 9/10/11";

+49

pkgs/by-name/pa/parallel-hashmap/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , gtest

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
       +
         pname = "parallel-hashmap";

     

       10
       10
       +
         version = "1.3.12";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "greg7mdp";

     

       14
       14
       +
           repo = "parallel-hashmap";

     

       15
       15
       +
           rev = "refs/tags/v${finalAttrs.version}";

     

       16
       16
       +
           hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         postPatch = ''

     

       20
       20
       +
           # don't download googletest, but build it from source

     

       21
       21
       +
           # https://github.com/greg7mdp/parallel-hashmap/blob/be6a2c79857c9ea76760ca6ce782e1609713428e/CMakeLists.txt#L98

     

       22
       22
       +
           substituteInPlace CMakeLists.txt \

     

       23
       23
       +
             --replace "include(cmake/DownloadGTest.cmake)" "add_subdirectory(${gtest.src} ./googletest-build EXCLUDE_FROM_ALL)"

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           cmake

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         cmakeFlags = [

     

       31
       31
       +
           "-DPHMAP_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"

     

       32
       32
       +
           "-DPHMAP_BUILD_EXAMPLES=OFF"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeCheckInputs = [

     

       36
       36
       +
           gtest

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         doCheck = true;

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "A family of header-only, very fast and memory-friendly hashmap and btree containers";

     

       43
       43
       +
           homepage = "https://github.com/greg7mdp/parallel-hashmap";

     

       44
       44
       +
           changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${finalAttrs.src.rev}";

     

       45
       45
       +
           license = licenses.asl20;

     

       46
       46
       +
           platforms = platforms.unix;

     

       47
       47
       +
           maintainers = with maintainers; [ natsukium ];

     

       48
       48
       +
         };

     

       49
       49
       +
       })

+2 -2

pkgs/by-name/qu/quarkus/package.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
        
         pname = "quarkus-cli";

     

       10
       10
       -
         version = "3.9.4";

     

       10
       10
       +
         version = "3.9.5";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";

     

       14
       14
       -
           hash = "sha256-ez4D+czYDhs/GNrjRF8Bx999JRW0EigMxc39fOH54V8=";

     

       14
       14
       +
           hash = "sha256-3vcuf49gutlXbFT5mUuZw9fDjyvb0Q+lXyn4n+RcLdU=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ makeWrapper ];

+104

pkgs/by-name/ta/taler-exchange/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchgit,

     

       5
       5
       +
         curl,

     

       6
       6
       +
         gnunet,

     

       7
       7
       +
         jansson,

     

       8
       8
       +
         libgcrypt,

     

       9
       9
       +
         libmicrohttpd,

     

       10
       10
       +
         libsodium,

     

       11
       11
       +
         libunistring,

     

       12
       12
       +
         pkg-config,

     

       13
       13
       +
         postgresql,

     

       14
       14
       +
         autoreconfHook,

     

       15
       15
       +
         python3,

     

       16
       16
       +
         recutils,

     

       17
       17
       +
         wget,

     

       18
       18
       +
         jq,

     

       19
       19
       +
         gettext,

     

       20
       20
       +
         texinfo,

     

       21
       21
       +
       }:

     

       22
       22
       +
       

     

       23
       23
       +
       let

     

       24
       24
       +
         version = "0.10.1";

     

       25
       25
       +
       in

     

       26
       26
       +
       stdenv.mkDerivation {

     

       27
       27
       +
         pname = "taler-exchange";

     

       28
       28
       +
         inherit version;

     

       29
       29
       +
       

     

       30
       30
       +
         src = fetchgit {

     

       31
       31
       +
           url = "https://git.taler.net/exchange.git";

     

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

     

       33
       33
       +
           fetchSubmodules = true;

     

       34
       34
       +
           hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg=";

     

       35
       35
       +
       

     

       36
       36
       +
           # When fetching submodules without the .git folder we get the following error:

     

       37
       37
       +
           # "Server does not allow request for unadvertised object"

     

       38
       38
       +
           leaveDotGit = true;

     

       39
       39
       +
           postFetch = ''

     

       40
       40
       +
             rm -rf $out/.git

     

       41
       41
       +
           '';

     

       42
       42
       +
         };

     

       43
       43
       +
       

     

       44
       44
       +
         nativeBuildInputs = [

     

       45
       45
       +
           autoreconfHook

     

       46
       46
       +
           pkg-config

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         buildInputs = [

     

       50
       50
       +
           libgcrypt

     

       51
       51
       +
           libmicrohttpd

     

       52
       52
       +
           jansson

     

       53
       53
       +
           libsodium

     

       54
       54
       +
           postgresql

     

       55
       55
       +
           curl

     

       56
       56
       +
           recutils

     

       57
       57
       +
           gettext

     

       58
       58
       +
           texinfo # Fix 'makeinfo' is missing on your system.

     

       59
       59
       +
           libunistring

     

       60
       60
       +
           python3.pkgs.jinja2

     

       61
       61
       +
           # jq is necessary for some tests and is checked by configure script

     

       62
       62
       +
           jq

     

       63
       63
       +
         ];

     

       64
       64
       +
       

     

       65
       65
       +
         propagatedBuildInputs = [ gnunet ];

     

       66
       66
       +
       

     

       67
       67
       +
         # From ./bootstrap

     

       68
       68
       +
         preAutoreconf = ''

     

       69
       69
       +
           ./contrib/gana-generate.sh

     

       70
       70
       +
           pushd contrib

     

       71
       71
       +
           find wallet-core/aml-backoffice/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext

     

       72
       72
       +
           truncate -s -2 Makefile.am.ext

     

       73
       73
       +
           cat Makefile.am.in Makefile.am.ext >> Makefile.am

     

       74
       74
       +
           popd

     

       75
       75
       +
         '';

     

       76
       76
       +
       

     

       77
       77
       +
         enableParallelBuilding = true;

     

       78
       78
       +
       

     

       79
       79
       +
         doInstallCheck = true;

     

       80
       80
       +
       

     

       81
       81
       +
         nativeCheckInputs = [

     

       82
       82
       +
           wget

     

       83
       83
       +
           curl

     

       84
       84
       +
         ];

     

       85
       85
       +
       

     

       86
       86
       +
         checkTarget = "check";

     

       87
       87
       +
       

     

       88
       88
       +
         meta = with lib; {

     

       89
       89
       +
           description = ''

     

       90
       90
       +
             Taler is an electronic payment system providing the ability to pay

     

       91
       91
       +
             anonymously using digital cash.  Taler consists of a network protocol

     

       92
       92
       +
             definition (using a RESTful API over HTTP), a Exchange (which creates

     

       93
       93
       +
             digital coins), a Wallet (which allows customers to manage, store and

     

       94
       94
       +
             spend digital coins), and a Merchant website which allows customers to

     

       95
       95
       +
             spend their digital coins.  Naturally, each Merchant is different, but

     

       96
       96
       +
             Taler includes code examples to help Merchants integrate Taler as a

     

       97
       97
       +
             payment system.

     

       98
       98
       +
           '';

     

       99
       99
       +
           homepage = "https://taler.net/";

     

       100
       100
       +
           license = licenses.agpl3Plus;

     

       101
       101
       +
           maintainers = with maintainers; [ astro ];

     

       102
       102
       +
           platforms = platforms.linux;

     

       103
       103
       +
         };

     

       104
       104
       +
       }

+88

pkgs/by-name/ta/taler-merchant/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchgit,

     

       5
       5
       +
         gnunet,

     

       6
       6
       +
         qrencode,

     

       7
       7
       +
         taler-exchange,

     

       8
       8
       +
         libtool,

     

       9
       9
       +
         pkg-config,

     

       10
       10
       +
         autoreconfHook,

     

       11
       11
       +
         jq,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       let

     

       15
       15
       +
         version = "0.10.1";

     

       16
       16
       +
       

     

       17
       17
       +
         taler-wallet-core = fetchgit {

     

       18
       18
       +
           url = "https://git.taler.net/wallet-core.git";

     

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

     

       20
       20
       +
           hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY=";

     

       21
       21
       +
         };

     

       22
       22
       +
       in

     

       23
       23
       +
       stdenv.mkDerivation {

     

       24
       24
       +
         pname = "taler-merchant";

     

       25
       25
       +
         inherit version;

     

       26
       26
       +
       

     

       27
       27
       +
         src = fetchgit {

     

       28
       28
       +
           url = "https://git.taler.net/merchant.git";

     

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

     

       30
       30
       +
           fetchSubmodules = true;

     

       31
       31
       +
           hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y=";

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
         postUnpack = ''

     

       35
       35
       +
           ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           pkg-config

     

       40
       40
       +
           autoreconfHook

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         buildInputs = taler-exchange.buildInputs ++ [

     

       44
       44
       +
           qrencode

     

       45
       45
       +
           taler-exchange

     

       46
       46
       +
           # for ltdl.h

     

       47
       47
       +
           libtool

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         propagatedBuildInputs = [ gnunet ];

     

       51
       51
       +
       

     

       52
       52
       +
         # From ./bootstrap

     

       53
       53
       +
         preAutoreconf = ''

     

       54
       54
       +
           pushd contrib

     

       55
       55
       +
           find wallet-core/backoffice/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext

     

       56
       56
       +
           truncate -s -2 Makefile.am.ext

     

       57
       57
       +
           cat Makefile.am.in Makefile.am.ext >> Makefile.am

     

       58
       58
       +
           popd

     

       59
       59
       +
         '';

     

       60
       60
       +
       

     

       61
       61
       +
         configureFlags = [

     

       62
       62
       +
           "--with-gnunet=${gnunet}"

     

       63
       63
       +
           "--with-exchange=${taler-exchange}"

     

       64
       64
       +
         ];

     

       65
       65
       +
       

     

       66
       66
       +
         enableParallelBuilding = true;

     

       67
       67
       +
       

     

       68
       68
       +
         doInstallCheck = true;

     

       69
       69
       +
       

     

       70
       70
       +
         nativeCheckInputs = [ jq ];

     

       71
       71
       +
       

     

       72
       72
       +
         checkTarget = "check";

     

       73
       73
       +
       

     

       74
       74
       +
         meta = with lib; {

     

       75
       75
       +
           description = ''

     

       76
       76
       +
             This is the GNU Taler merchant backend. It provides the logic that should run

     

       77
       77
       +
             at every GNU Taler merchant.  The GNU Taler merchant is a RESTful backend that

     

       78
       78
       +
             can be used to setup orders and process payments.  This component allows

     

       79
       79
       +
             merchants to receive payments without invading the customers' privacy. Of

     

       80
       80
       +
             course, this applies mostly for digital goods, as the merchant does not need

     

       81
       81
       +
             to know the customer's physical address.

     

       82
       82
       +
           '';

     

       83
       83
       +
           homepage = "https://taler.net/";

     

       84
       84
       +
           license = licenses.agpl3Plus;

     

       85
       85
       +
           maintainers = with maintainers; [ astro ];

     

       86
       86
       +
           platforms = platforms.linux;

     

       87
       87
       +
         };

     

       88
       88
       +
       }

+3 -3

pkgs/development/python-modules/fast-histogram/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "fast-histogram";

     

       17
       17
       -
         version = "0.12";

     

       17
       17
       +
         version = "0.14";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.6";

     
···

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "astrofrog";

     

       24
       24
        
           repo = pname;

     

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

     

       26
       26
       -
           sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM=";

     

       25
       25
       +
           rev = "refs/tags/v${version}";

     

       26
       26
       +
           sha256 = "sha256-vIzDDzz6e7PXArHdZdSSgShuTjy3niVdGtXqgmyJl1w=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

+15 -4

pkgs/development/python-modules/opentelemetry-api/default.nix

···

       9
       9
        
       , setuptools

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
        
       , pythonRelaxDepsHook

     

       12
       12
       +
       , writeScript

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       let

     

       15
       16
        
         self = buildPythonPackage rec {

     

       16
       17
        
           pname = "opentelemetry-api";

     

       17
       17
       -
           version = "1.23.0";

     

       18
       18
       +
           version = "1.24.0";

     

       18
       19
        
           pyproject = true;

     

       19
       20
        
       

     

       20
       21
        
           disabled = pythonOlder "3.8";

     
···

       24
       25
        
             owner = "open-telemetry";

     

       25
       26
        
             repo = "opentelemetry-python";

     

       26
       27
        
             rev = "refs/tags/v${version}";

     

       27
       27
       -
             hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA=";

     

       28
       28
       +
             hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs=";

     

       28
       29
        
           };

     

       29
       30
        
       

     

       30
       31
        
           sourceRoot = "${src.name}/opentelemetry-api";

     
···

       55
       56
        
       

     

       56
       57
        
           doCheck = false;

     

       57
       58
        
       

     

       58
       58
       -
           # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.

     

       59
       59
       -
           passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };

     

       59
       59
       +
           passthru = {

     

       60
       60
       +
             updateScript = writeScript "update.sh" ''

     

       61
       61
       +
               #!/usr/bin/env nix-shell

     

       62
       62
       +
               #!nix-shell -i bash -p nix-update

     

       63
       63
       +
       

     

       64
       64
       +
               set -eu -o pipefail

     

       65
       65
       +
               nix-update --version-regex 'v(.*)' python3Packages.opentelemetry-api

     

       66
       66
       +
               nix-update python3Packages.opentelemetry-instrumentation

     

       67
       67
       +
             '';

     

       68
       68
       +
             # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.

     

       69
       69
       +
             tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };

     

       70
       70
       +
           };

     

       60
       71
        
       

     

       61
       72
        
           meta = with lib; {

     

       62
       73
        
             homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api";

+4 -2

pkgs/development/python-modules/opentelemetry-instrumentation/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "opentelemetry-instrumentation";

     

       15
       15
       -
         version = "0.44b0";

     

       15
       15
       +
         version = "0.45b0";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.8";

     
···

       22
       22
        
           owner = "open-telemetry";

     

       23
       23
        
           repo = "opentelemetry-python-contrib";

     

       24
       24
        
           rev = "refs/tags/v${version}";

     

       25
       25
       -
           hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k=";

     

       25
       25
       +
           hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         sourceRoot = "${src.name}/opentelemetry-instrumentation";

     
···

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
        
         pythonImportsCheck = [ "opentelemetry.instrumentation" ];

     

       46
       46
       +
       

     

       47
       47
       +
         passthru.updateScript = opentelemetry-api.updateScript;

     

       46
       48
        
       

     

       47
       49
        
         meta = with lib; {

     

       48
       50
        
           homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";

+2 -2

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

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "optimum";

     

       25
       25
       -
         version = "1.18.1";

     

       25
       25
       +
         version = "1.19.1";

     

       26
       26
        
         format = "setuptools";

     

       27
       27
        
       

     

       28
       28
        
         disabled = pythonOlder "3.7";

     
···

       31
       31
        
           owner = "huggingface";

     

       32
       32
        
           repo = "optimum";

     

       33
       33
        
           rev = "refs/tags/v${version}";

     

       34
       34
       -
           hash = "sha256-Y+KWvpd/ULthCOr18hQjP0REQPcs2Ql2aUi3DIKIOpQ=";

     

       34
       34
       +
           hash = "sha256-EHu3p3M7xBjMnf3tKsneYOZtd9YWsC0qok1fnk4TMAg=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         propagatedBuildInputs = [

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "vitess";

     

       5
       5
       -
         version = "19.0.1";

     

       5
       5
       +
         version = "19.0.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vitessio";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-UDqSCAJObKh65/mDupuWzkYfqJyd6XZCi+qA7NwIO9M=";

     

       11
       11
       +
           hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-YrgWrk+67Vx9L+uFLipyuousj5DQIleqyxbUSqalZyw=";

     

       14
       14
       +
         vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ sqlite ];

     

       17
       17

+3 -3

pkgs/development/tools/hcloud/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "hcloud";

     

       9
       9
       -
         version = "1.43.0";

     

       9
       9
       +
         version = "1.43.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "hetznercloud";

     

       13
       13
        
           repo = "cli";

     

       14
       14
        
           rev = "refs/tags/v${version}";

     

       15
       15
       -
           hash = "sha256-czuMlnVhUDWGVbIZ0V7vaoOnT84WKPFjhcUvt5BzBXo=";

     

       15
       15
       +
           hash = "sha256-XPDaywSCvXc9jo8bNxaF9Pj6Vs+Hz0MxDPbbnRNW3VI=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-0XFgi2cPlsL4zCbttGrEsm0j5ftB8MAuphu3YNlPbIs=";

     

       18
       18
       +
         vendorHash = "sha256-pN+HMsZ2FpxwF/yPfYGwJNj9i4fgnE3cKo3mti3KoR0=";

     

       19
       19
        
       

     

       20
       20
        
         ldflags = [

     

       21
       21
        
           "-s"

+3 -3

pkgs/development/tools/prettierd/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       mkYarnPackage rec {

     

       10
       10
        
         pname = "prettierd";

     

       11
       11
       -
         version = "0.25.1";

     

       11
       11
       +
         version = "0.25.3";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "fsouza";

     

       15
       15
        
           repo = "prettierd";

     

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

     

       17
       17
       -
           hash = "sha256-aoRfZ9SJazz0ir1fyHypn3aYqK9DJOLLVPMuFcOm/20=";

     

       17
       17
       +
           hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         offlineCache = fetchYarnDeps {

     

       21
       21
        
           yarnLock = src + "/yarn.lock";

     

       22
       22
       -
           hash = "sha256-HsWsRIONRNY9akZ2LXlWcPhH6N5qCKnesaDX1gQp+NU=";

     

       22
       22
       +
           hash = "sha256-Ti2b102pzUKB6Xy3LwZ7DlrnW0cRscgNLTUIAKz+6Us=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         packageJSON = ./package.json;

+7 -7

pkgs/development/tools/prettierd/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "@fsouza/prettierd",

     

       3
       3
       -
         "version": "0.25.1",

     

       3
       3
       +
         "version": "0.25.3",

     

       4
       4
        
         "description": "prettier, as a daemon",

     

       5
       5
        
         "bin": {

     

       6
       6
        
           "prettierd": "./bin/prettierd"

     
···

       24
       24
        
         },

     

       25
       25
        
         "homepage": "https://github.com/fsouza/prettierd",

     

       26
       26
        
         "devDependencies": {

     

       27
       27
       -
           "@types/node": "^20.6.3",

     

       27
       27
       +
           "@types/node": "^20.12.7",

     

       28
       28
        
           "@types/prettier": "^3.0.0",

     

       29
       29
       -
           "typescript": "^5.2.2"

     

       29
       29
       +
           "typescript": "^5.4.5"

     

       30
       30
        
         },

     

       31
       31
        
         "dependencies": {

     

       32
       32
       -
           "core_d": "^6.0.0",

     

       33
       33
       -
           "prettier": "^3.0.3"

     

       32
       32
       +
           "core_d": "^6.1.0",

     

       33
       33
       +
           "prettier": "^3.2.5"

     

       34
       34
        
         },

     

       35
       35
        
         "files": [

     

       36
       36
        
           "bin",

     
···

       39
       39
        
           "README.md"

     

       40
       40
        
         ],

     

       41
       41
        
         "optionalDependencies": {

     

       42
       42
       -
           "@babel/parser": "^7.22.16",

     

       43
       43
       -
           "@typescript-eslint/typescript-estree": "^6.7.2"

     

       42
       42
       +
           "@babel/parser": "^7.24.4",

     

       43
       43
       +
           "@typescript-eslint/typescript-estree": "^7.6.0"

     

       44
       44
        
         }

     

       45
       45
        
       }

+3 -3

pkgs/development/tools/protoc-gen-entgrpc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "protoc-gen-entgrpc";

     

       5
       5
       -
         version = "0.4.5";

     

       5
       5
       +
         version = "0.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ent";

     

       9
       9
        
           repo = "contrib";

     

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

     

       11
       11
       -
           sha256 = "sha256-bEJjVNWd4NsUdWPqMZQ86U9F32q5M1iBRcS9MYDp9GE=";

     

       11
       11
       +
           sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y=";

     

       14
       14
       +
         vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];

     

       17
       17

+4 -4

pkgs/tools/networking/zrok/default.nix

···

       14
       14
        
         }.${system} or throwSystem;

     

       15
       15
        
       

     

       16
       16
        
         hash = {

     

       17
       17
       -
           x86_64-linux = "sha256-XzMd2NgMY8AUSjdYDyOEcK3HlZ5hl+L/ulHgy2iDtKg=";

     

       18
       18
       -
           aarch64-linux = "sha256-ypjg73ciUhXIyiNSLzim8AZV0ByU27WRc3PJqTyTllg=";

     

       19
       19
       -
           armv7l-linux = "sha256-VgVn5NsGpvGpkLQRZDphOgeZFQzhR2rVfcwi/EkJ/y4=";

     

       17
       17
       +
           x86_64-linux = "sha256-cg/4BNjL0+Zl8AHJOK/vVutXrz1aLJ+4cHvzcx5iU/8=";

     

       18
       18
       +
           aarch64-linux = "sha256-W+wTOZUYMqqAOrnhrWsnGYfz7FUQ7D/ssoMsZWrhTqw=";

     

       19
       19
       +
           armv7l-linux = "sha256-Sgfrms2prm3VJECKoqb5NaTYkgGHTdfm2mcR+BIPm2U=";

     

       20
       20
        
         }.${system} or throwSystem;

     

       21
       21
        
       in

     

       22
       22
        
       stdenv.mkDerivation (finalAttrs: {

     

       23
       23
        
         pname = "zrok";

     

       24
       24
       -
         version = "0.4.26";

     

       24
       24
       +
         version = "0.4.27";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchzip {

     

       27
       27
        
           url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";

+6 -4

pkgs/tools/package-management/pdm/default.nix

···

       94
       94
        
         '';

     

       95
       95
        
       

     

       96
       96
        
         postInstall = ''

     

       97
       97
       -
           installShellCompletion --cmd pdm \

     

       98
       98
       -
             --bash <($out/bin/pdm completion bash) \

     

       99
       99
       -
             --fish <($out/bin/pdm completion fish) \

     

       100
       100
       -
             --zsh <($out/bin/pdm completion zsh)

     

       97
       97
       +
           export PDM_LOG_DIR=/tmp/pdm/log

     

       98
       98
       +
           $out/bin/pdm completion bash >pdm.bash

     

       99
       99
       +
           $out/bin/pdm completion fish >pdm.fish

     

       100
       100
       +
           $out/bin/pdm completion zsh >pdm.zsh

     

       101
       101
       +
           installShellCompletion pdm.{bash,fish,zsh}

     

       102
       102
       +
           unset PDM_LOG_DIR

     

       101
       103
        
         '';

     

       102
       104
        
       

     

       103
       105
        
         nativeCheckInputs = [

+3 -3

pkgs/tools/security/cdxgen/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildNpmPackage rec {

     

       7
       7
        
         pname = "cdxgen";

     

       8
       8
       -
         version = "10.3.5";

     

       8
       8
       +
         version = "10.4.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "AppThreat";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-Tpmx94pQq7lqDvTtPY0chwcwAMmydkFFv2IlXb+q8EU=";

     

       14
       14
       +
           sha256 = "sha256-m6AtAbsZ7zPu7MlwEt9+RBs11DAHNa3x0Nn7b3TWdAY=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         npmDepsHash = "sha256-V7eLhscu7gTLtfq0OI3yCfT5Xlkbj54WrgOM6WUArTU=";

     

       17
       17
       +
         npmDepsHash = "sha256-z7tBghs2bg2eYNRkhe9J8/0rqaAXV5e5ZT9u5fdABe0=";

     

       18
       18
        
       

     

       19
       19
        
         dontNpmBuild = true;

     

       20
       20

+3 -3

pkgs/tools/security/grype/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "grype";

     

       12
       12
       -
         version = "0.77.0";

     

       12
       12
       +
         version = "0.77.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "anchore";

     

       16
       16
        
           repo = "grype";

     

       17
       17
        
           rev = "refs/tags/v${version}";

     

       18
       18
       -
           hash = "sha256-EnAMAmoP8rbkOkdPPxkN14lOPVYPqVpmaekfXBboeyI=";

     

       18
       18
       +
           hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI=";

     

       19
       19
        
           # populate values that require us to use git. By doing this in postFetch we

     

       20
       20
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       21
       21
        
           leaveDotGit = true;

     
···

       30
       30
        
       

     

       31
       31
        
         proxyVendor = true;

     

       32
       32
        
       

     

       33
       33
       -
         vendorHash = "sha256-oJNTvbfVkz4fK+EsF2ZoFfBSlkt0pFT4r2QDyhZhv5Y=";

     

       33
       33
       +
         vendorHash = "sha256-lAq1PRElWR0F+OfuSBpR/gnFOptFH33ObR8yd1k7oMk=";

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [ installShellFiles ];

     

       36
       36

+2 -2

pkgs/tools/security/pinentry-bemenu/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "pinentry-bemenu";

     

       6
       6
       -
         version = "0.13.1";

     

       6
       6
       +
         version = "0.13.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "t-8ch";

     

       10
       10
        
           repo = pname;

     

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

     

       12
       12
       -
           sha256 = "sha256-h+PC8IGwCW5ZroLGpypcmpejOo+JGM7zG4N5fguBWvM=";

     

       12
       12
       +
           sha256 = "sha256-m6P8/cCdGH2c9ne8aLrh6pUJ6Ekn+CNyEn3WlD2LhU8=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ meson ninja pkg-config ];

+20 -17

pkgs/tools/security/step-ca/default.nix

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , lib

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , buildGoModule

     

       5
       5
       -
       , coreutils

     

       6
       6
       -
       , pcsclite

     

       7
       7
       -
       , PCSC

     

       8
       8
       -
       , pkg-config

     

       9
       9
       -
       , hsmSupport ? true

     

       10
       10
       -
       , nixosTests

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         buildGoModule,

     

       6
       6
       +
         coreutils,

     

       7
       7
       +
         pcsclite,

     

       8
       8
       +
         PCSC,

     

       9
       9
       +
         pkg-config,

     

       10
       10
       +
         hsmSupport ? true,

     

       11
       11
       +
         nixosTests,

     

       11
       12
        
       }:

     

       12
       13
        
       

     

       13
       14
        
       buildGoModule rec {

     

       14
       15
        
         pname = "step-ca";

     

       15
       15
       -
         version = "0.25.2";

     

       16
       16
       +
         version = "0.26.1";

     

       16
       17
        
       

     

       17
       18
        
         src = fetchFromGitHub {

     

       18
       19
        
           owner = "smallstep";

     

       19
       20
        
           repo = "certificates";

     

       20
       21
        
           rev = "refs/tags/v${version}";

     

       21
       21
       -
           hash = "sha256-cP3QypBNWGbr7R7lJLfaoBh6C37ubGuaxnxWlZ1Z000=";

     

       22
       22
       +
           hash = "sha256-yej7gzhaUPbcvqbse7Hh7Im38+DUfC9UZkpjpuG8ctk=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       24
       -
         vendorHash = "sha256-AXMMpzXEhdKSGeVg/KK2NEgalxIXP6DUTcoxOQVqow4=";

     

       25
       25
       +
         vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4=";

     

       25
       26
        
       

     

       26
       26
       -
         nativeBuildInputs = lib.optionals hsmSupport [

     

       27
       27
       -
           pkg-config

     

       28
       28
       -
         ];

     

       27
       27
       +
         nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];

     

       29
       28
        
       

     

       30
       29
        
         buildInputs =

     

       31
       30
        
           lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ]

     
···

       62
       61
        
           homepage = "https://smallstep.com/certificates/";

     

       63
       62
        
           changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}";

     

       64
       63
        
           license = licenses.asl20;

     

       65
       65
       -
           maintainers = with maintainers; [ cmcdragonkai mohe2015 techknowlogick ];

     

       64
       64
       +
           maintainers = with maintainers; [

     

       65
       65
       +
             cmcdragonkai

     

       66
       66
       +
             mohe2015

     

       67
       67
       +
             techknowlogick

     

       68
       68
       +
           ];

     

       66
       69
        
         };

     

       67
       70
        
       }

+2 -2

pkgs/tools/video/xjadeo/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "xjadeo";

     

       6
       6
       -
         version = "0.8.13";

     

       6
       6
       +
         version = "0.8.14";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "x42";

     

       10
       10
        
           repo = "xjadeo";

     

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

     

       12
       12
       -
           sha256 = "sha256-CSq11hFNmo41VXOndBoPxRc9NNUUBtzfWx14DCUFieQ=";

     

       12
       12
       +
           sha256 = "sha256-GTg0W3D0BRSxsmeVsB4On3MfwncScEGFJGVJK7wflCM=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

+1 -4

pkgs/top-level/all-packages.nix

···

       13513
       13513
        
       

     

       13514
       13514
        
         tailer = callPackage ../tools/misc/tailer { };

     

       13515
       13515
        
       

     

       13516
       13516
       -
         inherit (callPackages ../applications/networking/taler { })

     

       13517
       13517
       -
           taler-exchange taler-merchant;

     

       13518
       13518
       -
       

     

       13519
       13516
        
         tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { };

     

       13520
       13517
        
       

     

       13521
       13518
        
         tango = callPackage ../applications/misc/tango { };

     
···

       32308
       32305
        
         kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; };

     

       32309
       32306
        
         kid3 = kid3-kde;

     

       32310
       32307
        
       

     

       32311
       32311
       -
         kile = libsForQt5.callPackage ../applications/editors/kile { };

     

       32308
       32308
       +
         kile = callPackage ../applications/editors/kile { };

     

       32312
       32309
        
       

     

       32313
       32310
        
         kitsas = libsForQt5.callPackage ../applications/office/kitsas { };

     

       32314
       32311