nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot] 2024-11-02 00:16:29 +00:00 committed by GitHub
commit 481d440898
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 116 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -21222,6 +21222,13 @@
githubId = 1215623;
keys = [ { fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; } ];
};
wilhelmines = {
email = "mail@aesz.org";
matrix = "@wilhelmines:matrix.org";
name = "Ronja Schwarz";
github = "wilhelmines";
githubId = 71409721;
};
willbush = {
email = "git@willbush.dev";
matrix = "@willbush:matrix.org";

8
pkgs/by-name/br/brave/package.nix
View File

@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
if stdenv.isAarch64 then
rec {
pname = "brave";
version = "1.71.118";
version = "1.71.121";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-6ERUWUb4GL+kuI0j8VI3vERR3HFfb1gYL4d+hBTcw5w=";
hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk=";
platform = "aarch64-linux";
}
else if stdenv.isx86_64 then
rec {
pname = "brave";
version = "1.71.118";
version = "1.71.121";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-SnpYAJmqBRfECQrlOvgxwQI1k7j0tfctJG7Tt93afe8=";
hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0=";
platform = "x86_64-linux";
}
else

38
pkgs/by-name/ki/kin-openapi/package.nix Normal file
View File

@ -0,0 +1,38 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "kin-openapi";
version = "0.128.0";
vendorHash = "sha256-yNS5Rtmxts4uOhMPTXCFRhe/dLPZZAtGKe/bNkOeIBw=";
src = fetchFromGitHub {
owner = "getkin";
repo = "kin-openapi";
rev = "refs/tags/v${version}";
hash = "sha256-4pYrg75dFFdFS2SC1BvFoHcLFNGgBumXd3Vd7jHvUJg=";
};
checkFlags =
let
# Skip tests that require network access
skippedTests = [
"TestExtraSiblingsInRemoteRef"
"TestIssue495WithDraft04"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
subPackages = [ "cmd/validate" ];
meta = {
mainProgram = "validate";
description = "Command line tool to validation openapi3 documents";
homepage = "https://github.com/getkin/kin-openapi";
changelog = "https://github.com/getkin/kin-openapi/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers._6543 ];
};
}

4
pkgs/by-name/ta/tailscale/package.nix
View File

@ -14,7 +14,7 @@
}:
let
version = "1.76.1";
version = "1.76.3";
in
buildGo123Module {
pname = "tailscale";
@ -24,7 +24,7 @@ buildGo123Module {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw=";
hash = "sha256-bSMtBIIpLVbADjHBojeO7VM/Ny+aWM1bz29ZuhOvjRY=";
};
patches = [

51
pkgs/by-name/ve/versatiles/package.nix Normal file
View File

@ -0,0 +1,51 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "versatiles";
version = "0.12.10"; # When updating: Replace with current version
src = fetchFromGitHub {
owner = "versatiles-org";
repo = "versatiles-rs";
rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version
hash = "sha256-LKUpxsAy39dX8hESlUEVs4rkOpYsd7kbATfnU1QYd9Q="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
};
cargoHash = "sha256-dkFnoQY1+VNNrjS+o5Y0cvhWKoHt38KJKyNhCQ0dGaY="; # When updating: Same as above
# Testing only necessary for the `bins` and `lib` features
cargoTestFlags = [
"--bins"
"--lib"
];
# Skip tests that require network access
checkFlags = [
"--skip tools::convert::tests::test_remote1"
"--skip tools::convert::tests::test_remote2"
"--skip tools::probe::tests::test_remote"
"--skip tools::serve::tests::test_remote"
"--skip utils::io::data_reader_http"
"--skip utils::io::data_reader_http::tests::read_range_git"
"--skip utils::io::data_reader_http::tests::read_range_googleapis"
];
meta = {
description = "Toolbox for converting, checking and serving map tiles in various formats";
longDescription = ''
VersaTiles is a Rust-based project designed for processing and serving tile data efficiently.
It supports multiple tile formats and offers various functionalities for handling tile data.
'';
homepage = "https://versatiles.org/";
downloadPage = "https://github.com/versatiles-org/versatiles-rs";
changelog = "https://github.com/versatiles-org/versatiles-rs/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wilhelmines ];
mainProgram = "versatiles";
platforms = with lib.platforms; linux ++ darwin ++ windows;
};
}

20
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@ -1,15 +1,15 @@
{
"testing": {
"version": "6.12-rc4",
"hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk"
"version": "6.12-rc5",
"hash": "sha256:18zh3nwhsz1hpyhmlim9a2hz8yvx5psrrav4346k46x9ybfardqy"
},
"6.1": {
"version": "6.1.114",
"hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2"
"version": "6.1.115",
"hash": "sha256:0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g"
},
"5.15": {
"version": "5.15.169",
"hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676"
"version": "5.15.170",
"hash": "sha256:1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx"
},
"5.10": {
"version": "5.10.228",
@ -24,11 +24,11 @@
"hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
},
"6.6": {
"version": "6.6.58",
"hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7"
"version": "6.6.59",
"hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93"
},
"6.11": {
"version": "6.11.5",
"hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527"
"version": "6.11.6",
"hash": "sha256:1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69"
}
}

10
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -65,14 +65,4 @@
name = "export-rt-sched-migrate";
patch = ./export-rt-sched-migrate.patch;
};
# Backport upstream fix for very annoying Tailscale issue
# FIXME: remove when merged upstream
netfilter-typo-fix = {
name = "netfilter-typo-fix";
patch = fetchpatch {
url = "https://lore.kernel.org/netdev/20241021094536.81487-3-pablo@netfilter.org/raw";
hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4=";
};
};
}

2
pkgs/os-specific/linux/scx/default.nix
View File

@ -69,7 +69,7 @@ let
{ rlfifo = import ./scx_rlfifo; }
{ rustland = import ./scx_rustland; }
{ rusty = import ./scx_rusty; }
{ csheds = import ./scx_csheds.nix; }
{ cscheds = import ./scx_cscheds.nix; }
{ full = import ./scx_full.nix; }
];
in

2
pkgs/os-specific/linux/scx/scx_csheds.nix → pkgs/os-specific/linux/scx/scx_cscheds.nix
View File

@ -54,7 +54,7 @@ let
in
mkScxScheduler "c" {
schedulerName = "scx_csheds";
schedulerName = "scx_cscheds";
postPatch = ''
rm meson-scripts/fetch_bpftool

2
pkgs/os-specific/linux/scx/scx_full.nix
View File

@ -4,7 +4,7 @@
scx,
mkScxScheduler,
}:
scx.csheds.overrideAttrs (oldAttrs: {
scx.cscheds.overrideAttrs (oldAttrs: {
pname = "scx_full";
postInstall =
(oldAttrs.postInstall or "")

10
pkgs/top-level/linux-kernels.nix
View File

@ -53,7 +53,7 @@ let
broken = kernel.meta.broken;
};
};
kernelPatches = lib.filter ({ name ? null, ... }: name != "netfilter-typo-fix") kernel.kernelPatches ++ [
kernelPatches = kernel.kernelPatches ++ [
kernelPatches.hardened.${kernel.meta.branch}
];
isHardened = true;
@ -146,7 +146,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
];
};
@ -155,7 +154,6 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate
kernelPatches.netfilter-typo-fix
];
};
@ -164,7 +162,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
];
};
@ -173,7 +170,6 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate
kernelPatches.netfilter-typo-fix
];
};
@ -182,7 +178,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
];
};
@ -191,7 +186,6 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate
kernelPatches.netfilter-typo-fix
];
};
@ -200,7 +194,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
];
};
@ -212,7 +205,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
];
};
latest = packageAliases.linux_latest.kernel;