diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
| commit | 11a9ac00fc34ca9948ae05c034fa730163626e40 (patch) | |
| tree | 90b3ed6837b3f97239f6efbe763929cdaaa5795b /lib | |
| parent | 563389a7fdd85b1ca1d4c6590785df62f52c8d6d (diff) | |
| parent | 6543c61311c0397775253dd3d7f1f41154fc6189 (diff) | |
| download | nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.gz nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.bz2 nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.lz nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.xz nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.zst nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/networking/xh/default.nix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/trivial.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index f6f5da5998f..e1581f1e91d 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -171,7 +171,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Okapi"; + codeName = "Porcupine"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = |