nixpkgs: 24.05-unstable-2024-06-xx -> 24.05-unstable-2024-06-08
This commit is contained in:
parent
36934eedfd
commit
502c9d1db3
|
@ -148,14 +148,13 @@ let
|
|||
in
|
||||
{
|
||||
sane.programs.mpv = {
|
||||
packageUnwrapped = pkgs.wrapMpv
|
||||
(mpv-unwrapped.override rec {
|
||||
packageUnwrapped = mpv-unwrapped.wrapper {
|
||||
mpv = mpv-unwrapped.override rec {
|
||||
# N.B.: populating `self` to `luajit` is necessary for the resulting `lua.withPackages` function to preserve my override.
|
||||
# i use enable52Compat in order to get `table.unpack`.
|
||||
# i think using `luajit` here instead of `lua` is optional, just i get better perf with it :)
|
||||
lua = pkgs.luajit.override { enable52Compat = true; self = lua; };
|
||||
})
|
||||
{
|
||||
};
|
||||
scripts = [
|
||||
pkgs.mpvScripts.mpris
|
||||
pkgs.mpvScripts.mpv-playlistmanager
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
}:
|
||||
let
|
||||
lock = {
|
||||
master.rev = "716a7056386dcc67eb3b813289499d6329d4befc";
|
||||
master.sha256 = "sha256:1skv9nbnspi3pphk4jzvcj147796m4wqdx8iwdbnl9h4nd3kw6n2";
|
||||
staging.rev = "da9d22446697971278edcd4af92f63221f7d21f6";
|
||||
staging.sha256 = "sha256:0yccyg071zn77i1pfb49dz07difwx5k3w1g0l1vdzlc3xiv9dgmk";
|
||||
staging-next.rev = "5aa86ae5585cd46299ee46682fda8a9b76baf2ae";
|
||||
staging-next.sha256 = "sha256:1dqws7fmdv4l9mk45i88ivzlxzm2b4lbdg9rg4am0z1alsz36dzz";
|
||||
master.rev = "33605cdf028a6bfb96ce5d6e6e87d4779555f35f";
|
||||
master.sha256 = "sha256-Lp669vFtN0vaCyOmXiA1UWrBXyyTlxYu2cZhaD10gn4=";
|
||||
staging.rev = "33605cdf028a6bfb96ce5d6e6e87d4779555f35f";
|
||||
staging.sha256 = "sha256-Lp669vFtN0vaCyOmXiA1UWrBXyyTlxYu2cZhaD10gn4=";
|
||||
staging-next.rev = "33605cdf028a6bfb96ce5d6e6e87d4779555f35f";
|
||||
staging-next.sha256 = "sha256-Lp669vFtN0vaCyOmXiA1UWrBXyyTlxYu2cZhaD10gn4=";
|
||||
};
|
||||
lock' = lock."${variant}";
|
||||
unpatchedSrc = fetchzip {
|
||||
|
@ -81,7 +81,7 @@ in
|
|||
src.overrideAttrs (base: {
|
||||
# attributes needed for update scripts
|
||||
pname = "nixpkgs";
|
||||
version = "24.05-unstable-2024-06-xx";
|
||||
version = "24.05-unstable-2024-06-08";
|
||||
passthru = (base.passthru or {}) // nixpkgs // {
|
||||
src = unpatchedSrc // {
|
||||
inherit (lock') rev;
|
||||
|
|
|
@ -41,12 +41,6 @@ builtins.filter (p: p != null)
|
|||
# hash = "sha256-5W/5/u2CXJJEgTjPx/do6SRZ6WEfhlAi/qXYS/Lsb14=";
|
||||
# })
|
||||
|
||||
(fetchpatch' {
|
||||
title = "networkmanager: 1.46.0 → 1.48.0";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/316417";
|
||||
hash = "sha256-LfQyB3tzQa3UNyZl9HWCuoyBznIhinodlTL6TnPn0Uk=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
title = "nixos/networkmanager: split ModemManager bits into own module";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/316824";
|
||||
|
|
Loading…
Reference in New Issue
Block a user