mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-20 02:53:10 +00:00
Code Issues Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2024-03-06 12:01:15 +00:00 committed by GitHub
parent 09c267dae0 45dd476c54
commit d6370b05b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 391 additions and 330 deletions
lib
attrsets.nix
maintainers/scripts/kde
generate-sources.py
nixos
doc/manual/development
running-nixos-tests.section.md
modules/services/monitoring
mackerel-agent.nix
pkgs
applications
emulators/retroarch
hashes.json
gis/grass
default.nix
networking/cluster/k9s
default.nix
science/molecular-dynamics/gromacs
default.nix
build-support/php/hooks
php-script-utils.bash
by-name
au/audiness
package.nix
ez/eza
package.nix
ja/jasper
package.nix
ll/llama-cpp
package.nix
rl/rl_json
package.nix
data/themes
adapta-kde
default.nix
arc-kde
default.nix
development
php-packages/castor
default.nix
python-modules
llama-index-readers-file
default.nix
llama-parse
default.nix
reptor
default.nix
kde
frameworks/baloo
default.nix
generated/sources
plasma.json
lib
mk-kde-derivation.nix
plasma
default.nix
shells/nushell
default.nix
plugins
formats.nixgstat.nixquery.nix
tools
security/opensc
default.nix
virtualization/multipass
default.nix
top-level
python-packages.nix

77
lib/attrsets.nix
View file

@ -680,52 +680,67 @@ rec {
attrsToList = mapAttrsToList nameValuePair;
/* Like `mapAttrs`, except that it recursively applies itself to
the *leaf* attributes of a potentially-nested attribute set:
the second argument of the function will never be an attrset.
Also, the first argument of the argument function is a *list*
of the attribute names that form the path to the leaf attribute.
/**
Like `mapAttrs`, except that it recursively applies itself to the *leaf* attributes of a potentially-nested attribute set:
the second argument of the function will never be an attrset.
Also, the first argument of the mapping function is a *list* of the attribute names that form the path to the leaf attribute.
For a function that gives you control over what counts as a leaf,
see `mapAttrsRecursiveCond`.
For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`.
Example:
mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value]))
{ n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; }
=> { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; }
:::{#map-attrs-recursive-example .example}
# Map over leaf attributes
Type:
mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet
```nix
mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value]))
{ n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; }
```
evaluates to
```nix
{ n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; }
```
:::
# Type
```
mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet
```
*/
mapAttrsRecursive =
# A function, given a list of attribute names and a value, returns a new value.
# A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value.
f:
# Set to recursively map over.
# Attribute set to recursively map over.
set:
mapAttrsRecursiveCond (as: true) f set;
/* Like `mapAttrsRecursive`, but it takes an additional predicate
function that tells it whether to recurse into an attribute
set. If it returns false, `mapAttrsRecursiveCond` does not
recurse, but does apply the map function. If it returns true, it
does recurse, and does not apply the map function.
/**
Like `mapAttrsRecursive`, but it takes an additional predicate that tells it whether to recurse into an attribute set.
If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function.
If the predicate returns true, it does recurse, and does not apply the mapping function.
Example:
# To prevent recursing into derivations (which are attribute
# sets with the attribute "type" equal to "derivation"):
mapAttrsRecursiveCond
(as: !(as ? "type" && as.type == "derivation"))
(x: ... do something ...)
attrs
:::{#map-attrs-recursive-cond-example .example}
# Map over an leaf attributes defined by a condition
Type:
mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet
Map derivations to their `name` attribute.
Derivatons are identified as attribute sets that contain `{ type = "derivation"; }`.
```nix
mapAttrsRecursiveCond
(as: !(as ? "type" && as.type == "derivation"))
(x: x.name)
attrs
```
:::
# Type
```
mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet
```
*/
mapAttrsRecursiveCond =
# A function, given the attribute set the recursion is currently at, determine if to recurse deeper into that attribute set.
# A function that, given the attribute set the recursion is currently at, determines if to recurse deeper into that attribute set.
cond:
# A function, given a list of attribute names and a value, returns a new value.
# A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value.
# The attribute value is either an attribute set for which `cond` returns false, or something other than an attribute set.
f:
# Attribute set to recursively map over.
set:

2
maintainers/scripts/kde/generate-sources.py
View file

@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path):
set_dir.mkdir(parents=True, exist_ok=True)
with (set_dir / "default.nix").open("w") as fd:
fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n")
fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n")
sources_dir = generated_dir / "sources"
sources_dir.mkdir(parents=True, exist_ok=True)

10
nixos/doc/manual/development/running-nixos-tests.section.md
View file

@ -18,3 +18,13 @@ you can view a log of the test:
```ShellSession
$ nix-store --read-log result
```
## System Requirements {#sec-running-nixos-tests-requirements}
NixOS tests require virtualization support.
This means that the machine must have `kvm` in its [system features](https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=system-features#conf-system-features) list, or `apple-virt` in case of macOS.
These features are autodetected locally, but `apple-virt` is only autodetected since Nix 2.19.0.
Features of **remote builders** must additionally be configured manually on the client, e.g. on NixOS with [`nix.buildMachines.*.supportedFeatures`](https://search.nixos.org/options?show=nix.buildMachines.*.supportedFeatures&sort=alpha_asc&query=nix.buildMachines) or through general [Nix configuration](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds).
If you run the tests on a **macOS** machine, you also need a "remote" builder for Linux; possibly a VM. [nix-darwin](https://daiderd.com/nix-darwin/) users may enable [`nix.linux-builder.enable`](https://daiderd.com/nix-darwin/manual/index.html#opt-nix.linux-builder.enable) to launch such a VM.

2
nixos/modules/services/monitoring/mackerel-agent.nix
View file

@ -81,7 +81,7 @@ in {
include = mkDefault "/etc/mackerel-agent/conf.d/*.conf";
};
# upstream service file in https://git.io/JUt4Q
# upstream service file in https://github.com/mackerelio/mackerel-agent/blob/master/packaging/rpm/src/mackerel-agent.service
systemd.services.mackerel-agent = {
description = "mackerel.io agent";
wants = [ "network-online.target" ];

96
pkgs/applications/emulators/retroarch/hashes.json
View file

@ -55,20 +55,20 @@
"src": {
"owner": "libretro",
"repo": "beetle-pce-libretro",
"rev": "753f067738e55a6325d3ca5206151a9acd9127f0",
"hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY="
"rev": "95b5ea18a694f5a05b1c0cda20928c825d981238",
"hash": "sha256-4Y2dyELUGWycCQ1UA0Ov6Ijh1t+KgSL1AtDefbRmjbA="
},
"version": "unstable-2024-02-09"
"version": "unstable-2024-03-01"
},
"beetle-pce-fast": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "beetle-pce-fast-libretro",
"rev": "ad9ad7e7e3b89d322e9f9492f5b04738641ffbe8",
"hash": "sha256-UUej94plV/UDsvfh7CPjP6zv99zNw4JT+ZDOl0AKzmc="
"rev": "28180934e9d7f1a6ec655adde0b81f0b167732ad",
"hash": "sha256-Kt1Bh32zoJynbqp/0ARngPTYHlvp6k/Ya09l8/736gk="
},
"version": "unstable-2024-02-23"
"version": "unstable-2024-03-01"
},
"beetle-pcfx": {
"fetcher": "fetchFromGitHub",
@ -85,10 +85,10 @@
"src": {
"owner": "libretro",
"repo": "beetle-psx-libretro",
"rev": "4a006dca366af88d491e232892fe93aabe094b14",
"hash": "sha256-tdD2Ilkzph425RC4pVcS7kpvIxA+DF/rWYM9BhcWGyY="
"rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212",
"hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k="
},
"version": "unstable-2024-02-27"
"version": "unstable-2024-03-01"
},
"beetle-saturn": {
"fetcher": "fetchFromGitHub",
@ -115,10 +115,10 @@
"src": {
"owner": "libretro",
"repo": "beetle-supergrafx-libretro",
"rev": "32070ffd0082fd5127519bb6e92a2daecc359408",
"hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64="
"rev": "29ff9e00a85db3d462cca42543a84597c421c99c",
"hash": "sha256-UZt1yFcwgdY/TbDs+GQ73Nu5KRA1R8gdKs73IQC1mCg="
},
"version": "unstable-2024-02-09"
"version": "unstable-2024-03-01"
},
"beetle-vb": {
"fetcher": "fetchFromGitHub",
@ -165,10 +165,10 @@
"src": {
"owner": "libretro",
"repo": "bsnes-libretro",
"rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd",
"hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA="
"rev": "9e9b928e0153f663cf4802f266315ab092067b7e",
"hash": "sha256-Fn1bz3TC+8CEmGDNcll0yfzBpDPvfS1vknf49ogNCIQ="
},
"version": "unstable-2024-02-09"
"version": "unstable-2024-03-01"
},
"bsnes-hd": {
"fetcher": "fetchFromGitHub",
@ -287,31 +287,31 @@
"src": {
"owner": "libretro",
"repo": "fbneo",
"rev": "226123d45854f23a93f5030471bf82d068f018ad",
"hash": "sha256-GTkUgLhnP2KFR6Lo354577qYS5CXjGZ7k7PZ9sTE0Cg="
"rev": "a9c41d1e1132b1a7aad48c0f8e94fcf9c7ba0f9f",
"hash": "sha256-H4pJruHqJ4p3tBykm015U+wApHrAeVaZO9nLJ9Rc0NQ="
},
"version": "unstable-2024-02-22"
"version": "unstable-2024-03-03"
},
"fceumm": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "libretro-fceumm",
"rev": "1deea6c93cdcf5158b032683f426a06dd1bfa8d5",
"hash": "sha256-e0AxHw9sRufk5cc6q66/cmdkD+FbVRY+OUkRjZA8j1U="
"rev": "40969671ce9e4b1a49165d836476cd71bb960131",
"hash": "sha256-wdAigh3qUzB3wmh6q/dwCHHhuyqyAmqV+NSvrzjODVM="
},
"version": "unstable-2024-02-27"
"version": "unstable-2024-03-02"
},
"flycast": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "flyinghead",
"repo": "flycast",
"rev": "bc51aefa9c52981621abf1d3545bff7befa4d01b",
"hash": "sha256-NSCJxex5Rl7sWe2DkJ2aIyPzfdTcwSRb2iI3xpvYiow=",
"rev": "391da7023f63c2afd32af72ac9f2cfb02bbc7eb6",
"hash": "sha256-fcNpFl6VwaoL2mWZOgyVoJWX9CV2KbWctukdxxo797I=",
"fetchSubmodules": true
},
"version": "unstable-2024-02-23"
"version": "unstable-2024-03-04"
},
"fmsx": {
"fetcher": "fetchFromGitHub",
@ -348,20 +348,20 @@
"src": {
"owner": "libretro",
"repo": "gambatte-libretro",
"rev": "4041d5a6c474d2d01b4cb1e81324b06b51d0147b",
"hash": "sha256-TmPOka3oz5xIFDEsmDbvXXmLmP15FtQdoUZ+FErbqrI="
"rev": "9806d3f12bc3a831fad3f71c6fbad6f93d83581c",
"hash": "sha256-EdqS410TZyRqE/nd/oLJt7dauN0DCtNnhB6k6CPd/tc="
},
"version": "unstable-2024-02-23"
"version": "unstable-2024-03-01"
},
"genesis-plus-gx": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "Genesis-Plus-GX",
"rev": "b38cdca9036332c1b7b05817432d1fd42d59527b",
"hash": "sha256-5yr64Jy8WxamMknIG9nhIV4BLTZg8k7Q8Lnw8sfmWhk="
"rev": "d434ad9ee418247490a8560b52e0651d25304f35",
"hash": "sha256-v6IYku+9hLlGD0sgkzoatdD7Glp/3pgwBE2K4hdsFec="
},
"version": "unstable-2024-02-23"
"version": "unstable-2024-03-02"
},
"gpsp": {
"fetcher": "fetchFromGitHub",
@ -408,10 +408,10 @@
"src": {
"owner": "libretro",
"repo": "mame",
"rev": "8ebaec4073703f5050dac3f6c8da408943e15938",
"hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk="
"rev": "6d6d21fd9e41dab2b0e0ca0587baf3fcad18fd67",
"hash": "sha256-8pPDIxnEeeTQl160E+sg/wmchOR53pQmbhvEAXRFif0="
},
"version": "unstable-2024-02-13"
"version": "unstable-2024-02-29"
},
"mame2000": {
"fetcher": "fetchFromGitHub",
@ -438,10 +438,10 @@
"src": {
"owner": "libretro",
"repo": "mame2003-plus-libretro",
"rev": "d3bc97daafcd0ff8498c4e1acd8996accb668ad3",
"hash": "sha256-Ua/uP9vXKiij+VyEOf7lAD352LGpoqH3nuHAjDTaYus="
"rev": "a7cb863de48247c771a0fcc71d519131eae4e9c6",
"hash": "sha256-Y/Zyfck5tJ6oVsL/WjNXJZdPE5THeyBD5tNzJQaLSn8="
},
"version": "unstable-2024-02-26"
"version": "unstable-2024-03-02"
},
"mame2010": {
"fetcher": "fetchFromGitHub",
@ -518,10 +518,10 @@
"src": {
"owner": "libretro",
"repo": "mgba",
"rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486",
"hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM="
"rev": "b2564482c86378581a7a43ef4e254b2a75167bc7",
"hash": "sha256-9qHk4V7wb9YISpZ2xO2NWCGCFMRWpE8lAKTzIldsC9M="
},
"version": "unstable-2023-05-28"
"version": "unstable-2024-02-28"
},
"mrboom": {
"fetcher": "fetchFromGitHub",
@ -651,22 +651,22 @@
"src": {
"owner": "jpd002",
"repo": "Play-",
"rev": "a9a404632d3c6457e103314edb5f0985729ed0f1",
"hash": "sha256-PpRQXSK3TujmNL3Tmfva2oV6mWANGqz81ffiC99vuzQ=",
"rev": "79cb8379b0ac86d26bacf85f34b5d199b232f6fa",
"hash": "sha256-lXSbFsbZh01FxzN1f0pBSFXrJe1RimlmmmTB9GitQzo=",
"fetchSubmodules": true
},
"version": "unstable-2024-02-23"
"version": "unstable-2024-03-05"
},
"ppsspp": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "bc18fb145bda05735b92dde1869426c3380d35e5",
"hash": "sha256-sofvjkrKDTCHyYWIqlaAR6kN3JdBOjh67pNCvw5IXi8=",
"rev": "0159102a191d43de7ae51775a79846efa2635988",
"hash": "sha256-b7QOOpeoVJUComVOlMtZK8B5w5vkE6rxJVEHecJE19k=",
"fetchSubmodules": true
},
"version": "unstable-2024-02-27"
"version": "unstable-2024-02-28"
},
"prboom": {
"fetcher": "fetchFromGitHub",
@ -793,10 +793,10 @@
"src": {
"owner": "stella-emu",
"repo": "stella",
"rev": "4557099e5d7a0c0b02424ea85d2a4b093911e048",
"hash": "sha256-wyJExpIIScgLTALgvqW5f/QgIsMC19JU8Meh3mV4d2c="
"rev": "a311e1d714db3837ae4c05e2fab0abcf092a2e54",
"hash": "sha256-QJirSJleSPezNoyH2DKkaoNmGY3r/5J64IHBp+MeFvI="
},
"version": "unstable-2024-02-02"
"version": "unstable-2024-03-03"
},
"stella2014": {
"fetcher": "fetchFromGitHub",

4
pkgs/applications/gis/grass/default.nix
View file

@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [
"--with-blas"
"--with-fftw"
"--with-geos"
# It complains about missing libmysqld but doesn't really seem to need it
"--with-mysql"
@ -107,10 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-proj-share=${proj}/share/proj"
"--with-pthread"
"--with-readline"
"--with-zstd"
"--without-opengl"
] ++ lib.optionals stdenv.isLinux [
"--with-pdal"
] ++ lib.optionals stdenv.isDarwin [
"--without-cairo"
"--without-freetype"

6
pkgs/applications/networking/cluster/k9s/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.31.9";
version = "0.32.2";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
hash = "sha256-yPSAHqnGdLW2a2TCR7HPl8e5WlG+ruHwITATtivtBnw=";
hash = "sha256-lqLXk98rH5ZBI54ovj7YlyPh88d9Z9/jPjwUixeNJQc=";
};
ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-roHFUKH72BSzqZp2qh/Hw7rfTXj9yqpJyB2dozUz+Y8=";
vendorHash = "sha256-R/lQAjEfch3RtJNsny6ox0ZgUOFGZdoUEgmeIIM/pmQ=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

4
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View file

@ -45,8 +45,8 @@ let
}
else
{
version = "2024";
hash = "sha256-BNIm1SBmqLw6QuANYhPec3tOwpLiZwMGWST/AZVoAeI=";
version = "2024.1";
hash = "sha256-k32PEqNv/78q963XGtu1qlxVN4ktRsmnavvsqxqgqsc=";
};
in stdenv.mkDerivation rec {

23
pkgs/build-support/php/hooks/php-script-utils.bash
View file

@ -13,7 +13,28 @@ setComposeRootVersion() {
}
checkComposerValidate() {
if ! composer validate --strict --no-ansi --no-interaction; then
if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --no-check-lock; then
if [ "1" == "${composerStrictValidation-}" ]; then
echo
echo -e "\e[31mERROR: composer files validation failed\e[0m"
echo
echo -e '\e[31mThe validation of the composer.json failed.\e[0m'
echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m'
echo
exit 1
else
echo
echo -e "\e[33mWARNING: composer files validation failed\e[0m"
echo
echo -e '\e[33mThe validation of the composer.json failed.\e[0m'
echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m'
echo
echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m'
echo
fi
fi
if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock; then
if [ "1" == "${composerStrictValidation-}" ]; then
echo
echo -e "\e[31mERROR: composer files validation failed\e[0m"

4
pkgs/by-name/au/audiness/package.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "audiness";
version = "0.2.1";
version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "audiusGmbH";
repo = "audiness";
rev = "refs/tags/${version}";
hash = "sha256-QznJdm9wSmxdWxaRYgiaUqFfRs2apLuQOIr226eFIGA=";
hash = "sha256-PkzYsfEhwrMoB+a2eJMmt/PRCbjASQRm38reA8PP4aI=";
};
nativeBuildInputs = with python3.pkgs; [

6
pkgs/by-name/ez/eza/package.nix
View file

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.18.5";
version = "0.18.6";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-L0FF9pN4WGCFpg2MPAvrKC/DwyWK6BWGxwYEpQBl9Rw=";
hash = "sha256-xdMoOGOHbGNRouVbJewQ1bWJbd7nusq3H7mXDC4AIXU=";
};
cargoHash = "sha256-bZ2NzFpB9vpT0mB2LsETdmtzYAwNrpzBRoqmm4+13+0=";
cargoHash = "sha256-IM1dxTaFa5kq94pn6QQrUGg6fZWhBZsf4ZND42BPVag=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]

12
pkgs/by-name/ja/jasper/package.nix
View file

@ -23,7 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-SE3zB+8zZuuT+W6QYTuQhM+dBgYuFzYK4a7QaquGB60=";
};
outputs = [ "out" "dev" "doc" "lib" "man" ];
# Splitting outputs going bad on Darwin
outputs = if stdenv.isDarwin
then [ "out" ]
else [ "out" "dev" "doc" "lib" "man" ];
nativeBuildInputs = [
cmake
@ -75,12 +78,13 @@ stdenv.mkDerivation (finalAttrs: {
was chosen primarily due to the availability of C development environments
for most computing platforms when JasPer was first developed, circa 1999.
'';
license = lib.licenses.mit;
license = with lib.licenses; [ mit ];
mainProgram = "jasper";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
# The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling.
# The value of __STDC_VERSION__ cannot be automatically determined when
# cross-compiling.
broken = stdenv.buildPlatform != stdenv.hostPlatform;
};
})
# TODO: investigate opengl support

4
pkgs/by-name/ll/llama-cpp/package.nix
View file

@ -69,13 +69,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "2294";
version = "2346";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-uZi4Bj03PgfFV+jS5M+A1sMCWC/GMY5IyyrlR1b4Sh4=";
hash = "sha256-s937fAOUjid2H+6OQEMicdkFQVqPJ37GR+DMrCV1ky4=";
};
postPatch = ''

14
pkgs/by-name/rl/rl_json/package.nix
View file

@ -5,15 +5,15 @@
, tcl
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rl_json";
version = "0.14";
version = "0.15.1";
src = fetchFromGitHub {
owner = "RubyLane";
repo = "rl_json";
rev = version;
hash = "sha256-7xjZQ8F8czrkr7p2Xg1xAZRCsDpiWXHXVxPhG0f9PNg=";
rev = finalAttrs.version;
hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA=";
fetchSubmodules = true;
};
@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
values, and comparable in speed.
'';
maintainers = with lib.maintainers; [ fgaz ];
platforms = lib.platforms.all;
platforms = tcl.meta.platforms;
# From version 0.15.1: 'endian.h' file not found
broken = stdenv.isDarwin;
};
}
})

2
pkgs/data/themes/adapta-kde/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A port of the Adapta theme for Plasma";
homepage = "https://git.io/adapta-kde";
homepage = "https://github.com/PapirusDevelopmentTeam/adapta-kde";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.tadfisher ];
platforms = lib.platforms.all;

2
pkgs/data/themes/arc-kde/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A port of the arc theme for Plasma";
homepage = "https://git.io/arc-kde";
homepage = "https://github.com/PapirusDevelopmentTeam/arc-kde";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.nixy ];
platforms = lib.platforms.all;

13
pkgs/development/php-packages/castor/default.nix
View file

@ -8,26 +8,25 @@
php.buildComposerProject (finalAttrs: {
pname = "castor";
version = "0.11.1";
version = "0.13.1";
src = fetchFromGitHub {
owner = "jolicode";
repo = "castor";
rev = "v${finalAttrs.version}";
hash = "sha256-FqFCKvhOEtDERNRLB3613geEiNDOlQuLeCa5uVvoMdM=";
hash = "sha256-Sm6I306iKVr66sBp+ADeTZAKGToVMc+Y/BCymUdszNc=";
};
vendorHash = "sha256-+ORwa3+tkVJ9KU+9URg+1lyHoL1swxg6DG5ex8HjigE=";
vendorHash = "sha256-KbmovAnejShyVclF4IcZ9ckUOWysfEz3DFqE8OxlzI0=";
nativeBuildInputs = [ installShellFiles ];
# install shell completions
postInstall = ''
echo "yes" | ${php}/bin/php $out/share/php/castor/bin/castor
installShellCompletion --cmd castor \
--bash <(${php}/bin/php $out/share/php/castor/bin/castor completion bash) \
--fish <(${php}/bin/php $out/share/php/castor/bin/castor completion fish) \
--zsh <(${php}/bin/php $out/share/php/castor/bin/castor completion zsh)
--bash <($out/bin/castor completion bash) \
--fish <($out/bin/castor completion fish) \
--zsh <($out/bin/castor completion zsh)
'';
passthru = {

8
pkgs/development/python-modules/llama-index-readers-file/default.nix
View file

@ -6,13 +6,15 @@
, poetry-core
, pymupdf
, pypdf
, pytestCheckHook
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "llama-index-readers-file";
version = "0.1.7";
inherit (llama-index-core) version src meta;
inherit (llama-index-core) src meta;
pyproject = true;
@ -40,6 +42,10 @@ buildPythonPackage rec {
pypdf
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"llama_index.readers.file"
];

4
pkgs/development/python-modules/llama-parse/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "llama-parse";
version = "0.3.5";
version = "0.3.6";
pyproject = true;
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_parse";
inherit version;
hash = "sha256-c2qA5PxZcLnL7xBIFxkIAh69Jr5D8HuAaInw0bs4df4=";
hash = "sha256-mAk+YCJeer1ReluiRagiQy00XRNqX5iLS029oFdYAqE=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/reptor/default.nix
View file

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "reptor";
version = "0.11";
version = "0.12";
pyproject = true;
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "Syslifters";
repo = "reptor";
rev = "refs/tags/${version}";
hash = "sha256-OJcg/e+ZC5Hf4dkP1dhsR9A+5lWvuFeuNLXyW8Hw6ko=";
hash = "sha256-8XjEWs+LKKc7ztNchNVmW+YGdYpmi5ee4eOoXIUBoM8=";
};
pythonRelaxDeps = true;

5
pkgs/kde/frameworks/baloo/default.nix
View file

@ -6,5 +6,10 @@
mkKdeDerivation {
pname = "baloo";
# kde-systemd-start-condition is not part of baloo
postPatch = ''
substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition
'';
extraBuildInputs = [qtdeclarative lmdb];
}

386
pkgs/kde/generated/sources/plasma.json
View file

@ -1,317 +1,317 @@
{
"bluedevil": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/bluedevil-6.0.0.tar.xz",
"hash": "sha256-gxRzBpx78HGHryrLsQHTpsdHVVh+SQFCCY1aoFTuYmU="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/bluedevil-6.0.1.tar.xz",
"hash": "sha256-7bpz4yNYWvTgzHhtCAZXclkRP9fLH6sPYsvHOL1/53k="
},
"breeze": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/breeze-6.0.0.tar.xz",
"hash": "sha256-vHKhaxFre+q/G06aRRAZ+QSOe+awWsc6RifyWywgWeo="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/breeze-6.0.1.tar.xz",
"hash": "sha256-IASCzv0Gbg1I4WqnOAqcsA5jSyujSDTNxzVPNjtgVE0="
},
"breeze-grub": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/breeze-grub-6.0.0.tar.xz",
"hash": "sha256-bsSL/16nneLcQgdr5ROGb9zV10K0ZytpDK8u3OXLcNY="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/breeze-grub-6.0.1.tar.xz",
"hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM="
},
"breeze-gtk": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/breeze-gtk-6.0.0.tar.xz",
"hash": "sha256-zsTK8cIpvDDKAMZgXbTbmKllAhZ/NKm3fKArJrSZqzY="
"version": "6.0.1.1",
"url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.1.tar.xz",
"hash": "sha256-I8qWYBzJv/AENPf7/jkB+8uSNi0XUaMcCFIPtMESRhA="
},
"breeze-plymouth": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/breeze-plymouth-6.0.0.tar.xz",
"hash": "sha256-J3eGWAwBDAmqGS+I0JZFmvYKKv/yWpDo/TldOlInpkw="
"version": "6.0.1.1",
"url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.1.tar.xz",
"hash": "sha256-Xk/enHtV4kwK4inPSrct34g1nvewvSrnFbuH4eDx94I="
},
"discover": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/discover-6.0.0.tar.xz",
"hash": "sha256-e6gl/kd5pJX/7UaStQ5xFw4gIz25kB7L4VKO3Dqz37A="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/discover-6.0.1.tar.xz",
"hash": "sha256-fVGh2NErdS2rcyHMKC/mT8L2H5OAfDUzi1BEp4ahoZo="
},
"drkonqi": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/drkonqi-6.0.0.tar.xz",
"hash": "sha256-oI1SR63vWJ5K+8ow3xSPjxgjfFDWThOkzphb93h9MQY="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/drkonqi-6.0.1.tar.xz",
"hash": "sha256-X2YFQ8MKee/7SJANHrrZ+eViBRTaq96b2rwrXwGyAm0="
},
"flatpak-kcm": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/flatpak-kcm-6.0.0.tar.xz",
"hash": "sha256-3u5cNcxTHAkuSJjmvJUInDOzJ5z1mPk0RjY8bYD7cSE="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/flatpak-kcm-6.0.1.tar.xz",
"hash": "sha256-sHI/1B0LYRm1cplSH0iy1jXeIsZ3mfK/UDxbfD+N5YM="
},
"kactivitymanagerd": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kactivitymanagerd-6.0.0.tar.xz",
"hash": "sha256-khCzkcMpAY5FrGXG46d/ZFMvPgF2xYm812RgwgMBAvw="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kactivitymanagerd-6.0.1.tar.xz",
"hash": "sha256-L5LCvqE8fGn2gjfoyHBvfNnP70CdWex8HcSd+JRvsrc="
},
"kde-cli-tools": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kde-cli-tools-6.0.0.tar.xz",
"hash": "sha256-Q3DJO7XCBe8yv0i8APJj6qOQt/G0bfh1pC/L/79Ch0E="
},
"kdecoration": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kdecoration-6.0.0.tar.xz",
"hash": "sha256-NjpdI9kJUqXi4yvH+/Qf9Nu7fM/xOL7xnUiz2tEfFVE="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kde-cli-tools-6.0.1.tar.xz",
"hash": "sha256-RuDbooTXS1BpScAw4/gX8RwpJiwRbT6aKp5l855DzRU="
},
"kde-gtk-config": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kde-gtk-config-6.0.0.tar.xz",
"hash": "sha256-YAcf/LVCeBilDKqVsickidoQgFwyuXXTggJsB4+NhFM="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kde-gtk-config-6.0.1.tar.xz",
"hash": "sha256-u1Df3OqfIavqqAs91SiZMhrRi2bjNRYfZrRHKWCJflU="
},
"kdecoration": {
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kdecoration-6.0.1.tar.xz",
"hash": "sha256-gSDaTJyMrv6nYKj5egjz7P//uK8ncqtE34EJ9hn/NZY="
},
"kdeplasma-addons": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kdeplasma-addons-6.0.0.tar.xz",
"hash": "sha256-vQ1ZBmRGTIhv4URHvjjBYakntw+2yc4opwkPkJAmDPc="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kdeplasma-addons-6.0.1.tar.xz",
"hash": "sha256-ZFjmBdJY4LKkLWAUwzaALBDfGvP+FPNND9v56THNK28="
},
"kgamma": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kgamma-6.0.0.tar.xz",
"hash": "sha256-lwTTLITibYwzAX8LDFYrdBu7ZpW4n6OIKfyEN1pQVmU="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kgamma-6.0.1.tar.xz",
"hash": "sha256-+2CVNijflwfXuoMVXVgo1fRNCT7YQZdMeO6adOzjyRI="
},
"kglobalacceld": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kglobalacceld-6.0.0.tar.xz",
"hash": "sha256-qn6zTz36/cL0dbsg7WqFY6Lp+/sGRwiQ4SfckFT5Rao="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kglobalacceld-6.0.1.tar.xz",
"hash": "sha256-tA1DMo0CPXqxsmWj6FUNv+8rjQ0dsq2oWBEdzzwZTqc="
},
"kinfocenter": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kinfocenter-6.0.0.tar.xz",
"hash": "sha256-byma0LoUOGQSDazzZUSGOkkGg1pZFcHLiRcGzzmjfnk="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kinfocenter-6.0.1.tar.xz",
"hash": "sha256-FP7LO/ME5sI3eJ2WL+o/vHJWsEAwde2b9K661Y+IluA="
},
"kmenuedit": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kmenuedit-6.0.0.tar.xz",
"hash": "sha256-+moJ6P7DQ2gNWNR9rt8NWCZ/i5kPEuLFCqcrq8ljrF8="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kmenuedit-6.0.1.tar.xz",
"hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ="
},
"kpipewire": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kpipewire-6.0.0.tar.xz",
"hash": "sha256-3Vhe5N47W83BDzb+XfkZZkR8pxZXDWtOoVFg2x8dc7w="
"version": "6.0.1.1",
"url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.1.tar.xz",
"hash": "sha256-GQLzlJBS/xq12nnGMJWG8+EaKcfASgRPc7P2rJglHEo="
},
"kscreen": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kscreen-6.0.0.tar.xz",
"hash": "sha256-+XwEV2MLzg2Q/bwPbEXx4rIaYBRL0YLYtB9Yk5v9c0Y="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kscreen-6.0.1.tar.xz",
"hash": "sha256-WHLCDvu4mvi59SZWsFyYaE4PrOWAAdOw7g2nslgi9ho="
},
"kscreenlocker": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kscreenlocker-6.0.0.tar.xz",
"hash": "sha256-JQL6qFyHRgpLXqu5J2nTPBls0zc7PzpSHtOW5QTSKrY="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kscreenlocker-6.0.1.tar.xz",
"hash": "sha256-Kd74dcQG41cCjekXiFh/3mtTrL0Q1LgXd1S+z12VYCg="
},
"ksshaskpass": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/ksshaskpass-6.0.0.tar.xz",
"hash": "sha256-tdkYWBTLYsZMVfTA67KQ0jn3Pqr3IVjEWOVkM4xV7cY="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/ksshaskpass-6.0.1.tar.xz",
"hash": "sha256-0kRZcKvMZXYVKLfTp7KAJAb6ykTYkowpUOR7dXMDIUY="
},
"ksystemstats": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/ksystemstats-6.0.0.tar.xz",
"hash": "sha256-qFAYXmObZ4kt6lGy/7cadJj9BJ/8KNFz5u58atPzzro="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/ksystemstats-6.0.1.tar.xz",
"hash": "sha256-Bxr+Zkw47Gq3spK5DmtVzC0r6yC+P4qlOxMWgok6XEk="
},
"kwallet-pam": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kwallet-pam-6.0.0.tar.xz",
"hash": "sha256-GTqIHaQf8VG84ejt86CUqzUbUi/ZDjenNX0aGV7wBno="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kwallet-pam-6.0.1.tar.xz",
"hash": "sha256-Gti7wB7F0cIUQSK9PYKyJn2nfQdq47+ku/HEGi1wulA="
},
"kwayland": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kwayland-6.0.0.tar.xz",
"hash": "sha256-ADEglGgZZqTPaSKIOYBHokE28bzhMjBzBNDf+hz57Xk="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kwayland-6.0.1.tar.xz",
"hash": "sha256-0rTZqzHiVNZ1ek7GqxzngNvGwA1Mj2pdoHz5GB6MhZU="
},
"kwayland-integration": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kwayland-integration-6.0.0.tar.xz",
"hash": "sha256-BOLLxF6jxLbxiroWYQ/Sx/ogsmPKYGKQsbJ1RmUBAek="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kwayland-integration-6.0.1.tar.xz",
"hash": "sha256-G4S88fPSm7FKvEVUR4r9srx8x5UboSwtPIgCM4uzLHM="
},
"kwin": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kwin-6.0.0.tar.xz",
"hash": "sha256-sZR8K0TeYZCQhGLIHorIn/nHMmqHZB/rZebM2FJipNs="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kwin-6.0.1.tar.xz",
"hash": "sha256-bmGFfFAwt7OVPMDaXulKJDdVmZpM4AegAxH5HbiXXwQ="
},
"kwrited": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/kwrited-6.0.0.tar.xz",
"hash": "sha256-9kHAA98JHE83lsTG8xUdVieoo4UxAITi5/T8rPT3SmI="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/kwrited-6.0.1.tar.xz",
"hash": "sha256-YGx8Iojk9T9YmUPQhhjuFcOulE+HCDwJM7u+LeAhdBI="
},
"layer-shell-qt": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/layer-shell-qt-6.0.0.tar.xz",
"hash": "sha256-FaV6gtnMsNUgtVihc/Mxs5d1yADAsoSB2oCBFeHSirQ="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/layer-shell-qt-6.0.1.tar.xz",
"hash": "sha256-PbMq6DC2f1Wl3ikrdXkRJKft0DOYm36T5L2RPFj9l58="
},
"libkscreen": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/libkscreen-6.0.0.tar.xz",
"hash": "sha256-xCpykMiZ/IuIeJCnsD79cgtHbXrG/JHGTm8D2t/wm0Q="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/libkscreen-6.0.1.tar.xz",
"hash": "sha256-8D3Px59OGyDSvT0WluRiKpW8TTtjYHgP3wxAj/o2KJs="
},
"libksysguard": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/libksysguard-6.0.0.tar.xz",
"hash": "sha256-a3LM++1p8nvOwNhkFO14CHAQmAHMIMUFkBZXyFw2RN0="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/libksysguard-6.0.1.tar.xz",
"hash": "sha256-kPDmZzBbmqucMqToAQyqzGqfsfyBpzuB0uu7SEXrLwM="
},
"libplasma": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/libplasma-6.0.0.tar.xz",
"hash": "sha256-sdj0cBoAndGHl8v2jwa9xFo+haJDsEGQiQtLQEQJJ9I="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/libplasma-6.0.1.tar.xz",
"hash": "sha256-df7WkHW/Eazi++KfHRUnDIc3+6qReJBQSe/YAt52tHQ="
},
"milou": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/milou-6.0.0.tar.xz",
"hash": "sha256-yOqST3w5FeHeqlIgugByOFJrPfkCmzrJjsoVjlVSs0o="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/milou-6.0.1.tar.xz",
"hash": "sha256-wC6xYOq3nUvsGvh3RDptPGVfS5UsUXHhmHAT2s1L5hA="
},
"ocean-sound-theme": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/ocean-sound-theme-6.0.0.tar.xz",
"hash": "sha256-IqDtyoacebSb5aJVtsPfsNJYTJ72jbt5BhOKfJb2efo="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/ocean-sound-theme-6.0.1.tar.xz",
"hash": "sha256-YoctZEvuhcjofoyUcER3ttxIdyU8bqLfwGWeodN6sp0="
},
"oxygen": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/oxygen-6.0.0.tar.xz",
"hash": "sha256-+5NjfGeceeuPdkPn1IQiVfN/kluWW84v1Vf4Ct/6weg="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/oxygen-6.0.1.tar.xz",
"hash": "sha256-Tdkt0bgp7pwlSRunoigb2cTsmV1ujdBM+ZDr+4lJ91Q="
},
"oxygen-sounds": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/oxygen-sounds-6.0.0.tar.xz",
"hash": "sha256-dWWuHsxtOVvK9DaH7/lPVu2opCidDG/19KV1E5HG5Y8="
},
"plasma5support": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma5support-6.0.0.tar.xz",
"hash": "sha256-qhMUh/8sdciSzoxSgTtuH+LWpJ9S7QjzhwDiLA6Z6+0="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/oxygen-sounds-6.0.1.tar.xz",
"hash": "sha256-bMbU68dKW17oLbEg9tdX28F/m3CRJ5hACiATMjGbeo8="
},
"plasma-activities": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-6.0.0.tar.xz",
"hash": "sha256-8L0Hu82QIscuVkBGBGAps59x0cxbRnufUJFIEwQ7J5U="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-6.0.1.tar.xz",
"hash": "sha256-L9fe7g6q78KXoC5o4Ra09tqUdbtvJvc9fO0bWSK/TYY="
},
"plasma-activities-stats": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-stats-6.0.0.tar.xz",
"hash": "sha256-Xmqw/l88XbDeLr5q3NecJhcLkq3cBWzzXwSE+0UAfS4="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-stats-6.0.1.tar.xz",
"hash": "sha256-d5/1WkSbl0UpWn3L/5oiq7TU8PdKgHIZZ09iT3tVpuo="
},
"plasma-browser-integration": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-browser-integration-6.0.0.tar.xz",
"hash": "sha256-IdX3JyJKnhxUhqc0UELbQoLqpC4JpoUvt3tbATX09kE="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-browser-integration-6.0.1.tar.xz",
"hash": "sha256-QpBJgaCwFxKG71tTAJHrXzZgBfEfzLlslcr2GQXYFjU="
},
"plasma-desktop": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-desktop-6.0.0.tar.xz",
"hash": "sha256-kkzgTbLIjPeuGiPxmzjrRSl3CHtuk37QVozlOXvMkn0="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-desktop-6.0.1.tar.xz",
"hash": "sha256-l9dA6OO1/5IXO5qQhlZ9/0D/dwyjTQzs/rNdZQgIovE="
},
"plasma-disks": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-disks-6.0.0.tar.xz",
"hash": "sha256-uC/+Mn227ddGxCL3HgBxUjcT3m2bL0b7DhLQMAKHTyo="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-disks-6.0.1.tar.xz",
"hash": "sha256-eC8HigBYUBU7uH3zZjRI/Uqpz/TMfMve+kClFq1+p/4="
},
"plasma-firewall": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-firewall-6.0.0.tar.xz",
"hash": "sha256-MrC04kHmfXqrKt5eo0VnDwlFhQ4iDWWro8blX2AYV5Y="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-firewall-6.0.1.tar.xz",
"hash": "sha256-K+GFZDSTYBGZiCUf4VLAdiBLR0LsDSFv5RtRjopzaec="
},
"plasma-integration": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-integration-6.0.0.tar.xz",
"hash": "sha256-Ez/2bspjY7eYtRUuluNwQAIT5aK8KL1jPYtpFAawLEE="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz",
"hash": "sha256-FtEj3D9ZxJIlG44vupScddO/D2fzzs+WxRvkjcQUQp8="
},
"plasma-mobile": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-mobile-6.0.0.tar.xz",
"hash": "sha256-128H4RR/0utqMuNdfLTIR5XtoysWHLCmCgRnah6ab/M="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-mobile-6.0.1.tar.xz",
"hash": "sha256-snOILhyWtKu57n9BInxHokC6v+9FkJ8N13ysBa02QAg="
},
"plasma-nano": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-nano-6.0.0.tar.xz",
"hash": "sha256-mfxE3tTdO0TEX4k+2SIaphJt3p1Paty3JwTAOpMgfCc="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-nano-6.0.1.tar.xz",
"hash": "sha256-IEHQFekEQButOtNaSjEC2kaGau6PycwMk9o3246plHQ="
},
"plasma-nm": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-nm-6.0.0.tar.xz",
"hash": "sha256-Us+Wc4zur85l8YOjRXMlrrWx8YpDNs7t5aImVW5unrQ="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-nm-6.0.1.tar.xz",
"hash": "sha256-cKIB7prSAiQrAP9QYZZkrFIFlE+J3yrDpyqfTOV4kyo="
},
"plasma-pa": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-pa-6.0.0.tar.xz",
"hash": "sha256-tJq7K7dEAbIs2uHZkhAddktIOhjGAIfCAvbmlRRdAiw="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-pa-6.0.1.tar.xz",
"hash": "sha256-Jyjs2fHFEG/ovAfwsDvaMWA2rcXQOjrAAVEfdUPDN8c="
},
"plasma-sdk": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-sdk-6.0.0.tar.xz",
"hash": "sha256-jLLeV6og30Qzp9lRMGpjfMKErOuuKzTPpxxQ7j7eKqo="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-sdk-6.0.1.tar.xz",
"hash": "sha256-cuDXrIGZJI96emqO3nvc1geZDVhnqZmOHmrxT9cjKLc="
},
"plasma-systemmonitor": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-systemmonitor-6.0.0.tar.xz",
"hash": "sha256-WJ/QTx/g2Wv6KXpP4D7rAVx7X4OZMlvyMyd9/nnmb5k="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-systemmonitor-6.0.1.tar.xz",
"hash": "sha256-L4l5l4s0jWtxrAePmJ3SH/TptrDSW15Zo3G+UA/JnVE="
},
"plasma-thunderbolt": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-thunderbolt-6.0.0.tar.xz",
"hash": "sha256-BHjvWduv56m0l00o8Ukcud37OZ+DHW3BulqwN1zoqJ8="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-thunderbolt-6.0.1.tar.xz",
"hash": "sha256-mzw6wQ94iaZr+rv2KCPsld/a2f9GZSltDCB9S9KIkr0="
},
"plasma-vault": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-vault-6.0.0.tar.xz",
"hash": "sha256-ZB3XHds51dFb6E1LDCTVoODEG0zityVzj6cuWcRS7ak="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-vault-6.0.1.tar.xz",
"hash": "sha256-rWYoml4dP23zwX2xah+IwVi0z3h2VnJuiVhI0L5u0AU="
},
"plasma-welcome": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-welcome-6.0.0.tar.xz",
"hash": "sha256-xihVGMLHIQfGgnqdcZj5Oh8wrsb5mZPCoxHjE3/T5mw="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-welcome-6.0.1.tar.xz",
"hash": "sha256-+Lrjd8pQpMvsSpYwXy4rjowzNZ9ZamSFEQirCVC280E="
},
"plasma-workspace": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-6.0.0.tar.xz",
"hash": "sha256-R92HtMDgnBvLNBYreq4+WjuaSquhuf7Q9NaBuz+f67o="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-6.0.1.tar.xz",
"hash": "sha256-1MNcsWi5kEh7OfG36xlGkJxedPAgDQ3i0xdlnBbxWgw="
},
"plasma-workspace-wallpapers": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-wallpapers-6.0.0.tar.xz",
"hash": "sha256-Tde+PXqq8Bt8mmKGX/BITnSvEbJGhcVCMaMV90r2uB0="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-wallpapers-6.0.1.tar.xz",
"hash": "sha256-MWMiru1TqQSs+mk3gT320hZEmM2dTC8th7YQu1vPgs4="
},
"plasma5support": {
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plasma5support-6.0.1.tar.xz",
"hash": "sha256-CyW9EyMGCEy1wNrgfFwP+noy2eserMDTS1bnhHEe0zU="
},
"plymouth-kcm": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/plymouth-kcm-6.0.0.tar.xz",
"hash": "sha256-D79i6jP593fdbe4JPQlALUtNmF2Ghuc1S7xDavqJLeM="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/plymouth-kcm-6.0.1.tar.xz",
"hash": "sha256-RQtov7L/0cuFzQLE1kEgg3iHB4SBGn+POngU1mM1Ink="
},
"polkit-kde-agent-1": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/polkit-kde-agent-1-6.0.0.tar.xz",
"hash": "sha256-LM/EGoPP74ybMxH+H5OrUtBi9jsPblpjsIJA7RFTqk4="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/polkit-kde-agent-1-6.0.1.tar.xz",
"hash": "sha256-YpgXxuVqVkfDr5fW3JYOd0RGAzK9PeavgJCV6LUy2T0="
},
"powerdevil": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/powerdevil-6.0.0.tar.xz",
"hash": "sha256-EmNCdg4bjKS5j6hXmryqQVuFnX1tGAKzagJWSGcssFA="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/powerdevil-6.0.1.tar.xz",
"hash": "sha256-CsSPI+gmRDhDQPBjkDeoQkFpqOGjS0nz9tJQUzJC0K8="
},
"print-manager": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/print-manager-6.0.0.tar.xz",
"hash": "sha256-vZBXi5HmyQoTxa/PlLwW1XvHo7feiURb+gFfDE54FP0="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/print-manager-6.0.1.tar.xz",
"hash": "sha256-qMam4P00JMAi1yEUEKP3dMNT+G7ny08Yrb06pnEhl0o="
},
"qqc2-breeze-style": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/qqc2-breeze-style-6.0.0.tar.xz",
"hash": "sha256-pDDhl8ITxJif4Q/CSeTwrkYu4dP11vvJWPQus4sEySc="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/qqc2-breeze-style-6.0.1.tar.xz",
"hash": "sha256-d4hSRmOyOT2I8DeYeKu9HlLAUg6zyofZVHh3aiUCkLQ="
},
"sddm-kcm": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/sddm-kcm-6.0.0.tar.xz",
"hash": "sha256-iBIFJOqFFY5nhPNSP7cGQ8KmXBn+cu4NXwQAc6wih48="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/sddm-kcm-6.0.1.tar.xz",
"hash": "sha256-f8538z7WWFkQNx2YP+LiCxB/7KvIZS+K+wjZrhk+4c8="
},
"systemsettings": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/systemsettings-6.0.0.tar.xz",
"hash": "sha256-Vh+QE7oHBxwK3Xd4WOyF1AqN3fzIOhD18Ess4QFmZrw="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/systemsettings-6.0.1.tar.xz",
"hash": "sha256-HGShWBnCxoPGaXJfEa6Fos3ElOR5lvalbLLYExiQTZU="
},
"wacomtablet": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/wacomtablet-6.0.0.tar.xz",
"hash": "sha256-1/MYJz6HWKOiJAFuEJMIc/uO1wnZzWrMJm1lp47k0Ww="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/wacomtablet-6.0.1.tar.xz",
"hash": "sha256-m4LCsY3YClBN6OAM1qT5ypB2vZj6b6EReCIj3pRdzj4="
},
"xdg-desktop-portal-kde": {
"version": "6.0.0",
"url": "mirror://kde/stable/plasma/6.0.0/xdg-desktop-portal-kde-6.0.0.tar.xz",
"hash": "sha256-xW7ePlFI33RoOWGLdLCuOPsPtrEM0Eo1xxvJL41X3Wo="
"version": "6.0.1",
"url": "mirror://kde/stable/plasma/6.0.1/xdg-desktop-portal-kde-6.0.1.tar.xz",
"hash": "sha256-2koLhkyhdujOGfbhXSfI+RkyOlGgck7II3gXnDFY2Zk="
}
}

2
pkgs/kde/lib/mk-kde-derivation.nix
View file

@ -100,6 +100,8 @@ in
cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags;
separateDebugInfo = true;
env.LANG = "C.UTF-8";
};
cleanArgs = builtins.removeAttrs args [

4
pkgs/kde/plasma/default.nix
View file

@ -9,8 +9,8 @@
flatpak-kcm = callPackage ./flatpak-kcm {};
kactivitymanagerd = callPackage ./kactivitymanagerd {};
kde-cli-tools = callPackage ./kde-cli-tools {};
kdecoration = callPackage ./kdecoration {};
kde-gtk-config = callPackage ./kde-gtk-config {};
kdecoration = callPackage ./kdecoration {};
kdeplasma-addons = callPackage ./kdeplasma-addons {};
kgamma = callPackage ./kgamma {};
kglobalacceld = callPackage ./kglobalacceld {};
@ -34,7 +34,6 @@
ocean-sound-theme = callPackage ./ocean-sound-theme {};
oxygen = callPackage ./oxygen {};
oxygen-sounds = callPackage ./oxygen-sounds {};
plasma5support = callPackage ./plasma5support {};
plasma-activities = callPackage ./plasma-activities {};
plasma-activities-stats = callPackage ./plasma-activities-stats {};
plasma-browser-integration = callPackage ./plasma-browser-integration {};
@ -53,6 +52,7 @@
plasma-welcome = callPackage ./plasma-welcome {};
plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {};
plasma5support = callPackage ./plasma5support {};
plymouth-kcm = callPackage ./plymouth-kcm {};
polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {};
powerdevil = callPackage ./powerdevil {};

6
pkgs/shells/nushell/default.nix
View file

@ -24,7 +24,7 @@
}:
let
version = "0.90.1";
version = "0.91.0";
in
rustPlatform.buildRustPackage {
@ -35,10 +35,10 @@ rustPlatform.buildRustPackage {
owner = "nushell";
repo = "nushell";
rev = version;
hash = "sha256-MODd2BT2g6g5H6/1EG5OjIoYm18yBSvYTR83RuYDMec=";
hash = "sha256-X3D+JRvnk6HMKWJMTNR16Fmhu+gYd8Ip+7PZQoLIoEU=";
};
cargoHash = "sha256-35KPY5t4aozHIcukmeS00g6tzZA9ZsS/44u9vpZ3oGQ=";
cargoHash = "sha256-Xj4P/qd4GvmhWGwGaPvY23cQwdjdf6cSb1xyRZLN0tQ=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]

2
pkgs/shells/nushell/plugins/formats.nix
View file

@ -12,7 +12,7 @@
rustPlatform.buildRustPackage rec {
pname = "nushell_plugin_formats";
inherit (nushell) version src;
cargoHash = "sha256-lMxI+tw5B6Q/ZXW1ANl+Oi/x37ds2IEuOkdPIV1zXLA=";
cargoHash = "sha256-sEc+Oa2s8d3/9mye/9cHipjamPmLj6P38Jh24VrpfXM=";
env = lib.optionalAttrs stdenv.cc.isClang {
LIBCLANG_PATH = "${libclang.lib}/lib";

2
pkgs/shells/nushell/plugins/gstat.nix
View file

@ -12,7 +12,7 @@
rustPlatform.buildRustPackage rec {
pname = "nushell_plugin_gstat";
inherit (nushell) version src;
cargoHash = "sha256-/viATLt2CixUCUa45YWo4fod2/iI/qvqB/BP8L8qrvY=";
cargoHash = "sha256-wtw4S5fbZPh6OXmbbQu8oXpo0/rXWdOGHspx+z8Fjns=";
env = lib.optionalAttrs stdenv.cc.isClang {
LIBCLANG_PATH = "${libclang.lib}/lib";

2
pkgs/shells/nushell/plugins/query.nix
View file

@ -11,7 +11,7 @@
rustPlatform.buildRustPackage {
pname = "nushell_plugin_query";
inherit (nushell) version src;
cargoHash = "sha256-pDsjKpb4c9nnYA81sQm4RCYhIoKJe+vcV1hs8KCSP9Q=";
cargoHash = "sha256-u6etPrtq/q37CvJ2rkoFvVDBgu/YyVugeGOJbeHcSek=";
env = lib.optionalAttrs stdenv.cc.isClang {
LIBCLANG_PATH = "${libclang.lib}/lib";

4
pkgs/tools/security/opensc/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "opensc";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "OpenSC";
rev = version;
sha256 = "sha256-1mm0b4AAtX0AgjShpU1FR6e7pUkea5TOJdIGkNQgjuE=";
sha256 = "sha256-pNorJiZzLGpxtlkog2d3E9xePMy9ASoHeWduqVZiBiA=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

5
pkgs/tools/virtualization/multipass/default.nix
View file

@ -70,8 +70,8 @@ stdenv.mkDerivation
# Patch the patch of the OVMF binaries to use paths from the nix store.
substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \
--replace "OVMF.fd" "${OVMF.firmware}" \
--replace "QEMU_EFI.fd" "${OVMF.firmware}"
--replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
--replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"
# Copy the grpc submodule we fetched into the source code.
cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc
@ -122,6 +122,7 @@ stdenv.mkDerivation
dnsmasq
iproute2
iptables
OVMF.fd
qemu
qemu-utils
xterm

6
pkgs/top-level/python-packages.nix
View file

@ -3601,7 +3601,7 @@ self: super: with self; {
ecoaliface = callPackage ../development/python-modules/ecoaliface { };
ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { });
ecos = callPackage ../development/python-modules/ecos { };
ecpy = callPackage ../development/python-modules/ecpy { };
@ -4716,9 +4716,9 @@ self: super: with self; {
gmpy = callPackage ../development/python-modules/gmpy { };
gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh {
gmsh = toPythonModule (callPackage ../applications/science/math/gmsh {
enablePython = true;
}));
});
gntp = callPackage ../development/python-modules/gntp { };