colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-02-20 06:01:15 +00:00 committed by GitHub
commit ba5eeff4f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
59 changed files with 2230 additions and 2074 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
doc/languages-frameworks/python.section.md
View File

@ -116,11 +116,11 @@ buildPythonPackage rec {
rm testing/test_argcomplete.py rm testing/test_argcomplete.py
''; '';
nativeBuildInputs = [ build-system = [
setuptools-scm setuptools-scm
]; ];
propagatedBuildInputs = [ dependencies = [
attrs attrs
py py
setuptools setuptools
@ -172,7 +172,7 @@ following are specific to `buildPythonPackage`:
variable in wrapped programs. variable in wrapped programs.
* `pyproject`: Whether the pyproject format should be used. When set to `true`, * `pyproject`: Whether the pyproject format should be used. When set to `true`,
`pypaBuildHook` will be used, and you can add the required build dependencies `pypaBuildHook` will be used, and you can add the required build dependencies
from `build-system.requires` to `nativeBuildInputs`. Note that the pyproject from `build-system.requires` to `build-system`. Note that the pyproject
format falls back to using `setuptools`, so you can use `pyproject = true` format falls back to using `setuptools`, so you can use `pyproject = true`
even if the package only has a `setup.py`. When set to `false`, you can even if the package only has a `setup.py`. When set to `false`, you can
use the existing [hooks](#setup-hooks0 or provide your own logic to build the use the existing [hooks](#setup-hooks0 or provide your own logic to build the
@ -206,17 +206,22 @@ build inputs (see "Specifying dependencies"). The following are of special
interest for Python packages, either because these are primarily used, or interest for Python packages, either because these are primarily used, or
because their behaviour is different: because their behaviour is different:
* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables * `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables.
as well as the items listed in `setup_requires`. * `build-system ? []`: Build-time only Python dependencies. Items listed in `build-system.requires`/`setup_requires`.
* `buildInputs ? []`: Build and/or run-time dependencies that need to be * `buildInputs ? []`: Build and/or run-time dependencies that need to be
compiled for the host machine. Typically non-Python libraries which are being compiled for the host machine. Typically non-Python libraries which are being
linked. linked.
* `nativeCheckInputs ? []`: Dependencies needed for running the [`checkPhase`](#ssec-check-phase). These * `nativeCheckInputs ? []`: Dependencies needed for running the [`checkPhase`](#ssec-check-phase). These
are added to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) when [`doCheck = true`](#var-stdenv-doCheck). Items listed in are added to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) when [`doCheck = true`](#var-stdenv-doCheck). Items listed in
`tests_require` go here. `tests_require` go here.
* `propagatedBuildInputs ? []`: Aside from propagating dependencies, * `dependencies ? []`: Aside from propagating dependencies,
`buildPythonPackage` also injects code into and wraps executables with the `buildPythonPackage` also injects code into and wraps executables with the
paths included in this list. Items listed in `install_requires` go here. paths included in this list. Items listed in `install_requires` go here.
* `optional-dependencies ? { }`: Optional feature flagged dependencies. Items listed in `extras_requires` go here.
Aside from propagating dependencies,
`buildPythonPackage` also injects code into and wraps executables with the
paths included in this list. Items listed in `extras_requires` go here.
##### Overriding Python packages {#overriding-python-packages} ##### Overriding Python packages {#overriding-python-packages}
@ -299,11 +304,12 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw=";
}; };
nativeBuildInputs = with python3Packages; [ build-system = with python3Packages; [
setuptools setuptools
wheel
]; ];
propagatedBuildInputs = with python3Packages; [ dependencies = with python3Packages; [
tornado tornado
python-daemon python-daemon
]; ];
@ -462,11 +468,11 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function).
- `eggBuildHook` to skip building for eggs. - `eggBuildHook` to skip building for eggs.
- `eggInstallHook` to install eggs. - `eggInstallHook` to install eggs.
- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system
(e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. (e.g. `setuptools` or `flit`) should still be added as `build-system`.
- `pypaBuildHook` to build a wheel using - `pypaBuildHook` to build a wheel using
[`pypa/build`](https://pypa-build.readthedocs.io/en/latest/index.html) and [`pypa/build`](https://pypa-build.readthedocs.io/en/latest/index.html) and
PEP 517/518. Note a build system (e.g. `setuptools` or `flit`) should still PEP 517/518. Note a build system (e.g. `setuptools` or `flit`) should still
be added as `nativeBuildInput`. be added as `build-system`.
- `pipInstallHook` to install wheels. - `pipInstallHook` to install wheels.
- `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). - `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook).
- `pythonCatchConflictsHook` to fail if the package depends on two different versions of the same dependency. - `pythonCatchConflictsHook` to fail if the package depends on two different versions of the same dependency.
@ -881,7 +887,7 @@ buildPythonPackage rec {
hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
wheel wheel
]; ];
@ -941,7 +947,7 @@ with import <nixpkgs> {};
hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
}; };
nativeBuildInputs = [ build-system = [
python311.pkgs.setuptools python311.pkgs.setuptools
python311.pkgs.wheel python311.pkgs.wheel
]; ];
@ -977,13 +983,15 @@ that we introduced with the `let` expression.
#### Handling dependencies {#handling-dependencies} #### Handling dependencies {#handling-dependencies}
Our example, `toolz`, does not have any dependencies on other Python packages or Our example, `toolz`, does not have any dependencies on other Python packages or system libraries.
system libraries. According to the manual, [`buildPythonPackage`](#buildpythonpackage-function) uses the [`buildPythonPackage`](#buildpythonpackage-function) uses the the following arguments in the following circumstances:
arguments [`buildInputs`](#var-stdenv-buildInputs) and [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs) to specify dependencies. If
something is exclusively a build-time dependency, then the dependency should be - `dependencies` - For Python runtime dependencies.
included in [`buildInputs`](#var-stdenv-buildInputs), but if it is (also) a runtime dependency, then it - `build-system` - For Python build-time requirements.
should be added to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). Test dependencies are considered - [`buildInputs`](#var-stdenv-buildInputs) - For non-Python build-time requirements.
build-time dependencies and passed to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs). - [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) - For test dependencies
Dependencies can belong to multiple arguments, for example if something is both a build time requirement & a runtime dependency.
The following example shows which arguments are given to [`buildPythonPackage`](#buildpythonpackage-function) in The following example shows which arguments are given to [`buildPythonPackage`](#buildpythonpackage-function) in
order to build [`datashape`](https://github.com/blaze/datashape). order to build [`datashape`](https://github.com/blaze/datashape).
@ -1013,12 +1021,12 @@ buildPythonPackage rec {
hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
wheel wheel
]; ];
propagatedBuildInputs = [ dependencies = [
multipledispatch multipledispatch
numpy numpy
python-dateutil python-dateutil
@ -1041,7 +1049,7 @@ buildPythonPackage rec {
We can see several runtime dependencies, `numpy`, `multipledispatch`, and We can see several runtime dependencies, `numpy`, `multipledispatch`, and
`python-dateutil`. Furthermore, we have [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) with `pytest`. `python-dateutil`. Furthermore, we have [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) with `pytest`.
`pytest` is a test runner and is only used during the [`checkPhase`](#ssec-check-phase) and is `pytest` is a test runner and is only used during the [`checkPhase`](#ssec-check-phase) and is
therefore not added to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). therefore not added to `dependencies`.
In the previous case we had only dependencies on other Python packages to consider. In the previous case we had only dependencies on other Python packages to consider.
Occasionally you have also system libraries to consider. E.g., `lxml` provides Occasionally you have also system libraries to consider. E.g., `lxml` provides
@ -1068,7 +1076,7 @@ buildPythonPackage rec {
hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk="; hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
wheel wheel
]; ];
@ -1125,7 +1133,7 @@ buildPythonPackage rec {
hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ="; hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
wheel wheel
]; ];
@ -1136,7 +1144,7 @@ buildPythonPackage rec {
fftwLongDouble fftwLongDouble
]; ];
propagatedBuildInputs = [ dependencies = [
numpy numpy
scipy scipy
]; ];
@ -1459,9 +1467,7 @@ mode is activated.
In the following example, we create a simple environment that has a Python 3.11 In the following example, we create a simple environment that has a Python 3.11
version of our package in it, as well as its dependencies and other packages we version of our package in it, as well as its dependencies and other packages we
like to have in the environment, all specified with [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). like to have in the environment, all specified with `dependencies`.
Indeed, we can just add any package we like to have in our environment to
[`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs).
```nix ```nix
with import <nixpkgs> {}; with import <nixpkgs> {};
@ -1470,9 +1476,11 @@ with python311Packages;
buildPythonPackage rec { buildPythonPackage rec {
name = "mypackage"; name = "mypackage";
src = ./path/to/package/source; src = ./path/to/package/source;
propagatedBuildInputs = [ dependencies = [
pytest pytest
numpy numpy
];
propagatedBuildInputs = [
pkgs.libsndfile pkgs.libsndfile
]; ];
} }
@ -1519,7 +1527,7 @@ buildPythonPackage rec {
hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
wheel wheel
]; ];
@ -1903,8 +1911,8 @@ configure alternatives](#sec-overlays-alternatives-blas-lapack)".
In a `setup.py` or `setup.cfg` it is common to declare dependencies: In a `setup.py` or `setup.cfg` it is common to declare dependencies:
* `setup_requires` corresponds to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) * `setup_requires` corresponds to `build-system`
* `install_requires` corresponds to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs) * `install_requires` corresponds to `dependencies`
* `tests_require` corresponds to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) * `tests_require` corresponds to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs)
### How to enable interpreter optimizations? {#optimizations} ### How to enable interpreter optimizations? {#optimizations}
@ -1928,12 +1936,10 @@ in mypython
Some packages define optional dependencies for additional features. With Some packages define optional dependencies for additional features. With
`setuptools` this is called `extras_require` and `flit` calls it `setuptools` this is called `extras_require` and `flit` calls it
`extras-require`, while PEP 621 calls these `optional-dependencies`. A `extras-require`, while PEP 621 calls these `optional-dependencies`.
method for supporting this is by declaring the extras of a package in its
`passthru`, e.g. in case of the package `dask`
```nix ```nix
passthru.optional-dependencies = { optional-dependencies = {
complete = [ distributed ]; complete = [ distributed ];
}; };
``` ```
@ -1941,11 +1947,13 @@ passthru.optional-dependencies = {
and letting the package requiring the extra add the list to its dependencies and letting the package requiring the extra add the list to its dependencies
```nix ```nix
propagatedBuildInputs = [ dependencies = [
... ...
] ++ dask.optional-dependencies.complete; ] ++ dask.optional-dependencies.complete;
``` ```
This method is using `passthru`, meaning that changing `optional-dependencies` of a package won't cause it to rebuild.
Note this method is preferred over adding parameters to builders, as that can Note this method is preferred over adding parameters to builders, as that can
result in packages depending on different variants and thereby causing result in packages depending on different variants and thereby causing
collisions. collisions.

10
nixos/modules/services/x11/desktop-managers/budgie.nix
View File

@ -39,6 +39,10 @@ let
''; '';
destination = "/share/gnome-background-properties/nixos.xml"; destination = "/share/gnome-background-properties/nixos.xml";
}; };
budgie-control-center = pkgs.budgie.budgie-control-center.override {
enableSshSocket = config.services.openssh.startWhenNeeded;
};
in { in {
options = { options = {
services.xserver.desktopManager.budgie = { services.xserver.desktopManager.budgie = {
@ -114,7 +118,7 @@ in {
[ [
# Budgie Desktop. # Budgie Desktop.
budgie.budgie-backgrounds budgie.budgie-backgrounds
budgie.budgie-control-center budgie-control-center
(budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
budgie.budgie-desktop-view budgie.budgie-desktop-view
budgie.budgie-screensaver budgie.budgie-screensaver
@ -233,8 +237,8 @@ in {
services.gvfs.enable = mkDefault true; services.gvfs.enable = mkDefault true;
# Register packages for DBus. # Register packages for DBus.
services.dbus.packages = with pkgs; [ services.dbus.packages = [
budgie.budgie-control-center budgie-control-center
]; ];
# Register packages for udev. # Register packages for udev.

3
nixos/modules/system/etc/build-composefs-dump.py
View File

@ -199,7 +199,8 @@ def main() -> None:
size=os.stat(source).st_size, size=os.stat(source).st_size,
filetype=FileType.file, filetype=FileType.file,
mode=mode, mode=mode,
payload=target, # payload needs to be relative path in this case
payload=target.lstrip("/"),
) )
paths[target] = composefs_path paths[target] = composefs_path
add_leading_directories(target, attrs, paths) add_leading_directories(target, attrs, paths)

16
pkgs/applications/blockchains/clboss/default.nix
View File

@ -1,6 +1,8 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchFromGitHub
, autoconf-archive
, autoreconfHook
, pkg-config , pkg-config
, curlWithGnuTls , curlWithGnuTls
, libev , libev
@ -9,14 +11,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clboss"; pname = "clboss";
version = "0.12"; version = "0.13";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/ZmnSCPxj/clboss/releases/download/${version}/clboss-${version}.tar.gz"; owner = "ZmnSCPxj";
hash = "sha256-UZcSfbpp3vPsD3CDukp+r5Z60h0UEWTduqF4DhJ+H2U="; repo = "clboss";
rev = "v${version}";
hash = "sha256-NP9blymdqDXo/OtGLQg/MXK24PpPvCrzqXRdtfCvpfI=";
}; };
nativeBuildInputs = [ pkg-config libev curlWithGnuTls sqlite ]; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ];
enableParallelBuilding = true; enableParallelBuilding = true;

15
pkgs/applications/blockchains/nano-wallet/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL { lib, stdenv, fetchFromGitHub
, fetchpatch
, cmake, pkg-config, wrapQtAppsHook, boost, libGL
, qtbase, python3 }: , qtbase, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,6 +16,17 @@ stdenv.mkDerivation rec {
hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE="; hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE=";
}; };
patches = [
# Fix gcc-13 build failure due to missing <cstdint> includes.
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1.patch";
stripLen = 1;
extraPrefix = "submodules/rocksdb/";
hash = "sha256-HhlIYyPzIZFuyzHTUPz3bXgXiaFSQ8pVrLLMzegjTgE=";
})
];
cmakeFlags = let cmakeFlags = let
options = { options = {
PYTHON_EXECUTABLE = "${python3.interpreter}"; PYTHON_EXECUTABLE = "${python3.interpreter}";

6
pkgs/applications/editors/gedit/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gedit"; pname = "gedit";
version = "46.1"; version = "46.2";
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
sha256 = "oabjfwQXZd/3InofVXi29J+q8Bax4X6GnK9b+5TGqk4="; sha256 = "wIZkErrRR+us4tKC/8u1oOmjBLIP1VZAvuIcgebVAe8=";
}; };
patches = [ patches = [
@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
}; };
meta = with lib; { meta = with lib; {
homepage = "https://wiki.gnome.org/Apps/Gedit"; homepage = "https://gedit-technology.github.io/apps/gedit/";
description = "Former GNOME text editor"; description = "Former GNOME text editor";
maintainers = with maintainers; [ bobby285271 ]; maintainers = with maintainers; [ bobby285271 ];
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

4
pkgs/applications/graphics/mandelbulber/default.nix
View File

@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
mkDerivation rec { mkDerivation rec {
pname = "mandelbulber"; pname = "mandelbulber";
version = "2.31"; version = "2.31-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "buddhi1980"; owner = "buddhi1980";
repo = "mandelbulber2"; repo = "mandelbulber2";
rev = version; rev = version;
sha256 = "sha256-r3IuOdtBSrTK/pDChgq/M3yQkSz2R+FG6kvwjYPjR4A="; sha256 = "sha256-nyIFvFe86C2ciBDSNWn1yrBYTCm1dR7sZ5RFGoTPqvQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/applications/graphics/shotwell/default.nix
View File

@ -11,7 +11,6 @@
, libxml2 , libxml2
, vala , vala
, sqlite , sqlite
, webkitgtk_4_1
, pkg-config , pkg-config
, gnome , gnome
, gst_all_1 , gst_all_1
@ -40,11 +39,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "shotwell"; pname = "shotwell";
version = "0.32.4"; version = "0.32.6";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
sha256 = "sha256-3iqUUIRtHOwUxqEDA3X9SeGvJNySCtZIA0QST5zLhW8="; sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -67,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
libsoup_3 libsoup_3
libxml2 libxml2
sqlite sqlite
webkitgtk_4_1
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-libav gst_all_1.gst-libav
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base

4
pkgs/applications/networking/asn/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "asn"; pname = "asn";
version = "0.75.2"; version = "0.75.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nitefood"; owner = "nitefood";
repo = "asn"; repo = "asn";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-G8TDl9R5nbUzmjcr1m+eNNybSDqb64c7ZOO/viL5/Q4="; hash = "sha256-KOwXOGw6gv8YFTrFFkD6BNKChTIbD2Soy3gvvSzNQgM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

818
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -108,7 +108,7 @@ stdenv.mkDerivation {
updateScript = import ./update.nix { updateScript = import ./update.nix {
inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl = baseUrl =
if channel == "devedition" if channel == "developer-edition"
then "https://archive.mozilla.org/pub/devedition/releases/" then "https://archive.mozilla.org/pub/devedition/releases/"
else "https://archive.mozilla.org/pub/firefox/releases/"; else "https://archive.mozilla.org/pub/firefox/releases/";
}; };

1015
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

1025
pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix Normal file
View File

File diff suppressed because it is too large Load Diff

818
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

16
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -3,10 +3,10 @@
{ {
firefox = buildMozillaMach rec { firefox = buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "122.0.1"; version = "123.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1d4fe1ed351edd748ede2ef6448798a32de9ed7a075a54a7ed5f7baa7b0c4c7f932c2e29f443c9066829e39f22a1dc94be5d00cc994193e949b72aa4a1c8ba41"; sha512 = "a19567a13e1b663e538c4af17491146adad1f0ab977995e8da9ce9ed428008ad20902dee4efb82d54e1319a0e31768609696bc822563d75732b622760129d8bb";
}; };
extraPatches = [ extraPatches = [
@ -33,11 +33,11 @@
firefox-beta = buildMozillaMach rec { firefox-beta = buildMozillaMach rec {
pname = "firefox-beta"; pname = "firefox-beta";
version = "121.0b9"; version = "123.0b9";
applicationName = "Mozilla Firefox Beta"; applicationName = "Mozilla Firefox Beta";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "a107ba7127f40763325335136c5aeaf6d873dd9ca1c8ca95d93e96b377b41a0974056c84e8323c51ed57e01a2e4ef9996ef2ee2d804053aa2226bd837026523a"; sha512 = "87c564bf30e93a544fe65cf5eb0d46e2e992558df36d2808eee990772648c193ab051120a3400dacd6973dde8afbec9bea0f3b0b4adc923a5fea6f4005b46210";
}; };
meta = { meta = {
@ -62,13 +62,13 @@
firefox-devedition = buildMozillaMach rec { firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition"; pname = "firefox-devedition";
version = "121.0b9"; version = "123.0b9";
applicationName = "Mozilla Firefox Developer Edition"; applicationName = "Mozilla Firefox Developer Edition";
requireSigning = false; requireSigning = false;
branding = "browser/branding/aurora"; branding = "browser/branding/aurora";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "732c2b3f1e47512bee9af696e8763ce13b39497a6ec9af0de9904ce4f55b03bc799e628e17e84ce7062ebd5a7dc50290fbbfa17b0f41622ce5088f1d548897b5"; sha512 = "63b3e99fab51a219c537baef4f613c1efd174d8c567d7e77007b901d0800b88cfe872b56293473e5406aef15a5c6ab35b9ddf9966a447c001ca16e92469d984f";
}; };
meta = { meta = {
@ -94,11 +94,11 @@
firefox-esr-115 = buildMozillaMach rec { firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115"; pname = "firefox-esr-115";
version = "115.7.0esr"; version = "115.8.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d468d8ef117d76e0660c5359c3becf0502354c61bdaaeb4137d86f52b50143abec2ac4578af69afa5670700b57efff1c7323ca23e3339a9eaaa888dee7e8e922"; sha512 = "4b8c06b5eb3617700a72aaad8831d703a537fe600740f1acb8377bd0ce198a199938603fd7e6b2007671a578dfb24aa8f5c031c6c1ccf15d4a34562679eaa883";
}; };
meta = { meta = {

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20240210-1"; version = "20240219-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-3HBycPKj3dosI6vPhIMM5CZQ9r/ndoQrW5FT3eEuHF0="; hash = "sha256-gzc72y9AL/JUNp8YJkRKq9rq1NenX+4aOxb5HODy8v4=";
}; };
postPatch = '' postPatch = ''

4
pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "obs-move-transition"; pname = "obs-move-transition";
version = "2.9.8"; version = "2.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exeldro"; owner = "exeldro";
repo = "obs-move-transition"; repo = "obs-move-transition";
rev = version; rev = version;
sha256 = "sha256-GOLmwXAK2g8IyI+DFH2sBOR2iknYdgYevytZpt3Cc7Q="; sha256 = "sha256-HMhIGOslAtk5npunRZkOcFQZDSIB7c8qcFW3l9kgkzo=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hyprshade"; pname = "hyprshade";
version = "0.12.1"; version = "3.0.2";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "loqusion"; owner = "loqusion";
repo = "hyprshade"; repo = "hyprshade";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-xcFX1YApwEN40jPgRT0H/7SiODxXGYVTPUkSZ8OFIWs="; hash = "sha256-E5FNVzmzxzqhIZ4i8PwiKB8q4LwpsV961Bc77kSym8A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/by-name/au/authentik/package.nix
View File

@ -118,6 +118,8 @@ let
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace-fail 'dumb-init = "*"' "" \ --replace-fail 'dumb-init = "*"' "" \
--replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2' --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2'
substituteInPlace authentik/stages/email/utils.py \
--replace-fail 'web/' '${webui}/'
''; '';
nativeBuildInputs = [ prev.poetry-core ]; nativeBuildInputs = [ prev.poetry-core ];

5
pkgs/by-name/co/cosmic-session/package.nix
View File

@ -51,11 +51,10 @@ rustPlatform.buildRustPackage rec {
"--set" "--set"
"prefix" "prefix"
(placeholder "out") (placeholder "out")
"--set"
"xdp_cosmic"
xdg-desktop-portal-cosmic
]; ];
env.XDP_COSMIC = lib.getExe xdg-desktop-portal-cosmic;
passthru.providedSessions = [ "cosmic" ]; passthru.providedSessions = [ "cosmic" ];
meta = with lib; { meta = with lib; {

6
pkgs/by-name/fi/files-cli/package.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "files-cli"; pname = "files-cli";
version = "2.12.36"; version = "2.12.37";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "files-cli"; repo = "files-cli";
owner = "files-com"; owner = "files-com";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-tWOC2QDu72dETTFXG9JmOlm/xBWehTH2FUStegyYu2g="; hash = "sha256-2vXztx294fOAZ1Vp0z4sGfoUYZch9aZffyz/Z9vzEnQ=";
}; };
vendorHash = "sha256-rNftWnIbUruUOPrfCso8uu2Z4CAL43RxjoTVMpNkD3U="; vendorHash = "sha256-AEBpt8qg6UvHlx4iS8fXCdzQ0GgEf2ALKR00ThqXctc=";
ldflags = [ ldflags = [
"-s" "-s"

37
pkgs/by-name/gp/gptscript/package.nix Normal file
View File

@ -0,0 +1,37 @@
{
lib,
buildGo122Module,
fetchFromGitHub,
}:
buildGo122Module rec {
pname = "gptscript";
version = "0.1.1";
src = fetchFromGitHub {
owner = "gptscript-ai";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-zG75L10WvfkmjwW3ifBHaTkHNXqXvNO0PaXejCc2tls=";
};
vendorHash = "sha256-LV9uLLwdtLJTIxaBB1Jew92S0QjQsceyLEfSrDeDnR4=";
ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
"-X main.Commit=${version}"
];
# Requires network access
doCheck = false;
meta = with lib; {
homepage = "https://gptscript.ai";
changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}";
description = "Natural Language Programming";
license = with licenses; [asl20];
maintainers = with maintainers; [jamiemagee];
mainProgram = "gptscript";
};
}

4
pkgs/by-name/lu/lunar-client/package.nix
View File

@ -6,11 +6,11 @@
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
pname = "lunar-client"; pname = "lunar-client";
version = "3.2.1"; version = "3.2.3";
src = fetchurl { src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
hash = "sha512-ZW+SFIZ5+xxgesaZ7ZQbUnv7H5U92SZdfAU7GhJR1H0mhkrIb5Go6GWrIXaWYZLrmOlD98LSLihYi7SemJp+Yg=="; hash = "sha512-2zuVURKDw+Z/8I1AO8G5KPVOlPIZC/Mbt9jK5gn9CV1zmRiWKL+m1/Bw9/h7fanBdm0fhfLklplmlTTabPm7dg==";
}; };
extraInstallCommands = extraInstallCommands =

2
pkgs/by-name/pl/plumber/package.nix
View File

@ -18,6 +18,8 @@ buildGoModule rec {
export HOME="$(mktemp -d)" export HOME="$(mktemp -d)"
''; '';
subPackages = [ "." ];
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"

6
pkgs/by-name/st/steamguard-cli/package.nix
View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "steamguard-cli"; pname = "steamguard-cli";
version = "0.12.5"; version = "0.12.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dyc3"; owner = "dyc3";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YjJhCEg87xuUFjHD6cBN4dhQhx/c4F/XewyMYeA06+U="; hash = "sha256-LKzN4bNhouwOiTx3pEOLw3bDqRAhKkPi25i0yP/n0PI=";
}; };
cargoHash = "sha256-Z1KWU7Z9iGs5yjuWilMSYhfIilSW8ng+pq5ENfunINo="; cargoHash = "sha256-SLbT2538maN2gQAf8BdRHpDRcYjA9lkMgCpiEYOas28=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
postInstall = '' postInstall = ''

1
pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
View File

@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec {
description = "XDG Desktop Portal for the COSMIC Desktop Environment"; description = "XDG Desktop Portal for the COSMIC Desktop Environment";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ nyanbinary ]; maintainers = with maintainers; [ nyanbinary ];
mainProgram = "xdg-desktop-portal-cosmic";
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

11
pkgs/desktops/budgie/budgie-control-center/default.nix
View File

@ -19,7 +19,6 @@
, glibc , glibc
, gnome , gnome
, gnome-desktop , gnome-desktop
, gnome-online-accounts
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gsound , gsound
, gtk3 , gtk3
@ -54,18 +53,19 @@
, upower , upower
, webp-pixbuf-loader , webp-pixbuf-loader
, wrapGAppsHook , wrapGAppsHook
, enableSshSocket ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "budgie-control-center"; pname = "budgie-control-center";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BuddiesOfBudgie"; owner = "BuddiesOfBudgie";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q="; sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
}; };
patches = [ patches = [
@ -101,7 +101,6 @@ stdenv.mkDerivation rec {
glib glib
glib-networking glib-networking
gnome-desktop gnome-desktop
gnome-online-accounts
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
gnome.cheese gnome.cheese
gnome.gnome-bluetooth_1_0 gnome.gnome-bluetooth_1_0
@ -134,6 +133,10 @@ stdenv.mkDerivation rec {
upower upower
]; ];
mesonFlags = [
(lib.mesonBool "ssh" enableSshSocket)
];
preConfigure = '' preConfigure = ''
# For ITS rules # For ITS rules
addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"

2
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, glib , glib
, glib-networking
, gettext , gettext
, cinnamon-desktop , cinnamon-desktop
, gtk3 , gtk3
@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
glib glib
glib-networking
cinnamon-desktop cinnamon-desktop
libnotify libnotify
cinnamon-menus cinnamon-menus

48
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -45,6 +45,14 @@
# C can import package A propagated by B # C can import package A propagated by B
, propagatedBuildInputs ? [] , propagatedBuildInputs ? []
# Python module dependencies.
# These are named after PEP-621.
, dependencies ? []
, optional-dependencies ? {}
# Python PEP-517 build systems.
, build-system ? []
# DEPRECATED: use propagatedBuildInputs # DEPRECATED: use propagatedBuildInputs
, pythonPath ? [] , pythonPath ? []
@ -97,8 +105,6 @@
, meta ? {} , meta ? {}
, passthru ? {}
, doCheck ? config.doCheckByDefault or false , doCheck ? config.doCheckByDefault or false
, disabledTestPaths ? [] , disabledTestPaths ? []
@ -193,10 +199,28 @@ let
"setuptools" "wheel" "setuptools" "wheel"
]; ];
passthru =
attrs.passthru or { }
// {
updateScript = let
filename = builtins.head (lib.splitString ":" self.meta.position);
in attrs.passthru.updateScript or [ update-python-libraries filename ];
}
// lib.optionalAttrs (dependencies != []) {
inherit dependencies;
}
// lib.optionalAttrs (optional-dependencies != {}) {
inherit optional-dependencies;
}
// lib.optionalAttrs (build-system != []) {
inherit build-system;
};
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format"
"disabledTestPaths" "outputs" "stdenv" "disabledTestPaths" "outputs" "stdenv"
"dependencies" "optional-dependencies" "build-system"
]) // { ]) // {
name = namePrefix + name_; name = namePrefix + name_;
@ -256,11 +280,11 @@ let
pythonNamespacesHook pythonNamespacesHook
] ++ lib.optionals withDistOutput [ ] ++ lib.optionals withDistOutput [
pythonOutputDistHook pythonOutputDistHook
] ++ nativeBuildInputs; ] ++ nativeBuildInputs ++ build-system;
buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath); buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [ propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ dependencies ++ [
# we propagate python even for packages transformed with 'toPythonApplication' # we propagate python even for packages transformed with 'toPythonApplication'
# this pollutes the PATH but avoids rebuilds # this pollutes the PATH but avoids rebuilds
# see https://github.com/NixOS/nixpkgs/issues/170887 for more context # see https://github.com/NixOS/nixpkgs/issues/170887 for more context
@ -292,6 +316,8 @@ let
outputs = outputs ++ lib.optional withDistOutput "dist"; outputs = outputs ++ lib.optional withDistOutput "dist";
inherit passthru;
meta = { meta = {
# default to python's platforms # default to python's platforms
platforms = python.meta.platforms; platforms = python.meta.platforms;
@ -305,13 +331,7 @@ let
disabledTestPaths = lib.escapeShellArgs disabledTestPaths; disabledTestPaths = lib.escapeShellArgs disabledTestPaths;
})); }));
passthru.updateScript = let in lib.extendDerivation
filename = builtins.head (lib.splitString ":" self.meta.position); (disabled -> throw "${name} not supported for interpreter ${python.executable}")
in attrs.passthru.updateScript or [ update-python-libraries filename ]; passthru
in self
if disabled then
throw "${name} not supported for interpreter ${python.executable}"
else
self.overrideAttrs (attrs: {
passthru = lib.recursiveUpdate passthru attrs.passthru;
})

8
pkgs/development/libraries/boringssl/default.nix
View File

@ -10,17 +10,17 @@
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
buildGoModule { buildGoModule {
pname = "boringssl"; pname = "boringssl";
version = "unstable-2023-09-27"; version = "unstable-2024-02-15";
src = fetchgit { src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl"; url = "https://boringssl.googlesource.com/boringssl";
rev = "d24a38200fef19150eef00cad35b138936c08767"; rev = "5a1a5fbdb865fa58f1da0fd8bf6426f801ea37ac";
hash = "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s="; hash = "sha256-nu+5TeWEAVLGhTE15kxmTWZxo0V2elNUy67gdaU3Y+I=";
}; };
nativeBuildInputs = [ cmake ninja perl ]; nativeBuildInputs = [ cmake ninja perl ];
vendorHash = "sha256-EJPcx07WuvHPAgiS1ASU6WHlHkxjUOO72if4TkmrqwY="; vendorHash = "sha256-McSmG+fMO8/T/bJR6YAJDYw9pxsWJoj1hcSTPv/wMsI=";
proxyVendor = true; proxyVendor = true;
# hack to get both go and cmake configure phase # hack to get both go and cmake configure phase

6
pkgs/development/python-modules/accelerate/default.nix
View File

@ -11,6 +11,7 @@
, pyyaml , pyyaml
, safetensors , safetensors
, torch , torch
, config
, cudatoolkit , cudatoolkit
, evaluate , evaluate
, parameterized , parameterized
@ -51,7 +52,7 @@ buildPythonPackage rec {
preCheck = '' preCheck = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
export PATH=$out/bin:$PATH export PATH=$out/bin:$PATH
'' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform cudatoolkit) '' '' + lib.optionalString config.cudaSupport ''
export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas" export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas"
''; '';
pytestFlagsArray = [ "tests" ]; pytestFlagsArray = [ "tests" ];
@ -75,7 +76,8 @@ buildPythonPackage rec {
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
# usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
"CheckpointTest" "CheckpointTest"
# requires ptxas from cudatoolkit, which is unavailable on aarch64-linux ] ++ lib.optionals (!config.cudaSupport) [
# requires ptxas from cudatoolkit, which is unfree
"test_dynamo_extract_model" "test_dynamo_extract_model"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
# RuntimeError: torch_shm_manager: execl failed: Permission denied # RuntimeError: torch_shm_manager: execl failed: Permission denied

23
pkgs/development/python-modules/bitsandbytes/default.nix
View File

@ -12,7 +12,7 @@
let let
pname = "bitsandbytes"; pname = "bitsandbytes";
version = "0.41.0"; version = "0.42.0";
inherit (torch) cudaCapabilities cudaPackages cudaSupport; inherit (torch) cudaCapabilities cudaPackages cudaSupport;
inherit (cudaPackages) backendStdenv cudaVersion; inherit (cudaPackages) backendStdenv cudaVersion;
@ -43,15 +43,15 @@ let
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimDettmers"; owner = "TimDettmers";
repo = pname; repo = "bitsandbytes";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-e6SK2ylITookO6bhpfdRp/V4y2S9rk6Lo1PD3xXrcmM="; hash = "sha256-PZxsFJ6WpfeQqRQrRRBZfZfNY6/TfJFLBeknX24OXcU=";
}; };
postPatch = '' postPatch = ''
@ -73,8 +73,16 @@ buildPythonPackage {
else else
''make CUDA_VERSION=CPU cpuonly''; ''make CUDA_VERSION=CPU cpuonly'';
nativeBuildInputs = [ setuptools wheel ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; nativeBuildInputs = [
buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; setuptools
wheel
] ++ lib.optionals torch.cudaSupport [
cuda-native-redist
];
buildInputs = lib.optionals torch.cudaSupport [
cuda-redist
];
propagatedBuildInputs = [ propagatedBuildInputs = [
scipy scipy
@ -88,8 +96,9 @@ buildPythonPackage {
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/TimDettmers/bitsandbytes";
description = "8-bit CUDA functions for PyTorch"; description = "8-bit CUDA functions for PyTorch";
homepage = "https://github.com/TimDettmers/bitsandbytes";
changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
}; };

6
pkgs/development/python-modules/openllm-client/default.nix
View File

@ -23,6 +23,12 @@ buildPythonPackage rec {
sourceRoot = "source/openllm-client"; sourceRoot = "source/openllm-client";
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "hatchling==1.18.0" "hatchling" \
--replace-fail "hatch-vcs==0.3.0" "hatch-vcs"
'';
nativeBuildInputs = [ nativeBuildInputs = [
hatch-fancy-pypi-readme hatch-fancy-pypi-readme
hatch-vcs hatch-vcs

4
pkgs/development/python-modules/optimum/default.nix
View File

@ -22,7 +22,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "optimum"; pname = "optimum";
version = "1.17.0"; version = "1.17.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "huggingface"; owner = "huggingface";
repo = "optimum"; repo = "optimum";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-101QW6MgCcmSeQ0AefPZKmg5O6+2JlrekYN3fIkukuw="; hash = "sha256-21y7pFRCZqwNaZR+TcXH2KIK5IZuLVq0wgIQqByyEf8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pendulum/default.nix
View File

@ -20,8 +20,8 @@ buildPythonPackage rec {
export HOME=$TMPDIR export HOME=$TMPDIR
''; '';
nativeBuildInputs = [ poetry-core ]; build-system = [ poetry-core ];
propagatedBuildInputs = [ python-dateutil pytzdata ] dependencies = [ python-dateutil pytzdata ]
++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (pythonOlder "3.5") typing
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

12
pkgs/development/python-modules/pyoctoprintapi/default.nix
View File

@ -1,6 +1,8 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder
, setuptools
# propagated # propagated
, aiohttp , aiohttp
@ -16,15 +18,21 @@ let
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rfleming71"; owner = "rfleming71";
repo = pname; repo = "pyoctoprintapi";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Jf/zYnBHVl3TYxFy9Chy6qNH/eCroZkmUOEWfd62RIo="; hash = "sha256-Jf/zYnBHVl3TYxFy9Chy6qNH/eCroZkmUOEWfd62RIo=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
]; ];

6
pkgs/development/python-modules/requests/default.nix
View File

@ -30,7 +30,7 @@ buildPythonPackage rec {
hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE="; hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE=";
}; };
propagatedBuildInputs = [ dependencies = [
brotlicffi brotlicffi
certifi certifi
charset-normalizer charset-normalizer
@ -38,7 +38,7 @@ buildPythonPackage rec {
urllib3 urllib3
]; ];
passthru.optional-dependencies = { optional-dependencies = {
security = []; security = [];
socks = [ socks = [
pysocks pysocks
@ -53,7 +53,7 @@ buildPythonPackage rec {
pytest-xdist pytest-xdist
pytestCheckHook pytestCheckHook
] ]
++ passthru.optional-dependencies.socks; ++ optional-dependencies.socks;
disabledTests = [ disabledTests = [
# Disable tests that require network access and use httpbin # Disable tests that require network access and use httpbin

4
pkgs/development/python-modules/snakemake-interface-common/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "snakemake-interface-common"; pname = "snakemake-interface-common";
version = "1.16.0"; version = "1.17.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snakemake"; owner = "snakemake";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-rqeDRbB77ttPYoQQtvv44IjXmotlrUA1Dssf1nLKnKs="; hash = "sha256-1dvanwYCQE5usgXPhYCZfUpj4MyaLImQ5RskQvS6nJs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/somajo/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "somajo"; pname = "somajo";
version = "2.4.1"; version = "2.4.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "tsproisl"; owner = "tsproisl";
repo = "SoMaJo"; repo = "SoMaJo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-44avfokFgOQ62dswGpsNX+mywrtZLMTkMV4s+y0UusE="; hash = "sha256-5rlgDnPYTtuVMincG5CgVwNh/IGmZk6ItvzdB/wHmgg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -29,7 +29,7 @@
, avx2Support ? stdenv.hostPlatform.avx2Support , avx2Support ? stdenv.hostPlatform.avx2Support
, fmaSupport ? stdenv.hostPlatform.fmaSupport , fmaSupport ? stdenv.hostPlatform.fmaSupport
# Darwin deps # Darwin deps
, Foundation, Security, cctools, llvmPackages_11 , Foundation, Security, cctools, llvmPackages
}: }:
let let
@ -51,7 +51,7 @@ let
# translation units, so the build fails at link time # translation units, so the build fails at link time
stdenv = stdenv =
if cudaSupport then cudaPackagesGoogle.backendStdenv if cudaSupport then cudaPackagesGoogle.backendStdenv
else if originalStdenv.isDarwin then llvmPackages_11.stdenv else if originalStdenv.isDarwin then llvmPackages.stdenv
else originalStdenv; else originalStdenv;
inherit (cudaPackagesGoogle) cudatoolkit nccl; inherit (cudaPackagesGoogle) cudatoolkit nccl;
# use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu)

4
pkgs/development/tools/pyenv/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pyenv"; pname = "pyenv";
version = "2.3.35"; version = "2.3.36";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pyenv"; owner = "pyenv";
repo = "pyenv"; repo = "pyenv";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-tNTHRSzYCelByEt8bN7BhUBGQCAJfZVjWIYTr0VhbO4="; hash = "sha256-ZZb7fB9VWwpmW6Qrw65/zLUBqz7E4/Bg3A7DnTt+IbE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped"; pname = "rust-analyzer-unwrapped";
version = "2024-01-29"; version = "2024-02-19";
cargoSha256 = "sha256-3f+Nc2HXCQsaZ+FFSH7ML0o1yikZWhsRZmA8JtBc2TY="; cargoSha256 = "sha256-xrLjM2fx+IGkl0UQREH3PvdjpEkXWmFgG8V8/3mO674=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = version; rev = version;
sha256 = "sha256-6K5rK1b2APQfXOrC+Hm+0QcyfPVt+TV81Q6Fd/QjMlQ="; sha256 = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE=";
}; };
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

6
pkgs/os-specific/darwin/yabai/default.nix
View File

@ -17,7 +17,7 @@
let let
pname = "yabai"; pname = "yabai";
version = "6.0.12"; version = "6.0.13";
test-version = testers.testVersion { test-version = testers.testVersion {
package = yabai; package = yabai;
@ -53,7 +53,7 @@ in
src = fetchzip { src = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
hash = "sha256-wCxx/XqUrdD2xyoS6VCKMt6PhiQ8ALM6PHkv9lSCYsM="; hash = "sha256-71Dw/5wqoHE6HEhGA/CJA2WVgN3EifdyBO0gLFOwfJA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -89,7 +89,7 @@ in
owner = "koekeishiya"; owner = "koekeishiya";
repo = "yabai"; repo = "yabai";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-acoMOM0vaMHUXmgSToFa4PYEIUWfOiD5+ewsqB3DX+E="; hash = "sha256-jt1PwMkhWBWAFYXJ1HxVLwJY9OmNDzlohB5krIsvWfg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/os-specific/linux/esdm/default.nix
View File

@ -60,13 +60,13 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend =
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "esdm"; pname = "esdm";
version = "1.0.0"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smuellerDD"; owner = "smuellerDD";
repo = "esdm"; repo = "esdm";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-q6TGL1agltV9CFfcA6hZszVwGIBBngs22ZqhQgc9FeM="; sha256 = "sha256-J7iVp6lLjR2JPdpppnqgV5Ke+X9TcZaS5V1ffejI5yE=";
}; };
nativeBuildInputs = [ meson pkg-config ninja ]; nativeBuildInputs = [ meson pkg-config ninja ];

17
pkgs/servers/home-automation/evcc/default.nix
View File

@ -1,9 +1,9 @@
{ lib { lib
, buildGoModule , buildGo122Module
, fetchFromGitHub , fetchFromGitHub
, fetchNpmDeps , fetchNpmDeps
, cacert , cacert
, go , go_1_22
, git , git
, enumer , enumer
, mockgen , mockgen
@ -14,22 +14,27 @@
, stdenv , stdenv
}: }:
let
buildGoModule = buildGo122Module;
go = go_1_22;
in
buildGoModule rec { buildGoModule rec {
pname = "evcc"; pname = "evcc";
version = "0.124.0"; version = "0.124.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evcc-io"; owner = "evcc-io";
repo = "evcc"; repo = "evcc";
rev = version; rev = version;
hash = "sha256-x6BsW4INahGFbFNprE1mZjlW/EoEMZgDIJACd9F+g6A="; hash = "sha256-sSR0aRSIUPph1YGfY6ihUffKiyauSbO7eUSVa3jaY6s=";
}; };
vendorHash = "sha256-/TlbjyKGpVqkQAStx8QaAxpWsVYs0yxBMantqelYkhw="; vendorHash = "sha256-1ZSMI6mz8CkibP3KwWJ3I05BMoBu9r+Fn8vLLDTpVfA=";
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
inherit src; inherit src;
hash = "sha256-Tl08gscv8WaMG4XfIVUWqj76xICWwUTBDK0VSs2kwMk="; hash = "sha256-Uu1idwI3zRQmu2xBrbMcFBmJuO/z+N5+6eSRK+n1pg8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/servers/radarr/default.nix
View File

@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = { hash = {
x64-linux_hash = "sha256-RXvpKTIXDOcPUyRa07+8N4xkav23t8aWAshhPEK5pCI="; x64-linux_hash = "sha256-oZI2nvxvxOiv9F9c2AaP9hEBVd3kV4tjuEmvaR5V0Lc=";
arm64-linux_hash = "sha256-zAwlyW6uU+3/XQk2HxA/ClvF/EozxMnlH/6C2cx99bU="; arm64-linux_hash = "sha256-Pquc/b/VXJEi4N8uOfvg4X1083JaOdCXg2IPAGZAMV0=";
x64-osx_hash = "sha256-j7cvUyDMxf+9ry9pMSO+xfjBgoqeOhda3pnzHA2RDw4="; x64-osx_hash = "sha256-HHmx8bI4d+xmL63v/qmUIJDt+laoSs5Iqp+I7OzoU/k=";
arm64-osx_hash = "sha256-v8SuAWlyBT7bIFRkQDJ5E2y7uxckfdW5cCG/nJ+27cg="; arm64-osx_hash = "sha256-Us/ZEDlZ96/ybs8lxnl4bSFICwc9xJtXScA+hGEwfWk=";
}."${arch}-${os}_hash"; }."${arch}-${os}_hash";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "radarr"; pname = "radarr";
version = "5.2.6.8376"; version = "5.3.6.8612";
src = fetchurl { src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

4
pkgs/servers/sickbeard/sickgear.nix
View File

@ -4,13 +4,13 @@ let
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "sickgear"; pname = "sickgear";
version = "3.30.9"; version = "3.30.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SickGear"; owner = "SickGear";
repo = "SickGear"; repo = "SickGear";
rev = "release_${version}"; rev = "release_${version}";
hash = "sha256-Ik+A7CqSRsXPzqbgmwpam7v2hyj6BweyWJnF5ix/JNg="; hash = "sha256-pTcetcZ62rHMcnplteTJQkuEIQrPUKdX+cSV5V4ZqA4=";
}; };
patches = [ patches = [

4
pkgs/servers/sql/rqlite/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "rqlite"; pname = "rqlite";
version = "8.20.1"; version = "8.20.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rqlite"; owner = "rqlite";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QMaCtl18adOLuWUXDlnVphkLyQUTEhYx+6HAJ3qYPW8="; sha256 = "sha256-pblCeabZeAL45L4prwYwKh0uIG/I/2TnFciOJS1N3Ds=";
}; };
vendorHash = "sha256-FzxY6CTcFwSmW9LEKzPRtCsKxsGedwU9G3A3efYG9zk="; vendorHash = "sha256-FzxY6CTcFwSmW9LEKzPRtCsKxsGedwU9G3A3efYG9zk=";

23
pkgs/tools/audio/wyoming/openwakeword.nix
View File

@ -1,36 +1,27 @@
{ lib { lib
, python3Packages , python3Packages
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "wyoming-openwakeword"; pname = "wyoming-openwakeword";
version = "1.8.1"; version = "1.9.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rhasspy"; owner = "rhasspy";
repo = "wyoming-openwakeword"; repo = "wyoming-openwakeword";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-N/EjdNQLsYLpJ4kOxY/z+/dMMmF1PPAIEEzSHfnZWaM="; hash = "sha256-NceUFsIKZO6DOXae3QJ7JJGc7QdDHkMh20eLvl12p4U=";
}; };
patches = [
(fetchpatch {
# import tflite entrypoint from tensorflow
url = "https://github.com/rhasspy/wyoming-openwakeword/commit/8f4ba2750d8c545e77549a7230cdee1301dac09a.patch";
hash = "sha256-WPvywpGv0sYYVGc7he4bt7APIsa3ziKaWqpFlx3v+V8=";
})
(fetchpatch {
# add commandline entrypoint
url = "https://github.com/rhasspy/wyoming-openwakeword/commit/f40e5635543b2315217538dd89a9fe40fe817cfe.patch";
hash = "sha256-HNlGqt7bMzwyvhx5Hw7mkTHeQmBpgDCU3pUbZzss1bY=";
})
];
nativeBuildInputs = with python3Packages; [ nativeBuildInputs = with python3Packages; [
setuptools setuptools
pythonRelaxDepsHook
];
pythonRemoveDeps = [
"tflite-runtime-nightly"
]; ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

15
pkgs/tools/audio/wyoming/piper.nix
View File

@ -6,25 +6,16 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "wyoming-piper"; pname = "wyoming-piper";
version = "1.4.0"; version = "1.5.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rhasspy"; owner = "rhasspy";
repo = "wyoming-piper"; repo = "wyoming-piper";
# https://github.com/rhasspy/wyoming-piper/issues/3 rev = "v${version}";
rev = "560927437c72eca4d334ca503d15863f0b42980d"; hash = "sha256-aI1CWtSpSPX1aK4UR/lsCQZQwNs7qOLKfatlSomJx1Q=";
hash = "sha256-Q4S96zs856zXVAGo4mB466an60naHiS2S/qxYxPE4sI=";
}; };
patches = [
(fetchpatch {
# add console script
url = "https://github.com/rhasspy/wyoming-piper/commit/4c27fbd067fd543adede4626fc5868a3f2458734.patch";
hash = "sha256-YPjDjeY9RLsgCtbBZoNgPyQTv3rbCJGcqTNSSwiqqEE=";
})
];
nativeBuildInputs = with python3Packages; [ nativeBuildInputs = with python3Packages; [
setuptools setuptools
pythonRelaxDepsHook pythonRelaxDepsHook

83
pkgs/tools/graphics/mangohud/default.nix
View File

@ -4,6 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, substituteAll , substituteAll
, fetchpatch
, coreutils , coreutils
, curl , curl
, glxinfo , glxinfo
@ -38,7 +39,6 @@
let let
# Derived from subprojects/cmocka.wrap # Derived from subprojects/cmocka.wrap
cmocka = { cmocka = {
version = "1.81";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "cmocka"; owner = "cmocka";
repo = "cmocka"; repo = "cmocka";
@ -47,18 +47,33 @@ let
}; };
}; };
# Derived from subprojects/implot.wrap
implot = rec {
version = "0.16";
src = fetchFromGitHub {
owner = "epezent";
repo = "implot";
rev = "refs/tags/v${version}";
hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0=";
};
patch = fetchurl {
url = "https://wrapdb.mesonbuild.com/v2/implot_${version}-1/get_patch";
hash = "sha256-HGsUYgZqVFL6UMHaHdR/7YQfKCMpcsgtd48pYpNlaMc=";
};
};
# Derived from subprojects/imgui.wrap # Derived from subprojects/imgui.wrap
imgui = rec { imgui = rec {
version = "1.81"; version = "1.89.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocornut"; owner = "ocornut";
repo = "imgui"; repo = "imgui";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; hash = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU=";
}; };
patch = fetchurl { patch = fetchurl {
url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch";
hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; hash = "sha256-myEpDFl9dr+NTus/n/oCSxHZ6mxh6R1kjMyQtChD1YQ=";
}; };
}; };
@ -68,7 +83,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-Headers"; repo = "Vulkan-Headers";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5uyk2nMwV1MjXoa3hK/WUeGLwpINJJEvY16kc5DEaks="; hash = "sha256-5uyk2nMwV1MjXoa3hK/WUeGLwpINJJEvY16kc5DEaks=";
}; };
patch = fetchurl { patch = fetchurl {
@ -79,14 +94,14 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mangohud"; pname = "mangohud";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flightlessmango"; owner = "flightlessmango";
repo = "MangoHud"; repo = "MangoHud";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ="; hash = "sha256-Gnq+1j+PFbeipAfXGnTq7wZdVQeG9R9vLAKZnZj7Bvs=";
}; };
outputs = [ "out" "doc" "man" ]; outputs = [ "out" "doc" "man" ];
@ -97,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
${lib.optionalString finalAttrs.finalPackage.doCheck '' ${lib.optionalString finalAttrs.finalPackage.doCheck ''
cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka
''} ''}
cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version}
cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version}
cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version}
)''; )'';
@ -124,6 +140,13 @@ stdenv.mkDerivation (finalAttrs: {
libdbus = dbus.lib; libdbus = dbus.lib;
inherit hwdata; inherit hwdata;
}) })
# Add dep_vulkan to mangoapp and test_amdgpu to fix build failure
# TODO: Remove in next release
(fetchpatch {
url = "https://github.com/flightlessmango/MangoHud/commit/cba217ffaf93aea6acb4e59e3e46bf912f740ccf.patch";
hash = "sha256-1My4/EuSMpe3AFhhFOJr8rz/wnywp+BW+F4dSgxToe0=";
})
]; ];
postPatch = '' postPatch = ''
@ -138,6 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
( (
cd subprojects cd subprojects
unzip ${implot.patch}
unzip ${imgui.patch} unzip ${imgui.patch}
unzip ${vulkan-headers.patch} unzip ${vulkan-headers.patch}
) )
@ -198,33 +222,36 @@ stdenv.mkDerivation (finalAttrs: {
''} ''}
''; '';
postFixup = let postFixup =
archMap = { let
"x86_64-linux" = "x86_64"; archMap = {
"i686-linux" = "x86"; "x86_64-linux" = "x86_64";
}; "i686-linux" = "x86";
layerPlatform = archMap."${stdenv.hostPlatform.system}" or null; };
# We need to give the different layers separate names or else the loader layerPlatform = archMap."${stdenv.hostPlatform.system}" or null;
# might try the 32-bit one first, fail and not attempt to load the 64-bit # We need to give the different layers separate names or else the loader
# layer under the same name. # might try the 32-bit one first, fail and not attempt to load the 64-bit
in lib.optionalString (layerPlatform != null) '' # layer under the same name.
substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \ in
--replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}" lib.optionalString (layerPlatform != null) ''
'' + '' substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \
# Add OpenGL driver path to RUNPATH to support NVIDIA cards --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}"
addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" '' + ''
'' + lib.optionalString gamescopeSupport '' # Add OpenGL driver path to RUNPATH to support NVIDIA cards
addOpenGLRunpath "$out/bin/mangoapp" addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so"
'' + lib.optionalString finalAttrs.finalPackage.doCheck '' '' + lib.optionalString gamescopeSupport ''
# libcmocka.so is only used for tests addOpenGLRunpath "$out/bin/mangoapp"
rm "$out/lib/libcmocka.so" '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
''; # libcmocka.so is only used for tests
rm "$out/lib/libcmocka.so"
'';
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };
meta = with lib; { meta = with lib; {
description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"; description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more";
homepage = "https://github.com/flightlessmango/MangoHud"; homepage = "https://github.com/flightlessmango/MangoHud";
changelog = "https://github.com/flightlessmango/MangoHud/releases/tag/v${finalAttrs.version}";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ kira-bruneau zeratax ]; maintainers = with maintainers; [ kira-bruneau zeratax ];

2
pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
View File

@ -12,7 +12,7 @@ index 7379af1..4eef3fe 100644
return false; return false;
} }
diff --git a/src/logging.cpp b/src/logging.cpp diff --git a/src/logging.cpp b/src/logging.cpp
index 046c847..42782be 100644 index ca33ee3..90d3638 100644
--- a/src/logging.cpp --- a/src/logging.cpp
+++ b/src/logging.cpp +++ b/src/logging.cpp
@@ -26,7 +26,11 @@ string exec(string command) { @@ -26,7 +26,11 @@ string exec(string command) {

41
pkgs/tools/graphics/mangohud/preload-nix-workaround.patch
View File

@ -1,26 +1,39 @@
diff --git a/bin/mangohud.in b/bin/mangohud.in diff --git a/bin/mangohud.in b/bin/mangohud.in
index 6c3c6e8..8847cdc 100755 index 53c72ef..18240ea 100755
--- a/bin/mangohud.in --- a/bin/mangohud.in
+++ b/bin/mangohud.in +++ b/bin/mangohud.in
@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then @@ -13,13 +13,15 @@ fi
exit 1 DISABLE_LD_PRELOAD="cs2.sh
fi some_other_exe"
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so" -MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so"
+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
+MANGOHUD_LIB_NAME="libMangoHud_opengl.so" +MANGOHUD_LIB_NAME="libMangoHud_opengl.so"
if [ "$1" = "--dlsym" ]; then if [ "$1" = "--dlsym" ]; then
- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" - MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" + MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
shift shift # shift will only be executed if $1 is "--dlsym"
elif [ "$MANGOHUD_DLSYM" = "1" ]; then
- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
fi fi
@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in if [ "$1" = "--version" ]; then
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" @@ -41,7 +43,7 @@ for exe in $DISABLE_LD_PRELOAD; do
esac done
+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" if [ "$disable_preload" = true ]; then
+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" - exec env MANGOHUD=1 "$@"
+ exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@"
else
# Make sure we don't append mangohud lib multiple times
# otherwise, this could cause issues with the steam runtime
@@ -54,5 +56,5 @@ else
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
esac
-exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" "$@" - exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
+exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@" + exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@"
fi

6
pkgs/tools/misc/chezmoi/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "chezmoi"; pname = "chezmoi";
version = "2.46.0"; version = "2.46.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "twpayne"; owner = "twpayne";
repo = "chezmoi"; repo = "chezmoi";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-A296BsUyZFgVUsoplkBJ1Xrr21VRjcRSqjk2JU44ilg="; hash = "sha256-RMhYgmNN2SPBU33ZzR6ZK7ElVlT9ZM/8QOS7k/NOBSY=";
}; };
vendorHash = "sha256-EGc4l02by6K0j0RZZ7YuGkpJ8UaZ4cYcxBd+ECHdwq4="; vendorHash = "sha256-C3aRKluMIZ6X7VHwC1xitG/gLJE8qcbbskxsgsXvzuA=";
doCheck = false; doCheck = false;

4
pkgs/tools/misc/diskscan/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "diskscan"; pname = "diskscan";
version = "0.20"; version = "0.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baruch"; owner = "baruch";
repo = "diskscan"; repo = "diskscan";
rev = version; rev = version;
sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c=";
}; };
buildInputs = [ ncurses zlib ]; buildInputs = [ ncurses zlib ];

6
pkgs/tools/misc/pre-commit/default.nix
View File

@ -18,7 +18,7 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "pre-commit"; pname = "pre-commit";
version = "3.6.0"; version = "3.6.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -26,8 +26,8 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pre-commit"; owner = "pre-commit";
repo = "pre-commit"; repo = "pre-commit";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-OTduVg8uhMdXs2gQ7KaMVOO1zQK4m489W9SU7PWIvcM="; hash = "sha256-UmQ1GehoMDXKEXo8wgPLxTDbtObk7YC2cfk1yNqesJM=";
}; };
patches = [ patches = [

4
pkgs/tools/misc/ugs/default.nix
View File

@ -18,11 +18,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ugs"; pname = "ugs";
version = "2.1.4"; version = "2.1.5";
src = fetchzip { src = fetchzip {
url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
hash = "sha256-2WGRHdxmGa2b8ca20xNJoA0NAY9a0pngzdf94ROfirk="; hash = "sha256-StXEtDJ3UjTWgiQQ8HQtPcUENQPosdHis1eo81Jf96M=";
}; };
dontUnpack = true; dontUnpack = true;

6
pkgs/tools/text/ov/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ov"; pname = "ov";
version = "0.33.2"; version = "0.33.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "noborus"; owner = "noborus";
repo = "ov"; repo = "ov";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-EaAguJPr/FVDfmfbC26zpmkZFnX+3Cdez/zvx2lr4jM="; hash = "sha256-dKAZ8rcm1J3jRfOyLz74YuVv0hZ3iWXR1slBTu5CtYU=";
}; };
vendorHash = "sha256-/S7YKIwuZyQBGIbcPt/ffv8Vx6vzXsk/fDRCIXANPTE="; vendorHash = "sha256-6Ik//r6JJ2n9lXr6JZ6BGIIL7yXXray+flEwQ0IKyA4=";
ldflags = [ ldflags = [
"-s" "-s"

2
pkgs/top-level/all-packages.nix
View File

@ -31757,7 +31757,7 @@ with pkgs;
firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (gnome) adwaita-icon-theme; inherit (gnome) adwaita-icon-theme;
channel = "developer-edition"; channel = "developer-edition";
generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix;
}; };
firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {