From b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 16 Oct 2018 20:25:44 +0200
Subject: Revert "Merge pull request #48122 from zimbatm/pkg-nixos-rebuild"

This reverts commit 10addad6035034b2b78f3c74ef436cd7146d5231, reversing
changes made to 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2.

NixOS scripts should be kept in the NixOS source tree, not in
pkgs. Moving them around is just confusing and creates unnecessary
code/history churn.
---
 lib/trivial.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib')

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 811c298d8620..938df6ced476 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -98,9 +98,6 @@ rec {
   # The current nixpkgs version number as string.
   release = lib.strings.fileContents ../.version;
 
-  # Note: the first letter is bumped on every release.  It's an animal.
-  codeName = lib.strings.fileContents ../.codeName;
-
   # The current nixpkgs version suffix as string.
   versionSuffix =
     let suffixFile = ../.version-suffix;
-- 
cgit 1.4.1