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

Jump to bottom

utahfs: init at 1.0 #91060

Merged
merged 1 commit into from Jul 5, 2020
Merged

utahfs: init at 1.0 #91060

merged 1 commit into from Jul 5, 2020

Conversation

snglth
Copy link
Member

@snglth snglth commented Jun 18, 2020 •
edited by veprbl

Motivation for this change

Fixes: #90338

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.

mdlayher
mdlayher approved these changes Jun 19, 2020
View reviewed changes
Copy link
Member

@mdlayher mdlayher left a comment

Choose a reason for hiding this comment

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

LGTM

pkgs/applications/networking/utahfs/default.nix
description =
"Encrypted storage system that provides a user-friendly FUSE drive backed by cloud storage";
license = licenses.bsd3;
maintainers = [ maintainers.snglth ];
Copy link
Member

Choose a reason for hiding this comment

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

Nit: I see with maintainers; [ snglth ]; used more frequently, but no big deal.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's really pointless if there is only one maintainer or whatever to be put into expression's lexical scope, IMHO.

@mdlayher
Copy link
Member

Builds just fine:

[matt@servnerr-3:~/src/nixpkgs]$ nixpkgs-review pr 91060
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/91060/head:refs/nixpkgs-review/1
remote: Enumerating objects: 17, done.
remote: Counting objects: 100% (17/17), done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 21 (delta 9), reused 8 (delta 8), pack-reused 4
Unpacking objects: 100% (21/21), 13.49 KiB | 767.00 KiB/s, done.
From https://github.com/NixOS/nixpkgs
 * [new branch]              master               -> refs/nixpkgs-review/0
 * [new ref]                 refs/pull/91060/head -> refs/nixpkgs-review/1
$ git worktree add /home/matt/.cache/nixpkgs-review/pr-91060/nixpkgs 4e69b0a89934d3516b72ca2175fabe85f6f540d7
Preparing worktree (detached HEAD 4e69b0a8993)
Updating files: 100% (21934/21934), done.
HEAD is now at 4e69b0a8993 Merge pull request #89744 from vojta001/traefik-indent-config
$ git merge --no-commit 816524bbc5bdc1ba427f1e5115d532d83fa9223d
Auto-merging pkgs/top-level/all-packages.nix
Automatic merge went well; stopped before committing as requested
$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/matt/.cache/nixpkgs-review/pr-91060/build.nix
warning: ignoring the user-specified setting 'sandbox', because it is a restricted setting and you are not a trusted user
[22 built, 19 copied (96.3 MiB), 12.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/91060
1 package built:
utahfs

[0.0 MiB DL]
$ nix-shell /home/matt/.cache/nixpkgs-review/pr-91060/shell.nix
these paths will be fetched (1.51 MiB download, 8.27 MiB unpacked):
  /nix/store/3fd40kcri44gl9nkzn75krvh2rpgbp3n-bash-interactive-4.4-p23-dev
  /nix/store/amh412bj67yaaaiqyh58h22jp7zh8x60-readline-7.0p5
  /nix/store/gr4nh9lch6dn9axs82jmv0bbs7li4zxa-bash-interactive-4.4-p23-doc
  /nix/store/hgplspyw16amnbhlbi7qa2938w8i0rz6-bash-interactive-4.4-p23
  /nix/store/hrni2kgw4m661b65h3lv28hvbp79az24-bash-interactive-4.4-p23-man
  /nix/store/wd9xmxvsv5gfd71c1c7mxja92wlprbhl-bash-interactive-4.4-p23-info
copying path '/nix/store/gr4nh9lch6dn9axs82jmv0bbs7li4zxa-bash-interactive-4.4-p23-doc' from 'https://cache.nixos.org'...
copying path '/nix/store/wd9xmxvsv5gfd71c1c7mxja92wlprbhl-bash-interactive-4.4-p23-info' from 'https://cache.nixos.org'...
copying path '/nix/store/hrni2kgw4m661b65h3lv28hvbp79az24-bash-interactive-4.4-p23-man' from 'https://cache.nixos.org'...
copying path '/nix/store/amh412bj67yaaaiqyh58h22jp7zh8x60-readline-7.0p5' from 'https://cache.nixos.org'...
copying path '/nix/store/hgplspyw16amnbhlbi7qa2938w8i0rz6-bash-interactive-4.4-p23' from 'https://cache.nixos.org'...
copying path '/nix/store/3fd40kcri44gl9nkzn75krvh2rpgbp3n-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

[nix-shell:~/.cache/nixpkgs-review/pr-91060]$ ./results/utahfs/bin/utahfs-server -h
Usage of ./results/utahfs/bin/utahfs-server:
  -cfg string
        Location of the server's config file. (default "./utahfs.yaml")
  -metrics-addr string
        Address to serve metrics on. (default "localhost:3003")
  -server-addr string
        Address to expose server on. (default "0.0.0.0:3002")

@devhell
Copy link
Contributor

devhell commented Jun 23, 2020

Amazing, thank you!

@snglth snglth requested a review from veprbl July 3, 2020 13:35
veprbl
veprbl reviewed Jul 3, 2020
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Looks fine, but need to resolve the merge conflict.

pkgs/applications/networking/utahfs/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@veprbl veprbl merged commit 9f0f539 into NixOS:master Jul 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

@mdlayher mdlayher mdlayher approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Package Request: UtahFS
4 participants
@snglth @mdlayher @devhell @veprbl