Robert Hensing
60c4e61a61
Merge pull request #132363 from NixOS/backport-131814-to-release-21.05
...
[Backport release-21.05] nixos/nix-daemon: fix registry flake type
2021-08-02 01:49:18 +02:00
Robert Hensing
3ed3b163aa
Merge pull request #131876 from NixOS/backport-131760-to-release-21.05
...
[Backport release-21.05] nixos/installer: force root fs type
2021-08-01 23:06:37 +02:00
Robert Hensing
348a2aaee0
Merge pull request #130952 from NixOS/backport-129574-to-release-21.05
...
[Backport release-21.05] nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb
2021-07-22 09:09:24 +02:00
Robert Hensing
9d230170bc
Merge pull request #126586 from vs49688/vgmstream
...
[21.05] vgmstream: init at r1050-3448-g77cc431b
2021-07-15 11:33:33 +02:00
Robert Hensing
0ce211ba1b
Merge pull request #130177 from unclechu/backport-add-json2yaml-to-toplevel-to-release-21.05
...
Backport “add json2yaml to top-level” to release-21.05
2021-07-15 11:03:06 +02:00
Robert Hensing
63f6eb0512
Merge pull request #130215 from NixOS/backport-130165-to-release-21.05
...
[Backport release-21.05] thunderbird, thunderbird-bin: 78.11.0 -> 78.12.0 [High security fixes]
2021-07-15 09:16:58 +02:00
Robert Hensing
eca1edd70d
Merge pull request #127720 from NixOS/backport-127628-to-release-21.05
...
[Backport release-21.05] nixosTest: Force system.nixos.revision constant
2021-06-22 16:35:32 +02:00
Robert Hensing
6dc9b7d832
Merge pull request #126986 from NixOS/backport-126922-to-release-21.05
...
[Backport release-21.05] nixos/ssh: Add an example of verbatim keys
2021-06-15 22:50:37 +02:00
Robert Hensing
1fe3b399a3
Merge pull request #125783 from NixOS/backport-125625-to-release-21.05
...
[Backport release-21.05] doc: Fix make in nix-shell
2021-06-05 15:14:54 +02:00
Robert Hensing
297970378b
Merge pull request #125341 from hercules-ci/backport-podman-improvements
...
[Backport release-21.05] podman improvements
2021-06-02 18:23:15 +02:00
Robert Hensing
68e821b051
Merge pull request #125388 from NixOS/backport-125216-to-release-21.05
...
[Backport release-21.05] dockerTools: Fix passthru image tag
2021-06-02 17:19:19 +02:00
Robert Hensing
eaba7870ff
Merge pull request #125338 from NixOS/backport-124494-to-release-21.05
...
[Backport release-21.05] dockerTools: Allow omitting all store paths
2021-06-02 10:22:59 +02:00
Robert Hensing
7a2a68316e
Merge pull request #123898 from edolstra/revert-nix-experimental
...
Revert nixExperimental / nixFlakes changes and deprecate nixFlakes attribute
2021-05-21 16:05:01 +02:00
Robert Hensing
a37d157601
Merge pull request #123052 from xoe-labs/da-test-vm-innteractive-log-switch
...
nixos/testing: add interactive serial stdout logs switch and dim them
2021-05-20 15:32:54 +02:00
Robert Hensing
61f412a75f
Merge pull request #123781 from 06kellyjac/boundary
...
boundary: 0.2.1 -> 0.2.2
2021-05-20 13:14:07 +02:00
Robert Hensing
76a7840f5f
Merge pull request #117275 from hercules-ci/nixosTest-remove-nixpkgs-commit-hash
...
nixosTest: Make system.nixos.revision constant
2021-05-20 10:40:59 +02:00
Robert Hensing
ff2f08080e
Merge pull request #123591 from hercules-ci/update-podman-compose
...
podman-compose: 0.1.5 -> 0.2.0pre-2021-05-18
2021-05-19 17:47:22 +02:00
Robert Hensing
74bf82a202
Merge pull request #122784 from hercules-ci/nixpkgs-init-nixos-install-tools
...
nixos-install-tools: init
2021-05-19 17:45:43 +02:00
Robert Hensing
5bbdc24b2a
Merge pull request #123597 from hercules-ci/issue-123572
...
tests.trivial: Avoid evaluation and ${pkgs.path} dep
2021-05-19 11:57:32 +02:00
Robert Hensing and Nikolay Korotkiy
8bb4cc751e
podman-compose: hash nitpicking
...
Co-authored-by: Nikolay Korotkiy <sikmir@gmail.com >
2021-05-19 11:34:34 +02:00
Robert Hensing
ea0c94f50d
Merge pull request #123111 from hercules-ci/writeDirectReferencesToFile
...
writeDirectReferencesToFile and maintenance
2021-05-17 15:44:10 +02:00
Robert Hensing
338baef861
Merge pull request #122458 from serokell/team-serokell
...
maintainers: add serokell team, move various packages to it
2021-05-16 22:37:50 +02:00
Robert Hensing
beae2e6b19
Merge pull request #122832 from mroi/patch-fakeroot
...
fakeroot: fix Darwin by applying an additional patch from Brew
2021-05-16 22:09:42 +02:00
Robert Hensing
3c6fcc9073
Merge pull request #122987 from alyssais/nixos-rebuild-aarch64
...
nixos-rebuild: support prebuilt Nix on aarch64
2021-05-16 22:00:39 +02:00
Robert Hensing
e312fc23c4
Merge pull request #122282 from roberth/docker-tools-reenable-lint
...
nixos/tests/docker-tools*: enable linting
2021-05-09 03:33:42 +02:00
Robert Hensing
ecfc25248c
Merge pull request #122204 from roberth/nixos-test-expose-driver
...
nixos/tests: move makeWrapper to nativeBuildInputs
2021-05-09 03:13:09 +02:00
Robert Hensing
4433ba90aa
Merge pull request #121927 from rissson/nixos-unbound-fix-top-level-include
...
nixos/unbound: allow list of strings in top-level settings option type
2021-05-08 22:00:57 +02:00
Robert Hensing
8823855ce3
Merge pull request #122003 from hercules-ci/rename-xvfb-run
...
treewide: xvfb_run -> xvfb-run
2021-05-08 16:26:48 +02:00
Robert Hensing
3cfb002b07
Merge pull request #122192 from roberth/docker-tools-stimulate-testing
...
dockerTools testing update
2021-05-08 15:53:17 +02:00
Robert Hensing
16067d53d1
Merge pull request #122083 from hercules-ci/update-hercules-ci-optparse-applicative
...
haskellPackages.hercules-ci-optparse-applicative: 2021-03-05 -> 2021-03-18
2021-05-07 22:43:39 +02:00
Robert Hensing
316b82563a
Merge pull request #121702 from hercules-ci/nixos-hercules-ci-agent-update
...
nixos/hercules-ci-agent: updates
2021-05-07 15:48:33 +02:00
Robert Hensing
f6899555d0
Merge pull request #58600 from AerialX/msp430-mspds
...
MSP430 debug stack
2021-05-07 13:01:58 +02:00
Robert Hensing
1e5f2ef8f8
Merge pull request #121820 from sumnerevans/sublime-music-11-12
...
sublime-music: 0.11.11 -> 0.11.12
2021-05-07 12:23:31 +02:00
Robert Hensing
7419bcfa41
Merge pull request #121840 from drewrisinger/libcint-bump
...
libcint: 4.3.0 -> 4.4.0
2021-05-07 12:20:53 +02:00
Robert Hensing
eb4372d68f
Merge pull request #122005 from sternenseemann/ghc-binary-src-urls
...
haskell.compiler.ghc*Binary: update source URLs
2021-05-07 11:59:14 +02:00
Robert Hensing
aaec26af39
Merge pull request #121896 from raboof/extract-version-test-to-utility
...
test-utilities: version test
2021-05-07 11:56:01 +02:00
Robert Hensing
0633b6aa74
Merge pull request #121870 from Pacman99/pass-specialargs
...
lib/modules: pass specialArgs to modules
2021-05-07 01:54:48 +02:00
Robert Hensing
e32d497623
Merge pull request #121899 from hercules-ci/update-elm-json
...
elmPackages.elm-json: 0.2.7 -> 0.2.10
2021-05-06 11:58:36 +02:00
Robert Hensing
ce93c98ce2
Merge pull request #99132 from Infinisil/recursive-type-deprecation
...
Recursive type deprecation
2021-05-05 11:13:37 +02:00
Robert Hensing
0cf3550c91
Merge pull request #121124 from hercules-ci/cassandra-tidy
...
cassandra: tidy
2021-05-03 13:41:41 +02:00
Robert Hensing
b2f44e9aeb
Merge pull request #112504 from hercules-ci/fix-nixosTest-meta-position
...
nixosTest: fix meta.position
2021-05-03 11:50:57 +02:00
Robert Hensing
3f98c6e86c
Merge pull request #121043 from raboof/jre_minimal-add-test
...
jre_minimal: add basic test
2021-04-29 09:01:11 +02:00
Robert Hensing
fb45a00d63
Merge pull request #115523 from raboof/jre_minimal-strip-library
...
jre_minimal: strip libraries
2021-04-22 21:34:25 +02:00
Robert Hensing
578acc7a42
Merge pull request #118018 from considerate/master
...
dockerTools: Implement merging of image tarballs
2021-04-16 09:17:44 +02:00
Robert Hensing
58b21dea78
Merge pull request #116749 from vroad/docker-layered-image-fakeroot
...
dockerTools.streamLayeredImage: add fakeRootCommands option
2021-04-07 15:02:24 +02:00
Robert Hensing
363d7c86b0
Merge pull request #117603 from lbpdt/fix/docker-tools-layered-image-env
...
dockerTools.streamLayeredImage: resolve duplicate env vars
2021-03-26 09:52:18 +01:00
Robert Hensing
43b02818f6
Merge pull request #117273 from hercules-ci/nixos-dont-format
...
Don't format XML of the NixOS manual
2021-03-24 11:07:23 +01:00
Robert Hensing
e0e241c219
Merge pull request #116369 from m1cr0man/master
...
nixos/acme: Fix webroot issues
2021-03-23 21:31:42 +01:00
Robert Hensing
bef62e8c81
Merge pull request #114752 from hercules-ci/lazy-offline-acme
...
acme: Determine offline whether renewal is due
2021-03-22 16:04:33 +01:00
Robert Hensing
d061acd4fa
Merge pull request #115330 from hercules-ci/hercules-ci-updates
...
Hercules CI updates
2021-03-09 22:45:48 +01:00
Robert Hensing
2deb6cf482
Merge pull request #115491 from NasaGeek/dockerTools.buildImage-nolower
...
dockerTools: Do not lowercase image tag in buildImage
2021-03-09 10:49:47 +01:00
Robert Hensing
ba51a94740
Merge pull request #115106 from hercules-ci/nixpkgs-doc
...
doc: Add README and format
2021-03-07 11:33:44 +01:00
Robert Hensing
16b327c0b4
Merge pull request #108914 from bryanasdev000/doc-dockertools
...
dockertools: Update doc to use CommonMark
2021-03-04 18:01:39 +01:00
Robert Hensing
f3d006c1d4
Merge pull request #115083 from osener/fix-dockertools-on-darwin
...
dockerTools: fix build on Darwin
2021-03-04 16:50:26 +01:00
Robert Hensing
89aa0173ca
Merge pull request #115075 from siraben/stdenv-cleanup
...
treewide: remove stdenv where not needed
2021-03-04 15:51:04 +01:00
Robert Hensing
2c0bb4d969
Merge pull request #113944 from xoe-labs/da/fixup-sd-card-move
...
installer: fixup sd-card folder move from #110827
2021-02-21 23:27:02 +01:00
Robert Hensing
92b1ef601c
Merge pull request #110827 from xoe-labs/da/sd-are-no-installation-devices
...
installer: split sd cards -> base for bespoke sd images
2021-02-21 18:34:47 +01:00
Robert Hensing
931260043e
Merge pull request #113282 from hercules-ci/qtwebengine-timeout
...
qtwebengine: Increase build timeout to 24h
2021-02-17 01:08:29 +01:00
Robert Hensing
075e1f7ee4
Merge pull request #112637 from hercules-ci/hercules-ci-agent-maintenance
...
nixos/hercules-ci-agent: maintenance
2021-02-10 11:02:45 +01:00
Robert Hensing
094362a35a
Merge pull request #112154 from hercules-ci/nixos-hercules-ci-agent-remove-patchNix
...
nixos/hercules-ci-agent: Remove patchNix
2021-02-08 19:21:00 +01:00
Robert Hensing
a4f4d86e92
Merge pull request #111583 from mikroskeem/more-docker-fixes
...
docker: fix socket activation race
2021-02-01 19:13:38 +01:00
Robert Hensing and Jörg Thalheim
1d41739764
nixUnstable: patch #4470 (ETag) ( #111005 )
...
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com >
2021-01-28 19:11:48 +00:00
Robert Hensing
d2a41be2f3
Merge pull request #110707 from Infinisil/functionTo
...
Bring back `types.functionTo`
2021-01-27 10:50:13 +01:00
Robert Hensing
1d0d9d26c6
Merge pull request #109663 from Pamplemousse/documentation
...
documention corrections
2021-01-26 15:37:45 +01:00
Robert Hensing
530df49d7a
Merge pull request #108411 from hercules-ci/vault-multiple-config-files
...
vault: Support multiple config files (no secrets in store)
2021-01-24 13:49:06 +01:00
Robert Hensing
e03103707b
Merge pull request #110614 from cpcloud/nomad-mkdefault-data-dir
...
nixos/nomad: fix data_dir-default-not-propagating bug
2021-01-23 21:09:27 +01:00
Robert Hensing
bbaff89ceb
Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre
...
nixos/systemd: allow preStart with other ExecStartPre cmdlines
2021-01-22 10:18:11 +01:00
Robert Hensing
33fdfd07d2
Merge pull request #102669 from pulsation/add-klog
...
klog: init at 1.3.2
2021-01-20 00:00:58 +01:00
Robert Hensing
d51d15e1cf
Merge pull request #109665 from prusnak/stdenv-lib-nixos
...
nixos/modules: stdenv.lib -> lib
2021-01-19 23:50:30 +01:00
Robert Hensing
95e1ba302d
Merge pull request #109447 from mikroskeem/docker-20.10-fixes
...
Docker 20.10 fixes
2021-01-15 15:25:24 +01:00
Robert Hensing
5540dd9b9b
Merge pull request #108416 from srhb/streamlayeredimage-symlinked-storepaths
...
dockerTools: Fix streamLayeredImage for symlinks
2021-01-05 10:00:28 +01:00
Robert Hensing
1a553d53c7
Merge pull request #107354 from lrworth/bash-5.1
...
bash: 5.0 -> 5.1
2020-12-22 21:57:08 +01:00
Robert Hensing
408e703eed
Merge pull request #106958 from NixOS/doc-cross-compilation-remove-confusing-reexplanation
...
doc/cross-compilation: Remove confusing re-explanation
2020-12-15 15:57:53 +01:00
Robert Hensing and John Ericson
3393e110a9
doc/stdenv/cross-compilation.chapter.md typo
...
Co-authored-by: John Ericson <git@JohnEricson.me >
2020-12-15 15:57:27 +01:00
Robert Hensing
1b35b3d3a7
Merge pull request #106703 from terinjokes/patches/dockerTools-getArch
...
dockerTools: normalize arch to GOARCH
2020-12-15 12:49:34 +01:00
Robert Hensing
c7e5c02374
doc/cross-compilation: Remove confusing re-explanation
...
See https://github.com/NixOS/nixpkgs/issues/106950
> They way it's worded says buildInputs are for build-time and nativeBuildInputs are for run-time. The other documentation leads me to believe it is the other way around.
2020-12-15 11:45:38 +01:00
Robert Hensing
b37c00ab90
Merge pull request #106441 from hercules-ci/cassandra-passthru-tests
...
Cassandra passthru tests
2020-12-14 16:49:47 +01:00
Robert Hensing
7aa5b3479d
Merge pull request #106650 from hercules-ci/fetchMavenArtifact-https
...
fetchMavenArtifact: switch mirrors to https
2020-12-11 14:32:15 +01:00
Robert Hensing
2abae8433e
Merge pull request #101325 from dbirks/add-lens
...
lens: init at 3.6.7
2020-12-11 11:41:51 +01:00
Robert Hensing
48929049d7
Merge pull request #104838 from redvers/update_cassandra_2.1.20_to_2.1.22_cve-2020-13946
...
cassandra_2_1: 2.1.20 -> 2.1.22
2020-12-09 13:21:04 +01:00
Robert Hensing
ed03f1a594
Merge pull request #104840 from redvers/update_cassandra_2.2.14_to_2.2.19_cve-2020-13946
...
cassandra_2_2: 2.2.14 -> 2.2.19
2020-12-09 13:20:34 +01:00
Robert Hensing
f41b7f6153
Merge pull request #104835 from redvers/update_cassandra_3.11.4_3.11.9_cve-2020-13946
...
cassandra: 3.11.4 -> 3.11.9
2020-12-09 13:19:53 +01:00
Robert Hensing
54ec506be5
Merge pull request #105662 from srhb/docker-tools-fix-format
...
nixos/tests/docker-tools.nix: Fix format
2020-12-02 09:02:46 +01:00
Robert Hensing
18506b716e
Merge pull request #104289 from hercules-ci/update-nixUnstable-2020-11-19
...
nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9
2020-11-21 13:00:55 +01:00
Robert Hensing
c68e739300
Merge pull request #104271 from adisbladis/dockertools-cross
...
dockerTools.buildLayeredImage: Fix cross compilation
2020-11-19 20:41:53 +01:00
Robert Hensing
c790ed8c4e
Merge pull request #96371 from asdf8dfafjk/fcitx_commit
...
fcitx: Add test (Unicode input, table input, m17n)
2020-11-19 11:05:36 +01:00
Robert Hensing
3f7278f9e9
Merge pull request #101341 from SuperSandro2000/gitlab-triage
...
gitlab-triage: init at 1.13.0
2020-11-10 19:14:29 +01:00
Robert Hensing
30e4ed063b
Merge pull request #101269 from bcdarwin/simpleitk-2.0.1
...
simpleitk: 2.0.0 -> 2.0.1
2020-11-10 18:57:57 +01:00
Robert Hensing
e8e46530c8
Merge pull request #103175 from utdemir/ud/add-utdemir-to-dockertools-codeowners
...
Add utdemir to CODEOWNERS for dockerTools
2020-11-09 08:54:45 +01:00
Robert Hensing
e2a129348b
Merge pull request #100585 from magnetophon/tiv
...
tiv: init at 1.1.0
2020-11-06 10:11:09 +01:00
Robert Hensing
5879841745
Merge pull request #99394 from omgbebebe/photoflare
...
photoflare: init at 1.6.5
2020-11-06 10:09:13 +01:00
Robert Hensing
c1cc245934
Merge pull request #100747 from oxalica/osu-lazer
...
osu-lazer: 2020.925.0 -> 2020.1017.0
2020-11-06 01:07:12 +01:00
Robert Hensing
587e1e27d5
Merge pull request #100496 from penguwin/charm
...
charm: 0.8.3 -> 0.8.4
2020-11-06 00:52:19 +01:00
Robert Hensing
f541365ca4
Merge pull request #100663 from andersk/rufo
...
rufo (Ruby formatter): init at 0.12.0
2020-11-06 00:44:42 +01:00
Robert Hensing
f15a00e2a0
Merge pull request #99721 from magnetophon/ardour
...
ardour: 6.2 -> 6.3
2020-11-06 00:15:19 +01:00
Robert Hensing
349288d101
Merge pull request #100582 from ldenefle/git-chglog-0.9.1
...
gitAndTools.git-chglog: init at 0.9.1
2020-11-05 22:39:07 +01:00
Robert Hensing
24f36f8464
Merge pull request #100002 from yanganto/find-cursor-1.6
...
find-cursor: init at 1.6
2020-11-05 12:47:09 +01:00
Robert Hensing
2d3c2e139b
Merge pull request #100524 from 06kellyjac/starboard_0.6.0
...
starboard: 0.5.0 -> 0.6.0
2020-11-05 12:42:55 +01:00
Robert Hensing
97e3346fbd
Merge pull request #99955 from Jiehong/feature/new_font
...
ttf-tw-moe: first version
2020-11-05 12:37:30 +01:00
Robert Hensing
161539a1ea
Merge pull request #99952 from siraben/spasm-init
...
spasm-ng: init at unstable-2020-08-03
2020-11-05 12:33:32 +01:00