ryantm/nixpkgs-update
1
1
Fork 0
mirror of https://github.com/ryantm/nixpkgs-update.git synced 2024-08-16 09:10:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #353 from nh2/non-experimental-features-compatibility

Browse Source 
Compatibility with Nix that does not have experimental features enabled
This commit is contained in:
Ryan Mulligan 2023-08-01 18:48:21 -07:00 committed by GitHub
commit b297f32504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/interactive-updates.md
View File

@ -14,10 +14,14 @@ nixpkgs-update supports interactive, single package updates via the
no longer uses `hub` itself).
2. Go to your local checkout of nixpkgs, and **make sure the working
directory is clean**. Be on a branch you are okay committing to.
3. Run it like: `nixpkgs-update update "postman 7.20.0 7.21.2"`
3. Ensure that there is an Git origin called `upstream` which points to nixpkgs:
```sh
git remote add upstream "https://github.com/NixOS/nixpkgs.git"
```
4. Run it like: `nixpkgs-update update "postman 7.20.0 7.21.2"`
which mean update the package "postman" from version 7.20.0
to version 7.21.2.
4. It will run the updater, and, if the update builds, it will commit
5. It will run the updater, and, if the update builds, it will commit
the update and output a message you could use for a pull request.
# Flags

10
src/Nix.hs
View File

@ -67,7 +67,7 @@ nixEvalApply ::
ExceptT Text m Text
nixEvalApply applyFunc attrPath =
ourReadProcess_
(proc (binPath <> "/nix") (["eval", ".#" <> T.unpack attrPath, "--apply", T.unpack applyFunc]))
(proc (binPath <> "/nix") (["--extra-experimental-features", "nix-command", "--extra-experimental-features", "flakes", "eval", ".#" <> T.unpack attrPath, "--apply", T.unpack applyFunc]))
& fmapRT (fst >>> T.strip)
nixEvalApplyRaw ::
@ -77,7 +77,7 @@ nixEvalApplyRaw ::
ExceptT Text m Text
nixEvalApplyRaw applyFunc attrPath =
ourReadProcess_
(proc (binPath <> "/nix") (["eval", ".#" <> T.unpack attrPath, "--raw", "--apply", T.unpack applyFunc]))
(proc (binPath <> "/nix") (["--extra-experimental-features", "nix-command", "--extra-experimental-features", "flakes", "eval", ".#" <> T.unpack attrPath, "--raw", "--apply", T.unpack applyFunc]))
& fmapRT (fst >>> T.strip)
nixEvalExpr ::
@ -86,7 +86,7 @@ nixEvalExpr ::
ExceptT Text m Text
nixEvalExpr expr =
ourReadProcess_
(proc (binPath <> "/nix") (["eval", "--expr", T.unpack expr]))
(proc (binPath <> "/nix") (["--extra-experimental-features", "nix-command", "eval", "--expr", T.unpack expr]))
& fmapRT (fst >>> T.strip)
-- Error if the "new version" is actually newer according to nix
@ -136,7 +136,7 @@ lookupAttrPath updateEnv =
getDerivationFile :: MonadIO m => Text -> ExceptT Text m Text
getDerivationFile attrPath = do
npDir <- liftIO $ Git.nixpkgsDir
proc "env" ["EDITOR=echo", (binPath <> "/nix"), "edit", attrPath & T.unpack, "-f", "."]
proc "env" ["EDITOR=echo", (binPath <> "/nix"), "--extra-experimental-features", "nix-command", "edit", attrPath & T.unpack, "-f", "."]
& ourReadProcess_
& fmapRT (fst >>> T.strip >>> T.stripPrefix (T.pack npDir <> "/") >>> fromJust)
@ -186,7 +186,7 @@ buildCmd attrPath =
silently $ proc (binPath <> "/nix-build") (nixBuildOptions ++ ["-A", attrPath & T.unpack])
log :: Text -> ProcessConfig () () ()
log attrPath = proc (binPath <> "/nix") ["log", "-f", ".", attrPath & T.unpack]
log attrPath = proc (binPath <> "/nix") ["--extra-experimental-features", "nix-command", "log", "-f", ".", attrPath & T.unpack]
build :: MonadIO m => Text -> ExceptT Text m ()
build attrPath =

3
src/Utils.hs
View File

@ -253,7 +253,8 @@ nixBuildOptions :: [String]
nixBuildOptions =
[ "--option",
"sandbox",
"true"
"true",
"--no-out-link" -- do not pollute current directory with `result` symlink
]
<> nixCommonOptions