summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* labels: cacerts always needs backporting•••In general, we should always be backporting cacerts changes to keep our stable version up to date with the latest trust chains. Not perfect: will mislabel changes on stable branches probably, but I think that is a reasonable tradeoff.origin/grahamc-patch-1Graham Christensen2021-05-301-0/+3
* ocamlPackages.uri: 4.0.0 → 4.2.0Ulrik Strid2021-05-301-2/+2
* Merge pull request #124938 from TredwellGit/zfsUnstable•••zfsUnstable: 2.1.0-rc5 -> 2.1.0-rc6Robin Gloster2021-05-301-2/+2
|\
| * zfsUnstable: 2.1.0-rc5 -> 2.1.0-rc6•••https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc6 TredwellGit2021-05-301-2/+2
* | Merge pull request #110858 from jrick/oksh-shellPath•••oksh: add shellPath for use as user shellsGuillaume Girol2021-05-301-0/+4
|\ \
| * | oksh: add shellPath for use as user shells•••This allows the user shell to be set to pkgs.oksh instead of needing a string like "${pkgs.oksh}/bin/oksh". Josh Rickmar2021-01-261-0/+4
* | | Merge pull request #124732 from r-ryantm/auto-update/icinga2•••icinga2: 2.12.3 -> 2.12.4Ryan Mulligan2021-05-301-2/+2
|\ \ \
| * | | icinga2: 2.12.3 -> 2.12.4R. RyanTM2021-05-281-2/+2
* | | | Merge pull request #123841 from hercules-ci/podman-socket•••nixos/podman: Add docker socket supportRobert Hensing2021-05-309-4/+358
|\ \ \ \
| * | | | podman: Add iproute2, fixing docker network rmRobert Hensing2021-05-302-0/+3
| * | | | nixos/podman-network-socket-ghostunnel: initRobert Hensing2021-05-305-1/+191
| * | | | nixos/podman: Add generic networkSocket interfaceRobert Hensing2021-05-302-0/+92
| * | | | nixos/podman: Add dockerSocket.enableRobert Hensing2021-05-302-2/+60
| * | | | nixos/podman: Change podman socket to new podman groupRobert Hensing2021-05-301-1/+12
|/ / / /
* | | | Merge pull request #123253 from sbruder/vapoursynth-improve-dependency-resolu...•••vapoursynth: improve plugin dependency resolutionMichele Guerini Rocco2021-05-301-2/+3
|\ \ \ \
| * | | | vapoursynth: improve plugin dependency resolution•••Some python packages (e.g. functools32) are conditionally disabled for certain interpreter versions by having them return null instead of a derivation. `getRecursivePropagatedBuildInputs` fails if such a package is part of the dependency tree. This commit makes it only recurse into derivations and ignore everything else. This also deduplicates the final plugin list to improve startup time. Simon Bruder2021-05-161-2/+3
* | | | | Merge pull request #124943 from fortuneteller2k/vieb•••vieb: use electron_13Gabriel Ebner2021-05-301-1/+1
|\ \ \ \ \
| * | | | | vieb: use electron_13fortuneteller2k2021-05-301-1/+1
* | | | | | Merge pull request #124942 from yanganto/gitui-16•••gitui: 0.15.0 -> 0.16.0Fabian Affolter2021-05-301-3/+3
|\ \ \ \ \ \
| * | | | | | gitui: 0.15.0 -> 0.16.0Antonio Yang2021-05-301-3/+3
* | | | | | | Merge pull request #124411 from Kho-Dialga/master•••fixed version in proton-callerVladyslav M2021-05-301-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | proton-caller: fix versionKho-Dialga2021-05-291-1/+1
* | | | | | | Merge pull request #124941 from sumnerevans/heisenbridge-2021-05-29•••heisenbridge: unstable-2021-05-23 -> unstable-2021-05-29Martin Weinelt2021-05-301-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | heisenbridge: unstable-2021-05-23 -> unstable-2021-05-29•••Critically, this includes the changes from hifi/heisenbridge#78 which adds an entrypoint so that the executable works. Sumner Evans2021-05-291-3/+3
* | | | | | | Merge pull request #124884 from yanganto/s3rs•••s3rs: init at 0.4.8Sandro2021-05-302-0/+30
|\ \ \ \ \ \ \
| * | | | | | | s3rs: init at 0.4.8Antonio Yang2021-05-302-0/+30
* | | | | | | | Merge pull request #124351 from fortuneteller2k/sacad•••sacad: 2.3.4 -> 2.4.0Sandro2021-05-301-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | sacad: 2.3.4 -> 2.4.0fortuneteller2k2021-05-251-2/+2
* | | | | | | | | Merge pull request #121999 from siriobalmelli-foss/add/xjobs•••xjobs: init at 20200726Sandro2021-05-302-0/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xjobs: init at 20200726•••xjobs reads job descriptions line by line and executes them in parallel. Signed-off-by: Sirio Balmelli <sirio@b-ad.ch> Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Sirio Balmelli2021-05-242-0/+67
* | | | | | | | | | Merge pull request #124161 from romildo/upd.numix-solarized-gtk-theme•••numix-solarized-gtk-theme: 20200910 -> 20210522Sandro2021-05-301-5/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | numix-solarized-gtk-theme: 20200910 -> 20210522José Romildo2021-05-231-5/+6
* | | | | | | | | | Merge pull request #124066 from magnetophon/gxplugins•••Gxplugins-Lv2: 0.8 -> 0.9Sandro2021-05-301-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Gxplugins-Lv2: 0.8 -> 0.9Bart Brouns2021-05-241-3/+3
* | | | | | | | | | | Merge pull request #122854 from dguibert/dg/reposurgeon•••reposurgeon: 3.44 -> 4.26Sandro2021-05-301-50/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reposurgeon: 3.44 -> 4.26David Guibert2021-05-241-50/+28
* | | | | | | | | | | | Merge pull request #123491 from dotlambda/capture-ffmpeg•••capture: use ffmpeg instead of ffmpeg_3Sandro2021-05-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | capture: use ffmpeg instead of ffmpeg_3Robert Schütz2021-05-181-2/+2
* | | | | | | | | | | | | Merge pull request #124690 from 239/submit/update-bitwarden•••bitwarden: 1.24.6 -> 1.26.4Sandro2021-05-301-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | bitwarden: 1.24.6 -> 1.26.42392021-05-271-3/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | babashka: 0.4.1 -> 0.4.3 (#124325)Thiago Kenji Okada2021-05-301-4/+10
* | | | | | | | | | | | | Merge pull request #124575 from fgaz/goattracker/2.76•••goattracker,goattracker-stereo: 2.75 -> 2.76, 2.76 -> 2.77Sandro2021-05-301-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | goattracker,goattracker-stereo: 2.75 -> 2.76, 2.76 -> 2.77Francesco Gazzetta2021-05-271-5/+5
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | godot: 3.2.2 -> 3.3.2 (#123126)•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com>Robert Whitaker2021-05-303-23/+34
* | | | | | | | | | | | | Merge pull request #124920 from SuperSandro2000/twineSandro2021-05-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | twine: add top-level entrySandro Jäckel2021-05-301-0/+2
* | | | | | | | | | | | | | gitRepo: 2.14.5 -> 2.15.3 (#124904)Otavio Salvador2021-05-302-17/+13
* | | | | | | | | | | | | | Merge pull request #124222 from austinbutler/kooha-121•••kooha: 1.1.3 -> 1.2.1Sandro2021-05-301-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | kooha: 1.1.3 -> 1.2.1Austin Butler2021-05-231-5/+9
* | | | | | | | | | | | | | | Merge pull request #113779 from freezeboy/update-webcamoid•••webcamoid: 8.7.1 -> 8.8.0Sandro2021-05-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \