about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/intake
Commit message (Collapse)AuthorAge
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-03-01
|
* Merge branch 'staging' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-22
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-15
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-14
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-08-13
| | | | | | | | | | | 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
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-06-16
| | | | | | | | | | | | | | | | | | | | | | 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
* Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'Alyssa Ross2023-02-08
|
* Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'Alyssa Ross2022-02-19
| | | | | | | | | | | | | | | | | 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
* Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'Alyssa Ross2021-09-27
| | | | | | | | 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
* Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'Alyssa Ross2021-06-30
|
* Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'Alyssa Ross2021-06-10
|
* Merge remote-tracking branch 'nixpkgs/nixos-unstable'Alyssa Ross2021-04-12
|
* Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'Alyssa Ross2021-01-15
|
* Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'Alyssa Ross2021-01-12
|
* Merge commit 'b47873026c7e356a340d0e1de7789d4e8428ac66'Alyssa Ross2020-05-18
|
* Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'Alyssa Ross2020-04-27
|
* Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'Alyssa Ross2020-01-11
|
* Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'Alyssa Ross2019-09-16
|
* Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'Alyssa Ross2019-06-19
|
* Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'Alyssa Ross2019-04-27
|
* Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'Alyssa Ross2019-03-11
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-14 09:03:46 +0000