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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-21 12:05:57 +00:00
committed by GitHub
parent 6566172f70 d533f739c4
commit 534769b8ac
88 changed files with 1021 additions and 17615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/eval.yml
+3 -1
View File
@@ -85,9 +85,11 @@ jobs:
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- name: Evaluate the ${{ matrix.system }} output paths for all derivation attributes
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
nix-build nixpkgs/ci -A eval.singleSystem \
--argstr evalSystem ${{ matrix.system }} \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg attrpathFile ./paths/paths.json \
--arg chunkSize 10000
# If it uses too much memory, slightly decrease chunkSize
maintainers/maintainer-list.nix
-6
View File
@@ -12872,12 +12872,6 @@
githubId = 37505890;
name = "Luis Wirth";
};
luc65r = {
email = "lucas@ransan.fr";
github = "luc65r";
githubId = 59375051;
name = "Lucas Ransan";
};
LucaGuerra = {
email = "luca@guerra.sh";
github = "LucaGuerra";
nixos/doc/manual/release-notes/rl-2505.section.md
+2
View File
@@ -14,6 +14,8 @@
- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](option.html#opt-services.kimai).
- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
nixos/modules/module-list.nix
+1
View File
@@ -880,6 +880,7 @@
./services/misc/zookeeper.nix
./services/monitoring/alerta.nix
./services/monitoring/alloy.nix
./services/monitoring/amazon-cloudwatch-agent.nix
./services/monitoring/apcupsd.nix
./services/monitoring/arbtt.nix
./services/monitoring/below.nix
nixos/modules/services/monitoring/amazon-cloudwatch-agent.nix
+179
View File
@@ -0,0 +1,179 @@
{
lib,
pkgs,
config,
...
}:
let
cfg = config.services.amazon-cloudwatch-agent;
tomlFormat = pkgs.formats.toml { };
jsonFormat = pkgs.formats.json { };
commonConfigurationFile = tomlFormat.generate "common-config.toml" cfg.commonConfiguration;
configurationFile = jsonFormat.generate "amazon-cloudwatch-agent.json" cfg.configuration;
# See https://docs.aws.amazon.com/prescriptive-guidance/latest/implementing-logging-monitoring-cloudwatch/create-store-cloudwatch-configurations.html#store-cloudwatch-configuration-s3.
#
# We don't use the multiple JSON configuration files feature,
# but "config-translator" will log a benign error if the "-input-dir" option is omitted or is a non-existent directory.
#
# Create an empty directory to hide this benign error log. This prevents false-positives if users filter for "error" in the agent logs.
configurationDirectory = pkgs.runCommand "amazon-cloudwatch-agent.d" { } "mkdir $out";
in
{
options.services.amazon-cloudwatch-agent = {
enable = lib.mkEnableOption "Amazon CloudWatch Agent";
package = lib.mkPackageOption pkgs "amazon-cloudwatch-agent" { };
commonConfiguration = lib.mkOption {
type = tomlFormat.type;
default = { };
description = ''
Amazon CloudWatch Agent common configuration. See
<https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/install-CloudWatch-Agent-commandline-fleet.html#CloudWatch-Agent-profile-instance-first>
for supported values.
'';
example = {
credentials = {
shared_credential_profile = "profile_name";
shared_credential_file = "/path/to/credentials";
};
proxy = {
http_proxy = "http_url";
https_proxy = "https_url";
no_proxy = "domain";
};
};
};
configuration = lib.mkOption {
type = jsonFormat.type;
default = { };
description = ''
Amazon CloudWatch Agent configuration. See
<https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Agent-Configuration-File-Details.html>
for supported values.
'';
# Subset of "CloudWatch agent configuration file: Complete examples" and "CloudWatch agent configuration file: Traces section" in the description link.
#
# Log file path changed from "/opt/aws/amazon-cloudwatch-agent/logs" to "/var/log/amazon-cloudwatch-agent" to follow the FHS.
example = {
agent = {
metrics_collection_interval = 10;
logfile = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";
};
metrics = {
namespace = "MyCustomNamespace";
metrics_collected = {
cpu = {
resource = [ "*" ];
measurement = [
{
name = "cpu_usage_idle";
rename = "CPU_USAGE_IDLE";
unit = "Percent";
}
{
name = "cpu_usage_nice";
unit = "Percent";
}
"cpu_usage_guest"
];
totalcpu = false;
metrics_collection_interval = 10;
append_dimensions = {
customized_dimension_key_1 = "customized_dimension_value_1";
customized_dimension_key_2 = "customized_dimension_value_2";
};
};
};
};
logs = {
logs_collected = {
files = {
collect_list = [
{
file_path = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";
log_group_name = "amazon-cloudwatch-agent.log";
log_stream_name = "{instance_id}";
timezone = "UTC";
}
];
};
};
log_stream_name = "log_stream_name";
force_flush_interval = 15;
};
traces = {
traces_collected = {
xray = { };
oltp = { };
};
};
};
};
mode = lib.mkOption {
type = lib.types.str;
default = "auto";
description = ''
Amazon CloudWatch Agent mode. Indicates whether the agent is running in EC2 ("ec2"), on-premises ("onPremise"),
or if it should guess based on metadata endpoints like IMDS or the ECS task metadata endpoint ("auto").
'';
example = "onPremise";
};
};
config = lib.mkIf cfg.enable {
# See https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300048.1/packaging/dependencies/amazon-cloudwatch-agent.service.
systemd.services.amazon-cloudwatch-agent = {
description = "Amazon CloudWatch Agent";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "simple";
# "start-amazon-cloudwatch-agent" assumes the package is installed at "/opt/aws/amazon-cloudwatch-agent" so we can't use it.
#
# See https://github.com/aws/amazon-cloudwatch-agent/issues/1319.
#
# This program:
# 1. Switches to a non-root user if configured.
# 2. Runs "config-translator" to translate the input JSON configuration files into separate TOML (for CloudWatch Logs + Metrics),
# YAML (for X-Ray + OpenTelemetry), and JSON (for environment variables) configuration files.
# 3. Runs "amazon-cloudwatch-agent" with the paths to these generated files.
#
# Re-implementing with systemd options.
User = lib.attrByPath [
"agent"
"run_as_user"
] "root" cfg.configuration;
RuntimeDirectory = "amazon-cloudwatch-agent";
LogsDirectory = "amazon-cloudwatch-agent";
ExecStartPre = ''
${cfg.package}/bin/config-translator \
-config ${commonConfigurationFile} \
-input ${configurationFile} \
-input-dir ${configurationDirectory} \
-mode ${cfg.mode} \
-output ''${RUNTIME_DIRECTORY}/amazon-cloudwatch-agent.toml
'';
ExecStart = ''
${cfg.package}/bin/amazon-cloudwatch-agent \
-config ''${RUNTIME_DIRECTORY}/amazon-cloudwatch-agent.toml \
-envconfig ''${RUNTIME_DIRECTORY}/env-config.json \
-otelconfig ''${RUNTIME_DIRECTORY}/amazon-cloudwatch-agent.yaml \
-pidfile ''${RUNTIME_DIRECTORY}/amazon-cloudwatch-agent.pid
'';
KillMode = "process";
Restart = "on-failure";
RestartSec = 60;
};
restartTriggers = [
cfg.package
commonConfigurationFile
configurationFile
configurationDirectory
cfg.mode
];
};
};
meta.maintainers = pkgs.amazon-cloudwatch-agent.meta.maintainers;
}
nixos/modules/services/network-filesystems/kubo.nix
+1 -1
View File
@@ -339,7 +339,7 @@ in
# After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open.
rm -vf "$IPFS_PATH/api"
'' + lib.optionalString cfg.autoMigrate ''
${pkgs.kubo-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y
'${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y
'' + ''
fi
ipfs --offline config show |
nixos/modules/services/networking/libreswan.nix
+3 -1
View File
@@ -125,7 +125,9 @@ in
# Install configuration files
environment.etc = {
"ipsec.secrets".source = "${pkgs.libreswan}/etc/ipsec.secrets";
"ipsec.secrets".text = ''
include ${pkgs.libreswan}/etc/ipsec.secrets
'';
"ipsec.conf".source = "${pkgs.libreswan}/etc/ipsec.conf";
"ipsec.d/01-nixos.conf".source = configFile;
} // policyFiles;
nixos/tests/all-tests.nix
+1
View File
@@ -119,6 +119,7 @@ in {
alloy = handleTest ./alloy.nix {};
allTerminfo = handleTest ./all-terminfo.nix {};
alps = handleTest ./alps.nix {};
amazon-cloudwatch-agent = handleTest ./amazon-cloudwatch-agent.nix {};
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
amazon-ssm-agent = handleTest ./amazon-ssm-agent.nix {};
amd-sev = runTest ./amd-sev.nix;
nixos/tests/amazon-cloudwatch-agent.nix
+93
View File
@@ -0,0 +1,93 @@
import ./make-test-python.nix (
{ lib, pkgs, ... }:
let
# See https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html.
iniFormat = pkgs.formats.ini { };
region = "ap-northeast-1";
sharedConfigurationDefaultProfile = "default";
sharedConfigurationFile = iniFormat.generate "config" {
"${sharedConfigurationDefaultProfile}" = {
region = region;
};
};
sharedCredentialsFile = iniFormat.generate "credentials" {
"${sharedConfigurationDefaultProfile}" = {
aws_access_key_id = "placeholder";
aws_secret_access_key = "placeholder";
aws_session_token = "placeholder";
};
};
sharedConfigurationDirectory = pkgs.runCommand ".aws" { } ''
mkdir $out
cp ${sharedConfigurationFile} $out/config
cp ${sharedCredentialsFile} $out/credentials
'';
in
{
name = "amazon-cloudwatch-agent";
meta.maintainers = pkgs.amazon-cloudwatch-agent.meta.maintainers;
nodes.machine =
{ config, pkgs, ... }:
{
services.amazon-cloudwatch-agent = {
enable = true;
commonConfiguration = {
credentials = {
shared_credential_profile = sharedConfigurationDefaultProfile;
shared_credential_file = "${sharedConfigurationDirectory}/credentials";
};
};
configuration = {
agent = {
# Required despite documentation saying the agent ignores it in "onPremise" mode.
region = region;
# Show debug logs and write to a file for interactive debugging.
debug = true;
logfile = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";
};
logs = {
logs_collected = {
files = {
collect_list = [
{
file_path = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";
log_group_name = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";
log_stream_name = "{local_hostname}";
}
];
};
};
};
traces = {
local_mode = true;
traces_collected = {
xray = { };
};
};
};
mode = "onPremise";
};
# Keep the runtime directory for interactive debugging.
systemd.services.amazon-cloudwatch-agent.serviceConfig.RuntimeDirectoryPreserve = true;
};
testScript = ''
start_all()
machine.wait_for_unit("amazon-cloudwatch-agent.service")
machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.pid")
machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.toml")
# "config-translator" omits this file if no trace configurations are specified.
#
# See https://github.com/aws/amazon-cloudwatch-agent/issues/1320.
machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.yaml")
machine.wait_for_file("/run/amazon-cloudwatch-agent/env-config.json")
'';
}
)
pkgs/applications/display-managers/greetd/default.nix
+1 -1
View File
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://sr.ht/~kennylevinsen/greetd/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/display-managers/greetd/gtkgreet.nix
+1 -1
View File
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
description = "GTK based greeter for greetd, to be run under cage or similar";
homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
mainProgram = "gtkgreet";
};
pkgs/applications/display-managers/greetd/tuigreet.nix
+1 -1
View File
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/apognu/tuigreet";
changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ luc65r ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
mainProgram = "tuigreet";
};
pkgs/applications/display-managers/greetd/wlgreet.nix
+1 -1
View File
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
mainProgram = "wlgreet";
homepage = "https://git.sr.ht/~kennylevinsen/wlgreet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/networking/browsers/chromium/info.json
+9 -9
View File
@@ -766,7 +766,7 @@
}
},
"ungoogled-chromium": {
"version": "131.0.6778.69",
"version": "131.0.6778.85",
"deps": {
"depot_tools": {
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
@@ -777,16 +777,16 @@
"hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk="
},
"ungoogled-patches": {
"rev": "131.0.6778.69-1",
"hash": "sha256-1XKlIO8aH3eHNiF4fPJGymo1MGUgHlqD98vWjHGMWHY="
"rev": "131.0.6778.85-1",
"hash": "sha256-mcSshjdfUEH4ur4z+0P0oWCjlV8EhFMc+7rdfIIPASI="
},
"npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "131.0.6778.69",
"hash": "sha256-GbhiqLRC5Kilo84XwYHnosNUgtZNCwmuzSOkP6if/8s=",
"rev": "131.0.6778.85",
"hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -886,8 +886,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "cdc5b4dc1ee1482378b545b6c1efa1a234195ab5",
"hash": "sha256-HtLdotDYA0fsUyFkk/nhJ+GPC+GkbwfmyPbJLKAyKdE="
"rev": "7e742cac42c29a14ab7f54b134b2f17592711267",
"hash": "sha256-K2gwKNwonzCIu4hnlYuOaYyKaRV11hwDzF4oykiKsl0="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1526,8 +1526,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "7075674f24f09d3b30913710a31e8793c131000a",
"hash": "sha256-N6FB/ocU1KIAGoYTnAl42qjrjatuD5fooRu93akPUjM="
"rev": "bd2671b973062afc614b852ec190524b80aaef8a",
"hash": "sha256-uq0CE7Chqzy2d+iifC3hV9RTnDVinpwjl1pOzyNGbSo="
}
}
}
pkgs/applications/networking/browsers/chromium/update.mjs
+23 -13
View File
@@ -38,7 +38,7 @@ for (const attr_path of Object.keys(lockfile)) {
}
const ungoogled = attr_path === 'ungoogled-chromium'
const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps["ungoogled-patches"].rev
const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps['ungoogled-patches'].rev
const version_upstream = !ungoogled ? await get_latest_chromium_release() : await get_latest_ungoogled_release()
console.log(`[${attr_path}] ${chalk.red(version_nixpkgs)} (nixpkgs)`)
@@ -56,7 +56,7 @@ for (const attr_path of Object.keys(lockfile)) {
deps: {
depot_tools: {},
gn: {},
"ungoogled-patches": ungoogled ? await fetch_ungoogled(version_upstream) : undefined,
'ungoogled-patches': ungoogled ? await fetch_ungoogled(version_upstream) : undefined,
npmHash: dummy_hash,
},
DEPS: {},
@@ -84,18 +84,28 @@ for (const attr_path of Object.keys(lockfile)) {
value.recompress = true
}
const cache = lockfile_initial[attr_path].DEPS[path]
const cache_hit =
cache !== undefined &&
value.url === cache.url &&
value.rev === cache.rev &&
value.recompress === cache.recompress &&
cache.hash !== undefined &&
cache.hash !== '' &&
cache.hash !== dummy_hash
const cache_hit = (() => {
for (const attr_path in lockfile_initial) {
const cache = lockfile_initial[attr_path].DEPS[path]
const hits_cache =
cache !== undefined &&
value.url === cache.url &&
value.rev === cache.rev &&
value.recompress === cache.recompress &&
cache.hash !== undefined &&
cache.hash !== '' &&
cache.hash !== dummy_hash
if (hits_cache) {
cache.attr_path = attr_path
return cache;
}
}
})();
if (cache_hit) {
console.log(`[${chalk.green(path)}] Reusing hash from previous info.json for ${cache.url}@${cache.rev}`)
value.hash = cache.hash
console.log(`[${chalk.green(path)}] Reusing hash from previous info.json for ${cache_hit.url}@${cache_hit.rev} from ${cache_hit.attr_path}`)
value.hash = cache_hit.hash
continue
}
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -489,13 +489,13 @@
"vendorHash": null
},
"gitlab": {
"hash": "sha256-fzt7yPU9gaI0V08KNzyLZjZEARkDgk9ID3nNJWU5tJ4=",
"hash": "sha256-3kAfGyHaQtTkRq3DyiN+W0uyASnxf6C50BmcBmYpjr8=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v17.4.0",
"rev": "v17.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-lwqlWLk0sOtfsh3wf6zjCBH4mIj5ZVIU8D7rae3mNhA="
"vendorHash": "sha256-P718i0CkboK15CRJ7GNmS7oMYQ8oy+mKOoYrBt3sSZg="
},
"google": {
"hash": "sha256-u6p937GYGWFZZD0s1BnnESny7fHMHZ+Fctp67ElUYUU=",
pkgs/applications/networking/kubo-migrator/all-migrations.nix
-82
View File
@@ -1,82 +0,0 @@
{ lib
, stdenv
, symlinkJoin
, buildGoModule
, kubo-migrator-unwrapped
}:
# This package contains all the individual migrations in the bin directory.
# This is used by fs-repo-migrations and could also be used by Kubo itself
# when starting it like this: ipfs daemon --migrate
let
fs-repo-common = pname: version: buildGoModule {
inherit pname version;
inherit (kubo-migrator-unwrapped) src;
sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}";
vendorHash = null;
# Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match
# See https://github.com/ipfs/fs-repo-migrations/pull/163
postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) ''
substituteInPlace 'vendor/github.com/marten-seemann/qtls-go1-15/common.go' \
--replace \
'"container/list"' \
'"container/list"
"context"' \
--replace \
'config *Config' \
'config *Config
ctx context.Context'
'';
doCheck = false;
meta = kubo-migrator-unwrapped.meta // {
mainProgram = pname;
description = "Individual migration for the filesystem repository of Kubo clients";
};
};
# Concatenation of the latest repo version and the version of that migration
version = "15.1.0.1";
fs-repo-14-to-15 = fs-repo-common "fs-repo-14-to-15" "1.0.1";
fs-repo-13-to-14 = fs-repo-common "fs-repo-13-to-14" "1.0.0";
fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0";
fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2";
fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1";
fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1";
fs-repo-8-to-9 = fs-repo-common "fs-repo-8-to-9" "1.0.1";
fs-repo-7-to-8 = fs-repo-common "fs-repo-7-to-8" "1.0.1";
fs-repo-6-to-7 = fs-repo-common "fs-repo-6-to-7" "1.0.1";
fs-repo-5-to-6 = fs-repo-common "fs-repo-5-to-6" "1.0.1";
fs-repo-4-to-5 = fs-repo-common "fs-repo-4-to-5" "1.0.1";
fs-repo-3-to-4 = fs-repo-common "fs-repo-3-to-4" "1.0.1";
fs-repo-2-to-3 = fs-repo-common "fs-repo-2-to-3" "1.0.1";
fs-repo-1-to-2 = fs-repo-common "fs-repo-1-to-2" "1.0.1";
fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1";
all-migrations = [
fs-repo-14-to-15
fs-repo-13-to-14
fs-repo-12-to-13
fs-repo-11-to-12
fs-repo-10-to-11
fs-repo-9-to-10
fs-repo-8-to-9
fs-repo-7-to-8
] ++ lib.optional (!stdenv.hostPlatform.isDarwin) # I didn't manage to fix this on macOS:
fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2
++ [
fs-repo-5-to-6
fs-repo-4-to-5
fs-repo-3-to-4
fs-repo-2-to-3
fs-repo-1-to-2
fs-repo-0-to-1
];
in
symlinkJoin {
name = "kubo-migrator-all-fs-repo-migrations-${version}";
paths = all-migrations;
}
pkgs/applications/networking/kubo-migrator/default.nix
-23
View File
@@ -1,23 +0,0 @@
{ lib
, buildEnv
, makeWrapper
, kubo-migrator-unwrapped
, kubo-migrator-all-fs-repo-migrations
}:
buildEnv {
name = "kubo-migrator-${kubo-migrator-unwrapped.version}";
nativeBuildInputs = [ makeWrapper ];
paths = [ kubo-migrator-unwrapped ];
pathsToLink = [ "/bin" ];
postBuild = ''
wrapProgram "$out/bin/fs-repo-migrations" \
--prefix PATH ':' '${lib.makeBinPath [ kubo-migrator-all-fs-repo-migrations ]}'
'';
inherit (kubo-migrator-unwrapped) meta;
}
pkgs/applications/networking/kubo-migrator/unwrapped.nix
-35
View File
@@ -1,35 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "kubo-migrator";
version = "2.0.2";
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
# Use the latest git tag here, since v2.0.2 does not
# contain the latest migration fs-repo-14-to-15/v1.0.1
# The fs-repo-migrations code itself is the same between
# the two versions but the migration code, which is built
# into separate binaries, is not.
rev = "fs-repo-14-to-15/v1.0.1";
hash = "sha256-oIGDZr0cv+TIl5glHr3U+eIqAlPAOWyFzgfQGGM+xNM=";
};
sourceRoot = "${src.name}/fs-repo-migrations";
vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk=";
doCheck = false;
meta = with lib; {
description = "Migrations for the filesystem repository of Kubo clients";
homepage = "https://github.com/ipfs/fs-repo-migrations";
license = licenses.mit;
maintainers = with maintainers; [ Luflosi elitak ];
mainProgram = "fs-repo-migrations";
};
}
pkgs/applications/science/math/cemu-ti/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "CEmu";
homepage = "https://ce-programming.github.io/CEmu";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ clevor ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.hostPlatform.isDarwin;
};
pkgs/applications/video/tartube/default.nix
+1 -1
View File
@@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec {
description = "GUI front-end for youtube-dl";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ mkg20001 luc65r ];
maintainers = with maintainers; [ mkg20001 ];
homepage = "https://tartube.sourceforge.io/";
mainProgram = "tartube";
};
pkgs/by-name/al/aleo-fonts/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "aleo-fonts";
version = "2.0.0-unstable-2023-06-03";
src = fetchFromGitHub {
owner = "AlessioLaiso";
repo = "aleo";
rev = "ce875e48d9983031648e87f38b7a269f4fbf5eb5";
hash = "sha256-HSxP5/sLHQTujBVt1u93625EXEc42lxpt8W1//6ngWM=";
};
installPhase = ''
runHook preInstall
install -Dm644 fonts/variable/*.ttf -t $out/share/fonts/truetype
runHook postInstall
'';
meta = {
description = "Slab serif typeface designed by Alessio Laiso";
homepage = "https://github.com/AlessioLaiso/aleo";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ donovanglover ];
platforms = lib.platforms.all;
};
}
pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
+63
View File
@@ -0,0 +1,63 @@
{
lib,
amazon-cloudwatch-agent,
buildGoModule,
fetchFromGitHub,
nix-update-script,
nixosTests,
stdenv,
versionCheckHook,
}:
buildGoModule rec {
pname = "amazon-cloudwatch-agent";
version = "1.300049.1";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-cloudwatch-agent";
rev = "refs/tags/v${version}";
hash = "sha256-/VzLSHlBT40h7iErBisfSp7cTAm3L4vmZP03UiDmBaE=";
};
vendorHash = "sha256-zsASHuTXL3brRlgLPNb4wFPHkYpUWbOdRDCXQUwZjIY=";
# See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300048.1/Makefile#L68-L77.
subPackages = [
"cmd/config-downloader"
"cmd/config-translator"
"cmd/amazon-cloudwatch-agent"
# Broken since it hardcodes the package install path. See https://github.com/aws/amazon-cloudwatch-agent/issues/1319.
# "cmd/start-amazon-cloudwatch-agent"
"cmd/amazon-cloudwatch-agent-config-wizard"
];
# See https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300048.1/Makefile#L57-L64.
#
# Needed for "amazon-cloudwatch-agent -version" to not show "Unknown".
postInstall = ''
echo v${version} > $out/bin/CWAGENT_VERSION
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "-version";
passthru = {
tests = lib.optionalAttrs stdenv.isLinux {
inherit (nixosTests) amazon-cloudwatch-agent;
};
updateScript = nix-update-script { };
};
meta = {
description = "CloudWatch Agent enables you to collect and export host-level metrics and logs on instances running Linux or Windows server";
homepage = "https://github.com/aws/amazon-cloudwatch-agent";
license = lib.licenses.mit;
mainProgram = "amazon-cloudwatch-agent";
maintainers = with lib.maintainers; [ pmw ];
};
}
pkgs/by-name/au/autofs5/package.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto, pkgconf
, fetchpatch
, fetchpatch, libnsl
}:
stdenv.mkDerivation rec {
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd
openssl cyrus_sasl rpcsvc-proto ];
openssl cyrus_sasl rpcsvc-proto libnsl ];
nativeBuildInputs = [ flex bison pkgconf ];
nativeBuildInputs = [ flex bison pkgconf libnsl.dev ];
meta = {
description = "Kernel-based automounter";
pkgs/by-name/az/azure-cli/extensions-generated.json
+24 -31
View File
@@ -50,9 +50,9 @@
},
"aks-preview": {
"pname": "aks-preview",
"version": "13.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-V9Ll880ec95QKoV6E5P6TQAVpsrJVaKZFkZ749+5Uss=",
"version": "13.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-lVOEs9+Vbg7vYt5jhV8agVFvfbqpxdqF58b06Zv9erY=",
"description": "Provides a preview for upcoming AKS features"
},
"akshybrid": {
@@ -78,9 +78,9 @@
},
"amg": {
"pname": "amg",
"version": "2.5.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.2-py3-none-any.whl",
"hash": "sha256-T/8/ziRGiD+1MDdpUzBiHz+q4Q7/i2AG+x/6M64SxU4=",
"version": "2.5.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.3-py3-none-any.whl",
"hash": "sha256-xrJS464daKWiw7QeXzzicm9WWl7+0GVi7N1GV203IMk=",
"description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
},
"amlfs": {
@@ -141,9 +141,9 @@
},
"azure-firewall": {
"pname": "azure-firewall",
"version": "1.2.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.1-py2.py3-none-any.whl",
"hash": "sha256-xvttNUPeleAxiLuGuqCNI6eI+xIxpW7aJ92yVYsl13c=",
"version": "1.2.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.2-py2.py3-none-any.whl",
"hash": "sha256-EmH9F4kTG4K7QDwb44Wq0FMUD3Wo1pcWS0KwMXzdnVU=",
"description": "Manage Azure Firewall resources"
},
"azurelargeinstance": {
@@ -218,9 +218,9 @@
},
"connectedmachine": {
"pname": "connectedmachine",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0-py3-none-any.whl",
"hash": "sha256-FJ7q1J0MBG93jqTZnXhEjzgVe4bqWR0e6lRfiJZZZRE=",
"version": "1.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.1.0-py3-none-any.whl",
"hash": "sha256-m3EBWmsEd3De7Yg91AkoV2QcaldPIQfuVYsFNf8pRtg=",
"description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension"
},
"connectedvmware": {
@@ -314,13 +314,6 @@
"hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=",
"description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension"
},
"deidservice": {
"pname": "deidservice",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/deidservice-1.0.0b1-py3-none-any.whl",
"hash": "sha256-FJw581LzrLlcttM70PuWJwMs8BoaoyCsud1xJ0RZfNA=",
"description": "Microsoft Azure Command-Line Tools Deidservice Extension"
},
"deploy-to-azure": {
"pname": "deploy-to-azure",
"version": "0.2.0",
@@ -344,9 +337,9 @@
},
"devcenter": {
"pname": "devcenter",
"version": "6.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.0.1-py3-none-any.whl",
"hash": "sha256-JePc3Jy4MkPOsu1qbe3CJ5U8BsthC6lchN3sD3UDIk8=",
"version": "6.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.1.0-py3-none-any.whl",
"hash": "sha256-OaWjjAv4bu2KsUYXcQrxrlEiiUrnqa2rfHXg7ZxbyB4=",
"description": "Microsoft Azure Command-Line Tools DevCenter Extension"
},
"diskpool": {
@@ -372,9 +365,9 @@
},
"dns-resolver": {
"pname": "dns-resolver",
"version": "0.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-0.2.0-py3-none-any.whl",
"hash": "sha256-HEu4IW5QnC8I+nXEWTDsN3doMm8wy5qxJYQqqTUsbi4=",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-1.0.0-py3-none-any.whl",
"hash": "sha256-DdTqcuNTVT8gVFyv8lePy3YqniY3pFamM1ERCOLsAOM=",
"description": "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension"
},
"durabletask": {
@@ -526,9 +519,9 @@
},
"healthcareapis": {
"pname": "healthcareapis",
"version": "0.4.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-0.4.0-py3-none-any.whl",
"hash": "sha256-ol19V9T9OtzDdYHQrMHWxqRtzQNRkz7TfPup0avWCXg=",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-1.0.0-py3-none-any.whl",
"hash": "sha256-RSFMiiNWGMw4PjI+PKQ7UxGn00Jb5CUxRyKK/fRLruc=",
"description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension"
},
"hpc-cache": {
@@ -673,9 +666,9 @@
},
"mdp": {
"pname": "mdp",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0-py3-none-any.whl",
"hash": "sha256-wKSuGBcQO1SPHZHX4chVKEFdoBaoPUgxVIWXI7+3jYE=",
"version": "1.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.1-py3-none-any.whl",
"hash": "sha256-kjVGMrc9yxtPrAwhr/EdcLxON2mp7UQK5MwMFm8v2ac=",
"description": "Microsoft Azure Command-Line Tools Mdp Extension"
},
"microsoft-fabric": {
pkgs/by-name/az/azure-cli/extensions-manual.nix
+1
View File
@@ -150,4 +150,5 @@
blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370
compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240
connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194
deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224
}
pkgs/by-name/az/azure-cli/package.nix
+3 -2
View File
@@ -26,14 +26,14 @@
}:
let
version = "2.66.0";
version = "2.67.0";
src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
hash = "sha256-iWDKvtEvH6ZwK+5Zp9P2fgXP+4f4kXH+xXfBkYmsPl0=";
hash = "sha256-UrWReU9x7n2GqFt+OO9SLo0uAuwQBXUr4rYtTZfHlfY=";
};
# put packages that needs to be overridden in the py package scope
@@ -148,6 +148,7 @@ py.pkgs.toPythonApplication (
azure-mgmt-containerservice
azure-mgmt-cosmosdb
azure-mgmt-databoxedge
azure-mgmt-datalake-store
azure-mgmt-datamigration
azure-mgmt-devtestlabs
azure-mgmt-dns
pkgs/by-name/az/azure-cli/python-packages.nix
+28 -3
View File
@@ -137,6 +137,26 @@ let
overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
"sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
# ImportError: cannot import name 'ConfigMap' from 'azure.mgmt.containerinstance.models'
azure-mgmt-containerinstance = super.azure-mgmt-containerinstance.overridePythonAttrs (attrs: rec {
version = "10.2.0b1";
src = fetchPypi {
pname = "azure_mgmt_containerinstance"; # Different from src.pname in the original package.
inherit version;
hash = "sha256-v0u3e9ZoEnDdCnM6o6fD7N+suo5hbTqMO5jM6cSMx8A=";
};
});
# ModuleNotFoundError: No module named 'azure.mgmt.containerservice.v2024_09_01'
azure-mgmt-containerservice = super.azure-mgmt-containerservice.overridePythonAttrs (attrs: rec {
version = "33.0.0";
src = fetchPypi {
pname = "azure_mgmt_containerservice"; # Different from src.pname in the original package.
inherit version;
hash = "sha256-hoWD3NuKSQXeA6hKm3kD12octZrNnDc28CvHQ7UEfJ4=";
};
});
# ValueError: The operation 'azure.mgmt.devtestlabs.operations#VirtualMachinesOperations.delete' is invalid.
azure-mgmt-devtestlabs =
overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
@@ -180,9 +200,14 @@ let
"sha256-05PUV8ouAKq/xhGxVEWIzDop0a7WDTV5mGVSC4sv9P4=";
# ImportError: cannot import name 'AdvancedThreatProtectionName' from 'azure.mgmt.sql.models'
azure-mgmt-sql =
overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b17" "tar.gz"
"sha256-i9VNbYJ3TgzURbtYYrXw+ez4ubK7BH39/EIL5kqb9Xg=";
azure-mgmt-sql = super.azure-mgmt-sql.overridePythonAttrs (attrs: rec {
version = "4.0.0b20";
src = fetchPypi {
pname = "azure_mgmt_sql"; # Different from src.pname in the original package.
inherit version;
hash = "sha256-mphqHUet4AhmL8aUoRbrGOjbookCHR3Ex+unpOq7aQM=";
};
});
# ValueError: The operation 'azure.mgmt.sqlvirtualmachine.operations#SqlVirtualMachinesOperations.begin_create_or_update' is invalid.
azure-mgmt-sqlvirtualmachine =
pkgs/by-name/c3/c3c/package.nix
-1
View File
@@ -56,7 +56,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/c3lang/c3c";
license = licenses.lgpl3Only;
maintainers = with maintainers; [
luc65r
anas
];
platforms = platforms.all;
pkgs/by-name/co/convbin/package.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/mateoconlechuga/convbin";
license = licenses.bsd3;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ clevor ];
platforms = platforms.all;
mainProgram = "convbin";
};
pkgs/by-name/co/convfont/package.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Converts font for use with FontLibC";
homepage = "https://github.com/drdnar/convfont";
license = licenses.wtfpl;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ clevor ];
platforms = platforms.all;
mainProgram = "convfont";
};
pkgs/by-name/co/convimg/package.nix
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/mateoconlechuga/convimg";
license = licenses.bsd3;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ clevor ];
platforms = platforms.linux;
mainProgram = "convimg";
};
pkgs/by-name/di/dictu/package.nix
+1 -1
View File
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
mainProgram = "dictu";
homepage = "https://dictu-lang.com";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin
};
pkgs/by-name/fa/fasmg/package.nix
+1 -1
View File
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
mainProgram = "fasmg";
homepage = "https://flatassembler.net";
license = licenses.bsd3;
maintainers = with maintainers; [ orivej luc65r ];
maintainers = with maintainers; [ orivej clevor ];
platforms = with platforms; intersectLists (linux ++ darwin) x86;
};
}
pkgs/by-name/ga/game-music-emu/package.nix
+1 -1
View File
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "Collection of video game music file emulators";
license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
};
}
pkgs/by-name/gi/git-smash/package.nix
+51
View File
@@ -0,0 +1,51 @@
{
lib,
fetchFromGitHub,
rustPlatform,
installShellFiles,
makeWrapper,
fzf,
stdenv,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "git-smash";
version = "0.1.1";
src = fetchFromGitHub {
owner = "anthraxx";
repo = "git-smash";
rev = "refs/tags/v${version}";
hash = "sha256-NyNYEF5g0O9xNhq+CoDPhQXZ+ISiY4DsShpjk5nP0N8=";
};
cargoHash = "sha256-omITZMBWzYlHHim/IXNa1rtiwHqpgLJ5G9z15YvDRi0=";
nativeBuildInputs = [
installShellFiles
makeWrapper
];
postFixup = ''
wrapProgram "$out/bin/git-smash" --suffix PATH : "${lib.makeBinPath [ fzf ]}"
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd git-smash \
--bash <($out/bin/git-smash completions bash) \
--fish <($out/bin/git-smash completions fish) \
--zsh <($out/bin/git-smash completions zsh)
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Smash staged changes into previous commits to support your Git workflow, pull request and feature branch maintenance";
homepage = "https://github.com/anthraxx/git-smash";
changelog = "https://github.com/anthraxx/git-smash/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
mainProgram = "git-smash";
maintainers = with lib.maintainers; [ bcyran ];
};
}
pkgs/by-name/go/gollama/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gollama";
version = "1.27.17";
version = "1.27.19";
src = fetchFromGitHub {
owner = "sammcj";
repo = "gollama";
rev = "refs/tags/v${version}";
hash = "sha256-/KemOJwVHdb2BJnV53EVvbuE+0s3WOj4kzcox8hRZ6w=";
hash = "sha256-W+69Jt0mdwLIBHZ8zg3oK8d2DwwvYHtHj1oQUW3vt6M=";
};
vendorHash = "sha256-MbadjPW9Oq3lRVa+Qcq4GXaZnBL0n6qLh5I2hJ0XhaY=";
vendorHash = "sha256-SYu2ITSZIVtDczBfWJ5pFw4l0mkb3b7YvMzIrEcpOa8=";
doCheck = false;
pkgs/by-name/go/google-chrome/package.nix
+5 -5
View File
@@ -166,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "131.0.6778.69";
version = "131.0.6778.85";
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-7aE6RZE5kB3DaJFUDdc2Ter8SsZZM0JzYmKn1hF1BUs=";
hash = "sha256-Cn0fg6WI1kFdk8s0LCksMCMLSDkPImXBDNK+hNMlMpQ=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -266,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "131.0.6778.70";
version = "131.0.6778.86";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/acwi7l3xj4g6lag6mccophfiv2aa_131.0.6778.70/GoogleChrome-131.0.6778.70.dmg";
hash = "sha256-Gikqdh9g3FAnWBLrxMtbomKceIaMsz/GnguiEUpKJW0=";
url = "http://dl.google.com/release2/chrome/neljlxhync4hvd3scdidzwcaj4_131.0.6778.86/GoogleChrome-131.0.6778.86.dmg";
hash = "sha256-EIX74r86/J8dgz585O7dcx0pv/OlR3ZNLiUe6E/V2C8=";
};
dontPatch = true;
pkgs/by-name/ir/irust/package.nix
+3 -3
View File
@@ -21,16 +21,16 @@
rustPlatform.buildRustPackage rec {
pname = "irust";
version = "1.71.24";
version = "1.71.29";
src = fetchFromGitHub {
owner = "sigmaSd";
repo = "IRust";
rev = "irust@${version}";
hash = "sha256-L9iSTa0KlAXVYA1PgLaxB0eHoOGrzGE49Km3jBq4jWo=";
hash = "sha256-UKq9sFLhgx1eg0jKhb47NH/HaSdwegh1gES7naXXup0=";
};
cargoHash = "sha256-nF6tmA7IcgPG8EoFzwJa7zYKx9ezhpjIIa1tZLO0rvQ=";
cargoHash = "sha256-GW2IqWyFkohFTzCqxJoj/U9gi/IrSfG0bXQl7OFc+kI=";
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ke/keystone/package.nix
+1 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Lightweight multi-platform, multi-architecture assembler framework";
homepage = "https://www.keystone-engine.org";
license = licenses.gpl2Only;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
mainProgram = "kstool";
platforms = platforms.unix;
};
pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
+264
View File
@@ -0,0 +1,264 @@
{
lib,
stdenv,
symlinkJoin,
buildGoModule,
fetchFromGitHub,
kubo-migrator-unwrapped,
writeShellApplication,
minRepoVersion ? 0, # The minimum supported Kubo repo version from which the migrations can start. Increasing this reduces the closure size
stubBrokenMigrations ? true, # This prevents the fs-repo-migrations program from downloading binaries off the internet without even checking any signatures
}:
let
mkMigration =
from: to: version: hash:
let
pname = "fs-repo-${toString from}-to-${toString to}";
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
rev = "${pname}/v${version}";
inherit hash;
sparseCheckout = [ pname ];
};
in
buildGoModule {
inherit pname version src;
sourceRoot = "${src.name}/${pname}";
vendorHash = null;
# Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match
# See https://github.com/ipfs/fs-repo-migrations/pull/163
postPatch =
lib.optionalString
(lib.elem to [
11
12
])
''
substituteInPlace 'vendor/github.com/marten-seemann/qtls-go1-15/common.go' \
--replace-fail \
'"container/list"' \
'"container/list"
"context"' \
--replace-fail \
'config *Config' \
'config *Config
ctx context.Context'
'';
checkPhase = ''
runHook preCheck
${
if to <= 11 then
"" # Migrations fs-repo-10-to-11 and earlier require too much effort to test, making it not worth it
else if to == 12 then
''
cd migration
go test -mod=vendor
''
else if to <= 15 then
''
cd not-sharness
./test.sh
''
else
''
cd test-e2e
./test.sh
''
}
runHook postCheck
'';
# Check that it does not crash
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
"$out/bin/${pname}" -help
runHook postInstallCheck
'';
meta = {
inherit (kubo-migrator-unwrapped.meta)
homepage
license
platforms
maintainers
;
mainProgram = pname;
description = "Migrate the filesystem repository of Kubo from repo version ${toString from} to ${toString to}";
broken =
to == 7 && stdenv.hostPlatform.isDarwin # fs-repo-6-to-7 is broken on macOS: gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2
|| (lib.elem to [
11 # fs-repo-10-to-11 fails (probably since Go 1.21) with: panic: qtls.ClientSessionState doesn't match
12 # fs-repo-11-to-12 fails (probably since Go 1.21) with: panic: qtls.ClientSessionState doesn't match
]);
};
};
stubBecauseDisabled =
from: to: release:
let
pname = "fs-repo-${toString from}-to-${toString to}";
in
writeShellApplication {
name = pname;
text = ''
echo 'The kubo-fs-repo-migrations package was not buit with support for ${pname}.'
echo 'To enable support, set the minRepoVersion argument of this package to a lower value.'
echo 'The purpose of this stub is to prevent the fs-repo-migrations program from downloading unsigned binaries from the internet.'
'';
};
stubBecauseBroken =
pname:
writeShellApplication {
name = pname;
text = ''
echo '${pname} is broken with the latest Go version.'
echo 'The purpose of this stub is to prevent the fs-repo-migrations program from downloading unsigned binaries from the internet.'
'';
};
releases = [
{
from = 0;
to = 1;
release = "1.0.1";
hash = "sha256-2mKtr6ZXZdOOY+9GNaC85HKjOMsfeM91oxVuxHIWDO4=";
}
{
from = 1;
to = 2;
release = "1.0.1";
hash = "sha256-6/BewNcZc/fIBa8G1luNO2wqTdeHi8vL7ojJDjBfWYI=";
}
{
from = 2;
to = 3;
release = "1.0.1";
hash = "sha256-kESX/R25nb7G/uggwa7GB7I2IrdgeKe0chRzjr70Kuw=";
}
{
from = 3;
to = 4;
release = "1.0.1";
hash = "sha256-Mv3/7eUS8j7ZzbNR52baekDcXPwcaNpUfqkt0eRpP20=";
}
{
from = 4;
to = 5;
release = "1.0.1";
hash = "sha256-aEqXFhZGOBU5ql2RRqzwD5IXGySVGroaHxjrkpIGAeU=";
}
{
from = 5;
to = 6;
release = "1.0.1";
hash = "sha256-EhMe/3gIl3VjSh6KzBPGH4s6B3AWRnbJ+eHSc8GOHMw=";
}
{
from = 6;
to = 7;
release = "1.0.1";
hash = "sha256-+5kIPQZckloPujLS0QQT+ojIIndfCQaH6grftZdYQ88=";
}
{
from = 7;
to = 8;
release = "1.0.1";
hash = "sha256-82oSU7qhldPVTdbbol3xSnl8Ko7NUPvGpAnmFxvAceQ=";
}
{
from = 8;
to = 9;
release = "1.0.1";
hash = "sha256-9knC2CfiTUNJRlrOLRpKy70Hl9p9DQf6rfXnU2a0fig=";
}
{
from = 9;
to = 10;
release = "1.0.1";
hash = "sha256-732k76Kijs5izu404ES/YSnYfC9V88d9Qq5oHv5Qon0=";
}
{
from = 10;
to = 11;
release = "1.0.1";
hash = "sha256-WieBZpD8dpFDif7QxTGjRoZtNBbkI3KU4w4av7b+d4Q=";
}
{
from = 11;
to = 12;
release = "1.0.2";
hash = "sha256-x/4ps705Hnf+/875/tn3AsEHgaHHCc+cGXymXpRt0xA=";
}
{
from = 12;
to = 13;
release = "1.0.0";
hash = "sha256-HjtZ2izoZ+0BrhzXG/QJHcnwsxi0oY4Q3CHjTi29W9o=";
}
{
from = 13;
to = 14;
release = "1.0.0";
hash = "sha256-zvNq+AFp7HDHHZCJOh9OW/lalk3bXOl1Pi+rvJtjuSA=";
}
{
from = 14;
to = 15;
release = "1.0.1";
hash = "sha256-u7PM6kFCQUn07NGpeRYpBDEwc2pP+r5mf44LZU4DV5Y=";
}
{
from = 15;
to = 16;
release = "1.0.1";
hash = "sha256-/TG5GNSyV8gsngRT/0jazkL2n2RzA9h1gCTLqGOrI0A=";
}
];
maxRepoVersion = builtins.length releases;
minRepoVersionValidated =
if minRepoVersion >= 0 then
minRepoVersion
else
throw "The minimum supported repo version is 0. Set `minRepoVersion` to a non-zero value.";
latestMigration = builtins.foldl' (x: y: if y.to == maxRepoVersion then y else x) {
release = throw "Could not get the latest Kubo migration";
} releases;
version = "${toString maxRepoVersion}.${latestMigration.release}";
mkMigrationOrStub =
x:
let
builder = if x.from >= minRepoVersionValidated then mkMigration else stubBecauseDisabled;
in
builder x.from x.to x.release x.hash;
migrations = builtins.map mkMigrationOrStub releases;
packageNotBroken = package: !package.meta.broken;
migrationsBrokenRemoved = builtins.filter packageNotBroken migrations;
migrationsBrokenStubbed = builtins.map (
x: if packageNotBroken x then x else (stubBecauseBroken x.pname)
) migrations;
in
symlinkJoin {
name = "kubo-fs-repo-migrations-${version}";
paths = if stubBrokenMigrations then migrationsBrokenStubbed else migrationsBrokenRemoved;
meta = (builtins.removeAttrs kubo-migrator-unwrapped.meta [ "mainProgram" ]) // {
description = "Several individual migrations for migrating the filesystem repository of Kubo one version at a time";
longDescription = ''
This package contains all the individual migrations in the bin directory.
This is used by fs-repo-migrations and could also be used by Kubo itself
when starting it like this: ipfs daemon --migrate
'';
};
}
pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix
+36
View File
@@ -0,0 +1,36 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "kubo-migrator";
version = "2.0.2-unstable-2024-08-02";
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
rev = "cbc31a03fb2f6aba80d577224c09472101427771";
hash = "sha256-wgWwDuL5Yv7dSYFrBiC4OS7SuTHh1D8RSabBnOTUiZ0=";
sparseCheckout = [ "fs-repo-migrations" ];
};
sourceRoot = "${src.name}/fs-repo-migrations";
vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk=";
doCheck = false;
meta = {
description = "Run the appripriate migrations for migrating the filesystem repository of Kubo (migrations not included)";
homepage = "https://github.com/ipfs/fs-repo-migrations";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
Luflosi
elitak
];
mainProgram = "fs-repo-migrations";
};
}
pkgs/by-name/ku/kubo-migrator/package.nix
+26
View File
@@ -0,0 +1,26 @@
{
lib,
buildEnv,
makeWrapper,
kubo-migrator-unwrapped,
kubo-fs-repo-migrations,
}:
buildEnv {
name = "kubo-migrator-${kubo-migrator-unwrapped.version}";
nativeBuildInputs = [ makeWrapper ];
paths = [ kubo-migrator-unwrapped ];
pathsToLink = [ "/bin" ];
postBuild = ''
wrapProgram "$out/bin/fs-repo-migrations" \
--prefix PATH ':' '${lib.makeBinPath [ kubo-fs-repo-migrations ]}'
'';
meta = kubo-migrator-unwrapped.meta // {
description = "Run the appripriate migrations for migrating the filesystem repository of Kubo";
};
}
pkgs/by-name/ku/kubo/package.nix
+1 -1
View File
@@ -10,7 +10,7 @@ buildGoModule rec {
version = "0.29.0"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}";
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
passthru.repoVersion = "15"; # Also update kubo-migrator-unwrapped and kubo-fs-repo-migrations when changing the repo version
# Kubo makes changes to its source tarball that don't match the git source.
src = fetchurl {
pkgs/by-name/li/libticables2/package.nix
+1 -1
View File
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "This library is part of the TiLP framework";
homepage = "http://lpg.ticalc.org/prj_tilp/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ siraben luc65r ];
maintainers = with maintainers; [ siraben clevor ];
platforms = with platforms; linux ++ darwin;
};
}
pkgs/by-name/li/libticonv/package.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = "This library is part of the TiLP framework";
homepage = "http://lpg.ticalc.org/prj_tilp/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ siraben luc65r ];
maintainers = with maintainers; [ siraben clevor ];
platforms = with platforms; linux ++ darwin;
};
}
pkgs/by-name/li/libtifiles2/package.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = "This library is part of the TiLP framework";
homepage = "http://lpg.ticalc.org/prj_tilp/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ siraben luc65r ];
maintainers = with maintainers; [ siraben clevor ];
platforms = with platforms; linux ++ darwin;
};
}
pkgs/by-name/mo/moonlight-qt/package.nix
-1
View File
@@ -88,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
azuwis
luc65r
zmitchell
];
platforms = lib.platforms.all;
pkgs/by-name/my/myrddin/package.nix
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
description = "Systems language that is both powerful and fun to use";
homepage = "https://myrlang.org/";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
# darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin;
pkgs/by-name/od/odin/package.nix
-1
View File
@@ -87,7 +87,6 @@ stdenv.mkDerivation {
mainProgram = "odin";
maintainers = with lib.maintainers; [
astavie
luc65r
znaniye
];
platforms = lib.platforms.unix;
pkgs/by-name/py/pylyzer/Cargo.lock
Generated
-1444
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/py/pylyzer/package.nix
+4 -8
View File
@@ -14,21 +14,17 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.70";
version = "0.0.71";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "refs/tags/v${version}";
hash = "sha256-jj9r5npClLY9mhDHFI92825RYvwn6m9KlngfFL0bqCw=";
hash = "sha256-CzmfDOEh+3kUIl8dWYcxXH+6o+6zea/8hzZ09FaT8sw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rustpython-ast-0.4.0" = "sha256-RChZlXzdzyLp0Lb/LTLbWfbUzPDhmWkf0uVobflCKRk=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-ZX3ql8GkgDLWFc3M1zIAu4QOYtZ/ryd1rrctkHpYmiU=";
nativeBuildInputs = [
git
pkgs/by-name/rb/rbw/package.nix
+1 -1
View File
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://crates.io/crates/rbw";
changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}";
license = licenses.mit;
maintainers = with maintainers; [ albakham luc65r ];
maintainers = with maintainers; [ albakham ];
mainProgram = "rbw";
};
}
pkgs/by-name/ro/rofi-calc/package.nix
+1 -1
View File
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "Do live calculations in rofi!";
homepage = "https://github.com/svenstaro/rofi-calc";
license = licenses.mit;
maintainers = with maintainers; [ luc65r albakham ];
maintainers = with maintainers; [ albakham ];
platforms = with platforms; linux;
};
}
pkgs/by-name/sn/snapcraft/package.nix
+3 -3
View File
@@ -12,7 +12,7 @@
python3Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.4.1";
version = "8.5.0";
pyproject = true;
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
rev = "refs/tags/${version}";
hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c=";
hash = "sha256-u5LO29LnAJrU8fafa1EA4ii5g8sO8REfuf/7lzI7x5k=";
};
patches = [
@@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec {
pyyaml
raven
requests-toolbelt
requests-unixsocket
requests-unixsocket2
simplejson
snap-helpers
tabulate
pkgs/by-name/sn/snipaste/package.nix
+12 -3
View File
@@ -3,17 +3,26 @@
lib,
fetchurl,
}:
appimageTools.wrapType2 rec {
let
pname = "snipaste";
version = "2.10.2";
src = fetchurl {
url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage";
hash = "sha256-u9e2d9ZpHDbDIsFkseOdJX2Kspn9TkhFfZxbeielDA8=";
};
contents = appimageTools.extract { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
passthru.updateScript = ./update.sh;
extraInstallCommands = ''
install -d $out/share/{applications,icons}
cp ${contents}/usr/share/applications/*.desktop -t $out/share/applications/
cp -r ${contents}/usr/share/icons/* -t $out/share/icons/
substituteInPlace $out/share/applications/*.desktop --replace-warn 'Exec=Snipaste' 'Exec=${pname}'
'';
meta = {
description = "Screenshot tools";
homepage = "https://www.snipaste.com/";
pkgs/by-name/ss/ssh-chat/package.nix
+1 -1
View File
@@ -18,6 +18,6 @@ buildGoModule rec {
mainProgram = "ssh-chat";
homepage = "https://github.com/shazow/ssh-chat";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
};
}
pkgs/by-name/ti/tilem/package.nix
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "http://lpg.ticalc.org/prj_tilem/";
description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ siraben luc65r ];
maintainers = with maintainers; [ siraben clevor ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "tilem2";
};
pkgs/by-name/tu/tuisky/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuisky";
version = "0.1.3";
version = "0.1.5";
src = fetchFromGitHub {
owner = "sugyan";
repo = "tuisky";
rev = "refs/tags/v${version}";
hash = "sha256-TsxERi+xxWk6SJwIxMgqiYCAUrDLzZXPL1xQCIXtUr0=";
hash = "sha256-phadkJgSvizSNPvrVaYu/+y1uAj6fmb9JQLdj0dEQIg=";
};
cargoHash = "sha256-p6Yqg4HdkviuOuYMGEPXyySduiS47aPOshr5iXE+f+A=";
cargoHash = "sha256-jI4HKn8HalEnBCuFR8/auTqi8M1qt25MS3h/b1pf3BA=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/ur/urh/package.nix
+2 -1
View File
@@ -2,6 +2,7 @@
, hackrf, rtl-sdr, airspy, limesuite, libiio
, libbladeRF
, qt5
, wrapGAppsHook3
, USRPSupport ? false, uhd }:
python3Packages.buildPythonApplication rec {
@@ -15,7 +16,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-4Fe2+BUdnVdNQHqZeftXLabn/vTzgyynOtqy0rAb0Rk=";
};
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
nativeBuildInputs = [ qt5.wrapQtAppsHook wrapGAppsHook3 ];
buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ]
++ lib.optional USRPSupport uhd
++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland;
pkgs/by-name/wl/wlink/package.nix
+4 -4
View File
@@ -36,17 +36,17 @@ rustPlatform.buildRustPackage rec {
};
};
meta = with lib; {
meta = {
description = "WCH-Link flash tool for WCH's RISC-V MCUs(CH32V, CH56X, CH57X, CH58X, CH59X, CH32L103, CH32X035, CH641, CH643)";
homepage = "https://github.com/ch32-rs/wlink";
changelog = "https://github.com/ch32-rs/wlink/releases/tag/v${version}";
license = with licenses; [
license = with lib.licenses; [
mit # or
asl20
];
platforms = with platforms; linux ++ darwin ++ windows;
platforms = with lib.platforms; linux ++ darwin ++ windows;
broken = !stdenv.hostPlatform.isLinux;
maintainers = with maintainers; [ jwillikers ];
maintainers = with lib.maintainers; [ jwillikers ];
mainProgram = "wlink";
};
}
pkgs/by-name/ze/zed-editor/Cargo.lock
Generated
-15831
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ze/zed-editor/package.nix
+2 -22
View File
@@ -117,28 +117,8 @@ rustPlatform.buildRustPackage rec {
./0002-disable-livekit-darwin.patch
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"alacritty_terminal-0.24.1-dev" = "sha256-b4oSDhsAAYjpYGfFgA1Q1642JoJQ9k5RTsPgFUpAFmc=";
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
"async-stripe-0.40.0" = "sha256-kVdYCmlM8DilSrcOGxI1tvSiUjSrXdnmKqBA9WUJgMw=";
"blade-graphics-0.5.0" = "sha256-j/JI34ZPD7RAHNHu3krgDLnIq4QmmZaZaU1FwD7f2FM=";
"cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM=";
"font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
"lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
"nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo=";
"pet-0.1.0" = "sha256-RxwisvRC5I3TCMAOT+kPasijuf66F+VFok1O9Ep8tGE=";
"reqwest-0.12.8" = "sha256-mjO6SPYOMiw1H0ZEbd4BlPivPtaLVNftpsCu+M2i3Qw=";
"tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0=";
"tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE=";
"tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw=";
"tree-sitter-md-0.3.2" = "sha256-q2/aJx+385B8HiU0soZ1vtRvjkE21ABGzIyR1qwKFOU=";
"tree-sitter-yaml-0.6.1" = "sha256-95u/bq74SiUHW8lVp3RpanmYS/lyVPW0Inn8gR7N3IQ=";
"xim-0.4.0" = "sha256-BXyaIBoqMNbzaSJqMadmofdjtlEVSoU6iogF66YP6a4=";
"xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-88x9x+EoH1Vi34CdFdYRD8EQzGHU+8DTHd0tT+tyW8k=";
nativeBuildInputs =
[
pkgs/by-name/zl/zls/package.nix
+3
View File
@@ -3,6 +3,7 @@
, fetchFromGitHub
, zig_0_13
, callPackage
, apple-sdk_11,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -23,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ zig_0_13.hook ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
postPatch = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
pkgs/desktops/mate/mate-tweak/default.nix
+1 -1
View File
@@ -81,6 +81,6 @@ python3Packages.buildPythonApplication rec {
changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}";
license = [ licenses.gpl2Plus ];
platforms = platforms.linux;
maintainers = teams.mate.members ++ (with maintainers; [ luc65r ]);
maintainers = teams.mate.members;
};
}
pkgs/development/compilers/cone/default.nix
+1 -1
View File
@@ -37,7 +37,7 @@ llvmPackages.stdenv.mkDerivation rec {
mainProgram = "conec";
homepage = "https://cone.jondgoodwin.com";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/development/libraries/libticalcs2/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "This library is part of the TiLP framework";
homepage = "http://lpg.ticalc.org/prj_tilp/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ siraben luc65r ];
maintainers = with maintainers; [ siraben clevor ];
platforms = with platforms; linux ++ darwin;
};
}
pkgs/development/libraries/unicorn/default.nix
-1
View File
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [
thoughtpolice
luc65r
];
};
}
pkgs/development/ocaml-modules/tls/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildDunePackage rec {
pname = "tls";
version = "1.0.2";
version = "1.0.4";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz";
hash = "sha256-ohdRIAyzFG/+FUf11t4Ye1FH6O5r7RKwnVLAAtQrP+s=";
hash = "sha256-yFt8Gh4ipseWEHsnJVld3iYElMDvBrYdn1O+IuHcQug=";
};
minimalOCamlVersion = "4.08";
pkgs/development/python-modules/awkward-cpp/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "awkward-cpp";
version = "39";
version = "42";
pyproject = true;
src = fetchPypi {
pname = "awkward_cpp";
inherit version;
hash = "sha256-YdoAEZnqIJRITijKB0WR0uxmDxF+mperieYNpAUnI4U=";
hash = "sha256-1sSJ7L6asuqjTUXM7OxVt0gHs2P+yiO4123IvCBzVew=";
};
build-system = [
pkgs/development/python-modules/awkward-pandas/default.nix
+49
View File
@@ -0,0 +1,49 @@
{
lib,
buildPythonPackage,
fetchPypi,
# build-system
hatch-vcs,
hatchling,
# dependencies
awkward,
pandas,
}:
buildPythonPackage rec {
pname = "awkward-pandas";
version = "2023.8.0";
pyproject = true;
src = fetchPypi {
pname = "awkward_pandas";
inherit version;
hash = "sha256-Vre3NSQVAkI6ya+0nbDdO7WQWlGlPN/kdunUMWqXX94=";
};
build-system = [
hatch-vcs
hatchling
];
dependencies = [
awkward
pandas
];
pythonImportsCheck = [
"awkward_pandas"
];
# There are no tests in the Pypi archive
doCheck = false;
meta = {
description = "Awkward Array Pandas Extension";
homepage = "https://pypi.org/project/awkward-pandas/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/awkward/default.nix
+2 -2
View File
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "awkward";
version = "2.6.9";
version = "2.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "awkward";
rev = "refs/tags/v${version}";
hash = "sha256-kYDihmfzMH5LPXSgXpC64qMPqxIX59VzflhP0gWu92Y=";
hash = "sha256-EcBSPW+us6RjxQu+rNc+++5vGsXyeJB27/Zuth3wacc=";
};
build-system = [
pkgs/development/python-modules/azure-mgmt-network/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-network";
version = "27.0.0";
version = "28.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "azure_mgmt_network";
inherit version;
hash = "sha256-XBxh2LsTrUD3iKJv11acHZ1g6y5MsZwqG12cAq6GIxY=";
hash = "sha256-QDVtNI70g4Mk8ZpBzYA0C0+N1KwvChiky9XMle8pdPM=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "azure-mgmt-postgresqlflexibleservers";
version = "1.0.0";
version = "1.1.0b1";
pyproject = true;
src = fetchPypi {
pname = "azure_mgmt_postgresqlflexibleservers";
inherit version;
hash = "sha256-5aSpnUCTol+L1w7XZp6d2QRN+LxGOpUUztiMQqkD55E=";
hash = "sha256-X/AkFBzTsgNO4SU8K9h1w8QAoxOoZfnvvoTyVbwE3K0=";
};
build-system = [
pkgs/development/python-modules/craft-application/default.nix
+9 -3
View File
@@ -6,7 +6,9 @@
craft-cli,
craft-grammar,
craft-parts,
craft-platforms,
craft-providers,
jinja2,
fetchFromGitHub,
git,
hypothesis,
@@ -23,11 +25,12 @@
responses,
setuptools-scm,
snap-helpers,
freezegun,
}:
buildPythonPackage rec {
pname = "craft-application";
version = "4.2.5";
version = "4.4.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -36,12 +39,12 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-application";
rev = "refs/tags/${version}";
hash = "sha256-Y/Eci0ByE1HxUcxWhpQq0F2Ef1xkXZMBDGmUSIyPKII=";
hash = "sha256-Sb7/p5g03stipnvfE5FceXv6xDA4c45qnxllBUWhmY8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools==74.1.1" "setuptools"
--replace-fail "setuptools==75.2.0" "setuptools"
'';
build-system = [ setuptools-scm ];
@@ -56,7 +59,9 @@ buildPythonPackage rec {
craft-cli
craft-grammar
craft-parts
craft-platforms
craft-providers
jinja2
license-expression
pygit2
pyyaml
@@ -64,6 +69,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
freezegun
git
hypothesis
pyfakefs
pkgs/development/python-modules/craft-cli/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "craft-cli";
version = "2.7.0";
version = "2.10.1";
pyproject = true;
@@ -21,12 +21,12 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-cli";
rev = "refs/tags/${version}";
hash = "sha256-PNurNP0ghG/R0rcUc5GfuPM5PTt+9FbJRjs61YJ1ytc=";
hash = "sha256-XKRV5VJLC3B5gcNr/icOxWB6pDXDT7MV5wM/vEQHVm4=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools==70.1.0" "setuptools"
--replace-fail "setuptools==75.2.0" "setuptools"
'';
build-system = [ setuptools-scm ];
pkgs/development/python-modules/craft-providers/default.nix
+3 -6
View File
@@ -9,7 +9,6 @@
pyyaml,
requests-unixsocket,
setuptools-scm,
urllib3,
pytest-check,
pytest-mock,
pytestCheckHook,
@@ -21,7 +20,7 @@
buildPythonPackage rec {
pname = "craft-providers";
version = "2.0.3";
version = "2.0.4";
pyproject = true;
@@ -29,7 +28,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-providers";
rev = "refs/tags/${version}";
hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk=";
hash = "sha256-f+0AEoVUFL/+v4sRYirc6OD5dYH4dlLk8h7im+CLuhM=";
};
patches = [
@@ -51,8 +50,7 @@ buildPythonPackage rec {
# The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69
# This is already patched in nixpkgs.
substituteInPlace pyproject.toml \
--replace-fail "setuptools==73.0.1" "setuptools" \
--replace-fail "urllib3<2" "urllib3"
--replace-fail "setuptools==73.0.1" "setuptools"
'';
pythonRelaxDeps = [ "requests" ];
@@ -65,7 +63,6 @@ buildPythonPackage rec {
pydantic
pyyaml
requests-unixsocket
urllib3
];
pythonImportsCheck = [ "craft_providers" ];
pkgs/development/python-modules/playsound/default.nix
+1 -1
View File
@@ -25,6 +25,6 @@ buildPythonPackage rec {
description = "Pure Python, cross platform, single function module with no dependencies for playing sounds";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/python-whois/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "python-whois";
version = "0.9.4";
version = "0.9.5";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "python_whois";
inherit version;
hash = "sha256-d7xzR7+BXWXM0ZZxHCmDdlLwdYWu2tPDwE3YhWUf16c=";
hash = "sha256-GJaMIUhHUvzEuaXwr0d+9rjcLou38b1cM4MUmcDdQco=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1266";
version = "3.0.1267";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-YcWdg23Zu/86PxBClZbFFQwOPyPN7TEMCHa/hI5OY6Y=";
hash = "sha256-aX9ulyCodTPf/6YhhL0Gf77PbqJEenEyKu/0zhNWgf0=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/uproot/default.nix
+4 -2
View File
@@ -15,6 +15,7 @@
packaging,
# checks
awkward-pandas,
pandas,
pytestCheckHook,
pytest-timeout,
@@ -25,14 +26,14 @@
buildPythonPackage rec {
pname = "uproot";
version = "5.4.1";
version = "5.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "uproot5";
rev = "refs/tags/v${version}";
hash = "sha256-MWqkEbw6hdNaXrRLWoxUcppT+X9a+DmEhho9GpG29XM=";
hash = "sha256-letdC246I9LDqEnLCOTz51cBnQGbkrsR/i7UN6EMcDA=";
};
build-system = [
@@ -50,6 +51,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
awkward-pandas
pandas
pytestCheckHook
pytest-timeout
pkgs/kde/plasma/powerdevil/default.nix
+5 -1
View File
@@ -1,11 +1,15 @@
{
mkKdeDerivation,
pkg-config,
ddcutil,
qtwayland,
}:
mkKdeDerivation {
pname = "powerdevil";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ qtwayland ];
extraBuildInputs = [
ddcutil
qtwayland
];
}
pkgs/os-specific/linux/ipu6-drivers/default.nix
+6 -4
View File
@@ -7,16 +7,18 @@
stdenv.mkDerivation rec {
pname = "ipu6-drivers";
version = "unstable-2024-10-10";
version = "unstable-2024-11-19";
src = fetchFromGitHub {
owner = "intel";
repo = "ipu6-drivers";
rev = "118952d49ec598f56add50d93fa7bc3ac4a05643";
hash = "sha256-xdMwINoKrdRHCPMpdZQn86ATi1dAXncMU39LLXS16mc=";
rev = "0ad4988248d7e9382498a0b47fc78bb990b29a58";
hash = "sha256-UFvwuoAzwk1k4YiUK+4EeMKeTx9nVvBgBN5JKAfqZkQ=";
};
patches = [ "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch" ];
patches = [
"${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
];
postPatch = ''
cp --no-preserve=mode --recursive --verbose \
pkgs/servers/homepage-dashboard/default.nix
+3 -3
View File
@@ -29,16 +29,16 @@ let
in
buildNpmPackage rec {
pname = "homepage-dashboard";
version = "0.9.10";
version = "0.9.12";
src = fetchFromGitHub {
owner = "gethomepage";
repo = "homepage";
rev = "v${version}";
hash = "sha256-qDbYgitMbjOMIZUyQuFSNAyb/ZRAcStm/jDrsIutKno=";
hash = "sha256-/7MWeCn9vMRlwqYoOf0oldtb1hy0xyKI4+HvnUQIU1c=";
};
npmDepsHash = "sha256-gAti4y4Ios7XjJ3nVOhzjwPzcAC2upODZ64qQjx17JE=";
npmDepsHash = "sha256-Hajc6Ift8V6Q3h6DiePc31nNBVsOm0L97wnEe+fwXPI=";
preBuild = ''
mkdir -p config
pkgs/tools/admin/drawterm/default.nix
+1 -1
View File
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
description = "Connect to Plan 9 CPU servers from other operating systems";
homepage = "https://drawterm.9front.org/";
license = licenses.mit;
maintainers = with maintainers; [ luc65r moody ];
maintainers = with maintainers; [ moody ];
platforms = platforms.linux;
mainProgram = "drawterm";
};
pkgs/top-level/aliases.nix
+2 -1
View File
@@ -529,7 +529,7 @@ mapAliases {
inotifyTools = inotify-tools;
inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
ipfs = kubo; # Added 2022-09-27
ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27
ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27
ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
ipfs-migrator = kubo-migrator; # Added 2022-09-27
iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2024-10-17
@@ -586,6 +586,7 @@ mapAliases {
krb5Full = krb5;
krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17
kubei = kubeclarity; # Added 2023-05-20
kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
### L ###
pkgs/top-level/all-packages.nix
-4
View File
@@ -4086,10 +4086,6 @@ with pkgs;
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { };
kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { };
kubo-migrator = callPackage ../applications/networking/kubo-migrator { };
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
peruse = libsForQt5.callPackage ../tools/misc/peruse { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -1089,6 +1089,8 @@ self: super: with self; {
inherit (pkgs) cmake ninja;
};
awkward-pandas = callPackage ../development/python-modules/awkward-pandas { };
aws-adfs = callPackage ../development/python-modules/aws-adfs { };
aws-encryption-sdk = callPackage ../development/python-modules/aws-encryption-sdk { };