movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge 'master' into staging and re-revert merge

Browse source 
... from staging to master, reverted temporarily in aa9a04883e.
This commit is contained in:
Vladimír Čunát 2016-06-23 12:07:57 +02:00
commit 6b27ceb006
526 changed files with 5888 additions and 4415 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/lib/utils.nix
View file

@ -8,4 +8,10 @@ rec {
replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]
(if hasPrefix "/" s then substring 1 (stringLength s) s else s);
# Returns a system path for a given shell package
toShellPath = shell:
if types.shellPackage.check shell then
"/run/current-system/sw${shell.shellPath}"
else
shell;
}