orivej has quit [(Ping timeout: 256 seconds)]
<samueldr> hmmmm, there is no notice specific about the licensing of the wiki on the wiki
<samueldr> I believe the intention initially was the license from the github repo to cover the github wiki
<samueldr> I will add that mention to the [[NixOS_Wiki:Copyrights]] page
<samueldr> we may have to verify with authors for all content made between the migration to the mediawiki and now
<samueldr> it may be a bit messy, since some content may have been moved through different wiki migrations
<samueldr> (see 24th/25th of december discussion on #nixos-dev)
<samueldr> and it may be necessary to review the attribution to Mic92 to *something else* clear but encompassing nixos-users github community?
<nixoswikibot> [[NixOS Wiki:Copyrights]] N https://nixos.wiki/index.php?oldid=1699&rcid=1721 * Samueldr * (+1275) Inits page, tentatively with the licensing terms as stated in the repository, to remove all doubts from future contributions
<samueldr> the reason it's important to put the licensing terms at that location in the wiki is that mediawiki automatically links there
<samueldr> (for discussions purposes, if ever needed, I'm keeping a log of what is said here https://gist.github.com/samueldr/42c548a99de160892ca301c84b85bab8 )
orivej has joined joined #nixos-wiki
<Mic92> samueldr: my plan was to sneak in a license, so nobody would ever remember there was no license in the wiki in the past
orivej has quit [(Ping timeout: 248 seconds)]
asymmetric has joined joined #nixos-wiki
orivej has joined joined #nixos-wiki
asymmetric has quit [(Ping timeout: 260 seconds)]
ixxie has joined joined #nixos-wiki
<ixxie> samueldr: I like these new hardware pages
<ixxie> really cool work
<Mic92> Actually nixos-hardware should be merged as well into nixpkgs
<ixxie> Mic92: which nixos-hardware?
<ixxie> I was talking about the ARM pages, stuff like: https://nixos.wiki/wiki/NixOS_on_ARM/Raspberry_Pi
<ixxie> I am actually also curious about this structure because it seems like these are 'subarticles'
<ixxie> Mic92: could you help me out with a git question? I am trying to work on my first PR to nixpkgs
<ixxie> UserA (me) uses forkA to make PR-A; changes are requested, so UserB
<ixxie> uses forkB to make PR-B. Now more changes are requested, and I want to merge the branch corresponding to PR-B back into my copy of the PR-A branch, but I get `error: the
<ixxie> follow untracked working tree files would be overwritten by merge:
<ixxie> 13:52 < ixxie> [...] Please move or remove them before merge.`
<Mic92> ixxie: make a commit before merge
<Mic92> with all untracked files
<Mic92> or stash them away
<Mic92> and unstash them after merge
<ixxie> thanks
ixxie has quit [(Ping timeout: 252 seconds)]
ixxie has joined joined #nixos-wiki
ixxie has quit [(Client Quit)]
ixxie has joined joined #nixos-wiki
ixxie has quit [(Ping timeout: 260 seconds)]
asymmetric has joined joined #nixos-wiki
<samueldr> Reaktor|krebs: tell ixxie ask away, if you're curious about the structure of the NixOS on ARM pages
<Reaktor|krebs> Consider it noted.
ixxie has joined joined #nixos-wiki
<Reaktor|krebs> ixxie: ask away, if you're curious about the structure of the NixOS on ARM pages -- samueldr!~samueldr@unaffiliated/samueldr, Mon Dec 25 18:43:22 CET 2017
<samueldr> hi!
orivej has quit [(Ping timeout: 264 seconds)]
ixxie has quit [(Ping timeout: 252 seconds)]
orivej has joined joined #nixos-wiki
SUPERNETS__ has joined joined #nixos-wiki
SUPERNETS__ has quit [(Read error: Connection reset by peer)]