Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-05-20 12:01:58 +00:00 committed by GitHub
commit be5878415f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
112 changed files with 10325 additions and 474 deletions

View File

@ -8584,6 +8584,12 @@
githubId = 1550265;
name = "Dominic Steinitz";
};
ifd3f = {
github = "ifd3f";
githubId = 7308591;
email = "astrid@astrid.tech";
name = "ifd3f";
};
iFreilicht = {
github = "iFreilicht";
githubId = 9742635;
@ -17582,6 +17588,12 @@
github = "rosehobgoblin";
githubId = 84164410;
};
roshaen = {
name = "Roshan Kumar";
email = "roshaen09@gmail.com";
github = "roshaen";
githubId = 58213083;
};
rossabaker = {
name = "Ross A. Baker";
email = "ross@rossabaker.com";

View File

@ -99,6 +99,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- [Guix](https://guix.gnu.org), a functional package manager inspired by Nix. Available as [services.guix](#opt-services.guix.enable).
- [Flarum](https://flarum.org/), a delightfully simple discussion platform for your website. Available as [services.flarum](#opt-services.flarum.enable).
- [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition.
- [clatd](https://github.com/toreanderson/clatd), a CLAT / SIIT-DC Edge Relay implementation for Linux.
@ -289,6 +291,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details.
- `hvm` was updated to version 2.
- `nvtop` family of packages was reorganized into nested attrset. `nvtop` has been renamed to `nvtopPackages.full`, and all `nvtop-{amd,nvidia,intel,msm}` packages are now named as `nvtopPackages.{amd,nvidia,intel,msm}`.
- `neo4j` has been updated to version 5. You may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/).

View File

@ -1354,6 +1354,7 @@
./services/web-apps/engelsystem.nix
./services/web-apps/ethercalc.nix
./services/web-apps/firefly-iii.nix
./services/web-apps/flarum.nix
./services/web-apps/fluidd.nix
./services/web-apps/freshrss.nix
./services/web-apps/galene.nix

View File

@ -0,0 +1,210 @@
{ pkgs, lib, config, ... }:
with lib;
let
cfg = config.services.flarum;
flarumInstallConfig = pkgs.writeText "config.json" (builtins.toJSON {
debug = false;
offline = false;
baseUrl = cfg.baseUrl;
databaseConfiguration = cfg.database;
adminUser = {
username = cfg.adminUser;
password = cfg.initialAdminPassword;
email = cfg.adminEmail;
};
settings = {
forum_title = cfg.forumTitle;
};
});
in {
options.services.flarum = {
enable = mkEnableOption "Flarum discussion platform";
package = mkPackageOption pkgs "flarum" { };
forumTitle = mkOption {
type = types.str;
default = "A Flarum Forum on NixOS";
description = "Title of the forum.";
};
domain = mkOption {
type = types.str;
default = "localhost";
example = "forum.example.com";
description = "Domain to serve on.";
};
baseUrl = mkOption {
type = types.str;
default = "http://localhost";
example = "https://forum.example.com";
description = "Change `domain` instead.";
};
adminUser = mkOption {
type = types.str;
default = "flarum";
description = "Username for first web application administrator";
};
adminEmail = mkOption {
type = types.str;
default = "admin@example.com";
description = "Email for first web application administrator";
};
initialAdminPassword = mkOption {
type = types.str;
default = "flarum";
description = "Initial password for the adminUser";
};
user = mkOption {
type = types.str;
default = "flarum";
description = "System user to run Flarum";
};
group = mkOption {
type = types.str;
default = "flarum";
description = "System group to run Flarum";
};
stateDir = mkOption {
type = types.path;
default = "/var/lib/flarum";
description = "Home directory for writable storage";
};
database = mkOption rec {
type = with types; attrsOf (oneOf [str bool int]);
description = "MySQL database parameters";
default = {
# the database driver; i.e. MySQL; MariaDB...
driver = "mysql";
# the host of the connection; localhost in most cases unless using an external service
host = "localhost";
# the name of the database in the instance
database = "flarum";
# database username
username = "flarum";
# database password
password = "";
# the prefix for the tables; useful if you are sharing the same database with another service
prefix = "";
# the port of the connection; defaults to 3306 with MySQL
port = 3306;
strict = false;
};
};
createDatabaseLocally = mkOption {
type = types.bool;
default = true;
description = "Create the database and database user locally, and run installation.";
};
};
config = mkIf cfg.enable {
users.users.${cfg.user} = {
isSystemUser = true;
home = cfg.stateDir;
createHome = true;
group = cfg.group;
};
users.groups.${cfg.group} = {};
services.phpfpm.pools.flarum = {
user = cfg.user;
settings = {
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
"listen.mode" = "0600";
"pm" = mkDefault "dynamic";
"pm.max_children" = mkDefault 10;
"pm.max_requests" = mkDefault 500;
"pm.start_servers" = mkDefault 2;
"pm.min_spare_servers" = mkDefault 1;
"pm.max_spare_servers" = mkDefault 3;
};
phpOptions = ''
error_log = syslog
log_errors = on
'';
};
services.nginx = {
enable = true;
virtualHosts."${cfg.domain}" = {
root = "${cfg.stateDir}/public";
locations."~ \.php$".extraConfig = ''
fastcgi_pass unix:${config.services.phpfpm.pools.flarum.socket};
fastcgi_index site.php;
'';
extraConfig = ''
index index.php;
include ${cfg.package}/share/php/flarum/.nginx.conf;
'';
};
};
services.mysql = mkIf cfg.enable {
enable = true;
package = pkgs.mysql;
ensureDatabases = [cfg.database.database];
ensureUsers = [
{
name = cfg.database.username;
ensurePermissions = {
"${cfg.database.database}.*" = "ALL PRIVILEGES";
};
}
];
};
assertions = [
{
assertion = !cfg.createDatabaseLocally || cfg.database.driver == "mysql";
message = "Flarum can only be automatically installed in MySQL/MariaDB.";
}
];
systemd.services.flarum-install = {
description = "Flarum installation";
requiredBy = ["phpfpm-flarum.service"];
before = ["phpfpm-flarum.service"];
requires = ["mysql.service"];
after = ["mysql.service"];
serviceConfig = {
Type = "oneshot";
User = cfg.user;
Group = cfg.group;
};
path = [config.services.phpfpm.phpPackage];
script = ''
mkdir -p ${cfg.stateDir}/{extensions,public/assets/avatars}
mkdir -p ${cfg.stateDir}/storage/{cache,formatter,sessions,views}
cd ${cfg.stateDir}
cp -f ${cfg.package}/share/php/flarum/{extend.php,site.php,flarum} .
ln -sf ${cfg.package}/share/php/flarum/vendor .
ln -sf ${cfg.package}/share/php/flarum/public/index.php public/
chmod a+x . public
chmod +x site.php extend.php flarum
'' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
if [ ! -f config.php ]; then
php flarum install --file=${flarumInstallConfig}
fi
php flarum migrate
php flarum cache:clear
'';
};
};
meta.maintainers = with lib.maintainers; [ fsagbuya jasonodoom ];
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub
{ lib, stdenv, intltool, pkg-config, gtk3, fetchFromGitHub
, autoreconfHook, wrapGAppsHook3 }:
stdenv.mkDerivation rec {

View File

@ -1,7 +1,6 @@
{
lib,
vscode-utils,
fetchurl,
writeScript,
runtimeShell,
jq,

View File

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.2.5";
version = "24.4.0";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-8Cs+uME6uXWIWeuS9cgKnlYJG/m13l2BIVNDG0bqEmc=";
hash = "sha256-x+9e0DPvYuxFqZAuCuzndz2E1iKdsmtN9WGUQPc9/uM=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-tQFcdZc+4N6TYY6MDAwUgpaIvqYkU681DbuYCQhvJ1c=";
hash = "sha256-OL4AcV8Fy25liRn4oVTLjUKyIuDKBsXHyN5RG3qexu4=";
};
nativeBuildInputs = [

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, python3, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.4.4";
version = "2.5.0";
pname = "weather";
src = fetchurl {
url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";
sha256 = "sha256-uBwcntmLmIAztbIOHEDx0Y0/kcoJqAHqBOM2yBiRHrU=";
sha256 = "sha256-wn3cpgfrlqntMIiVFh4317DrbGgQ4YRnFz3KHXacTw4=";
};
nativeBuildInputs = [

View File

@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.7.3329.27";
version = "6.7.3329.31";
suffix = {
aarch64-linux = "arm64";
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-o+ociqdALNti/7VgcBOb7cQBlZLWmYnTQ68SW8NMDIs=";
x86_64-linux = "sha256-1ppDdLIpQMBX+W2dL6CumqUM6PsEZJpQrA3huj3V+Eg=";
aarch64-linux = "sha256-TxfsI4XMZM3QvyxV48CrOltnRt0LUwZc2auppTvI+0w=";
x86_64-linux = "sha256-NRGELYgcJVL+mLdaWmDZCImCX8w9L+9ecGYQgIB1dq4=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
gradle, git, perl, makeWrapper, fetchpatch, substituteAll, jre_minimal
}:

View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, autoreconfHook
, autoconf-archive

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.66";
version = "3.67";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-1hK7FEBfLWh1LVtuhELAvZFyMK1bpOSnBg78aIRK8LY=";
hash = "sha256-5XR0dT72t6Kn/io1knA8xol5nGnmaBF+izmFZVf3OGE=";
};
vendorHash = "sha256-ly1opQmYL8zRKtLTMFo5Ek9ofEtn1YwmfhVuWfACKxY=";
vendorHash = "sha256-GBbbru7yWfwzVmRO1tuqE60kD8UJudX0rei7I02SYzw=";
subPackages = [ "weed" ];

View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, fetchurl
, dpkg
, autoPatchelfHook
, alsa-lib

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl }:
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "whisper";

View File

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitLab
, fetchFromGitHub
, fetchurl
, git
, cmake
, gnum4

View File

@ -1,25 +1,55 @@
{ lib, stdenv, fetchgit, pkg-config, cmake, glib, boost, libsigrok
, libsigrokdecode, libserialport, libzip, libftdi1, hidapi, glibmm
, pcre, python3, qtsvg, qttools, bluez
, wrapQtAppsHook, desktopToDarwinBundle
{ lib
, stdenv
, fetchgit
, pkg-config
, cmake
, glib
, boost
, libsigrok
, libsigrokdecode
, libserialport
, libzip
, libftdi1
, hidapi
, glibmm
, pcre
, python3
, qtsvg
, qttools
, bluez
, wrapQtAppsHook
, desktopToDarwinBundle
}:
stdenv.mkDerivation rec {
pname = "pulseview";
version = "0.4.2-unstable-2024-01-26";
version = "0.4.2-unstable-2024-03-14";
src = fetchgit {
url = "git://sigrok.org/pulseview";
rev = "9b8b7342725491d626609017292fa9259f7d5e0e";
hash = "sha256-UEJunADzc1WRRfchO/n8qqxnyrSo4id1p7gLkD3CKaM=";
rev = "d00efc65ef47090b71c4da12797056033bee795f";
hash = "sha256-MwfMUqV3ejxesg+3cFeXVB5hwg4r0cOCgHJuH3ZLmNE=";
};
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [
glib boost libsigrok libsigrokdecode libserialport libzip libftdi1 hidapi glibmm
pcre python3
glib
boost
libsigrok
libsigrokdecode
libserialport
libzip
libftdi1
hidapi
glibmm
pcre
python3
qtsvg
] ++ lib.optionals stdenv.isLinux [ bluez ];

View File

@ -45,8 +45,8 @@ let
}
else
{
version = "2024.1";
hash = "sha256-k32PEqNv/78q963XGtu1qlxVN4ktRsmnavvsqxqgqsc=";
version = "2024.2";
hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs=";
};
in stdenv.mkDerivation rec {

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, cmake
, pkg-config
, boxed-cpp

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
{ stdenv, lib, fetchpatch, fetchFromGitLab, bundlerEnv
, ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl
, defaultGemConfig, buildRubyGem
, gitlabEnterprise ? false, callPackage, yarn

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "caligula";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitHub {
owner = "ifd3f";
repo = "caligula";
rev = "v${version}";
hash = "sha256-9+aLpxmMP76CsLFFmr1mhKgbaT7Zz0lx4D2jQCUA9VY=";
hash = "sha256-nLt+PDPdW7oEMoWqW0iO4nXGlwk7UymWShn0azQt2ro=";
};
cargoHash = "sha256-VwtmU5jTQPn3hpNuLckPQl6joEFPfuax1gRVG0/nceg=";
cargoHash = "sha256-8K3twPL7lNUmUUjD+nKATGgcjgoCuFO+bvlujVySXj0=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
description = "A user-friendly, lightweight TUI for disk imaging";
homepage = "https://github.com/ifd3f/caligula/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ sodiboo ];
maintainers = with maintainers; [ ifd3f sodiboo ];
platforms = platforms.linux ++ platforms.darwin;
# https://github.com/ifd3f/caligula/issues/105
broken = stdenv.hostPlatform.isDarwin;

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.87";
version = "1.0.88";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
hash = "sha256-sBL1/5was2qN8M2s8u443mb376ySE+T58bmdfO0XqE0=";
hash = "sha256-H0KgtiBxafmk2PSIxnlhzRgqt5zVfk59qWnc4iDTL0k=";
};
cargoHash = "sha256-DhjZMOKfXBGSF8b7OQ7l++/RKjtww+cUJDj91JW9ROY=";
cargoHash = "sha256-UtXsUaJB7PY7FQaHu3EKZnbGjajW9e/WtK23fF0fU4c=";
meta = with lib; {
description = "Cargo subcommand to show result of macro expansion";

9499
pkgs/by-name/fl/flarum/composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,28 @@
{ lib
, php
, fetchFromGitHub
}:
php.buildComposerProject (finalAttrs: {
pname = "flarum";
version = "1.8.1";
src = fetchFromGitHub {
owner = "flarum";
repo = "flarum";
rev = "v${finalAttrs.version}";
hash = "sha256-kigUZpiHTM24XSz33VQYdeulG1YI5s/M02V7xue72VM=";
};
composerLock = ./composer.lock;
composerStrictValidation = false;
vendorHash = "sha256-gQkjuatItw93JhI7FVfg5hYxkC1gsRQ3c2C2+MhI/Jg=";
meta = with lib; {
changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md";
description = "Flarum is a delightfully simple discussion platform for your website";
homepage = "https://github.com/flarum/flarum";
license = lib.licenses.mit;
maintainers = with maintainers; [ fsagbuya jasonodoom ];
};
})

View File

@ -1131,6 +1131,51 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hickory-proto"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
dependencies = [
"async-trait",
"cfg-if",
"data-encoding",
"enum-as-inner",
"futures-channel",
"futures-io",
"futures-util",
"idna 0.4.0",
"ipnet",
"once_cell",
"rand",
"thiserror",
"tinyvec",
"tokio",
"tracing",
"url",
]
[[package]]
name = "hickory-resolver"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
dependencies = [
"cfg-if",
"futures-util",
"hickory-proto",
"ipconfig",
"lru-cache",
"once_cell",
"parking_lot",
"rand",
"resolv-conf",
"smallvec",
"thiserror",
"tokio",
"tracing",
]
[[package]]
name = "hostname"
version = "0.3.1"
@ -1142,6 +1187,17 @@ dependencies = [
"winapi",
]
[[package]]
name = "hostname"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
dependencies = [
"cfg-if",
"libc",
"windows 0.52.0",
]
[[package]]
name = "humantime"
version = "2.1.0"
@ -1228,7 +1284,7 @@ dependencies = [
[[package]]
name = "lan-mouse"
version = "0.7.3"
version = "0.8.0"
dependencies = [
"anyhow",
"ashpd",
@ -1241,24 +1297,27 @@ dependencies = [
"futures-core",
"glib-build-tools",
"gtk4",
"hickory-resolver",
"hostname 0.4.0",
"keycode",
"libadwaita",
"libc",
"log",
"memmap",
"num_enum",
"once_cell",
"reis",
"serde",
"serde_json",
"slab",
"tempfile",
"tokio",
"toml",
"trust-dns-resolver",
"wayland-client",
"wayland-protocols",
"wayland-protocols-misc",
"wayland-protocols-wlr",
"windows",
"windows 0.54.0",
"x11",
]
@ -1427,6 +1486,27 @@ dependencies = [
"libc",
]
[[package]]
name = "num_enum"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 2.0.53",
]
[[package]]
name = "object"
version = "0.32.2"
@ -1711,7 +1791,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
dependencies = [
"hostname",
"hostname 0.3.1",
"quick-error",
]
@ -2069,52 +2149,6 @@ dependencies = [
"once_cell",
]
[[package]]
name = "trust-dns-proto"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
dependencies = [
"async-trait",
"cfg-if",
"data-encoding",
"enum-as-inner",
"futures-channel",
"futures-io",
"futures-util",
"idna 0.4.0",
"ipnet",
"once_cell",
"rand",
"smallvec",
"thiserror",
"tinyvec",
"tokio",
"tracing",
"url",
]
[[package]]
name = "trust-dns-resolver"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
dependencies = [
"cfg-if",
"futures-util",
"ipconfig",
"lru-cache",
"once_cell",
"parking_lot",
"rand",
"resolv-conf",
"smallvec",
"thiserror",
"tokio",
"tracing",
"trust-dns-proto",
]
[[package]]
name = "typenum"
version = "1.17.0"
@ -2309,13 +2343,32 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
"windows-core 0.52.0",
"windows-targets 0.52.4",
]
[[package]]
name = "windows"
version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
dependencies = [
"windows-core",
"windows-core 0.54.0",
"windows-targets 0.52.4",
]
[[package]]
name = "windows-core"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets 0.52.4",
]

View File

@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "lan-mouse";
version = "0.7.3";
version = "0.8.0";
src = fetchFromGitHub {
owner = "feschber";
repo = "lan-mouse";
rev = "v${version}";
hash = "sha256-W4TCA8umcr2hCIc50GFdvDVZaJGSNRNi7iDe8DJ5PHs=";
hash = "sha256-s80oaUDuFnbCluImLLliv1b1RDpIKrBWdX4hHy3xUIU=";
};
nativeBuildInputs = [

View File

@ -114,5 +114,9 @@ stdenv.mkDerivation rec {
homepage = "https://libcamera.org";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ citadelcore ];
badPlatforms = [
# Mandatory shared libraries.
lib.systems.inspect.platformPatterns.isStatic
];
};
}

View File

@ -8,7 +8,6 @@
ninja,
fetchFromGitHub,
fetchpatch,
fetchurl,
libpng,
stdenv,
}:

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perl, linuxPackages_latest }:
{ lib, stdenv, perl, linuxPackages_latest }:
stdenv.mkDerivation rec {
pname = "linux-manual";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, xorg, bdf2psf, bdftopcf
, libfaketime
}:

View File

@ -7,22 +7,19 @@
rustPlatform.buildRustPackage rec {
pname = "hvm";
version = "1.0.9";
version = "2.0.12";
src = fetchCrate {
inherit pname version;
hash = "sha256-dO0GzbMopX84AKOtJYYW6vojcs4kYcZ8LQ4tXEgUN7I=";
hash = "sha256-/55SK/5zBKXmucRQPoYt/8IHxisQlOxNEVMAZVMtCNI=";
};
cargoHash = "sha256-RQnyVRHWrqnKcI3Jy593jDTydG1nGyrScsqSNyJTDJk=";
cargoHash = "sha256-9U8Y0KaQHIfOZnCKbl94VvjS/7Qmi6UnKMDZDTXcye0=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.IOKit
];
# tests are broken
doCheck = false;
# enable nightly features
RUSTC_BOOTSTRAP = true;

View File

@ -1,10 +1,10 @@
{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL
, openglSupport ? libGLSupported, libGL, libGLU
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
, libXext, libICE, libXrandr
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, libpulseaudio
, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
}:

View File

@ -1,6 +1,5 @@
{ stdenv
, arrow-cpp
, fetchurl
, glib
, gobject-introspection
, lib

View File

@ -3,7 +3,6 @@
, cmake
, darwin
, fetchFromGitHub
, fetchurl
, withBlas ? true, blas
}:

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
{ lib, stdenv, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
stdenv.mkDerivation {
pname = "libagar-test";

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, rust
, rustPlatform
, cargo-c

View File

@ -35,7 +35,9 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE =
# stringop-truncation: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028978
if stdenv.cc.isGNU then "-Wno-error=array-bounds -Wno-error=stringop-overflow=8 -Wno-error=stringop-truncation"
else "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion";
else let
isLLVM17 = stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17";
in "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion${lib.optionalString (isLLVM17) " -Wno-error=unused-but-set-variable"}";
meta = with lib; {
homepage = "https://omxil.sourceforge.net/";

View File

@ -103,11 +103,25 @@ in {
libressl_3_6 = generic {
version = "3.6.3";
hash = "sha256-h7G7426e7I0K5fBMg9NrLFsOWBeEx+sIFwJe0p6t6jc=";
patches = [
(fetchpatch {
url = "https://github.com/libressl/portable/commit/86e4965d7f20c3a6afc41d95590c9f6abb4fe788.patch";
includes = [ "tests/tlstest.sh" ];
hash = "sha256-XmmKTvP6+QaWxyGFCX6/gDfME9GqBWSx4X8RH8QbDXA=";
})
];
};
libressl_3_7 = generic {
version = "3.7.3";
hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM=";
patches = [
(fetchpatch {
url = "https://github.com/libressl/portable/commit/86e4965d7f20c3a6afc41d95590c9f6abb4fe788.patch";
includes = [ "tests/tlstest.sh" ];
hash = "sha256-XmmKTvP6+QaWxyGFCX6/gDfME9GqBWSx4X8RH8QbDXA=";
})
];
};
libressl_3_8 = generic {

View File

@ -500,6 +500,7 @@ self = stdenv.mkDerivation {
changelog = "https://www.mesa3d.org/relnotes/${version}.html";
license = with lib.licenses; [ mit ]; # X11 variant, in most files
platforms = lib.platforms.mesaPlatforms;
badPlatforms = []; # Load bearing for libGL meta on Darwin.
maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :)
};
};

View File

@ -82,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Stub bindings using " + (if stdenv.hostPlatform.isDarwin then "mesa" else "libglvnd");
pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ];
} // {
inherit (if stdenv.hostPlatform.isDarwin then mesa.meta else libglvnd.meta) homepage license platforms;
inherit (if stdenv.hostPlatform.isDarwin then mesa.meta else libglvnd.meta)
homepage license platforms badPlatforms;
};
})

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchurl }:
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "mp4v2";

View File

@ -65,7 +65,7 @@
, xorg
, mysofaSupport ? true
, libmysofa
, ffadoSupport ? x11Support && stdenv.buildPlatform.canExecute stdenv.hostPlatform
, ffadoSupport ? x11Support && lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform
, ffado
, libselinux
}:

View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchurl
, perl
, perlPackages
, sharnessExtensions ? {} }:

View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, fetchurl
, audiofile
, libtiff
, buildPackages

View File

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchurl
, buildDunePackage
, bos
, bwd

View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl, fmt, lun, ppxlib }:
{ lib, buildDunePackage, fmt, lun, ppxlib }:
buildDunePackage {
pname = "ppx_lun";

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, lwd, lwt, nottui }:
{ lib, buildDunePackage, lwd, lwt, nottui }:
buildDunePackage {
pname = "nottui-lwt";

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, lwd, nottui }:
{ lib, buildDunePackage, lwd, nottui }:
buildDunePackage {
pname = "nottui-pretty";

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, lwd, notty }:
{ lib, buildDunePackage, lwd, notty }:
buildDunePackage {
pname = "nottui";

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, fetchpatch, buildDunePackage, js_of_ocaml, js_of_ocaml-ppx, lwd, tyxml }:
{ lib, fetchpatch, buildDunePackage, js_of_ocaml, js_of_ocaml-ppx, lwd, tyxml }:
buildDunePackage {
pname = "tyxml-lwd";

View File

@ -1,4 +1,4 @@
{ buildDunePackage, fetchurl, mirage-time, lwt, duration }:
{ buildDunePackage, mirage-time, lwt, duration }:
buildDunePackage {
pname = "mirage-time-unix";

View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime
{ lib, buildDunePackage, ipaddr, functoria-runtime
, logs, lwt
, alcotest
}:

View File

@ -1,5 +1,5 @@
# Version can be selected with the 'version' argument, see generic.nix.
{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args:
{ lib, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args:
let
# for compat with ocaml-lsp

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, ocaml
{ lib, buildDunePackage, ocaml
, ocaml-crunch
, astring, cmdliner, cppo, fpath, result, tyxml
, markup, yojson, sexplib0, jq

View File

@ -1,6 +1,5 @@
{ buildDunePackage
, lib
, fetchurl
, astring
, base64
, cmdliner

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, ocaml
{ lib, buildDunePackage, ocaml
, saturn_lockfree
, dscheck
, qcheck, qcheck-alcotest, qcheck-stm

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib
{ lib, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib
, junit_alcotest
}:

View File

@ -1,33 +1,41 @@
{ lib
, azure-core
, buildPythonPackage
, cryptography
, fetchPypi
, isodate
, msrest
, pythonOlder
, typing-extensions
{
lib,
azure-core,
buildPythonPackage,
cryptography,
fetchPypi,
isodate,
msrest,
pythonOlder,
setuptools,
typing-extensions,
}:
buildPythonPackage rec {
pname = "azure-storage-file-share";
version = "12.15.0";
format = "setuptools";
version = "12.16.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-AJjxz6k0TE94HODNUE/zo1JVdRVTwB5yDczQyqjYqio=";
hash = "sha256-QS+35sPCj29yKvmBlapZQHqqMjI6+hOkoB9i0Lh3TrM=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
azure-core
cryptography
isodate
typing-extensions
];
passthru.optional-dependencies = {
aio = [ azure-core ] ++ azure-core.optional-dependencies.aio;
};
# Tests require checkout from monorepo
doCheck = false;
@ -38,7 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Microsoft Azure File Share Storage Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-share";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-file-share_${version}/sdk/storage/azure-storage-file-share/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ kamadorueda ];

View File

@ -7,7 +7,6 @@
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, fetchurl
, minexr
, opencv4
, python3Packages

View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "craft-parts";
version = "1.29.0";
version = "1.30.0";
pyproject = true;
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-parts";
rev = "refs/tags/${version}";
hash = "sha256-3AWiuRGUGj6q6ZEnShc64DSL1S6kTsry4Z1IYMelvzg=";
hash = "sha256-JEf5JYDBH4Pm5ke++7GkpimM8Ec0dFe1GGxruntjmVE=";
};
patches = [

View File

@ -0,0 +1,30 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "devgoldyutils";
version = "3.0.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "2kGu9QPP5WqKv2gO9DAkE9SNDerzNaEDRt5DrrYD9nQ=";
};
doCheck = false;
nativeBuildInputs = [ setuptools-scm ];
pythonImportsCheck = [ "devgoldyutils" ];
meta = {
description = "A collection of utility functions for Python used by mov-cli";
homepage = "https://github.com/THEGOLDENPRO/devgoldyutils";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ roshaen ];
};
}

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, callPackage
, fetchurl
, libeduvpn-common
, selenium
, setuptools

View File

@ -1,34 +1,33 @@
{ lib
, aiohttp
, bidict
, buildPythonPackage
, fetchPypi
, humanize
, lxml
, pythonOlder
, requests
, setuptools
, slixmpp
, websockets
{
lib,
aiohttp,
bidict,
buildPythonPackage,
fetchPypi,
humanize,
lxml,
pythonOlder,
requests,
setuptools,
slixmpp,
websockets,
}:
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.5.27";
version = "0.5.28";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-H76y784lYzETgq5XSsQOSGka/kvM+hyMHzUHEJuXTuk=";
hash = "sha256-TAPuP0VFhKuWDzko/+Upq6GDGZJO9y6GuuV6GsSqi2I=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aiohttp
bidict
humanize
@ -42,16 +41,14 @@ buildPythonPackage rec {
# https://github.com/simbaja/gehome/issues/32
doCheck = false;
pythonImportsCheck = [
"gehomesdk"
];
pythonImportsCheck = [ "gehomesdk" ];
meta = with lib; {
description = "Python SDK for GE smart appliances";
mainProgram = "gehome-appliance-data";
homepage = "https://github.com/simbaja/gehome";
changelog = "https://github.com/simbaja/gehome/blob/master/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "gehome-appliance-data";
};
}

View File

@ -1,13 +1,15 @@
{ lib
, buildPythonPackage
, fetchPypi
, pyjwt
, pytestCheckHook
, python-dateutil
, pythonOlder
, requests
, responses
, setuptools
{
lib,
buildPythonPackage,
fetchPypi,
pyjwt,
pytestCheckHook,
python-dateutil,
pythonAtLeast,
pythonOlder,
requests,
responses,
setuptools,
}:
buildPythonPackage rec {
@ -22,11 +24,9 @@ buildPythonPackage rec {
hash = "sha256-CqbZcEP1ianvRRpx527KBjQTjvGBzlSmoKY1Pe5MXRA=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
pyjwt
python-dateutil
requests
@ -52,6 +52,10 @@ buildPythonPackage rec {
"test_retry_config_external"
# assertion error due to requests brotli support
"test_http_client"
] ++ lib.optionals (pythonAtLeast "3.12") [
# Tests are blocking or failing
"test_abstract_class_instantiation"
"test_abstract_class_instantiation"
];
disabledTestPaths = [

View File

@ -1,21 +1,23 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, ibm-cloud-sdk-core
, pytest-rerunfailures
, pytestCheckHook
, python-dateutil
, python-dotenv
, pythonOlder
, requests
, responses
, websocket-client
{
lib,
buildPythonPackage,
fetchFromGitHub,
ibm-cloud-sdk-core,
pytest-rerunfailures,
pytestCheckHook,
python-dateutil,
python-dotenv,
pythonOlder,
requests,
setuptools,
responses,
websocket-client,
}:
buildPythonPackage rec {
pname = "ibm-watson";
version = "8.0.0";
format = "setuptools";
version = "8.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,10 +25,12 @@ buildPythonPackage rec {
owner = "watson-developer-cloud";
repo = "python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-p2LyR7Fxd0Ny6QCypAWIusnINuhWAhWOnRfZ14FKvro=";
hash = "sha256-r7A5i17KIy1pBrj01yeknfrOFjb5yZco8ZOc7tlFM7k=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
ibm-cloud-sdk-core
python-dateutil
requests
@ -40,9 +44,7 @@ buildPythonPackage rec {
responses
];
pythonImportsCheck = [
"ibm_watson"
];
pythonImportsCheck = [ "ibm_watson" ];
meta = with lib; {
description = "Client library to use the IBM Watson Services";

View File

@ -1,23 +1,24 @@
{ lib
, aiohttp
, aiocsv
, buildPythonPackage
, certifi
, ciso8601
, fetchFromGitHub
, numpy
, pandas
, python-dateutil
, pythonOlder
, reactivex
, setuptools
, urllib3
{
lib,
aiohttp,
aiocsv,
buildPythonPackage,
certifi,
ciso8601,
fetchFromGitHub,
numpy,
pandas,
python-dateutil,
pythonOlder,
reactivex,
setuptools,
urllib3,
}:
buildPythonPackage rec {
pname = "influxdb-client";
version = "1.42.0";
format = "setuptools";
version = "1.43.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -25,10 +26,12 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "refs/tags/v${version}";
hash = "sha256-PY0GpwO1OG4DKutMR3MF9HtTJbLFRCWypeoqVoiRD4o=";
hash = "sha256-CwSqJj9MslcvTzYGaDRygskSxbSh80uCJQM2tNz743k=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
certifi
python-dateutil
reactivex
@ -41,9 +44,7 @@ buildPythonPackage rec {
aiocsv
aiohttp
];
ciso = [
ciso8601
];
ciso = [ ciso8601 ];
extra = [
numpy
pandas
@ -53,9 +54,7 @@ buildPythonPackage rec {
# Requires influxdb server
doCheck = false;
pythonImportsCheck = [
"influxdb_client"
];
pythonImportsCheck = [ "influxdb_client" ];
meta = with lib; {
description = "InfluxDB client library";

View File

@ -1,15 +1,16 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pdm-backend
, httpx
, zstandard
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pdm-backend,
httpx,
zstandard,
}:
buildPythonPackage rec {
pname = "pbs-installer";
version = "2024.4.1";
version = "2024.4.24";
pyproject = true;
disabled = pythonOlder "3.8";
@ -17,22 +18,16 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "frostming";
repo = "pbs-installer";
rev = version;
hash = "sha256-0LuajPD/sM0LoyRoCkGJ9medUcWNEPqvY76GgK2rIac=";
rev = "refs/tags/${version}";
hash = "sha256-a35xQEdo7OOFlXk2vsTdVpEhqPRKFZRQzNnZw3c7ybA=";
};
build-system = [
pdm-backend
];
build-system = [ pdm-backend ];
optional-dependencies = {
all = optional-dependencies.install ++ optional-dependencies.download;
download = [
httpx
];
install = [
zstandard
];
download = [ httpx ];
install = [ zstandard ];
};
pythonImportsCheck = [ "pbs_installer" ];

View File

@ -1,21 +1,22 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, cmake
, ninja
, scikit-build-core
, charls
, eigen
, fmt
, numpy
, pillow
, pybind11
, setuptools
, pathspec
, pyproject-metadata
, setuptools-scm
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pytestCheckHook,
cmake,
ninja,
scikit-build-core,
charls,
eigen,
fmt,
numpy,
pillow,
pybind11,
setuptools,
pathspec,
pyproject-metadata,
setuptools-scm,
}:
buildPythonPackage rec {
@ -32,11 +33,17 @@ buildPythonPackage rec {
hash = "sha256-Rc4/S8BrYoLdn7eHDBaoUt1Qy+h0TMAN5ixCAuRmfPU=";
};
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontUseCmakeConfigure = true;
postPatch = ''
substituteInPlace pyproject.toml --replace '"conan~=2.0.16",' ""
substituteInPlace pyproject.toml \
--replace-fail '"conan~=2.0.16",' "" \
--replace-fail '"pybind11~=2.11.1",' '"pybind11",'
'';
nativeBuildInputs = [
build-system = [
cmake
ninja
pybind11
@ -44,36 +51,36 @@ buildPythonPackage rec {
setuptools
setuptools-scm
];
buildInputs = [
charls
eigen
fmt
];
propagatedBuildInputs = [
dependencies = [
numpy
pillow
pathspec
pyproject-metadata
];
pypaBuildFlags = [ "-C" "cmake.args='--preset=sysdeps'" ];
dontUseCmakeConfigure = true;
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
checkInputs = [
pytestCheckHook
pypaBuildFlags = [
"-C"
"cmake.args='--preset=sysdeps'"
];
# prevent importing from build during test collection:
nativeCheckInputs = [ pytestCheckHook ];
# Prevent importing from build during test collection:
preCheck = ''rm -rf pillow_jpls'';
pythonImportsCheck = [
"pillow_jpls"
];
pythonImportsCheck = [ "pillow_jpls" ];
meta = with lib; {
description = "A JPEG-LS plugin for the Python Pillow library";
homepage = "https://github.com/planetmarshall/pillow-jpls";
changelog = "https://github.com/planetmarshall/pillow-jpls/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
};

View File

@ -104,6 +104,8 @@ buildPythonPackage {
# https://github.com/protocolbuffers/protobuf/commit/5abab0f47e81ac085f0b2d17ec3b3a3b252a11f1
#
"google/protobuf/internal/generator_test.py"
] ++ lib.optionals (lib.versionAtLeast protobuf.version "25") [
"minimal_test.py" # ModuleNotFoundError: No module named 'google3'
];
pythonImportsCheck = [
@ -122,6 +124,6 @@ buildPythonPackage {
maintainers = with maintainers; [ knedlsepp ];
# Tests are currently failing because backend is unavailable and causes tests to fail
# Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902
broken = lib.versionAtLeast protobuf.version "25";
broken = lib.versionAtLeast protobuf.version "26";
};
}

View File

@ -1,36 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, pyyaml
, twine
{
lib,
buildPythonPackage,
fetchPypi,
pyyaml,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "pycomposefile";
version = "0.0.30";
format = "setuptools";
version = "0.0.31";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
hash = "sha256-GQopIO8F+G5iDz4NF2GTHCpXo4uqKHdHIzffacihylM=";
hash = "sha256-SYul81giQLUM1FdgfabKJyrbSu4xdoaWblcE87ZbBwg=";
};
nativeBuildInput = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
pyyaml
twine
];
dependencies = [ pyyaml ];
doCheck = false; # tests are broken
# Tests are broken
doCheck = false;
pythonImportsCheck = [ "pycomposefile" ];
meta = with lib; {
description = "Python library for structured deserialization of Docker Compose files";
homepage = "https://github.com/smurawski/pycomposefile";
changelog = "https://github.com/smurawski/pycomposefile/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ mdarocha ];
};

View File

@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "pymc-devs";
repo = "pymc";
rev = "refs/tags/v${version}";
hash = "sha256-KJXQz7LES3AqLkq5FPnaECraYSM4vfuDyfRJSclz1RQ=";
hash = "sha256-9AqnJOm0yQOOoksg1lpI4EcduU5xDjnIplOzVJIwQFo=";
};
postPatch = ''

View File

@ -1,51 +1,46 @@
{ lib
, stdenv
, aiohttp
, buildPythonPackage
, setuptools
, eventlet
, fetchFromGitHub
, iana-etc
, libredirect
, mock
, pytestCheckHook
, pythonOlder
, requests
, simple-websocket
, tornado
, websocket-client
{
lib,
stdenv,
aiohttp,
buildPythonPackage,
setuptools,
eventlet,
fetchFromGitHub,
iana-etc,
libredirect,
mock,
pytestCheckHook,
pythonOlder,
requests,
simple-websocket,
tornado,
websocket-client,
}:
buildPythonPackage rec {
pname = "python-engineio";
version = "4.9.0";
version = "4.9.1";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "miguelgrinberg";
repo = "python-engineio";
rev = "refs/tags/v${version}";
hash = "sha256-FpPGIK5HVtTzDOpORo+WPhS1860P3dm1nJkvakpzsjE=";
hash = "sha256-wn2qiVkL05GTopGJeghHe9i+wyOQZbEeYDmEIIbXDS0=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
simple-websocket
];
dependencies = [ simple-websocket ];
passthru.optional-dependencies = {
client = [
requests
websocket-client
];
asyncio_client = [
aiohttp
];
asyncio_client = [ aiohttp ];
};
nativeCheckInputs = [
@ -71,13 +66,9 @@ buildPythonPackage rec {
'';
# somehow effective log level does not change?
disabledTests = [
"test_logger"
];
disabledTests = [ "test_logger" ];
pythonImportsCheck = [
"engineio"
];
pythonImportsCheck = [ "engineio" ];
meta = with lib; {
description = "Python based Engine.IO client and server";

View File

@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "quart";
version = "0.19.5";
version = "0.19.6";
pyproject = true;
src = fetchFromGitHub {
owner = "pallets";
repo = "quart";
rev = "refs/tags/${version}";
hash = "sha256-T2+76AVvXrads7AbjNAExV0i4doQ2xIUEwekVB2JXAo=";
hash = "sha256-oR03Qu93F+pcWywbdYgMKIAdohBNezlGz04ws3yGAxs=";
};
build-system = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1149";
version = "3.0.1150";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-3c5MxP2u539++7R6ZMfRMqcxu9THTAWGjaPSdGbqTC8=";
hash = "sha256-EaTlhIH+XAxC2r7NbxUGId6Sc9XfxFL2YbiS0Htmjno=";
};
build-system = [ setuptools ];

View File

@ -1,25 +1,26 @@
{ lib
, buildPythonPackage
, exceptiongroup
, fetchFromGitHub
, glibcLocales
, pygobject3
, pyserial
, pytestCheckHook
, pythonOlder
, pyzmq
, setuptools
, setuptools-scm
, tornado
, trio
, twisted
, typing-extensions
, wcwidth
{
lib,
buildPythonPackage,
exceptiongroup,
fetchFromGitHub,
glibcLocales,
pygobject3,
pyserial,
pytestCheckHook,
pythonOlder,
pyzmq,
setuptools,
setuptools-scm,
tornado,
trio,
twisted,
typing-extensions,
wcwidth,
}:
buildPythonPackage rec {
pname = "urwid";
version = "2.6.11";
version = "2.6.12";
pyproject = true;
disabled = pythonOlder "3.7";
@ -28,46 +29,34 @@ buildPythonPackage rec {
owner = "urwid";
repo = "urwid";
rev = "refs/tags/${version}";
hash = "sha256-EArHHsHqr1z+UhdsUCc4IPZa33sSCaR1sDSr7eCGSOM=";
hash = "sha256-JGX9v/x8c7ayHnxVjC7u4YLs3OvZmTzPNFUfqGCeIRQ=";
};
postPatch = ''
sed -i '/addopts =/d' pyproject.toml
'';
nativeBuildInputs = [
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dependencies = [
typing-extensions
wcwidth
];
passthru.optional-dependencies = {
glib = [
pygobject3
];
tornado = [
tornado
];
glib = [ pygobject3 ];
tornado = [ tornado ];
trio = [
exceptiongroup
trio
];
twisted = [
twisted
];
zmq = [
pyzmq
];
serial = [
pyserial
];
lcd = [
pyserial
];
twisted = [ twisted ];
zmq = [ pyzmq ];
serial = [ pyserial ];
lcd = [ pyserial ];
};
nativeCheckInputs = [
@ -77,18 +66,14 @@ buildPythonPackage rec {
env.LC_ALL = "en_US.UTF8";
pytestFlagsArray = [
"tests"
];
pytestFlagsArray = [ "tests" ];
disabledTestPaths = [
# expect call hangs
"tests/test_vterm.py"
];
pythonImportsCheck = [
"urwid"
];
pythonImportsCheck = [ "urwid" ];
meta = with lib; {
description = "A full-featured console (xterm et al.) user interface library";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:
{ lib, stdenv, clang, llvmPackages, perl, makeWrapper, python3 }:
stdenv.mkDerivation rec {
pname = "clang-analyzer";

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
{ lib, buildGoModule, fetchFromGitLab, bash }:
let
version = "16.11.1";

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, zig_0_12
, callPackage
}:

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub, unstableGitUpdater }:
{ lib, stdenv, autoreconfHook, fetchFromGitHub, unstableGitUpdater }:
stdenv.mkDerivation rec {
pname = "patchelf";

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin, result }:
{ lib, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin, result }:
buildDunePackage rec {
pname = "dot-merlin-reader";

View File

@ -12,16 +12,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in
buildGoModule rec {
pname = "regclient";
version = "0.5.7";
version = "0.6.1";
tag = "v${version}";
src = fetchFromGitHub {
owner = "regclient";
repo = "regclient";
rev = tag;
sha256 = "sha256-GT8SJg24uneEbV8WY8Wl2w3lxqLJ7pFCa+654ksBfG4=";
sha256 = "sha256-0TeqZeW2HTjHyHyO8EhmOUCaLTq/XpWTPQMKh58VH8M=";
};
vendorHash = "sha256-cxydurN45ovb4XngG4L/K6L+QMfsaRBZhfLYzKohFNY=";
vendorHash = "sha256-cKpsgT/YOyNEV8OQdclZnDmGKCrUjNeZCOd0zQ/bvL8=";
outputs = [ "out" ] ++ bins;
@ -52,6 +52,11 @@ buildGoModule rec {
'')
bins;
checkFlags = [
# touches network
"-skip=^ExampleNew$"
];
passthru.tests = lib.mergeAttrsList (
map
(bin: {

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-careful";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "RalfJung";
repo = "cargo-careful";
rev = "v${version}";
hash = "sha256-oiwR6NgHHu9B1L6dSK6KZfgcSdwBPEzUZONwPHr0a4k=";
hash = "sha256-Yye1Dz6XTh7bWz63zENQ0QDbYbulO6SnRV7g/6mMgUw=";
};
cargoHash = "sha256-sVIAY9eYlpyS/PU6kLInc4hMeD3qcewoMbTH+wTIBuI=";
cargoHash = "sha256-syj3Hf+DxPoJgNbZQERHaKAZwMYuCCmuEGb8ylQt1Xo=";
meta = with lib; {
description = "A tool to execute Rust code carefully, with extra checking along the way";

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.45";
version = "1.0.46";
src = fetchCrate {
inherit pname version;
hash = "sha256-d0v34CUm3r9QScxrc5aKSLpNLPTK+OHAZ7JdS9A4lAw=";
hash = "sha256-wQo9HDVb7m+FdrMnNVAESEK3k3wrsZYvVpIMu2YNhS8=";
};
cargoHash = "sha256-QNVySY5IEGXdRBwJDG2eLZ+u28X/qYcdCkFiBCpgNhE=";
cargoHash = "sha256-tj9bbT7UlsVbEibtomB7rFK/V6Jdo5K0uoeuXw1yq+o=";
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
DiskArbitration

View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, fetchurl
, runCommand
, fetchCrate
, rustPlatform

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }:
{ stdenv, lib, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }:
symlinkJoin rec {
name = "deliantra-data-${version}";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, which
{ lib, stdenv, fetchFromGitHub, which
, boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf
, glew, zlib, icu, pkg-config, cairo, libvpx, glm
}:

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook3 }:
{ stdenv, lib, fetchFromGitHub, pkg-config, allegro5, libGL, wrapGAppsHook3 }:
stdenv.mkDerivation rec {
pname = "liberation-circuit";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
{ lib, stdenv, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }:
stdenv.mkDerivation rec {

View File

@ -1,4 +1,4 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, fetchurl, SDL2, makeWrapper, makeDesktopItem}:
{ stdenv, lib, rustPlatform, fetchFromGitHub, SDL2, makeWrapper, makeDesktopItem}:
let
desktopFile = makeDesktopItem {

View File

@ -1,5 +1,5 @@
{ lib, appleDerivation, xcbuildHook, Libc, stdenv, macosPackages_11_0_1, xnu
, fetchurl, libutil }:
, libutil }:
let
xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl
{ lib, stdenv, fetchFromGitHub
, callPackage
, fetchpatch
, cmake, pkg-config, dbus, makeWrapper

View File

@ -6,14 +6,14 @@ let
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.6.30";
hash = "sha256-fQATjYekxV/+24mqyel3bYfgUMN4NhOHR9yyL6L5bl0=";
version = "6.6.31";
hash = "sha256-Hs2DjNG7mj4qb1P0u7XAgrNizx8oqs1ot563IvRKnhU=";
variant = "lts";
};
mainVariant = {
version = "6.8.9";
hash = "sha256-OUlT/fiwLGTPnr/7gneyZBio/l8KAWopcJqTpSjBMl0=";
version = "6.8.10";
hash = "sha256-lGzZThINyeZrMBDaGVujXB+DzIdfFBo7Z/Bhyj21I2g=";
variant = "main";
};
@ -45,9 +45,6 @@ let
HZ = freeform "250";
HZ_250 = yes;
HZ_1000 = no;
# Disable writeback throttling by default
BLK_WBT_MQ = lib.mkOverride 60 no;
};
extraMeta = {

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, kernel, bash, lenovo-legion }:
{ lib, stdenv, kernel, bash, lenovo-legion }:
stdenv.mkDerivation {
pname = "lenovo-legion-module";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv }:
stdenv.mkDerivation rec {
pname = "numworks-udev-rules";

View File

@ -22,32 +22,21 @@
let
# Temporarily avoid applying the patches on systems where already we have binaries
# (in particular x86_64-linux and aarch64-linux) as the package is a huge rebuild there.
avoidRebuild = stdenv.isLinux && stdenv.is64bit;
avoidRebuild = with stdenv.hostPlatform; isLinux && is64bit && !isStatic;
in
stdenv.mkDerivation rec {
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
version = "2.40.1";
version = if avoidRebuild then "2.40.1" else "2.39.4";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
hash = "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8=";
hash = if avoidRebuild
then "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8="
else "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4=";
};
patches = [
./rtcwake-search-PATH-for-shutdown.patch
] ++ lib.optionals (!avoidRebuild) [
# Backports of patches that hopefully fix an intermittent parallel
# build failure.
(fetchpatch {
name = "pam_lastlog2:-drop-duplicate-assignment-pam_lastlog2_la_LDFLAGS.patch";
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=290748729dc3edf9ea1c680c8954441a5e367a44";
hash = "sha256-Hi+SrT8UovZyCWf6Jc7s3dc6YLyfOfgqohOEnc7aJq4=";
})
(fetchpatch {
name = "libuuid:-drop-duplicate-assignment-liuuid_la_LDFLAGS";
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=597e8b246ae31366514ead6cca240a09fe5e1528";
hash = "sha256-QCx3MD/57x2tV1SlJ79EYyxafhaEH4UC+Dt24DA6P8I=";
})
];
# We separate some of the utilities into their own outputs. This
@ -98,7 +87,6 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config installShellFiles ]
++ lib.optionals (!avoidRebuild) [ autoreconfHook gtk-doc ]
++ lib.optionals translateManpages [ po4a ];
buildInputs = [ zlib libxcrypt sqlite ]

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }:
{ stdenv, lib, fetchFromGitHub, kernel, fetchpatch }:
stdenv.mkDerivation (finalAttrs: {
pname = "xone";

View File

@ -1,5 +1,4 @@
{ fetchurl
, formats
{ formats
, glibcLocales
, jdk
, lib

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }:
{ lib, stdenv, fetchFromGitHub, apacheHttpd }:
stdenv.mkDerivation rec {
pname = "mod_fastcgi";

View File

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchurl
, nixosTests
, stdenv
, dotnetCorePackages

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, runCommand }:
let
version = "1.3.8";

View File

@ -1,7 +1,6 @@
{ mkDerivation
, makeDesktopItem
, python3
, fetchurl
, lib
, pulseaudio
}:

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