| Commit message (Collapse) | Author | Age |
| |
|
| |
|
|
|
|
| |
HEAD
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
nixpkgs/pkgs/top-level/perl-packages.nix
|
|
|
|
| |
HEAD
|
| |
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/servers/pr-tracker/default.nix
|
| |
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
|
| |
|
| |
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/build-support/go/module.nix
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/build-support/go/module.nix
nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/applications/window-managers/sway/default.nix
nixpkgs/pkgs/build-support/go/module.nix
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
nixpkgs/pkgs/development/libraries/mesa/default.nix
nixpkgs/pkgs/servers/dict/dictd-db.nix
Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/nixos/modules/config/console.nix
nixpkgs/nixos/modules/services/mail/mailman.nix
nixpkgs/nixos/modules/services/mail/public-inbox.nix
nixpkgs/nixos/modules/services/mail/rss2email.nix
nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
nixpkgs/pkgs/applications/window-managers/sway/default.nix
nixpkgs/pkgs/build-support/go/module.nix
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
nixpkgs/pkgs/development/interpreters/python/default.nix
nixpkgs/pkgs/development/node-packages/overrides.nix
nixpkgs/pkgs/development/tools/b4/default.nix
nixpkgs/pkgs/servers/dict/dictd-db.nix
nixpkgs/pkgs/servers/mail/public-inbox/default.nix
nixpkgs/pkgs/tools/security/pinentry/default.nix
nixpkgs/pkgs/tools/text/unoconv/default.nix
nixpkgs/pkgs/top-level/all-packages.nix
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/nixos/modules/system/boot/systemd.nix
nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix
nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix
nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix
nixpkgs/pkgs/top-level/all-packages.nix
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
|
|
|
|
|
| |
Conflicts:
nixpkgs/pkgs/applications/window-managers/sway/default.nix
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/nixos/modules/programs/ssh.nix
nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
nixpkgs/pkgs/development/go-modules/generic/default.nix
nixpkgs/pkgs/development/interpreters/ruby/default.nix
nixpkgs/pkgs/development/libraries/mesa/default.nix
|
|
|
|
| |
(cherry picked from commit 1dc68f203cc0d495dcd271d973590511adb1aaa6)
|
|
|
|
| |
(cherry picked from commit 88a7c0e327772fbac71e5c67d3fbad6b8709d092)
|
|
|
|
| |
(cherry picked from commit 2222e9b3f3892554a11910732bc2e73eee6d4dc5)
|
|
|
|
| |
(cherry picked from commit 0a0c1140dc3ca394e29033d059d7c18fd4bdfd7d)
|
|
|
|
| |
(cherry picked from commit 12b90a49fb708bacc883a839db9d449c8c97813e)
|
|
|
|
| |
(cherry picked from commit ee226b91dd32c1eedce8c30e9e63d443bbfd6f18)
|
|
|
|
| |
(cherry picked from commit c1b06381d8a742d9a6214018399b56f443d0717e)
|
|
|
|
| |
(cherry picked from commit eca8a5d6941626d43e05d73635e915a0d3f482ce)
|
|
|
|
| |
(cherry picked from commit 8b36faa20bc86ec9b278c3ca741b94d7fb8b3271)
|
|
|
|
| |
(cherry picked from commit 46223d06c63b9bdf979a714cec4ba7c45d098946)
|
|
|
|
| |
(cherry picked from commit 69dadbcd8bc98f9ab27cbf985059c8511946dafc)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/nixos/modules/misc/documentation.nix
nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
nixpkgs/pkgs/applications/window-managers/sway/default.nix
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
nixpkgs/pkgs/development/go-modules/generic/default.nix
nixpkgs/pkgs/development/interpreters/ruby/default.nix
nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
nixpkgs/pkgs/servers/mail/mailman/web.nix
nixpkgs/pkgs/top-level/aliases.nix
nixpkgs/pkgs/top-level/all-packages.nix
nixpkgs/pkgs/top-level/impure.nix
|
| |
|
|
|
|
|
|
|
|
| |
Conflicts:
nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
nixpkgs/pkgs/development/node-packages/default.nix
nixpkgs/pkgs/development/python-modules/priority/deadline.patch
|
|
|
|
|
| |
Conflicts:
nixpkgs/nixos/modules/config/update-users-groups.pl
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
# Conflicts:
# nixpkgs/pkgs/top-level/all-packages.nix
|
|
|
|
|
|
|
|
|
| |
# Conflicts:
# nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
# nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
# nixpkgs/pkgs/applications/window-managers/sway/default.nix
# nixpkgs/pkgs/build-support/rust/default.nix
# nixpkgs/pkgs/development/go-modules/generic/default.nix
|
|
|
|
|
|
| |
(cherry picked from commit e117e00a5c83fdfd880126aa4dc9a1b245dc70a6)
Backporting to nixlib because the URL for xlib was no longer valid.
|
| |
|