diff options
author | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-06 07:19:35 +0200 |
---|---|---|
committer | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-06 07:19:35 +0200 |
commit | 25456656ef9449d28bdb66f8316e3345ef1f76aa (patch) | |
tree | 2b7a509db99abf90899bbb21d5816f6563fc9d65 /pkgs/applications | |
parent | 27b512299f1a9e5e1fb5801d195f9cb98e75dc73 (diff) | |
parent | f5f3e8c2030892881a314c3c2b28d11f5bb6f3f2 (diff) | |
download | nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.tar nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.tar.gz nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.tar.bz2 nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.tar.lz nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.tar.xz nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.tar.zst nixpkgs-25456656ef9449d28bdb66f8316e3345ef1f76aa.zip |
Merge branch 'master' into package-petsc-p4est
Diffstat (limited to 'pkgs/applications')
30 files changed, 470 insertions, 196 deletions
diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 2f45a3fea92..9044d201c45 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , appstream-glib , desktop-file-utils , gettext @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.4.1"; + version = "0.4.2"; format = "other"; @@ -27,17 +26,9 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; + sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU="; }; - patches = [ - (fetchpatch { - name = "fix-ABI-breakage-from-libadwaita.patch"; - url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch"; - sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs"; - }) - ]; - postPatch = '' patchShebangs build-aux/meson ''; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index a7289cc35c8..9921c1b7e88 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.4.7"; + version = "3.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "+jmx4X9KiK1Tv2Cjb/445MY9G2b7pLdKxFtBFMaQwRhqTItA33MfHqKBwmytmbEhxhy0LDTU2woJvEMPQCmnvg=="; + sha512 = "NjhrtGQsIbNDmGPEDmEbaHSfvUTFb1e7yPorF/BzWTfwVoFZEJiNzP/1k+zTJ4Yfd4mG0W0GYx0jh8m/micWIg=="; }; appimageContents = appimageTools.extractType2 { @@ -34,7 +34,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/29"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/30"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 36ee6c12eef..0f4ffa14228 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -8,8 +8,8 @@ , gitMinimal , glib , gst_all_1 -, gtk3 -, libhandy_0 +, gtk4 +, libadwaita , meson , ninja , openssl @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld"; + sha256 = "sha256-25qPb7qlqCwYJzl4qZxAZYx5asxSlXBlc/0dGyBdk1o="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA="; + hash = "sha256-00dQXcSNmdZb2nSLG3q7jm4sugF9XR4LbH0OmcuHVxA="; }; nativeBuildInputs = [ @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { dbus gdk-pixbuf glib - gtk3 - libhandy_0 + gtk4 + libadwaita openssl sqlite ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix new file mode 100644 index 00000000000..c58023d6a4b --- /dev/null +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, dpkg +, lib +, autoPatchelfHook +, fetchurl +, gtk3 +, glib +, desktop-file-utils +, alsa-lib +, libjack2 +, harfbuzz +, fribidi +, pango +, freetype +}: + +stdenv.mkDerivation rec { + pname = "tonelib-jam"; + version = "4.6.6"; + + src = fetchurl { + url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ="; + }; + + buildInputs = [ + dpkg + gtk3 + glib + desktop-file-utils + alsa-lib + libjack2 + harfbuzz + fribidi + pango + freetype + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + unpackPhase = '' + mkdir -p $TMP/ $out/ + dpkg -x $src $TMP + ''; + + installPhase = '' + cp -R $TMP/usr/* $out/ + mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam + ''; + + meta = with lib; { + description = "ToneLib Jam – the learning and practice software for guitar players"; + homepage = "https://tonelib.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix new file mode 100644 index 00000000000..94ef3037a7c --- /dev/null +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, dpkg +, lib +, autoPatchelfHook +, fetchurl +, webkitgtk +, libjack2 +, alsa-lib +}: + +stdenv.mkDerivation rec { + pname = "tonelib-zoom"; + version = "4.3.1"; + + src = fetchurl { + url = "https://www.tonelib.net/download/0129/ToneLib-Zoom-amd64.deb"; + sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c="; + }; + + buildInputs = [ + dpkg + webkitgtk + libjack2 + alsa-lib + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + unpackPhase = '' + mkdir -p $TMP/ $out/ + dpkg -x $src $TMP + ''; + + installPhase = '' + cp -R $TMP/usr/* $out/ + mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom + ''; + + meta = with lib; { + description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; + homepage = "https://tonelib.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 96a543f3cb5..773b1f278e0 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,99 +1,9 @@ -{ buildFHSUserEnv, makeDesktopItem, writeScript, stdenv, lib, requireFile, unstick, - supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: +{ stdenv, lib, buildFHSUserEnv, callPackage, makeDesktopItem, writeScript +, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] +, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } +}: let - deviceIds = { - "Arria II" = "arria_lite"; - "Cyclone V" = "cyclonev"; - "Cyclone IV" = "cyclone"; - "Cyclone 10 LP" = "cyclone10lp"; - "MAX II/V" = "max"; - "MAX 10 FPGA" = "max10"; - }; - - supportedDeviceIds = - assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices) - "Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}"; - lib.listToAttrs (map (name: { - inherit name; - value = deviceIds.${name}; - }) supportedDevices); - - unsupportedDeviceIds = lib.filterAttrs (name: value: - !(lib.hasAttr name supportedDeviceIds) - ) deviceIds; - - quartus = stdenv.mkDerivation rec { - version = "20.1.0.711"; - pname = "quartus-prime-lite-unwrapped"; - - src = let - require = {name, sha256}: requireFile { - inherit name sha256; - url = "${meta.homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux"; - }; - - hashes = { - "arria_lite" = "09g2knq23h3vj0s5y7hsdnqbbkr3pnv53dzpqcw2lq9mb5zfs9r0"; - "cyclonev" = "05hrpysasyfb7xhxg68spdffxyvxcx0iagibd5jz643b7n6aalpa"; - "cyclone" = "1x3rnwsvzrb5kwdz35sbcabxmcvj8xxpnjlpcjwfc69ybiyr6sgz"; - "cyclone10lp" = "1x6d4hm697mjgzaxixrw5va8anr6ihhx96x2524r6axpwqf6wcja"; - "max" = "060b7v0xh86kkjyiix7akfkzhx2kl1b3q117kp7xibnz6yrzwmy3"; - "max10" = "05840l9pmqa4i1b3ajfaxkqz1hppls556vbq16a42acz2qs2g578"; - }; - - devicePackages = map (id: { - name = "${id}-${version}.qdz"; - sha256 = lib.getAttr id hashes; - }) (lib.attrValues supportedDeviceIds); - in map require ([{ - name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "07ssrv8p8kacal6xd80n4h7l5xz13aw1m1gfqqaxig0ivsj971z5"; - } { - name = "ModelSimSetup-${version}-linux.run"; - sha256 = "0smxasrmr1c8k6hy378knskpjmz4cgpgb35v5jclns0kx68y3c42"; - }] ++ devicePackages); - - nativeBuildInputs = [ unstick ]; - - buildCommand = let - installers = lib.sublist 0 2 src; - components = lib.sublist 2 ((lib.length src) - 2) src; - copyInstaller = installer: '' - # `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf - cp ${installer} $TEMP/${installer.name} - chmod u+w,+x $TEMP/${installer.name} - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name} - ''; - copyComponent = component: "cp ${component} $TEMP/${component.name}"; - # leaves enabled: quartus, modelsim_ase, devinfo - disabledComponents = [ - "quartus_help" - "quartus_update" - # not modelsim_ase - "modelsim_ae" - ] ++ (lib.attrValues unsupportedDeviceIds); - in '' - ${lib.concatMapStringsSep "\n" copyInstaller installers} - ${lib.concatMapStringsSep "\n" copyComponent components} - - unstick $TEMP/${(builtins.head installers).name} \ - --disable-components ${lib.concatStringsSep "," disabledComponents} \ - --mode unattended --installdir $out --accept_eula 1 - - rm -r $out/uninstall $out/logs - ''; - - meta = { - homepage = "https://fpgasoftware.intel.com"; - description = "FPGA design and simulation software"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; - hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore - maintainers = with lib.maintainers; [ kwohlfahrt ]; - }; - }; - desktopItem = makeDesktopItem { name = "quartus-prime-lite"; exec = "quartus"; @@ -102,7 +12,6 @@ let genericName = "Quartus Prime"; categories = "Development;"; }; - # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSUserEnv rec { name = "quartus-prime-lite"; # wrapped @@ -136,9 +45,7 @@ in buildFHSUserEnv rec { xorg.libXrender ]; - passthru = { - unwrapped = quartus; - }; + passthru = { inherit unwrapped; }; extraInstallCommands = let quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [ @@ -156,14 +63,14 @@ in buildFHSUserEnv rec { in '' mkdir -p $out/share/applications $out/share/icons/128x128 ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s ${quartus}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png + ln -s ${unwrapped}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin WRAPPER=$out/bin/${name} EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" for executable in $EXECUTABLES; do echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${quartus}/$executable \$@" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable done cd $out diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix new file mode 100644 index 00000000000..9475f441703 --- /dev/null +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -0,0 +1,97 @@ +{ stdenv, lib, unstick, requireFile +, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] +}: + +let + deviceIds = { + "Arria II" = "arria_lite"; + "Cyclone V" = "cyclonev"; + "Cyclone IV" = "cyclone"; + "Cyclone 10 LP" = "cyclone10lp"; + "MAX II/V" = "max"; + "MAX 10 FPGA" = "max10"; + }; + + supportedDeviceIds = + assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices) + "Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}"; + lib.listToAttrs (map (name: { + inherit name; + value = deviceIds.${name}; + }) supportedDevices); + + unsupportedDeviceIds = lib.filterAttrs (name: value: + !(lib.hasAttr name supportedDeviceIds) + ) deviceIds; + + componentHashes = { + "arria_lite" = "140jqnb97vrxx6398cpgpw35zrrx3z5kv1x5gr9is1xdbnf4fqhy"; + "cyclone" = "116kf69ryqcmlc2k8ra0v32jy7nrk7w4s5z3yll7h3c3r68xcsfr"; + "cyclone10lp" = "07wpgx9bap6rlr5bcmr9lpsxi3cy4yar4n3pxfghazclzqfi2cyl"; + "cyclonev" = "11baa9zpmmfkmyv33w1r57ipf490gnd3dpi2daripf38wld8lgak"; + "max" = "1zy2d42dqmn97fwmv4x6pmihh4m23jypv3nd830m1mj7jkjx9kcq"; + "max10" = "1hvi9cpcjgbih3l6nh8x1vsp0lky5ax85jb2yqmzla80n7dl9ahs"; + }; + + version = "20.1.1.720"; + homepage = "https://fpgasoftware.intel.com"; + + require = {name, sha256}: requireFile { + inherit name sha256; + url = "${homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux"; + }; + +in stdenv.mkDerivation rec { + inherit version; + pname = "quartus-prime-lite-unwrapped"; + + src = map require ([{ + name = "QuartusLiteSetup-${version}-linux.run"; + sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k"; + } { + name = "ModelSimSetup-${version}-linux.run"; + sha256 = "1cqgv8x6vqga8s4v19yhmgrr886rb6p7sbx80528df5n4rpr2k4i"; + }] ++ (map (id: { + name = "${id}-${version}.qdz"; + sha256 = lib.getAttr id componentHashes; + }) (lib.attrValues supportedDeviceIds))); + + nativeBuildInputs = [ unstick ]; + + buildCommand = let + installers = lib.sublist 0 2 src; + components = lib.sublist 2 ((lib.length src) - 2) src; + copyInstaller = installer: '' + # `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf + cp ${installer} $TEMP/${installer.name} + chmod u+w,+x $TEMP/${installer.name} + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name} + ''; + copyComponent = component: "cp ${component} $TEMP/${component.name}"; + # leaves enabled: quartus, modelsim_ase, devinfo + disabledComponents = [ + "quartus_help" + "quartus_update" + # not modelsim_ase + "modelsim_ae" + ] ++ (lib.attrValues unsupportedDeviceIds); + in '' + ${lib.concatMapStringsSep "\n" copyInstaller installers} + ${lib.concatMapStringsSep "\n" copyComponent components} + + unstick $TEMP/${(builtins.head installers).name} \ + --disable-components ${lib.concatStringsSep "," disabledComponents} \ + --mode unattended --installdir $out --accept_eula 1 + + rm -r $out/uninstall $out/logs + ''; + + meta = with lib; { + inherit homepage; + description = "FPGA design and simulation software"; + license = licenses.unfree; + platforms = platforms.linux; + hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore + maintainers = with maintainers; [ kwohlfahrt ]; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 5fea254ce08..4ac4af48aab 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 +, lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices, Foundation }: @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { [ "--with-frozenpaths" ] ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optional (liblqr1 != null) "--with-lqr" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif libde265 djvulibre + liblqr1 libpng libtiff libxml2 libheif libde265 djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e2fdb19127d..0fd76235f52 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif +, lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , Foundation , testVersion, imagemagick @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-0"; + version = "7.1.0-2"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg="; + sha256 = "sha256-0nTz9UBspROrNj72amyZmFYK/y9Xg4+qNt4raZiK3AI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { [ "--with-frozenpaths" ] ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optional (liblqr1 != null) "--with-lqr" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif djvulibre + liblqr1 libpng libtiff libxml2 libheif djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] @@ -84,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ erictapen dotlambda ]; license = licenses.asl20; mainProgram = "magick"; }; diff --git a/pkgs/applications/misc/kanjidraw/default.nix b/pkgs/applications/misc/kanjidraw/default.nix new file mode 100644 index 00000000000..53c752651d2 --- /dev/null +++ b/pkgs/applications/misc/kanjidraw/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, python3 +, bash +}: + +python3.pkgs.buildPythonApplication rec { + pname = "kanjidraw"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "obfusk"; + repo = "kanjidraw"; + rev = "v${version}"; + sha256 = "03ag8vkbf85qww857ii8hcnn8bh5qa7rsmhka0v9vfxk272ifbyq"; + }; + + propagatedBuildInputs = with python3.pkgs; [ tkinter ]; + + postPatch = '' + substituteInPlace Makefile --replace /bin/bash ${bash}/bin/bash + ''; + + checkPhase = '' + make test + ''; + + meta = with lib; { + description = "Handwritten kanji recognition"; + longDescription = '' + kanjidraw is a simple Python library + GUI for matching (the strokes of a) + handwritten kanji against its database. + + You can use the GUI to draw and subsequently select a kanji from the list of + probable matches, which will then be copied to the clipboard. + + The database is based on KanjiVG and the algorithms are based on the + Kanji draw Android app. + ''; + homepage = "https://github.com/obfusk/kanjidraw"; + license = with licenses; [ + agpl3Plus # code + cc-by-sa-30 # data.json + ]; + maintainers = [ maintainers.obfusk ]; + }; +} diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index a9e44964d45..9146f38df36 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-06-01"; + version = "unstable-2021-06-24"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "28235f85ece148e7010c5d6ac088688100a18e04"; - sha256 = "sha256-UTfYYywOwa728zLkLWQaz6wN0TM/4OzbHQGedjdHGSI="; + rev = "6a306b0b5af0f250135eb88e0e72a5038fccd6a8"; + sha256 = "sha256-DznIDzI5rNrlKJdXjpOpsLL8IO6tuIvW0pNdRN8N6Go="; }; passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-dzOkiZYHQu5AuwkbWEtIJAyZ1TNIGYkfz+S3q6K384w="; + cargoSha256 = "sha256-LFRqhgvziQ7a8OWRzXqNIfziP6bRHTe2oF55N09rFy8="; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix new file mode 100644 index 00000000000..dfa114f446a --- /dev/null +++ b/pkgs/applications/misc/kiln/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromSourcehut, scdoc }: + +buildGoModule rec { + pname = "kiln"; + version = "0.2.1"; + + src = fetchFromSourcehut { + owner = "~adnano"; + repo = pname; + rev = version; + hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI="; + }; + + nativeBuildInputs = [ scdoc ]; + + vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk="; + + installPhase = '' + runHook preInstall + make PREFIX=$out install + runHook postInstall + ''; + + meta = with lib; { + description = "A simple static site generator for Gemini"; + homepage = "https://git.sr.ht/~adnano/kiln"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 5247207d149..08a1b5a71af 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -1,43 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, readline }: let + patchPrefix = "https://github.com/samuelgrf/kjv/commit/"; -patch-base = "https://github.com/LukeSmithxyz/kjv/commit/"; - -add-apocrypha = fetchpatch { - url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; - sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k"; -}; - -add-install-target = fetchpatch { - url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch"; - sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q"; -}; + add-apocrypha = fetchpatch { + url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch"; + sha256 = "1jkajdg4wvpbbwc5mn37i4c8nfis4z0pv5rl7gqs0laj0gpj7jn8"; + }; + add-install-target = fetchpatch { + url = patchPrefix + "50a83256ee45430fb06b7aea1945dd91c6813bc3.patch"; + sha256 = "0bv9yma67jdj496a6vn6y007c9gwjpg3rzld1i9m9y9xmlzq4yzv"; + }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kjv"; - version = "unstable-2018-12-25"; + version = "unstable-2021-03-11"; src = fetchFromGitHub { owner = "bontibon"; - repo = pname; - rev = "fda81a610e4be0e7c5cf242de655868762dda1d4"; - sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf"; + repo = "kjv"; + rev = "108595dcbb9bb12d40e0309f029b6fb3ccd81309"; + hash = "sha256-Z6myd9Xn23pYizG+IZVDrP988pYU06QIcpqXtWTcPiw="; }; patches = [ add-apocrypha add-install-target ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + buildInputs = [ readline ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; - license = licenses.publicDomain; - maintainers = [ maintainers.jtobin ]; + license = licenses.unlicense; + maintainers = with maintainers; [ jtobin samuelgrf ]; + mainProgram = "kjv"; }; } - diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index d294271ca25..2d70daa94ec 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,6 +1,8 @@ -{ buildPythonApplication, lib, fetchFromGitHub +{ buildPythonApplication +, lib +, fetchFromGitHub -# build inputs + # build inputs , atk , gdk-pixbuf , glib-networking @@ -13,7 +15,7 @@ , webkitgtk , wrapGAppsHook -# python dependencies + # python dependencies , dbus-python , distro , evdev @@ -25,7 +27,7 @@ , keyring , python_magic -# commands that lutris needs + # commands that lutris needs , xrandr , pciutils , psmisc @@ -71,15 +73,16 @@ let gstreamer ]; -in buildPythonApplication rec { +in +buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.8.3"; + version = "0.5.8.4"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "sha256-NnWIP9oEndk/hDo5Z33pkmZ61pxT/ScmZ4YpS2ajK/8="; + sha256 = "sha256-5ivXIgDyM9PRvuUhPFPgziXDvggcL+p65kI2yOaiS1M="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index e60e110087f..353fe661483 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; }; - patchPhase = "patchShebangs test"; + patches = [ ./tests-use-better-shell.patch ]; + postPatch = "patchShebangs test"; doCheck = true; checkTarget = "test"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://megastep.org/makeself"; + homepage = "https://makeself.io"; description = "Utility to create self-extracting packages"; license = licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/applications/misc/makeself/tests-use-better-shell.patch b/pkgs/applications/misc/makeself/tests-use-better-shell.patch new file mode 100644 index 00000000000..159a93622ad --- /dev/null +++ b/pkgs/applications/misc/makeself/tests-use-better-shell.patch @@ -0,0 +1,10 @@ +Use full bash's sh in tests instead of /bin/sh, as that would be +too minimalist in the build sandbox. See issue: +https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128 +diff --git a/test/extracttest b/test/extracttest +--- a/test/extracttest ++++ b/test/extracttest +@@ -9,2 +9,3 @@ setupTests() { + $SUT $* archive makeself-test.run "Test $*" echo Testing ++ sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run + } diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 4f17fa87950..1d9dc3811aa 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, conf ? null }: +{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: stdenv.mkDerivation rec { pname = "sfm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw="; }; - configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf); + configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 8620c43cdbe..95e16797cf4 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY="; + sha256 = "sha256-8b1VyukVMTXLAnvYcjXgTdPtMq3YxJgTpxe25Kj+Wpw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 31fae0e31c2..7b5e5810581 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.6.3"; - sha256 = "sha256-NgfbkeVRl0AGNkZSS2nSAHp4eZ49QNSEYMuFe1G5iBY="; - vendorSha256 = "sha256-rq/MHo5MG2EKZ3d937TIDXFCoWnLlQO3C/fo1bhRxCA="; + version = "21.7.1"; + sha256 = "sha256-VLq776A0H2IZLBeYjXpYzFixcydw/OcYsvKFxeLuewo="; + vendorSha256 = "sha256-xSOPMFHfyCmG+yTzBfKR7F5KYV0gcKRNM0UrxpGBpE4="; }; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 7be59ee1661..418f3259178 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,23 +10,21 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.8.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mBoqyDfGho2e4RuFwkiU2R+zb38LzByWtH4pOhguueY="; + sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg="; }; - vendorSha256 = "sha256-S3Gp7HkBIZNZ8rkp64XaUQUj1TggGwI9FMrVkyLCQWA="; + vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA="; nativeBuildInputs = [ makeWrapper installShellFiles ]; - preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in - '' - buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>") - ''; + ldflags = let t = "github.com/containerd/nerdctl/pkg/version"; in + [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.Revision=<unknown>" ]; # Many checks require a containerd socket and running nerdctl after it's built doCheck = false; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index c792a38001a..bf11b35d71a 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50="; + sha256 = "sha256-9UfSKMyapmDyikRqs7UiA4YYcvj/Tin9pRqC9iFLPWE="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index faf817d1c7f..1717d320900 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.30.7"; + version = "0.31.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zcb2bdIvUeHEto2NeY0Zwj7jIB+ipVXpnb7q97IkvmA="; + sha256 = "sha256-JRIwPOExPbwLS7ps4pJpvIRaZ9jZZjVK+POaUHAmiPI="; }; - vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs="; + vendorSha256 = "sha256-lck4nabDhFA8N0lo+cIKiJjlg2TGx3qMExbblHQwbvQ="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 3675aba028c..b0d0d6193e2 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "waypoint"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yeD7XtcB/2ph6cCnOcv0yFQqvAMPDLXMrUWWkgmBUaA="; + sha256 = "sha256-JB/0nU/05Agh4fWFeSfrUHFtR8cQjxdXW0QHAoH0dDc="; }; deleteVendor = true; - vendorSha256 = "sha256-xZGYPh3Yp3g22GraYfMESVpp7j5fOZASUEvN4YaDd1g="; + vendorSha256 = "sha256-2YrCRdpRk+gPHN8flahgWb2sbK5dYL5ivVqeJSsiy8Y="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix b/pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix new file mode 100644 index 00000000000..a2e9fc3265a --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, weechat }: + +stdenv.mkDerivation { + pname = "buffer_autoset"; + version = "1.2"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/weechat/scripts/2b308b44df39ba6563d02b2bcd40c384ec2777dc/python/buffer_autoset.py"; + sha256 = "0csl3sfpijdbq1j6wabx347lvn91a24a2jfx5b5pspfxz7gixli1"; + }; + + dontUnpack = true; + + passthru.scripts = [ "buffer_autoset.py" ]; + + installPhase = '' + install -D $src $out/share/buffer_autoset.py + ''; + + meta = with lib; { + inherit (weechat.meta) platforms; + description = "buffer_autoset.py is a weechat script which auto-set buffer properties when a buffer is opened."; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ govanify ]; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 1a975d2229d..ea665160f60 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -22,4 +22,6 @@ weechat-otr = callPackage ./weechat-otr { }; weechat-go = callPackage ./weechat-go { }; + + buffer_autoset = callPackage ./buffer_autoset { }; } diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix new file mode 100644 index 00000000000..b4de49730fe --- /dev/null +++ b/pkgs/applications/networking/juju/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "juju"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "juju"; + repo = "juju"; + rev = "juju-${version}"; + sha256 = "sha256-ZiG+LMeQboFxaLIBSHjRNe5tt8bEguYXQp3nhkoMpek="; + }; + + vendorSha256 = "sha256-5R3TmwOzHgdEQhS4B4Bb0InghaEhUVxDSl7oZl3aNZ4="; + + # Disable tests because it attempts to use a mongodb instance + doCheck = false; + + meta = with lib; { + description = "Open source modelling tool for operating software in the cloud"; + homepage = "https://juju.is"; + license = licenses.mit; + maintainers = with maintainers; [ citadelcore ]; + }; +} diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 92606f3f909..5d2158843ed 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.42"; + version = "14.31.44"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw="; + sha256 = "sha256-MHfqoQzUEL7nje7Y/hbaA8iktxfN7464TJXum5B6OCc="; }; patchPhase = '' diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 208bb95f930..58b2a617bd6 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,7 +1,12 @@ -{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut, giflib -, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng +{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper +, libGLU, libGL, freeglut, mpfr, gmp +, pkgsHostTarget }: +let + inherit (pkgsHostTarget.targetPackages.stdenv) cc; +in + stdenv.mkDerivation { name = "glsurf-3.3.1"; @@ -10,17 +15,32 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr giflib gmp - libtiff libjpeg libpng ] - ++ (with ocamlPackages; [ - ocaml findlib ocaml_mysql lablgl camlimages_4_1_2 mlgmpidl + nativeBuildInputs = [ + makeWrapper + ] ++ (with ocamlPackages; [ + ocaml findlib + ]); + + buildInputs = [ + freeglut libGL libGLU mpfr gmp + ] ++ (with ocamlPackages; [ + camlp4 lablgl camlimages_4_2_4 ]); + postPatch = '' + for f in callbacks*/Makefile src/Makefile; do + substituteInPlace "$f" --replace "+camlp4" \ + "${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4" + done + ''; + installPhase = '' mkdir -p $out/bin $out/share/doc/glsurf cp ./src/glsurf.opt $out/bin/glsurf cp ./doc/doc.pdf $out/share/doc/glsurf cp -r ./examples $out/share/doc/glsurf + + wrapProgram "$out/bin/glsurf" --set CC "${cc}/bin/${cc.targetPrefix}cc" ''; meta = { diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1ed174ebd46..218ab920a87 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -126,6 +126,15 @@ stdenv.mkDerivation rec { rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; }) + + # eclib 20210625 update + # https://trac.sagemath.org/ticket/31443 + (fetchSageDiff { + base = "9.4.beta3"; + name = "eclib-20210625.patch"; + rev = "789550ca04c94acfb1e803251538996a34962038"; + sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/git-and-tools/bit/default.nix index cce37df357b..c3524417829 100644 --- a/pkgs/applications/version-management/git-and-tools/bit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bit/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "bit"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "chriswalz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-85GEx9y8r9Fjgfcwh1Bi8WDqBm6KF7uidutlF77my60="; + sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8="; }; vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA="; |