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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-03 00:14:50 +00:00
committed by GitHub
parent b35ed50e47 b387a48a04
commit 1b5ba42224
204 changed files with 15498 additions and 14083 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
+1
View File
@@ -254,6 +254,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
# Idris
/pkgs/development/idris-modules @Infinisil
/pkgs/development/compilers/idris2 @mattpolzin
# Bazel
/pkgs/development/tools/build-managers/bazel @Profpatsch
doc/languages-frameworks/dotnet.section.md
+1
View File
@@ -118,6 +118,7 @@ For more detail about managing the `deps.nix` file, see [Generating and updating
* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build.
* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore.
* `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. Note that if set, only tests from this project are executed.
* `testFilters` is used to disable running unit tests based on various [filters](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details). This gets passed as: `dotnet test --filter "{}"`, with each filter being concatenated using `"&"`.
* `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks.
* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`.
* `dotnetBuildFlags` can be used to pass flags to `dotnet build`.
lib/modules.nix
+1 -1
View File
@@ -861,7 +861,7 @@ let
else
# (nixos-option detects this specific error message and gives it special
# handling. If changed here, please change it there too.)
throw "The option `${showOption loc}' is used but not defined.";
throw "The option `${showOption loc}' was accessed but has no value defined. Try setting the option.";
isDefined = defsFinal != [];
lib/strings.nix
+4 -3
View File
@@ -408,7 +408,6 @@ rec {
start ? false,
end ? false,
}:
s:
let
# Define our own whitespace character class instead of using
# `[:space:]`, which is not well-defined.
@@ -425,12 +424,14 @@ rec {
"(.*[^${chars}])[${chars}]*"
else
"(.*)";
in
s:
let
# If the string was empty or entirely whitespace,
# then the regex may not match and `res` will be `null`.
res = match regex s;
in
optionalString (res != null) (head res);
optionalString (res != null) (head res);
/**
Construct a Unix-style, colon-separated search path consisting of
lib/systems/default.nix
+1
View File
@@ -376,6 +376,7 @@ let
"armv7l" = "armv7";
"armv6l" = "arm";
"armv5tel" = "armv5te";
"riscv32" = "riscv32gc";
"riscv64" = "riscv64gc";
}.${cpu.name} or cpu.name;
vendor_ = final.rust.platform.vendor;
lib/tests/modules.sh
+4 -4
View File
@@ -312,7 +312,7 @@ checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkP
checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix
checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix
checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix
checkConfigError 'The option .undefinedPackage. is used but not defined' config.undefinedPackage ./declare-mkPackageOption.nix
checkConfigError 'The option .undefinedPackage. was accessed but has no value defined. Try setting the option.' config.undefinedPackage ./declare-mkPackageOption.nix
checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix
checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix
checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix
@@ -410,7 +410,7 @@ checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-
checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
# Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf
checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
checkConfigError 'The option .* was accessed but has no value defined. Try setting the option.' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
# submodules in freeformTypes should have their locations annotated
checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix
@@ -469,8 +469,8 @@ checkConfigOutput "{}" config.attrs.a ./emptyValues.nix
checkConfigOutput "null" config.null.a ./emptyValues.nix
checkConfigOutput "{}" config.submodule.a ./emptyValues.nix
# These types don't have empty values
checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix
checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix
checkConfigError 'The option .int.a. was accessed but has no value defined. Try setting the option.' config.int.a ./emptyValues.nix
checkConfigError 'The option .nonEmptyList.a. was accessed but has no value defined. Try setting the option.' config.nonEmptyList.a ./emptyValues.nix
# types.unique
# requires a single definition
maintainers/maintainer-list.nix
+11
View File
@@ -5643,6 +5643,12 @@
githubId = 6689924;
name = "David Terry";
};
dxwil = {
email = "dovydas@kersys.lt";
github = "dxwil";
githubId = 90563298;
name = "Dovydas Kersys";
};
dylan-gonzalez = {
email = "dylcg10@gmail.com";
github = "dylan-gonzalez";
@@ -8207,6 +8213,11 @@
githubId = 2405974;
name = "Sébastian Méric de Bellefon";
};
hellodword = {
github = "hellodword";
githubId = 46193371;
name = "hellodword";
};
hellwolf = {
email = "zhicheng.miao@gmail.com";
github = "hellwolf";
nixos/doc/manual/release-notes/rl-2411.section.md
+10
View File
@@ -4,6 +4,12 @@
## Highlights {#sec-release-24.11-highlights}
- **This will be the latest version of Nixpkgs to support macOS 10.12 (Sierra).**
Starting with release 25.05, the minimum supported version will be macOS 11 (Big Sur).
From that point on, packages may or may not work on older releases of macOS.
Users on old macOS versions should consider upgrading to a supported OS release (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to OS X 10.6 (Snow Leopard).
- Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`.
- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option.
@@ -119,6 +125,8 @@
- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
- `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.
- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
- `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.
@@ -169,6 +177,8 @@
- Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases.
- The `rust.toTargetArch`, `rust.toTargetOs`, `rust.toTargetFamily`, `rust.toTargetVendor`, `rust.toRustTarget`, `rust.toRustTargetSpec`, `rust.toRustTargetSpecShort`, and `rust.IsNoStdTarget` functions are deprecated in favour of the `rust.platform.arch`, `rust.platform.os`, `rust.platform.target-family`, `rust.platform.vendor`, `rust.rustcTarget`, `rust.rustcTargetSpec`, `rust.cargoShortTarget`, `rust.cargoEnvVarTarget`, and `rust.isNoStdTarget` platform attributes respectively.
- The `budgie` and `budgiePlugins` scope have been removed and their packages
moved into the top level scope (i.e., `budgie.budgie-desktop` is now
`budgie-desktop`)
nixos/modules/services/development/zammad.nix
+51 -54
View File
@@ -1,11 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.zammad;
settingsFormat = pkgs.formats.yaml { };
filterNull = filterAttrs (_: v: v != null);
filterNull = lib.filterAttrs (_: v: v != null);
serviceConfig = {
Type = "simple";
Restart = "always";
@@ -29,88 +26,88 @@ in
options = {
services.zammad = {
enable = mkEnableOption "Zammad, a web-based, open source user support/ticketing solution";
enable = lib.mkEnableOption "Zammad, a web-based, open source user support/ticketing solution";
package = mkPackageOption pkgs "zammad" { };
package = lib.mkPackageOption pkgs "zammad" { };
dataDir = mkOption {
type = types.path;
dataDir = lib.mkOption {
type = lib.types.path;
default = "/var/lib/zammad";
description = ''
Path to a folder that will contain Zammad working directory.
'';
};
host = mkOption {
type = types.str;
host = lib.mkOption {
type = lib.types.str;
default = "127.0.0.1";
example = "192.168.23.42";
description = "Host address.";
};
openPorts = mkOption {
type = types.bool;
openPorts = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether to open firewall ports for Zammad";
};
port = mkOption {
type = types.port;
port = lib.mkOption {
type = lib.types.port;
default = 3000;
description = "Web service port.";
};
websocketPort = mkOption {
type = types.port;
websocketPort = lib.mkOption {
type = lib.types.port;
default = 6042;
description = "Websocket service port.";
};
redis = {
createLocally = mkOption {
type = types.bool;
createLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to create a local redis automatically.";
};
name = mkOption {
type = types.str;
name = lib.mkOption {
type = lib.types.str;
default = "zammad";
description = ''
Name of the redis server. Only used if `createLocally` is set to true.
'';
};
host = mkOption {
type = types.str;
host = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = ''
Redis server address.
'';
};
port = mkOption {
type = types.port;
port = lib.mkOption {
type = lib.types.port;
default = 6379;
description = "Port of the redis server.";
};
};
database = {
type = mkOption {
type = types.enum [ "PostgreSQL" "MySQL" ];
type = lib.mkOption {
type = lib.types.enum [ "PostgreSQL" "MySQL" ];
default = "PostgreSQL";
example = "MySQL";
description = "Database engine to use.";
};
host = mkOption {
type = types.nullOr types.str;
host = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = {
PostgreSQL = "/run/postgresql";
MySQL = "localhost";
}.${cfg.database.type};
defaultText = literalExpression ''
defaultText = lib.literalExpression ''
{
PostgreSQL = "/run/postgresql";
MySQL = "localhost";
@@ -121,28 +118,28 @@ in
'';
};
port = mkOption {
type = types.nullOr types.port;
port = lib.mkOption {
type = lib.types.nullOr lib.types.port;
default = null;
description = "Database port. Use `null` for default port.";
};
name = mkOption {
type = types.str;
name = lib.mkOption {
type = lib.types.str;
default = "zammad";
description = ''
Database name.
'';
};
user = mkOption {
type = types.nullOr types.str;
user = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = "zammad";
description = "Database user.";
};
passwordFile = mkOption {
type = types.nullOr types.path;
passwordFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/keys/zammad-dbpassword";
description = ''
@@ -150,16 +147,16 @@ in
'';
};
createLocally = mkOption {
type = types.bool;
createLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to create a local database automatically.";
};
settings = mkOption {
settings = lib.mkOption {
type = settingsFormat.type;
default = { };
example = literalExpression ''
example = lib.literalExpression ''
{
}
'';
@@ -171,8 +168,8 @@ in
};
};
secretKeyBaseFile = mkOption {
type = types.nullOr types.path;
secretKeyBaseFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/keys/secret_key_base";
description = ''
@@ -197,10 +194,10 @@ in
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
services.zammad.database.settings = {
production = mapAttrs (_: v: mkDefault v) (filterNull {
production = lib.mapAttrs (_: v: lib.mkDefault v) (filterNull {
adapter = {
PostgreSQL = "postgresql";
MySQL = "mysql2";
@@ -215,7 +212,7 @@ in
});
};
networking.firewall.allowedTCPPorts = mkIf cfg.openPorts [
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openPorts [
config.services.zammad.port
config.services.zammad.websocketPort
];
@@ -243,9 +240,9 @@ in
}
];
services.mysql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") {
services.mysql = lib.optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") {
enable = true;
package = mkDefault pkgs.mariadb;
package = lib.mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
ensureUsers = [
{
@@ -255,7 +252,7 @@ in
];
};
services.postgresql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") {
services.postgresql = lib.optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") {
enable = true;
ensureDatabases = [ cfg.database.name ];
ensureUsers = [
@@ -266,7 +263,7 @@ in
];
};
services.redis = optionalAttrs cfg.redis.createLocally {
services.redis = lib.optionalAttrs cfg.redis.createLocally {
servers."${cfg.redis.name}" = {
enable = true;
port = cfg.redis.port;
@@ -282,7 +279,7 @@ in
after = [
"network.target"
"postgresql.service"
] ++ optionals cfg.redis.createLocally [
] ++ lib.optionals cfg.redis.createLocally [
"redis-${cfg.redis.name}.service"
];
requires = [
@@ -301,13 +298,13 @@ in
# config file
cp ${databaseConfig} ./config/database.yml
chmod -R +w .
${optionalString (cfg.database.passwordFile != null) ''
${lib.optionalString (cfg.database.passwordFile != null) ''
{
echo -n " password: "
cat ${cfg.database.passwordFile}
} >> ./config/database.yml
''}
${optionalString (cfg.secretKeyBaseFile != null) ''
${lib.optionalString (cfg.secretKeyBaseFile != null) ''
{
echo "production: "
echo -n " secret_key_base: "
@@ -317,7 +314,7 @@ in
if [ `${config.services.postgresql.package}/bin/psql \
--host ${cfg.database.host} \
${optionalString
${lib.optionalString
(cfg.database.port != null)
"--port ${toString cfg.database.port}"} \
--username ${cfg.database.user} \
nixos/modules/services/hardware/thinkfan.nix
+1 -1
View File
@@ -12,7 +12,7 @@ let
tuple = ts: lib.mkOptionType {
name = "tuple";
merge = lib.mergeOneOption;
check = xs: all id (zipListsWith (t: x: t.check x) ts xs);
check = xs: lib.all lib.id (zipListsWith (t: x: t.check x) ts xs);
description = "tuple of" + lib.concatMapStrings (t: " (${t.description})") ts;
};
level = ints.unsigned;
nixos/modules/virtualisation/qemu-vm.nix
+1 -1
View File
@@ -329,7 +329,7 @@ in
virtualisation.diskSize =
mkOption {
type = types.nullOr types.ints.positive;
type = types.ints.positive;
default = 1024;
description = ''
The disk size in megabytes of the virtual machine.
nixos/tests/prometheus-exporters.nix
-3
View File
@@ -530,9 +530,6 @@ let
global-module: mod-stats
dnssec-signing: off
zonefile-sync: -1
journal-db: /var/lib/knot/journal
kasp-db: /var/lib/knot/kasp
timer-db: /var/lib/knot/timer
zonefile-load: difference
storage: ${pkgs.buildEnv {
name = "foo";
nixos/tests/zigbee2mqtt.nix
+1 -1
View File
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
machine.wait_for_unit("multi-user.target")
machine.wait_until_fails("systemctl status zigbee2mqtt.service")
machine.succeed(
"journalctl -eu zigbee2mqtt | grep 'Failed to connect to the adapter'"
"journalctl -eu zigbee2mqtt | grep 'Error: Inappropriate ioctl for device, cannot set'"
)
machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))
pkgs/applications/editors/codeblocks/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3
, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook3
, contribPlugins ? false, hunspell, boost, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config file zip wrapGAppsHook3 ];
buildInputs = [ wxGTK32 gtk3 ]
++ lib.optionals contribPlugins [ hunspell gamin boost ];
++ lib.optionals contribPlugins [ hunspell boost ];
enableParallelBuilding = true;
patches = [
./writable-projects.patch
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [
("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman")
("--with-contrib-plugins=all,-FileManager" + lib.optionalString stdenv.isDarwin ",-NassiShneiderman")
"--with-boost-libdir=${boost}/lib"
];
postInstall = lib.optionalString stdenv.isDarwin ''
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -8751,6 +8751,18 @@ final: prev:
meta.homepage = "https://github.com/samjwill/nvim-unception/";
};
nvim-various-textobjs = buildVimPlugin {
pname = "nvim-various-textobjs";
version = "2024-08-17";
src = fetchFromGitHub {
owner = "chrisgrieser";
repo = "nvim-various-textobjs";
rev = "8dbc655f794202f45ab6a1cac1cb323a218ac6a1";
sha256 = "0fj02l74ibcp4b8j6jkyjfq2k25a3jllf6cd1mddhhj7laa4zhfw";
};
meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
};
nvim-web-devicons = buildVimPlugin {
pname = "nvim-web-devicons";
version = "2024-08-04";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -737,6 +737,7 @@ https://github.com/windwp/nvim-ts-autotag/,,
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
https://github.com/kevinhwang91/nvim-ufo/,HEAD,
https://github.com/samjwill/nvim-unception/,HEAD,
https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD,
https://github.com/kyazdani42/nvim-web-devicons/,,
https://github.com/AckslD/nvim-whichkey-setup.lua/,,
https://github.com/s1n7ax/nvim-window-picker/,HEAD,
pkgs/applications/emulators/mame/default.nix
+2 -2
View File
@@ -38,14 +38,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.268";
version = "0.269";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-zH/82WC4xXa/NMJ2W4U57Uv8+5994U5YcMbRvPiAtTI=";
hash = "sha256-ECOPohrfAVz0Rx/oYBFJvo91FoS76RJuBzadfXoXB4c=";
};
outputs = [ "out" "tools" ];
pkgs/applications/graphics/ImageMagick/default.nix
+2 -2
View File
@@ -49,13 +49,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-37";
version = "7.1.1-38";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-dlcyCJw/tytb6z5VaogblUlzBRYBtijUJbkX3vZdeEU=";
hash = "sha256-dyk9kCH1w76Jhy/yBhVFLthTKYaMgXLBn7QGWAFS0XU=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
pkgs/applications/graphics/rawtherapee/default.nix
+28 -13
View File
@@ -1,9 +1,17 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, cmake
, pkg-config
, util-linux
, libselinux
, libsepol
, lerc
, libthai
, libdatrie
, libxkbcommon
, libepoxy
, libXtst
, wrapGAppsHook3
, makeWrapper
, pixman
@@ -15,37 +23,31 @@
, libiptcdata
, fftw
, expat
, pcre
, pcre2
, libsigcxx
, lensfun
, librsvg
, libcanberra-gtk3
, gtk-mac-integration
, exiv2
, libraw
, libjxl
}:
stdenv.mkDerivation rec {
pname = "rawtherapee";
version = "5.10";
version = "5.11";
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
rev = version;
hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE=";
hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730=";
# The developpers ask not to use the tarball from Github releases, see
# https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers
forceFetchGit = true;
};
# https://github.com/Beep6581/RawTherapee/issues/7074
patches = [
(fetchurl {
url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff";
hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM=";
})
];
postPatch = ''
echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake
substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \
@@ -61,6 +63,15 @@ stdenv.mkDerivation rec {
];
buildInputs = [
util-linux
libselinux
libsepol
lerc
libthai
libdatrie
libxkbcommon
libepoxy
libXtst
pixman
libpthreadstubs
gtkmm3
@@ -70,11 +81,13 @@ stdenv.mkDerivation rec {
libiptcdata
fftw
expat
pcre
pcre2
libsigcxx
lensfun
librsvg
exiv2
libraw
libjxl
] ++ lib.optionals stdenv.isLinux [
libcanberra-gtk3
] ++ lib.optionals stdenv.isDarwin [
@@ -84,6 +97,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DPROC_TARGET_NUMBER=2"
"-DCACHE_NAME_SUFFIX=\"\""
"-DWITH_SYSTEM_LIBRAW=\"ON\""
"-DWITH_JXL=\"ON\""
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
];
pkgs/applications/graphics/xv/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "xv";
version = "6.0.0";
version = "6.0.1";
src = fetchFromGitHub {
owner = "jasper-software";
repo = "xv";
rev = "v${version}";
sha256 = "sha256-KPX/HA9CUaRaIHkcFcM+oo3UasEQfZgmZwi6e/pbFuE=";
sha256 = "sha256-IFbR/1oksRkpJvvu+7TwLFtDujuAmV+sX8Njn6gpgBg=";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/misc/conceal/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "conceal";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "TD-Sky";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LPuPpcs0PtZk516wM9cfhvV12550VBQugVvbQBWxnxA=";
sha256 = "sha256-N/KlxtxzEDwUvQMpgf2S6u7MaYiF0eXnMrGoowc08J0=";
};
cargoHash = "sha256-7FUUte6hAY+KyD9t3rgibkhARFcWIIrFyX4vWSAwcBU=";
cargoHash = "sha256-50EHc8ZHzbl5IFpi5k3/Katc3FaxBgnpf8COrpPHZWk=";
nativeBuildInputs = [ installShellFiles ];
pkgs/applications/misc/tui-journal/default.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.9.1";
version = "0.10.0";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-GmLhBlNHVyO0oUvjOBpTEqQiPYZ68MdgwAqt9v2oMdU=";
hash = "sha256-5in2GulBGUjmrzEDFGRKYzEvB1Z7etVDM2TIb+hlMQA=";
};
cargoHash = "sha256-+5rWjq3/0xfJ5Nbq0kReombuaJkcFmHoqVzzQ4x68Hc=";
cargoHash = "sha256-gIBMtzGNcHjJ0ZWLU5+ys4ARHl6mN3PpU5zxsfAzG2M=";
nativeBuildInputs = [
pkg-config
pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
version = "1.23.3";
version = "1.24.0";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A=";
hash = "sha256-/BUrUksNT6KuVLxJxnBfkU9OEeQU3u7WA6pKqcGnuSU=";
};
vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug=";
vendorHash = "sha256-s1fKwWfOSgRw6eOPc1aZzf1VzaTVHXBjQWd1132vAS0=";
subPackages = [ "cmd/kubectl-cnpg" ];
pkgs/applications/networking/cluster/pluto/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pluto";
version = "5.20.1";
version = "5.20.2";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
hash = "sha256-M0top2czb9iPbA0JxDZwRrNT5sEUi8E3uTB+eCN4RDY=";
hash = "sha256-JMpqZnlFMHC6b+nQ6UIcOF0HKz4VE8/YXEnofUMHhxY=";
};
vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak=";
pkgs/applications/networking/dropbox/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let
version = "185.4.6054";
version = "206.3.6386";
arch = {
x86_64-linux = "x86_64";
pkgs/applications/networking/instant-messengers/element/seshat/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec {
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
node_modules/.bin/neon build --release -- --target ${rust.toRustTargetSpec stdenv.hostPlatform} -Z unstable-options --out-dir target/release
node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release
runHook postBuild
'';
pkgs/applications/office/beamerpresenter/default.nix
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "beamerpresenter";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "stiglers-eponym";
repo = "BeamerPresenter";
rev = "v${version}";
hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8=";
hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo=";
};
nativeBuildInputs = [
pkgs/applications/radio/quisk/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "quisk";
version = "4.2.35";
version = "4.2.37";
src = fetchPypi {
inherit pname version;
hash = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg=";
hash = "sha256-S25pqHZUZp9yucVaYAQv7Pa/N1gKU4Sc9nPS7/AplqY=";
};
buildInputs = [
pkgs/applications/terminal-emulators/kitty/default.nix
+5 -1
View File
@@ -84,7 +84,6 @@ buildPythonApplication rec {
sphinx-inline-tabs
go
fontconfig
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
] ++ lib.optionals stdenv.isDarwin [
imagemagick
libicns # For the png2icns tool.
@@ -137,6 +136,11 @@ buildPythonApplication rec {
'';
in ''
runHook preBuild
# Add the font by hand because fontconfig does not finds it in darwin
mkdir ./fonts/
cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/
${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" }
${if stdenv.isDarwin then ''
${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions}
pkgs/applications/video/ani-cli/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@ assert withMpv || withVlc || withIina;
stdenvNoCC.mkDerivation rec {
pname = "ani-cli";
version = "4.8";
version = "4.9";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ani-cli";
rev = "v${version}";
hash = "sha256-vntCiWaONndjU622c1BoCoASQxQf/i7yO0x+70OxzPU=";
hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/virtualization/OVMF/default.nix
+9 -7
View File
@@ -29,6 +29,7 @@
x86_64 = "OvmfPkg/OvmfPkgX64.dsc";
aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc";
riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";
loongarch64 = "OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc";
}.${stdenv.hostPlatform.parsed.cpu.name}
or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}")
, fwPrefix ? {
@@ -36,6 +37,7 @@
x86_64 = "OVMF";
aarch64 = "AAVMF";
riscv64 = "RISCV_VIRT";
loongarch64 = "LOONGARCH_VIRT";
}.${stdenv.hostPlatform.parsed.cpu.name}
or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}")
, metaPlatforms ? edk2.meta.platforms
@@ -84,8 +86,8 @@ let
in
assert platformSpecific ? ${cpuName};
assert msVarsTemplate -> fdSize4MB;
assert msVarsTemplate -> platformSpecific ? ${cpuName};
assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs;
edk2.mkDerivation projectDscPath (finalAttrs: {
@@ -130,17 +132,17 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
export PYTHONPATH=$NIX_BUILD_TOP/debian/python:$PYTHONPATH
'';
postBuild = lib.optionalString stdenv.hostPlatform.isAarch ''
postBuild = lib.optionalString (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isLoongArch64) ''
(
cd ${buildPrefix}/FV
cp QEMU_EFI.fd ${fwPrefix}_CODE.fd
cp QEMU_VARS.fd ${fwPrefix}_VARS.fd
)
'' + lib.optionalString stdenv.hostPlatform.isAarch ''
# QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures
# Truncate the firmware files to the expected size
truncate -s 64M ${fwPrefix}_CODE.fd
truncate -s 64M ${fwPrefix}_VARS.fd
)
truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_CODE.fd
truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_VARS.fd
'' + lib.optionalString stdenv.hostPlatform.isRiscV ''
truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_CODE.fd
truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_VARS.fd
@@ -165,7 +167,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
postInstall = ''
mkdir -vp $fd/FV
'' + lib.optionalString (builtins.elem fwPrefix [
"OVMF" "AAVMF" "RISCV_VIRT"
"OVMF" "AAVMF" "RISCV_VIRT" "LOONGARCH_VIRT"
]) ''
mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV
'' + lib.optionalString stdenv.hostPlatform.isx86 ''
pkgs/applications/virtualization/containerd/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.7.20";
version = "1.7.21";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
hash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
hash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI=";
};
vendorHash = null;
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
+3 -3
View File
@@ -9,13 +9,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprscroller";
version = "0-unstable-2024-07-04";
version = "0-unstable-2024-09-01";
src = fetchFromGitHub {
owner = "dawsers";
repo = "hyprscroller";
rev = "bef840b3f0fd3d37b5c1c9f2704b2efb60173184";
hash = "sha256-vkpGSseA7n0/Y+83snbEe7Z++2akdDbvv7eZzM9V3wI=";
rev = "5fe29fcbd7103782d55cfb50482c64c31189f02a";
hash = "sha256-Fr2OUEO2LgZsLILnXePuMMbzYBnGA9GyIlLWt2P7bLA=";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+23
View File
@@ -36,6 +36,29 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=";
};
patches = [
# CMake formatting, required for the next two commits to cleanly apply
(fetchpatch {
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/5555f467f68ce7cdf1060991c24263073b95e9da.patch";
hash = "sha256-yNkg7GCXDPJdsE7M6J98YylnRxQWpcM5N3olix7Oc1A=";
})
# removes wayland-scanner from deps, as it includes a pkg-config that
# defines that it has a non-existent include directory which trips up CMake
(fetchpatch {
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/0dd9af698b9386bcf25d3ea9f5017eca721831c1.patch";
hash = "sha256-Y6eWASHoMXVN2rYJ1rs0jy2qP81/qbHsZU+6b7XNBBg=";
})
# handle finding wayland-scanner more nicely
(fetchpatch {
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/2425e8f541525fa7409d9f26a8ffaf92a3767251.patch";
hash = "sha256-6dCg/U/SIjtvo07Z3tn0Hn8Xwx72nwVz6Q2cFnObonU=";
})
];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
cmake
pkg-config
pkgs/applications/window-managers/leftwm/default.nix
+11 -2
View File
@@ -20,7 +20,16 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y=";
};
cargoHash = "sha256-TylRxdpAVuGtZ3Lm8je6FZ0JUwetBi6mOGRoT2M3Jyk=";
cargoPatches = [
# This pacth can be removed with the next version bump, it just updates the `time` crate
./update-time-crate.patch
];
# To show the "correct" git-hash in `leftwm-check` we manually set the GIT_HASH env variable
# can be remove together with the above patch
GIT_HASH = "36609e0 patched";
cargoHash = "sha256-SNq76pTAPSUGVRp/+fwCjSMP/lKVzh6wU+WZW5n/yjg=";
buildInputs = rpathLibs;
@@ -39,7 +48,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/leftwm/leftwm";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ yanganto ];
maintainers = with lib.maintainers; [ vuimuich yanganto ];
changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md";
mainProgram = "leftwm";
};
pkgs/applications/window-managers/leftwm/update-time-crate.patch
+57
View File
@@ -0,0 +1,57 @@
From 9358bebb11df19f46d0813723959518498d812b2 Mon Sep 17 00:00:00 2001
From: VuiMuich <vuimuich@quantentunnel.de>
Date: Mon, 2 Sep 2024 11:15:27 +0200
Subject: [PATCH] fix rust 1.80.x for nixpkgs
---
Cargo.lock | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index f8a82eecf..5728b55bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -777,6 +777,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-traits"
version = "0.2.17"
@@ -1218,13 +1224,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.30"
+version = "0.3.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582"
dependencies = [
"deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]
pkgs/build-support/cc-wrapper/default.nix
+1 -1
View File
@@ -752,6 +752,6 @@ stdenvNoCC.mkDerivation {
(optionalAttrs (cc_ ? meta) (removeAttrs cc.meta ["priority"])) //
{ description = attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)";
priority = 10;
mainProgram = if name != "" then name else ccName;
mainProgram = if name != "" then name else "${targetPrefix}${ccName}";
};
}
pkgs/build-support/dotnet/build-dotnet-module/default.nix
+6
View File
@@ -67,7 +67,12 @@ let
# platforms in meta.platforms which are supported by the sdk.
runtimeId ? null,
# Test filters. This gets passed to `dotnet test --filter`, concatenated using `&`.
# You may also use `disabledTests` to filter tests based on their name.
# See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details.
testFilters ? [ ],
# Tests to disable. This gets passed to `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all frameworks.
# You may also use `testFilters` to pass more generic filters to `dotnet test --filter`.
# See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details.
disabledTests ? [ ],
# The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set.
@@ -132,6 +137,7 @@ let
dotnetBuildType = buildType;
dotnetProjectFiles = projectFiles;
dotnetTestProjectFiles = testProjectFiles;
dotnetTestFilters = testFilters;
dotnetDisabledTests = disabledTests;
dotnetRuntimeIds = lib.singleton (
if runtimeId != null then runtimeId else systemToDotnetRid stdenvNoCC.hostPlatform.system
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
+7 -1
View File
@@ -9,6 +9,7 @@ dotnetCheckHook() {
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
@@ -16,6 +17,7 @@ dotnetCheckHook() {
local dotnetProjectFilesArray=($dotnetProjectFiles)
local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
local dotnetTestFlagsArray=($dotnetTestFlags)
local dotnetTestFiltersArray=($dotnetTestFilters)
local dotnetDisabledTestsArray=($dotnetDisabledTests)
local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
@@ -23,8 +25,12 @@ dotnetCheckHook() {
if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
fi
if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
local OLDIFS="$IFS" IFS='&'
dotnetTestFlagsArray+=("--filter:${disabledTestsFilters[*]//,/%2C}")
dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
IFS="$OLDIFS"
fi
pkgs/build-support/rust/build-rust-package/default.nix
+17 -14
View File
@@ -150,21 +150,24 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
strictDeps = true;
meta = {
# default to Rust's platforms
platforms = rustc.meta.platforms ++ [
# Platforms without host tools from
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
"armv7a-darwin"
"armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux"
"mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux"
"armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd"
"x86_64-redox"
"wasm32-wasi"
];
badPlatforms = [
meta = meta // {
badPlatforms = meta.badPlatforms or [] ++ [
# Rust is currently unable to target the n32 ABI
lib.systems.inspect.patterns.isMips64n32
];
} // meta;
} // lib.optionalAttrs (rustc.meta ? platforms) {
# default to Rust's platforms
platforms = lib.intersectLists
meta.platforms or lib.platforms.all
(rustc.meta.platforms ++ [
# Platforms without host tools from
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
"armv7a-darwin"
"armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux"
"mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux"
"armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd"
"x86_64-redox"
"wasm32-wasi"
]);
};
})
pkgs/build-support/rust/lib/default.nix
+1 -2
View File
@@ -80,8 +80,7 @@ rec {
'';
};
} // lib.mapAttrs (old: new: platform:
# TODO: enable warning after 23.05 is EOL.
# lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead."
lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead."
lib.getAttrFromPath new platform.rust)
{
toTargetArch = [ "platform" "arch" ];
pkgs/by-name/aq/aquamarine/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.3.3";
version = "0.4.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "aquamarine";
rev = "v${finalAttrs.version}";
hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U=";
hash = "sha256-EaKtf4mESHvHF2ak5Lt7ycSTLqdjI+Ry+zWpQaPqgD8=";
};
nativeBuildInputs = [
pkgs/by-name/au/audiobookshelf/package.nix
-8
View File
@@ -56,14 +56,6 @@ buildNpmPackage {
inherit pname src;
inherit (source) version;
postPatch = ''
# Always skip version checks of the binary manager.
# We provide our own binaries, and don't want to trigger downloads.
substituteInPlace server/managers/BinaryManager.js --replace-fail \
'if (!this.validVersions.length) return true' \
'return true'
'';
buildInputs = [ util-linux ];
nativeBuildInputs = [ python3 ];
pkgs/by-name/au/audiobookshelf/source.json
+5 -5
View File
@@ -1,9 +1,9 @@
{
"owner": "advplyr",
"repo": "audiobookshelf",
"rev": "52a3bc224ae7c79fbb543716a25b731c65a8f76a",
"hash": "sha256-SbpoCtd5PJ6fU9muy58J4VxlbKiJM0OfMALHC5DUqFc=",
"version": "2.12.3",
"depsHash": "sha256-8YUGM+MPYFLpLwWe3W+eObxH4ZklDVGj8bDYkSWTzQg=",
"clientDepsHash": "sha256-8xE1M7InH+Rxjpb2rsdvC3LcLV+k8a83BKWCis5P+tY="
"rev": "48f232790a5026ac886564ef57660a338a168187",
"hash": "sha256-2/lUByeWMZlxk7i+mvzBuxlxD97C+JEtmf/ajht5AOs=",
"version": "2.13.2",
"depsHash": "sha256-kU5Nrhy6AePwD2/kmvTXvrvGUH8uz3qm3ZvD3kC9EmE=",
"clientDepsHash": "sha256-1haujBoC9KyusE52HeepOcvmb6v7EG5XWD4dq1wPfe4="
}
pkgs/by-name/au/audiobookshelf/wrapper.nix
+1
View File
@@ -52,6 +52,7 @@
NODE_ENV=production \
SOURCE=nixpkgs \
SKIP_BINARIES_CHECK=1 \
FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \
FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \
CONFIG_PATH="$config" \
pkgs/by-name/aw/awscli2/package.nix
+3 -3
View File
@@ -59,14 +59,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "awscli2";
version = "2.17.18"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.17.42"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
hash = "sha256-HxFtMFeGR6XAMsP5LM0tvJ/ECWVpveIhWRTKvf8uYA0=";
hash = "sha256-f6S206MQy0qyHIJTIKSHBKT+P0dVCiUn5pMp2tClSb0=";
};
patches = [
@@ -79,7 +79,7 @@ py.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'awscrt>=0.19.18,<=0.20.11' 'awscrt>=0.19.18' \
--replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \
--replace-fail 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
--replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \
--replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \
pkgs/tools/misc/bmap-tools/default.nix → pkgs/by-name/bm/bmaptool/package.nix
+7 -7
View File
@@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "bmap-tools";
version = "3.6";
pname = "bmaptool";
version = "3.8.0";
src = fetchFromGitHub {
owner = "intel";
repo = "bmap-tools";
owner = "yoctoproject";
repo = "bmaptool";
rev = "v${version}";
sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl";
sha256 = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
};
propagatedBuildInputs = with python3Packages; [ six ];
@@ -17,8 +17,8 @@ python3Packages.buildPythonApplication rec {
doCheck = false;
meta = with lib; {
description = "bmap-related tools";
homepage = "https://github.com/intel/bmap-tools";
description = "BMAP Tools";
homepage = "https://github.com/yoctoproject/bmaptool";
license = licenses.gpl2Only;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
pkgs/applications/radio/chirp/default.nix → pkgs/by-name/ch/chirp/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "chirp";
version = "0.4.0-unstable-2024-08-06";
version = "0.4.0-unstable-2024-08-31";
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "a8242df7d2bfc888604e26b9dc3e8ad111e02ee2";
hash = "sha256-TpTlYRXB1hnpyQ8fL8DQ1mtLW64zDCvtDZXykahfq5U=";
rev = "fddaaa00e3baa3c4e854ab88ab46fd3b4ced3a62";
hash = "sha256-KPdv8E0ZaLK49H2Q749UaLYIXdiplIKTrbkD7+KTAYg=";
};
buildInputs = [
glib
pkgs/by-name/co/cosmic-greeter/package.nix
+2 -2
View File
@@ -60,10 +60,10 @@ rustPlatform.buildRustPackage rec {
(placeholder "out")
"--set"
"bin-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter"
"--set"
"daemon-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter-daemon"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter-daemon"
];
postPatch = ''
pkgs/by-name/co/cosmic-session/package.nix
+1 -1
View File
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace Justfile \
--replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-session'
--replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-session'
substituteInPlace data/start-cosmic \
--replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \
--replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session"
pkgs/by-name/cr/crossplane-cli/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "crossplane-cli";
version = "1.16.0";
version = "1.16.1";
src = fetchFromGitHub {
owner = "crossplane";
repo = "crossplane";
rev = "v${version}";
hash = "sha256-1067l3DM6/kW6d35+9nfMdFtu8jIzw/QJaHFKzOTbSc=";
hash = "sha256-wRbQKpWEzos5fzzf1tUF2xQAlk8KIrhXJ/QZ9JKCa2M=";
};
vendorHash = "sha256-Ccc7hEsHkHw2P5cgMB06VVlHur5DCPclaEMoFCwoSrA=";
vendorHash = "sha256-XzIDLtEP4wrz23Cewz1QFuS62F/XQr7JNoaPAQfanEs=";
ldflags = [
"-s"
pkgs/by-name/cr/crystal-dock/package.nix
+42
View File
@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
kdePackages,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "crystal-dock";
version = "2.2";
src = fetchFromGitHub {
owner = "dangvd";
repo = "crystal-dock";
rev = "v${finalAttrs.version}";
hash = "sha256-c5Kae2cZ/DoJ972VT4kQWNUr2cF6Noy3nPIChWok/BA=";
};
nativeBuildInputs = [
cmake
kdePackages.extra-cmake-modules
qt6.wrapQtAppsHook
];
buildInputs = [
kdePackages.layer-shell-qt
qt6.qtbase
qt6.qtwayland
];
cmakeDir = "../src";
meta = with lib; {
description = "Dock (desktop panel) for Linux desktop";
mainProgram = "crystal-dock";
license = licenses.gpl3Only;
homepage = "https://github.com/dangvd/crystal-dock";
maintainers = with maintainers; [ rafameou ];
platforms = platforms.linux;
};
})
pkgs/by-name/cs/csharpier/package.nix
+2 -2
View File
@@ -2,10 +2,10 @@
buildDotnetGlobalTool {
pname = "csharpier";
version = "0.28.2";
version = "0.29.1";
executables = "dotnet-csharpier";
nugetHash = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18=";
nugetHash = "sha256-VW9QzbQfbY3Tz+Gz3hQ7VC4wOtwfIYV1Yq2WJz6bL04=";
meta = with lib; {
description = "Opinionated code formatter for C#";
pkgs/by-name/de/dezoomify-rs/package.nix
+9
View File
@@ -1,7 +1,9 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
darwin,
}:
rustPlatform.buildRustPackage rec {
@@ -17,6 +19,13 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-v48eM43+/dt2M1J9yfjfTpBetv6AA2Hhzu8rrL3gojg=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
SystemConfiguration
]
);
checkFlags = [
# Tests failing due to networking errors in Nix build environment
"--skip=local_generic_tiles"
pkgs/by-name/ed/edk2/package.nix
+3 -1
View File
@@ -23,6 +23,8 @@ else if stdenv.isAarch64 then
"AARCH64"
else if stdenv.hostPlatform.isRiscV64 then
"RISCV64"
else if stdenv.hostPlatform.isLoongArch64 then
"LOONGARCH64"
else
throw "Unsupported architecture";
@@ -128,7 +130,7 @@ edk2 = stdenv.mkDerivation {
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
changelog = "https://github.com/tianocore/edk2/releases/tag/edk2-stable${edk2.version}";
license = lib.licenses.bsd2;
platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64;
platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ loongarch64 ++ riscv64;
maintainers = [ lib.maintainers.mjoerg ];
};
pkgs/by-name/fa/fantomas/package.nix
+2 -2
View File
@@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "fantomas";
version = "6.3.10";
version = "6.3.11";
nugetHash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM=";
nugetHash = "sha256-11bHGEAZTNtdp2pTg5zqLrQiyI/j/AT7GGL/2CR4+dw=";
meta = with lib; {
description = "F# source code formatter";
pkgs/by-name/fl/flameshot/package.nix
+91 -34
View File
@@ -1,16 +1,28 @@
{ libsForQt5
, stdenv
, lib
, fetchFromGitHub
, cmake
, nix-update-script
, fetchpatch
, grim
, makeBinaryWrapper
, enableWlrSupport ? false
{
stdenv,
lib,
overrideSDK,
darwin,
fetchFromGitHub,
fetchpatch,
cmake,
imagemagick,
libicns,
libsForQt5,
grim,
makeBinaryWrapper,
nix-update-script,
enableWlrSupport ? false,
enableMonochromeIcon ? false,
}:
stdenv.mkDerivation {
assert stdenv.isDarwin -> (!enableWlrSupport);
let
stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation {
pname = "flameshot";
# wlr screenshotting is currently only available on unstable version (>12.1.0)
version = "12.1.0-unstable-2024-08-02";
@@ -32,43 +44,88 @@ stdenv.mkDerivation {
})
];
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
};
cmakeFlags =
[
(lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
(lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
]
++ lib.optionals stdenv.isLinux [
(lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
(lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
]
++ lib.optionals stdenv.isDarwin [
(lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5")
];
cmakeFlags = [
(lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
(lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
];
nativeBuildInputs = [
cmake
libsForQt5.qttools
libsForQt5.qtsvg
libsForQt5.wrapQtAppsHook
makeBinaryWrapper
];
nativeBuildInputs =
[
cmake
libsForQt5.qttools
libsForQt5.qtsvg
libsForQt5.wrapQtAppsHook
makeBinaryWrapper
]
++ lib.optionals stdenv.isDarwin [
imagemagick
libicns
];
buildInputs = [
libsForQt5.qtbase
libsForQt5.kguiaddons
];
postPatch = lib.optionalString stdenv.isDarwin ''
# Fix icns generation running concurrently with png generation
sed -E -i '/"iconutil -o/i\
)\
execute_process(\
' src/CMakeLists.txt
# Replace unavailable commands
sed -E -i \
-e 's/"sips -z ([0-9]+) ([0-9]+) +(.+) --out /"magick \3 -resize \1x\2\! /' \
-e 's/"iconutil -o (.+) -c icns (.+)"/"png2icns \1 \2\/*{16,32,128,256,512}.png"/' \
src/CMakeLists.txt
'';
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications
mv $out/bin/flameshot.app $out/Applications
ln -s $out/Applications/flameshot.app/Contents/MacOS/flameshot $out/bin/flameshot
rm -r $out/share/applications
rm -r $out/share/dbus*
rm -r $out/share/icons
rm -r $out/share/metainfo
'';
dontWrapQtApps = true;
postFixup = ''
wrapProgram $out/bin/flameshot \
${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \
''${qtWrapperArgs[@]}
'';
postFixup =
let
binary =
if stdenv.isDarwin then "Applications/flameshot.app/Contents/MacOS/flameshot" else "bin/flameshot";
in
''
wrapProgram $out/${binary} \
${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \
''${qtWrapperArgs[@]}
'';
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
};
meta = with lib; {
description = "Powerful yet simple to use screenshot software";
homepage = "https://github.com/flameshot-org/flameshot";
mainProgram = "flameshot";
maintainers = with maintainers; [ scode oxalica ];
maintainers = with maintainers; [
scode
oxalica
];
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
};
pkgs/by-name/fl/flye/package.nix
+2 -8
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication rec {
pname = "flye";
version = "2.9.4";
version = "2.9.5";
pyproject = true;
src = fetchFromGitHub {
owner = "fenderglass";
repo = "flye";
rev = "refs/tags/${version}";
hash = "sha256-lwiY0VTEsLMMXt1VowsS3jj44v30Z766xNRwQtQKr10=";
hash = "sha256-448PTdGueQVHFIDS5zMy+XKZCtEb0SqP8bspPLHMJn0=";
};
patches = [
@@ -34,12 +34,6 @@ python3Packages.buildPythonApplication rec {
url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch";
hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ=";
})
(fetchpatch {
# https://github.com/mikolmogorov/Flye/pull/670
name = "remove-find_module.patch";
url = "https://github.com/mikolmogorov/Flye/commit/441b1c6eb0f60b7c4fb1a40d659c7dabb7ad41b6.patch";
hash = "sha256-RytFIN1STK33/nvXpck6woQcwV/e1fmA8AgmptiIiDU=";
})
];
postPatch = ''
pkgs/by-name/ga/gate/package.nix
+3 -3
View File
@@ -5,7 +5,7 @@
let
pname = "gate";
version = "0.39.2";
version = "0.39.3";
in
buildGoModule {
inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
owner = "minekube";
repo = "gate";
rev = "refs/tags/v${version}";
hash = "sha256-ocstveux4nSev6jUx0niGxjKk0ljEhhagmHpUKncrQY=";
hash = "sha256-K2xpRljlKO9DAlXqnmlWsY67ysv449o2vb+OuSXcvnY=";
};
vendorHash = "sha256-e+XIftRRP0Dig6nIRdxE1x60RU8oXChTyyLIEGOQ5Yc=";
vendorHash = "sha256-GatbReuW6azrxHnGuW1omR3HRntLBp0J8in4sRc7sJc=";
ldflags = [ "-s" "-w" ];
pkgs/by-name/gi/gickup/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gickup";
version = "0.10.31";
version = "0.10.34";
src = fetchFromGitHub {
owner = "cooperspencer";
repo = "gickup";
rev = "refs/tags/v${version}";
hash = "sha256-6du9x5QQN1VJzAABJ+8Fm3YscfoRwKVYZO9tTMz22AQ=";
hash = "sha256-cdYQU5pQj+vypFtvPxN1Vg4ckui+vcYUmOJQ9d3XTK4=";
};
vendorHash = "sha256-Nmt7T6sDWVHQZuINvON24Mq638Q04r5bpOBnz2vp4vM=";
vendorHash = "sha256-x+K3qXV0F4OKsldsnNcR5w4fmwYyt7V7IDrcHBNPttI=";
ldflags = [ "-X main.version=${version}" ];
pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
+59
View File
@@ -0,0 +1,59 @@
From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001
From: Dan Klishch <danilklishch@gmail.com>
Date: Sat, 30 Sep 2023 23:38:05 -0400
Subject: Defer setting cursor position until the cursor is locked
---
src/wl_platform.h | 3 +++
src/wl_window.c | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/wl_platform.h b/src/wl_platform.h
index ca34f66e..cd1f227f 100644
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland
int scaleSize;
int compositorPreferredScale;
+ double askedCursorPosX, askedCursorPosY;
+ GLFWbool didAskForSetCursorPos;
+
struct zwp_relative_pointer_v1* relativePointer;
struct zwp_locked_pointer_v1* lockedPointer;
struct zwp_confined_pointer_v1* confinedPointer;
diff --git a/src/wl_window.c b/src/wl_window.c
index 1de26558..0df16747 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos)
void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y)
{
- _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
- "Wayland: The platform does not support setting the cursor position");
+ window->wl.didAskForSetCursorPos = true;
+ window->wl.askedCursorPosX = x;
+ window->wl.askedCursorPosY = y;
}
void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode)
@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener =
static void lockedPointerHandleLocked(void* userData,
struct zwp_locked_pointer_v1* lockedPointer)
{
+ _GLFWwindow* window = userData;
+
+ if (window->wl.didAskForSetCursorPos)
+ {
+ window->wl.didAskForSetCursorPos = false;
+ zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer,
+ wl_fixed_from_double(window->wl.askedCursorPosX),
+ wl_fixed_from_double(window->wl.askedCursorPosY));
+ }
}
static void lockedPointerHandleUnlocked(void* userData,
--
2.42.0
pkgs/development/libraries/glfw/3.x.nix → pkgs/by-name/gl/glfw3/package.nix
+15 -8
View File
@@ -1,13 +1,16 @@
{ stdenv, lib, fetchFromGitHub, cmake
, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
, Carbon, Cocoa, Kernel, fixDarwinDylibNames
, darwin, fixDarwinDylibNames
, extra-cmake-modules, wayland
, wayland-scanner, wayland-protocols, libxkbcommon, libdecor
, withMinecraftPatch ? false
}:
stdenv.mkDerivation rec {
let
version = "3.4";
pname = "glfw";
in
stdenv.mkDerivation {
pname = "glfw${lib.optionalString withMinecraftPatch "-minecraft"}";
inherit version;
src = fetchFromGitHub {
owner = "glfw";
@@ -17,16 +20,20 @@ stdenv.mkDerivation rec {
};
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
patches = ./x11.patch;
patches = [
./x11.patch
] ++ lib.optionals withMinecraftPatch [
./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
];
propagatedBuildInputs = [ libGL ];
nativeBuildInputs = [ cmake extra-cmake-modules ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]
++ lib.optionals stdenv.isLinux [ wayland-scanner ];
buildInputs =
lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa Kernel ])
++ lib.optionals stdenv.isLinux [
wayland
wayland-protocols
@@ -64,7 +71,7 @@ stdenv.mkDerivation rec {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = "https://www.glfw.org/";
license = licenses.zlib;
maintainers = with maintainers; [ marcweber twey ];
maintainers = with maintainers; [ marcweber Scrumplex twey ];
platforms = platforms.unix ++ platforms.windows;
};
}
pkgs/development/libraries/glfw/x11.patch → pkgs/by-name/gl/glfw3/x11.patch
View File
pkgs/by-name/gn/gnome-monitor-config/package.nix
+21 -14
View File
@@ -1,14 +1,15 @@
{ lib
, fetchFromGitHub
, stdenv
, meson
, ninja
, pkg-config
, cairo
, glib
{
lib,
fetchFromGitHub,
stdenv,
meson,
ninja,
pkg-config,
cairo,
glib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "gnome-monitor-config";
version = "0-unstable-2023-09-26";
@@ -19,10 +20,17 @@ stdenv.mkDerivation rec {
hash = "sha256-uVWhQ5SCyadDkeOd+pY2cYZAQ0ZvWMlgndcr1ZIEf50=";
};
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
glib
];
buildInputs = [
@@ -30,11 +38,10 @@ stdenv.mkDerivation rec {
glib
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv src/gnome-monitor-config $out/bin
runHook postInstall
postPatch = ''
substituteInPlace src/meson.build \
--replace-fail "executable('gnome-monitor-config', src" \
"executable('gnome-monitor-config', src, install : true"
'';
meta = with lib; {
pkgs/by-name/go/google-chrome/package.nix
+5 -5
View File
@@ -164,11 +164,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "128.0.6613.84";
version = "128.0.6613.113";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-4hABtHDq/8lIP6YbpU1VJdmgZNmLN2qb0VMPYw3dsBg=";
hash = "sha256-jdgZFmkPZwNt+4nb6/4ahCM4jNEKUkIfaI9MqOcjHys=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -256,11 +256,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "128.0.6613.85";
version = "128.0.6613.114";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/adnfqet5f4kxrux64zb25vwits5a_128.0.6613.85/GoogleChrome-128.0.6613.85.dmg";
hash = "sha256-mWTNwfMfCLPV+w1VCMUdv7lFtYSEVr4mnDgKURlDV3Q=";
url = "http://dl.google.com/release2/chrome/j7qfyaczqq4hpgxunewwclxnky_128.0.6613.114/GoogleChrome-128.0.6613.114.dmg";
hash = "sha256-6y99T+9abmUS9wKglNgPgj9M/cyLxb85rxpgCLxXR3E=";
};
dontPatch = true;
pkgs/by-name/ha/harper/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "harper";
version = "0.9.5";
version = "0.10.0";
src = fetchFromGitHub {
owner = "elijah-potter";
repo = "harper";
rev = "v${version}";
hash = "sha256-Tk2YOY9myAGHrNTpgwyqo+P6gGQ+2cpKAJbsA3ZfhUA=";
hash = "sha256-DpBCTljIigpyZdiFm8x/bqDn+kzK8ILHpzGqX0d1mI8=";
};
cargoHash = "sha256-9ITfjrtc8LPQ3u3G59xESzqky/PCiea5mJiTIiEAmSA=";
cargoHash = "sha256-ZMZq/HRvr+JO/fHBJcyRtKXSzCabxkJRBe6OQjij77g=";
meta = {
description = "Grammar Checker for Developers";
pkgs/by-name/hd/hdrop/package.nix
+27 -22
View File
@@ -1,26 +1,27 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, makeWrapper
, scdoc
, coreutils
, util-linux
, jq
, libnotify
, withHyprland ? true
, hyprland
, gawk
{
coreutils,
fetchFromGitHub,
gawk,
hyprland,
jq,
lib,
libnotify,
makeWrapper,
scdoc,
stdenvNoCC,
util-linux,
withHyprland ? true,
}:
stdenvNoCC.mkDerivation rec {
pname = "hdrop";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "Schweber";
repo = "hdrop";
rev = "v${version}";
hash = "sha256-iginpMlgANSPWgFxNC2TYMjf2NKSSzzrjIN8lIsAvX8=";
hash = "sha256-0GkZBqpORJqhhC19bsJHvkbHKOno1ZyBBA7nhzfqLZw=";
};
nativeBuildInputs = [
@@ -32,14 +33,18 @@ stdenvNoCC.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/hdrop --prefix PATH ':' \
"${lib.makeBinPath ([
coreutils
util-linux
jq
libnotify
gawk
]
++ lib.optional withHyprland hyprland)}"
"${
lib.makeBinPath (
[
coreutils
util-linux
jq
libnotify
gawk
]
++ lib.optional withHyprland hyprland
)
}"
'';
meta = with lib; {
pkgs/by-name/ko/koboldcpp/package.nix
+2 -2
View File
@@ -53,13 +53,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.73.1";
version = "1.74";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-LRXtmQ5u+/vgcU6YC9IN2CazfDtg5+jZnJV2o9jEAaY=";
hash = "sha256-tGG1+EGlCUmFpx/axijonOXydurwFxqjuoeDwHxC+pc=";
};
enableParallelBuilding = true;
pkgs/applications/misc/liberasurecode/default.nix → pkgs/by-name/li/liberasurecode/package.nix
+32 -17
View File
@@ -1,34 +1,44 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, doxygen
, installShellFiles
, zlib
{
lib,
stdenv,
autoreconfHook,
doxygen,
fetchFromGitHub,
installShellFiles,
testers,
zlib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "liberasurecode";
version = "1.6.3";
version = "1.6.4";
outputs = [ "out" "dev" "doc" ];
outputs = [
"out"
"dev"
"doc"
];
src = fetchFromGitHub {
owner = "openstack";
repo = pname;
rev = version;
sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU=";
repo = "liberasurecode";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-KYXlRjUudWhFbhyv9V1fmqwBw3/vTBfusxafaNG+Q40=";
};
postPatch = ''
substituteInPlace doc/doxygen.cfg.in \
--replace "GENERATE_MAN = NO" "GENERATE_MAN = YES"
--replace-fail "GENERATE_MAN = NO" "GENERATE_MAN = YES"
substituteInPlace Makefile.am src/Makefile.am \
--replace "-Werror" ""
--replace-fail "-Werror" ""
'';
nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ];
nativeBuildInputs = [
autoreconfHook
doxygen
installShellFiles
];
buildInputs = [ zlib ];
@@ -47,10 +57,15 @@ stdenv.mkDerivation rec {
checkTarget = "test";
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
meta = with lib; {
description = "Erasure Code API library written in C with pluggable Erasure Code backends";
homepage = "https://github.com/openstack/liberasurecode";
license = licenses.bsd2;
maintainers = teams.openstack.members;
pkgConfigModules = [ "erasurecode-1" ];
};
}
})
pkgs/by-name/li/lint-staged/package.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "15.2.9";
version = "15.2.10";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-qEqjB6GBzKx4zRqumMPSRxFnWQ4j+sBKWTspaeorL6Q=";
hash = "sha256-Mtr3PXV4pSQgtP+RkPmXpDgmW5hFo7a+xb2GAi+wFg4=";
};
npmDepsHash = "sha256-VQ8UDdPIrhiLvDfpAWLMvCtBIhW/LtRj/CC1j2yEm5o=";
npmDepsHash = "sha256-Br/KlvRkr+jFe8y2KEiE38FYrwgSbY5WpvwVOO4LGuQ=";
dontNpmBuild = true;
pkgs/by-name/lm/lmstudio/darwin.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM%20Studio-${version}-arm64.dmg";
hash = "sha256-8m+gLZqX1rz8kVxEo880FKvU046juaO2DneeBg7Sc70=";
hash = "sha256-KC4nXhMkrRDRtLPnpD5UTyKzQ+xH9jhZZHnjk9gDVfo=";
};
nativeBuildInputs = [ undmg ];
pkgs/by-name/lm/lmstudio/linux.nix
+1 -1
View File
@@ -7,7 +7,7 @@
let
src = fetchurl {
url = "https://releases.lmstudio.ai/linux/x86/${version}/LM_Studio-${version}.AppImage";
hash = "sha256-zkTSa0wgKcyKywnIZPF0b6ZzKtyHn3hqjrQPgILF0eI=";
hash = "sha256-w+g7/YezpOr/mBNZbmtLMPt3xTRDIHgGTSroo6mRXxw=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
pkgs/by-name/lm/lmstudio/package.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
let
pname = "lmstudio";
version = "0.3.1";
version = "0.3.2";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
homepage = "https://lmstudio.ai/";
pkgs/by-name/lu/lunar-client/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "lunarclient";
version = "3.2.16";
version = "3.2.17";
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
hash = "sha512-p+a7zirfM4rR4CPsXGa6jPhh0sFvoQN1O/roSZYA+qbhhtRS0MgnvuSN6EKdH37M5cF2KoNOqfapWE3PWWK19A==";
hash = "sha512-hzW7khHfWEYPtzMmedy/dXqKh7LPniqI7/0F1FtBtrlDnEIEQUq/7VUcygsVTBI6kuj8vTG5+PYcLez+cYAjqg==";
};
extraInstallCommands =
pkgs/by-name/lx/lxgw-fusionkai/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
stdenvNoCC,
}:
stdenvNoCC.mkDerivation rec {
pname = "lxgw-fusionkai";
version = "24.134";
src = fetchFromGitHub {
owner = "lxgw";
repo = "FusionKai";
rev = "v${version}";
hash = "sha256-pEISoFEsv8SJOGa2ud/nV1yvl8T9kakfKENu3mfYA5A=";
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/lxgw/FusionKai";
description = "Simplified Chinese font derived from LXGW WenKai GB, iansui and Klee One";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ hellodword ];
};
}
pkgs/servers/geospatial/mapproxy/default.nix → pkgs/by-name/ma/mapproxy/package.nix
+24 -14
View File
@@ -1,21 +1,29 @@
{ lib
, python3
, fetchPypi
{
lib,
python3,
fetchFromGitHub,
}:
with python3.pkgs;
buildPythonApplication rec {
pname = "MapProxy";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-2FEgfdo8i/R5lU0G514zJcaIRe8y60Vm0jHOBEaoEwI=";
pname = "mapproxy";
version = "3.0.1";
src = fetchFromGitHub {
owner = "mapproxy";
repo = "mapproxy";
rev = version;
hash = "sha256-74hUJIy1+DaKjUsCgd4+2MdMPGqqDUuHDrhBCFNn8Dk=";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
'';
propagatedBuildInputs = [
dependencies = [
boto3 # needed for caches service
future
jsonschema
pillow
pyyaml
pyproj
@@ -23,6 +31,7 @@ buildPythonApplication rec {
gdal
lxml
setuptools
werkzeug
];
# Tests are disabled:
# 1) Dependency list is huge.
@@ -32,10 +41,11 @@ buildPythonApplication rec {
# https://github.com/NixOS/nixpkgs/issues/33876
# https://github.com/NixOS/nixpkgs/pull/56480
doCheck = false;
meta = with lib; {
description = "Open source proxy for geospatial data";
homepage = "https://mapproxy.org/";
license = licenses.asl20;
maintainers = with maintainers; [ rakesh4g ];
meta = {
description = "Open source proxy for geospatial data";
homepage = "https://mapproxy.org/";
license = lib.licenses.asl20;
maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]);
};
}
pkgs/by-name/ne/nexusmods-app/package.nix
+15 -17
View File
@@ -71,25 +71,23 @@ buildDotnetModule (finalAttrs: {
doCheck = true;
dotnetTestFlags = [
"--environment=USER=nobody"
(
"--filter="
+ lib.strings.concatStringsSep "&" (
[
"Category!=Disabled"
"FlakeyTest!=True"
"RequiresNetworking!=True"
"FullyQualifiedName!=NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage"
"FullyQualifiedName!=NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile"
]
++ lib.optionals (!_7zz.meta.unfree) [
"FullyQualifiedName!=NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
]
)
)
dotnetTestFlags = [ "--environment=USER=nobody" ];
testFilters = [
"Category!=Disabled"
"FlakeyTest!=True"
"RequiresNetworking!=True"
];
disabledTests =
[
"NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage"
"NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile"
]
++ lib.optionals (!_7zz.meta.unfree) [
"NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
];
passthru = {
tests =
let
pkgs/by-name/no/nomacs/package.nix
+1
View File
@@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
# see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277
(lib.getOutput "cxxdev" opencv4)
] ++ (with libsForQt5; [
kimageformats
qtbase
qtimageformats
qtsvg
pkgs/by-name/ob/obs-cmd/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "obs-cmd";
version = "0.17.6";
version = "0.17.7";
src = fetchFromGitHub {
owner = "grigio";
repo = "obs-cmd";
rev = "v${version}";
hash = "sha256-bZ3N0wCTXyCv6iBQDlieMDFa80yNu1XrI4W5EaN5y/I=";
hash = "sha256-+rsX86PrTlswi7uItyfOqYWziJ0kLl9X86TMtcmMCKo=";
};
cargoHash = "sha256-gIJOkWlBD1rv6bKf++v/pyI8/awdnZBo/U/5PFnEcvg=";
cargoHash = "sha256-u+IHQiKEX0KUkwz4KsqwIgdo3KAxarPZgrmJWA1qQ50=";
meta = with lib; {
description = "Minimal CLI to control OBS Studio via obs-websocket";
pkgs/by-name/oi/oidc-agent/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "oidc-agent";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "indigo-dc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cOK/rZ/jnyALLuhDM3+qvwwe4Fjkv8diQBkw7NfVo0c=";
sha256 = "sha256-Nwna8VbhhXtmEbAxgo/E9QgfuglGuyFK2DwHOZL4WXQ=";
};
nativeBuildInputs = [
pkgs/by-name/ol/ollama/disable-lib-check.patch
-10
View File
@@ -1,10 +0,0 @@
--- a/llm/generate/gen_linux.sh
+++ b/llm/generate/gen_linux.sh
@@ -245,7 +245,6 @@
if [ $(cat "${BUILD_DIR}/bin/deps.txt" | wc -l ) -lt 8 ] ; then
cat "${BUILD_DIR}/bin/deps.txt"
echo "ERROR: deps file short"
- exit 1
fi
compress
fi
pkgs/by-name/ol/ollama/package.nix
+2 -6
View File
@@ -40,13 +40,13 @@ assert builtins.elem acceleration [
let
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.3.5";
version = "0.3.9";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-2lPOkpZ9AmgDFoIHKi+Im1AwXnTxSY3LLtyui1ep3Dw=";
hash = "sha256-h/IFD7OaiIWNhJywqWG4uOPXExHfcnipr6f9YD1OjNc=";
fetchSubmodules = true;
};
@@ -63,7 +63,6 @@ let
(preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=")
(preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
(preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
(preparePatch "08-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=")
(preparePatch "09-lora.diff" "sha256-tNtI3WHHjBq+PJZGJCBsXHa15dlNJeJm+IiaUbFC0LE=")
(preparePatch "11-phi3-sliding-window.diff" "sha256-VbcR4SLa9UXoh8Jq/bPVBerxfg68JZyWALRs7fz7hEs=")
];
@@ -179,9 +178,6 @@ goBuild (
# this also disables necessary patches contained in `ollama/llm/patches/`
# those patches are added to `llamacppPatches`, and reapplied here in the patch phase
./disable-git.patch
# disable a check that unnecessarily exits compilation during rocm builds
# since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly
./disable-lib-check.patch
] ++ llamacppPatches;
postPatch = ''
# replace inaccurate version number with actual release version
pkgs/by-name/pr/prismlauncher/package.nix
+24 -51
View File
@@ -1,30 +1,33 @@
{
lib,
stdenv,
symlinkJoin,
prismlauncher-unwrapped,
addDriverRunpath,
alsa-lib,
flite,
gamemode,
glfw,
glfw-wayland-minecraft,
mesa-demos,
jdk8,
glfw3-minecraft,
jdk17,
jdk21,
jdk8,
kdePackages,
lib,
libGL,
libX11,
libXcursor,
libXext,
libXrandr,
libXxf86vm,
libjack2,
libpulseaudio,
libusb1,
makeWrapper,
mesa-demos,
openal,
pciutils,
pipewire,
prismlauncher-unwrapped,
stdenv,
symlinkJoin,
udev,
vulkan-loader,
xorg,
xrandr,
additionalLibs ? [ ],
additionalPrograms ? [ ],
@@ -37,15 +40,6 @@
],
msaClientID ? null,
textToSpeechSupport ? stdenv.isLinux,
# Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
# when launched on wayland, allowing for the game to be run natively.
# Make sure to enable "Use system installation of GLFW" in instance settings
# for this to take effect
#
# Warning: This build of glfw may be unstable, and the launcher
# itself can take slightly longer to start
withWaylandGLFW ? false,
}:
assert lib.assertMsg (
@@ -56,10 +50,6 @@ assert lib.assertMsg (
textToSpeechSupport -> stdenv.isLinux
) "textToSpeechSupport only has an effect on Linux.";
assert lib.assertMsg (
withWaylandGLFW -> stdenv.isLinux
) "withWaylandGLFW is only available on Linux.";
let
prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
in
@@ -69,11 +59,7 @@ symlinkJoin {
paths = [ prismlauncher' ];
nativeBuildInputs =
[ kdePackages.wrapQtAppsHook ]
# purposefully using a shell wrapper here for variable expansion
# see https://github.com/NixOS/nixpkgs/issues/172583
++ lib.optional withWaylandGLFW makeWrapper;
nativeBuildInputs = [ kdePackages.wrapQtAppsHook ];
buildInputs =
[
@@ -84,30 +70,17 @@ symlinkJoin {
lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
) kdePackages.qtwayland;
env = {
waylandPreExec = lib.optionalString withWaylandGLFW ''
if [ -n "$WAYLAND_DISPLAY" ]; then
export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
fi
'';
};
postBuild =
lib.optionalString withWaylandGLFW ''
qtWrapperArgs+=(--run "$waylandPreExec")
''
+ ''
wrapQtAppsHook
'';
postBuild = ''
wrapQtAppsHook
'';
qtWrapperArgs =
let
runtimeLibs =
[
# lwjgl
stdenv.cc.cc.lib
## native versions
glfw
glfw3-minecraft
openal
## openal
@@ -118,11 +91,11 @@ symlinkJoin {
## glfw
libGL
xorg.libX11
xorg.libXext
xorg.libXcursor
xorg.libXrandr
xorg.libXxf86vm
libX11
libXcursor
libXext
libXrandr
libXxf86vm
udev # oshi
@@ -136,7 +109,7 @@ symlinkJoin {
runtimePrograms = [
mesa-demos
pciutils # need lspci
xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
] ++ additionalPrograms;
in
pkgs/applications/audio/pyradio/default.nix → pkgs/by-name/py/pyradio/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.9.3.9";
version = "0.9.3.11";
src = fetchFromGitHub {
owner = "coderholic";
repo = "pyradio";
rev = "refs/tags/${version}";
hash = "sha256-EoHCOg4nPkKRSFX/3AUKJaXzS6J1quwtv+mKeKBu5Ns=";
hash = "sha256-JvvnzIA5xhHgH87g0j60Ul0FHGhA88knsEFf1n2MQ84=";
};
nativeBuildInputs = [
pkgs/by-name/qu/quarkus/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quarkus-cli";
version = "3.13.2";
version = "3.14.1";
src = fetchurl {
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
hash = "sha256-6rt40cQde6ck0Eq3YRfN+l2QP18CHTxFj2EJyiPgkrE=";
hash = "sha256-OiA45lItW5IhOboxS+/kcUxvuVuJmvT+m6wX1REGUGI=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ra/radicle-httpd/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "radicle-httpd";
version = "0.15.0";
version = "0.17.0";
env.RADICLE_VERSION = version;
src = fetchgit {
url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
hash = "sha256-wd+ST8ax988CpGcdFb3LUcA686U7BLmbi1k8Y3GAEIc=";
hash = "sha256-nstyb1rSll3Sl0DlA9JAAwvr6JN8okJ03WoQnE4dXEk=";
sparseCheckout = [ "radicle-httpd" ];
};
sourceRoot = "${src.name}/radicle-httpd";
cargoHash = "sha256-YIux5/BFAZNI9ZwP4lVKj4UGQ4lKrhZ675bCdUaXN70=";
cargoHash = "sha256-M4tDtUXS99/Zb1Z71CTdW9gMgRR30rbwA6wK7nlwblQ=";
nativeBuildInputs = [
asciidoctor
pkgs/by-name/ra/radio-cli/package.nix
+44
View File
@@ -0,0 +1,44 @@
{
lib,
rustPlatform,
fetchFromGitHub,
makeWrapper,
pkg-config,
openssl,
mpv,
}:
rustPlatform.buildRustPackage rec {
pname = "radio-cli";
version = "2.3.1";
src = fetchFromGitHub {
owner = "margual56";
repo = "radio-cli";
rev = "v${version}";
hash = "sha256-XN0IzU7+V0zUUXfOygWrZXQX09IEpVo2Rhwfv+Lny/E=";
};
cargoHash = "sha256-XCzDNUZpyfu4gJr1lUx1/VbLkEv3OnJvYku0eEJbK5s=";
buildInputs = [ openssl ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
postInstall = ''
wrapProgram "$out/bin/radio-cli" \
--suffix PATH : ${lib.makeBinPath [ mpv ]}
'';
meta = {
description = "Simple radio CLI written in rust";
homepage = "https://github.com/margual56/radio-cli";
changelog = "https://github.com/margual56/radio-cli/releases/tag/v${version}";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
mainProgram = "radio-cli";
platforms = lib.platforms.linux;
};
}
pkgs/by-name/rc/rcp/package.nix
+3 -3
View File
@@ -7,20 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-TQTn91FDqDpdPv6dn2cwseGF+3EcJ17sglHKD7EQLeY=";
hash = "sha256-INLXVruiaK5yv5old0NOWFcg9y13M6Dm7bBMmcPFY1I=";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
IOKit
]);
cargoHash = "sha256-uhE1AphdYKL6pFY8vsmdMGxHxFiVw75oDXNP8qGykBc=";
cargoHash = "sha256-JXDM97uGuGh3qHK3Gh8Nd/YSZq/Kcj81PpufJJMqQQI=";
RUSTFLAGS = "--cfg tokio_unstable";
pkgs/by-name/re/renode-dts2repl/package.nix
+3 -3
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl";
version = "0-unstable-2024-08-20";
version = "0-unstable-2024-08-30";
pyproject = true;
src = fetchFromGitHub {
owner = "antmicro";
repo = "dts2repl";
rev = "ca0e43957140ee0cd7795b7a42ffb04fdcb98328";
hash = "sha256-6SgnYFta9FgHhc6Da1ItFO/UK2UtXU14bTl+sjX0I9s=";
rev = "231e1330c3210d31f08bf739ef69f096f0732291";
hash = "sha256-oD67tMJ23FBZzELtTdFZ2E7AtKs9m3T6L1rRuibfvY8=";
};
nativeBuildInputs = [
pkgs/by-name/re/renovate/package.nix
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "renovate";
version = "38.55.4";
version = "38.62.0";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-62nijbuHCNG6ht2W3EJB6fwNvYhZHzDp+RyH1prBWVQ=";
hash = "sha256-Wv7kSKuiyqVpl0EQIygF0R8h9PMH6yI5ezXhz1hbzd8=";
};
postPatch = ''
@@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-wdlGYIVGHLB2D4wSA5pjFRSHoetyLLN7v50K8nXxMO0=";
hash = "sha256-n2CnyjabKQ9D72OBdEqeHoxOJsKlLD2rJPRs50AWCXU=";
};
env.COREPACK_ENABLE_STRICT = 0;
pkgs/by-name/se/sesh/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "sesh";
version = "1.2.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "joshmedeski";
repo = "sesh";
rev = "v${version}";
hash = "sha256-nihyctFnDRLiDgHeXfn/q4G5IVEAOxh9MqFcsInK9UI=";
hash = "sha256-oOr2jJAJuddyIPp9z7ottHFUDSpSyc5+PiNYyVD6Alg=";
};
vendorHash = "sha256-zt1/gE4bVj+3yr9n0kT2FMYMEmiooy3k1lQ77rN6sTk=";
vendorHash = "sha256-a45P6yt93l0CnL5mrOotQmE/1r0unjoToXqSJ+spimg=";
ldflags = [ "-s" "-w" ];
pkgs/by-name/sp/speakersafetyd/package.nix
+1 -1
View File
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace speakersafetyd.service --replace "/usr" "$out"
substituteInPlace Makefile --replace "target/release" "target/${rust.lib.toRustTargetSpec stdenv.hostPlatform}/$cargoBuildType"
substituteInPlace Makefile --replace "target/release" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType"
# creating files in /var does not make sense in a nix package
substituteInPlace Makefile --replace 'install -dDm0755 $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox' ""
'';
pkgs/by-name/sv/svt-av1-psy/package.nix
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nasm,
libdovi,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "svt-av1-psy";
version = "2.2.1";
src = fetchFromGitHub {
owner = "gianni-rosato";
repo = "svt-av1-psy";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-4ds7yrUMp0O5/aWOkdnrANR1D3djajU/0ZeY6xJnpHI=";
};
cmakeBuildType = "Release";
cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {
LIBDOVI_FOUND = lib.boolToString true;
# enable when libhdr10plus is available
# LIBHDR10PLUS_RS_FOUND = lib.boolToString true;
};
nativeBuildInputs = [
cmake
nasm
];
buildInputs = [
libdovi
];
meta = {
homepage = "https://github.com/gianni-rosato/svt-av1-psy";
description = "Scalable Video Technology AV1 Encoder and Decoder";
longDescription = ''
SVT-AV1-PSY is the Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)
with perceptual enhancements for psychovisually optimal AV1 encoding.
The goal is to create the best encoding implementation for perceptual quality with AV1.
'';
license = with lib.licenses; [
aom
bsd3
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ johnrtitor ];
};
})
pkgs/by-name/sw/swaylock-effects/package.nix
+1
View File
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
'';
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner];
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
pkgs/by-name/va/vale-ls/package.nix
+5 -5
View File
@@ -9,15 +9,15 @@
, vale
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "vale-ls";
version = "0.3.7-unstable-2024-03-13";
version = "0.3.8";
src = fetchFromGitHub {
owner = "errata-ai";
repo = "vale-ls";
rev = "473e16bc88ec48b35e2bd208adc174878c4d5396";
hash = "sha256-ywJsnWMc9NSjYjsK6SXdMAQl+hcP+KQ7Xp1A99aeqAg=";
rev = "refs/tags/v${version}";
hash = "sha256-+2peLqj3/ny0hDwJVKEp2XS68VO50IvpCB2fvZoEdJo=";
};
nativeBuildInputs = [
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage {
env.OPENSSL_NO_VENDOR = true;
cargoHash = "sha256-ifKdSTmVWfDZF5Kn9b5JpzDxa160oRTfzjvxeL9POBg=";
cargoHash = "sha256-YurMB54jeMQIAOgDQhXEYrkYUYrSl02M9JG5Wtp6Eb8=";
postInstall = ''
wrapProgram $out/bin/vale-ls \
pkgs/by-name/wa/wayprompt/build.zig.zon.nix
+48
View File
@@ -0,0 +1,48 @@
# generated by zon2nix (https://github.com/nix-community/zon2nix)
{ linkFarm, fetchzip }:
linkFarm "zig-packages" [
{
name = "12201bbf05e1fb73323a9b13d2599dc4bf82851e6d328d7523a1af5b861a87edf286";
path = fetchzip {
url = "https://git.sr.ht/~leon_plickat/zig-ini/archive/879c74a3a801d49fa34343aebd55a22f591899b3.tar.gz";
hash = "sha256-in7abjMSWtnmrri2tbTJW2WVL4ZLrKkTT8Bxy8njJT4=";
};
}
{
name = "12202727aaaf0e742d4945be55af1ace8b25902095e0c1b0a24b70cc80a81b7ac518";
path = fetchzip {
url = "https://git.sr.ht/~leon_plickat/zig-spoon/archive/fdba8e643c9558254bf4e6c600dfbd782fa7a267.tar.gz";
hash = "sha256-c8V+HqtDMW6JBDKilzrC39GizvWPp1eMton1X4PpxJI=";
};
}
{
name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
};
}
{
name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz";
hash = "sha256-zcfZEMnipWDPuptl9UN0PoaJDjy2EHc7Wwi4GQq3hkY=";
};
}
{
name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38";
path = fetchzip {
url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz";
hash = "sha256-JAR6Ticav9l/3aemJWGsjXMEUyHjuhUr3L0fznnLoEY=";
};
}
{
name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk=";
};
}
]
pkgs/by-name/wa/wayprompt/package.nix
+58
View File
@@ -0,0 +1,58 @@
{
callPackage,
lib,
zig_0_13,
stdenv,
fetchFromSourcehut,
fcft,
libxkbcommon,
pixman,
pkg-config,
scdoc,
wayland,
wayland-protocols,
wayland-scanner,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wayprompt";
version = "0.1.2";
src = fetchFromSourcehut {
owner = "~leon_plickat";
repo = "wayprompt";
rev = "v${finalAttrs.version}";
hash = "sha256-+9Zgq5/Zbb1I3CMH1pivPkddThaGDXM+vVCzWppXq+0=";
};
deps = callPackage ./build.zig.zon.nix { };
nativeBuildInputs = [
zig_0_13.hook
pkg-config
wayland
wayland-scanner
scdoc
];
buildInputs = [
fcft
libxkbcommon
pixman
wayland-protocols
];
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
];
meta = {
homepage = "https://git.sr.ht/~leon_plickat/wayprompt";
description = "Multi-purpose (password-)prompt tool for Wayland";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ sg-qwt ];
mainProgram = "pinentry-wayprompt";
platforms = lib.platforms.linux;
};
})
pkgs/by-name/yt/yt-dlg/package.nix
+3 -20
View File
@@ -1,27 +1,9 @@
{
lib,
python3,
python3Packages,
fetchFromGitHub,
fetchPypi
fetchPypi,
}:
let
python3' =
(python3.override {
packageOverrides = final: prev: {
wxpython = prev.wxpython.overrideAttrs rec {
version = "4.2.0";
src = fetchPypi {
pname = "wxPython";
inherit version;
hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
};
};
};
});
python3Packages = python3'.pkgs;
in
python3Packages.buildPythonApplication rec {
pname = "yt-dlg";
version = "1.8.5";
@@ -34,6 +16,7 @@ python3Packages.buildPythonApplication rec {
};
pyproject = true;
pythonRelaxDeps = [ "wxpython" ];
build-system = with python3Packages; [
setuptools
wheel
pkgs/by-name/ze/zenn-cli/package.nix
+102
View File
@@ -0,0 +1,102 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
autoPatchelfHook,
makeWrapper,
nodejs,
pnpm_9,
testers,
}:
let
go-turbo-version = "1.7.4";
go-turbo-srcs = {
x86_64-linux = fetchurl {
url = "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-${go-turbo-version}.tgz";
hash = "sha256-bwi+jthoDe+SEvCPPNNNv9AR8n5IA1fc4I8cnfC095Y=";
};
aarch64-linux = fetchurl {
url = "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-${go-turbo-version}.tgz";
hash = "sha256-j3mUd3x16tYR3QQweIB07IbCKYuKPeEkKkUHhrpHzyc=";
};
};
go-turbo = stdenv.mkDerivation {
pname = "go-turbo";
version = go-turbo-version;
src = go-turbo-srcs.${stdenv.hostPlatform.system};
nativeBuildInputs = [ autoPatchelfHook ];
dontBuild = true;
installPhase = ''
install -Dm755 bin/go-turbo -t $out/bin
'';
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "zenn-cli";
version = "0.1.155";
src = fetchFromGitHub {
owner = "zenn-dev";
repo = "zenn-editor";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-3SM57DRCz8VuizyUrW6sI9FuBq4NrjoCqriEYUQg27M=";
# turborepo requires .git directory
leaveDotGit = true;
};
nativeBuildInputs = [
nodejs
pnpm_9.configHook
makeWrapper
];
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-FfqBe1WQc6ditizjxYLmjb8mvCjQJMpvyUDdaW29sXY=";
};
preBuild =
''
echo VITE_EMBED_SERVER_ORIGIN="https://embed.zenn.studio" > packages/zenn-cli/.env
''
# replace go-turbo since the existing one can't be executed
+ lib.optionalString stdenv.hostPlatform.isLinux ''
cp ${go-turbo}/bin/go-turbo node_modules/.pnpm/turbo-linux-*/node_modules/turbo-linux*/bin/go-turbo
'';
buildPhase = ''
runHook preBuild
pnpm build --no-daemon
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib/node_modules/zenn-cli}
cp -r packages/zenn-cli/{dist,LICENSE,package.json,README.md} $out/lib/node_modules/zenn-cli
makeWrapper "${lib.getExe nodejs}" "$out/bin/zenn" \
--add-flags "$out/lib/node_modules/zenn-cli/dist/server/zenn.js"
runHook postInstall
'';
passthru = {
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
};
meta = {
description = "Preview Zenn content locally";
homepage = "https://github.com/zenn-dev/zenn-editor";
changelog = "https://github.com/zenn-dev/zenn-editor/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "zenn";
platforms = nodejs.meta.platforms;
};
})
pkgs/data/icons/apple-cursor/default.nix
+11 -13
View File
@@ -8,19 +8,12 @@ let
name = variant;
url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}";
hash = hash;
} // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }));
} // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }) // (lib.optionalAttrs (suffix == "tar.xz") { stripRoot = false; }));
version = "2.0.0";
srcs = [
(_src "macOS-BigSur-White" "tar.gz" "sha256-3Ax2hMfkEL4cyJtGQpK3PqC/L5wtmgO0LsY4gkTQ2Bg=")
(_src "macOS-BigSur-White-Windows" "zip" "sha256-V6J2Ddgq46BkgxCWVReZrvE7CsOczzV7slOpilKFG9E=")
(_src "macOS-BigSur" "tar.gz" "sha256-VZWFf1AHum2xDJPMZrBmcyVrrmYGKwCdXOPATw7myOA=")
(_src "macOS-BigSur-Windows" "zip" "sha256-lp28ACsK8BXe6rSDELL4GdXb1QEdOVC8Y6eLofctkR4=")
(_src "macOS-Monterey-White" "tar.gz" "sha256-IfFYUbDW6mBe209iU1sBhFzolZd6YDVdJf+DPe9AQDM=")
(_src "macOS-Monterey-White-Windows" "zip" "sha256-gUuBFOi0nDBoX9TWPg4eQhCAhwYeEhfDEbYpc+XsQNE=")
(_src "macOS-Monterey" "tar.gz" "sha256-MHmaZs56Q1NbjkecvfcG1zAW85BCZDn5kXmxqVzPc7M=")
(_src "macOS-Monterey-Windows" "zip" "sha256-ajxEgq7besaRajLn0gTPpp4euOWVqbzc78u720PWlyE=")
(_src "macOS" "tar.xz" "sha256-nS4g+VwM+4q/S1ODb3ySi2SBk7Ha8vF8d9XpP5cEkok=")
];
version = "2.0.1";
in stdenv.mkDerivation rec {
pname = "apple_cursor";
inherit version;
@@ -30,14 +23,19 @@ in stdenv.mkDerivation rec {
installPhase = ''
install -dm 0755 $out/share/icons
cp -r macOS* $out/share/icons/
cp -r macOS/macOS* $out/share/icons/
'';
meta = with lib; {
description = "Opensource macOS Cursors";
homepage = "https://github.com/ful1e5/apple_cursor";
license = licenses.gpl3;
license = [
licenses.gpl3Only
# Potentially a derivative work of copyrighted Apple designs
licenses.unfree
];
platforms = platforms.linux;
maintainers = with maintainers; [ colemickens ];
maintainers = with maintainers; [ colemickens dxwil ];
};
}

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