about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
Commit message (Collapse)AuthorAge
* Merge https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-01
|
* Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'Alyssa Ross2023-02-08
|
* Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'Alyssa Ross2022-03-31
| | | | | | | | | | 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
* 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 'db88608d8c811a93b74c99cfa1224952afc78200'Alyssa Ross2021-09-13
| | | | | Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
* Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'Alyssa Ross2021-06-22
| | | | | | | | | # 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
* Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'Alyssa Ross2021-06-10
|
* Merge remote-tracking branch 'nixpkgs/nixos-unstable'Alyssa Ross2021-04-12
|
* youtube-dl: 2021.03.31 -> 2021.04.01zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.04.01 (cherry picked from commit eb0980855d03c1727557c33539a6f89be46cecbb)
* youtube-dl: 2021.03.25 -> 2021.03.31zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.31 (cherry picked from commit 124564d5d212c8c9a74252ed718e6f1d65f3a5a0)
* youtube-dl: 2021.03.14 -> 2021.03.25zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.25 (cherry picked from commit 6aa079e2dd415c93c00fa53f031b09253c487135)
* youtube-dl: 2021.03.03 -> 2021.03.14zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.14 (cherry picked from commit f7393191e740d7ab695c5ffeac4766b7dc66cfee)
* youtube-dl: 2021.03.02 -> 2021.03.03zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03 (cherry picked from commit 694721374b47b881c816fd5cb870c36c26102bf5)
* youtube-dl: 2021.02.22 -> 2021.03.02zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.02 (cherry picked from commit 4dc3b8ba525c761819c283960d061e458de302ee)
* youtube-dl: 2021.02.10 -> 2021.02.22zowoq2021-04-04
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.22 (cherry picked from commit 90120d702ccb3b76bf56dbf375894c810b8feb9f)
* nixpkgs: merge nixos-unstableAlyssa Ross2021-02-16
|
* Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'Alyssa Ross2021-01-26
|
* Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'Alyssa Ross2021-01-15
|
* youtube-dl: 2020.11.19 -> 2020.11.21.1zowoq2020-11-22
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.21 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.21.1
* youtube-dl: 2020.11.12 -> 2020.11.19zowoq2020-11-22
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.18 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.19
* youtube-dl: 2020.11.01.1 -> 2020.11.12Vincent Demeester2020-11-22
| | | | | Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit b8065eeaef65ffdc95272dede63156e18293c4c0)
* youtube-dl: 2020-09-20 -> 2020.11.01.1Martin Weinelt2020-11-22
| | | | (cherry picked from commit d7a1f5e2016ebff780dc3ab86922b90d11160bac)
* youtube-dl: 2020.09.14 -> 2020.09.20Luflosi2020-10-14
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.20 (cherry picked from commit 907fd8d6f6274847ad7486456f3ac9bc6c38fb65)
* youtube-dl: 2020.09.06 -> 2020.09.14Luflosi2020-10-14
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.14 (cherry picked from commit 4a11f046a6e132974acb2ce6c21dd893386ac0ff)
* youtube-dl: 2020.07.28 -> 2020.09.06zowoq2020-10-14
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.06 (cherry picked from commit e2d02e469a1bff167fe25dc7ff087401e4591433)
* youtube-dl: 2020.06.16.1 -> 2020.07.28zowoq2020-10-14
| | | | | https://github.com/ytdl-org/youtube-dl/releases/tag/2020.07.28 (cherry picked from commit 1e2a59ef56e914ee1dbb233f2c8a0153896a421e)
* Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'Alyssa Ross2020-07-13
| | | | | | This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
* Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'Alyssa Ross2020-06-04
|
* Merge commit '683c68232e91f76386db979c461d8fbe2a018782'Alyssa Ross2020-05-12
|
* Merge commit 'ae6bdcc53584aaf20211ce1814bea97ece08a248'Alyssa Ross2020-04-06
| | | | | | # Conflicts: # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
* Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'Alyssa Ross2020-04-01
|
* Merge commit '3d085a399c436a41d875801619e8f976b8519196'Alyssa Ross2020-01-26
|
* Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f'Alyssa Ross2020-01-22
|
* Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'Alyssa Ross2020-01-11
|
* Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'Alyssa Ross2019-09-28
|
* Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'Alyssa Ross2019-09-16
|
* Merge remote-tracking branch 'channels/nixos-unstable'Alyssa Ross2019-08-22
|
* Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'Alyssa Ross2019-08-14
|
* Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'Alyssa Ross2019-08-14
| | | | v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
* Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'Alyssa Ross2019-06-19
|
* Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'Alyssa Ross2019-06-18
|
* Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'Alyssa Ross2019-05-17
|
* Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'Alyssa Ross2019-05-07
|
* Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'Alyssa Ross2019-04-27
|
* Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'Alyssa Ross2019-04-22
|
* Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'Alyssa Ross2019-04-14
|
* Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'Alyssa Ross2019-03-11
|
* Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'Alyssa Ross2019-02-24
|
* Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'Alyssa Ross2019-02-07
|
* Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'Alyssa Ross2019-01-07
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199