Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
39c0adc31b
@ -4,12 +4,15 @@
|
|||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "nix-diff";
|
pname = "nix-diff";
|
||||||
version = "1.0.0";
|
version = "1.0.0-krebs1";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/Gabriel439/nix-diff";
|
url = "https://github.com/Gabriel439/nix-diff";
|
||||||
sha256 = "1k00nx8pannqmpzadkwfrs6bf79yk22ynhd033z5rsyw0m8fcz9k";
|
sha256 = "1k00nx8pannqmpzadkwfrs6bf79yk22ynhd033z5rsyw0m8fcz9k";
|
||||||
rev = "e32ffa2c7f38b47a71325a042c1d887fb46cdf7d";
|
rev = "e32ffa2c7f38b47a71325a042c1d887fb46cdf7d";
|
||||||
};
|
};
|
||||||
|
patches = [
|
||||||
|
./nixos-system.patch
|
||||||
|
];
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
executableHaskellDepends = [
|
executableHaskellDepends = [
|
18
krebs/5pkgs/haskell/nix-diff/nixos-system.patch
Normal file
18
krebs/5pkgs/haskell/nix-diff/nixos-system.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
diff --git a/src/Main.hs b/src/Main.hs
|
||||||
|
index 959ab8e..d3b6077 100644
|
||||||
|
--- a/src/Main.hs
|
||||||
|
+++ b/src/Main.hs
|
||||||
|
@@ -95,7 +95,12 @@ pathToText path =
|
||||||
|
underneath `/nix/store`, but this is the overwhelmingly common use case
|
||||||
|
-}
|
||||||
|
derivationName :: FilePath -> Text
|
||||||
|
-derivationName = Data.Text.dropEnd 4 . Data.Text.drop 44 . pathToText
|
||||||
|
+derivationName p =
|
||||||
|
+ if Data.Text.isPrefixOf "nixos-system" s
|
||||||
|
+ then "nixos-system"
|
||||||
|
+ else s
|
||||||
|
+ where
|
||||||
|
+ s = Data.Text.dropEnd 4 . Data.Text.drop 44 . pathToText $ p
|
||||||
|
|
||||||
|
-- | Group input derivations by their name
|
||||||
|
groupByName :: Map FilePath (Set Text) -> Map Text (Map FilePath (Set Text))
|
@ -13,8 +13,16 @@ with import <stockholm/lib>;
|
|||||||
|
|
||||||
http://www.exim.org/
|
http://www.exim.org/
|
||||||
|
|
||||||
|
{
|
||||||
|
url = https://api.github.com/repos/Gabriel439/nix-diff/git/refs/heads/master;
|
||||||
|
filter = "system:${pkgs.jq}/bin/jq -r .object.sha";
|
||||||
|
}
|
||||||
|
|
||||||
# ref src/nixpkgs/pkgs/tools/admin/sec/default.nix
|
# ref src/nixpkgs/pkgs/tools/admin/sec/default.nix
|
||||||
https://api.github.com/repos/simple-evcorr/sec/tags
|
{
|
||||||
|
url = https://api.github.com/repos/simple-evcorr/sec/tags;
|
||||||
|
filter = "system:${pkgs.jq}/bin/jq .";
|
||||||
|
}
|
||||||
|
|
||||||
# ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
|
# ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
|
||||||
https://thp.io/2008/urlwatch/
|
https://thp.io/2008/urlwatch/
|
||||||
|
Loading…
Reference in New Issue
Block a user