Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-04-06 00:02:21 +00:00 committed by GitHub
commit 0ba819378f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
184 changed files with 2751 additions and 2616 deletions

View File

@ -203,6 +203,12 @@
fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B";
}]; }];
}; };
_48cf = {
name = "czapek";
email = "czapek1337@gmail.com";
github = "48cf";
githubId = 32851089;
};
_6543 = { _6543 = {
email = "6543@obermui.de"; email = "6543@obermui.de";
github = "6543"; github = "6543";
@ -6442,6 +6448,12 @@
githubId = 5198058; githubId = 5198058;
name = "Udo Sauer"; name = "Udo Sauer";
}; };
ferrine = {
email = "justferres@yandex.ru";
github = "ferrine";
githubId = 11705326;
name = "Max Kochurov";
};
ffinkdevs = { ffinkdevs = {
email = "fink@h0st.space"; email = "fink@h0st.space";
github = "ffinkdevs"; github = "ffinkdevs";

View File

@ -230,7 +230,7 @@ When upgrading from a previous release, please be aware of the following incompa
- The `documentation` module gained an option named `documentation.nixos.includeAllModules` which makes the generated configuration.nix 5 manual page include all options from all NixOS modules included in a given `configuration.nix` configuration file. Currently, it is set to `false` by default as enabling it frequently prevents evaluation. But the plan is to eventually have it set to `true` by default. Please set it to `true` now in your `configuration.nix` and fix all the bugs it uncovers. - The `documentation` module gained an option named `documentation.nixos.includeAllModules` which makes the generated configuration.nix 5 manual page include all options from all NixOS modules included in a given `configuration.nix` configuration file. Currently, it is set to `false` by default as enabling it frequently prevents evaluation. But the plan is to eventually have it set to `true` by default. Please set it to `true` now in your `configuration.nix` and fix all the bugs it uncovers.
- The `vlc` package gained support for Chromecast streaming, enabled by default. TCP port 8010 must be open for it to work, so something like `networking.firewall.allowedTCPPorts = [ 8010 ];` may be required in your configuration. Also consider enabling [ Accelerated Video Playback](https://nixos.wiki/wiki/Accelerated_Video_Playback) for better transcoding performance. - The `vlc` package gained support for Chromecast streaming, enabled by default. TCP port 8010 must be open for it to work, so something like `networking.firewall.allowedTCPPorts = [ 8010 ];` may be required in your configuration. Also consider enabling [ Accelerated Video Playback](https://wiki.nixos.org/wiki/Accelerated_Video_Playback) for better transcoding performance.
- The following changes apply if the `stateVersion` is changed to 19.09 or higher. For `stateVersion = "19.03"` or lower the old behavior is preserved. - The following changes apply if the `stateVersion` is changed to 19.09 or higher. For `stateVersion = "19.03"` or lower the old behavior is preserved.

View File

@ -302,7 +302,7 @@ in {
}; };
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf (enabledInstances != []) { (lib.mkIf (enabledInstances != {}) {
assertions = lib.mkMerge (lib.attrValues (lib.mapAttrs (name: cfg: [ assertions = lib.mkMerge (lib.attrValues (lib.mapAttrs (name: cfg: [
{ {
assertion = cfg.settings.homeserver.domain != "" && cfg.settings.homeserver.address != ""; assertion = cfg.settings.homeserver.domain != "" && cfg.settings.homeserver.address != "";

View File

@ -170,7 +170,7 @@ in
# thing, but for VM tests it should provide a bit more # thing, but for VM tests it should provide a bit more
# determinism (e.g. if the VM runs at lower speed, then # determinism (e.g. if the VM runs at lower speed, then
# timeouts in the VM should also be delayed). # timeouts in the VM should also be delayed).
"clock=acpi_pm" "clocksource=acpi_pm"
]; ];
# `xwininfo' is used by the test driver to query open windows. # `xwininfo' is used by the test driver to query open windows.

View File

@ -10,6 +10,7 @@
, hicolor-icon-theme , hicolor-icon-theme
, isocodes , isocodes
, itstool , itstool
, libadwaita
, libxml2 , libxml2
, meson , meson
, ninja , ninja
@ -20,13 +21,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "parlatype"; pname = "parlatype";
version = "4.0"; version = "4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gkarsay"; owner = "gkarsay";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1iyjxss6sgc9gx6ij30zz97bl31qix8pxklzn4kknh1b0j7hhbwq"; sha256 = "0546rl5sm7xmgl54cqps3a7bhfs7xdvz98jgdcf4sgiz1k2vh9xq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
gtk4 gtk4
hicolor-icon-theme hicolor-icon-theme
isocodes isocodes
libadwaita
]; ];
postPatch = '' postPatch = ''
@ -72,7 +74,8 @@ stdenv.mkDerivation rec {
useful for journalists, students, scientists and whoever needs to useful for journalists, students, scientists and whoever needs to
transcribe audio files. transcribe audio files.
''; '';
homepage = "https://www.parlatype.org/"; # maintainer lost control of parlatype.org
homepage = "https://github.com/gkarsay/parlatype";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ alexshpilkin melchips ]; maintainers = with maintainers; [ alexshpilkin melchips ];
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
releasePath releasePath
else else
let let
platform = platforms.${stdenv.system}; platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; urlVersion = lib.replaceStrings [ "." ] [ "_" ] version;
in fetchurl { in fetchurl {
url = url =

View File

@ -9,7 +9,7 @@ in
name = "vscode-wakatime"; name = "vscode-wakatime";
publisher = "WakaTime"; publisher = "WakaTime";
version = "18.0.5"; version = "18.0.5";
sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs=";
}; };
meta = { meta = {

View File

@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
name = "rescript-vscode"; name = "rescript-vscode";
publisher = "chenglou92"; publisher = "chenglou92";
inherit version; inherit version;
sha256 = "sha256-Dt7mqZQ/vEUFyUD5SsY6RGzg9kq19/Amksrwtfv0TuE="; hash = "sha256-Dt7mqZQ/vEUFyUD5SsY6RGzg9kq19/Amksrwtfv0TuE=";
}; };
postPatch = '' postPatch = ''
rm -r ${analysisDir} rm -r ${analysisDir}

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "rescript-lang"; owner = "rescript-lang";
repo = "rescript-vscode"; repo = "rescript-vscode";
rev = version; rev = version;
sha256 = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU=";
}; };
nativeBuildInputs = [ ocaml dune_3 ocamlPackages.cppo ]; nativeBuildInputs = [ ocaml dune_3 ocamlPackages.cppo ];

View File

@ -10,7 +10,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
name = "context-mapper-vscode-extension"; name = "context-mapper-vscode-extension";
publisher = "contextmapper"; publisher = "contextmapper";
version = "6.11.0"; version = "6.11.0";
sha256 = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; hash = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "vsc-material-theme"; name = "vsc-material-theme";
publisher = "Equinusocio"; publisher = "Equinusocio";
version = "34.3.1"; version = "34.3.1";
sha256 = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; hash = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE=";
}; };
# extensions wants to write at the /nix/store path, so we patch it to use the globalStorageUri instead. # extensions wants to write at the /nix/store path, so we patch it to use the globalStorageUri instead.

View File

@ -4,7 +4,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
name = "terraform"; name = "terraform";
publisher = "hashicorp"; publisher = "hashicorp";
version = "2.19.0"; version = "2.19.0";
sha256 = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY="; hash = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY=";
}; };
patches = [ ./fix-terraform-ls.patch ]; patches = [ ./fix-terraform-ls.patch ];

View File

@ -5,7 +5,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "plantuml"; name = "plantuml";
publisher = "jebbs"; publisher = "jebbs";
version = "2.17.4"; version = "2.17.4";
sha256 = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; hash = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug=";
}; };
nativeBuildInputs = [ jq moreutils ]; nativeBuildInputs = [ jq moreutils ];
postInstall = '' postInstall = ''

View File

@ -1,10 +1,10 @@
{ publisher, name, version, arch ? "", sha256 ? "" }: { publisher, name, version, arch ? "", sha256 ? "", hash ? "" }:
let let
archurl = (if arch == "" then "" else "?targetPlatform=${arch}"); archurl = (if arch == "" then "" else "?targetPlatform=${arch}");
in in
{ {
url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}"; url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}";
sha256 = sha256; inherit sha256 hash;
# The `*.vsix` file is in the end a simple zip file. Change the extension # The `*.vsix` file is in the end a simple zip file. Change the extension
# so that existing `unzip` hooks takes care of the unpacking. # so that existing `unzip` hooks takes care of the unpacking.
name = "${publisher}-${name}.zip"; name = "${publisher}-${name}.zip";

View File

@ -12,7 +12,7 @@ let
extInfo = { extInfo = {
x86_64-linux = { x86_64-linux = {
arch = "linux-x64"; arch = "linux-x64";
sha256 = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8=";
binaries = [ binaries = [
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost"
@ -22,7 +22,7 @@ let
}; };
aarch64-linux = { aarch64-linux = {
arch = "linux-arm64"; arch = "linux-arm64";
sha256 = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw=";
binaries = [ binaries = [
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost"
@ -32,7 +32,7 @@ let
}; };
x86_64-darwin = { x86_64-darwin = {
arch = "darwin-x64"; arch = "darwin-x64";
sha256 = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM=";
binaries = [ binaries = [
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost"
@ -42,7 +42,7 @@ let
}; };
aarch64-darwin = { aarch64-darwin = {
arch = "darwin-arm64"; arch = "darwin-arm64";
sha256 = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw=";
binaries = [ binaries = [
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost"
@ -57,7 +57,7 @@ buildVscodeMarketplaceExtension {
name = "csdevkit"; name = "csdevkit";
publisher = "ms-dotnettools"; publisher = "ms-dotnettools";
version = "1.4.28"; version = "1.4.28";
inherit (extInfo) sha256 arch; inherit (extInfo) hash arch;
}; };
sourceRoot = "extension"; # This has more than one folder. sourceRoot = "extension"; # This has more than one folder.

View File

@ -29,22 +29,22 @@ let
{ {
x86_64-linux = { x86_64-linux = {
arch = "linux-x64"; arch = "linux-x64";
sha256 = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE=";
binaries = linuxBins; binaries = linuxBins;
}; };
aarch64-linux = { aarch64-linux = {
arch = "linux-arm64"; arch = "linux-arm64";
sha256 = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA=";
binaries = linuxBins; binaries = linuxBins;
}; };
x86_64-darwin = { x86_64-darwin = {
arch = "darwin-x64"; arch = "darwin-x64";
sha256 = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI=";
binaries = darwinBins; binaries = darwinBins;
}; };
aarch64-darwin = { aarch64-darwin = {
arch = "darwin-arm64"; arch = "darwin-arm64";
sha256 = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0=";
binaries = darwinBins ++ [ binaries = darwinBins ++ [
".debugger/arm64/vsdbg-ui" ".debugger/arm64/vsdbg-ui"
".debugger/arm64/vsdbg" ".debugger/arm64/vsdbg"
@ -57,7 +57,7 @@ buildVscodeMarketplaceExtension {
name = "csharp"; name = "csharp";
publisher = "ms-dotnettools"; publisher = "ms-dotnettools";
version = "2.22.3"; version = "2.22.3";
inherit (extInfo) sha256 arch; inherit (extInfo) hash arch;
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
name = "python"; name = "python";
publisher = "ms-python"; publisher = "ms-python";
version = "2023.1.10091012"; version = "2023.1.10091012";
sha256 = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; hash = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM=";
}; };
buildInputs = [ icu ]; buildInputs = [ icu ];
@ -72,7 +72,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
tmp=$(mktemp) tmp=$(mktemp)
curl -sLo $tmp $(echo ${(import ../mktplcExtRefToFetchArgs.nix mktplcRef).url} | sed "s|${mktplcRef.version}|$version|") curl -sLo $tmp $(echo ${(import ../mktplcExtRefToFetchArgs.nix mktplcRef).url} | sed "s|${mktplcRef.version}|$version|")
hash=$(nix hash file --type sha256 --base32 --sri $tmp) hash=$(nix hash file --type sha256 --base32 --sri $tmp)
sed -i -e "s|${mktplcRef.sha256}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/python/default.nix sed -i -e "s|${mktplcRef.hash}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/python/default.nix
fi fi
''; '';

View File

@ -5,7 +5,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "jupyter"; name = "jupyter";
publisher = "ms-toolsai"; publisher = "ms-toolsai";
version = "2024.2.0"; version = "2024.2.0";
sha256 = "sha256-QavZ8NNeu0FHLvorhHybzfmdQqKnyXD6MYA8AzabPQw="; hash = "sha256-QavZ8NNeu0FHLvorhHybzfmdQqKnyXD6MYA8AzabPQw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -84,7 +84,7 @@ buildVscodeMarketplaceExtension {
name = "remote-ssh"; name = "remote-ssh";
publisher = "ms-vscode-remote"; publisher = "ms-vscode-remote";
version = "0.78.0"; version = "0.78.0";
sha256 = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w="; hash = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w=";
}; };
postPatch = '' postPatch = ''

View File

@ -32,11 +32,11 @@ let
gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
supported = { supported = {
x86_64-linux = { x86_64-linux = {
sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg="; hash = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg=";
arch = "linux-x64"; arch = "linux-x64";
}; };
aarch64-linux = { aarch64-linux = {
sha256 = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM="; hash = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM=";
arch = "linux-arm64"; arch = "linux-arm64";
}; };
}; };

View File

@ -1,54 +1,23 @@
# Based on previous attempts: { lib, vscode-utils, xsel }:
# - <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>
# - <https://github.com/NixOS/nixpkgs/issues/41189>
{ lib, gccStdenv, vscode-utils
, autoPatchelfHook, bash, makeWrapper
, curl, gcc, libsecret, libunwind, libX11, lttng-ust, util-linux
, desktop-file-utils, xsel
}:
let vscode-utils.buildVscodeMarketplaceExtension {
# https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually
libs = [
# Credential Storage
libsecret
# NodeJS
libX11
# https://github.com/flathub/com.visualstudio.code.oss/issues/11#issuecomment-392709170
libunwind
lttng-ust
curl
# General
gcc.cc.lib
util-linux # libuuid
];
in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "vsliveshare"; name = "vsliveshare";
publisher = "ms-vsliveshare"; publisher = "ms-vsliveshare";
version = "1.0.5900"; version = "1.0.5918";
sha256 = "sha256-syVW/aS2ppJjg4OZaenzGM3lczt+sLy7prwsYFTDl9s="; hash = "sha256-Tk0mKydUF8M7l7NC9wEA7t2rzJWy/mq4/HvIHI2/ldQ=";
}; };
}).overrideAttrs({ buildInputs ? [], ... }: {
buildInputs = buildInputs ++ libs;
# Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates.
# Rather than patching the calls to functions, we modify the functions to return what we want,
# which is less likely to break in the future.
postPatch = '' postPatch = ''
substituteInPlace extension.js \ substituteInPlace extension.js \
--replace "'xsel'" "'${xsel}/bin/xsel'" --replace-fail '"xsel"' '"${xsel}/bin/xsel"'
''; '';
meta = { meta = {
description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; description = "Real-time collaborative development for VS Code";
homepage = "https://aka.ms/vsls-docs"; homepage = "https://aka.ms/vsls-docs";
changelog = "https://marketplace.visualstudio.com/items/MS-vsliveshare.vsliveshare/changelog";
license = lib.licenses.unfree; license = lib.licenses.unfree;
maintainers = [ lib.maintainers.jraygauthier lib.maintainers.V ]; maintainers = builtins.attrValues { inherit (lib.maintainers) jraygauthier V; };
platforms = [ "x86_64-linux" ];
}; };
}) }

View File

@ -26,7 +26,7 @@ let
owner = "rust-lang"; owner = "rust-lang";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = releaseTag; rev = releaseTag;
sha256 = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; hash = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE=";
}; };
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps";

View File

@ -8,7 +8,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "lua"; name = "lua";
publisher = "sumneko"; publisher = "sumneko";
version = "3.7.3"; version = "3.7.3";
sha256 = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM="; hash = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM=";
}; };
# Running chmod in runtime will lock up extension # Running chmod in runtime will lock up extension

View File

@ -6,7 +6,7 @@ let
repo = "llvm-project"; repo = "llvm-project";
# codelldb/14.x branch # codelldb/14.x branch
rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7";
sha256 = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw=";
}; };
in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec {
passthru = (oldAttrs.passthru or {}) // { passthru = (oldAttrs.passthru or {}) // {

View File

@ -74,6 +74,7 @@ let
"publisher" "publisher"
"version" "version"
"sha256" "sha256"
"hash"
"arch" "arch"
]; ];

File diff suppressed because it is too large Load Diff

View File

@ -9,6 +9,7 @@
, wayland , wayland
, xorg , xorg
, vulkan-loader , vulkan-loader
, udev
, jre_minimal , jre_minimal
, cairo , cairo
, gtk3 , gtk3
@ -20,13 +21,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruffle"; pname = "ruffle";
version = "nightly-2024-02-09"; version = "nightly-2024-03-25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ruffle-rs"; owner = "ruffle-rs";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-C4wfR5io0FBFmNfYHlE/v81jQAb0SEoaCzI6tenRYGg="; hash = "sha256-3G5xSGdMl4ISQmb2BVGdKz1cXU5Mnl+VkVYpJ6P12og=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -52,6 +53,7 @@ rustPlatform.buildRustPackage rec {
xorg.libxcb xorg.libxcb
xorg.libXrender xorg.libXrender
vulkan-loader vulkan-loader
udev
]; ];
dontWrapGApps = true; dontWrapGApps = true;
@ -59,7 +61,8 @@ rustPlatform.buildRustPackage rec {
preFixup = '' preFixup = ''
patchelf $out/bin/ruffle_desktop \ patchelf $out/bin/ruffle_desktop \
--add-needed libxkbcommon-x11.so \ --add-needed libxkbcommon-x11.so \
--add-rpath ${libxkbcommon}/lib --add-needed libwayland-client.so \
--add-rpath ${libxkbcommon}/lib:${wayland}/lib
''; '';
postFixup = '' postFixup = ''
@ -83,10 +86,10 @@ rustPlatform.buildRustPackage rec {
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"flash-lso-0.6.0" = "sha256-SHWIOVp3MGIATKDKAGNWG3B3jX3a0jDE2c8bt7NptrE="; "flash-lso-0.6.0" = "sha256-sVe53VRtBEEI6eERWRv6aG6BBT31sSLvJ6CSCcif2Lo=";
"h263-rs-0.1.0" = "sha256-Akf1SBjo8qikhiHI8NPvO3vJvVfm0dQBf2X9V7OdgQc="; "h263-rs-0.1.0" = "sha256-EBYZ00axaILGc2CtJoPQpewlf6+jlmml+cXZFyoxhHQ=";
"jpegxr-0.3.0" = "sha256-jirUbse2MiUDCmwBO7ykWNKHgDgL/6ZM5o2HeDUhm0c="; "jpegxr-0.3.1" = "sha256-YbQMi86DXqdi7o0s5ajAv7/vFaxNpShz19cNa9MpOsA=";
"nellymoser-rs-0.1.2" = "sha256-GykDQc1XwySOqfxW/OcSxkKCFJyVmwSLy/CEBcwcZJs="; "nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04=";
"nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c="; "nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c=";
}; };
}; };

View File

@ -13,7 +13,7 @@ let
hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs="; hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs=";
}; };
}; };
src = srcs.${stdenv.hostPlatform.system}; src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
meta = with lib; { meta = with lib; {
description = "User-friendly Desktop Internet GIS"; description = "User-friendly Desktop Internet GIS";

View File

@ -26,11 +26,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "photoqt"; pname = "photoqt";
version = "4.3"; version = "4.4";
src = fetchurl { src = fetchurl {
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
hash = "sha256-B0ZubvWIEZFnD2v74bpPv+/wr7vaHS9QP4//9/afjzQ="; hash = "sha256-dCaNF5UoH6SkKBrZGtwg2qZcDtlptdBxEGZL2oKyjhI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb";
sha256 = "sha256-Gpr5456MCNpyam3g2qPo7S3aEZFMaUGR8bu7YmRY8xk="; sha256 = "sha256-Gpr5456MCNpyam3g2qPo7S3aEZFMaUGR8bu7YmRY8xk=";
}; };
}."${stdenv.hostPlatform.system}"; }."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}");
unpackPhase = '' unpackPhase = ''
ar x $src ar x $src

View File

@ -51,7 +51,7 @@ let
}; };
src = fetchurl { src = fetchurl {
inherit (sources.${channel}.${stdenv.system}) url hash; inherit (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) url hash;
}; };
meta = with lib; { meta = with lib; {

View File

@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "camunda-modeler"; pname = "camunda-modeler";
version = "5.20.0"; version = "5.21.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
hash = "sha256-W8//7sU/ewA99ea3lDPi+IbdAdswt9rukdjoQWj2H9Q="; hash = "sha256-brZRYvRrOHj/HUb+w5tPkxHnJzVyFBKshk2ZO7YMzsU=";
}; };
sourceRoot = "camunda-modeler-${version}-linux-x64"; sourceRoot = "camunda-modeler-${version}-linux-x64";

View File

@ -1,13 +1,16 @@
{ lib {
, fetchFromGitHub lib,
, git fetchFromGitHub,
, python3 git,
python3,
}: }:
let
python3.pkgs.buildPythonApplication rec { python = python3.override { packageOverrides = self: super: { pydantic = super.pydantic_1; }; };
in
python.pkgs.buildPythonApplication rec {
pname = "dbx"; pname = "dbx";
version = "0.8.18"; version = "0.8.18";
format = "setuptools"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "databrickslabs"; owner = "databrickslabs";
@ -17,67 +20,64 @@ python3.pkgs.buildPythonApplication rec {
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
"cryptography"
"databricks-cli"
"rich" "rich"
"typer" "typer"
]; ];
pythonRemoveDeps = [ pythonRemoveDeps = [ "mlflow-skinny" ];
"mlflow-skinny"
];
nativeBuildInputs = with python3.pkgs; [ build-system = with python.pkgs; [ setuptools ];
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
aiohttp
click propagatedBuildInputs =
cookiecutter with python.pkgs;
cryptography [
databricks-cli aiohttp
jinja2 click
mlflow cookiecutter
pathspec cryptography
pydantic databricks-cli
pyyaml jinja2
requests mlflow
retry pathspec
rich pydantic
tenacity pyyaml
typer requests
watchdog retry
] ++ typer.optional-dependencies.all; rich
tenacity
typer
watchdog
]
++ typer.optional-dependencies.all;
passthru.optional-dependencies = with python3.pkgs; { passthru.optional-dependencies = with python3.pkgs; {
aws = [ aws = [ boto3 ];
boto3
];
azure = [ azure = [
azure-storage-blob azure-storage-blob
azure-identity azure-identity
]; ];
gcp = [ gcp = [ google-cloud-storage ];
google-cloud-storage
];
}; };
nativeCheckInputs = [ nativeCheckInputs =
git [ git ]
] ++ (with python3.pkgs; [ ++ (with python3.pkgs; [
pytest-asyncio pytest-asyncio
pytest-mock pytest-mock
pytest-timeout pytest-timeout
pytestCheckHook pytestCheckHook
]); ]);
preCheck = '' preCheck = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
export PATH="$PATH:$out/bin" export PATH="$PATH:$out/bin"
''; '';
pytestFlagsArray = [ pytestFlagsArray = [ "tests/unit" ];
"tests/unit"
];
disabledTests = [ disabledTests = [
# Fails because of dbfs CLI wrong call # Fails because of dbfs CLI wrong call
@ -87,10 +87,27 @@ python3.pkgs.buildPythonApplication rec {
"test_python_basic_sanity_check" "test_python_basic_sanity_check"
]; ];
pythonImportsCheck = [ disabledTestPaths = [
"dbx" "tests/unit/api/"
"tests/unit/api/test_build.py"
"tests/unit/api/test_destroyer.py"
"tests/unit/api/test_jinja.py"
"tests/unit/commands/test_configure.py"
"tests/unit/commands/test_deploy_jinja_variables_file.py"
"tests/unit/commands/test_deploy.py"
"tests/unit/commands/test_destroy.py"
"tests/unit/commands/test_execute.py"
"tests/unit/commands/test_help.py"
"tests/unit/commands/test_launch.py"
"tests/unit/models/test_deployment.py"
"tests/unit/models/test_destroyer.py"
"tests/unit/models/test_task.py"
"tests/unit/sync/test_commands.py"
"tests/unit/utils/test_common.py"
]; ];
pythonImportsCheck = [ "dbx" ];
meta = with lib; { meta = with lib; {
description = "CLI tool for advanced Databricks jobs management"; description = "CLI tool for advanced Databricks jobs management";
homepage = "https://github.com/databrickslabs/dbx"; homepage = "https://github.com/databrickslabs/dbx";

View File

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: { lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null
# update script dependencies
, gitUpdater
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dmenu"; pname = "dmenu";
@ -24,11 +27,15 @@ stdenv.mkDerivation rec {
makeFlags = [ "CC:=$(CC)" ]; makeFlags = [ "CC:=$(CC)" ];
passthru.updateScript = gitUpdater {
url = "git://git.suckless.org/dmenu";
};
meta = with lib; { meta = with lib; {
description = "A generic, highly customizable, and efficient menu for the X Window System"; description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = "https://tools.suckless.org/dmenu"; homepage = "https://tools.suckless.org/dmenu";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ pSub globin ]; maintainers = with maintainers; [ pSub globin qusic ];
platforms = platforms.all; platforms = platforms.all;
mainProgram = "dmenu"; mainProgram = "dmenu";
}; };

View File

@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let
in in
{ {
pname = "remnote"; pname = "remnote";
version = "1.14.13"; version = "1.15.4";
src = fetchurl { src = fetchurl {
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
hash = "sha256-WpNgdQGNz1Vv3MQe6tgnkzf+rvxMeoDQns5SqKNP7F8="; hash = "sha256-6WBdTOj/seinx1wJGb/4if3PzCPmtzHyNAFmQwmsrvE=";
}; };
appexec = appimageTools.wrapType2 { appexec = appimageTools.wrapType2 {

View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; description = "Simple emoji selector for Wayland using wofi and wl-clipboard";
homepage = "https://github.com/dln/wofi-emoji"; homepage = "https://github.com/Zeioth/wofi-emoji";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.ymarkus ]; maintainers = [ maintainers.ymarkus ];
platforms = platforms.all; platforms = platforms.all;

View File

@ -35,7 +35,7 @@ let
src = fetchurl { src = fetchurl {
url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}"
+ optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz";
inherit (platformAttrs.${stdenv.system}) hash; inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) hash;
}; };
doCheck = true; doCheck = true;

View File

@ -8,18 +8,19 @@
, qtwebengine , qtwebengine
, qtwayland , qtwayland
, pipewire , pipewire
, kdePackages
, nix-update-script , nix-update-script
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "discord-screenaudio"; pname = "discord-screenaudio";
version = "1.9.2"; version = "1.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "maltejur"; owner = "maltejur";
repo = "discord-screenaudio"; repo = "discord-screenaudio";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-it7JSmiDz3k1j+qEZrrNhyAuoixiQuiEbXac7lbJmko="; hash = "sha256-+F+XRBQn4AVDVARdM2XtBDE7c6tMPZTR3cntDL8aenw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -34,6 +35,9 @@ stdenv.mkDerivation rec {
qtwebengine qtwebengine
qtwayland qtwayland
pipewire pipewire
kdePackages.knotifications
kdePackages.kxmlgui
kdePackages.kglobalaccel
]; ];
preConfigure = '' preConfigure = ''

View File

@ -52,7 +52,7 @@ let
}; };
aarch64-darwin = x86_64-darwin; aarch64-darwin = x86_64-darwin;
}; };
src = srcs.${stdenv.hostPlatform.system}.${branch}; src = srcs.${stdenv.hostPlatform.system}.${branch} or (throw "${stdenv.hostPlatform.system} not supported on ${branch}");
meta = with lib; { meta = with lib; {
description = "All-in-one cross-platform voice and text chat for gamers"; description = "All-in-one cross-platform voice and text chat for gamers";

View File

@ -1,36 +1,44 @@
{ lib, fetchFromGitHub, buildPythonApplication, aiohttp, python-dateutil, humanize, click, pytestCheckHook, tox }: {
lib,
fetchFromGitHub,
python3,
}:
buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "twtxt"; pname = "twtxt";
version = "1.3.1"; version = "1.3.1";
pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "buckket"; owner = "buckket";
repo = pname; repo = "twtxt";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw="; sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw=";
}; };
# Relax some dependencies build-system = with python3.pkgs; [ setuptools ];
postPatch = ''
substituteInPlace setup.py \
--replace 'aiohttp>=2.2.5,<3' 'aiohttp' \
--replace 'click>=6.7,<7' 'click' \
--replace 'humanize>=0.5.1,<1' 'humanize'
'';
propagatedBuildInputs = [ aiohttp python-dateutil humanize click ]; dependencies = with python3.pkgs; [
aiohttp
click
humanize
python-dateutil
setuptools
];
nativeCheckInputs = [ pytestCheckHook tox ]; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
pythonImportsCheck = [ "twtxt" ];
disabledTests = [ disabledTests = [
# Disable test using relative date and time # Disable test using relative date and time
"test_tweet_relative_datetime" "test_tweet_relative_datetime"
]; ];
meta = with lib; { meta = with lib; {
description = "Decentralised, minimalist microblogging service for hackers"; description = "Decentralised, minimalist microblogging service for hackers";
homepage = "https://github.com/buckket/twtxt"; homepage = "https://github.com/buckket/twtxt";
changelog = "https://github.com/buckket/twtxt/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ siraben ]; maintainers = with maintainers; [ siraben ];
mainProgram = "twtxt"; mainProgram = "twtxt";

View File

@ -49,7 +49,7 @@ let
# If we don't have a platform available, put a dummy version here, so at # If we don't have a platform available, put a dummy version here, so at
# least evaluation succeeds. # least evaluation succeeds.
sources = sources =
(lib.importJSON ./sources.json).${stdenv.system} or { picoscope.version = "unknown"; }; (lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}");
scopePkg = name: scopePkg = name:
{ url, version, sha256 }: { url, version, sha256 }:

View File

@ -15,7 +15,7 @@ let
sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4=";
}; };
}; };
src = srcs.${stdenv.hostPlatform.system}; src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
contents = appimageTools.extract { inherit name src; }; contents = appimageTools.extract { inherit name src; };

View File

@ -7,10 +7,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bilibili"; pname = "bilibili";
version = "1.13.0-2"; version = "1.13.2-1";
src = fetchurl { src = fetchurl {
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
hash = "sha256-svTD8YZBFj0K9/3ggojiH+8cMRkCxHr/hHTC24NL2tE="; hash = "sha256-yqgQNsTD4iT54LJYEbV6dk7OD7KoZvX61XERYQ4MsSA=";
}; };
unpackPhase = '' unpackPhase = ''

View File

@ -1,8 +1,8 @@
{ lib { lib
, fetchFromGitLab , fetchFromGitLab
, mkDerivation , mkKdeDerivation
, breeze-icons , breeze-icons
, breeze-qt5 , breeze
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
, ffmpeg-headless , ffmpeg-headless
@ -12,7 +12,7 @@
, ki18n , ki18n
, kiconthemes , kiconthemes
, kio , kio
, kirigami2 , kirigami
, kxmlgui , kxmlgui
, kdoctools , kdoctools
, mpv , mpv
@ -20,19 +20,18 @@
, wrapQtAppsHook , wrapQtAppsHook
, qqc2-desktop-style , qqc2-desktop-style
, qtbase , qtbase
, qtquickcontrols2
, yt-dlp , yt-dlp
}: }:
mkDerivation rec { mkKdeDerivation rec {
pname = "haruna"; pname = "haruna";
version = "0.12.3"; version = "1.0.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "multimedia"; owner = "multimedia";
repo = "haruna"; repo = "haruna";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iYf8oTMQ65+6E1dlOj0GU6EezPul6p1GG2CcrcjDUik="; hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8=";
domain = "invent.kde.org"; domain = "invent.kde.org";
}; };
@ -43,7 +42,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
breeze-icons breeze-icons
breeze-qt5 breeze
qqc2-desktop-style qqc2-desktop-style
yt-dlp yt-dlp
@ -54,12 +53,11 @@ mkDerivation rec {
ki18n ki18n
kiconthemes kiconthemes
kio kio
kirigami2 kirigami
kxmlgui kxmlgui
kdoctools kdoctools
mpv mpv
qtbase qtbase
qtquickcontrols2
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,7 +13,7 @@ let
dlbin = sha256: fetchurl { dlbin = sha256: fetchurl {
url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz";
sha256 = sha256."${stdenv.hostPlatform.system}"; sha256 = sha256."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}");
}; };
in in

View File

@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "alt-tab-macos"; pname = "alt-tab-macos";
version = "6.66.0"; version = "6.68.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
hash = "sha256-mQ4tS9htL+X4lXqSe3L+mnwgVnHb3Zxyz6dgzmYHY9w="; hash = "sha256-NjDq5Uq771xRHeTipqwTrlz9vBCSsnV34A0482tcZuE=";
}; };
sourceRoot = "."; sourceRoot = ".";

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster"; pname = "bngblaster";
version = "0.8.39"; version = "0.8.44";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rtbrick"; owner = "rtbrick";
repo = "bngblaster"; repo = "bngblaster";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-w8E/GcwLCH6OYwabRWH+CNQ2p7scMK8ogReRxNFqI4k="; hash = "sha256-kKzrXw6HQ2917RBArj2BxixXXH0mIvC4IeEU2JY4F9s=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gcc12Stdenv
, SDL2
, libGL
}:
gcc12Stdenv.mkDerivation (finalAttrs: {
pname = "bstone";
version = "1.2.12";
src = fetchFromGitHub {
owner = "bibendovsky";
repo = "bstone";
rev = "v${finalAttrs.version}";
hash = "sha256-wtW595cSoVTZaVykxOkJViNs3OmuIch9nA5s1SqwbJo=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
libGL
SDL2
];
postInstall = ''
mkdir -p $out/bin
mv $out/bstone* $out/bin
'';
meta = {
description = "Unofficial source port for the Blake Stone series";
homepage = "https://github.com/bibendovsky/bstone";
changelog = "https://github.com/bibendovsky/bstone/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = with lib.licenses; [
gpl2Plus # Original game source code
mit # BStone
];
maintainers = with lib.maintainers; [ keenanweaver ];
mainProgram = "bstone";
platforms = lib.platforms.linux; #TODO: macOS / Darwin support
};
})

View File

@ -1,28 +1,34 @@
{ lib, stdenv, fetchFromGitHub, SDL2, glew, lua5_4, desktopToDarwinBundle }: { lib, stdenv, fetchFromGitHub, SDL2, SDL2_net, glew, lua5_4, desktopToDarwinBundle }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cadzinho"; pname = "cadzinho";
version = "0.4.1"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zecruel"; owner = "zecruel";
repo = "CadZinho"; repo = "CadZinho";
rev = version; rev = version;
hash = "sha256-6/sBNxQb52FFO2fWLVs6YDOmJLEbSOA5mwdMdJDjEDM="; hash = "sha256-s2+k1TcmY3xwxXccHP7au71e0l3Qrso5XxmGGVvyIo0=";
}; };
postPatch = '' postPatch = ''
substituteInPlace src/gui_config.c --replace "/usr/share/cadzinho" "$out/share/cadzinho" substituteInPlace src/gui_config.c --replace-fail "/usr/share/cadzinho" "$out/share/cadzinho"
substituteInPlace Makefile --replace-fail "-lGLEW" "-lGLEW -lSDL2_net"
''; '';
nativeBuildInputs = lib.optional stdenv.isDarwin desktopToDarwinBundle; nativeBuildInputs = lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [ SDL2 glew lua5_4 ]; buildInputs = [ SDL2 SDL2_net glew lua5_4 ];
makeFlags = [ "CC:=$(CC)" ]; makeFlags = [ "CC:=$(CC)" ];
# https://github.com/llvm/llvm-project/issues/62254 env.NIX_CFLAGS_COMPILE = toString ([
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-builtin-strrchr"; "-I${SDL2.dev}/include/SDL2"
"-I${SDL2_net.dev}/include/SDL2"
] ++ lib.optionals stdenv.isDarwin [
# https://github.com/llvm/llvm-project/issues/62254
"-fno-builtin-strrchr"
]);
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View File

@ -6,24 +6,27 @@
, expat , expat
, pkg-config , pkg-config
, check , check
, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libstrophe"; pname = "libstrophe";
version = "0.12.3"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "strophe"; owner = "strophe";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "EDgdKJ7wqUoThy0t1r39p2lbn64uvTDoIqNCzhpWnZ8="; hash = "sha256-JMuvWspgXs+1dVWoo6kJVaf6cVvYj8lhyyu4ZILKeOg=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ openssl expat libtool check ]; buildInputs = [ openssl expat libtool check zlib ];
dontDisableStatic = true; dontDisableStatic = true;
strictDeps = true;
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {

View File

@ -0,0 +1,66 @@
# Builds limine with all available features.
{
# Helpers
stdenv
, fetchurl
, lib
, # Dependencies
llvmPackages
, mtools
, nasm
}:
let
version = "7.3.0";
in
# The output of the derivation is a tool to create bootable images using Limine
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation {
inherit version;
pname = "limine";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
sha256 = "sha256-iPi6u3iZOJfVRERrJVgH6q16aANnSGgBL5AtNuANrao=";
};
nativeBuildInputs = [
llvmPackages.bintools
# gcc is used for the host tool, while clang is used for the bootloader.
llvmPackages.clang
llvmPackages.lld
mtools
nasm
];
configureFlags = [
"--enable-all"
];
installFlags = [ "destdir=$out" "manprefix=/share" ];
outputs = [ "out" "doc" "dev" "man" ];
meta = with lib; {
homepage = "https://limine-bootloader.org/";
description = "Limine Bootloader";
# Caution. Some submodules have different licenses.
license = [
licenses.bsd2 # limine, flanterm
licenses.bsd0 # freestanding-toolchain, freestanding-headers
licenses.asl20 # cc-runtime
licenses.mit # limine-efi, stb
licenses.zlib # tinf
];
# The platforms on that the Liminine binary and helper tools can run, not
# necessarily the platforms for that bootable images can be created.
platforms = platforms.unix;
maintainers = [
maintainers._48cf
maintainers.phip1611
];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mbusd"; pname = "mbusd";
version = "0.5.1"; version = "0.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "3cky"; owner = "3cky";
repo = "mbusd"; repo = "mbusd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vYYaJKcnREng+2UsDIZ28hvANkQCHVixQIxo82m7MQs="; hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View File

@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "newsraft"; pname = "newsraft";
version = "0.23"; version = "0.24";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "newsraft"; owner = "newsraft";
repo = "newsraft"; repo = "newsraft";
rev = "newsraft-${finalAttrs.version}"; rev = "newsraft-${finalAttrs.version}";
hash = "sha256-c5yN67FL4siPyO8v0RuTCznwrqX9+r8tY5PKS4zlqIc="; hash = "sha256-LTiFwsjnGuGN4UgMpu/HGKtJbbYTx58zldjV2C/wtPQ=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pgmoneta"; pname = "pgmoneta";
version = "0.10.0"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pgmoneta"; owner = "pgmoneta";
repo = "pgmoneta"; repo = "pgmoneta";
rev = version; rev = version;
hash = "sha256-wNBomyyr078Twzg7fuu3et1NUxpb+vqIbsnpmF73t18="; hash = "sha256-gViXbL54YGY2NFg0ScyiarMB4vYjpOrdkyTjWzwP2vo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,38 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa }:
buildGoModule rec {
pname = "rosa";
version = "1.2.36";
src = fetchFromGitHub {
owner = "openshift";
repo = "rosa";
rev = "v${version}";
hash = "sha256-jdLMQLbk446QJ+8+HjTCTjtlCuLlZZsLUBInRg4UMH0=";
};
vendorHash = null;
ldflags = [ "-s" "-w" ];
__darwinAllowLocalNetworking = true;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd rosa \
--bash <($out/bin/rosa completion bash) \
--fish <($out/bin/rosa completion fish) \
--zsh <($out/bin/rosa completion zsh)
'';
passthru.tests.version = testers.testVersion {
package = rosa;
command = "rosa version --client";
};
meta = with lib; {
description = "CLI for the Red Hat OpenShift Service on AWS";
license = licenses.asl20;
homepage = "https://github.com/openshift/rosa";
maintainers = with maintainers; [ jfchevrette ];
};
}

View File

@ -10,7 +10,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "satellite"; pname = "satellite";
version = "0.4.2"; version = "0.4.3";
pyproject = true; pyproject = true;
@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "tpikonen"; owner = "tpikonen";
repo = "satellite"; repo = "satellite";
rev = version; rev = version;
hash = "sha256-VPljvbHsPpBvH//LFs1P0YiyMfQxTLHrrxqnVk261hg="; hash = "sha256-4L6zbHjWAIJJv2N3XKcfHSZUAUC2FPjK5hT9XGBtQ3w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchurl
, unzip
, makeBinaryWrapper
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sloth-app";
version = "3.2";
src = fetchurl {
url = "https://github.com/sveinbjornt/Sloth/releases/download/${finalAttrs.version}/sloth-${finalAttrs.version}.zip";
hash = "sha256-8/x8I769V8kGxstDuXXUaMtGvg03n2vhrKvmaltSISo=";
};
dontUnpack = true;
nativeBuildInputs = [ unzip makeBinaryWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications $out/bin
unzip -d $out/Applications $src
makeWrapper $out/Applications/Sloth.app/Contents/MacOS/Sloth $out/bin/Sloth
runHook postInstall
'';
meta = {
description = "Mac app that shows all open files, directories, sockets, pipes and devices";
homepage = "https://sveinbjorn.org/sloth";
license = lib.licenses.bsd3;
mainProgram = "Sloth";
maintainers = with lib.maintainers; [ emilytrau ];
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})

View File

@ -5,13 +5,13 @@
buildGoModule { buildGoModule {
pname = "spirit"; pname = "spirit";
version = "0-unstable-2024-01-11"; version = "0-unstable-2024-03-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cashapp"; owner = "cashapp";
repo = "spirit"; repo = "spirit";
rev = "fdbfa0baf31e9406227ae7fa9403c977189d715c"; rev = "10e4bba0a89ef3b372046dc367c2b2d12e9d0c0b";
hash = "sha256-kvERTUYVsuKS24/CavmlZd0K6hlosGMDLeEZcHfwBZI="; hash = "sha256-tw+gHSxIHKEsHaVuknylk4zWsTRKGVNci9WimDC9y1A=";
}; };
vendorHash = "sha256-r6iQs5kgOniHCN8KteQ17rPhQ/73Exuqlu6qWgKEIzs="; vendorHash = "sha256-r6iQs5kgOniHCN8KteQ17rPhQ/73Exuqlu6qWgKEIzs=";

View File

@ -41,6 +41,10 @@ stdenv.mkDerivation {
"LIBRARY_TYPE=relocatable" "LIBRARY_TYPE=relocatable"
]; ];
env = lib.optionalAttrs stdenv.isDarwin {
NIX_LDFLAGS = "-headerpad_max_install_names";
};
# Fixes gprbuild being linked statically always. Based on the AUR's patch: # Fixes gprbuild being linked statically always. Based on the AUR's patch:
# https://aur.archlinux.org/cgit/aur.git/plain/0001-Makefile-build-relocatable-instead-of-static-binary.patch?h=gprbuild&id=bac524c76cd59c68fb91ef4dfcbe427357b9f850 # https://aur.archlinux.org/cgit/aur.git/plain/0001-Makefile-build-relocatable-instead-of-static-binary.patch?h=gprbuild&id=bac524c76cd59c68fb91ef4dfcbe427357b9f850
patches = lib.optionals (!stdenv.hostPlatform.isStatic) [ patches = lib.optionals (!stdenv.hostPlatform.isStatic) [

View File

@ -83,6 +83,8 @@ let
# Remove old versions of elixir, when the supports fades out: # Remove old versions of elixir, when the supports fades out:
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
ex_doc = callPackage ./ex_doc { inherit elixir fetchMixDeps mixRelease; };
elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; }; elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };
lfe = lfe_2_1; lfe = lfe_2_1;

View File

@ -0,0 +1,55 @@
{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }:
# Based on ../elixir-ls/default.nix
let
pname = "ex_doc";
version = "0.31.2";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "${pname}";
rev = "v${version}";
hash = "sha256-qUiXZ1KHD9sS1xG7QNYyrZVzPqerwCRdkN8URrlQ45g=";
};
in
mixRelease {
inherit pname version src elixir;
stripDebug = true;
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version elixir;
hash = "sha256-ZNHhWCZ3n2Y/XCsXVjbu4wbx/J95JdFP/2raACciAUU=";
};
configurePhase = ''
runHook preConfigure
mix deps.compile --no-deps-check
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
mix do escript.build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -v ex_doc $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/elixir-lang/ex_doc";
description = ''
ExDoc produces HTML and EPUB documentation for Elixir projects
'';
license = licenses.asl20;
platforms = platforms.unix;
mainProgram = "ex_doc";
maintainers = with maintainers; [chiroptical];
};
passthru.updateScript = nix-update-script { };
}

View File

@ -128,7 +128,10 @@ in
++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch ++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch
# Use absolute path in GNAT dylib install names on Darwin # Use absolute path in GNAT dylib install names on Darwin
++ optional (atLeast12 && stdenv.isDarwin && langAda) ./gnat-darwin-dylib-install-name.patch ++ optionals (stdenv.isDarwin && langAda) ({
"13" = [ ./gnat-darwin-dylib-install-name-13.patch ];
"12" = [ ./gnat-darwin-dylib-install-name.patch ];
}.${majorVersion} or [])
# We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building
# a foreign one: https://github.com/iains/gcc-12-branch/issues/18 # a foreign one: https://github.com/iains/gcc-12-branch/issues/18

View File

@ -0,0 +1,18 @@
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -788,13 +788,13 @@ gnatlib-shared-darwin:
-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
$(SO_OPTS) \
- -Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ -Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
$(MISCLIB)
cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -dynamiclib $(PICFLAG_FOR_TARGET) \
-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
$(GNATRTL_TASKING_OBJS) \
$(SO_OPTS) \
- -Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ -Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
libgnat$(soext)

View File

@ -80,7 +80,7 @@ let result = stdenv.mkDerivation rec {
in requireFile { in requireFile {
name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html";
sha256 = sha256.${stdenv.hostPlatform.system}; sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
}; };
nativeBuildInputs = [ file makeWrapper ] nativeBuildInputs = [ file makeWrapper ]

View File

@ -24,7 +24,7 @@ let
sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
src = fetchurl { src = fetchurl {
inherit (sourcePerArch.${cpuName}) url sha256; inherit (sourcePerArch.${cpuName} or (throw "unsupported system ${stdenv.hostPlatform.system}")) url sha256;
}; };
# See: https://github.com/NixOS/patchelf/issues/10 # See: https://github.com/NixOS/patchelf/issues/10

View File

@ -4,9 +4,9 @@ mkCoqDerivation {
pname = "LibHyps"; pname = "LibHyps";
owner = "Matafou"; owner = "Matafou";
inherit version; inherit version;
defaultVersion = if (lib.versions.range "8.11" "8.19") coq.version then "2.0.4.1" else null; defaultVersion = if (lib.versions.range "8.11" "8.19") coq.version then "2.0.8" else null;
release = { release = {
"2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; "2.0.8".sha256 = "sha256-u8T7ZWfgYNFBsIPss0uUS0oBvdlwPp3t5yYIMjYzfLc=";
}; };
configureScript = "./configure.sh"; configureScript = "./configure.sh";

View File

@ -17,8 +17,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A Rust implementation of the Starlark language"; description = "A Rust implementation of the Starlark language";
homepage = "https://github.com/facebookexperimental/starlark-rust"; homepage = "https://github.com/facebook/starlark-rust";
changelog = "https://github.com/facebookexperimental/starlark-rust/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda ];
mainProgram = "starlark"; mainProgram = "starlark";

View File

@ -16,7 +16,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "intel-media-driver"; pname = "intel-media-driver";
version = "23.3.5"; version = "23.4.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "intel"; owner = "intel";
repo = "media-driver"; repo = "media-driver";
rev = "intel-media-${version}"; rev = "intel-media-${version}";
hash = "sha256-7OdLpqO2evNeyxceOtHEI7sJCVybqvrcM1ZZx8bI4xw="; hash = "sha256-KVdnCl+jModdDNBtssTnVnq82ZbWovHlaMZ/9/xU8mU=";
}; };
patches = [ patches = [

View File

@ -73,7 +73,7 @@ let
platforms."aarch64-linux".sha256 = "16sbfk599h96wcsmpbxlwsvq0n1pssmm8dpwmjsqfrn1464dvs68"; platforms."aarch64-linux".sha256 = "16sbfk599h96wcsmpbxlwsvq0n1pssmm8dpwmjsqfrn1464dvs68";
platforms."x86_64-linux".sha256 = "1wa4nv28saz96kar9svdarfz6c4rnbcqz0rqxzl9zclnhfzhqdiw"; platforms."x86_64-linux".sha256 = "1wa4nv28saz96kar9svdarfz6c4rnbcqz0rqxzl9zclnhfzhqdiw";
platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; platformInfo = platforms.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cef-binary"; pname = "cef-binary";

View File

@ -2,24 +2,26 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libiscsi"; pname = "libiscsi";
version = "1.19.0"; version = "1.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sahlberg"; owner = "sahlberg";
repo = "libiscsi"; repo = "libiscsi";
rev = version; rev = version;
sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas=";
}; };
postPatch = '' postPatch = ''
substituteInPlace lib/socket.c \ substituteInPlace lib/socket.c \
--replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" --replace-fail "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {"
''; '';
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
# This problem is gone on libiscsi master. env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) {
env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"); # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
NIX_CFLAGS_COMPILE = "-Wno-error=format";
};
meta = with lib; { meta = with lib; {
description = "iscsi client library and utilities"; description = "iscsi client library and utilities";

View File

@ -1,33 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: { lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo, yaml-cpp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libpointmatcher"; pname = "libpointmatcher";
version = "1.3.1"; version = "1.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethz-asl"; owner = "norlab-ulaval";
repo = pname; repo = "libpointmatcher";
rev = version; rev = version;
sha256 = "0lai6sr3a9dj1j4pgjjyp7mx10wixy5wpvbka8nsc2danj6xhdyd"; hash = "sha256-XXkvBxG9f8rW1O968+2R+gltMSRGqH225vOmzp6Tpb8=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ eigen boost libnabo ]; buildInputs = [ eigen boost libnabo yaml-cpp ];
cmakeFlags = [ cmakeFlags = [
"-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3")
(lib.cmakeBool "BUILD_TESTS" doCheck)
]; ];
doCheck = true; doCheck = true;
checkPhase = ''
./utest/utest --path ../examples/data/
'';
meta = with lib; { meta = with lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
license = licenses.bsd3; license = licenses.bsd3;
platforms = [ "x86_64-linux" ]; platforms = platforms.linux;
maintainers = with maintainers; [ cryptix ]; maintainers = with maintainers; [ cryptix ];
}; };
} }

View File

@ -7,11 +7,11 @@
}: }:
let let
suitesparseVersion = "7.6.0"; suitesparseVersion = "7.7.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "mongoose"; pname = "mongoose";
version = "3.3.2"; version = "3.3.3";
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];
@ -19,7 +19,7 @@ stdenv.mkDerivation {
owner = "DrTimothyAldenDavis"; owner = "DrTimothyAldenDavis";
repo = "SuiteSparse"; repo = "SuiteSparse";
rev = "v${suitesparseVersion}"; rev = "v${suitesparseVersion}";
hash = "sha256-zZXbUNXxVi4mpI4j4GjyVYraoPFWcuep9q5jl1XdqEo="; hash = "sha256-wE1DKC0Hn3Q9X1FzKH7Kev26ICNWH0LEKQIQP98AGuo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,7 +2,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "linenoise"; pname = "linenoise";
version = "1.5"; version = "1.5.1";
minimalOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "fxfactorial"; owner = "fxfactorial";
repo = "ocaml-${pname}"; repo = "ocaml-${pname}";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ywcL5w65XXqInREalf0aDxvoEYA6tZW9eU5NGI/QETI="; sha256 = "sha256-yWBWMbk1anXaF4hIakTOcRZFCYmxI0xG3bHFFOAyEDA=";
}; };
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];

View File

@ -2,11 +2,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "ocaml-version"; pname = "ocaml-version";
version = "3.6.4"; version = "3.6.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
hash = "sha256-JwvOv+Q4gevAnIl73l6juQc3t2c+5BAPjAxs/zIYctw="; hash = "sha256-hHP2l0Jcz9YalxCY0wcgdH6zTz+OqRD6JOyjB+r539I=";
}; };
checkInputs = [ alcotest ]; checkInputs = [ alcotest ];

View File

@ -1,18 +1,19 @@
{ lib {
, aiolifx lib,
, async-timeout aiolifx,
, buildPythonPackage async-timeout,
, fetchFromGitHub buildPythonPackage,
, poetry-core fetchFromGitHub,
, pytest-asyncio poetry-core,
, pytestCheckHook pytest-asyncio,
, pythonOlder pytestCheckHook,
, typer pythonOlder,
typer,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiolifx-themes"; pname = "aiolifx-themes";
version = "0.4.12"; version = "0.4.14";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,23 +22,19 @@ buildPythonPackage rec {
owner = "Djelibeybi"; owner = "Djelibeybi";
repo = "aiolifx-themes"; repo = "aiolifx-themes";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-dV8xLZQaWiCSqXsY45vme4IMPT6UDmeAOkxEEU5UIW4="; hash = "sha256-KlQKRcgxaWqRKIusnZGoBDEfKYF1Gn9EkrhJAftdUTc=";
}; };
prePatch = '' prePatch = ''
# Don't run coverage, or depend on typer for no reason. # Don't run coverage, or depend on typer for no reason.
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \ --replace-fail " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \
--replace "typer = " "# unused: typer = " --replace-fail "typer = " "# unused: typer = "
''; '';
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
];
propagatedBuildInputs = [ dependencies = [ aiolifx ];
aiolifx
];
nativeCheckInputs = [ nativeCheckInputs = [
async-timeout async-timeout
@ -45,9 +42,7 @@ buildPythonPackage rec {
pytest-asyncio pytest-asyncio
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "aiolifx_themes" ];
"aiolifx_themes"
];
meta = with lib; { meta = with lib; {
description = "Color themes for LIFX lights running on aiolifx"; description = "Color themes for LIFX lights running on aiolifx";

View File

@ -21,7 +21,7 @@
let let
pname = "ansible"; pname = "ansible";
version = "9.3.0"; version = "9.4.0";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -31,7 +31,7 @@ buildPythonPackage {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-f06g5NBlU4h5s+Eegehe7U2ALRlA9lZK2VDp0RoxsDw="; hash = "sha256-3UMcYzgOGMP6yjKI696M4vT5kjY6tVijwRyPIDLZCGc=";
}; };
postPatch = '' postPatch = ''

View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "apispec"; pname = "apispec";
version = "6.5.0"; version = "6.6.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-wDpNhIrnDpuyJp3U5NMNjsfsBp0k756bQi48vRqf55Q="; hash = "sha256-wIRvjqpRGcRrLs/pvCTtGduohF+GVdALUd3SlqEOpMs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,28 +1,29 @@
{ lib {
, attrs lib,
, bidict attrs,
, bitstruct bidict,
, buildPythonPackage bitstruct,
, fetchFromGitHub buildPythonPackage,
, fetchpatch fetchFromGitHub,
, more-itertools fetchpatch,
, poetry-core more-itertools,
, pprintpp poetry-core,
, pythonOlder pprintpp,
, pythonRelaxDepsHook pythonOlder,
, tbm-utils pythonRelaxDepsHook,
tbm-utils,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "audio-metadata"; pname = "audio-metadata";
version = "0.11.1"; version = "0.11.1";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thebigmunch"; owner = "thebigmunch";
repo = pname; repo = "audio-metadata";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg="; hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg=";
}; };
@ -41,12 +42,11 @@ buildPythonPackage rec {
"more-itertools" "more-itertools"
]; ];
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [ nativeBuildInputs = [ pythonRelaxDepsHook ];
dependencies = [
attrs attrs
bidict bidict
bitstruct bitstruct
@ -58,13 +58,11 @@ buildPythonPackage rec {
# Tests require ward which is not ready to be used # Tests require ward which is not ready to be used
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [ "audio_metadata" ];
"audio_metadata"
];
meta = with lib; { meta = with lib; {
description = "Library for handling the metadata from audio files";
homepage = "https://github.com/thebigmunch/audio-metadata"; homepage = "https://github.com/thebigmunch/audio-metadata";
description = "A library for reading and, in the future, writing metadata from audio files";
changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md"; changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ]; maintainers = with maintainers; [ jakewaksbaum ];

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-netapp"; pname = "azure-mgmt-netapp";
version = "11.0.0"; version = "12.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-00cDFHpaEciRQLHM+Kt3uOtw/geOn5+onrY7lav6EeU="; hash = "sha256-bC7HZzIeUK4E6HcQgguB/sDr1G1kPkS/A43xZ6pBpyw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-servicebus"; pname = "azure-servicebus";
version = "7.12.0"; version = "7.12.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Xr5KU7/BAw9AH2lOrB7NJ8FB2ATl5vzyNXQrLWKUbks="; hash = "sha256-sRv1aer3fDDYp2+IuTwIcT/TYYjZzG2r9x6tsQ63Qvk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,32 +1,48 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, setuptools
, wheel
, jinja2
, jupyterhub , jupyterhub
, packaging
, pythonOlder , pythonOlder
, pytest-asyncio
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "batchspawner"; pname = "batchspawner";
version = "1.2.0"; version = "1.3.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jupyterhub"; owner = "jupyterhub";
repo = "batchspawner"; repo = "batchspawner";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oyS47q+gsO7JmRsbVJXglZsSRfits5rS/nrHW5E7EV0="; hash = "sha256-Z7kB8b7s11wokTachLI/N+bdUV+FfCRTemL1KYQpzio=";
}; };
propagatedBuildInputs = [ build-system = [
jupyterhub setuptools
packaging wheel
]; ];
# Tests require a job scheduler e.g. slurm, pbs, etc. dependencies = [
doCheck = false; jinja2
jupyterhub
];
preCheck = ''
substituteInPlace pyproject.toml \
--replace-fail "--cov=batchspawner" ""
'';
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ pythonImportsCheck = [
"batchspawner" "batchspawner"

View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bids-validator"; pname = "bids-validator";
version = "1.14.1"; version = "1.14.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Rv8fBCLm16K33co+H0WcN7rSaKoS1bjGvg2pKcEhm/4="; hash = "sha256-Q0pghEFmK5qJ3sWgrxs4jWUm+Ox7LO5sDR8GUJWBr/o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -24,14 +24,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "black"; pname = "black";
version = "24.2.0"; version = "24.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-vOTyXCfDQ15NrOSBW8sgCLh+Fn479O5HzNxc6QbrSJQ="; hash = "sha256-oMnEoHca/GkZV4zscc6Co+MeBUkE5xl96svJOCZxxB8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -18,16 +18,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bundlewrap"; pname = "bundlewrap";
version = "4.17.2"; version = "4.18.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bundlewrap"; owner = "bundlewrap";
repo = "bundlewrap"; repo = "bundlewrap";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-0yg8+OflTF3pNYz2TPNUW8ubTZjrEgtihV/21PpJUlM="; hash = "sha256-7jBFeJem+0vZot+BknKmCxozmoHCBCAZqDbfQQG3/Vw=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];

View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "click-command-tree"; pname = "click-command-tree";
version = "1.1.1"; version = "1.2.0";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whwright"; owner = "whwright";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-uBp7462LutL8aFRFix3pbVYbSf1af6k0nW0J0HhJa1U="; hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cryptolyzer"; pname = "cryptolyzer";
version = "0.12.2"; version = "0.12.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "CryptoLyzer"; pname = "CryptoLyzer";
inherit version; inherit version;
hash = "sha256-UffFdQ+MiB8kPzqnmWdnGRwAAM9wJwpUDK2bPvPvH0c="; hash = "sha256-UdM0+PkO3K4XshcqaDkEKry6Spny9KMZAHiADxxth+c=";
}; };
postPatch = '' postPatch = ''

View File

@ -15,23 +15,23 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc-task"; pname = "dvc-task";
version = "0.3.0"; version = "0.4.0";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iterative"; owner = "iterative";
repo = pname; repo = "dvc-task";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-nrE8PdvzhH7lO0flvNkGC61NOVT4aj2E2gKEDRkp+b4="; hash = "sha256-zSPv+eMGSsGXKtgi9r4EiGY1ZURXeJXWBKvR2GnfP8I=";
}; };
nativeBuildInputs = [ build-system = [
setuptools-scm setuptools-scm
]; ];
propagatedBuildInputs = [ dependencies = [
kombu kombu
shortuuid shortuuid
celery celery

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "empy"; pname = "empy";
version = "4.0.1"; version = "4.1";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-YjI3uYzWQ75eILrWJ1zJM//nz3ZFI5Lx0ybXZywqvWQ="; sha256 = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c=";
}; };
pythonImportsCheck = [ "em" ]; pythonImportsCheck = [ "em" ];
meta = with lib; { meta = with lib; {

View File

@ -47,7 +47,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flask-security-too"; pname = "flask-security-too";
version = "5.4.2"; version = "5.4.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -55,7 +55,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "Flask-Security-Too"; pname = "Flask-Security-Too";
inherit version; inherit version;
hash = "sha256-dzVHHC5Lsh6rUC+cOyNEe/uHVTzkObhFffgSvFOfKoI="; hash = "sha256-YrGTl+jXGo1MuNwNRAnMehSXmCVJAwOWlgruUYdV5YM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ftfy"; pname = "ftfy";
version = "6.1.3"; version = "6.2.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-aTJ0rq2BHP8kweh4QWWqdVzS9uRCpexTXH1pf2QipCI="; hash = "sha256-XkIUPHAl75eUTKJhnWthsGGfxmVPmHcdOehiwUJMdcA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gitpython"; pname = "gitpython";
version = "3.1.42"; version = "3.1.43";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gitpython-developers"; owner = "gitpython-developers";
repo = "GitPython"; repo = "GitPython";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-qpADumkfm8DHNlB2JeH/7sYrJqtYdFLv5YQAV0q5//s="; hash = "sha256-HO6t5cOHyDJVz+Bma4Lkn503ZfDmiQxUfSLaSZtUrTk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "glad2"; pname = "glad2";
version = "2.0.5"; version = "2.0.6";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-ugdXtqo6IEtjeHOxPQubQIZa4ZbfcpD8bAHYGOWK+Bw="; hash = "sha256-CGFa7TIZ6hx3WEvVlh2CO6sib4rDgx0JrfZcb6h3+Ow=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "glyphslib"; pname = "glyphslib";
version = "6.6.6"; version = "6.7.0";
format = "pyproject"; format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "googlefonts"; owner = "googlefonts";
repo = "glyphsLib"; repo = "glyphsLib";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-IF/mm6JOulB4kLZ1rRnZHjQth5RkgroDWuZ+HzMZYjM="; hash = "sha256-Fhp/2nK1LFgpJ3J7ZTxl2jKT6sCDyqT5qlLCtbnUejM=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];

View File

@ -18,14 +18,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-api-core"; pname = "google-api-core";
version = "2.17.1"; version = "2.18.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-nfGKH4fuDfC8TuoncOvEIoOS2MxAZmVbMg4s/MsV25U="; hash = "sha256-Ytl0F7/GdNbO8lHlxNY5qWVeAMRVKMQ2T7/rtHjOcqk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-api-python-client"; pname = "google-api-python-client";
version = "2.121.0"; version = "2.125.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-34Y+zk24s2zhBT69mD5D+8W2ZCCe7XjoLMhK5W3axsA="; hash = "sha256-UaA4XP9l7BNRBui+YO5xElVzlt3l9EETriORK63doUM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,35 +1,34 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi buildPythonPackage,
, google-api-core fetchPypi,
, google-cloud-testutils google-api-core,
, grpc-google-iam-v1 google-cloud-testutils,
, grpcio grpc-google-iam-v1,
, grpcio-status grpcio,
, libcst grpcio-status,
, proto-plus libcst,
, protobuf proto-plus,
, pytest-asyncio protobuf,
, pytestCheckHook pytest-asyncio,
, pythonOlder pytestCheckHook,
, setuptools pythonOlder,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-pubsub"; pname = "google-cloud-pubsub";
version = "2.21.0"; version = "2.21.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-lAF/C8moX6P02RPzEukwoP4hd1vWjd5cZm4vGxrd+BE="; hash = "sha256-MfzwdES3+BOmFsS2UOH78dyZigiP4AWadhZIVawX8Fw=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
];
dependencies = [ dependencies = [
google-api-core google-api-core
@ -42,9 +41,7 @@ buildPythonPackage rec {
] ++ google-api-core.optional-dependencies.grpc; ] ++ google-api-core.optional-dependencies.grpc;
passthru.optional-dependencies = { passthru.optional-dependencies = {
libcst = [ libcst = [ libcst ];
libcst
];
}; };
nativeCheckInputs = [ nativeCheckInputs = [
@ -63,9 +60,7 @@ buildPythonPackage rec {
"tests/unit/pubsub_v1" "tests/unit/pubsub_v1"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "google.cloud.pubsub" ];
"google.cloud.pubsub"
];
meta = with lib; { meta = with lib; {
description = "Google Cloud Pub/Sub API client library"; description = "Google Cloud Pub/Sub API client library";

View File

@ -18,14 +18,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-storage"; pname = "google-cloud-storage";
version = "2.15.0"; version = "2.16.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-dWCjxIoD1mxVPcVSFdNYg8aA/gq0TCOqSDKADMyFXHQ="; hash = "sha256-3aSF+lA3EKgo0BJGvRbOnbCCPcUbvKdCzpamgX1YZp8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "googleapis-common-protos"; pname = "googleapis-common-protos";
version = "1.62.0"; version = "1.63.0";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-g/Ds6flOVnLM7YL1ktKl7fUnqW7ReU8LqzbVc1yZYnc="; hash = "sha256-F60BsR1fHQFxwG07pcBMVEdOiDtmuUlyK0k47iaU704=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,18 +1,37 @@
{ lib, buildPythonPackage, fetchPypi}: {
lib,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
setuptools,
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "gorilla"; pname = "gorilla";
version = "0.4.0"; version = "0.4.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "005ab8853b037162a7c77bb824604c6e081878ee03c09ad01ef41744856019d3"; hash = "sha256-AFq4hTsDcWKnx3u4JGBMbggYeO4DwJrQHvQXRIVgGdM=";
}; };
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "gorilla" ];
disabledTests = lib.optionals (pythonAtLeast "3.12") [ "test_find_patches_2" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/christophercrouzet/gorilla";
description = "Convenient approach to monkey patching"; description = "Convenient approach to monkey patching";
homepage = "https://github.com/christophercrouzet/gorilla";
changelog = "https://github.com/christophercrouzet/gorilla/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ tbenst ]; maintainers = with maintainers; [ tbenst ];
}; };

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