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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

spectral: unstable 2019-08-30 -> 817, olm: cmake+clean #76767

Merged
merged 2 commits into from Jan 21, 2020

Conversation

@dtzWill
Copy link
Contributor

@dtzWill dtzWill commented Jan 1, 2020

Motivation for this change

Update!

If crashes on launch, and you've previously used spectral,
I've found sometimes nuking paths like
~/.cache/ENCOM/Spectral/qmlcache or even
~/.cache/ENCOM/Spectral seems to fix things.

Not sure what is going on that would cause that, just a heads-up.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
Notify maintainers

cc @dtzWill (me 馃槆)

@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 7, 2020

Oh, olm needs to be built w/cmake, missed that when picking this over. Pulling that in, let's see how that looks...

@dtzWill dtzWill force-pushed the dtzWill:update/spectral-2019-12-23 branch from 874f0ad to 87b617e Jan 7, 2020
@dtzWill dtzWill changed the title spectral: 2019-{08-30 -> 12-23} spectral: 2019-{08-30 -> 12-23}, olm: cmake+clean Jan 7, 2020
@dtzWill dtzWill changed the title spectral: 2019-{08-30 -> 12-23}, olm: cmake+clean spectral: 2019-08-30 -> 2020-01-06, olm: cmake+clean Jan 7, 2020
@dtzWill dtzWill changed the title spectral: 2019-08-30 -> 2020-01-06, olm: cmake+clean spectral: unstable 2019-08-30 -> 817, olm: cmake+clean Jan 13, 2020
@dtzWill dtzWill requested review from colemickens, globin and volth Jan 13, 2020
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 13, 2020

(using github's reviewer suggestions, thank you!)

Copy link
Member

@colemickens colemickens left a comment

Might be nice to have this squashed a bit more, also.

And thanks! I've been trying my hand at this a few times and had concluded olm needed help that I wasn't prepared to give it. :)

pname = "spectral";
version = "unstable-2019-08-30";
version = "817";

src = fetchgit {
url = "https://gitlab.com/b0/spectral.git";

This comment has been minimized.

@colemickens

colemickens Jan 13, 2020
Member

update url, org is now spectral-im


src = fetchgit {
url = "https://gitlab.com/b0/spectral.git";
rev = "23237d0cb27a0b15c8e81c0e2311cc897302e6ba";
sha256 = "11jfq97fa90r8wrahb6aasvmi7k7hr61lqgnbknsr9akn4wgvrh8";
rev = "refs/tags/${version}";

This comment has been minimized.

@colemickens

colemickens Jan 13, 2020
Member

fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
Unable to checkout refs/tags/ref/tags/817 from https://gitlab.com/spectral-im/spectral.git.
@dtzWill dtzWill force-pushed the dtzWill:update/spectral-2019-12-23 branch from e342abb to cd07c91 Jan 13, 2020
dtzWill added 2 commits Jan 1, 2020
* libsecret, now req'd
* url updates
@dtzWill dtzWill force-pushed the dtzWill:update/spectral-2019-12-23 branch from cd07c91 to 7d52215 Jan 13, 2020
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 13, 2020

@colemickens
Copy link
Member

@colemickens colemickens commented Jan 13, 2020

The rev/version/ref-tag was me applying the patch wrong. I'd left out the rec so version was empty. Turns out your "fix" was unnecessary but would've fixed my issue. Problem is, I noticed before sending the review but forgot to fix my comment, sorry about that.

Anyway, it looks good to me and is a VERY welcome upgrade, I'm running it now, no issues with upgrading or havign to delete data. Thanks! :)

@colemickens
Copy link
Member

@colemickens colemickens commented Jan 14, 2020

This fixes #77034 btw.

Copy link
Member

@colemickens colemickens left a comment

LGTM!

@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 21, 2020

Great, thanks!

@dtzWill dtzWill merged commit 3bf9cc3 into NixOS:master Jan 21, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
olm, spectral on aarch64-linux Success
Details
olm, spectral on x86_64-darwin Success
Details
olm, spectral on x86_64-linux Success
Details
@dtzWill dtzWill deleted the dtzWill:update/spectral-2019-12-23 branch Jan 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can鈥檛 perform that action at this time.