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

Update hapistrano #72985

Closed
Closed
Changes from 1 commit
Commits
Show all changes
715 commits
Select commit Hold shift + click to select a range
e1ecc2b
Remove list sorting
chkno Sep 6, 2019
f3eedb6
Parallel build is the default, so no need to specify
chkno Sep 6, 2019
2336982
Add license
chkno Sep 6, 2019
d89ccc1
Correct syntax for license specification
chkno Sep 6, 2019
c7c684a
Preserve type of rethrown exceptions
chkno Sep 6, 2019
0adf77e
Narrow the «not defined» check to just ThrownError
chkno Sep 6, 2019
6b405f9
Fix missing "using ThrownError"
chkno Sep 6, 2019
8834992
clang-format
chkno Sep 6, 2019
b8db815
Support submodules (Fixes #13121)
chkno Sep 6, 2019
c352bfe
Switch from east const to west const
chkno Sep 16, 2019
4ded9be
Add note: Keep error message in sync with nixos-option
chkno Sep 16, 2019
aa8e1d5
Always say which path component had trouble
chkno Sep 16, 2019
88183eb
Per reviewer request, cast the other side.
chkno Sep 16, 2019
c457766
Use std::get_if
chkno Sep 16, 2019
c967e3f
Hold state and autoArgs by reference
chkno Sep 16, 2019
3d3ce8d
Pass Context by reference
chkno Sep 16, 2019
94a068f
Pass values by reference
chkno Sep 16, 2019
2ddd2d0
Explain why header goes on stderr
chkno Sep 16, 2019
84d5571
Don't print header on stderr
chkno Sep 16, 2019
4d17d5b
snake_case -> camelCase
chkno Sep 16, 2019
5646240
Only print example when there is one
chkno Sep 16, 2019
57a5752
Add maintainer
chkno Sep 16, 2019
a3e31df
(clang-format for has_example)
chkno Sep 18, 2019
445145d
Support aggregate types attrsOf and listOf
chkno Sep 18, 2019
1e79859
snake_case -> camelCase
chkno Sep 20, 2019
348bafc
vivaldi: 2.9.1705.31-1 -> 2.9.1705.38-1
NeQuissimus Nov 4, 2019
754e315
release-notes 20.03: added notice for rewritten nixos-option
globin Oct 8, 2019
ed2484f
hunspell-dicts: add Russian dictionary
alapshin Nov 4, 2019
c97ca70
linux: 5.4-rc5 -> 5.4-rc6
NeQuissimus Nov 4, 2019
9b773fd
inkscape: fix darwin build
LnL7 Nov 4, 2019
7622f30
pulumi: install providers and add update script
jlesquembre Oct 31, 2019
faf06da
rictydiminished-with-firacode: fonttools requires python3 (#72762)
ijaketak Nov 4, 2019
2fa5660
Merge pull request #72778 from alapshin/hunspell-dicts-ru
matthewbauer Nov 4, 2019
d20670f
Merge pull request #72735 from nh2/libjpeg-turbo-static
matthewbauer Nov 4, 2019
5ae0b8f
Merge pull request #72566 from kolbycrouch/master
matthewbauer Nov 4, 2019
6f41b1c
Merge pull request #68193 from chkno/nixos-option-rewrite
lheckemann Nov 4, 2019
de1cbcc
nixos/nat: fix typo in comment
mveytsman Nov 4, 2019
a38273a
asunder: 2.9.4 -> 2.9.5 (#72459)
r-ryantm Nov 4, 2019
5c37153
nixos/httpd: allow user to specify a minimal list of apache modules
aanderse Nov 4, 2019
1c336ed
ocamlPackages.mlgmpidl: 1.2.10 -> 1.2.11
r-ryantm Nov 2, 2019
5524f4d
gitAndTools.pre-commit: 1.18.3 -> 1.20.0
r-ryantm Nov 2, 2019
d751e08
python38Packages.license-expression: 0.999 -> 1.0
r-ryantm Nov 2, 2019
b1b776b
python38Packages.xdis: 4.0.4 -> 4.1.2
r-ryantm Nov 3, 2019
e51f707
Merge pull request #72729 from mmahut/trac
mmahut Nov 4, 2019
7a17d2d
video2midi: 0.3.9.5 -> 0.3.9.6
gnidorah Oct 26, 2019
2632156
phodav: 2.2 -> 2.3
gnidorah Oct 26, 2019
f7c032e
pythonPackages.pykde4: fix url
gnidorah Oct 26, 2019
34647cf
kmsxx: 2018-10-23 -> 2019-10-28
gnidorah Oct 26, 2019
791f835
vk-messenger: 4.0.1 -> 4.5.2
gnidorah Oct 26, 2019
afb4d44
vkquake: 1.01.0 -> 1.02.1
gnidorah Oct 26, 2019
1c3407f
openmw-tes3mp: 2019-06-09 -> 2019-07-01
gnidorah Oct 26, 2019
b505f81
openjk: 2019-06-24 -> 2019-10-25
gnidorah Oct 26, 2019
0f68bf3
openxray: 510 -> 558
gnidorah Nov 1, 2019
b7dc9e1
pakcs: 2.1.2 -> 2.2.0
gnidorah Nov 4, 2019
5842a29
python3Packages.solo-python: 0.0.15 -> 0.0.18
jonringer Nov 1, 2019
1a3f284
gnome3.devhelp: clean up
jtojnar Nov 4, 2019
6160907
gnome3.devhelp: fix blank pages
jtojnar Nov 4, 2019
57d33a2
Merge pull request #72788 from jtojnar/devhelp-blank
jtojnar Nov 4, 2019
924bc50
Merge pull request #72779 from LnL7/darwin-inkscape
mmahut Nov 4, 2019
ba76515
Merge pull request #72738 from dduan/tre
mmahut Nov 4, 2019
c4821a8
theharvester: 3.0.6 -> 3.1
c0bw3b Nov 4, 2019
e2058c7
clj-kondo: 2019.10.26 -> 2019.11.03
jlesquembre Nov 4, 2019
f65e759
Merge pull request #72646 from r-ryantm/auto-update/qbittorrent
ryantm Nov 4, 2019
527dd6e
mm-common: 0.9.12 → 1.0.0
jtojnar Nov 4, 2019
cb8423d
Merge pull request #72698 from gebner/digimend-drivers
gebner Nov 4, 2019
fa7d7eb
Merge pull request #71266 from philandstuff/add-gnupg-pkcs11-scd
globin Nov 4, 2019
db502b0
Merge pull request #71139 from philandstuff/ssh-agent-pkcs11-whitelist
globin Nov 4, 2019
8134b50
Merge pull request #72184 from stigtsp/packages/perl-mojo-sqlite-3.003
c0bw3b Nov 4, 2019
d34465e
Merge pull request #72795 from jtojnar/mm-common-1.0
jtojnar Nov 4, 2019
3a28fef
nixos/test: Port test driver to python
tfc Sep 6, 2019
ac97edf
nixos/test: use ptpython as repl
flokli Nov 4, 2019
7d19c5a
nixos/test: Pythonify documentation
tfc Nov 4, 2019
75d3e81
nixos/bittorrent: Port test to python
tfc Sep 10, 2019
be48c5c
nixos/login: Port test to python
tfc Sep 10, 2019
8eead58
nixos/postgres: Port test to python
tfc Sep 10, 2019
9b33b5d
nixos/gitea: convert test to python
Oct 27, 2019
2af2d59
nixos/emacs-daemon: convert test to python
blitz Oct 27, 2019
8b12f0d
nixos/quake3: convert test to python
Oct 27, 2019
baec88a
nixos/wireguard: convert default test to python
Oct 27, 2019
cdd4d4f
nixos/wireguard: convert generated test to python
Oct 27, 2019
d4a5ea5
nixos/boot: Port test to python
tfc Oct 27, 2019
40396a7
nixos/zfs: convert test to python
blitz Oct 27, 2019
e5ee596
nixos/acme: Port test to python
tfc Oct 27, 2019
986a1eb
nixos/ammonite: Port test to python
tfc Oct 27, 2019
48508da
nixos/automysqlackup: Port test to python
tfc Oct 27, 2019
2290632
Merge pull request #71684 from tfc/integration-test-python
flokli Nov 4, 2019
4704bbd
perlPackages.CryptOpenSSLX509: init at 1.813
stigtsp Oct 24, 2019
3d89ead
gjs: move to top-level
jtojnar Nov 4, 2019
a2f6928
gjs: clean up
jtojnar Nov 4, 2019
a17cda6
youtube-dl: 2019.10.29 -> 2019.11.05
xrelkd Nov 5, 2019
11d3784
Merge pull request #72559 from r-ryantm/auto-update/libpwquality
marsam Nov 5, 2019
aa499df
Merge pull request #72670 from r-ryantm/auto-update/rocksdb
ryantm Nov 5, 2019
02fb0b9
Merge pull request #72441 from marsam/update-pg_topn
marsam Nov 5, 2019
a5d9600
comic-neue: 2.2 -> 2.3
marsam Nov 5, 2019
c855dce
python3Packages.nvchecker: 1.4.4 -> 1.5
marsam Nov 5, 2019
8632698
ocamlPackages.checkseum: 0.0.3 → 0.1.1
vbgl Oct 29, 2019
1f2fff4
nextcloud-client: 2.6.0 -> 2.6.1
Ma27 Nov 5, 2019
a77d200
Merge pull request #71904 from stigtsp/package/perl-crypt-openssl-x50…
c0bw3b Nov 5, 2019
b5d4298
podman: v1.6.2 -> v1.6.3
saschagrunert Nov 5, 2019
d15b9b1
avocode: 3.9.3 -> 3.9.6
r-ryantm Nov 1, 2019
b7f151d
yacas: 1.6.1 -> 1.8.0
r-ryantm Nov 3, 2019
7c72345
nfstrace: init at 0.4.3.2
Azulinho Nov 4, 2019
19fb942
Merge pull request #66645 from WhittlesJr/python-easysnmp-and-poster3
lheckemann Nov 5, 2019
aa1ad7b
pythonPackages.schema: Fix
tobim Nov 3, 2019
85fb935
pythonPackages.schema: Add myself as maintainer
tobim Nov 3, 2019
4e60c47
yad: 0.42.0 -> 5.0
r-ryantm Nov 3, 2019
89814c9
simplenote: 1.8.0 -> 1.9.1
r-ryantm Nov 3, 2019
d4ceb13
Merge pull request #72747 from Azulinho/nfstrace
c0bw3b Nov 5, 2019
b9611d2
python38Packages.willow: 1.1 -> 1.3
r-ryantm Nov 3, 2019
78c5c97
python38Packages.wurlitzer: 1.0.3 -> 2.0.0
r-ryantm Nov 3, 2019
ccadfbe
python38Packages.telethon: 1.9.0 -> 1.10.8
r-ryantm Nov 3, 2019
2e8ed0f
Revert "lvm2: enable parallel building" (#72823)
kirelagin Nov 5, 2019
6d7ab9e
pythonPackages.scikitlearn: 0.21.2 -> 0.21.3
tbenst Nov 5, 2019
d629298
android-udev-rules: 20190315 -> 20191103
Mic92 Nov 5, 2019
b786c1b
nixos/openssh: port test to python
marijanp Nov 4, 2019
daa9786
nixos/tor: port test to python
marijanp Nov 4, 2019
04f0961
nixos/transmission: port test to python
marijanp Nov 4, 2019
1afa50a
nixos/fsck: port test to python
marijanp Nov 4, 2019
16d2fcc
nixos/nix-generate-config: port test to python
marijanp Nov 4, 2019
7d98a8b
nixos/simple: port test to python
marijanp Nov 4, 2019
eb98b1d
pythonPackages.intreehooks: init at 1.0
FRidh Nov 4, 2019
21c201a
pythonPackages.mesonpep517: init at 0.1.9999994
FRidh Nov 4, 2019
d9b0ef5
pythonPackages.meson: init
FRidh Nov 5, 2019
eee9790
android-studio: 3.5.1.0 -> 3.5.2.0
primeos Nov 5, 2019
ce6364a
gns3-{gui,server}: 2.2.1 -> 2.2.2
primeos Nov 5, 2019
44efab6
aerc: Fix store references in default config
tadeokondrak Oct 28, 2019
f3a090a
Merge pull request #72569 from romildo/upd.lounge-gtk-theme
romildo Nov 5, 2019
7354d72
Merge pull request #72588 from romildo/upd.efl
romildo Nov 5, 2019
fa2909b
python.pkgs.pyglet: Fix missing libraries
talanis85 Oct 11, 2019
54c0ac5
Merge pull request #72810 from marijanp/port-tests-python
flokli Nov 5, 2019
8853b8c
Merge pull request #72821 from saschagrunert/podman
grahamc Nov 5, 2019
3c8f637
Merge pull request #72145 from dtzWill/update/radiotray-ng-0.2.7
dtzWill Nov 5, 2019
aa98348
jormungandr: Remove
edolstra Nov 5, 2019
50ea99c
nixos/tests/quake3.nix: Remove
edolstra Nov 5, 2019
51de90e
gjs: add separateDebugInfo
jtojnar Nov 4, 2019
d5699fe
Merge pull request #72755 from Ekleog/org-9.2.6
adisbladis Nov 5, 2019
9d36ef7
gjs: various improvements (#72805)
jtojnar Nov 5, 2019
e13f405
nixos/babeld: port test to python
mweinelt Nov 5, 2019
76df6d6
nixos/knot: port test to python
mweinelt Nov 5, 2019
014970b
nixos/knot: add myself as maintainer for test
mweinelt Nov 5, 2019
0e17ec1
Merge pull request #72806 from xrelkd/update/youtube-dl
fpletz Nov 5, 2019
9b78e5f
vault: fix config when file backend is used
Nov 4, 2019
5fecc35
nixos/vault: convert test to python
flokli Nov 5, 2019
2cb12e0
Merge pull request #72787 from jpotier/master
flokli Nov 5, 2019
a692029
Merge pull request #72816 from marsam/update-comic-neue
fpletz Nov 5, 2019
1eafac2
qtcreator 4.9.1 -> 4.10.0 (#70573)
deadloko Nov 5, 2019
f605e22
python3Packages.cytoolz: 0.10.0 -> 0.10.1
jonringer Nov 4, 2019
65db5ce
onnxruntime: 0.5.0 -> 1.0.0
jonringer Oct 30, 2019
c89b97e
git-sizer: 1.0.0 -> 1.3.0
gebner Nov 5, 2019
1a1bab3
sysbench: 1.0.17 -> 1.0.18
r-ryantm Nov 5, 2019
0720a4e
gnome3.gnome-boxes: add glib-networking
worldofpeace Nov 5, 2019
b27b5c4
gnome3.gnome-boxes: nixpkgs-fmt
worldofpeace Nov 5, 2019
aaaea2a
synthv1: use qt5's mkDerivation
worldofpeace Nov 5, 2019
ac50bb7
Merge pull request #72691 from r-ryantm/auto-update/synthv1
worldofpeace Nov 5, 2019
917ab4b
Merge pull request #72792 from jlesquembre/clj-kondo-update
worldofpeace Nov 5, 2019
c380f48
Merge branch 'master' into update/spotify
kolaente Nov 5, 2019
91b01ae
drawpile: 2.1.12 -> 2.1.13 (#72854)
fgaz Nov 5, 2019
6465a56
nixos/metabase: port test to python
1000101 Nov 5, 2019
5768950
nixos/trac: port test to python
1000101 Nov 5, 2019
23340a2
nixos/trezord: port test to python
1000101 Nov 5, 2019
62fa5d3
Add libpulseaudio to not have spotify crash when trying to play music
kolaente Nov 5, 2019
b508ecb
Merge pull request #72848 from gebner/gitsizer130
gebner Nov 5, 2019
fbe6ab2
Merge pull request #72857 from 1000101/master
worldofpeace Nov 5, 2019
e73c93d
Merge pull request #72834 from mweinelt/pr/tests/migrate-python
worldofpeace Nov 5, 2019
d4d7652
ipfs-cluster 0.9.0 -> 0.11.0 (#72820)
lordcirth Nov 5, 2019
5d1c5ba
arrow-cpp: 0.15.0 -> 0.15.1
jonringer Nov 5, 2019
f9ff0cd
sidequest: 0.7.2 -> 0.7.5
rvolosatovs Nov 5, 2019
cb7e94a
zstd: 1.4.3 -> 1.4.4
nrdxp Nov 5, 2019
ca76550
flow: 0.111.0 -> 0.111.3
marsam Nov 5, 2019
f48ecbf
Merge pull request #72624 from witkamp/master
LnL7 Nov 5, 2019
4dce5d7
qemu: name -> pname
hyperfekt Nov 5, 2019
9484904
texmacs: 1.99.10 -> 1.99.11
nh2 Aug 12, 2019
92930b8
ocamlPackages.reason: 3.5.0 → 3.5.1
vbgl Nov 4, 2019
645a6fd
mattermost-desktop: fix filechooser causing crash
Evils-Devils Nov 6, 2019
ebaedb0
pythondialog: init at 3.4.0
mbrgm Sep 13, 2019
f41b8aa
mattermost-desktop: version 4.2.3 -> 4.3.1
Evils-Devils Nov 5, 2019
0cad3f6
Merge pull request #70365 from jglukasik/mod_tile
aanderse Nov 6, 2019
bc8ef6c
emacs: also allow librsvg dependency when using withNS
marsam Nov 6, 2019
32ece96
Merge pull request #72853 from worldofpeace/glib-networking/gnome-boxes
worldofpeace Nov 6, 2019
ec65794
Merge pull request #71603 from aanderse/kdevelop
aanderse Nov 6, 2019
1e72fa5
Merge pull request #68954 from dguibert/dg/cudatoolkit_10_1
andir Nov 6, 2019
a4dd9d7
skypeforlinux: 8.51.0.72 -> 8.54.0.85
fishi0x01 Nov 5, 2019
b69a51a
libtommath: 1.1.0 -> 1.2.0
r-ryantm Nov 6, 2019
f6501c4
Merge pull request #72872 from marsam/enable-librsvg-emacs-darwin
adisbladis Nov 6, 2019
e86b9b9
nixos/atd: port test to python
marijanp Nov 5, 2019
0f96f9f
nixos/avahi: port test to python
marijanp Nov 5, 2019
f794de4
nixos/bcachefs: port test to python
marijanp Nov 5, 2019
db54622
nixos/beanstalkd: port test to python
marijanp Nov 5, 2019
44e6c84
nixos/bind: port test to python
marijanp Nov 5, 2019
54cc018
nixos/boot-stage1: port test to python
marijanp Nov 5, 2019
af117c3
nixos/borgbackup: port test to python
marijanp Nov 5, 2019
3c2c50b
matrix-synapse: 1.5.0 -> 1.5.1
Ma27 Nov 6, 2019
f103882
Merge pull request #72833 from marijanp/port-tests-python
domenkozar Nov 6, 2019
abe853b
Merge pull request #70336 from abbradar/synapse-ipv6
Ma27 Nov 6, 2019
4390b5e
paraview: 5.6.0 -> 5.6.3
JohnAZoidberg Nov 6, 2019
c59079b
Merge pull request #72850 from fishi0x01/fishi0x01/skype-upgrade
c0bw3b Nov 6, 2019
baa8892
opencv3: 3.4.7 -> 3.4.8 (security)
risicle Nov 2, 2019
a1a4484
Merge pull request #72885 from Ma27/bump-matrix-synapse
Ekleog Nov 6, 2019
d8e7f7e
Merge pull request #72891 from JohnAZoidberg/fix-qt-paraview
dguibert Nov 6, 2019
af48079
sage: ignore cmp deprecation in sagenb
timokau Nov 2, 2019
f85ce83
sage: ignore deprecation warnings in rst2sws
timokau Nov 2, 2019
f64885b
sage: fix pkgconfig errors in tests
timokau Nov 4, 2019
da7ec1c
sage: ignore werkzeug immutable dict deprecation
timokau Nov 4, 2019
afb9887
sage: backport fix for threejs r109
timokau Nov 5, 2019
fc323c2
Merge pull request #72867 from Evils-Devils/mattermost-filechooser
jokogr Nov 6, 2019
eeba5c8
Merge pull request #72777 from cab404/android-studio/flutter-tls-support
matthewbauer Nov 6, 2019
afbfef9
nixos/tests: Ignore shutdown/crash if not booted
JohnAZoidberg Nov 6, 2019
c54848e
Merge pull request #72771 from timokau/sage-fixes
timokau Nov 6, 2019
46f1dae
Merge pull request #72727 from oxalica/mips-parse
matthewbauer Nov 6, 2019
d1473e0
coloursum: 0.1.0 -> 0.2.0 (#72900)
fgaz Nov 6, 2019
7272491
Merge pull request #72373 from jlesquembre/pulumi-fix
veprbl Nov 6, 2019
afa48f1
reaper: 5.983 -> 5.984
r-ryantm Nov 6, 2019
46af0b2
opera: 62.0.3331.43 -> 64.0.3417.83
r-ryantm Nov 6, 2019
f8948e9
mcelog: 164 -> 165 (#72583)
r-ryantm Nov 6, 2019
0923ffb
Merge pull request #72899 from JohnAZoidberg/fix-py-test-driver-crash
worldofpeace Nov 6, 2019
5f3956f
Merge pull request #72596 from kolaente/update/spotify
Ma27 Nov 6, 2019
d476363
grafana: 6.4.3 -> 6.4.4
WilliButz Nov 6, 2019
01aedf0
renpy: 7.3.3 -> 7.3.5 (#72653)
r-ryantm Nov 6, 2019
2b2a80a
setbfree: 0.8.9 -> 0.8.10
r-ryantm Nov 6, 2019
20ef52b
Merge pull request #72915 from WilliButz/grafana-update
Ma27 Nov 6, 2019
9a5ef40
linux: 5.3.8 -> 5.3.9
adisbladis Nov 6, 2019
f46e8f9
cri-o: 1.15.2 -> 1.16.0
saschagrunert Nov 6, 2019
91c8c00
leatherman: 1.8.0 -> 1.9.0
r-ryantm Nov 6, 2019
f28fad5
jetty: 9.4.16.v20190411 -> 9.4.22.v20191022
r-ryantm Nov 6, 2019
2316150
linux: 4.14.151 -> 4.14.152
NeQuissimus Nov 6, 2019
308aba8
linux: 4.19.81 -> 4.19.82
NeQuissimus Nov 6, 2019
042cf21
linux: 4.4.198 -> 4.4.199
NeQuissimus Nov 6, 2019
873ffd8
linux: 4.9.198 -> 4.9.199
NeQuissimus Nov 6, 2019
47769e5
vimPlugins: Update
gjabell Oct 29, 2019
6f3f7fc
vimPlugins.mattn-calendar-vim: init at 2018-08-25
gjabell Oct 29, 2019
05ded64
vimPlugins.gv-vim: init at 2019-10-13
gjabell Oct 29, 2019
05c0d87
vimPlugins.kotlin-vim: init at 2019-05-26
gjabell Oct 29, 2019
2b944d2
vimPlugins.vim-salve: init at 2019-08-02
gjabell Oct 29, 2019
13c2cc0
vimPlugins.utl-vim: init at 2010-10-18
gjabell Oct 29, 2019
afbde10
vimPlugins.vim-clojure-highlight: init 2015-07-05
gjabell Oct 29, 2019
ae74169
vimPlugins.vim-clojure-static: init at 2017-10-23
gjabell Oct 29, 2019
c07850c
vimPlugins.vim-sexp: init at 2017-05-15
gjabell Oct 29, 2019
545bc45
vimPlugins.vim-sexp-mappings-for-regular-people:
gjabell Oct 29, 2019
1cfd1d0
vimPlugins.VimOrganizer: init at 2014-04-10
gjabell Oct 29, 2019
8eb8fa1
vimPlugins: Add alias support to update.py
gjabell Nov 6, 2019
874201a
vimPlugins: fix vim-docbk-snippets naming clash
gjabell Nov 6, 2019
2e52f98
streamlit: init at 0.49.0
yrashk Oct 10, 2019
7456f19
nlohmann_json: disable tests for now since they timeout
davidak Nov 6, 2019
98b0f8c
graylog: 3.1.2 -> 3.1.3
fadenb Nov 6, 2019
314c974
Merge pull request #72933 from fadenb/graylog_3.1.3
Ma27 Nov 6, 2019
dec234f
Merge pull request #72789 from aanderse/httpd-again
aanderse Nov 6, 2019
8b8db86
Revert "python: jupyter_console: 5.2.0 -> 6.0.0"
merijnb Nov 6, 2019
b8a18cf
pidgin-sipe: 1.24.0 -> 1.25.0
r-ryantm Nov 6, 2019
4835c83
Merge pull request #72925 from davidak/nlohmann_json_disable_tests
grahamc Nov 6, 2019
ba225e4
hapistrano: fix broken package
Nov 7, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

snake_case -> camelCase

  • Loading branch information
chkno authored and lheckemann committed Sep 16, 2019
commit 4d17d5b31f196416ee4be50b0f7b125966ea210f
@@ -56,7 +56,7 @@ class Out
ONE_LINE,
MULTI_LINE
};
explicit Out(std::ostream & ostream) : ostream(ostream), policy(ONE_LINE), write_since_sep(true) {}
explicit Out(std::ostream & ostream) : ostream(ostream), policy(ONE_LINE), writeSinceSep(true) {}
Out(Out & o, const std::string & start, const std::string & end, LinePolicy policy);
Out(Out & o, const std::string & start, const std::string & end, int count)
: Out(o, start, end, count < 2 ? ONE_LINE : MULTI_LINE)
@@ -72,30 +72,30 @@ class Out
std::string indentation;
std::string end;
LinePolicy policy;
bool write_since_sep;
bool writeSinceSep;
template <typename T> friend Out & operator<<(Out & o, T thing);
};

template <typename T> Out & operator<<(Out & o, T thing)
{
if (!o.write_since_sep && o.policy == Out::MULTI_LINE) {
if (!o.writeSinceSep && o.policy == Out::MULTI_LINE) {
o.ostream << o.indentation;
}
o.write_since_sep = true;
o.writeSinceSep = true;
o.ostream << thing;
return o;
}

template <> Out & operator<<<Out::Separator>(Out & o, Out::Separator /* thing */)
{
o.ostream << (o.policy == Out::ONE_LINE ? " " : "\n");
o.write_since_sep = false;
o.writeSinceSep = false;
return o;
}

Out::Out(Out & o, const std::string & start, const std::string & end, LinePolicy policy)
: ostream(o.ostream), indentation(policy == ONE_LINE ? o.indentation : o.indentation + " "),
end(policy == ONE_LINE ? end : o.indentation + end), policy(policy), write_since_sep(true)
end(policy == ONE_LINE ? end : o.indentation + end), policy(policy), writeSinceSep(true)
{
o << start;
*this << Out::sep;
@@ -104,15 +104,15 @@ Out::Out(Out & o, const std::string & start, const std::string & end, LinePolicy
// Stuff needed for evaluation
struct Context
{
Context(EvalState & state, Bindings & autoArgs, Value options_root, Value config_root)
: state(state), autoArgs(autoArgs), options_root(options_root), config_root(config_root),
underscore_type(state.symbols.create("_type"))
Context(EvalState & state, Bindings & autoArgs, Value optionsRoot, Value configRoot)
: state(state), autoArgs(autoArgs), optionsRoot(optionsRoot), configRoot(configRoot),
underscoreType(state.symbols.create("_type"))
{}
EvalState & state;
Bindings & autoArgs;
Value options_root;
Value config_root;
Symbol underscore_type;
Value optionsRoot;
Value configRoot;
Symbol underscoreType;
};

Value evaluateValue(Context & ctx, Value & v)
@@ -131,16 +131,16 @@ bool isOption(Context & ctx, const Value & v)
if (v.type != tAttrs) {
return false;
}
const auto & actual_type = v.attrs->find(ctx.underscore_type);
if (actual_type == v.attrs->end()) {
const auto & atualType = v.attrs->find(ctx.underscoreType);
if (atualType == v.attrs->end()) {
return false;
}
try {
Value evaluated_type = evaluateValue(ctx, *actual_type->value);
if (evaluated_type.type != tString) {
Value evaluatedType = evaluateValue(ctx, *atualType->value);
if (evaluatedType.type != tString) {
return false;
}
return static_cast<std::string>(evaluated_type.string.s) == "option";
return static_cast<std::string>(evaluatedType.string.s) == "option";
} catch (Error &) {
return false;
}
@@ -238,7 +238,7 @@ void mapConfigValuesInOption(
{
Value * option;
try {
option = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.config_root);
option = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.configRoot);
} catch (Error &) {
f(path, std::current_exception());
return;
@@ -278,26 +278,25 @@ Value parseAndEval(EvalState & state, const std::string & expression, const std:
return v;
}

void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybe_value,
const std::string & path);
void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybeValue, const std::string & path);

void printList(Context & ctx, Out & out, Value & v)
{
Out list_out(out, "[", "]", v.listSize());
Out listOut(out, "[", "]", v.listSize());
for (unsigned int n = 0; n < v.listSize(); ++n) {
printValue(ctx, list_out, *v.listElems()[n], "");
list_out << Out::sep;
printValue(ctx, listOut, *v.listElems()[n], "");
listOut << Out::sep;
}
}

void printAttrs(Context & ctx, Out & out, Value & v, const std::string & path)
{
Out attrs_out(out, "{", "}", v.attrs->size());
Out attrsOut(out, "{", "}", v.attrs->size());
for (const auto & a : v.attrs->lexicographicOrder()) {
std::string name = a->name;
attrs_out << name << " = ";
printValue(ctx, attrs_out, *a->value, appendPath(path, name));
attrs_out << ";" << Out::sep;
attrsOut << name << " = ";
printValue(ctx, attrsOut, *a->value, appendPath(path, name));
attrsOut << ";" << Out::sep;
}
}

@@ -323,27 +322,27 @@ void multiLineStringEscape(Out & out, const std::string & s)
void printMultiLineString(Out & out, const Value & v)
{
std::string s = v.string.s;
Out str_out(out, "''", "''", Out::MULTI_LINE);
Out strOut(out, "''", "''", Out::MULTI_LINE);
std::string::size_type begin = 0;
while (begin < s.size()) {
std::string::size_type end = s.find('\n', begin);
if (end == std::string::npos) {
multiLineStringEscape(str_out, s.substr(begin, s.size() - begin));
multiLineStringEscape(strOut, s.substr(begin, s.size() - begin));
break;
}
multiLineStringEscape(str_out, s.substr(begin, end - begin));
str_out << Out::sep;
multiLineStringEscape(strOut, s.substr(begin, end - begin));
strOut << Out::sep;
begin = end + 1;
}
}

void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybe_value, const std::string & path)
void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybeValue, const std::string & path)
{
try {
if (auto ex = std::get_if<std::exception_ptr>(&maybe_value)) {
if (auto ex = std::get_if<std::exception_ptr>(&maybeValue)) {
std::rethrow_exception(*ex);
}
Value v = evaluateValue(ctx, std::get<Value>(maybe_value));
Value v = evaluateValue(ctx, std::get<Value>(maybeValue));
if (ctx.state.isDerivation(v)) {
describeDerivation(ctx, out, v);
} else if (v.isList()) {
@@ -384,14 +383,14 @@ void printConfigValue(Context & ctx, Out & out, const std::string & path, std::v
void printAll(Context & ctx, Out & out)
{
mapOptions(
[&ctx, &out](const std::string & option_path) {
[&ctx, &out](const std::string & optionPath) {
mapConfigValuesInOption(
[&ctx, &out](const std::string & config_path, std::variant<Value, std::exception_ptr> v) {
printConfigValue(ctx, out, config_path, v);
[&ctx, &out](const std::string & configPath, std::variant<Value, std::exception_ptr> v) {
printConfigValue(ctx, out, configPath, v);
},
option_path, ctx);
optionPath, ctx);
},
ctx, ctx.options_root);
ctx, ctx.optionsRoot);
}

void printAttr(Context & ctx, Out & out, const std::string & path, Value & root)
@@ -406,7 +405,7 @@ void printAttr(Context & ctx, Out & out, const std::string & path, Value & root)
void printOption(Context & ctx, Out & out, const std::string & path, Value & option)
{
out << "Value:\n";
printAttr(ctx, out, path, ctx.config_root);
printAttr(ctx, out, path, ctx.configRoot);

out << "\n\nDefault:\n";
printAttr(ctx, out, "default", option);
@@ -439,26 +438,26 @@ void printListing(Out & out, Value & v)
}
}

bool optionTypeIs(Context & ctx, Value & v, const std::string & sought_type)
bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType)
{
try {
const auto & type_lookup = v.attrs->find(ctx.state.sType);
if (type_lookup == v.attrs->end()) {
const auto & typeLookup = v.attrs->find(ctx.state.sType);
if (typeLookup == v.attrs->end()) {
return false;
}
Value type = evaluateValue(ctx, *type_lookup->value);
Value type = evaluateValue(ctx, *typeLookup->value);
if (type.type != tAttrs) {
return false;
}
const auto & name_lookup = type.attrs->find(ctx.state.sName);
if (name_lookup == type.attrs->end()) {
const auto & nameLookup = type.attrs->find(ctx.state.sName);
if (nameLookup == type.attrs->end()) {
return false;
}
Value name = evaluateValue(ctx, *name_lookup->value);
Value name = evaluateValue(ctx, *nameLookup->value);
if (name.type != tString) {
return false;
}
return name.string.s == sought_type;
return name.string.s == soughtType;
} catch (Error &) {
return false;
}
@@ -484,19 +483,19 @@ Value getSubOptions(Context & ctx, Value & option)
Value findAlongOptionPath(Context & ctx, const std::string & path)
{
Strings tokens = parseAttrPath(path);
Value v = ctx.options_root;
Value v = ctx.optionsRoot;
for (auto i = tokens.begin(); i != tokens.end(); i++) {
const auto & attr = *i;
try {
bool last_attribute = std::next(i) == tokens.end();
bool lastAttribute = std::next(i) == tokens.end();
v = evaluateValue(ctx, v);
if (attr.empty()) {
throw OptionPathError("empty attribute name");
}
if (isOption(ctx, v) && optionTypeIs(ctx, v, "submodule")) {
v = getSubOptions(ctx, v);
}
if (isOption(ctx, v) && optionTypeIs(ctx, v, "loaOf") && !last_attribute) {
if (isOption(ctx, v) && optionTypeIs(ctx, v, "loaOf") && !lastAttribute) {
v = getSubOptions(ctx, v);
// Note that we've consumed attr, but didn't actually use it. This is the path component that's looked
// up in the list or attribute set that doesn't name an option -- the "root" in "users.users.root.name".
@@ -538,8 +537,8 @@ int main(int argc, char ** argv)
{
bool all = false;
std::string path = ".";
std::string options_expr = "(import <nixpkgs/nixos> {}).options";
std::string config_expr = "(import <nixpkgs/nixos> {}).config";
std::string optionsExpr = "(import <nixpkgs/nixos> {}).options";
std::string configExpr = "(import <nixpkgs/nixos> {}).config";
std::vector<std::string> args;

struct MyArgs : nix::LegacyArgs, nix::MixEvalArgs
@@ -557,9 +556,9 @@ int main(int argc, char ** argv)
} else if (*arg == "--path") {
path = nix::getArg(*arg, arg, end);
} else if (*arg == "--options_expr") {
options_expr = nix::getArg(*arg, arg, end);
optionsExpr = nix::getArg(*arg, arg, end);
} else if (*arg == "--config_expr") {
config_expr = nix::getArg(*arg, arg, end);
configExpr = nix::getArg(*arg, arg, end);
} else if (!arg->empty() && arg->at(0) == '-') {
return false;
} else {
@@ -576,10 +575,10 @@ int main(int argc, char ** argv)
auto store = nix::openStore();
auto state = std::make_unique<EvalState>(myArgs.searchPath, store);

Value options_root = parseAndEval(*state, options_expr, path);
Value config_root = parseAndEval(*state, config_expr, path);
Value optionsRoot = parseAndEval(*state, optionsExpr, path);
Value configRoot = parseAndEval(*state, configExpr, path);

Context ctx{*state, *myArgs.getAutoArgs(*state), options_root, config_root};
Context ctx{*state, *myArgs.getAutoArgs(*state), optionsRoot, configRoot};
Out out(std::cout);

if (all) {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.