xfce: add update script #84292
Merged
xfce: add update script #84292
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
6.topic: xfce
|
The script does not work yet because it fails to correctly find the file (usually |
nix-shell maintainers/scripts/update.nix --argstr path xfce.thunar
|
|
@romildo This isn't optimal, we should really make diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix
index b7dc8322569..3f38ecedb53 100644
--- a/pkgs/desktops/xfce/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce/mkXfceDerivation.nix
@@ -31,6 +31,7 @@ let
homepage = "https://git.xfce.org/${category}/${pname}/about";
license = licenses.gpl2; # some libraries are under LGPLv2+
platforms = platforms.linux;
+ pos = builtins.unsafeGetAttrPos "pname" args;
};
};
|
|
It should probably make nixpkgs-update work as well. |
worldofpeace
reviewed
Apr 5, 2020
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 11-100
and removed
10.rebuild-darwin: 0
10.rebuild-linux: 0
labels
|
The update script is functional now. It is able to update packages from the xfce git server, from github, and from the xfce archive site. All Xfce packages has an update script, except the following:
|
worldofpeace
suggested changes
Apr 6, 2020
There was a problem hiding this comment.
Currently running update.nix will generate a .drv per package. That isn't very fast.
If you make update.nix return a list we can avoid this.
Look how gnome3's update script takes all the arguments the nix expression needs:
and then puts them into a list:
nixpkgs/pkgs/desktops/gnome-3/update.nix
Line 16 in e41a9d2
now it will just have a list of commands to run.
Done. |
|
This updater can be made general enough to work for several other packages. It basically does the following:
Arguments may be used to parameterize the updater with options that would allow for instance choosing the method of collecting source versions, transforming the version, or checking if a version is unstable. The updater could be moved to @worldofpeace what is your opinion on this? |
|
The update scripts have been moved to |
|
With this changes one can use Besides changing the nix expressions, it will output the file $ cat update-git-commits.txt |
|
@romildo I think in nixpkgs and the esosystem alone there's a lot of updaters in nixpkgs and outside it. And new one's being written https://github.com/Mic92/nix-update (I even have one for the packages I maintain https://github.com/NixOS/nixpkgs/tree/master/pkgs/desktops/pantheon/nixpkgs_github_update). So I'm a bit disillusioned by how many there are, I personally wish I didn't make "yet another". Though I do think if there was something documented in the manual for a "default" updateScript that nixpkgs contributors could use, it would be a good improvement. |
Would you want to add that file to git's ignores? |
worldofpeace
approved these changes
Apr 13, 2020
@worldofpeace do you mean a separate PR only for the changes in |
- updateScript: A nix expression that can be used in passThrough to update a package - list-git-tags: A shell script to list available tags in a git repository - list-archive-two-level-versions: A shell script to list available versions in a web site in two levels: there is a page listing the available major.minor versions, and for each of them there is another page listings the patch level versions major.minor.patch. It is suitable for Xfce packages for instance. How the updater works: 1. collect the available versions from the source repository (using a script given as argument) 2. print the collected versions (for debugging) 3. (optionally) apply some transformation to the collected versions to make them compatible with the versions used in nixpkgs (for instance, tags in the Xfce git repository may be prefixed with the package name, and the prefix need to be removed) 4. sort the available versions in decreasing order 5. choose the first version that pass validation: - check if the version may be a development version - if the version IS unstable, skip it and give a warning about skipping a development version (for debugging) - if the version COULD BE unstable, take it and give a warning about taking a potential development version (for debugging) - if the version IS stable, take it 6. update the package version and checksum in its nix expression 7. print the git commands for adding the modified files and for committing the changes
It is generated by common-updater/update-script.nix
This PR is not adding |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Do not merge yet. This is a working in progress.Add an update script to Xfce.
Fixes #81568.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)