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

nixpkgs: 2025-08-27 -> 2025-08-28; remove upstreamed newsflash cross code

Browse Source
This commit is contained in:
Colin
2025-08-28 16:01:56 +00:00
parent 94289c2253
commit 1c5c9b80eb
5 changed files with 9 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
overlays/cross.nix
View File

@@ -349,46 +349,6 @@ in with final; {
# 2025/07/27: upstreaming is unblocked by deps; but turns out to not be this simple
# ncftp = addNativeInputs [ bintools ] prev.ncftp;
# 2025/08/27: upstreaming is unblocked, implemented on desko branch `pr-newsflash-cross`
# newsflash = (prev.newsflash.override {
# cargo = crossCargo;
# }).overrideAttrs (upstream: {
# postPatch = (upstream.postPatch or "") + ''
# rm build.rs
# export OUT_DIR=$(pwd)
# # from build.rs:
# glib-compile-resources --sourcedir=data/resources --target=icons.gresource data/resources/icons.gresource.xml
# glib-compile-resources --sourcedir=data/resources --target=styles.gresource data/resources/styles.gresource.xml
# substitute data/io.gitlab.news_flash.NewsFlash.appdata.xml.in.in \
# data/resources/io.gitlab.news_flash.NewsFlash.appdata.xml \
# --replace-fail '@appid@' 'io.gitlab.news_flash.NewsFlash'
# glib-compile-resources --sourcedir=data/resources --target=appdata.gresource data/resources/appdata.gresource.xml
# '';
# env = let
# ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
# cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
# ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
# cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
# rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget;
# rustTargetPlatform = stdenv.hostPlatform.rust.rustcTarget;
# in (upstream.env or {}) // {
# # taken from <pkgs/build-support/rust/hooks/default.nix>
# # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’"
# # XXX: these aren't necessarily valid environment variables: the referenced nix file is more clever to get them to work.
# "CC_${rustBuildPlatform}" = "${ccForBuild}";
# "CXX_${rustBuildPlatform}" = "${cxxForBuild}";
# "CC_${rustTargetPlatform}" = "${ccForHost}";
# "CXX_${rustTargetPlatform}" = "${cxxForHost}";
# # fails to fix "Failed to find OpenSSL development headers."
# # OPENSSL_NO_VENDOR = 1;
# # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
# # OPENSSL_DIR = "${lib.getDev openssl}";
# };
# });
# fixes "properties/gresource.xml: Permission denied"
# - by providing glib-compile-resources
# 2025/07/27: upstreaming is blocked on gst-plugins-good, qtkeychain, qtmultimedia, qtquick3d, qt-jdenticon

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "2882c071a83fa909c4c3d171f65c71000e90f9fb";
sha256 = "sha256-q5G/GIlkYheWnM667b/mm1sVWK9FpncwQU8vdMIcJE0=";
version = "unstable-2025-08-27";
rev = "9bd1c4b190d825cc25b3bacc0e612801837fc6c1";
sha256 = "sha256-DjOO5XuELbVjN1xB+aQx4r/X8QXJ4ausEBSZUKjzUl8=";
version = "unstable-2025-08-28";
branch = "master";
}

7
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -109,13 +109,6 @@ in
hash = "sha256-nzqbRP9wHyDnwKyaATZ5mSyn68qgRvs4pEtAkhauiMM=";
})
(fetchpatch' {
name = "newsflash: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437702";
# saneCommit = "0453c58e9acf42c4ba52f3fda21d7e51139c0141";
hash = "sha256-UFH2BIiLROBo8jdKY8DRogt4Fjd1veZydfQqb4endls=";
})
# (fetchpatch' {
# # opencv used by alpaca, newelle
# name = "opencv: fix cross compliation by patching protobuf";

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "1eb52cf9f9307213080f56de3e7d02b79cd8ebde";
sha256 = "sha256-Vsb31y26+BCM4D0v+EaIWE4clduuJsA6lILmKBKEUI0=";
version = "unstable-2025-08-26";
rev = "31e6171f4eaf4ace50a742afaee052a6d646ca09";
sha256 = "sha256-R3YOPbE2ipa7vCnUJqKtWe54/LYq+hC1hDJHCnHMEkg=";
version = "unstable-2025-08-28";
branch = "staging-next";
}

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "b87fce245e13a2a7dfebb232e86f9e34d382e0c8";
sha256 = "sha256-0H/mKn37EOLPGrdPw9zAsgbPqnpy1rK7gCuMZ1HS9sg=";
version = "unstable-2025-08-26";
rev = "b4d7d83861f69b7c8bb73a5d289c4463033ba1a1";
sha256 = "sha256-D//FMt4yjbo/2VptV9tU5l13Ni/CQ2SJp34Bf0DGRXM=";
version = "unstable-2025-08-27";
branch = "staging";
}