Merge staging-next into staging
This commit is contained in:
commit
47e57e29f7
|
@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20libxcrypt&type=code).
|
||||
|
||||
- `boot.bootspec.enable` (internal option) is now enabled by default because [RFC-0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot usecases in NixOS such as SecureBoot.
|
||||
|
||||
## New Services {#sec-release-23.05-new-services}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
@ -37,7 +37,7 @@ in {
|
|||
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${lib.getExe pkgs.auto-cpufreq} --config ${cfgFile}"
|
||||
"${lib.getExe pkgs.auto-cpufreq} --daemon --config ${cfgFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
#V1: {
|
||||
import "struct"
|
||||
|
||||
#BootspecV1: {
|
||||
system: string
|
||||
init: string
|
||||
initrd?: string
|
||||
|
@ -7,12 +9,23 @@
|
|||
kernelParams: [...string]
|
||||
label: string
|
||||
toplevel: string
|
||||
specialisation?: {
|
||||
[=~"^"]: #V1
|
||||
}
|
||||
extensions?: {...}
|
||||
}
|
||||
|
||||
Document: {
|
||||
v1: #V1
|
||||
// A restricted document does not allow any official specialisation
|
||||
// information in it to avoid "recursive specialisations".
|
||||
#RestrictedDocument: struct.MinFields(1) & {
|
||||
"org.nixos.bootspec.v1": #BootspecV1
|
||||
[=~"^"]: #BootspecExtension
|
||||
}
|
||||
|
||||
// Specialisations are a hashmap of strings
|
||||
#BootspecSpecialisationV1: [string]: #RestrictedDocument
|
||||
|
||||
// Bootspec extensions are defined by the extension author.
|
||||
#BootspecExtension: {...}
|
||||
|
||||
// A "full" document allows official specialisation information
|
||||
// in the top-level with a reserved namespaced key.
|
||||
Document: #RestrictedDocument & {
|
||||
"org.nixos.specialisation.v1"?: #BootspecSpecialisationV1
|
||||
}
|
||||
|
|
|
@ -16,20 +16,20 @@ let
|
|||
filename = "boot.json";
|
||||
json =
|
||||
pkgs.writeText filename
|
||||
(builtins.toJSON
|
||||
(builtins.toJSON
|
||||
# Merge extensions first to not let them shadow NixOS bootspec data.
|
||||
(cfg.extensions //
|
||||
{
|
||||
v1 = {
|
||||
"org.nixos.bootspec.v1" = {
|
||||
system = config.boot.kernelPackages.stdenv.hostPlatform.system;
|
||||
kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
|
||||
kernelParams = config.boot.kernelParams;
|
||||
label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
|
||||
|
||||
inherit (cfg) extensions;
|
||||
} // lib.optionalAttrs config.boot.initrd.enable {
|
||||
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
|
||||
initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets";
|
||||
};
|
||||
});
|
||||
}));
|
||||
|
||||
generator =
|
||||
let
|
||||
|
@ -42,8 +42,8 @@ let
|
|||
toplevelInjector = lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
''
|
||||
.v1.toplevel = $toplevel |
|
||||
.v1.init = $init
|
||||
."org.nixos.bootspec.v1".toplevel = $toplevel |
|
||||
."org.nixos.bootspec.v1".init = $init
|
||||
''
|
||||
"--sort-keys"
|
||||
"--arg" "toplevel" "${placeholder "out"}"
|
||||
|
@ -62,14 +62,10 @@ let
|
|||
lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
"--sort-keys"
|
||||
".v1.specialisation = ($ARGS.named | map_values(. | first | .v1))"
|
||||
''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))''
|
||||
] + " ${lib.concatStringsSep " " specialisationLoader}";
|
||||
in
|
||||
''
|
||||
mkdir -p $out/bootspec
|
||||
|
||||
${toplevelInjector} | ${specialisationInjector} > $out/${filename}
|
||||
'';
|
||||
"${toplevelInjector} | ${specialisationInjector} > $out/${filename}";
|
||||
|
||||
validator = pkgs.writeCueValidator ./bootspec.cue {
|
||||
document = "Document"; # Universal validator for any version as long the schema is correctly set.
|
||||
|
@ -79,10 +75,17 @@ let
|
|||
in
|
||||
{
|
||||
options.boot.bootspec = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Enable generation of RFC-0125 bootspec in $system/bootspec, e.g. /run/current-system/bootspec");
|
||||
enable = lib.mkEnableOption (lib.mdDoc "the generation of RFC-0125 bootspec in $system/boot.json, e.g. /run/current-system/boot.json")
|
||||
// { default = true; internal = true; };
|
||||
enableValidation = lib.mkEnableOption (lib.mdDoc ''the validation of bootspec documents for each build.
|
||||
This will introduce Go in the build-time closure as we are relying on [Cuelang](https://cuelang.org/) for schema validation.
|
||||
Enable this option if you want to ascertain that your documents are correct.
|
||||
''
|
||||
);
|
||||
|
||||
extensions = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.attrs; # <namespace>: { ...namespace-specific fields }
|
||||
# NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation.
|
||||
type = lib.types.attrsOf lib.types.anything; # <namespace>: { ...namespace-specific fields }
|
||||
default = { };
|
||||
description = lib.mdDoc ''
|
||||
User-defined data that extends the bootspec document.
|
||||
|
@ -112,15 +115,4 @@ in
|
|||
default = schemas.v1.filename;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (cfg.enable) {
|
||||
warnings = [
|
||||
''RFC-0125 is not merged yet, this is a feature preview of bootspec.
|
||||
The schema is not definitive and features are not guaranteed to be stable until RFC-0125 is merged.
|
||||
See:
|
||||
- https://github.com/NixOS/nixpkgs/pull/172237 to track merge status in nixpkgs.
|
||||
- https://github.com/NixOS/rfcs/pull/125 to track RFC status.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -82,7 +82,8 @@ let
|
|||
|
||||
${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) ''
|
||||
${config.boot.bootspec.writer}
|
||||
${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"
|
||||
${optionalString config.boot.bootspec.enableValidation
|
||||
''${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"''}
|
||||
''}
|
||||
|
||||
${config.system.extraSystemBuilderCmds}
|
||||
|
|
|
@ -110,7 +110,7 @@ in
|
|||
|
||||
machine.succeed("test -e /run/current-system/boot.json")
|
||||
|
||||
bootspec = json.loads(machine.succeed("jq -r '.v1' /run/current-system/boot.json"))
|
||||
bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
|
||||
|
||||
assert all(key in bootspec for key in ('initrd', 'initrdSecrets')), "Bootspec should contain initrd or initrdSecrets field when initrd is enabled"
|
||||
'';
|
||||
|
@ -136,10 +136,10 @@ in
|
|||
machine.succeed("test -e /run/current-system/boot.json")
|
||||
machine.succeed("test -e /run/current-system/specialisation/something/boot.json")
|
||||
|
||||
sp_in_parent = json.loads(machine.succeed("jq -r '.v1.specialisation.something' /run/current-system/boot.json"))
|
||||
sp_in_parent = json.loads(machine.succeed("jq -r '.\"org.nixos.specialisation.v1\".something' /run/current-system/boot.json"))
|
||||
sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/boot.json"))
|
||||
|
||||
assert sp_in_parent == sp_in_fs['v1'], "Bootspecs of the same specialisation are different!"
|
||||
assert sp_in_parent['org.nixos.bootspec.v1'] == sp_in_fs['org.nixos.bootspec.v1'], "Bootspecs of the same specialisation are different!"
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -152,7 +152,9 @@ in
|
|||
imports = [ standard ];
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
boot.bootspec.extensions = {
|
||||
osRelease = config.environment.etc."os-release".source;
|
||||
"org.nix-tests.product" = {
|
||||
osRelease = config.environment.etc."os-release".source;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -161,7 +163,7 @@ in
|
|||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
current_os_release = machine.succeed("cat /etc/os-release")
|
||||
bootspec_os_release = machine.succeed("cat $(jq -r '.v1.extensions.osRelease' /run/current-system/boot.json)")
|
||||
bootspec_os_release = machine.succeed("cat $(jq -r '.\"org.nix-tests.product\".osRelease' /run/current-system/boot.json)")
|
||||
|
||||
assert current_os_release == bootspec_os_release, "Filename referenced by extension has unexpected contents"
|
||||
'';
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, clangStdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, flac
|
||||
}:
|
||||
|
||||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
buildGoModule rec {
|
||||
pname = "go-musicfox";
|
||||
version = "4.0.5";
|
||||
|
||||
|
@ -45,6 +43,6 @@ buildGoModule.override { stdenv = clangStdenv; } rec {
|
|||
homepage = "https://github.com/anhoder/go-musicfox";
|
||||
license = licenses.mit;
|
||||
mainProgram = "musicfox";
|
||||
maintainers = with maintainers; [ zendo Ruixi-rebirth ];
|
||||
maintainers = with maintainers; [ zendo Ruixi-rebirth aleksana ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14315,6 +14315,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/mattn/webapi-vim/";
|
||||
};
|
||||
|
||||
wgsl-vim = buildVimPluginFrom2Nix {
|
||||
pname = "wgsl.vim";
|
||||
version = "2023-04-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DingDean";
|
||||
repo = "wgsl.vim";
|
||||
rev = "b72cb2c28ec9554be240113bceb34198f88484e6";
|
||||
sha256 = "1l1y9dwp33g5gp5mvyq4vkw8q8369r493i0qfn81nmwnmc09rsbn";
|
||||
};
|
||||
meta.homepage = "https://github.com/DingDean/wgsl.vim/";
|
||||
};
|
||||
|
||||
which-key-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "which-key.nvim";
|
||||
version = "2023-04-18";
|
||||
|
|
|
@ -1202,6 +1202,7 @@ https://github.com/navicore/vissort.vim/,,
|
|||
https://github.com/liuchengxu/vista.vim/,,
|
||||
https://github.com/dylanaraps/wal.vim/,,
|
||||
https://github.com/mattn/webapi-vim/,,
|
||||
https://github.com/DingDean/wgsl.vim/,HEAD,
|
||||
https://github.com/folke/which-key.nvim/,,
|
||||
https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
|
||||
https://github.com/gelguy/wilder.nvim/,,
|
||||
|
|
|
@ -59,6 +59,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "cli" true)
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gstreamer
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "113.0.5672.53",
|
||||
"sha256": "0k91xx3fm0kywjn00s9b7p776882b1mfajf2ig0iz3jac6rprh56",
|
||||
"sha256bin64": "1pzpigz8l6hsddb7v2g9m5d32hlq979l1cpj2yfnc6dixjs8x053",
|
||||
"version": "113.0.5672.63",
|
||||
"sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn",
|
||||
"sha256bin64": "1n1bcim5wfafa3bl9grp3ckmnbi1mzhdxz8pim408wz892da34zl",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-03-18",
|
||||
|
@ -32,15 +32,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "114.0.5720.4",
|
||||
"sha256": "1q9r4m1gda1mq0nwi00yfpxsqdghd0qb3k7a0xa9py8l6jcv8ifa",
|
||||
"sha256bin64": "15ss5xix773yn4g24ww9bw38g7wxgwhdqbgmwy44yvp0yl824czb",
|
||||
"version": "114.0.5735.6",
|
||||
"sha256": "0wxlfqxrawk77yzm00hb1fbssrycl4mha53wm4y5mlb8warqs5jk",
|
||||
"sha256bin64": "0vlb6zr50kn7i0rfvy3yvwzcffpg5ki7is8i3ck43b1gr1bsmgmb",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-04-07",
|
||||
"version": "2023-04-19",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "ffeea1b1fd070cb6a8d47154a03f8523486b50a7",
|
||||
"sha256": "0xpwh06a82nb4j9ifr878rij97dikfcjfbc08cnkmxrx7hs1sjdw"
|
||||
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
|
||||
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -46,11 +46,11 @@
|
|||
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-6PStzU5YBhFDGtQOWUZ8Iyo9miRCTMgDsuJX0rNCYMQ=",
|
||||
"hash": "sha256-8jtZ+uhCpktt1e99j2I1C/sE69uOv911qbuaKTjv2DM=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.203.0",
|
||||
"rev": "v1.204.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -128,11 +128,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-tStlnMSlkkL+X/DP0SBmnm7xL6dH8HfyiaKY/McuMQE=",
|
||||
"hash": "sha256-1K+uM8uRpFigr9scvBL/FDoqc7TKh4ZnppEHnl8i8EA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.53.0",
|
||||
"rev": "v3.54.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -164,22 +164,22 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-2JTJF+zYuf9ZKaEMSOxxjODbmIBXnhpwE8LJUdRIkYY=",
|
||||
"hash": "sha256-lm/BNxfB5ZosyFYihJ6kh8oro+tCP6pRFNnWrvzeKgk=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.31.0",
|
||||
"rev": "v2.32.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mnG2CZ/ko4p4CTs0YskJP41sQD9lmEz4dRQLiklim34="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-e4WvQKtf6zVEZ74c+lE3ZkbX24rPazp8MrJCNQDTz2c=",
|
||||
"hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=",
|
||||
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
|
||||
"owner": "brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v3.3.0",
|
||||
"rev": "v3.4.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI="
|
||||
"vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-/LTUDnE5XB8Gwbs+CroJW+3pM7opNSVQFWvRQWQjFqc=",
|
||||
|
@ -539,11 +539,11 @@
|
|||
"vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-VK/b74pGB8vjaWmUi8Zz4K5utIUYlfeYk18YZF8J1jI=",
|
||||
"hash": "sha256-8ilj+9aCZAlNhQ3OMF6uWFfAAVtISfS6eahywmPAb98=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.47.1",
|
||||
"rev": "v1.48.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -737,13 +737,13 @@
|
|||
"vendorHash": "sha256-Mdy9uXYb7MH9XHqSNkG0QqTVzjvTy4+/Mr6VHXJBEZE="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-Ek7dIKWlyyAoEoMMTHx3DOBNuCoOtXP0CJHAsC04xy0=",
|
||||
"hash": "sha256-NvKthj+rVT23v/V1C8w8CMTfOy3yNsMjg2knXECzay4=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.8.2",
|
||||
"rev": "v1.9.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Eq5qsGKJnP+NOJKinDjHUeTLoeQc/BnK+e9d/O7ie7U="
|
||||
"vendorHash": "sha256-E/1w1FVLHV5X3We3NxKG7INwQtME9FCgFW1uM/6eE38="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
|
@ -764,13 +764,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-/q1kKXdeVjxliE1HeGiusscLM4pYylgik88nxk5gPcs=",
|
||||
"hash": "sha256-+awQtvyJBLSm+WYH2gp+VM2uNbWeEfIbwqw7VsikQEA=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.20.2",
|
||||
"rev": "v3.21.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WF4AdTu6lxoNSCsFKLMeQbHgH6j+hM0VNBRsue+azJA="
|
||||
"vendorHash": "sha256-fqO3hlDUPY8/9SSMpNVD81pyaQE12zwNKDLSI54UF3M="
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
|
||||
|
@ -1235,11 +1235,11 @@
|
|||
"vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
|
||||
},
|
||||
"vultr": {
|
||||
"hash": "sha256-cHMD4/jlXTIQ9ppTFJsUTHVQ3R9Qoe0I3me7zz2bxus=",
|
||||
"hash": "sha256-QZYuxtY89ldGUPNz/DJlFU6HWUJgeJC2TM6cSDoeaYc=",
|
||||
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
|
||||
"owner": "vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.14.0",
|
||||
"rev": "v2.14.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.45.4";
|
||||
version = "0.45.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rqMi+rBWOWoJeoOBpBPKp1lFKzZlWQJfShN5Uyxb5eM=";
|
||||
hash = "sha256-Azf9A/ZHb8wFRsd7iv9Y4jr9xs8R7vNUffz9ky07SVk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y=";
|
||||
vendorHash = "sha256-V7+N+vEOS4DXHglErD5YoUzu6EN4YRljV581kFnjK2M=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version" = "1.11.29";
|
||||
"version" = "1.11.30";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "/q2tMYz2Qu/njoFPzI965Vn69kliLXJqIAhWSB6CnBE=";
|
||||
"desktopYarnHash" = "1v910qx9ij4szs1fyxc1d2lh71zzyga5ry8d9i0pdw9nlwbkqjdh";
|
||||
"webSrcHash" = "tnCaq3k0DFBYnJfS1BY4/OOR9oe+zHMnwATPsOoNAHc=";
|
||||
"webYarnHash" = "0rd7f6ypp64znwdlaxqfahpf6lrr0mn28y3h635bn7ipzfjcqmqk";
|
||||
"desktopSrcHash" = "WICzS+KARX+Z4vfBqBd13wtNB7m18rsXJsFey/MnST0=";
|
||||
"desktopYarnHash" = "0rm0rghd2piaxhf7jvxs6rd6yykgdm8d2a7rxqc9m9xjklxdf6nj";
|
||||
"webSrcHash" = "5o1DEVtkx4PYYRXYdyjVOlkvbQSc9/an5DshARTJTR4=";
|
||||
"webYarnHash" = "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-screen-recorder";
|
||||
version = "5.11.23";
|
||||
version = "5.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yKBF/MmhlgwO5GLwfGgs13ERuzOg8EYjc3bXZ8TvcBU=";
|
||||
sha256 = "sha256-43jqgiBa77UAes0ekMES6IqVOPVXfzfQQjePdxFkNDM=";
|
||||
};
|
||||
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ]}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "2.9.0";
|
||||
version = "2.10.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qVPlrj6EVTPJ/HiwynIg6iuJzUGb6Lan/QKC29C2YNk=";
|
||||
hash = "sha256-pwhq8MAy2FueddEZgAYgsDs7eCrK/bStUhNDhfa+zqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.4.4";
|
||||
version = "2023.4.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5wUx0S3Wg30Kn6RAkybAOMQqRvVDt9HeIJyTPCVHqRc=";
|
||||
hash = "sha256-svXjBWiybJk3RzQtWGzFsvWJX0imhqQmPk9UmdeoIuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-synologydsm-api";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "mib1185";
|
||||
repo = "py-synologydsm-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L+i6PpN+3CgPp1X/EUQTXz1IUW3S0BJuuPPT4LKBtWs=";
|
||||
hash = "sha256-lSNdwM+b91XWILKjGsi73Tu29spOdnFznuE7ELg+mhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-inline-tabs";
|
||||
version = "2022.01.02.beta11";
|
||||
version = "2023.04.21";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pradyunsg";
|
||||
repo = "sphinx-inline-tabs";
|
||||
rev = version;
|
||||
hash = "sha256-k2nOidUk87EZbFsqQ7zr/4eHk+T7wUOYimjbllfneUM=";
|
||||
hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -22,14 +22,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.202";
|
||||
version = "2.3.205";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cJGHby6g4ndz031vxLFmQ9yUAB6lsyGff3eM8vjxUbc=";
|
||||
hash = "sha256-vs7gUYIw7n6PO5hjHFFtfM3gxjUxlmSOEJr8uJmeI6g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -116,7 +116,7 @@ buildPythonApplication rec {
|
|||
# Tests are comparing console output
|
||||
"cli"
|
||||
"console"
|
||||
# Starting to fail after 2.3.202
|
||||
# Starting to fail after 2.3.205
|
||||
"test_non_multiline_pair"
|
||||
];
|
||||
|
||||
|
|
|
@ -421,13 +421,6 @@ in {
|
|||
|
||||
ubootQemuRiscv64Smode = buildUBoot {
|
||||
defconfig = "qemu-riscv64_smode_defconfig";
|
||||
extraPatches = [
|
||||
# https://patchwork.ozlabs.org/project/uboot/patch/20220128134713.2322800-1-alexandre.ghiti@canonical.com/
|
||||
(fetchpatch {
|
||||
url = "https://patchwork.ozlabs.org/series/283391/mbox/";
|
||||
sha256 = "sha256-V0jDpx6O4bFzuaOQejdrRnLiWb5LBTx47T0TZqNtMXk=";
|
||||
})
|
||||
];
|
||||
extraMeta.platforms = ["riscv64-linux"];
|
||||
filesToInstall = ["u-boot.bin"];
|
||||
};
|
||||
|
|
|
@ -1,31 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "can-utils";
|
||||
# There are no releases (source archives or git tags), so use the date of the
|
||||
# latest commit in git master as version number.
|
||||
version = "20170830";
|
||||
version = "2023.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-can";
|
||||
repo = "can-utils";
|
||||
rev = "5b518a0a5fa56856f804372a6b99b518dedb5386";
|
||||
sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FaopviBJOmO0lXoJcdKNdtsoaJ8JrFEJGyO1aNBv+Pg=";
|
||||
};
|
||||
|
||||
# Fixup build with newer Linux headers.
|
||||
postPatch = ''
|
||||
sed '1i#include <linux/sockios.h>' -i \
|
||||
slcanpty.c cansniffer.c canlogserver.c isotpdump.c isotpsniffer.c isotpperf.c
|
||||
'';
|
||||
|
||||
preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CAN userspace utilities and tools (for use with Linux SocketCAN)";
|
||||
homepage = "https://github.com/linux-can/can-utils";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
maintainers = with maintainers; [ bjornfor Luflosi ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pscircle";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mildlyparallel";
|
||||
repo = "pscircle";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sm99423hh90kr4wdjqi9sdrrpk65j2vz2hzj65zcxfxyr6khjci";
|
||||
sha256 = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -140,6 +140,7 @@ assert withImportd -> withCompression;
|
|||
assert withCoredump -> withCompression;
|
||||
assert withHomed -> withCryptsetup;
|
||||
assert withHomed -> withPam;
|
||||
assert withUkify -> withEfi;
|
||||
|
||||
let
|
||||
wantCurl = withRemote || withImportd;
|
||||
|
|
|
@ -4,16 +4,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bootspec";
|
||||
version = "unstable-2022-12-05";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeterminateSystems";
|
||||
repo = pname;
|
||||
rev = "67a617ab6b99211daa92e748d27ead3f78127cf8";
|
||||
hash = "sha256-GX6Tzs/ClTUV9OXLvPFw6uBhrpCWSMI+PfrViyFEIxs=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gf6cIFympRIZo6vzQIX3sQ3ycLlmkDRXtEd2IYH7LQo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N/hbfjsuvwCc0mxOpeVVcTxb5cA024lyLSEpVcrS7kA=";
|
||||
cargoHash = "sha256-8qm9aUvH1EbZ5Jmtw+86KdNyLbYJ7BVExTyyexirTyw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Implementation of RFC-0125's datatype and synthesis tooling";
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "powerline-go";
|
||||
version = "1.22.1";
|
||||
version = "1.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "justjanne";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7QhW0Vn1u63N0fzSiX/vu0HNhFkoSFHXteJCrcFX+4Q=";
|
||||
hash = "sha256-qEVsJsDvqcMVxLz81kNybEO/TwCvhi8E/laci8ry/dw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+R+UwoYJ+KsV+jQj8+wfEsCAvezolsoPDNzCnGLzOEc=";
|
||||
vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Powerline like prompt for Bash, ZSH and Fish";
|
||||
|
|
|
@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "r0oth3x49";
|
||||
repo = "ghauri";
|
||||
rev = "refs7tags/${version}";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WEWiWu8U7DmRjj42BEBXA3CHTyJh2Apz59ImFrmQXEk=";
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue