Skip to content
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

cwm: 5.6 -> 6.3, and myself as maintainer #70018

Merged
merged 2 commits into from
Oct 7, 2019
Merged

cwm: 5.6 -> 6.3, and myself as maintainer #70018

merged 2 commits into from
Oct 7, 2019

Conversation

mkf
Copy link
Contributor

@mkf mkf commented Sep 29, 2019

Motivation for this change

There were huge changes in the syntax and feature set of the cwmrc language, cwm users coming from distros of it such as archlinux or openbsd that have it up-to-date faced the necessity to either abandon cwm and their cwmrc, or to install newer cwm privately if savvy enough, or to rework their whole cwmrc and get used to lack of features and outdated way of operation, from before changes made over a time of something like five years.

Things done

cwm: 5.6 -> 6.3-80-g4154b9b, and i added myself as the sole maintainer, adding myself to maintainers-list for that.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 and removed 6.topic: pantheon The Pantheon desktop environment 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Sep 29, 2019
@ttuegel ttuegel removed their request for review September 29, 2019 13:44
@mkf
Copy link
Contributor Author

mkf commented Sep 29, 2019

after i mentioned it on fediverse and while i wasnt looking there, @0x4A6F made his own patch, somewhat better in fixing a few things although not onto linux branch (80 commits forward from v6.3 tag) of the Leah's cwm repo but onto but the v6.3 tag of Leah's cwm repo

https://github.com/0x4A6F/nixpkgs/tree/master-cwm

although idk whether i should PR merging v6.3 or v6.3-80, and also whether i should even do more force-pushes

ahhh this rebasing and unability to test what i merge is so bothersome, i am considering switching to nixpkgs:master on my daily driver machine now but idk if i should

@0x4A6F
Copy link
Member

0x4A6F commented Sep 29, 2019

Welcome @mkf, I hope RFC-0053: defining pull-request workflow will make this process clearer.

I've picked the latest version from repology/projects/cwm.

You could import this PR to your configuration.nix and test from there.

environment.systemPackages = with pkgs; [
  (import (builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/pull/70018/head.tar.gz) {}).cwm
];

@mkf
Copy link
Contributor Author

mkf commented Sep 29, 2019

@0x4A6F you said "latest version from repology", while taking a glance of two top AUR entries there, cwm and cwm-git, looking at their PKGBUILDs, first takes v6.3 tag and the cwm-git takes linux branch , that is v6.3-80-g4154b9b as of now, so that leaves the consideration still up

afaik that project is about porting a version of cwm deemed stable for openbsd, so retaining the version numbering from there, and then making subsequent fixes, porting that version to linux. so i suppose that maybe what is in that linux branch is actually already deemed stable and not just a development branch

although yeah maybe it would be better to first merge the older tagged revision, then investigate how stable can linux branch be considered, and maybe then consider putting up a newer ref in another MR.


also, when i use that snippet i won't be testing against master but against my 19.03, while proposing a merge into master so not really testing the merge that i propose a commit of

(thanks for that snippet tho)

0x4A6F and others added 2 commits September 29, 2019 17:30
(cherry picked from commit 141f41b)
(cherry picked from commit 5de195f)
(cherry picked from commit 0838eeb)
@0x4A6F
Copy link
Member

0x4A6F commented Sep 29, 2019

According to nixpkgs/manual/#sec-package-naming and nixpkgs/manual/#sec-versioning cwm/default.nix should be for a release.
Versions from commits should be named cwm-unstable-YYYY-MM-DD.

@mkf mkf changed the title cwm: 5.6 -> 6.3-80-g4154b9b , and addition of myself as maintainer cwm: 5.6 -> 6.3, and myself as maintainer Sep 29, 2019
@jonringer
Copy link
Contributor

@GrahamcOfBorg build cwm

@romildo romildo merged commit 8d3392e into NixOS:master Oct 7, 2019
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants