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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-12-31 13:29:55 +01:00
parent 3780b69224 e823016e66
commit f3b4ae8402
96 changed files with 1009 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/shells/any-nix-shell/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "any-nix-shell";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "haslersn";
repo = "any-nix-shell";
rev = "v${version}";
sha256 = "02cv86csk1m8nlh2idvh7bjw43lpssmdawya2jhr4bam2606yzdv";
sha256 = "05xixgsdfv0qk648r74nvazw16dpw49ryz8dax9kwmhqrgkjaqv6";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/shells/zsh/oh-my-zsh/default.nix
+3 -3
View File
@@ -5,15 +5,15 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2020-12-28";
version = "2020-12-30";
pname = "oh-my-zsh";
rev = "4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e";
rev = "a4a79eaa8cdf39f35dcd1753b973e830ff7b00b8";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "09776acglph64lg9x1f1ypglbbhknrqidq47zk95vksd1in8l3is";
sha256 = "4L0G1ECFkwg7iytIvg2WQionf48a4LLGIKobopgMm4g=";
};
installPhase = ''