public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
This commit is contained in:
Vladimír Čunát
2020-10-10 10:18:58 +02:00
parent ec28e32c9e 8bc409e546
commit 338b25697c
138 changed files with 4330 additions and 3214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/shells/xonsh/default.nix
View File

@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.9.22";
version = "0.9.23";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p";
sha256 = "1by13ryq9ldc9wln3fk5mm6zvjp4aim57ikw49v0dfmz8irnpglp";
};
LC_ALL = "en_US.UTF-8";

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@@ -4,15 +4,15 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2020-10-08";
version = "2020-10-09";
pname = "oh-my-zsh";
rev = "58ff4e1d2e6a81ea97a05b142c28a931a9924b70";
rev = "1bb402190d53c118f47a0851f5714dd4faa52809";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "096pkq91njg7pvlxar5r39slkzyfky6wcm7p6kfwrlbwh6wx46kz";
sha256 = "0alm6253mz8yq5l17q7hj89aa0c0nfknds9vqx8pd619bsa6kf4g";
};
installPhase = ''