mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-24 17:40:37 +00:00
Compare commits
1 Commits
staging-ni
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7079e863e7 |
2
.github/workflows/backport.yml
vendored
2
.github/workflows/backport.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
||||
permission-pull-requests: write
|
||||
permission-workflows: write
|
||||
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
|
||||
2
.github/workflows/bot.yml
vendored
2
.github/workflows/bot.yml
vendored
@@ -42,7 +42,7 @@ jobs:
|
||||
runs-on: ubuntu-slim
|
||||
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: |
|
||||
|
||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -49,7 +49,7 @@ jobs:
|
||||
runs-on: ${{ matrix.runner }}
|
||||
timeout-minutes: 60
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
|
||||
6
.github/workflows/check.yml
vendored
6
.github/workflows/check.yml
vendored
@@ -43,7 +43,7 @@ jobs:
|
||||
runs-on: ubuntu-slim
|
||||
timeout-minutes: 3
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
path: trusted
|
||||
@@ -96,7 +96,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 8
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
path: trusted
|
||||
@@ -138,7 +138,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
|
||||
2
.github/workflows/comment.yml
vendored
2
.github/workflows/comment.yml
vendored
@@ -23,7 +23,7 @@ jobs:
|
||||
timeout-minutes: 2
|
||||
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: |
|
||||
|
||||
10
.github/workflows/eval.yml
vendored
10
.github/workflows/eval.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
||||
ciPinBumpCommit: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommit }}
|
||||
ciPinBumpCommitShort: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommitShort }}
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
path: trusted
|
||||
@@ -58,7 +58,7 @@ jobs:
|
||||
ci/supportedVersions.nix
|
||||
|
||||
- name: Check out the PR at the test merge commit
|
||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
ref: ${{ inputs.mergedSha }}
|
||||
@@ -174,7 +174,7 @@ jobs:
|
||||
sudo mkswap /swap
|
||||
sudo swapon /swap
|
||||
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
@@ -259,7 +259,7 @@ jobs:
|
||||
statuses: write # creating 'Eval Summary' commit statuses
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
@@ -476,7 +476,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
|
||||
8
.github/workflows/lint.yml
vendored
8
.github/workflows/lint.yml
vendored
@@ -26,7 +26,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
@@ -61,7 +61,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
@@ -90,7 +90,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: .github/actions
|
||||
@@ -134,7 +134,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
timeout-minutes: 8
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: true # Needed to run git fetch for large PRs.
|
||||
path: trusted
|
||||
|
||||
2
.github/workflows/merge-group.yml
vendored
2
.github/workflows/merge-group.yml
vendored
@@ -25,7 +25,7 @@ jobs:
|
||||
targetSha: ${{ steps.prepare.outputs.targetSha }}
|
||||
systems: ${{ steps.prepare.outputs.systems }}
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: |
|
||||
|
||||
2
.github/workflows/periodic-merge.yml
vendored
2
.github/workflows/periodic-merge.yml
vendored
@@ -34,7 +34,7 @@ jobs:
|
||||
permission-contents: write
|
||||
permission-pull-requests: write
|
||||
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
|
||||
2
.github/workflows/pull-request-target.yml
vendored
2
.github/workflows/pull-request-target.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
||||
systems: ${{ steps.prepare.outputs.systems }}
|
||||
touched: ${{ steps.prepare.outputs.touched }}
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout-cone-mode: true # default, for clarity
|
||||
|
||||
2
.github/workflows/review.yml
vendored
2
.github/workflows/review.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
runs-on: ubuntu-slim
|
||||
timeout-minutes: 2
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: |
|
||||
|
||||
2
.github/workflows/teams.yml
vendored
2
.github/workflows/teams.yml
vendored
@@ -30,7 +30,7 @@ jobs:
|
||||
permission-pull-requests: write
|
||||
|
||||
- name: Fetch source
|
||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: |
|
||||
|
||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@@ -19,7 +19,7 @@ jobs:
|
||||
push: ${{ steps.files.outputs.push }}
|
||||
targetSha: ${{ steps.prepare.outputs.targetSha }}
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout-cone-mode: true # default, for clarity
|
||||
|
||||
@@ -89,11 +89,6 @@ def main() -> None:
|
||||
type=Path,
|
||||
required=True,
|
||||
)
|
||||
arg_parser.add_argument(
|
||||
"--test-script",
|
||||
help="path to a test script to run, taking precedence over the one defined in the config file",
|
||||
type=Path,
|
||||
)
|
||||
arg_parser.add_argument(
|
||||
"--keep-vm-state",
|
||||
help=argparse.SUPPRESS,
|
||||
@@ -168,12 +163,8 @@ def main() -> None:
|
||||
if args.debug_hook_attach is not None:
|
||||
debugger = Debug(logger, args.debug_hook_attach)
|
||||
|
||||
config = load_driver_configuration(args.config)
|
||||
if args.test_script is not None:
|
||||
config.test_script = args.test_script
|
||||
|
||||
with Driver(
|
||||
config=config,
|
||||
config=load_driver_configuration(args.config),
|
||||
out_dir=output_directory,
|
||||
logger=logger,
|
||||
keep_machine_state=args.keep_machine_state,
|
||||
|
||||
@@ -1422,6 +1422,7 @@ let
|
||||
modulePath = config.security.pam.pam_unixModulePath;
|
||||
settings = {
|
||||
nullok = true;
|
||||
yescrypt = lib.mkIf config.security.pam.enableLegacySettings true;
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@@ -577,6 +577,7 @@ in
|
||||
control = "requisite";
|
||||
modulePath = config.security.pam.pam_unixModulePath;
|
||||
settings.nullok = true;
|
||||
settings.yescrypt = true;
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -458,6 +458,7 @@ in
|
||||
control = "requisite";
|
||||
modulePath = config.security.pam.pam_unixModulePath;
|
||||
settings.nullok = true;
|
||||
settings.yescrypt = true;
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -153,7 +153,6 @@ in
|
||||
console-log = runTest ./nixos-test-driver/console-log.nix;
|
||||
containers = runTest ./nixos-test-driver/containers.nix;
|
||||
nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix;
|
||||
multi-arch-test = runTest ./nixos-test-driver/multi-arch-test.nix;
|
||||
skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix;
|
||||
console-timeout = runTest ./nixos-test-driver/console-timeout.nix;
|
||||
options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; };
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
with subtest("create user"):
|
||||
machine.succeed("useradd -m alice")
|
||||
machine.succeed("(echo foobar; echo foobar) | passwd alice")
|
||||
machine.succeed("grep -F 'alice:$y$' /etc/shadow")
|
||||
|
||||
with subtest("Check whether switching VTs works"):
|
||||
machine.fail("pgrep -f 'agetty.*tty2'")
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
with subtest("create user"):
|
||||
machine.succeed("useradd -m alice")
|
||||
machine.succeed("(echo foobar; echo foobar) | passwd alice")
|
||||
machine.succeed("grep -F 'alice:$y$' /etc/shadow")
|
||||
|
||||
with subtest("Check whether switching VTs works"):
|
||||
machine.fail("pgrep -f 'agetty.*tty2'")
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "multi-arch-test";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ tfc ];
|
||||
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes = {
|
||||
# Setting build = host platform because such standard VM setups
|
||||
# are well-cached by the multi-arch build infrastructure of the
|
||||
# project.
|
||||
vmIntel = {
|
||||
nixpkgs.buildPlatform = "x86_64-linux";
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
};
|
||||
vmArm = {
|
||||
nixpkgs.buildPlatform = "aarch64-linux";
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
};
|
||||
};
|
||||
|
||||
defaults = {
|
||||
# not needed for this test and shrinks the closure
|
||||
# because we dont' need qemu for all architectures
|
||||
virtualisation.qemu.guestAgent.enable = false;
|
||||
|
||||
# the test is already very slow but we don't need DHCP anyway
|
||||
networking.dhcpcd.enable = false;
|
||||
|
||||
# fix the network-online target, otherwise it doesn't work
|
||||
# properly as a synchronization mechanism.
|
||||
systemd.network.wait-online.enable = true;
|
||||
systemd.network.wait-online.anyInterface = true;
|
||||
};
|
||||
|
||||
# slow due to SW emulation but shouldn't be slower than that
|
||||
globalTimeout = 5 * 60;
|
||||
|
||||
testScript = { nodes, ... }: /* python */ ''
|
||||
start_all()
|
||||
|
||||
vmIntel.systemctl("start network-online.target")
|
||||
vmArm.systemctl("start network-online.target")
|
||||
vmIntel.wait_for_unit("network-online.target")
|
||||
vmArm.wait_for_unit("network-online.target")
|
||||
|
||||
vmIntel.succeed("ping -c 1 vmArm")
|
||||
vmArm.succeed("ping -c 1 vmIntel")
|
||||
|
||||
archIntel = vmIntel.succeed("uname -m")
|
||||
t.assertIn("${nodes.vmIntel.nixpkgs.hostPlatform.qemuArch}", archIntel, "machine1 is an intel VM")
|
||||
archArm = vmArm.succeed("uname -m")
|
||||
t.assertIn("${nodes.vmArm.nixpkgs.hostPlatform.qemuArch}", archArm, "machine1 is an ARM VM")
|
||||
'';
|
||||
}
|
||||
@@ -122,8 +122,7 @@ in
|
||||
|
||||
stdenvNoCC.mkDerivation (
|
||||
{
|
||||
name =
|
||||
if (attrs ? pname && attrs ? version) then "${attrs.pname}-${attrs.version}" else baseNameOf src;
|
||||
name = baseNameOf src;
|
||||
}
|
||||
// optionalAttrs
|
||||
// forcedAttrs
|
||||
|
||||
@@ -9,14 +9,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "airspyhf";
|
||||
version = "1.8.1";
|
||||
version = "1.6.8-unstable-2025-07-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airspy";
|
||||
repo = "airspyhf";
|
||||
# Not clear why upstream won't tag releases. See:
|
||||
# https://github.com/airspy/airspyhf/commit/c0bb66dd8976651c53884ccec3d70a108f1e50e1#r193607536
|
||||
rev = "c0bb66dd8976651c53884ccec3d70a108f1e50e1";
|
||||
rev = "87cf12a30f3a0f10f313aab8e54999ca69b753af";
|
||||
hash = "sha256-7bXBv4YTOaWRFI6Svb9/lSBEAssUgJMqxKM5zHk1swM=";
|
||||
};
|
||||
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "btrfs-progs";
|
||||
version = "7.1";
|
||||
version = "7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-0fVcwpcTmMkULqp50gPmPVhqO0uGf5VmZKHWgyLNTjQ=";
|
||||
hash = "sha256-wobWh2y81yMnoLQX5M/SgDU+wj43tUn9vNeACoMtmpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dcp";
|
||||
version = "0.25.9";
|
||||
version = "0.25.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "dcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MjBnJRdlGF2efEH0TcJjM3JVEByRzeqAZ13sR9EL0Ik=";
|
||||
hash = "sha256-umcrTAPWAInbjdZYhY0xEbI7heGwr+8FGMI7BIWSdD0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eJAMl1vGX2JANdYe8SWWLsNImd3raEEYvSfvwwfV4Xk=";
|
||||
vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw=";
|
||||
|
||||
# This is required so we:
|
||||
# - Delete an inconsistent vendor directory from upstream
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ketch";
|
||||
version = "0.12.0";
|
||||
version = "0.10.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -16,10 +16,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "1broseidon";
|
||||
repo = "ketch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qp4EwQBrN0ic/gUAvBAirz03kL7Vjhs1LbKBd+uXmHA=";
|
||||
hash = "sha256-m6KEPbNd13eJsNigJyGGlV2dt0bcZTZcDBCBh/l5rjY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Kk7fY27y1ziJEMpwRUoGfslGYYQdayLDuuRvNyfiAy8=";
|
||||
vendorHash = "sha256-UsTR7+GSuxUQ0aBq8fv1M18LegeDqf/XoiyASQKe5EI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetworkConfiguration";
|
||||
repo = "openresolv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/NetworkConfiguration/openresolv/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Program to manage /etc/resolv.conf";
|
||||
mainProgram = "resolvconf";
|
||||
homepage = "https://roy.marples.name/projects/openresolv";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python313Packages,
|
||||
python312Packages,
|
||||
fetchFromGitHub,
|
||||
|
||||
chromaprint,
|
||||
@@ -12,17 +12,15 @@
|
||||
gst_all_1,
|
||||
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
# A few more tests fail with python314Pacakges, indicating the code isn't
|
||||
# ready for it yet.
|
||||
pythonPackages = python313Packages;
|
||||
pythonPackages = python312Packages;
|
||||
pyqt5 = if enablePlayback then pythonPackages.pyqt5-multimedia else pythonPackages.pyqt5;
|
||||
in
|
||||
pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
pname = "picard";
|
||||
# nix-update --commit picard --version-regex 'release-(.*)'
|
||||
version = "2.13.3";
|
||||
pyproject = true;
|
||||
strictDeps = true;
|
||||
@@ -47,7 +45,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform qt5.qtwayland) [
|
||||
qt5.qtwayland
|
||||
]
|
||||
++ lib.optionals pyqt5.multimediaEnabled [
|
||||
++ lib.optionals (pyqt5.multimediaEnabled) [
|
||||
qt5.qtmultimedia.bin
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base
|
||||
@@ -61,7 +59,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
"pyobjc-framework-Cocoa"
|
||||
];
|
||||
|
||||
dependencies =
|
||||
propagatedBuildInputs =
|
||||
with pythonPackages;
|
||||
[
|
||||
charset-normalizer
|
||||
@@ -106,17 +104,10 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
''
|
||||
+ lib.optionalString pyqt5.multimediaEnabled ''
|
||||
+ lib.optionalString (pyqt5.multimediaEnabled) ''
|
||||
makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"release-(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://picard.musicbrainz.org";
|
||||
changelog = "https://picard.musicbrainz.org/changelog";
|
||||
|
||||
@@ -18,13 +18,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdmr";
|
||||
version = "0.15.1";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hmatuschek";
|
||||
repo = "qdmr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RFGjL31o+aiy7O7UgZWjGSMBqG97b5BtwVr6HQD3Ioo=";
|
||||
hash = "sha256-epttTJbqOtkacIu7IfBCAG1aGk02+0Ncalo7wRz+44k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libusb1
|
||||
libxslt
|
||||
kdePackages.qtlocation
|
||||
kdePackages.qtmultimedia
|
||||
kdePackages.qtserialport
|
||||
kdePackages.qttools
|
||||
kdePackages.qtbase
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
# The web client verifies that the server version is a valid datetime string:
|
||||
#
|
||||
# Example:
|
||||
# versionToTimestamp "2026-04-17T00-00-00Z"
|
||||
# => "2026-04-17T00:00:00Z"
|
||||
versionToTimestamp =
|
||||
version:
|
||||
let
|
||||
splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1;
|
||||
in
|
||||
builtins.concatStringsSep "" [
|
||||
(builtins.elemAt splitTS 0)
|
||||
(builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1))
|
||||
];
|
||||
|
||||
# CopyrightYear will be printed to the CLI UI.
|
||||
# Example:
|
||||
# versionToYear "2026-04-17T00-00-00Z"
|
||||
# => "2026"
|
||||
versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "silo";
|
||||
version = "2026-06-18T00-00-00Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgsty";
|
||||
repo = "minio";
|
||||
tag = "RELEASE.${finalAttrs.version}";
|
||||
hash = "sha256-TwuqWof8FozryQoZt1lybw7z8z8E3Ose4jbKZ0To2lk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rewz3Sez/01iWGCEhMVmcVnIxxjgBzmeUyMqFi6s4mc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
# nixpkgs go_1_26 pinned to 1.26.3; pgsty/minio's go.mod says go 1.26.4.
|
||||
# Step down to 1.26.3 to use the available toolchain. If pgsty/minio
|
||||
# genuinely needs 1.26.4 features, we can replace this with one of:
|
||||
# - Go toolchain auto-switch: prePatch GOTOOLCHAIN=go1.26.4+auto
|
||||
# (fails inside Nix sandbox since GOPROXY=off blocks toolchain download)
|
||||
# - Override go: buildGoModule.override { go = go_1_26.overrideAttrs ... }
|
||||
# (compile go 1.26.4 from source, ~5–10 min)
|
||||
# - Wait for nixpkgs to bump go_1_26 past 1.26.4
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod \
|
||||
--replace-fail "go 1.26.4" "go 1.26.3"
|
||||
'';
|
||||
|
||||
tags = [ "kqueue" ];
|
||||
|
||||
ldflags =
|
||||
let
|
||||
t = "github.com/minio/minio/cmd";
|
||||
in
|
||||
[
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ${t}.Version=${versionToTimestamp finalAttrs.version}"
|
||||
"-X ${t}.ReleaseTag=RELEASE.${finalAttrs.version}"
|
||||
"-X ${t}.CommitID=${finalAttrs.src.rev}"
|
||||
"-X ${t}.CopyrightYear=${versionToYear finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s "$out/bin/minio" "$out/bin/silo"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Community-maintained fork of MinIO packaged as silo";
|
||||
homepage = "https://github.com/pgsty/minio";
|
||||
changelog = "https://github.com/pgsty/minio/releases/tag/${finalAttrs.src.tag}";
|
||||
maintainers = with lib.maintainers; [ randoneering ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "silo";
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "smfh";
|
||||
version = "1.7";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feel-co";
|
||||
repo = "smfh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vKJWHujoGfTV61gjDglzu4ZMJ1phsUGNKELLEeF3QMg=";
|
||||
hash = "sha256-mP/ln+GkafKSnK4LIrAZY45OZYErQFehHUKmBRhHJY4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CvXZtq0o+cYrXP7FSBJLi23wtU9dsUOAOWDsht5cK+k=";
|
||||
cargoHash = "sha256-6kybKx2aZ0pTr0yXPawqTnJVntL1NNCkgEvRFQEwtCk=";
|
||||
|
||||
meta = {
|
||||
description = "Sleek Manifest File Handler";
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
uhd,
|
||||
icu,
|
||||
airspy,
|
||||
airspyhf,
|
||||
hackrf,
|
||||
libbladeRF,
|
||||
rtl-sdr,
|
||||
@@ -80,7 +79,7 @@ mkDerivation (finalAttrs: {
|
||||
python.pkgs.pybind11
|
||||
];
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_PYTHON" (gnuradio.hasFeature "python-support"))
|
||||
(if (gnuradio.hasFeature "python-support") then "-DENABLE_PYTHON=ON" else "-DENABLE_PYTHON=OFF")
|
||||
]
|
||||
++ finalAttrs.finalPackage.passthru.enabledFeaturesCmakeFlags;
|
||||
nativeBuildInputs = [
|
||||
@@ -96,7 +95,6 @@ mkDerivation (finalAttrs: {
|
||||
# Other features don't have dependencies but can still be disabled in the
|
||||
# `features` argument.
|
||||
airspy = [ airspy ];
|
||||
airspyhf = [ airspyhf ];
|
||||
bladerf = [ libbladeRF ];
|
||||
hackrf = [ hackrf ];
|
||||
rtl = [ rtl-sdr ];
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular";
|
||||
version = "0.30.0";
|
||||
version = "0.29.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular";
|
||||
tag = version;
|
||||
hash = "sha256-CuN3ZmFQBLUlRteXVcWF/oE9vvLcaFAoEbkF3hHQLgQ=";
|
||||
hash = "sha256-7Eq0Z/BR/tvGS6RRRoy3jOyBQkc58QETHWy47S6tSD8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -26,13 +26,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-HhEtWYWdxJZOMS3dqB2VdQS7aSdpkRhq7EZCJ55n2OE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix cross compilation by using PKG_CONFIG env variable instead
|
||||
# of hardcoded binary name
|
||||
# https://github.com/libfuse/pyfuse3/pull/148
|
||||
./fix_cross_parse_pkg_config.patch
|
||||
];
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
setuptools
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From a37b18ea421eb20391d0b900844f0c04054247e6 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Heinrich <onny@project-insanity.org>
|
||||
Date: Thu, 9 Jul 2026 14:40:16 +0200
|
||||
Subject: [PATCH] Fix cross-compilaton by using PKG_CONFIG env variable
|
||||
|
||||
---
|
||||
util/build_backend.py | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/util/build_backend.py b/util/build_backend.py
|
||||
index 0ec6b21..95e4ee3 100644
|
||||
--- a/util/build_backend.py
|
||||
+++ b/util/build_backend.py
|
||||
@@ -15,11 +15,13 @@
|
||||
def pkg_config(pkg, cflags=True, ldflags=False, min_ver=None):
|
||||
"""Frontend to pkg-config"""
|
||||
|
||||
+ PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config').split()
|
||||
+
|
||||
if min_ver:
|
||||
- cmd = ['pkg-config', pkg, '--atleast-version', min_ver]
|
||||
+ cmd = PKG_CONFIG + [pkg, '--atleast-version', min_ver]
|
||||
|
||||
if subprocess.call(cmd) != 0:
|
||||
- cmd = ['pkg-config', '--modversion', pkg]
|
||||
+ cmd = PKG_CONFIG + ['--modversion', pkg]
|
||||
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
|
||||
version = proc.communicate()[0].strip()
|
||||
if not version:
|
||||
@@ -29,7 +31,7 @@ def pkg_config(pkg, cflags=True, ldflags=False, min_ver=None):
|
||||
'%s version too old (found: %s, required: %s)' % (pkg, version, min_ver)
|
||||
)
|
||||
|
||||
- cmd = ['pkg-config', pkg]
|
||||
+ cmd = PKG_CONFIG + [pkg]
|
||||
if cflags:
|
||||
cmd.append('--cflags')
|
||||
if ldflags:
|
||||
@@ -5,38 +5,38 @@
|
||||
"lts": false
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.178",
|
||||
"hash": "sha256:03vjdk7lk9zgydzamhwvrg066f8748vrfjggqqd2n0vmr9kzm0vx",
|
||||
"version": "6.1.177",
|
||||
"hash": "sha256:0c0ayz4nygcmz4865r7mcgmh7hic4fi7zysnj6vdlyj53bz9nlpn",
|
||||
"lts": true
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.212",
|
||||
"hash": "sha256:1zk51f3pv7ghz68hxkxhds9cjwmk35651pxbyyvyqyhcr7msx5n3",
|
||||
"version": "5.15.211",
|
||||
"hash": "sha256:0qfry534wl5sbm6b4hf6fxqrr6mzf1k9pa2435sqp4hp6vjm9fdy",
|
||||
"lts": true
|
||||
},
|
||||
"5.10": {
|
||||
"version": "5.10.261",
|
||||
"hash": "sha256:1i6pzaib30r1nmyxsrhqmfsdxy1jvvlmzc9f8lxzv9a00q8a3751",
|
||||
"version": "5.10.260",
|
||||
"hash": "sha256:113bka32apz5pfqjfnv97k9hf9arkn5asfcd6cw7snsh65qjka27",
|
||||
"lts": true
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.145",
|
||||
"hash": "sha256:09h1pzcai0i10pdyyfbsmq03rgk1x5wv2d937m5nz2xdv0rhw46y",
|
||||
"version": "6.6.144",
|
||||
"hash": "sha256:1hzcax2ypzhrjzmq4b0jyqyc4al0ncyfcj9pq36phl29gcqbh6gc",
|
||||
"lts": true
|
||||
},
|
||||
"6.12": {
|
||||
"version": "6.12.97",
|
||||
"hash": "sha256:0vswyjh91x52ay99mqrdfhwnvd6nnzv4hpncywk908njpfixzgbc",
|
||||
"version": "6.12.96",
|
||||
"hash": "sha256:1hapz6xz7plq56jc0drbzcsfcm1amlnphwbfhl0klsxkb9finbkx",
|
||||
"lts": true
|
||||
},
|
||||
"6.18": {
|
||||
"version": "6.18.40",
|
||||
"hash": "sha256:0cd42fb4390x73jdzbhacm9g9s0ji58whxhik2ndmr1rr0ggq4ip",
|
||||
"version": "6.18.39",
|
||||
"hash": "sha256:1c4c3wf00pb8x4kxxrmn46n7mgpnnm78sfi2jx0yg5cxmv9f79x7",
|
||||
"lts": true
|
||||
},
|
||||
"7.1": {
|
||||
"version": "7.1.5",
|
||||
"hash": "sha256:1rs162gcf6hsafrrmp3y8k9myn20s3s62xdp4zf39pxw7imik812",
|
||||
"version": "7.1.4",
|
||||
"hash": "sha256:0blfl34vi6vlcdjxd7mbhskl2p7i0zpgdy707a7d6xcn24m94qqw",
|
||||
"lts": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7981,6 +7981,7 @@ with pkgs;
|
||||
|
||||
qemu_test = lowPrio (
|
||||
qemu.override {
|
||||
hostCpuOnly = true;
|
||||
nixosTestRunner = true;
|
||||
}
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user