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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Fix cargo-flash build
This commit is contained in:
Jonathan Ringer
2021-05-16 18:27:14 -07:00
parent 6020fe2508 8aea69e5ab
commit d8e62d8e41
80 changed files with 906 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/ImageMagick/6.x.nix
+2 -2
View File
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "6.9.12-8";
version = "6.9.12-12";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
sha256 = "sha256-ZFCmoZOdZ3jbM5S90zBNiMGJKFylMLO0r3DB25wu3MM=";
sha256 = "sha256-yqMYuayQjPlTqi3+CtwP5CdsAGud/fHR0I2LwUPIq00=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big