| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | ocamlPackages.ppx_import: disable checks•••(cherry picked from commit ecf820740a0b576361dac53778a4e6e2e6338287)
origin/backport-124741-to-release-21.05 | Vincent Laporte | 2021-06-04 | 2 | -13/+1 |
| * | Merge pull request #125582 from NixOS/backport-125576-to-release-21.05 | Martin Weinelt | 2021-06-04 | 4 | -0/+92 |
| |\ |
|
| | * | matrix-synapse.tools.synadm: init at 0.29•••(cherry picked from commit 7efe82966df83ed82938912c4ecdf705ed49be4a)
| Martin Weinelt | 2021-06-03 | 2 | -0/+43 |
| | * | python3Packages.click-option-group: init at 0.5.3•••(cherry picked from commit c06b1086c0962a5909432c5b9590fc510926802a)
| Martin Weinelt | 2021-06-03 | 2 | -0/+49 |
| |/ |
|
| * | Merge pull request #125353 from petabyteboy/feature/gitlab-13-12-2-backport•••[21.05] gitlab: 13.12.0 -> 13.12.2 | Robert Scott | 2021-06-03 | 5 | -11/+11 |
| |\ |
|
| | * | gitlab: 13.12.0 -> 13.12.2•••https://about.gitlab.com/releases/2021/06/01/security-release-gitlab-13-12-2-released/
Backport of #125271
(cherry picked from commit 2a1c29ef4bacac06f9b677931027bf053952618c)
| Milan | 2021-06-03 | 5 | -11/+11 |
| * | | Merge pull request #125385 from mweinelt/21.05/lasso•••[21.05] lasso: Fix signature verification in AuthnResponse messages | Robert Scott | 2021-06-03 | 1 | -1/+9 |
| |\ \ |
|
| | * | | lasso: Fix signature verification in AuthnResponse messages•••Fixes: CVE-2021-28091
| Martin Weinelt | 2021-06-02 | 1 | -1/+9 |
| * | | | Merge pull request #125546 from NixOS/backport-125105-to-release-21.05 | Martin Weinelt | 2021-06-03 | 2 | -3/+3 |
| |\ \ \ |
|
| | * | | | samba4Full: disable glusterfs support•••The samba package was marked as broken, when enableGlusterFS is true.
The samba build with glusterfs fails due to API breakage that I am
unable to debug:
[3562/4088] Compiling source3/modules/vfs_virusfilter.c
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pread’:
../../source3/modules/vfs_glusterfs.c:856:8: error: too few arguments to function ‘glfs_pread’
856 | ret = glfs_pread(glfd, data, n, offset, 0);
| ^~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:713:1: note: declared here
713 | glfs_pread(glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags,
| ^~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pread_do’:
../../source3/modules/vfs_glusterfs.c:938:16: error: too few arguments to function ‘glfs_pread’
938 | state->ret = glfs_pread(state->fd, state->buf, state->count,
| ^~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:713:1: note: declared here
713 | glfs_pread(glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags,
| ^~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pwrite_do’:
../../source3/modules/vfs_glusterfs.c:1077:16: error: too few arguments to function ‘glfs_pwrite’
1077 | state->ret = glfs_pwrite(state->fd, state->buf, state->count,
| ^~~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:717:1: note: declared here
717 | glfs_pwrite(glfs_fd_t *fd, const void *buf, size_t count, off_t offset,
| ^~~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pwrite’:
../../source3/modules/vfs_glusterfs.c:1161:8: error: too few arguments to function ‘glfs_pwrite’
1161 | ret = glfs_pwrite(glfd, data, n, offset, 0);
| ^~~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:717:1: note: declared here
717 | glfs_pwrite(glfs_fd_t *fd, const void *buf, size_t count, off_t offset,
| ^~~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_fsync_do’:
../../source3/modules/vfs_glusterfs.c:1287:16: error: too few arguments to function ‘glfs_fsync’
1287 | state->ret = glfs_fsync(state->fd);
| ^~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:790:1: note: declared here
790 | glfs_fsync(glfs_fd_t *fd, struct glfs_stat *prestat,
| ^~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_ftruncate’:
../../source3/modules/vfs_glusterfs.c:1621:8: error: too few arguments to function ‘glfs_ftruncate’
1621 | ret = glfs_ftruncate(glfd, offset);
| ^~~~~~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:768:1: note: declared here
768 | glfs_ftruncate(glfs_fd_t *fd, off_t length, struct glfs_stat *prestat,
| ^~~~~~~~~~~~~~
../../source3/modules/vfs_virusfilter.c: In function ‘quarantine_create_dir’:
../../source3/modules/vfs_virusfilter.c:132:13: warning: implicit declaration of function ‘strlcat’; did you mean ‘strncat’? [-Wimplicit-function-declaration]
132 | cat_len = strlcat(new_dir, "/", len + 1);
| ^~~~~~~
| strncat
Waf: Leaving directory `/build/samba-4.14.4/bin/default'
Build failed
-> task in 'vfs_glusterfs.objlist' failed with exit status 1 (run with -v to display more information)
(cherry picked from commit fac761a55ad4d6c6a8498c468ec7e5c43b984264)
| Martin Weinelt | 2021-06-03 | 1 | -1/+0 |
| | * | | | samba: add missing python dependencies for ldap and domain controller•••(cherry picked from commit b760ab8cfbac9894b8b8e472c2810f8d4ea60b91)
| Maxine Aubrey | 2021-06-03 | 1 | -2/+3 |
| |/ / / |
|
| * | | | nix: 2.3.11 -> 2.3.12•••(cherry picked from commit ff50095bd4121f35e1ca73b4df68912db1bff2a4)
| Jonathan Ringer | 2021-06-03 | 1 | -2/+2 |
| * | | | nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5•••(cherry picked from commit f7fe3008d106b8b8834a4f64868ae386a9b26e08)
| Jonathan Ringer | 2021-06-03 | 1 | -10/+7 |
| * | | | iso-image: Improve disk detection•••This should help in rare hardware-specific situations where the root is
not automatically detected properly.
We search using a marker file. This should help some weird UEFI setups
where the root is set to `(hd0,msdos2)` by default.
Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It
is unclear why, but files in `(hd0,msdos2)` are not all present as they
should be.
This also fixes an issue introduced with cb5c4fcd3c5d4070f040d591b2dd1da580f234d1
where rEFInd stopped booting in many cases. This is because it ended up
using (hd0) rather than using the `search` which was happening
beforehand, which in turn uses (hd0,msdos2), which is the ESP.
Putting back the `search` here fixes that.
(cherry picked from commit 20b023b5ea63a6513a4dce7f162736a00bce5cc8)
| Samuel Dionne-Riel | 2021-06-03 | 1 | -1/+9 |
| * | | | iso-image: unqualified root → ($root)•••This technically changes nothing. In practice `$root` is always the
"CWD", whether searched for automatically or not.
But this serves to announce we are relying on `$root`... I guess...
(cherry picked from commit c9bb054dd68964b0eb9a38c51bdf824bfb212fc7)
| Samuel Dionne-Riel | 2021-06-03 | 1 | -6/+6 |
| * | | | iso-image: change date on all files•••It may be that in some conditions dates earlier than 1980 on FAT on GRUB
2.06~ish will cause failures
https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035
(cherry picked from commit 15eaed0718515db3f2fa7d4ed71676e6069d3fb5)
| Samuel Dionne-Riel | 2021-06-03 | 1 | -1/+3 |
| * | | | iso-image: Force gfxmode•••https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html
(cherry picked from commit f93f0e72e9ef423ed591951030f08cafd209e637)
| Samuel Dionne-Riel | 2021-06-03 | 1 | -0/+13 |
| * | | | Merge pull request #125342 from NixOS/backport-125334-to-release-21.05•••[Backport release-21.05] matterbridge: 1.12.1 -> 1.12.2 | Sandro | 2021-06-03 | 1 | -9/+9 |
| |\ \ \ |
|
| | * | | | matterbridge: 1.12.1 -> 1.12.2•••(cherry picked from commit a08f23039cf98d5b8648e2c3d6b872b348bac9d9)
origin/backport-125334-to-release-21.05 | legendofmiracles | 2021-06-02 | 1 | -9/+9 |
| * | | | | Merge pull request #125475 from NixOS/backport-125372-to-release-21.05•••[Backport release-21.05] nixos/tests/test-driver: add shell_interact | Domen Kožar | 2021-06-03 | 2 | -0/+23 |
| |\ \ \ \ |
|
| | * | | | | nixos/tests/test-driver: make it clear when shell is ready•••Co-authored-by: Domen Kožar <domen@enlambda.com>
(cherry picked from commit fd739c4dee12fbe57199f73c44ec22db2355028e)
origin/backport-125372-to-release-21.05 | Patrick Hilhorst | 2021-06-03 | 1 | -0/+1 |
| | * | | | | nixos/tests/test-driver: mention drawback•••(cherry picked from commit 287144273162acd869f514f7770a3daae4649d37)
| Patrick Hilhorst | 2021-06-03 | 1 | -0/+1 |
| | * | | | | nixos/tests/test-driver: document shell_interact•••(cherry picked from commit 9469433e341f7337308468bb4b9ccfff84b2951b)
| Patrick Hilhorst | 2021-06-03 | 2 | -1/+12 |
| | * | | | | nixos/tests/test-driver: add shell_interact•••(cherry picked from commit 5a589b5ba8941d734e9c3aebbf2be2f50d7c32a5)
| Patrick Hilhorst | 2021-06-03 | 1 | -0/+10 |
| |/ / / / |
|
| * | | | | blender: fix darwin build•••(cherry picked from commit dca87350f4e00539e52731628b98cbcc15c4319a)
| Dmitry Kalinkin | 2021-06-03 | 2 | -14/+9 |
| * | | | | blender: 2.92.0 -> 2.93.0•••(cherry picked from commit ff60dfcc7f700a9f60c5ff3ebbcf61781c17671e)
| Jonas Carpay | 2021-06-03 | 1 | -9/+9 |
| * | | | | redis: 6.2.3 -> 6.2.4 (#125444)•••https://github.com/redis/redis/releases/tag/6.2.4
(cherry picked from commit 8d34fb204ce256c124b35968f6bf3ee940bb36fc)
Co-authored-by: Mario Rodas <marsam@users.noreply.github.com> | github-actions[bot] | 2021-06-03 | 1 | -2/+2 |
| * | | | | Merge pull request #125336 from NixOS/backport-125306-to-release-21.05•••[Backport release-21.05] firefox-esr: 78.10.1esr -> 78.11.0esr | Martin Weinelt | 2021-06-03 | 1 | -2/+2 |
| |\ \ \ \ |
|
| | * | | | | firefox-esr: 78.10.1esr -> 78.11.0esr•••https://www.mozilla.org/en-US/firefox/78.11.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2021-24/
(cherry picked from commit f42ea75dec8fff9becbdf2094044485ec103dcd1)
origin/backport-125306-to-release-21.05 | Martin Weinelt | 2021-06-02 | 1 | -2/+2 |
| | |/ / / |
|
| * | | | | Merge pull request #125406 from eduardosm/dr14_tmeter•••[21.05] dr14_tmeter: use ffmpeg 4 | adisbladis | 2021-06-02 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | dr14_tmeter: use ffmpeg 4•••migrate away from ffmpeg_3 (https://github.com/NixOS/nixpkgs/issues/120705)
(cherry picked from commit 0b32978596d24542e6561a31b5f134ddcc6b811c)
| Eduardo Sánchez Muñoz | 2021-06-02 | 1 | -1/+1 |
| * | | | | | Merge pull request #125433 from sternenseemann/greenclip-fix•••[21.05] haskellPackages.greenclip: unbreak | Dennis Gosnell | 2021-06-03 | 3 | -14/+11 |
| |\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| | * | | | | haskellPackages.greenclip: unmark as broken•••libXScrnSaver is passed correctly now, so greenclip builds again.
| sternenseemann | 2021-06-03 | 2 | -3/+0 |
| | * | | | | hackage-packages.nix: Regenerate based on current config•••This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
Main point here is to apply the new cabal2nix-unstable generation with
a libNixName entry for libXScrnSaver, so greenclip builds again.
| sternenseemann | 2021-06-03 | 1 | -8/+8 |
| | * | | | | haskellPackages.cabal2nix-unstable: update to latest version from github•••(cherry picked from commit 259177f1097be0f8de5969242e98f8e026df8037)
| (cdep)illabout | 2021-06-03 | 1 | -3/+3 |
| |/ / / / |
|
| * | | | | Merge pull request #125425 from NixOS/backport-124407-to-release-21.05•••[Backport release-21.05] synapse: 1.34.0 -> 1.35.0 | Maximilian Bosch | 2021-06-03 | 1 | -7/+7 |
| |\ \ \ \ |
|
| | * | | | | synapse: 1.34.0 -> 1.35.0•••(cherry picked from commit c6a546e996d7dce5a688a6718ee7baeca694ddde)
| Sumner Evans | 2021-06-02 | 1 | -7/+7 |
| | |/ / / |
|
| * | | | | Merge pull request #125411 from NixOS/backport-125392-to-release-21.05•••[Backport release-21.05] pdns-recursor: disable on i686-linux | Michele Guerini Rocco | 2021-06-02 | 1 | -0/+3 |
| |\ \ \ \
| |/ / /
|/| | | |
|
| | * | | | pdns-recursor: disable on i686-linux•••Support for 32-bit platforms with no 64-bit time_t has ended.
See https://mailman.powerdns.com/pipermail/pdns-users/2021-May/027220.html
(cherry picked from commit cbfd8831a1082f6bea819f92c8bfd6ec688c9fc4)
origin/backport-125392-to-release-21.05 | rnhmjoj | 2021-06-02 | 1 | -0/+3 |
| |/ / / |
|
| * | | | Merge pull request #125341 from hercules-ci/backport-podman-improvements•••[Backport release-21.05] podman improvements | Robert Hensing | 2021-06-02 | 16 | -11/+552 |
| |\ \ \ |
|
| | * | | | nixos/podman-network-socket-ghostunnel: move condition to include socket•••(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
| zowoq | 2021-06-02 | 1 | -2/+2 |
| | * | | | podman: Add nixosTests.podman-dnsname to tests•••(cherry picked from commit 1d781e5c80d3c392933479a114e9e3857a1d9529)
| Robert Hensing | 2021-06-02 | 1 | -1/+4 |
| | * | | | nixos/podman-dnsname: init•••(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
| Robert Hensing | 2021-06-02 | 5 | -0/+84 |
| | * | | | nixos/podman: Add defaultNetwork.extraPlugins•••(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
| Robert Hensing | 2021-06-02 | 1 | -1/+22 |
| | * | | | nixos/containers: Add virtualisation.containers.containersConf.cniPlugins•••(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
| Robert Hensing | 2021-06-02 | 1 | -1/+21 |
| | * | | | dnsname-cni: Use wrapper instead of patch for dnsmasq•••The patch proved to be an incomplete solution while developing
nixosTests.podman-dnsname
(cherry picked from commit 651777934941480a36f7df9c434e6044957d045d)
| Robert Hensing | 2021-06-02 | 2 | -24/+11 |
| | * | | | podman: Add iproute2, fixing docker network rm•••(cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)
| Robert Hensing | 2021-06-02 | 2 | -0/+3 |
| | * | | | nixos/podman-network-socket-ghostunnel: init•••(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
| Robert Hensing | 2021-06-02 | 5 | -1/+191 |
| | * | | | nixos/podman: Add generic networkSocket interface•••(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
| Robert Hensing | 2021-06-02 | 2 | -0/+92 |
| | * | | | nixos/podman: Add dockerSocket.enable•••(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
| Robert Hensing | 2021-06-02 | 2 | -2/+60 |
