-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
openmoji-black,openmoji-color: fix hanging builds #174795
Conversation
pkgs/data/fonts/openmoji/default.nix
Outdated
]; | ||
buildInputs = old.buildInputs ++ [ libuninameslist ]; | ||
}); | ||
scfbuild-with-pinned-fontforge = scfbuild.override (old: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: It seems weird to call one the date and one just "pinned". Maybe just call both -pinned
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer using the version then. Fixed.
Result of 2 packages built:
|
...by downgrading fontforge. Fixes NixOS#167869
3a1e92b
to
6ee6794
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please keep the original names so that we don't mix two versions together.
@@ -26,7 +57,7 @@ in stdenv.mkDerivation rec { | |||
}; | |||
|
|||
nativeBuildInputs = [ | |||
scfbuild | |||
scfbuild-with-fontforge-20201107 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scfbuild-with-fontforge-20201107 | |
scfbuild |
scfbuild-with-fontforge-20201107 = scfbuild.override (old: { | ||
fontforge = fontforge-20201107; | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scfbuild-with-fontforge-20201107 = scfbuild.override (old: { | |
fontforge = fontforge-20201107; | |
}); | |
scfbuild = scfbuild.override (old: { | |
inherit fontforge; | |
}); |
# https://github.com/NixOS/nixpkgs/issues/167869 | ||
# Patches etc taken from | ||
# https://github.com/NixOS/nixpkgs/commit/69da642a5a9bb433138ba1b13c8d56fb5bb6ec05 | ||
fontforge-20201107 = fontforge.overrideAttrs (old: rec { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fontforge-20201107 = fontforge.overrideAttrs (old: rec { | |
fontforge = fontforge.overrideAttrs (old: rec { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't that infinite recursion since in nix let
is recursive?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤔 could be. I am not sure right now.
Then normally something like the following is used
fontforge-20201107 = fontforge.overrideAttrs (old: rec { | |
fontforge' = fontforge.overrideAttrs (old: rec { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the shadowing doesn't work I would rather stick with meaningful names rather than '
.
|
Successfully created backport PR #175190 for |
Description of changes
Fixes #167869
ZHF: #172160
@NixOS/nixos-release-managers
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes