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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-05-05 18:00:54 +00:00 committed by GitHub
commit 041bd1cdf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
126 changed files with 722 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -272,6 +272,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `mongodb-4_4` has been removed as it has reached end of life. Consequently, `unifi7` and `unifi8` now use MongoDB 5.0 by default.
- `mongodb-5_0` and newer requires a cpu with the avx instruction set to run.
- `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details.
- `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously.
@ -354,7 +356,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `optparse-bash` is now dropped due to upstream inactivity. Alternatives available in Nixpkgs include [`argc`](https://github.com/sigoden/argc), [`argbash`](https://github.com/matejak/argbash), [`bashly`](https://github.com/DannyBen/bashly) and [`gum`](https://github.com/charmbracelet/gum), to name a few.
- `kanata` package has been updated to v1.6.0, which includes breaking changes. Check out the changelog of [v1.5.0](https://github.com/jtroo/kanata/releases/tag/v1.5.0) and [v1.6.0](https://github.com/jtroo/kanata/releases/tag/v1.6.0) for details.
- `kanata` package has been updated to v1.6.1, which includes breaking changes. Check out the changelog of [v1.5.0](https://github.com/jtroo/kanata/releases/tag/v1.5.0) and [v1.6.0](https://github.com/jtroo/kanata/releases/tag/v1.6.0) for details.
- `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8).
- Files are now handled in binary mode; this could break programs with embedded UTF-8 characters.

4
pkgs/applications/accessibility/wvkbd/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "wvkbd";
version = "0.14.4";
version = "0.15";
src = fetchFromGitHub {
owner = "jjsullivan5196";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1ySKsWgSCqsWV0RnR+wZt7+hWVWUqXrQLd1H6FqYzc8=";
sha256 = "sha256-9gDxMH1hghqjcXlbda7CHjDdjcjApjjie7caihKIg9M=";
};
postPatch = ''

53
pkgs/applications/blockchains/sparrow/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv
, stdenvNoCC
, lib
, makeWrapper
, fetchurl
@ -17,17 +18,54 @@
, hwi
, imagemagick
, gzip
, gnupg
}:
let
pname = "sparrow";
version = "1.8.4";
version = "1.9.0";
src = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
sha256 = "0w6z84w9spwfpqrf5m9bcq30xqp94c27jw3qzxfdyisp8n22xvd8";
sha256 = "sha256-UbFijiPOfVuJP9q6S5odkrhLJ2BUResbJK09Dn9PyCw=";
# nativeBuildInputs, downloadToTemp, and postFetch are used to verify the signed upstream package.
# The signature is not a self-contained file. Instead the SHA256 of the package is added to a manifest file.
# The manifest file is signed by the owner of the public key, Craig Raw.
# Thus to verify the signed package, the manifest is verified with the public key,
# and then the package is verified against the manifest.
# The public key is obtained from https://keybase.io/craigraw/pgp_keys.asc
# and is included in this repo to provide reproducibility.
nativeBuildInputs = [ gnupg ];
downloadToTemp = true;
postFetch = ''
pushd $(mktemp -d)
export GNUPGHOME=$PWD/gnupg
mkdir -m 700 -p $GNUPGHOME
ln -s ${manifest} ./manifest.txt
ln -s ${manifestSignature} ./manifest.txt.asc
ln -s $downloadedFile ./${pname}-${version}-x86_64.tar.gz
gpg --import ${publicKey}
gpg --verify manifest.txt.asc manifest.txt
sha256sum -c --ignore-missing manifest.txt
popd
mv $downloadedFile $out
'';
};
manifest = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt";
sha256 = "sha256-x50wkQKlh7r4PM5YwhQaz6tnJpByQDMAmYsp1HafX2c=";
};
manifestSignature = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt.asc";
sha256 = "sha256-Nb5tQogQFMObd+nR/eUpEFUoCh1AnTX3s/jICJbvqqo=";
};
publicKey = ./publickey.asc;
launcher = writeScript "sparrow" ''
#! ${bash}/bin/bash
params=(
@ -74,7 +112,7 @@ let
exec ${tor}/bin/tor "$@"
'';
jdk-modules = stdenv.mkDerivation {
jdk-modules = stdenvNoCC.mkDerivation {
name = "jdk-modules";
nativeBuildInputs = [ openjdk ];
dontUnpack = true;
@ -95,7 +133,7 @@ let
'';
};
sparrow-modules = stdenv.mkDerivation {
sparrow-modules = stdenvNoCC.mkDerivation {
pname = "sparrow-modules";
inherit version src;
nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ];
@ -150,7 +188,6 @@ let
# with one from Nixpkgs.
gzip -c ${torWrapper} > tor.gz
cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz
find modules
'';
installPhase = ''
@ -162,7 +199,7 @@ let
'';
};
in
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
inherit version src;
pname = "sparrow-unwrapped";
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
@ -180,7 +217,7 @@ stdenv.mkDerivation rec {
})
];
sparrow-icons = stdenv.mkDerivation {
sparrow-icons = stdenvNoCC.mkDerivation {
inherit version src;
pname = "sparrow-icons";
nativeBuildInputs = [ imagemagick ];
@ -212,8 +249,6 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability.";
homepage = "https://sparrowwallet.com";

90
pkgs/applications/blockchains/sparrow/publickey.asc Normal file
View File

@ -0,0 +1,90 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: GPGTools - http://gpgtools.org
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
EmR2yA==
=t5JY
-----END PGP PUBLIC KEY BLOCK-----

26
pkgs/applications/blockchains/sparrow/update.sh
View File

@ -1,26 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p coreutils curl jq gnused gnupg common-updater-scripts
set -eu -o pipefail
version="$(curl -s https://api.github.com/repos/sparrowwallet/sparrow/releases| jq '.[] | {name} | limit(1;.[])' | sed 's/[\"v]//g' | head -n 1)"
depname="sparrow-$version-x86_64.tar.gz"
src_root="https://github.com/sparrowwallet/sparrow/releases/download/$version";
src="$src_root/$depname";
manifest="$src_root/sparrow-$version-manifest.txt"
signature="$src_root/sparrow-$version-manifest.txt.asc"
key="D4D0 D320 2FC0 6849 A257 B38D E946 1833 4C67 4B40"
pushd $(mktemp -d --suffix=-sparrow-updater)
export GNUPGHOME=$PWD/gnupg
mkdir -m 700 -p "$GNUPGHOME"
curl -L -o "$depname" -- "$src"
curl -L -o manifest.txt -- "$manifest"
curl -L -o signature.asc -- "$signature"
gpg --batch --recv-keys "$key"
gpg --batch --verify signature.asc manifest.txt
sha256sum -c --ignore-missing manifest.txt
sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname")
popd
update-source-version sparrow-unwrapped "$version" "$sha256"

2
pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
View File

@ -67,7 +67,7 @@ let
cp $out/lib/* $out/share/adapter
cp -r adapter/scripts $out/share/adapter
cp -t $out/share/formatters formatters/*.py
ln -s ${lldb.lib} $out/share/lldb
ln -s ${lib.getLib lldb} $out/share/lldb
makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
'';

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

@ -37,16 +37,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "emulsion";
version = "10.5";
version = "11.0";
src = fetchFromGitHub {
owner = "ArturKovacs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Wrb5jHr2rXDpXF/uHpNLKSc//Xdj0/VsXQcytit0hKY=";
sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8=";
};
cargoHash = "sha256-zfR4sp/AmK3+UcFdqMMZE9O9+oGathqmuqFw11SmUWI=";
cargoHash = "sha256-detJZRnxT3FubaF/A4w2pFdhW03BH0gsaeuNFYu+cBw=";
nativeBuildInputs = [
installShellFiles

6
pkgs/applications/misc/cartridges/default.nix
View File

@ -13,13 +13,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cartridges";
version = "2.7.4";
version = "2.8.4";
src = fetchFromGitHub {
owner = "kra-mo";
repo = "cartridges";
rev = "v${finalAttrs.version}";
hash = "sha256-AfO+vLJSWdaMqqbzRZWrY94nu/9BM7mqdad9rkiq1pg=";
hash = "sha256-x6utIvU4LxM/CJogy5JrFrDTLFmXbgItgqtT+lM7FGA=";
};
pythonPath = with python3Packages; [
@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
and more with no login necessary.
You can sort and hide games or download cover art from SteamGridDB.
'';
homepage = "https://apps.gnome.org/app/hu.kramo.Cartridges/";
homepage = "https://apps.gnome.org/Cartridges/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.getchoo ];
platforms = platforms.linux;

4
pkgs/applications/misc/gpu-viewer/default.nix
View File

@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "gpu-viewer";
version = "3.02";
version = "3.04";
format = "other";
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "arunsivaramanneo";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/m8kXCICvWDqKIC6DbhUAXsjT+RNLMTsvlVTx85AJhE=";
hash = "sha256-+FDBHSVBTUHnhu2n7i9W1zIZe2wjY+OuFwQOJZojuzs=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/nwg-displays/default.nix
View File

@ -14,13 +14,13 @@
python310Packages.buildPythonApplication rec {
pname = "nwg-displays";
version = "0.3.16";
version = "0.3.18";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-displays";
rev = "refs/tags/v${version}";
hash = "sha256-rnaBYDGEsc8oGw4yZ60NQFbNf+L0tmHYDYf+UDoDmSI=";
hash = "sha256-wf72x3lXNAJ6Y4zJmYgwJrL1gWJBvTYUcXasT5zlXCM=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/nwg-dock-hyprland/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "nwg-dock-hyprland";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Lekvk3tQfeOR+Ltbc5b7TMiUZpktZ2nvCtUncrFb+Kc=";
sha256 = "sha256-cdNxaOnm98RcPG2o0GaBETpd+Zo2nlgrFv+2PiHOwUI=";
};
vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0=";
vendorHash = "sha256-JEzc950c4EGOYMLgpL8PXENkGlWSX8Z4A4jCx1B99X8=";
ldflags = [ "-s" "-w" ];

4
pkgs/applications/misc/rofi-rbw/default.nix
View File

@ -17,14 +17,14 @@
buildPythonApplication rec {
pname = "rofi-rbw";
version = "1.4.0";
version = "1.4.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "fdw";
repo = "rofi-rbw";
rev = "refs/tags/${version}";
hash = "sha256-1xbdZlZa3YPz+33AMgvhiMO12vc/ej0RybypQUzEn+8=";
hash = "sha256-wUb89GkNB2lEfb42hMvcxpbjc1O+wx8AkFjq7aJwAko=";
};
nativeBuildInputs = [

12
pkgs/applications/networking/browsers/yandex-browser/default.nix
View File

@ -54,15 +54,15 @@
let
version = {
corporate = "23.11.1.822-1";
beta = "24.1.1.939-1";
stable = "24.1.1.940-1";
corporate = "24.1.3.843-1";
beta = "24.4.1.918-1";
stable = "24.4.1.915-1";
}.${edition};
hash = {
corporate = "sha256-OOcz2dQeVea0vBjF1FyrCsnRR+WrCzfLTd+YXpLJCsI=";
beta = "sha256-Meswp1aeNTBr79l7XGWqJT9qqUdOfSzIpdL1L29UfJw=";
stable = "sha256-FZHoCRedpHHVwibSXts2DncUN83PZ9UlVOSXPjgAaNs=";
corporate = "sha256-rI19YmsC2p2Dsi6Grd8IyNdpjMHWwET3wcVw5r7545M=";
beta = "sha256-EQjjaTMPQKaULITEF+MQuY1lRVXuOjyiGWuGQtIpIz0=";
stable = "sha256-2IIIADFG9kCtzB0X4AfrFI+btqoUzKwd6NlZt7qtL/M=";
}.${edition};
app = {

8
pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix
View File

@ -1,10 +1,10 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz";
sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz";
sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
};
}

12
pkgs/applications/networking/cluster/k3s/1_27/versions.nix
View File

@ -1,14 +1,14 @@
{
k3sVersion = "1.27.12+k3s1";
k3sCommit = "78ad57567c9eb1fd1831986f5fd7b4024add1767";
k3sRepoSha256 = "1j6xb3af4ypqq5m6a8x2yc2515zvlgqzfsfindjm9cbmq5iisphq";
k3sVendorHash = "sha256-65cmpRwD9C+fcbBSv1YpeukO7bfGngsLv/rk6sM59gU=";
k3sVersion = "1.27.13+k3s1";
k3sCommit = "b23f142da8589854cc7ee45da08d96b5ad1ee1ff";
k3sRepoSha256 = "052998644il0qra7cdpvmy007gw16k2rvyg418m1j02pm9a3zn10";
k3sVendorHash = "sha256-rQZZnleRekkU1+I38LmFnnatZPuS+K1jbBwA+Dmc0jo=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.11-k3s2.27";
containerdSha256 = "0xjxc5dgh3drk2glvcabd885damjffp9r4cs0cm1zgnrrbhlipra";
containerdVersion = "1.7.15-k3s1.27";
containerdSha256 = "0bjxw174prhq8izmgrmpyljfxzrj0lh5d0w04g3lyn0rp3kwxqsl";
criCtlVersion = "1.26.0-rc.0-k3s1";
}

8
pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix
View File

@ -1,10 +1,10 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz";
sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz";
sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
};
}

12
pkgs/applications/networking/cluster/k3s/1_28/versions.nix
View File

@ -1,14 +1,14 @@
{
k3sVersion = "1.28.8+k3s1";
k3sCommit = "653dd61aaa2d0ef8bd83ac4dbc6d150dde792efc";
k3sRepoSha256 = "0pf8xw1m56m2s8i99vxj4i2l7fz7388kiynwzfrck43jb7v7kbbw";
k3sVendorHash = "sha256-wglwRW2RO9QJI6CRLgkVg5Upt6R0M3gX76zy0kT02ec=";
k3sVersion = "1.28.9+k3s1";
k3sCommit = "289a1a3edbc0f6ee5a7f91bf96aa1ed1b743bd1f";
k3sRepoSha256 = "0kms6r10k6v037r5lxxrp90bnynrgyrn61kqnzy2f5avny4blikh";
k3sVendorHash = "sha256-iUp2Maua3BnrC4Jq2ij0uOW5gYYZfz6e+TEdDtN0PT8=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.11-k3s2";
containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib";
containerdVersion = "1.7.15-k3s1";
containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f";
criCtlVersion = "1.26.0-rc.0-k3s1";
}

8
pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix
View File

@ -1,10 +1,10 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz";
sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz";
sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
};
}

16
pkgs/applications/networking/cluster/k3s/1_29/versions.nix
View File

@ -1,14 +1,14 @@
{
k3sVersion = "1.29.3+k3s1";
k3sCommit = "8aecc26b0f167d5e9e4e9fbcfd5a471488bf5957";
k3sRepoSha256 = "12285mhwi6cifsw3gjxxmd1g2i5f7vkdgzdc6a78rkvnx7z1j3p3";
k3sVendorHash = "sha256-pID2h/rvvKyfHWoglYPbbliAby+9R2zoh7Ajd36qjVQ=";
k3sVersion = "1.29.4+k3s1";
k3sCommit = "94e29e2ef5d79904f730e2024c8d1682b901b2d5";
k3sRepoSha256 = "0kkhd2fnlmjanzvwgdclmbg6azw3r1a2lj5207716pavxmb9ld7y";
k3sVendorHash = "sha256-wOX+ktGPFYUKLZBK/bQhWWG+SnRCkNYnk3Tz8wpMo5A=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sRootVersion = "0.13.0";
k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj";
k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.11-k3s2";
containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib";
containerdVersion = "1.7.15-k3s1";
containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f";
criCtlVersion = "1.29.0-k3s1";
}

16
pkgs/applications/networking/cluster/k3s/builder.nix
View File

@ -30,7 +30,6 @@ lib:
# It is likely we will have to split out additional builders for additional
# versions in the future, or customize this one further.
{ lib
, fetchpatch
, makeWrapper
, socat
, iptables
@ -56,6 +55,7 @@ lib:
, sqlite
, nixosTests
, pkgsBuildBuild
, go
}:
# k3s is a kinda weird derivation. One of the main points of k3s is the
@ -93,8 +93,9 @@ let
# https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40
versionldflags = [
"-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}"
"-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}"
"-X github.com/k3s-io/k3s/pkg/version.Version=v${k3sVersion}"
"-X github.com/k3s-io/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}"
"-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=go${go.version}"
"-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}"
"-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}"
"-X k8s.io/client-go/pkg/version.gitTreeState=clean"
@ -185,15 +186,6 @@ let
src = k3sRepo;
vendorHash = k3sVendorHash;
patches =
# Disable: Add runtime checking of golang version
(fetchpatch {
# https://github.com/k3s-io/k3s/pull/9054
url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch";
hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U=";
revert = true;
});
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp sqlite.dev ];

5
pkgs/applications/networking/hpmyroom/default.nix
View File

@ -4,11 +4,11 @@
}:
mkDerivation rec {
pname = "hpmyroom";
version = "12.9.0.0601";
version = "12.13.0.0749";
src = fetchurl {
url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm";
sha256 = "sha256-1BC4EjCCLAuCIOV+jJn3pfKKW7UJI5tfC+wg0FUgB64=";
sha256 = "sha256-Ff3j14rC2ZHhNJLPxvKn9Sxyv351HuHbggclwOuFfX4=";
};
nativeBuildInputs = [
@ -56,5 +56,6 @@ mkDerivation rec {
# TODO: A Darwin binary is available upstream
platforms = [ "x86_64-linux" ];
mainProgram = "hpmyroom";
broken = true; # requires libpng15
};
}

6
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw=";
};
patches = [
# fixes build failure https://github.com/dino/dino/issues/1576
# backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74
./fix-compile-new-vala-c.diff
];
postPatch = ''
# don't overwrite manually set version information
substituteInPlace CMakeLists.txt \

16
pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff Normal file
View File

@ -0,0 +1,16 @@
diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi
index bcf12569..b32efd03 100644
--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi
+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi
@@ -22,9 +22,9 @@ public class Key {
public string issuer_name;
public string chain_id;
public Validity owner_trust;
- [CCode(array_null_terminated = true)]
+ [CCode(array_length = false, array_null_terminated = true)]
public SubKey[] subkeys;
- [CCode(array_null_terminated = true)]
+ [CCode(array_length = false, array_null_terminated = true)]
public UserID[] uids;
public KeylistMode keylist_mode;
// public string fpr; // requires gpgme >= 1.7.0

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20240425-1";
version = "20240504";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-CulgcWcAX/42jB3kCmxLAFioyNtMJV80dW3ofp7Yw6o=";
hash = "sha256-ojV/taYV5J4nHfDg//lJ78ltJv7nIG1H9iXo95nA/n8=";
};
postPatch = ''

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nextdns";
version = "1.43.0";
version = "1.43.3";
src = fetchFromGitHub {
owner = "nextdns";
repo = "nextdns";
rev = "v${version}";
sha256 = "sha256-5aznAAO53EFeq/fap10ARGerKzQAvLx0zOeG6OWkymw=";
sha256 = "sha256-sltTvjEfUZsmXDEyN+Zyck7oqZ+Xu8xScNnitt/0eic=";
};
vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY=";

9
pkgs/applications/radio/fldigi/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "fldigi";
version = "4.2.04";
version = "4.2.05";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-crVeX9vtvn1O5ah1dc74425qUKcozKlDMVeIefMpktY=";
hash = "sha256-rBGJ+63Szhy37LQw0LpE2/lLyP5lwK7hsz/uq453iHY=";
};
nativeBuildInputs = [ pkg-config ];
@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
libsamplerate
] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ];
env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14";
enableParallelBuilding = true;
meta = with lib; {
@ -47,8 +49,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ relrod ftrvxmtrx ];
platforms = platforms.unix;
# unable to execute command: posix_spawn failed: Argument list too long
# Builds fine on aarch64-darwin
broken = stdenv.system == "x86_64-darwin";
};
}

6
pkgs/applications/science/math/eigenmath/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "eigenmath";
version = "0-unstable-2024-04-26";
version = "0-unstable-2024-05-03";
src = fetchFromGitHub {
owner = "georgeweigt";
repo = pname;
rev = "14a55ff60d078b752033b4ae29d332b04b6e8912";
hash = "sha256-p7wcLmssTqs3LCkZWB9rhCXEc4IVgZJNBvRhS51oH5E=";
rev = "69ebfbaa7f328ddc9d97b7c404369818a5febe4a";
hash = "sha256-lHxVyUXIY9+YIStA6202Bhy/b0xaxJbW/VPI7FbNJk0=";
};
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''

2
pkgs/applications/science/math/getdp/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.6.0";
src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz";
sha256 = "sha256-N1cb72W77Dr+TzeHpLgv5FuFb+SJqyGcfn+kOfEvZgA=";
hash = "sha256-nzefwCV+Z9BHDofuTfhR+vhqm3cCSiUT+7cbtn601N8=";
};
inherit (petsc) mpiSupport;

3
pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
View File

@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
rev = "3c8f66be867aca6656e4109ce880b6ea7431b895";
hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU=";
};
postPatch = (old.postPatch or "") + ''
patchShebangs src/box_drawing_generate.sh
'';
} // lib.optionalAttrs sixelSupport {
buildInputs = old.buildInputs ++ [ libsixel ];
mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ];

4
pkgs/applications/version-management/git-cola/default.nix
View File

@ -10,14 +10,14 @@
python3Packages.buildPythonApplication rec {
pname = "git-cola";
version = "4.6.1";
version = "4.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
hash = "sha256-qAvoBVZt2IwrWFNzGWpCZqj8gbjysGlB/VXaa1CMH4o=";
hash = "sha256-BiSs3vWJacCtGthHi/nFJm4Hqt0uO6XXZi/Zqvjb928=";
};
buildInputs = lib.optionals stdenv.isLinux [

4
pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "obs-mute-filter";
version = "0.2.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-mute-filter";
rev = version;
sha256 = "sha256-SiutSmp+DnzMU62kxtBUL0xgMXTe0k+nKwSU3wQe4+g=";
sha256 = "sha256-UVYN9R7TnwD3a+KIYTXvxOQWfNUtR8cSWUoKZuNoBJc=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/applications/window-managers/sommelier/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation {
pname = "sommelier";
version = "123.0";
version = "124.0";
src = fetchzip rec {
url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz";
passthru.rev = "1abc91204f35cde76db37853ff3643c5cdb607e6";
passthru.rev = "0ced021a6b362f35592cca5a3915d0ed784615f2";
stripRoot = false;
sha256 = "Wa30MU7iK1Y7pKNeC+FPFXDwDxFLWOZPG4jkm8cnWeg=";
sha256 = "zSiGhF4FhLUavC7YEOGGq4NE2hxK4YNXF3CpLptoZbM=";
};
nativeBuildInputs = [

43
pkgs/build-support/php/build-composer-project.nix
View File

@ -2,11 +2,7 @@
callPackage,
stdenvNoCC,
lib,
writeTextDir,
php,
makeBinaryWrapper,
fetchFromGitHub,
fetchurl,
}:
let
@ -75,27 +71,30 @@ let
runHook postInstallCheck
'';
composerRepository = phpDrv.mkComposerRepository {
inherit composer composer-local-repo-plugin;
inherit (finalAttrs)
patches
pname
src
vendorHash
version
;
composerRepository =
previousAttrs.composerRepository or (phpDrv.mkComposerRepository {
inherit composer composer-local-repo-plugin;
inherit (finalAttrs)
patches
pname
src
vendorHash
version
;
composerLock = previousAttrs.composerLock or null;
composerNoDev = previousAttrs.composerNoDev or true;
composerNoPlugins = previousAttrs.composerNoPlugins or true;
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
composerLock = previousAttrs.composerLock or null;
composerNoDev = previousAttrs.composerNoDev or true;
composerNoPlugins = previousAttrs.composerNoPlugins or true;
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
});
env = {
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_DISABLE_NETWORK = "1";
COMPOSER_MIRROR_PATH_REPOS = "1";
};
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_DISABLE_NETWORK = "1";
COMPOSER_MIRROR_PATH_REPOS = "1";
meta = previousAttrs.meta or { } // {
platforms = lib.platforms.all;
};

12
pkgs/build-support/php/build-composer-repository.nix
View File

@ -2,8 +2,6 @@
callPackage,
stdenvNoCC,
lib,
writeTextDir,
fetchFromGitHub,
php,
}:
@ -107,10 +105,12 @@ let
runHook postInstallCheck
'';
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_MIRROR_PATH_REPOS = "1";
COMPOSER_HTACCESS_PROTECT = "0";
COMPOSER_DISABLE_NETWORK = "0";
env = {
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_MIRROR_PATH_REPOS = "1";
COMPOSER_HTACCESS_PROTECT = "0";
COMPOSER_DISABLE_NETWORK = "0";
};
outputHashMode = "recursive";
outputHashAlgo =

1
pkgs/build-support/php/hooks/default.nix
View File

@ -1,7 +1,6 @@
{
lib,
makeSetupHook,
diffutils,
jq,
writeShellApplication,
moreutils,

10
pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix
View File

@ -43,10 +43,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M=";
};
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_MIRROR_PATH_REPOS = "1";
COMPOSER_HTACCESS_PROTECT = "0";
COMPOSER_DISABLE_NETWORK = "1";
env = {
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_MIRROR_PATH_REPOS = "1";
COMPOSER_HTACCESS_PROTECT = "0";
COMPOSER_DISABLE_NETWORK = "1";
};
nativeBuildInputs = [ makeBinaryWrapper ];

3
pkgs/build-support/php/pkgs/composer-phar.nix
View File

@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
makeWrapper ${lib.getExe php} $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
--prefix PATH : ${
lib.makeBinPath [
@ -53,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
description = "Dependency Manager for PHP, shipped from the PHAR file";
homepage = "https://getcomposer.org/";
license = lib.licenses.mit;
mainProgram = "composer";
maintainers = with lib.maintainers; [ drupol ];
platforms = lib.platforms.all;
};

7
pkgs/by-name/an/ansel/package.nix
View File

@ -77,7 +77,7 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
version = "unstable-2024-02-23";
version = "0-unstable-2024-02-23";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
@ -160,7 +160,10 @@ stdenv.mkDerivation {
)
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
# Tags inherited from Darktable, + a "nightly" 0.0.0 tag that new artefacts get attached to
hardcodeZeroVersion = true;
};
meta = {
description = "A darktable fork minus the bloat plus some design vision";

2
pkgs/by-name/bl/bluez-tools/package.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bluez-tools";
version = "unstable-2020-10-25";
version = "0-unstable-2020-10-24";
src = fetchFromGitHub {
owner = "khvzak";

4
pkgs/by-name/br/bruno/package.nix
View File

@ -27,13 +27,13 @@ let
in
buildNpmPackage' rec {
pname = "bruno";
version = "1.16.0";
version = "1.16.1";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
rev = "v${version}";
hash = "sha256-nhs44W7cOREdULdXFNZpFGeeZeVTGUffKOBhtL4zAaw=";
hash = "sha256-rP3PHS6kuJCgbCQy4h+bJksmJAJvHDBMSysLM5FxQjk=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json

4
pkgs/by-name/ea/earlyoom/package.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "earlyoom";
version = "1.8";
version = "1.8.1";
src = fetchFromGitHub {
owner = "rfjakob";
repo = "earlyoom";
rev = "v${finalAttrs.version}";
hash = "sha256-jgNoYOGor2i3ngDuU3It238n5ky+AppzlRKdkwXb2AI=";
hash = "sha256-7gVwR/D3HEMv2sRXYe/B2aluxncDkMGyiBklwAJkWjk=";
};
outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ];

2
pkgs/by-name/fw/fwupd/package.nix
View File

@ -92,7 +92,7 @@ let
test-firmware =
let
version = "unstable-2022-04-02";
version = "0-unstable-2022-04-02";
src = fetchFromGitHub {
name = "fwupd-test-firmware-${version}";
owner = "fwupd";

23
pkgs/development/tools/hatch/default.nix → pkgs/by-name/ha/hatch/package.nix
View File

@ -8,14 +8,19 @@
python3.pkgs.buildPythonApplication rec {
pname = "hatch";
version = "1.9.0";
version = "1.9.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-4ealEeFS7HzU26vE9Pahh0hwvUnJfRfTkLkjLdpoXOM=";
hash = "sha256-Gae4IXn5Tyrd2612qn5lq5DK1VqxA9U4J2N5NcnmYkw=";
};
postPatch = ''
# Loosen hatchling runtime version dependency
sed -i 's/hatchling<1.22/hatchling/' pyproject.toml
'';
nativeBuildInputs = with python3.pkgs; [
hatchling
hatch-vcs
@ -69,19 +74,13 @@ python3.pkgs.buildPythonApplication rec {
"test_editable_exact_force_include_option"
"test_editable_exact_force_include_build_data_precedence"
"test_editable_pth"
# AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0
"test_creation_allow_system_packages"
# cli table output mismatch
"test_context_formatting"
# expects sh, finds bash
"test_all"
"test_already_installed_update_flag"
"test_already_installed_update_prompt"
# unmet expectations about the binary module we provide
"test_dependency_not_found"
"test_marker_unmet"
# output capturing mismatch, likely stdout/stderr mixup
"test_no_compatibility_check_if_exists"
# Loosen hatchling runtime version dependency
"test_core"
"test_correct"
] ++ lib.optionals stdenv.isDarwin [
# https://github.com/NixOS/nixpkgs/issues/209358
"test_scripts_no_environment"
@ -90,6 +89,8 @@ python3.pkgs.buildPythonApplication rec {
# It is not possible to run it in a nix build using a /nix/store shell.
# See https://github.com/pypa/hatch/pull/709 for the relevant code.
"test_populate_default_popen_kwargs_executable"
] ++ lib.optionals stdenv.isAarch64 [
"test_resolve"
];
meta = with lib; {

2
pkgs/by-name/la/labwc-gtktheme/package.nix
View File

@ -9,7 +9,7 @@
python3Packages.buildPythonApplication rec {
pname = "labwc-gtktheme";
version = "unstable-2022-07-17";
version = "0-unstable-2022-07-17";
pyproject = false;
src = fetchFromGitHub {

2
pkgs/by-name/la/labwc-menu-generator/package.nix
View File

@ -9,7 +9,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "labwc-menu-generator";
version = "unstable-2024-03-27";
version = "0-unstable-2024-03-27";
src = fetchFromGitHub {
owner = "labwc";

4
pkgs/by-name/le/lexical/package.nix
View File

@ -7,13 +7,13 @@
beamPackages.mixRelease rec {
pname = "lexical";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "lexical-lsp";
repo = "lexical";
rev = "refs/tags/v${version}";
hash = "sha256-20qfzYioR1PhA0ZBcft0nhcwxB95pw5L9zoPLWd7ZIE=";
hash = "sha256-gDiNjtYeEGoYoyoNmPh73EuYCvY36y9lUyLasbFrFgs=";
};
mixFodDeps = beamPackages.fetchMixDeps {

6
pkgs/by-name/li/libui-ng/package.nix
View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "libui-ng";
version = "unstable-2024-02-05";
version = "4.1-unstable-2024-02-05";
src = fetchFromGitHub {
owner = "libui-ng";
@ -47,7 +47,9 @@ stdenv.mkDerivation rec {
(lib.mesonBool "examples" (!stdenv.isDarwin))
];
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
tagPrefix = "alpha";
};
meta = with lib; {
description = "A portable GUI library for C";

2
pkgs/by-name/lo/louvain-community/package.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "louvain-community";
version = "unstable-2024-01-30";
version = "0-unstable-2024-01-30";
src = fetchFromGitHub {
owner = "meelgroup";

2
pkgs/by-name/ni/nitter/package.nix
View File

@ -8,7 +8,7 @@
buildNimPackage (finalAttrs: prevAttrs: {
pname = "nitter";
version = "unstable-2024-02-26";
version = "0-unstable-2024-02-26";
src = fetchFromGitHub {
owner = "zedeus";

8
pkgs/by-name/ni/nix-search-cli/package.nix
View File

@ -6,7 +6,7 @@
buildGoModule {
pname = "nix-search-cli";
version = "unstable-2023-09-12";
version = "0-unstable-2023-09-12";
src = fetchFromGitHub {
owner = "peterldowns";
@ -17,7 +17,11 @@ buildGoModule {
vendorHash = "sha256-JDOu7YdX9ztMZt0EFAMz++gD7n+Mn1VOe5g6XwrgS5M=";
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
# Almost every commit is tagged as "release-<unix-time>-<commit>", software doesn't keep track of its version
# Using 0 feels closer to what the tagging is trying to express
hardcodeZeroVersion = true;
};
meta = with lib; {
description = "CLI for searching packages on search.nixos.org";

130
pkgs/by-name/pp/ppsspp/package.nix
View File

@ -1,25 +1,29 @@
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, cmake
, copyDesktopItems
, ffmpeg_4
, glew
, libffi
, libsForQt5
, libzip
, makeDesktopItem
, makeWrapper
, pkg-config
, python3
, snappy
, vulkan-loader
, wayland
, zlib
, enableQt ? false
, enableVulkan ? true
, forceWayland ? false
{
lib,
SDL2,
cmake,
copyDesktopItems,
fetchFromGitHub,
ffmpeg,
glew,
libffi,
libsForQt5,
libzip,
makeDesktopItem,
makeWrapper,
pkg-config,
python3,
snappy,
stdenv,
vulkan-loader,
wayland,
zlib,
enableQt ? false,
enableVulkan ? true,
forceWayland ? false,
useSystemFfmpeg? false,
useSystemSnappy? true,
}:
let
@ -55,26 +59,33 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
pkg-config
python3
] ++ lib.optionals enableQt [ wrapQtAppsHook ];
]
++ lib.optionals enableQt [ wrapQtAppsHook ];
buildInputs = [
SDL2
ffmpeg_4
(glew.override { enableEGL = forceWayland; })
glew
libzip
snappy
zlib
] ++ lib.optionals enableQt [
]
++ lib.optionals useSystemFfmpeg [
ffmpeg
]
++ lib.optionals useSystemSnappy [
snappy
]
++ lib.optionals enableQt [
qtbase
qtmultimedia
] ++ lib.optionals enableVulkan [ vulkan-loader ]
]
++ lib.optionals enableVulkan [ vulkan-loader ]
++ lib.optionals vulkanWayland [ wayland libffi ];
cmakeFlags = [
(lib.cmakeBool "HEADLESS" (!enableQt))
(lib.cmakeBool "USE_SYSTEM_FFMPEG" true)
(lib.cmakeBool "USE_SYSTEM_FFMPEG" useSystemFfmpeg)
(lib.cmakeBool "USE_SYSTEM_LIBZIP" true)
(lib.cmakeBool "USE_SYSTEM_SNAPPY" true)
(lib.cmakeBool "USE_SYSTEM_SNAPPY" useSystemSnappy)
(lib.cmakeBool "USE_WAYLAND_WSI" vulkanWayland)
(lib.cmakeBool "USING_QT_UI" enableQt)
(lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND")
@ -91,33 +102,40 @@ stdenv.mkDerivation (finalAttrs: {
})
];
installPhase = let
vulkanPath = lib.makeLibraryPath [ vulkan-loader ];
in
''
runHook preInstall
installPhase =
lib.concatStringsSep "\n" ([
''runHook preInstall''
]
++ [
''mkdir -p $out/share/{applications,ppsspp/bin,icons}''
]
++ (if enableQt then [
''install -Dm555 PPSSPPQt $out/share/ppsspp/bin/''
] else [
''install -Dm555 PPSSPPHeadless $out/share/ppsspp/bin/''
''makeWrapper $out/share/ppsspp/bin/PPSSPPHeadless $out/bin/ppsspp-headless''
''install -Dm555 PPSSPPSDL $out/share/ppsspp/bin/''
])
++ [
''mv assets $out/share/ppsspp''
''mv ../icons/hicolor $out/share/icons''
]
++ [
''runHook postInstall''
]);
mkdir -p $out/share/{applications,ppsspp,icons}
''
+ (if enableQt then ''
install -Dm555 PPSSPPQt $out/bin/ppsspp
wrapProgram $out/bin/ppsspp \
'' else ''
install -Dm555 PPSSPPHeadless $out/bin/ppsspp-headless
install -Dm555 PPSSPPSDL $out/share/ppsspp/
makeWrapper $out/share/ppsspp/PPSSPPSDL $out/bin/ppsspp \
--set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"} \
'')
+ lib.optionalString enableVulkan ''
--prefix LD_LIBRARY_PATH : ${vulkanPath} \
''
+ ''
mv assets $out/share/ppsspp
mv ../icons/hicolor $out/share/icons
runHook postInstall
'';
postFixup =
let
wrapperArgs =
lib.concatStringsSep " "
(lib.optionals enableVulkan [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
] ++ lib.optionals (!enableQt) [
"--set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"}"
]);
binToBeWrapped = if enableQt then "PPSSPPQt" else "PPSSPPSDL";
in
''makeWrapper $out/share/ppsspp/bin/${binToBeWrapped} $out/bin/ppsspp ${wrapperArgs}'';
meta = {
homepage = "https://www.ppsspp.org/";

4
pkgs/by-name/re/redka/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "redka";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "nalgeon";
repo = "redka";
rev = "v${version}";
hash = "sha256-nE5JrKsvQeU/wDNl5HYFiK9ezyGpUqX4d4SaZhfURxo=";
hash = "sha256-Dm+QMmCYoYJWv+Crot0bwcSPHuUYQzhRgTO65jRjLLE=";
};
vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro=";

2
pkgs/by-name/re/renode-dts2repl/package.nix
View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl";
version = "unstable-2024-04-16";
version = "0-unstable-2024-04-16";
pyproject = true;
src = fetchFromGitHub {

2
pkgs/by-name/ri/river-bnf/package.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "river-bnf";
version = "unstable-2023-10-10";
version = "0-unstable-2023-10-10";
src = fetchFromSourcehut {
owner = "~leon_plickat";

8
pkgs/by-name/rp/rpcs3/package.nix
View File

@ -32,10 +32,10 @@
let
# Keep these separate so the update script can regex them
rpcs3GitVersion = "16377-08c3a38b6";
rpcs3Version = "0.0.31-16377-08c3a38b6";
rpcs3Revision = "08c3a38b6788d9cd4f0bb7310c22a7fd05dc3ba2";
rpcs3Hash = "sha256-GOKbznr1X+5nunbjfL9TZ9it/IPvV5mnpc0cbuGHDHw=";
rpcs3GitVersion = "16391-39e946630";
rpcs3Version = "0.0.31-16391-39e946630";
rpcs3Revision = "39e946630da8e23c4d2d2b763f63145eb9205e43";
rpcs3Hash = "sha256-CIPUmcpBc6iRMzZJZ5vKty/Uh4TYiR65xXD4aKRPSKc=";
inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
in

2
pkgs/by-name/sa/samrewritten/package.nix
View File

@ -11,7 +11,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "samrewritten";
version = "unstable-2023-05-23";
version = "202008-unstable-2023-05-22";
src = fetchFromGitHub {
owner = "PaulCombal";

8
pkgs/by-name/sp/spacedrive/package.nix
View File

@ -9,20 +9,20 @@
let
pname = "spacedrive";
version = "0.2.13";
version = "0.2.14";
src = fetchurl {
aarch64-darwin = {
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg";
hash = "sha256-Ph9+Jve1qP1KBbKRN1I2lylHRy/SWRJAx7nOF9l3A/E=";
hash = "sha256-G0Ey7ewZeXegiqkAXFmS0MdaYllTphp7Buqs5/4/mWY=";
};
x86_64-darwin = {
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg";
hash = "sha256-+FHxJre+ouOxKvhDG+uDKDp7ZSx8NWRxac4m4yFqgrE=";
hash = "sha256-ypUDb94RlGqJfkf4htWKZ0UrGZ0SyCZrrAqtMuxDzDI=";
};
x86_64-linux = {
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage";
hash = "sha256-AyR1FshOjFatkZLgT2K46IKJgeFDu4e4//CvcuNyt0E=";
hash = "sha256-DFJ1/uJW0BwEtJZxGpnvGC7U8YmsJTUbcuWEOAP2Bno=";
};
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

2
pkgs/by-name/te/tecoc/package.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tecoc";
version = "unstable-2023-06-21";
version = "0-unstable-2023-06-21";
src = fetchFromGitHub {
owner = "blakemcbride";

4
pkgs/by-name/uu/uuu/package.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uuu";
version = "1.5.179";
version = "1.5.181";
src = fetchFromGitHub {
owner = "nxp-imx";
repo = "mfgtools";
rev = "uuu_${finalAttrs.version}";
hash = "sha256-W0jFwivjD19SQmXz2G7cIvWh1zkyN4AXh3bfqF302MA=";
hash = "sha256-HMpirdXpcBFTkO7anGDIjsBJKjQ+kIN4kDhPlcqIDqY=";
};
passthru.updateScript = nix-update-script {

4
pkgs/applications/misc/wbg/default.nix → pkgs/by-name/wb/wbg/package.nix
View File

@ -20,14 +20,14 @@
stdenv.mkDerivation rec {
pname = "wbg";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "wbg";
rev = version;
sha256 = "sha256-JJIIqSc0qHgjtpGKai8p6vihXg16unsO7vW91pioAmc=";
sha256 = "sha256-zd5OWC0r/75IaeKy5xjV+pQefRy48IcFTxx93iy0a0Q=";
};
nativeBuildInputs = [

4
pkgs/development/compilers/llvm/common/lldb.nix
View File

@ -50,7 +50,9 @@ stdenv.mkDerivation (rec {
src = src';
inherit patches;
outputs = [ "out" "lib" "dev" ];
# LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of
# the `lib` output because that would create a cycle between it and the `out` output.
outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ];
sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}";

6
pkgs/development/interpreters/risor/default.nix
View File

@ -7,17 +7,17 @@
buildGoModule rec {
pname = "risor";
version = "1.5.2";
version = "1.6.0";
src = fetchFromGitHub {
owner = "risor-io";
repo = "risor";
rev = "v${version}";
hash = "sha256-tvEiboH5cGRpyBmmpu8A1UlDR1Y9XPe1pUNS0/Jvooc=";
hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg=";
};
proxyVendor = true;
vendorHash = "sha256-eW6eSZp5Msg/u50i1+S2KSzDws0Rq8JBY1Yxzq7/hVo=";
vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA=";
subPackages = [
"cmd/risor"

4
pkgs/development/libraries/drogon/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "drogon";
version = "1.9.3";
version = "1.9.4";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${finalAttrs.version}";
sha256 = "sha256-en8w8kda0ijg6b6s2WHxHfuGaa+p08928Jw57UBevDU=";
sha256 = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU=";
fetchSubmodules = true;
};

9
pkgs/development/libraries/glib/default.nix
View File

@ -47,10 +47,10 @@ let
x11Support = false;
};
librarySuffix = if (stdenv.targetPlatform.extensions.library == ".so") then "2.0.so.0"
else if (stdenv.targetPlatform.extensions.library == ".dylib") then "2.0.0.dylib"
else if (stdenv.targetPlatform.extensions.library == ".a") then "2.0.a"
else if (stdenv.targetPlatform.extensions.library == ".dll") then "2.0-0.dll"
librarySuffix = if (stdenv.hostPlatform.extensions.library == ".so") then "2.0.so.0"
else if (stdenv.hostPlatform.extensions.library == ".dylib") then "2.0.0.dylib"
else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a"
else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll"
else "2.0-0.lib";
in
@ -238,6 +238,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ];
# Conditional necessary to break infinite recursion with passthru.tests
preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"

4
pkgs/development/libraries/java/commons/bcel/default.nix
View File

@ -1,12 +1,12 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
version = "6.8.1";
version = "6.8.2";
pname = "commons-bcel";
src = fetchurl {
url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz";
hash = "sha256-a7PqcVvS+7tHSU2uXi5gLpl82ZN9hA03VEnCnc5cnRc=";
hash = "sha256-VRCRxy+P3uPW9gWy9xHfJ35muhWCHtXNimRmTfba+04=";
};
installPhase = ''

4
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -284,7 +284,11 @@ let
qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
qtpim = callPackage ../modules/qtpim.nix {};
qtpositioning = callPackage ../modules/qtpositioning.nix {};
qtpurchasing = callPackage ../modules/qtpurchasing.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation StoreKit;
};
qtquick1 = null;
qtquick3d = callPackage ../modules/qtquick3d.nix { };
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {};

14
pkgs/development/libraries/qt-5/modules/qtpurchasing.nix Normal file
View File

@ -0,0 +1,14 @@
{ stdenv
, lib
, qtModule
, qtbase
, qtdeclarative
, StoreKit
, Foundation
}:
qtModule {
pname = "qtpurchasing";
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation StoreKit ];
}

11
pkgs/development/libraries/qt-5/modules/qtquick3d.nix Normal file
View File

@ -0,0 +1,11 @@
{ qtModule
, qtbase
, qtdeclarative
, openssl
}:
qtModule {
pname = "qtquick3d";
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ openssl ];
}

5
pkgs/development/libraries/rapidyaml/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "rapidyaml";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "biojppm";
repo = pname;
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-1/P6Szgng94UU8cPFAtOKMS+EmiwfW/IJl2UTolDU5s=";
sha256 = "sha256-p9XaMsrOgnEdb0yl52HXhNzz6YxuvTD5GCaq1a+l1bQ=";
};
nativeBuildInputs = [ cmake git ];
@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/biojppm/rapidyaml";
license = licenses.mit;
maintainers = with maintainers; [ martfont ];
platforms = platforms.all;
};
}

4
pkgs/development/libraries/science/math/ipopt/default.nix
View File

@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";
version = "3.14.14";
version = "3.14.16";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Ipopt";
rev = "releases/${version}";
sha256 = "sha256-qMPdJVLIXFePhTA6qRr1Pth/BjJ62cj9y8C1HKQJGDQ=";
sha256 = "sha256-ZuiZZMq7NzOm6CCJgMBgEWs8PEfM3pVr2yOWbS42l8U=";
};
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

2
pkgs/development/libraries/vte/default.nix
View File

@ -27,6 +27,7 @@
, systemd
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
, nixosTests
, blackbox-terminal
}:
stdenv.mkDerivation (finalAttrs: {
@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
};
tests = {
inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal;
blackbox-terminal = blackbox-terminal.override { sixelSupport = true; };
};
};

4
pkgs/development/php-packages/opentelemetry/default.nix
View File

@ -5,7 +5,7 @@
}:
let
version = "1.0.2";
version = "1.0.3";
in
buildPecl rec {
inherit version;
@ -15,7 +15,7 @@ buildPecl rec {
owner = "open-telemetry";
repo = "opentelemetry-php-instrumentation";
rev = version;
hash = "sha256-w6Gkjh9+I6KlQyztv4o1XZ6nJ+Yn4wXXN6nma8/dLTU=";
hash = "sha256-KqLbKnAHxXbldNYVN7eMQ7NdZmPecu0UKHQdlUm7Ur0=";
};
sourceRoot = "${src.name}/ext";

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

@ -18,13 +18,13 @@ let
in
buildPythonPackage rec {
pname = "argostranslate";
version = "1.9.3";
version = "1.9.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-N1Dh8238cDKpIMeQT645lDvYMbOWjVqGuWxt37+TQmQ=";
sha256 = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s=";
};
propagatedBuildInputs = [

29
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View File

@ -1,12 +1,13 @@
{ lib
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, buildPythonPackage
, fetchPypi
, isodate
, pythonOlder
, setuptools
{
lib,
azure-common,
azure-mgmt-core,
azure-mgmt-nspkg,
buildPythonPackage,
fetchPypi,
isodate,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
@ -21,11 +22,9 @@ buildPythonPackage rec {
hash = "sha256-bGLmrFkONP7dc5/iSzGzdQcToBRhZpbqjUTHvMgcBrc=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
azure-common
azure-mgmt-core
isodate
@ -34,9 +33,7 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [
"azure.mgmt.containerservice"
];
pythonImportsCheck = [ "azure.mgmt.containerservice" ];
meta = with lib; {
description = "This is the Microsoft Azure Container Service Management Client Library";

47
pkgs/development/python-modules/casa-formats-io/default.nix
View File

@ -1,41 +1,48 @@
{ lib
, fetchPypi
, buildPythonPackage
, astropy
, dask
, numpy
, oldest-supported-numpy
, setuptools-scm
, wheel
{
lib,
astropy,
buildPythonPackage,
dask,
fetchPypi,
numpy,
oldest-supported-numpy,
pythonOlder,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "casa-formats-io";
version = "0.3.0";
format = "pyproject";
prproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
pname = "casa_formats_io";
inherit version;
hash = "sha256-FpQj0XeZ7vvOzUM/+5qG6FRwNXl3gzoUBItYdQ1M4m4=";
};
nativeBuildInputs = [
oldest-supported-numpy
setuptools-scm
wheel
];
build-system = [ setuptools-scm ];
propagatedBuildInputs = [ astropy dask numpy ];
nativeBuildInputs = [ oldest-supported-numpy ];
dependencies = [
astropy
dask
numpy
];
# Tests require a large (800 Mb) dataset
doCheck = false;
pythonImportsCheck = [ "casa_formats_io" ];
meta = {
meta = with lib; {
description = "Dask-based reader for CASA data";
homepage = "https://casa-formats-io.readthedocs.io/";
license = lib.licenses.lgpl2Only;
maintainers = with lib.maintainers; [ smaret ];
changelog = "https://github.com/radio-astro-tools/casa-formats-io/blob/v${version}/CHANGES.rst";
license = licenses.lgpl2Only;
maintainers = with maintainers; [ smaret ];
};
}

4
pkgs/development/python-modules/character-encoding-utils/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "character-encoding-utils";
version = "0.0.6";
version = "0.0.7";
disabled = pythonOlder "3.11";
src = fetchPypi {
pname = "character_encoding_utils";
inherit version;
hash = "sha256-ugzWiSpa/xxlraVyVPTSq/uxPg11kOyePgb1cmzX3ug=";
hash = "sha256-cUggyNz5xphDF+7dSrx3vr3v3R8ISryHj9accMJfDbg=";
};
format = "pyproject";

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

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "gflanguages";
version = "0.5.17";
version = "0.6.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dScgRQ6usjSqV0FqDyP+KGvHL06wlTFVcO+MmZ2NMAs=";
hash = "sha256-kaJZ0STN2U/4vQ7g5VbpPGv64czryK8jXmIJ97bkItA=";
};
pyproject = true;

15
pkgs/development/python-modules/govee-local-api/default.nix
View File

@ -2,15 +2,15 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
poetry-core,
poetry-dynamic-versioning,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "govee-local-api";
version = "1.4.4";
version = "1.4.5";
pyproject = true;
disabled = pythonOlder "3.10";
@ -19,12 +19,19 @@ buildPythonPackage rec {
owner = "Galorhallen";
repo = "govee-local-api";
rev = "refs/tags/v${version}";
hash = "sha256-J4SG4n6LIZ/G6pEXAzliV7uTWzqsH7rtFe3Y7BJ2dWE=";
hash = "sha256-kmIuo/e3eLJTgmI+2Oq9Y0jov/133jXwgoBayGv33r4=";
};
patches = [
(fetchpatch2 {
# configure pep517 build-backend
url = "https://github.com/Galorhallen/govee-local-api/commit/897a21ae723ff94343bbf4ba1541e3a1d3e03c94.patch";
hash = "sha256-/d5jGKGME768Ar+WWWQUByHJPGB31OHShI4oLjcMUIU=";
})
];
build-system = [
poetry-core
poetry-dynamic-versioning
];
nativeCheckInputs = [ pytestCheckHook ];

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "habluetooth";
version = "2.8.0";
version = "2.8.1";
pyproject = true;
disabled = pythonOlder "3.10";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "habluetooth";
rev = "refs/tags/v${version}";
hash = "sha256-Qmq81iZpeLNrSIvxgkHl6ZYntlRwQPfPWRY2ZToQXCs=";
hash = "sha256-2QiV32gDaoIBLUv/a3YzosFl6+E/nm0WoSUcTx9ph8s=";
};
postPatch = ''

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "indexed_zstd";
version = "1.6.0";
version = "1.6.1";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-icCerrv6ihBjSTS4Fsw7qhoA5ha8yegfMVRiIOhTvvY=";
hash = "sha256-i3Q3j5Rh/OqxdSFbZeHEiYZN2zS9gWBYk2pifwzKOos=";
};
nativeBuildInputs = [ cython setuptools ];

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

@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "libretranslate";
version = "1.5.6";
version = "1.5.7";
pyproject = true;
src = fetchFromGitHub {
owner = "LibreTranslate";
repo = "LibreTranslate";
rev = "refs/tags/v${version}";
hash = "sha256-43VnxgtapMRKyXxqsvBgSMUxvpbLI+iOfW3FA0/POpE=";
hash = "sha256-lOVi/809ig+KtiNwdt9Wovn+2Q8I6amps1sZ5JJy7WE=";
};
build-system = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "21.0.0";
version = "21.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-ksYTV10FGUjBIkJru4CiJIlPLT4S7fbpsNrjYczTFlI=";
hash = "sha256-KZGfr60RclPMis3y/XPY+VMQr0IxGXMwI7tPxNOlmhg=";
};
propagatedBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "plantuml-markdown";
version = "3.9.5";
version = "3.9.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mikitex70";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-bfbji517y0/PXMfLg2gGWlogg7IPhXvQ5vekLzc4/ow=";
hash = "sha256-LbAQt7cbSUHSU5QfqQWQWuolPxCoXBjmVaw5Tz96fK8=";
};
propagatedBuildInputs = [

36
pkgs/development/python-modules/py65/default.nix
View File

@ -1,40 +1,42 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
unittestCheckHook,
}:
buildPythonPackage rec {
pname = "py65";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
version = "1.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mnaberez";
repo = "py65";
rev = "refs/tags/${version}";
hash = "sha256-WLs3TAZovuphWZIvMvM3CZnqg1aZfMF4Yrqw46k+bLA=";
hash = "sha256-BMX+sMPx/YBFA4NFkaY0rl0EPicGHgb6xXVvLEIdllA=";
};
postPatch = ''
substituteInPlace py65/tests/test_monitor.py \
--replace "test_argv_rom" "dont_test_argv_rom" \
--replace "test_argv_combination_rom_mpu" "dont_test_argv_combination_rom_mpu"
'';
build-system = [ setuptools ];
nativeCheckInputs = [ unittestCheckHook ];
meta = {
homepage = "https://py65.readthedocs.io/";
homepage = "https://github.com/mnaberez/py65";
description = "Emulate 6502-based microcomputer systems in Python";
mainProgram = "py65mon";
longDescription = ''
Py65 includes a program called Py65Mon that functions as a machine
language monitor. This kind of program is sometimes also called a
debugger. Py65Mon provides a command line with many convenient commands
for interacting with the simulated 6502-based system.
'';
changelog = "https://github.com/mnaberez/py65/blob/${src.rev}/CHANGES.txt";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ AndersonTorres tomasajt ];
mainProgram = "py65mon";
maintainers = with lib.maintainers; [
AndersonTorres
tomasajt
];
};
}

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

@ -9,33 +9,46 @@
, pytest-cov
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
, tenacity
}:
buildPythonPackage rec {
pname = "pynws";
version = "1.6.0";
format = "setuptools";
version = "1.7.0";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "MatthewFlamm";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU=";
hash = "sha256-JjXGDjLITzJxEmCIv7RPvb+Jqe9hm++ptpJOryuK9M0=";
};
propagatedBuildInputs = [
build-system = [
setuptools
setuptools-scm
];
dependencies = [
aiohttp
metar
];
optional-dependencies.retry = [
tenacity
];
nativeCheckInputs = [
freezegun
pytest-aiohttp
pytest-asyncio
pytest-cov
pytestCheckHook
];
] ++ lib.flatten (lib.attrValues optional-dependencies);
pythonImportsCheck = [ "pynws" ];

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pyvista";
version = "0.43.6";
version = "0.43.7";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-EhhnX7r8yHynEVahMSB6LxCAquQcUF4cI0S4oW+IZ/Y=";
hash = "sha256-z/IO25hcHv1pimUecIIX5hZPYF2/1QkROqZ2D4Tk7DE=";
};
nativeBuildInputs = [

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

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.16.7";
version = "0.16.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-zfjcXQCXysG+JMw00YES/GQk/yjHH9kCksb9SlZt9wo=";
hash = "sha256-jAkDZKAm75MlAMNuX+21ZV6kHb53zgIOJctJC2bXH1k=";
};
nativeBuildInputs = [ pkg-config ];

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "quantile-forest";
version = "1.3.4";
version = "1.3.5";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "zillow";
repo = "quantile-forest";
rev = "refs/tags/v${version}";
hash = "sha256-hzLJq0y+qjc48PfHW3i73x9safGOy0V1HEQ5WR8IXpI=";
hash = "sha256-0zlj9nks5KsgsLSflRW+4uiYlYVQsF0HMkZ3zG3if2E=";
};
build-system = [

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "softlayer";
version = "6.1.11";
version = "6.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "softlayer-python";
rev = "refs/tags/v${version}";
hash = "sha256-2iN3T58aICQlGwr10/e/mWE9pA4rbJCBTE1jTu3GeGk=";
hash = "sha256-kOElL6VtHrtbA0lNAnDOC6VPX1mC7Rvk5x6N5x2Z1B0=";
};
postPatch = ''

45
pkgs/development/python-modules/wsgidav/default.nix
View File

@ -1,22 +1,23 @@
{ lib
, buildPythonPackage
, cheroot
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, defusedxml
, jinja2
, json5
, python-pam
, pyyaml
, requests
, setuptools
, webtest
{
lib,
buildPythonPackage,
cheroot,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
defusedxml,
jinja2,
json5,
python-pam,
pyyaml,
requests,
setuptools,
webtest,
}:
buildPythonPackage rec {
pname = "wsgidav";
version = "4.3.2";
version = "4.3.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -25,12 +26,12 @@ buildPythonPackage rec {
owner = "mar10";
repo = "wsgidav";
rev = "refs/tags/v${version}";
hash = "sha256-93+8h+vRLnspQ/lmdjKYpzSEJSKcqCkB4qRqTuKHNRA=";
hash = "sha256-vUqNC7ixpta0s7wRC5ROSKMa/MsgEBu5rr0XNu69FRw=";
};
build-system = [
setuptools
];
__darwinAllowLocalNetworking = true;
build-system = [ setuptools ];
dependencies = [
defusedxml
@ -40,8 +41,6 @@ buildPythonPackage rec {
pyyaml
];
__darwinAllowLocalNetworking = true;
nativeCheckInputs = [
cheroot
pytestCheckHook
@ -49,9 +48,7 @@ buildPythonPackage rec {
webtest
];
pythonImportsCheck = [
"wsgidav"
];
pythonImportsCheck = [ "wsgidav" ];
meta = with lib; {
description = "Generic and extendable WebDAV server based on WSGI";

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

@ -47,11 +47,15 @@ buildPythonPackage rec {
"xcffib"
];
# Tests use xvfb
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "A drop in replacement for xpyb, an XCB python binding";
homepage = "https://github.com/tych0/xcffib";
changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
maintainers = with maintainers; [ kamilchm ];
};
}

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "zdaemon";
version = "5.0";
version = "5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ml7GxRmigLvPqPfnP04Q2AjnuCcQq2COD0Sb88BtQ9U=";
hash = "sha256-Iun+UFDq67ngPZrWTk9jzNheBMOP2zUc8RO+9vaNt6Q=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/bacon/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-lYj6WIb8HvOO/RlxeTzD3r7Jjfx4mDqZ9VKo0chvooU=";
hash = "sha256-pui5cHWRE+b06RlAPfOXIO6DfuWlKvFWx2vlQX9H7k0=";
};
cargoHash = "sha256-G3IfxIhQ1t47ZhndTBmcUZNXHYehaaMVgIjBuD71zHE=";
cargoHash = "sha256-Eu9Pf1bKd054451ssLh7rEfNLEdityAybjfUqo+DXtY=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

6
pkgs/development/tools/misc/n98-magerun2/default.nix
View File

@ -5,16 +5,16 @@
php.buildComposerProject (finalAttrs: {
pname = "n98-magerun2";
version = "7.3.1";
version = "7.4.0";
src = fetchFromGitHub {
owner = "netz98";
repo = "n98-magerun2";
rev = finalAttrs.version;
hash = "sha256-a1T4SmeOEKRW/xS2VBPLZt6r9JdtaJn8YVvfRnzGdb4=";
hash = "sha256-OPvyZ0r7Zt4PC+rmRtBm9EkbaE4PeovnUHrhzXUqT8E=";
};
vendorHash = "sha256-1j0/spum4C9j/HNVlHwUehAFYJOz7YvMVlC6dtbNYK0=";
vendorHash = "sha256-HSkcYbDQPK1ByG8Euq9YqzK0jqjKrWO+0R4ungFDOIY=";
meta = {
changelog = "https://magerun.net/category/magerun/";

4
pkgs/development/web/ihp-new/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ihp-new";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "digitallyinduced";
repo = "ihp";
rev = "v${version}";
sha256 = "sha256-oQz7ZBrHe6WwYMwnxxUgnYM55CuH5Oxjz6mrLnYbB7U=";
sha256 = "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc=";
};
dontConfigure = true;

14
pkgs/games/freeciv/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "freeciv";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "freeciv";
repo = "freeciv";
rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-8cMy0O5VxVi1ffvA/Gz4BnTB0WvJptMSgM7Zu992k5k=";
hash = "sha256-ImjXDJ1Bq85OfUhxGe184cd5eu4a8BrZh+YYhzUdrLo=";
};
postPatch = ''
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
meta = {
description = "Multiplayer (or single player), turn-based strategy game";
longDescription = ''
Freeciv is a Free and Open Source empire-building strategy game
@ -79,10 +79,10 @@ stdenv.mkDerivation rec {
to the space age...
'';
homepage = "http://www.freeciv.org"; # http only
license = licenses.gpl2;
maintainers = with maintainers; [ pierron ];
platforms = platforms.unix;
hydraPlatforms = platforms.linux; # sdl-config times out on darwin
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ pierron ];
platforms = lib.platforms.unix;
hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin
broken = qtClient && stdenv.isDarwin; # Missing Qt5 development files
};
}

2
pkgs/games/gtypist/default.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1";
};
CFLAGS = "-std=gnu89";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ncurses perl fortune ]
++ lib.optional stdenv.isDarwin libiconv;

4
pkgs/games/openttd/jgrpp.nix
View File

@ -2,13 +2,13 @@
openttd.overrideAttrs (oldAttrs: rec {
pname = "openttd-jgrpp";
version = "0.58.2";
version = "0.58.3";
src = fetchFromGitHub rec {
owner = "JGRennison";
repo = "OpenTTD-patches";
rev = "jgrpp-${version}";
hash = "sha256-XwKCqfYgrqQpo/2L+vHCde/z2QV88BFL+WQqvsEYdhE=";
hash = "sha256-NRCdZ7iSeofVjH/kjpnw4zlxXc4ojhF1xfMpAfZuu98=";
};
buildInputs = oldAttrs.buildInputs ++ [ zstd ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "fwts";
version = "24.01.00";
version = "24.03.00";
src = fetchzip {
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
sha256 = "sha256-MXWmKxcxgSVCSeeGlWsa8JTBa5hLyvGPZ0811w+s+yA=";
sha256 = "sha256-UKL5q5sURSVXvEOzoZdG+wWBSS5f9YWo5stViY3F2vg=";
stripRoot = false;
};

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -6,14 +6,14 @@ let
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.6.29";
hash = "sha256-Be2VaW0DQDS0FJUwXM627QaNgrn1B3Hbyq+PiKb7b+k=";
version = "6.6.30";
hash = "sha256-fQATjYekxV/+24mqyel3bYfgUMN4NhOHR9yyL6L5bl0=";
variant = "lts";
};
mainVariant = {
version = "6.8.8";
hash = "sha256-6fT9vRjHw775m4ySUAUWU9R0dz/cWYYdZsPCwZjGiXM=";
version = "6.8.9";
hash = "sha256-OUlT/fiwLGTPnr/7gneyZBio/l8KAWopcJqTpSjBMl0=";
variant = "main";
};

Some files were not shown because too many files have changed in this diff Show More