colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-05-26 -> 2024-05-31, nixpkgs-wayland -> 2024-05-31

Browse Source 
```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/2baa940f86e1fc54757fd7d1ed551c0a38904bf2' (2024-05-26)
  → 'github:nixos/nixpkgs/d3d81af60c22e9e93a3930a9630b210362341ab9' (2024-05-31)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/7780e5160e011b39019797a4c4b1a4babc80d1bf' (2024-05-26)
  → 'github:nixos/nixpkgs/4e60a4d94bdc1abafeefc1928aa3cda6ce6c4210' (2024-05-31)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/397c85d463aef789a8dd24c4db467e9ad787907b' (2024-05-26)
  → 'github:nix-community/nixpkgs-wayland/1db9b79a45c8e346e03480767e6d9749fabfaf10' (2024-05-31)
```
This commit is contained in:
Colin
2024-05-30 21:40:11 +00:00
parent 0fcc3f8d5d
commit c7fd3d2217
4 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@@ -167,11 +167,11 @@
}, },
"nixpkgs-next-unpatched": { "nixpkgs-next-unpatched": {
"locked": { "locked": {
"lastModified": 1716724870, "lastModified": 1717113723,
"narHash": "sha256-nl8hhDgP/F2VmqN5NdHVpYyGMLUkBn5dnYCtj4LRmHs=", "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2baa940f86e1fc54757fd7d1ed551c0a38904bf2", "rev": "d3d81af60c22e9e93a3930a9630b210362341ab9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -199,11 +199,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1716735846, "lastModified": 1717125154,
"narHash": "sha256-tNsfjHkdF8ZJqfCKPrQWRApO/UD0eD2Ge4b8YHzEtcA=", "narHash": "sha256-8VpPVwCOYIdVuAxdCCobva1zqECuh732V5GDG5rzptI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7780e5160e011b39019797a4c4b1a4babc80d1bf", "rev": "4e60a4d94bdc1abafeefc1928aa3cda6ce6c4210",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -223,11 +223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729436, "lastModified": 1717117873,
"narHash": "sha256-wido1xW88LX7qKTxmEWkQoQ5E8P03T9libDjM/bHIHs=", "narHash": "sha256-d7pL/XDVUwO0XnmqUxSIdWk+mzEVcwhoW9B2sgAVIr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "397c85d463aef789a8dd24c4db467e9ad787907b", "rev": "1db9b79a45c8e346e03480767e6d9749fabfaf10",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/common/programs/handbrake.nix
View File

@@ -17,7 +17,7 @@
# disable expensive sambda dependency; i don't use it. # disable expensive sambda dependency; i don't use it.
packageUnwrapped = pkgs.handbrake.override { packageUnwrapped = pkgs.handbrake.override {
ffmpeg-full = pkgs.ffmpeg-full.override { ffmpeg_7-full = pkgs.ffmpeg_7-full.override {
withSamba = false; withSamba = false;
}; };
}; };

6
nixpatches/list.nix
View File

@@ -38,12 +38,6 @@ in [
hash = "sha256-hAaFHlJdx1GjQIJG5zxTBHm+CbmR/zlKUB9eyxPQbOg="; hash = "sha256-hAaFHlJdx1GjQIJG5zxTBHm+CbmR/zlKUB9eyxPQbOg=";
}) })
(fetchpatch' {
title = "gnome.gnome-keyring: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/311773";
hash = "sha256-HQax4h18Eb34I7qn00LvJtsJj65ZtEWjJMdvctt/PbY=";
})
# branch: wip-ffado-cross # branch: wip-ffado-cross
(fetchpatch' { (fetchpatch' {
# TODO: send out for review (after jtolnar's stuff is merged) # TODO: send out for review (after jtolnar's stuff is merged)

24
overlays/cross.nix
View File

@@ -1154,6 +1154,30 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; }; # callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# }); # });
libphonenumber = prev.libphonenumber.overrideAttrs (upstream: {
# fix that phone number geolocation binary doesn't cross compile.
# it's CMAKE, and a google project, so the fix to cross compile is unlikely to *ever* make it upstream.
# see: <https://github.com/google/libphonenumber/pull/2604>
#
# the main (only?) user of this library is evolution-data-server,
# which is consumed by gnome-calender, calls, planify.
# maybe i can purge EDS from my system somehow.
# - geary: package doesn't even have EDS as an input; it speaks to it over dbus.
# - calls: package has EDS as input (unused?); speaks to it over dbus.
# - it actually needs EDS though, for its `libebook-contacts` library: <https://gnome.pages.gitlab.gnome.org/evolution-data-server/libebook-contacts/>
# - gnome-calendar: package has EDS as input (unused?); speaks to it over dbus.
# - it actually needs EDS though, for its `libedataserverui4` library: <https://gnome.pages.gitlab.gnome.org/evolution-data-server/libedataserverui4/>
# - planify: package has EDS as input (unused?); speaks to it over dbus.
# - it actually needs EDS though, for its `libecal` library: <https://gnome.pages.gitlab.gnome.org/evolution-data-server/libecal/>
# - it could be using evolution-data-server-gtk4 instead of EDS gtk3 though
#
# or build EDS with `-DWITH_PHONENUMBER=OFF`
cmakeFlags = (upstream.cmakeFlags or []) ++ [
"-DPROTOC_BIN=${lib.getExe buildPackages.protobuf}"
"-DBUILD_GEOCODER=OFF"
];
});
# 2024/02/27: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/291947> # 2024/02/27: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/291947>
# but i don't think either the pkg-config fix (which breaks binfmt cross) nor disabling docs is the right fix. # but i don't think either the pkg-config fix (which breaks binfmt cross) nor disabling docs is the right fix.
# libshumate = prev.libshumate.overrideAttrs (upstream: { # libshumate = prev.libshumate.overrideAttrs (upstream: {