Unverified Commit f197472a authored by K900's avatar K900 Committed by GitHub
Browse files

staging-nixos merge for 2025-11-24 (#464546)

parents 5d924f3d f3c656f9

pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ It must be one of the following: 
	attribute path from file specified by the *--file* option. If specified

	without *--file* option, uses _default.nix_ in current directory.



*--flake* _flake-uri[#name]_

*--flake* _flake-uri[#name]_, *-F* _flake-uri[#name]_

	Build the NixOS system from the specified flake. It defaults to the

	directory containing the target of the symlink _/etc/nixos/flake.nix_,

	if it exists. The flake must contain an output named

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa 
    )

    main_parser.add_argument(

        "--flake",

        "-F",

        nargs="?",

        const=True,

        help="Build the NixOS system from the specified flake",

pkgs/by-name/ru/ruff/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "ruff";

  version = "0.14.5";

  version = "0.14.6";



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = "ruff";

    tag = finalAttrs.version;

    hash = "sha256-oABi0FnI09TCm++rUPPZeeKEFLWFRQMhTawYE/DLB9k=";

    hash = "sha256-xGQGodhDHrXIfCJ/Igv8TunsLo38FRRgnR1el+VKWGM=";

  };



  cargoBuildFlags = [ "--package=ruff" ];



  cargoHash = "sha256-8YjIGdtxlbLhJkz1HAwEkCgLpvQda1CoYsvoJY+4LVo=";

  cargoHash = "sha256-xbYWTuSvC1iqCNF+kIHKuQEjtdv+Z7DlL/4KUAXNcW0=";



  nativeBuildInputs = [ installShellFiles ];

pkgs/os-specific/linux/kernel/kernels-org.json

+8 −8
Original line number Diff line number Diff line 
{

    "testing": {

        "version": "6.18-rc3",

        "hash": "sha256:01cjjg23av5p8hxbqwfz4jbl0rzm3d1ldibapqcbkkxfcjri612n",

        "version": "6.18-rc7",

        "hash": "sha256:03k1kj4bqg3bn0p4lzkbz0yqj1p50v2yr94lrld8rrkbwdawxx3r",

        "lts": false

    },

    "6.1": {
@@ -20,18 +20,18 @@ 
        "lts": true

    },

    "6.6": {

        "version": "6.6.116",

        "hash": "sha256:07d5629579apc1d8yb0ki226iyb5n3lwp1yw0p189qlvq919g9d9",

        "version": "6.6.117",

        "hash": "sha256:1la3if0n4pv8lii4ggh4c69a61aga66bdl7x1jkvvz92j83k2fv4",

        "lts": true

    },

    "6.12": {

        "version": "6.12.58",

        "hash": "sha256:1b0k8snqa2hhviv9imn02y6jrbbb62an3ypx8q8ai9k0cra4q72z",

        "version": "6.12.59",

        "hash": "sha256:1gjqr91qysbzx55ic8101l8vsfb4q09bph8m4q1fq3pi4xrwvlm1",

        "lts": true

    },

    "6.17": {

        "version": "6.17.8",

        "hash": "sha256:1nmi5xmsys023xgy55dikm1ihim7fp7pf2kc3k00d9zwfm5fd3as",

        "version": "6.17.9",

        "hash": "sha256:01lfiw67jm853jr3wddvv0hl6lljscg2ils4ips9sl1wjlxq023d",

        "lts": false

    }

}

pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ _nixos-rebuild() { 


    # flakes options

    --commit-lock-file

    --flake # flake-uri

    --flake -F # flake-uri

    --override-input # input-name flake-uri

    --recreate-lock-file

    --update-input