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
Add versions to packages missing it #41009
Conversation
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: renoise Partial log (click to expand)
|
No attempt on x86_64-linux (full log) The following builds were skipped because they don't evaluate on x86_64-linux: renoise Partial log (click to expand)
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: renoise Partial log (click to expand)
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise Partial log (click to expand)
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: okteta, renoise Partial log (click to expand)
|
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.
LGTM, other than a few things I've mentioned. Also, feel free to remove commits I've added to this branch if those get in the way.
pkgs/applications/altcoins/mist.nix
Outdated
@@ -56,7 +56,7 @@ let | |||
}; | |||
in | |||
buildFHSUserEnv { | |||
name = "mist"; | |||
inherit name; |
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.
This seems to clash with another derivation named above: https://github.com/matthewbauer/nixpkgs/blob/931b6c016ea89978381df514511b8b663433d345/pkgs/applications/altcoins/mist.nix#L28
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.
Yes we should do a suffix here. Something like "mist-wrapper"?
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 thought maybe about giving unwrapped version a suffix, like -unwrapped
.
@@ -117,7 +117,7 @@ in if configure == null then weechat else | |||
ln -s $plugin $out/plugins | |||
done | |||
''; | |||
in (writeScriptBin "weechat" '' | |||
in (writeScriptBin "weechat-${stdenv.lib.getVersion weechat}" '' |
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.
This would change script's name.
@@ -51,7 +51,7 @@ let | |||
|
|||
in | |||
stdenv.mkDerivation { | |||
inherit name; | |||
name = "${name}-${stdenv.lib.getVersion neovim}"; |
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.
This seems to cause name clash between unwrapped and wrapped version.
@@ -77,7 +77,7 @@ let | |||
|
|||
# Lightworks expects some files in /usr/share/lightworks | |||
in buildFHSUserEnv rec { | |||
name = "lightworks"; | |||
name = "lightworks-${stdenv.lib.getVersion lightworks}"; |
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.
Same concern.
let | ||
|
||
emacs = emacsPackagesNg.emacsWithPackages (epkgs: [ epkgs.cask-package-toolset ]); | ||
cpt = emacsPackagesNg.cask-package-toolset; | ||
|
||
in writeScriptBin "cask" '' | ||
in writeScriptBin "cask-${lib.getVersion emacs}" '' |
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.
This would rename the script.
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.
Ok good catch! I'll just leave that out then.
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise, simgrid Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on x86_64-linux: renoise Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: okteta, simgrid The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: okteta, simgrid The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: okteta, simgrid, yuicompressor The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise, simgrid, yuicompressor Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise, simgrid Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise, simgrid Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on aarch64-linux: renoise Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Attempted: yuicompressor The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise, simgrid Partial log (click to expand)
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise, simgrid Partial log (click to expand)
|
@@ -1,7 +1,7 @@ | |||
{ stdenv, R, makeWrapper, recommendedPackages, packages }: | |||
|
|||
stdenv.mkDerivation { | |||
name = R.name + "-wrapper"; | |||
stdenv.lib.appendToName "wrapper" (stdenv.mkDerivation { |
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.
Why is this version better than what we have now? They seem to give the same result.
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 agree, if they are functionally equivalent I like the old version more given that it avoids one level of parenthesis nesting.
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.
The difference is where the version goes. AppendToName will put this before the version.
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.
Ah, you are right. That is the difference, indeed. :-)
As it happens, I actually don't want that change. I want the package name to be R
and the version to be 3.5.0-wrapper
. I don't want the package to be called R-wrapper
.
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.
Ok. Any opinions on the other 3? My assumption was that they were all mistakes, not realizing that the version is at the end of name.
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.
Thanks! I have no opinion on those other 3 cases, I don't maintain those packages.
Failure on x86_64-darwin (full log) Attempted: gimp, yuicompressor The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise, simgrid Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: gimp, okteta, simgrid, yuicompressor The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
@@ -11,10 +11,6 @@ stdenv.mkDerivation { | |||
|
|||
buildInputs = [ perl ]; | |||
|
|||
phases = [ "unpackPhase" |
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.
This phases = ...
change should probably be split out of this PR.
Failure on aarch64-linux (full log) Attempted: gimp, okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise, simgrid, yuicompressor Partial log (click to expand)
|
da6f0c9
to
398076b
Compare
Failure on x86_64-linux (full log) Attempted: gimp, okteta, simgrid, yuicompressor The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Lots of packages are missing versions in their name. This adds them where appropriate. These were found with this command: $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$' See issue NixOS#41007.
Uses the POSIX standard 1003.1-2008 as version number. It can be accessed for free at http://pubs.opengroup.org/onlinepubs/9699919799/.
Using appendToName preserves the version at the end of the name.
All gimp plugins are now prefixed with "gimp-plugin-" to make them more clear.
398076b
to
ee8fa75
Compare
Failure on aarch64-linux (full log) Attempted: gimp, okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise, simgrid, yuicompressor Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Attempted: gimp, yuicompressor The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise, simgrid Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Attempted: gimp, yuicompressor The following builds were skipped because they don't evaluate on x86_64-darwin: atlassian-cli, okteta, renoise, simgrid Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: gimp, okteta, simgrid, yuicompressor The following builds were skipped because they don't evaluate on x86_64-linux: atlassian-cli, renoise Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: gimp, okteta The following builds were skipped because they don't evaluate on aarch64-linux: atlassian-cli, renoise, simgrid, yuicompressor Partial log (click to expand)
|
Motivation for this change
See #41007 for more details.
Most of these were found with this command:
nixpkgs-unstable:
PR HEAD: