diff options
| author | Peter Simons <simons@cryp.to> | 2013-02-24 19:27:08 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-02-24 19:27:08 +0100 |
| commit | 5f32207dfc9a146f426ba168bfcf887292f2d265 (patch) | |
| tree | 0a217c941f7fa5be04431e98773971aab2ea092e /pkgs/applications/version-management | |
| parent | f20ff74afe62857376f1e3a081944500cca4e3ce (diff) | |
| parent | 7d5056f8a3cf76b20d9b24e6644f2fc7fdf4a0f8 (diff) | |
| download | nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.gz nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.bz2 nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.lz nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.xz nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.zst nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 75c71f9cfdf7..b7bf00f07dd7 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -49,7 +49,7 @@ rec { network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck - SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob; + SafeSemaphore networkProtocolXmpp async dns DAV uuid Glob; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 7f11462aa02e..3d11b4841738 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -8,7 +8,7 @@ , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time , transformers, transformersBase, utf8String, wai, waiLogger, warp , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore -, networkPprotocolXmpp, async, dns, DAV, uuid, Glob +, networkProtocolXmpp, async, dns, DAV, uuid, Glob }: let @@ -30,7 +30,7 @@ stdenv.mkDerivation { httpTypes IfElse json liftedBase MissingH monadControl mtl network networkInfo networkMulticast pcreLight QuickCheck SHA stm text time transformers transformersBase utf8String wai waiLogger warp yesod - yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp + yesodDefault yesodStatic testpack SafeSemaphore networkProtocolXmpp async dns DAV uuid Glob ]; checkTarget = "test"; |