diff options
author | aszlig <aszlig@redmoonstudios.org> | 2012-12-24 11:52:31 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2012-12-27 14:11:04 +0100 |
commit | 3583fa3ca84f4786e6ef300883f1366a4c66dd57 (patch) | |
tree | 358ca634c3c9b97a8643ed5dde2fbb3b574c58cd /nixpkgs/config.nix | |
parent | 08bd281625d378dc384f146dde6fff6fa6d648ff (diff) |
nixpkgs: Remove obsolete comments.
The first one was for ffmpeg and x11grab support. Maybe I'll need this someday again if I happen to create a screencast again. But for now, just remove it. And the second one actually was an attempt to patch git to always sign commits. I have found a better and more selective solution by just adding the following alias: rebase-sign = !EDITOR=cat git rebase -i -x 'git commit --amend --no-edit -S' This should make it easy to sign all commits prior to pushing easily with: git rebase-sign upstream/master Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixpkgs/config.nix')
-rw-r--r-- | nixpkgs/config.nix | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix index 2bc54499..1ab328c4 100644 --- a/nixpkgs/config.nix +++ b/nixpkgs/config.nix @@ -109,34 +109,6 @@ in { }; }; - #ffmpeg = pkgs.ffmpeg.override { - # x11grabSupport = true; - # faacSupport = true; - #}; - - /* - gitAndTools = recurseIntoAttrs ( - import <nixpkgs/pkgs/applications/version-management/git-and-tools> { - inherit pkgs; - } // { - git = lib.overrideDerivation gitAndTools.git (ogit: { - patches = let - alwaysSignPatch = writeText "always-sign.patch" '' - --- a/builtin/commit.c - +++ b/builtin/commit.c - @@ -91 +91 @@ static char *untracked_files_arg, *force_date, *ignore_submodule_arg; - -static char *sign_commit; - +static char *sign_commit = (intptr_t) ""; - @@ -1391 +1391 @@ int cmd_commit(int argc, const char **argv, const char *prefix) - -${"\t\t"} "GPG sign commit", PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, - +${"\t\t"} "Do not GPG sign commit", PARSE_OPT_OPTARG, (intptr_t) "", NULL }, - ''; - in ogit.patches ++ [alwaysSignPatch]; - }); - } - ); - */ - blop = stdenv.mkDerivation rec { name = "blop-${version}"; version = "0.2.8"; |