summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update REXML to fix a dependency resolution issue.•••REXML accidentally added a version pin on a default gem (strscan) without bumping the major version. REXML removed the pin on strscan in 3.3.0 https://github.com/ruby/rexml/commit/f1df7d13b3e57a5e059273d2f0870163c08d7420#diff-75d0a867bbfd5e375164c17cf7a9df96761fb050e7308f3918ad6fe1fe12d27dL58 (cherry picked from commit 5ba6bb7ad9710e6aeb9a2b23d45d24ed5055d59a) origin/backport-319727-to-release-24.05Joé Dupuis2024-06-141-2/+2
* Merge pull request #318775 from NixOS/backport-318760-to-release-24.05•••[Backport release-24.05] vscode-extensions.bazelbuild.vscode-bazel: 0.7.0 -> 0.10.0Weijia Wang2024-06-141-2/+2
|\
| * vscode-extensions.bazelbuild.vscode-bazel: 0.7.0 -> 0.10.0•••(cherry picked from commit 3c99b794a3e8500ea5407edc59aa30ee1cdeb601) Malte Poll2024-06-101-2/+2
* | Merge pull request #319859 from NixOS/backport-315225-to-release-24.05•••[Backport release-24.05] mdbook-i18n-helpers: 0.3.2 -> 0.3.3Weijia Wang2024-06-141-3/+3
|\ \
| * | mdbook-i18n-helpers: 0.3.2 -> 0.3.3•••(cherry picked from commit 95f8d6e5306ebb7459fc372fd7a5db776abb82a5) R. Ryantm2024-06-141-3/+3
* | | Merge pull request #319383 from NixOS/backport-316606-to-release-24.05•••[Backport release-24.05] easyaudiosync: init at 1.1.1Weijia Wang2024-06-147-0/+196
|\ \ \
| * | | easyaudiosync: init at 1.1.1•••(cherry picked from commit 34f416de629c3ece68ecb80b98a75e4dc6a16263) Matteo Pacini2024-06-126-0/+190
| * | | maintainers: add matteopacini•••(cherry picked from commit d35cdfc5cc8c32d35428e4fe890c705e8410b2e0) Matteo Pacini2024-06-121-0/+6
* | | | Merge pull request #319490 from NixOS/backport-319286-to-release-24.05•••[Backport release-24.05] roddhjav-apparmor-rules: init at 0-unstable-2024-06-11Weijia Wang2024-06-141-0/+47
|\ \ \ \
| * | | | roddhjav-apparmor-rules: init at 0-unstable-2024-06-11•••(cherry picked from commit 23fc77f9f691650b109a0b23c1f19efab52ded02) John Titor2024-06-131-0/+47
* | | | | Merge pull request #319045 from NixOS/backport-311433-to-release-24.05•••[Backport release-24.05] rquickshare: init at 0.7.1Weijia Wang2024-06-141-0/+34
|\ \ \ \ \
| * | | | | rquickshare: init at 0.7.1•••(cherry picked from commit b9c9195337aea327dd395aef740f518733ed6a2f) luftmensch-luftmensch2024-06-111-0/+34
* | | | | | Merge pull request #318923 from NixOS/backport-318873-to-release-24.05•••[Backport release-24.05] jellyfin/jellyfin-web: 10.9.3 -> 10.9.6Weijia Wang2024-06-145-32/+25
|\ \ \ \ \ \
| * | | | | | jellyfin: move to pkgs/by-name•••(cherry picked from commit 2fa82b71c13a07bfc8ac5cf3aa1c4669dad71c1c) Minijackson2024-06-104-8/+3
| * | | | | | jellyfin-web: move to pkgs/by-name•••(cherry picked from commit b71cba01651ec82a33f6014220c0f0e1aecd6c61) Minijackson2024-06-102-2/+0
| * | | | | | jellyfin: 10.9.3 -> 10.9.6•••(cherry picked from commit ce23a06b622bbf4b35a528cc5feb43f292e1a6db) Minijackson2024-06-102-19/+19
| * | | | | | jellyfin-web: 10.9.3 -> 10.9.6•••(cherry picked from commit f104ce9779d4468a211b1126dc79b41aa612e7ee) Minijackson2024-06-101-3/+3
* | | | | | | Merge pull request #319820 from NixOS/backport-319813-to-release-24.05•••[Backport release-24.05] prometheus-knot-exporter: 3.3.5 -> 3.3.6Martin Weinelt2024-06-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | prometheus-knot-exporter: 3.3.5 -> 3.3.6•••(cherry picked from commit 9de38ffd8ec88eed4229bd2d2ff1765cde42661c) R. Ryantm2024-06-141-2/+2
* | | | | | | | Merge pull request #319857 from NixOS/backport-318888-to-release-24.05•••[Backport release-24.05] flyctl: 0.2.65 -> 0.2.66Raghav Sood2024-06-151-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | flyctl: 0.2.65 -> 0.2.66•••(cherry picked from commit c6448fb371e07296dc0d9ba279e138df8bc7726d) R. Ryantm2024-06-141-3/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | spatial-shell: init at 7•••(cherry picked from commit 09b5e09ce89f065573268431f6e00ff2d6d06075) Francesco Gazzetta2024-06-141-0/+37
* | | | | | | | ocamlPackages.ezjsonm-encoding: init at 2.0.0•••(cherry picked from commit e8b10438a69707bb81f195cfe66cc0954ecb2d3d) Francesco Gazzetta2024-06-142-0/+22
|/ / / / / / /
* | | | | | | Merge pull request #319648 from rnhmjoj/pr-haskell-fixes-back•••[24.05] Assorted haskellPackages fixesmaralorn2024-06-143-21/+17
|\ \ \ \ \ \ \
| * | | | | | | haskellPackages.scat: unbreak•••(backport of commit 4636757b18c6c3496f74d5908b871ba56c8273f6) rnhmjoj2024-06-143-8/+4
| * | | | | | | haskellPackages.selda: unbreak•••(backport of commit 9106eb8ad99147c1bc5830a903479672d2bd8cdf) rnhmjoj2024-06-143-6/+3
| * | | | | | | haskellPackages.leveldb-haskell: unbreak•••(backport of commit 1516a75687501f31aa91824c2e4183dcb281bc4d) rnhmjoj2024-06-143-7/+10
* | | | | | | | Merge pull request #319493 from NixOS/backport-319334-to-release-24.05•••[Backport release-24.05] knot-dns: 3.3.5 -> 3.3.6Martin Weinelt2024-06-142-6/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | python312Packages.libknot: 3.3.5 -> 3.3.6•••(cherry picked from commit 5e57e65ce4295a22fa7c36cf99e5233586773383) Martin Weinelt2024-06-131-4/+3
| * | | | | | | knot-dns: 3.3.5 -> 3.3.6•••https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.6 (cherry picked from commit e67116cda691a38f5c4f8cc20069e2223288f460) Vladimír Čunát2024-06-131-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge #319748: maintainers/scripts/copy-tarballs.pl: switch nix version•••...into release-24.05 Vladimír Čunát2024-06-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | maintainers/scripts/copy-tarballs.pl: switch nix version•••nixUnstable is a deprecated alias, so the script didn't work anymore. Also, I see no need to avoid the default nix here (maybe years ago). Tested on mirror-tarballs.service at pluto.nixos.org (atop 24.05). (cherry picked from commit bf8e7f9cb33c73b14a8f19614ab98c5f55944235) Vladimír Čunát2024-06-141-1/+1
|/ / / / / / /
* | | | | | | ocamlPackages.apron: 0.9.14 → 0.9.15•••(cherry picked from commit eeb07de1e51c225ec652fc9b861ebaa8cd5ad819) Vincent Laporte2024-06-141-6/+3
* | | | | | | Merge pull request #319672 from NixOS/backport-319416-to-release-24.05•••[Backport release-24.05] magnetico: fix buildMichele Guerini Rocco2024-06-141-7/+17
|\ \ \ \ \ \ \
| * | | | | | | magnetico: fix build•••(cherry picked from commit a2395a2e722fb106c1ea977dd2aef84fc0699dc2) rnhmjoj2024-06-131-7/+17
* | | | | | | | Merge pull request #319673 from NixOS/backport-319622-to-release-24.05•••[Backport release-24.05] forgejo: 7.0.3 -> 7.0.4Emily2024-06-141-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | forgejo: 7.0.3 -> 7.0.4•••(cherry picked from commit 9c51d83ba84f61e9ad7ccb8062d0760006dd7ad5) Vri2024-06-131-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #319629 from NixOS/backport-318901-to-release-24.05•••[Backport release-24.05] nixos/freshrss: fix reload when config changesFelix Bühler2024-06-131-7/+4
|\ \ \ \ \ \ \
| * | | | | | | nixos/freshrss: fix reload when config changes•••(cherry picked from commit edcdf6ad3b6534ee5a848db43b8601824d930977) Felix Buehler2024-06-131-7/+4
|/ / / / / / /
* | | | | | | Merge pull request #317541 from NixOS/backport-315364-to-release-24.05•••[Backport release-24.05] sway-contrib.grimshot: 0-unstable-2024-01-20 -> 0-unstable-2024-03-19Nick Cao2024-06-131-3/+6
|\ \ \ \ \ \ \
| * | | | | | | sway-contrib.grimshot: add bash shell-completion•••(cherry picked from commit aceaa9eddb1cd2ec6389a622bbe9192757d4c3c3) John Garcia2024-06-051-0/+1
| * | | | | | | sway-contrib.grimshot: 0-unstable-2024-01-20 -> 0-unstable-2024-03-19•••(cherry picked from commit 2d567c689de96fbc5e3e3c1b5bb61a6b7c7c39e0) John Garcia2024-06-051-3/+3
| * | | | | | | sway-contrib.grimshot: add grep to wrapper•••(cherry picked from commit d1a1ad9af37ca84e9fa7b05a1227b932dcd224e0) John Garcia2024-06-051-0/+2
* | | | | | | | Merge pull request #319430 from NixOS/backport-318297-to-release-24.05•••[Backport release-24.05] linuxPackages.rtl88x2bu: unstable-2023-11-29 -> unstable-2024-05-11Nick Cao2024-06-131-4/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | linuxPackages.rtl88x2bu: unstable-2023-11-29 -> unstable-2024-06-09•••Fixes: #319097. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 32a6be9aaee8ba74f8742a36f49ffb0479fb3477) Otavio Salvador2024-06-131-4/+10
* | | | | | | | | irrd: 4.4.2 -> 4.4.4; fix build (#319593)•••(cherry picked from commit 389c3e21e2a31993561dd9976df060eede329134) Co-authored-by: Yureka <yuka@yuka.dev>github-actions[bot]2024-06-132-9/+22
* | | | | | | | | Merge pull request #319510 from pbsds/backport-amdvlk-24.05•••[24.05] nixos/amdvlk: init moduleJörg Thalheim2024-06-133-0/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nixos/amdvlk: init module•••Backport of #318175 Masum Reza2024-06-133-0/+65
* | | | | | | | | | Merge pull request #319559 from NixOS/backport-319486-to-release-24.05•••[Backport release-24.05] gitlab: 16.10.6 -> 16.11.4K9002024-06-1311-171/+213
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitlab-container-registry: 4.1.0 -> 4.5.0•••https://gitlab.com/gitlab-org/container-registry/-/blob/v4.5.0-gitlab/CHANGELOG.md Fixes CVE-2024-1495 Fixes CVE-2024-1963 Fixes CVE-2024-4201 Fixes CVE-2024-5469 (cherry picked from commit e34d62d869c3fbd23ab7440628bfea28b1e176c2) Yaya2024-06-132-3/+7