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

Glusterfs 3.12.3 #31782

Merged
merged 2 commits into from Nov 20, 2017
Merged

Glusterfs 3.12.3 #31782

merged 2 commits into from Nov 20, 2017

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Nov 18, 2017

Motivation for this change

Bugfix pointreleases

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.
  • Tested on my production cluster

FYI @bachp

@Ma27
Copy link
Member

Ma27 commented Nov 19, 2017

is it really necessary to include a commit which does a version bump to 3.12.2 if the version will be changed to 3.12.3 in the same branch?

@nh2
Copy link
Contributor Author

nh2 commented Nov 19, 2017

is it really necessary to include a commit which does a version bump to 3.12.2 if the version will be changed to 3.12.3 in the same branch?

@Ma27 No, I am simply upstreaming the commits from my nixpkgs in the order that I've tested them in my production cluster.

I first bumped to 3.12.2, updated and started testing my production cluster, but before I could upstream it, 3.12.3 got released and so I updated and tested it in another commit.

I could squash the two, but then they would no longer reflect the order in which I tested the upgrades, and it would create extra work for me (e.g. when it's merged to 17.09, I can no longer fast-forward my fork, because the 1-commit-way and the 2-commit-way will conflict) with no perceivable benefits.

@domenkozar
Copy link
Member

@GrahamcOfBorg build glusterfs

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: x86_64-darwin

error: Package ‘glusterfs-3.12.3’ in /tmp/nix-ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/31782/pkgs/tools/filesystems/glusterfs/default.nix:186 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-linux

optional arguments:
  -h, --help            show this help message and exit

usage: .eventsdash.py-wrapped [-h] [--port PORT] [--debug]

optional arguments:
  -h, --help   show this help message and exit
  --port PORT  Port
  --debug      Run Server in debug mode
/nix/store/x0in1r0r3j2vjg56w1h4l06xc4b7fzxh-glusterfs-3.12.3

@domenkozar domenkozar merged commit 7be449a into NixOS:master Nov 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants