update-nix-fetchgit 0.2.7 → 0.2.8
raw patch · 12 files changed
+20/−24 lines, 12 files
Files
- CHANGELOG.md +3/−0
- default.nix +1/−9
- package.yaml +1/−1
- src/Update/Nix/FetchGit.hs +3/−2
- src/Update/Nix/FetchGit/Utils.hs +1/−3
- tests/fakeRepo.sh +2/−0
- tests/networked/test_readme_examples.expected.nix +1/−1
- tests/test_max_version.expected.nix +4/−4
- tests/test_rec_sets.expected.nix +1/−1
- tests/test_updates_with_other_errors.expected.nix +1/−1
- tests/test_version_update.expected.nix +1/−1
- update-nix-fetchgit.cabal +1/−1
CHANGELOG.md view
@@ -2,6 +2,9 @@ ## WIP +## [0.2.8] - 2021-07-19+- Add `unstable-` prefix to versions when using dates+ ## [0.2.7] - 2021-05-23 - `hnix-0.13` support
default.nix view
@@ -10,15 +10,7 @@ in hp.developPackage { name = "update-nix-fetchgit"; root = nix-gitignore.gitignoreSource [ ] ./.;- overrides = self: super: {- hnix = pkgs.haskell.lib.dontCheck (self.callHackageDirect {- pkg = "hnix";- ver = "0.13.1";- sha256 = "0v3r33azlv050fv8y5vw0pahdnch7vqq94viwrp9vlw8hpiys8qn";- } { });- relude = self.relude_1_0_0_1;- semialign = self.semialign_1_2;- };+ overrides = self: super: { }; modifier = drv: haskell.lib.addBuildTools drv [ git nix nix-prefetch-git ]; returnShellEnv = forShell; }
package.yaml view
@@ -1,5 +1,5 @@ name: update-nix-fetchgit-version: "0.2.7"+version: "0.2.8" synopsis: A program to update fetchgit values in Nix expressions description: | This command-line utility is meant to be used by people maintaining Nix
src/Update/Nix/FetchGit.hs view
@@ -135,11 +135,12 @@ let latestDate = maximumMay (catMaybes ds) pure ( latestDate- , [ SpanUpdate (exprSpan v) (quoteString . pack . show $ d)+ , [ SpanUpdate (exprSpan v)+ (quoteString . ("unstable-" <>) . pack . show $ d) | Just d <- pure latestDate , Just v <- pure versionExpr ]- <> concat ss+ <> concat ss ) ----------------------------------------------------------------
src/Update/Nix/FetchGit/Utils.hs view
@@ -38,8 +38,7 @@ ) import Nix.Atoms ( NAtom(NBool) ) import Nix.Expr hiding ( SourcePos )-import Nix.Parser ( Result- , parseNixFileLoc+import Nix.Parser ( parseNixFileLoc , parseNixTextLoc ) import Update.Nix.FetchGit.Types@@ -92,7 +91,6 @@ -- | Get the 'SrcSpan' covering a particular expression. exprSpan :: NExprLoc -> SrcSpan exprSpan (AnnE s _) = s-exprSpan _ = error "unreachable" -- TODO: Add pattern completeness to hnix -- | Given an expression that is supposed to represent a function, -- extracts the name of the function. If we cannot figure out the
tests/fakeRepo.sh view
@@ -12,6 +12,8 @@ export GIT_AUTHOR_NAME='joe' export GIT_COMMITTER_EMAIL='joe@example.com' export GIT_AUTHOR_EMAIL='joe@example.com'+export XDG_CONFIG_DIRS=+export HOME= git init repo1 cd repo1
tests/networked/test_readme_examples.expected.nix view
@@ -2,7 +2,7 @@ a = { stdenv, fetchgit }: stdenv.mkDerivation rec { name = "foo-${version}";- version = "2016-06-26";+ version = "unstable-2016-06-26"; # ^ version will be updated to the date of the new revision src = fetchgit { url = "/tmp/nix-update-fetchgit-test/repo1";
tests/test_max_version.expected.nix view
@@ -1,9 +1,9 @@ {- version = "2016-07-08";+ version = "unstable-2016-07-08"; repos = {- version = "2016-07-08";+ version = "unstable-2016-07-08"; repo1 = {- version = "2016-06-26";+ version = "unstable-2016-06-26"; src = fetchgit { url = "/tmp/nix-update-fetchgit-test/repo1"; rev = "1c60ae07b5740aab02e32b4f64600f002112e6fd";@@ -11,7 +11,7 @@ }; }; repo2 = {- version = "2016-07-08";+ version = "unstable-2016-07-08"; src = fetchgit { url = "/tmp/nix-update-fetchgit-test/repo2"; rev = "1ac598e1fd0ec3556f1349bb5fd8d08d89580c8a";
tests/test_rec_sets.expected.nix view
@@ -1,6 +1,6 @@ rec { name = "foobar-${version}";- version = "2016-06-26";+ version = "unstable-2016-06-26"; src = fetchgit rec { url = "/tmp/nix-update-fetchgit-test/repo1"; rev = "1c60ae07b5740aab02e32b4f64600f002112e6fd";
tests/test_updates_with_other_errors.expected.nix view
@@ -1,5 +1,5 @@ {- version = "2016-06-26";+ version = "unstable-2016-06-26"; should-error = fetchgit rec { url = "/tmp/nix-update-fetchgit-test/missingRepo";
tests/test_version_update.expected.nix view
@@ -1,5 +1,5 @@ {- version = "2016-06-26";+ version = "unstable-2016-06-26"; src = fetchgit { url = "/tmp/nix-update-fetchgit-test/repo1"; rev = "1c60ae07b5740aab02e32b4f64600f002112e6fd";
update-nix-fetchgit.cabal view
@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: update-nix-fetchgit-version: 0.2.7+version: 0.2.8 synopsis: A program to update fetchgit values in Nix expressions description: This command-line utility is meant to be used by people maintaining Nix expressions that fetch files from Git repositories. It automates the process