Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
39d035c4cf
|
|
@ -13426,4 +13426,10 @@
|
|||
github = "jpagex";
|
||||
githubId = 635768;
|
||||
};
|
||||
pwoelfel = {
|
||||
name = "Philipp Woelfel";
|
||||
email = "philipp.woelfel@gmail.com";
|
||||
github = "PhilippWoelfel";
|
||||
githubId = 19400064;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -401,6 +401,8 @@ def load_plugin_spec(plugin_file: str) -> List[PluginDesc]:
|
|||
plugins = []
|
||||
with open(plugin_file) as f:
|
||||
for line in f:
|
||||
if line.startswith("#"):
|
||||
continue
|
||||
plugin = parse_plugin_line(line)
|
||||
if not plugin.owner:
|
||||
msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]"
|
||||
|
|
|
|||
|
|
@ -11,24 +11,15 @@ assert x11Support -> xorg != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bemenu";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8=";
|
||||
sha256 = "5xRM3NQfomG0vJheNEBLy3OaS6UEwabNKYa96u2md6M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for build against ncurses-6.3
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/Cloudef/bemenu/commit/d31164db756989579468946aba62969e42c7ed28.patch";
|
||||
sha256 = "sha256-oyndQI7SaR8cK0IO5wIIxMpmakhfUzwUqLIKRbPkEdw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config pcre ];
|
||||
|
||||
makeFlags = ["PREFIX=$(out)"];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binance";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
|
||||
sha256 = "sha256-klOzCYI2vSkSV7O9WlKny2wt+etl1K8zFjGlUNIOZdI=";
|
||||
sha256 = "sha256-qJuD+O4M9U8P6JhFUFc92yllX1vgZZvTlTd0bph3Vo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cobalt";
|
||||
version = "0.17.4";
|
||||
version = "0.17.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cobalt-org";
|
||||
repo = "cobalt.rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uZcs3VkmpasFwgB7m1spTHi2W86tJt2kWlRTXAotvvo=";
|
||||
sha256 = "sha256-FCt/4JCL7VmD26HH1XLjJeUP8m7uexdPekD414CxGDI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-U2TVg2/SIOxaWs4EehTpcu47uDO/EA2dJK56k3I6F+0=";
|
||||
cargoSha256 = "sha256-S2BVulU2bsgJpxKEt8u2ddNav8/1fd+s7wTVkSeHL4o=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
|
|
|||
91
pkgs/applications/misc/pdfstudio/default.nix
Normal file
91
pkgs/applications/misc/pdfstudio/default.nix
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
{ stdenv,
|
||||
lib,
|
||||
makeWrapper,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
autoPatchelfHook,
|
||||
gst_all_1,
|
||||
sane-backends,
|
||||
xorg,
|
||||
gnome2,
|
||||
alsa-lib,
|
||||
libgccjit,
|
||||
jdk11
|
||||
}:
|
||||
|
||||
let
|
||||
year = "2021";
|
||||
major = "1";
|
||||
minor = "1";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pdfstudio";
|
||||
version = "${year}.${major}.${minor}";
|
||||
autoPatchelfIgnoreMissingDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${year}_${major}_${minor}_linux64.deb";
|
||||
sha256 = "089jfpbsxwjhx245g8svlmg213kny3z5nl6ra1flishnrsfjjcxb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gst_all_1.gst-libav
|
||||
sane-backends
|
||||
xorg.libXxf86vm
|
||||
xorg.libXtst
|
||||
gnome2.libgtkhtml
|
||||
alsa-lib
|
||||
libgccjit
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
dpkg
|
||||
copyDesktopItems
|
||||
jdk11 # only for unpacking .jar.pack files
|
||||
];
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
name = "${pname}${year}";
|
||||
desktopName = "PDF Studio";
|
||||
genericName = "View and edit PDF files";
|
||||
exec = "${pname} %f";
|
||||
icon = "${pname}${year}";
|
||||
comment = "Views and edits PDF files";
|
||||
mimeType = "application/pdf";
|
||||
categories = "Office";
|
||||
type = "Application";
|
||||
terminal = false;
|
||||
})];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp -r opt/${pname}${year} $out/share/
|
||||
ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/
|
||||
makeWrapper $out/share/${pname}${year}/${pname}${year} $out/bin/${pname}
|
||||
|
||||
#Unpack jar files. Otherwise pdfstudio does this and fails due to read-only FS.
|
||||
for pfile in $out/share/${pname}${year}/jre/lib/{,ext/}*.jar.pack; do
|
||||
jar_file=`echo "$pfile" | awk '{ print substr($0,1,length($0)-5) }'`
|
||||
unpack200 -r "$pfile" "$jar_file"
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.qoppa.com/pdfstudio/";
|
||||
description = "An easy to use, full-featured PDF editing software";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.pwoelfel ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,6 @@
|
|||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.0.12";
|
||||
sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi";
|
||||
version = "1.0.13";
|
||||
sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
callPackage ./genericModule.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.1.6";
|
||||
sha256 = "1q6fqay1s9qwimjwlldc8hr6009cgx3ghz142mdx36jjv9isj9ln";
|
||||
vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0";
|
||||
version = "1.1.8";
|
||||
sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l";
|
||||
vendorSha256 = "03hjin9nybf7fpbj5r82qh19qh3cc8m0b236mk0ajhsyjqrk8pir";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "0z74slnq3y9wr1xr07jigz4n8dgxhk9qb0787sd0j6wj9g4rqxgg";
|
||||
sha256 = "0yfvnjqw9l99kdcr995by3mx5vwad6b530x93yb8ipr3xa1bcq9k";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
|
|
|||
|
|
@ -2,34 +2,25 @@
|
|||
#
|
||||
# To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root:
|
||||
#
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package pkgs.firefox-bin-unwrapped
|
||||
{ stdenv, lib, fetchurl, config, makeWrapper
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped
|
||||
{ lib, stdenv, fetchurl, config, wrapGAppsHook
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, atk
|
||||
, cairo
|
||||
, coreutils
|
||||
, cups
|
||||
, curl
|
||||
, dbus
|
||||
, cups
|
||||
, dbus-glib
|
||||
, dbus
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, glibc
|
||||
, gnome
|
||||
, gnugrep
|
||||
, gnupg
|
||||
, gnused
|
||||
, gpgme
|
||||
, gtk2
|
||||
, gtk3
|
||||
, libkrb5
|
||||
, libcanberra
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, libXScrnSaver
|
||||
, libxcb
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
|
|
@ -39,24 +30,43 @@
|
|||
, libXi
|
||||
, libXinerama
|
||||
, libXrender
|
||||
, libXScrnSaver
|
||||
, libXrandr
|
||||
, libXt
|
||||
, libXtst
|
||||
, libcanberra
|
||||
, libnotify
|
||||
, adwaita-icon-theme
|
||||
, libGLU, libGL
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, runtimeShell
|
||||
, pipewire
|
||||
, pciutils
|
||||
, libheimdal
|
||||
, libpulseaudio
|
||||
, systemd
|
||||
, writeScript
|
||||
, xdg-utils
|
||||
, writeText
|
||||
, xidel
|
||||
, coreutils
|
||||
, gnused
|
||||
, gnugrep
|
||||
, gnupg
|
||||
, ffmpeg
|
||||
, runtimeShell
|
||||
, mesa # thunderbird wants gbm for drm+dmabuf
|
||||
, systemLocale ? config.i18n.defaultLocale or "en_US"
|
||||
}:
|
||||
|
||||
# imports `version` and `sources`
|
||||
with (import ./release_sources.nix);
|
||||
|
||||
let
|
||||
arch = if stdenv.hostPlatform.system == "i686-linux"
|
||||
then "linux-i686"
|
||||
else "linux-x86_64";
|
||||
inherit (import ./release_sources.nix) version sources;
|
||||
|
||||
mozillaPlatforms = {
|
||||
i686-linux = "linux-i686";
|
||||
x86_64-linux = "linux-x86_64";
|
||||
};
|
||||
|
||||
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
|
||||
|
||||
isPrefixOf = prefix: string:
|
||||
builtins.substring 0 (builtins.stringLength prefix) string == prefix;
|
||||
|
|
@ -64,11 +74,17 @@ let
|
|||
sourceMatches = locale: source:
|
||||
(isPrefixOf source.locale locale) && source.arch == arch;
|
||||
|
||||
systemLocale = config.i18n.defaultLocale or "en-US";
|
||||
policies = { DisableAppUpdate = true; } // config.thunderbird.policies or { };
|
||||
policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; });
|
||||
|
||||
defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
|
||||
|
||||
source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
|
||||
mozLocale =
|
||||
if systemLocale == "ca_ES@valencia"
|
||||
then "ca-valencia"
|
||||
else lib.replaceStrings ["_"] ["-"] systemLocale;
|
||||
|
||||
source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -83,11 +99,10 @@ stdenv.mkDerivation {
|
|||
libPath = lib.makeLibraryPath
|
||||
[ stdenv.cc.cc
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
curl
|
||||
cups
|
||||
dbus-glib
|
||||
dbus
|
||||
fontconfig
|
||||
|
|
@ -98,34 +113,55 @@ stdenv.mkDerivation {
|
|||
gtk2
|
||||
gtk3
|
||||
libkrb5
|
||||
mesa
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libxcb
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXinerama
|
||||
libXrender
|
||||
libXrandr
|
||||
libXt
|
||||
libxcb
|
||||
libXtst
|
||||
libcanberra
|
||||
libnotify
|
||||
libGLU libGL
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
pipewire
|
||||
pciutils
|
||||
libheimdal
|
||||
libpulseaudio
|
||||
systemd
|
||||
ffmpeg
|
||||
] + ":" + lib.makeSearchPathOutput "lib" "lib64" [
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
|
||||
inherit gtk3;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gtk3 adwaita-icon-theme ];
|
||||
|
||||
# "strip" after "patchelf" may break binaries.
|
||||
# See: https://github.com/NixOS/patchelf/issues/10
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
patchPhase = ''
|
||||
# Don't download updates from Mozilla directly
|
||||
echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
|
||||
'';
|
||||
|
||||
# See "Note on GPG support" in `../thunderbird/default.nix` for explanations
|
||||
# on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH.
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
|
||||
|
|
@ -135,41 +171,27 @@ stdenv.mkDerivation {
|
|||
ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
|
||||
|
||||
for executable in \
|
||||
thunderbird crashreporter thunderbird-bin plugin-container updater
|
||||
thunderbird thunderbird-bin plugin-container \
|
||||
updater crashreporter webapprt-stub
|
||||
do
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
"$out/usr/lib/thunderbird-bin-${version}/$executable"
|
||||
if [ -e "$out/usr/lib/thunderbird-bin-${version}/$executable" ]; then
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
"$out/usr/lib/thunderbird-bin-${version}/$executable"
|
||||
fi
|
||||
done
|
||||
|
||||
find . -executable -type f -exec \
|
||||
patchelf --set-rpath "$libPath" \
|
||||
"$out/usr/lib/thunderbird-bin-${version}/{}" \;
|
||||
|
||||
# Create a desktop item.
|
||||
mkdir -p $out/share/applications
|
||||
cat > $out/share/applications/thunderbird.desktop <<EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Exec=$out/bin/thunderbird
|
||||
Icon=$out/usr/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png
|
||||
Name=Thunderbird
|
||||
GenericName=Mail Reader
|
||||
Categories=Application;Network;
|
||||
EOF
|
||||
# wrapThunderbird expects "$out/lib" instead of "$out/usr/lib"
|
||||
ln -s "$out/usr/lib" "$out/lib"
|
||||
|
||||
# SNAP_NAME: https://github.com/NixOS/nixpkgs/pull/61980
|
||||
# MOZ_LEGACY_PROFILES and MOZ_ALLOW_DOWNGRADE:
|
||||
# commit 87e261843c4236c541ee0113988286f77d2fa1ee
|
||||
wrapProgram "$out/bin/thunderbird" \
|
||||
--argv0 "$out/bin/.thunderbird-wrapped" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
|
||||
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
|
||||
--set SNAP_NAME "thunderbird" \
|
||||
--set MOZ_LEGACY_PROFILES 1 \
|
||||
--set MOZ_ALLOW_DOWNGRADE 1 \
|
||||
--prefix PATH : "${lib.getBin gnupg}/bin" \
|
||||
--prefix PATH : "${lib.getBin xdg-utils}/bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
|
||||
gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
|
||||
|
||||
# See: https://github.com/mozilla/policy-templates/blob/master/README.md
|
||||
mkdir -p "$out/lib/thunderbird-bin-${version}/distribution";
|
||||
ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json";
|
||||
'';
|
||||
|
||||
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
|
||||
|
|
@ -180,12 +202,13 @@ stdenv.mkDerivation {
|
|||
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
|
||||
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
|
||||
homepage = "http://www.mozilla.org/thunderbird/";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ lovesegfault ];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
44
pkgs/applications/science/astronomy/astrolog/default.nix
Normal file
44
pkgs/applications/science/astronomy/astrolog/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib, stdenv, fetchzip, fetchurl, xorg, gnused }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "astrolog";
|
||||
version = "7.30";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://www.astrolog.org/ftp/ast73src.zip";
|
||||
sha256 = "0nry4gxwy5aa99zzr8dlb6babpachsc3jjyk0vw82c7x3clbhl7l";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
${gnused}/bin/sed -i "s:~/astrolog:$out/astrolog:g" astrolog.h
|
||||
'';
|
||||
|
||||
buildInputs = [ xorg.libX11 ];
|
||||
NIX_CFLAGS_COMPILE = "-Wno-format-security";
|
||||
|
||||
installPhase =
|
||||
let
|
||||
ephemeris = fetchzip {
|
||||
url = "http://astrolog.org/ftp/ephem/astephem.zip";
|
||||
sha256 = "1mwvpvfk3lxjcc79zvwl4ypqzgqzipnc01cjldxrmx56xkc35zn7";
|
||||
stripRoot = false;
|
||||
};
|
||||
atlas = fetchurl {
|
||||
url = "http://astrolog.org/ftp/atlas/atlasbig.as";
|
||||
sha256 = "1k8cy8gpcvkwkhyz248qhvrv5xiwp1n1s3b7rlz86krh7vzz01mp";
|
||||
};
|
||||
in ''
|
||||
mkdir -p $out/bin $out/astrolog
|
||||
cp -r ${ephemeris}/*.se1 $out/astrolog
|
||||
cp *.as $out/astrolog
|
||||
install astrolog $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = [ maintainers.kmein ];
|
||||
homepage = "https://astrolog.org/astrolog.htm";
|
||||
description = "Freeware astrology program";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l6MwBxPWIL5oEaq9c0HJZumZf17WzZymZtytyWZOwWE=";
|
||||
sha256 = "sha256-RFKS6fHh+rX5S31MvAQpJUNgaI6loiUw0FNkdsMFqlQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ONeeFZbD5RJXWiXejUt5VKzGl0pz+3Hn73/Y5a+gJRw=";
|
||||
vendorSha256 = "sha256-6owFzn+NAhlHjTJEur1H5oZY87ZoptvAnF2w6kafix8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -33,13 +33,20 @@ assertExecutable() {
|
|||
# To troubleshoot a binary wrapper after you compiled it,
|
||||
# use the `strings` command or open the binary file in a text editor.
|
||||
makeWrapper() {
|
||||
assertExecutable "$1"
|
||||
makeDocumentedCWrapper "$1" "${@:3}" | \
|
||||
local original="$1"
|
||||
local wrapper="$2"
|
||||
shift 2
|
||||
|
||||
assertExecutable "$original"
|
||||
|
||||
mkdir -p "$(dirname "$wrapper")"
|
||||
|
||||
makeDocumentedCWrapper "$original" "$@" | \
|
||||
@CC@ \
|
||||
-Wall -Werror -Wpedantic \
|
||||
-Os \
|
||||
-x c \
|
||||
-o "$2" -
|
||||
-o "$wrapper" -
|
||||
}
|
||||
|
||||
# Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
|
||||
|
|
|
|||
|
|
@ -2,22 +2,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vlang";
|
||||
version = "weekly.2021.25";
|
||||
version = "weekly.2021.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "v";
|
||||
rev = version;
|
||||
sha256 = "0y4a5rmpcdqina32d6azbmsbi3zqqfl413sicg72x6a1pm2vg33j";
|
||||
sha256 = "1jvq3fxckl2jidiigkvclacjxbg5k38268mck7bl1ky1yspgfrnq";
|
||||
};
|
||||
|
||||
# V compiler source translated to C for bootstrap.
|
||||
# Use matching v.c release commit for now, 0.1.21 release is not available.
|
||||
vc = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "3201d2dd2faadfa370da0bad2a749a664ad5ade3";
|
||||
sha256 = "0xzkjdph5wfjr3qfkihgc27vsbbjh2l31rp8z2avq9hc531hwvrz";
|
||||
rev = "c8ed2cd82b247e94c33217dba35c420cfc02fef3";
|
||||
sha256 = "1acgx1qp480jmsv1xvqy1zf7iyy90mvg9x1m1b0zrwx09wz4y1cq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ glfw freetype openssl ]
|
||||
|
|
|
|||
|
|
@ -19,15 +19,23 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./patch.patch ./0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch ];
|
||||
|
||||
postPatch = ''
|
||||
echo 'InstallBinSubdirs(packlib scripts)' >> 2006/src/Imakefile
|
||||
substituteInPlace 2006/src/config/site.def \
|
||||
--replace "# define MakeCmd gmake" "# define MakeCmd make"
|
||||
substituteInPlace 2006/src/config/lnxLib.rules \
|
||||
--replace "# lib" "// lib"
|
||||
|
||||
substituteInPlace 2006/src/config/linux.cf \
|
||||
--replace "# ifdef Hasgfortran" "# if 1" \
|
||||
--replace "# define CcCmd gcc4" "# define CcCmd gcc"
|
||||
substituteInPlace 2006/src/scripts/cernlib \
|
||||
--replace "-lnsl" ""
|
||||
|
||||
# binutils 2.37 fix
|
||||
substituteInPlace 2006/src/config/Imake.tmpl --replace "clq" "cq"
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
preConfigure = ''
|
||||
export CERN=`pwd`
|
||||
export CERN_LEVEL=${version}
|
||||
export CERN_ROOT=$CERN/$CERN_LEVEL
|
||||
|
|
@ -43,32 +51,39 @@ stdenv.mkDerivation rec {
|
|||
"-fallow-argument-mismatch"
|
||||
];
|
||||
|
||||
NIX_CFLAGS = [ "-Wno-return-type" ];
|
||||
|
||||
makeFlags = [
|
||||
"FORTRANOPTIONS=$(FFLAGS)"
|
||||
"CCOPTIONS=$(NIX_CFLAGS)"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
cd $CERN_ROOT
|
||||
mkdir -p build bin lib
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
cd $CERN_ROOT
|
||||
mkdir -p build
|
||||
cd $CERN_ROOT/build
|
||||
$CVSCOSRC/config/imake_boot
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
make -j $NIX_BUILD_CORES $makeFlags bin/kuipc
|
||||
make -j $NIX_BUILD_CORES $makeFlags scripts/Makefile
|
||||
pushd scripts
|
||||
make -j $NIX_BUILD_CORES $makeFlags install.bin
|
||||
make -j $NIX_BUILD_CORES $makeFlags bin/cernlib
|
||||
popd
|
||||
make -j $NIX_BUILD_CORES $makeFlags
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir "$out"
|
||||
cp -r "$CERN_ROOT/bin" "$out"
|
||||
cp -r "$CERN_ROOT/lib" "$out"
|
||||
mkdir "$out/$CERN_LEVEL"
|
||||
ln -s "$out/bin" "$out/$CERN_LEVEL/bin"
|
||||
ln -s "$out/lib" "$out/$CERN_LEVEL/lib"
|
||||
'';
|
||||
installTargets = [ "install.bin" "install.lib" "install.include" ];
|
||||
installFlags = [
|
||||
"CERN_BINDIR=${placeholder "out"}/bin"
|
||||
"CERN_INCLUDEDIR=${placeholder "out"}/include"
|
||||
"CERN_LIBDIR=${placeholder "out"}/lib"
|
||||
"CERN_SHLIBDIR=${placeholder "out"}/libexec"
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,9 @@ let
|
|||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) GameController;
|
||||
};
|
||||
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
||||
qtlocation = callPackage ../modules/qtlocation.nix {};
|
||||
|
|
|
|||
|
|
@ -163,6 +163,9 @@ let
|
|||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) GameController;
|
||||
};
|
||||
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
||||
qtlocation = callPackage ../modules/qtlocation.nix {};
|
||||
|
|
|
|||
|
|
@ -125,7 +125,9 @@ let
|
|||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) GameController;
|
||||
};
|
||||
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
||||
qtlocation = callPackage ../modules/qtlocation.nix {};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ qtModule, qtbase, qtdeclarative, pkg-config }:
|
||||
{ lib, stdenv, qtModule, qtbase, qtdeclarative, GameController, pkg-config }:
|
||||
|
||||
qtModule {
|
||||
pname = "qtgamepad";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
qtInputs = [ qtbase qtdeclarative ]
|
||||
++ lib.optional stdenv.isDarwin GameController;
|
||||
buildInputs = [ ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, ocaml
|
||||
, dune-configurator
|
||||
, seq
|
||||
, either, seq
|
||||
, gen, iter, ounit, qcheck, uutf
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "3.4";
|
||||
version = "3.6.1";
|
||||
pname = "containers";
|
||||
|
||||
useDune2 = true;
|
||||
|
|
@ -14,11 +14,11 @@ buildDunePackage rec {
|
|||
owner = "c-cube";
|
||||
repo = "ocaml-containers";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ixpy81p6rc3lq71djfndb2sg2hfj20j1jbzzrrmgqsysqdjsgzz";
|
||||
sha256 = "sha256:1k8xrs3nki8g875sig9f5v6k4vwxrk5gn7ixrlkkys5ksbr4kis7";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ seq ];
|
||||
propagatedBuildInputs = [ either seq ];
|
||||
|
||||
checkInputs = [ gen iter ounit qcheck uutf ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, autoreconfHook
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
|
|
@ -9,11 +10,11 @@ assert pariSupport -> pari != null;
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cysignals";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "72985b0ddd6d6f0084b9583562c39d818012420c4f7dd8bf31b55be45d3b95f8";
|
||||
sha256 = "5858b1760fbe21848121b826b2463a67ac5a45caf3d73105497a68618c5a6fa6";
|
||||
};
|
||||
|
||||
# explicit check:
|
||||
|
|
@ -40,6 +41,8 @@ buildPythonPackage rec {
|
|||
pari
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.680";
|
||||
version = "2.0.682";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IandHrLrz5XsfNXZL6aWHEFSYOm597d2VgQ+/xalpt8=";
|
||||
sha256 = "sha256-WQSt3z2U4cQeT2AAGiVA4UhJlsMjzgR16cW9/7foHUI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.5.2";
|
||||
version = "5.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "sha256-7nygSugqOYhK0lXEy3BSr5h5+GTfLBG/1O6TyKhk++c=";
|
||||
sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,64 +1,10 @@
|
|||
{ stdenv, lib, fetchgit, darwin, writeText
|
||||
, ninja, python3
|
||||
}:
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
let
|
||||
callPackage ./generic.nix args {
|
||||
# Note: Please use the recommended version for Chromium, e.g.:
|
||||
# https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn
|
||||
rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a";
|
||||
revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3
|
||||
version = "2020-03-09";
|
||||
sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr";
|
||||
|
||||
revShort = builtins.substring 0 7 rev;
|
||||
lastCommitPosition = writeText "last_commit_position.h" ''
|
||||
#ifndef OUT_LAST_COMMIT_POSITION_H_
|
||||
#define OUT_LAST_COMMIT_POSITION_H_
|
||||
|
||||
#define LAST_COMMIT_POSITION_NUM ${revNum}
|
||||
#define LAST_COMMIT_POSITION "${revNum} (${revShort})"
|
||||
|
||||
#endif // OUT_LAST_COMMIT_POSITION_H_
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "gn-unstable";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
# Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja python3 ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
|
||||
libobjc
|
||||
cctools
|
||||
|
||||
# frameworks
|
||||
ApplicationServices
|
||||
Foundation
|
||||
AppKit
|
||||
]);
|
||||
|
||||
buildPhase = ''
|
||||
python build/gen.py --no-last-commit-position
|
||||
ln -s ${lastCommitPosition} out/last_commit_position.h
|
||||
ninja -j $NIX_BUILD_CORES -C out gn
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -vD out/gn "$out/bin/gn"
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A meta-build system that generates build files for Ninja";
|
||||
homepage = "https://gn.googlesource.com/gn";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ stesie matthewbauer primeos ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
60
pkgs/development/tools/build-managers/gn/generic.nix
Normal file
60
pkgs/development/tools/build-managers/gn/generic.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ stdenv, lib, fetchgit, darwin, writeText
|
||||
, ninja, python3
|
||||
, ...
|
||||
}:
|
||||
|
||||
{ rev, revNum, version, sha256 }:
|
||||
|
||||
let
|
||||
revShort = builtins.substring 0 7 rev;
|
||||
lastCommitPosition = writeText "last_commit_position.h" ''
|
||||
#ifndef OUT_LAST_COMMIT_POSITION_H_
|
||||
#define OUT_LAST_COMMIT_POSITION_H_
|
||||
|
||||
#define LAST_COMMIT_POSITION_NUM ${revNum}
|
||||
#define LAST_COMMIT_POSITION "${revNum} (${revShort})"
|
||||
|
||||
#endif // OUT_LAST_COMMIT_POSITION_H_
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "gn-unstable";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
# Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja python3 ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
|
||||
libobjc
|
||||
cctools
|
||||
|
||||
# frameworks
|
||||
ApplicationServices
|
||||
Foundation
|
||||
AppKit
|
||||
]);
|
||||
|
||||
buildPhase = ''
|
||||
python build/gen.py --no-last-commit-position
|
||||
ln -s ${lastCommitPosition} out/last_commit_position.h
|
||||
ninja -j $NIX_BUILD_CORES -C out gn
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -vD out/gn "$out/bin/gn"
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A meta-build system that generates build files for Ninja";
|
||||
homepage = "https://gn.googlesource.com/gn";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ stesie matthewbauer primeos ];
|
||||
};
|
||||
}
|
||||
8
pkgs/development/tools/build-managers/gn/rev1924.nix
Normal file
8
pkgs/development/tools/build-managers/gn/rev1924.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
rev = "24e2f7df92641de0351a96096fb2c490b2436bb8";
|
||||
revNum = "1924"; # git describe HEAD --match initial-commit | cut -d- -f3
|
||||
version = "2021-08-08";
|
||||
sha256 = "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl";
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xtOgc52mn3e/Kiz6GVK8RLQkoJW9Kpv0GvGXXgrCdpc=";
|
||||
sha256 = "sha256-3W6jDMT4UUtSND9bJJEexQ9LrqxL4oZtpucdcM1McdE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cfr";
|
||||
version = "0.151";
|
||||
version = "0.152";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
|
||||
sha256 = "sha256-MW6QFbmvKVP8/0/oa/O7pwXzLnzSW9blNcaY3ool6Dc=";
|
||||
sha256 = "sha256-9obo897Td9e8h9IWqQ6elRLfQVbnWwbGVaFmSK6HZbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.35.6";
|
||||
version = "0.35.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-31GIjm2OtaMwf0nYmWVUsi3GBeik/QKvL8AdCyhjZy0=";
|
||||
sha256 = "sha256-rMeaKzCGY9jRrw8GaGtgm1rg3FIdaX/P+bOZRAtAI/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-GMniiGOxg97JCZGxxIr4Zup6b/Wzldy4/FLbJwFJPxY=";
|
||||
cargoSha256 = "sha256-ZXQM2ij9Cpa5WCEHhcDc/tThfKZ7s1URmYsmqRg73m0=";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.24";
|
||||
version = "0.1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/A3OaJje8AT4zR91sLAYN6lsKiv2FbSBYAeuc79nSF0=";
|
||||
sha256 = "sha256-GNQ8PTnkmf4m2QW1yIEKytk53RNJZa9Z0GUrW5UjIkk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1LXcuLmbW0ezLJG0sszQDZqa2cRaMMC4blNjmFg1Ltc=";
|
||||
cargoSha256 = "sha256-MbD5lkmKzggdoSzCcArVzpdQRLnXT1y+C2EFSWUbaa4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -44,16 +44,16 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.22";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-gmBCoYGph5cyo9rLv4FnYF8wUpG/z6r16qDslSXXZO8=";
|
||||
version = "7.0-rc2";
|
||||
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-D92OOa9fFdBd0wZbtRLz9oOhhJ3AtHcSZP0EaWyW7X0=";
|
||||
inherit (stable) gecko32 gecko64;
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "6.4.0";
|
||||
version = "7.0.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
sha256 = "sha256-24uF87kQWQ9hrb+gAFqZXWE+KZocxz0AVT1w3IEBDjY=";
|
||||
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -65,7 +65,7 @@ in rec {
|
|||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-dGyaos6xITiAQdU65/PJQKRl5Rr5xBpgQhXii9iwb+E=";
|
||||
sha256 = "sha256-UkwvKKRXyFjLfYbL8Ienpp5pxUzMQY1bEyAkoP7Xdz4=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"compe-tmux": {
|
||||
"date": "2021-12-20",
|
||||
"date": "2021-12-21",
|
||||
"new": "cmp-tmux"
|
||||
},
|
||||
"gist-vim": {
|
||||
|
|
|
|||
|
|
@ -329,12 +329,12 @@ final: prev:
|
|||
|
||||
better-escape-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "better-escape.nvim";
|
||||
version = "2021-10-18";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "max397574";
|
||||
repo = "better-escape.nvim";
|
||||
rev = "bbb8b0e3d1b1088a1db6b5ece776a41709929128";
|
||||
sha256 = "1xiaywjy12rj25qdq5ys8ayrwlw9p9frpjzzagx1p6zgp03jpq63";
|
||||
rev = "066a74d517a10e6ef08e5acb72d86eb3f00e6444";
|
||||
sha256 = "0bkvkl2599jba5j3dgrigkfrn2p4rbilgpvgyp3zw9m06gqxsqin";
|
||||
};
|
||||
meta.homepage = "https://github.com/max397574/better-escape.nvim/";
|
||||
};
|
||||
|
|
@ -473,12 +473,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "c71da0287a5507670a747e5e513f2069e49d8dfe";
|
||||
sha256 = "0mc679cccxnksn2xm6wrk6s87b7civazncd978zsxvb3bf39x10w";
|
||||
rev = "52022913fe4446a2b649fb3ff9cfdf9def4b7b00";
|
||||
sha256 = "1alr8xj01dqlvyjq0ay5c54w0lwgbqf32sd3d1qbjdf6fgi8x86y";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -869,12 +869,12 @@ final: prev:
|
|||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc.nvim";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "ef04d1fd53107830da0b905e4dcfb8c8eafb4d49";
|
||||
sha256 = "0g0fp5fd5s6dzsphkjvmb0yf9p2vslbm0za5bsb5nwa614h9m762";
|
||||
rev = "37559aa90f9d149b8255dc06c28c8d7ba34b805e";
|
||||
sha256 = "086hahg9xjddll7c2a1ydmhxn7gywx3v63bzfbi260mxi6rl4a2s";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
|
|
@ -942,12 +942,12 @@ final: prev:
|
|||
|
||||
comment-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "comment.nvim";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtostr";
|
||||
repo = "comment.nvim";
|
||||
rev = "b7e18f9477974044b8ba3de93b51cad804a37eed";
|
||||
sha256 = "0da2wqz5kjwvwmma22kxmxznn0zvbm2f2sb7ax3w145m93ad9mzd";
|
||||
rev = "9e80d5146013275277238c89bbcaf4164f4e5140";
|
||||
sha256 = "1pxinsw4alrd299s3d7rsn9h0wppmgg36ywa891km27cjzplvrjr";
|
||||
};
|
||||
meta.homepage = "https://github.com/numtostr/comment.nvim/";
|
||||
};
|
||||
|
|
@ -1182,12 +1182,12 @@ final: prev:
|
|||
|
||||
crates-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "crates.nvim";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saecki";
|
||||
repo = "crates.nvim";
|
||||
rev = "6be824c39bed6c6794a10c8cff486b205bd954f0";
|
||||
sha256 = "03fl0q1405rkj95rc5r4vsf3898f2rwlyn7q62w3p892h50khv19";
|
||||
rev = "40f6c2abd2cc17c5579d56fecf62b461849d6302";
|
||||
sha256 = "1nwzjbp8ld4gpjw4c94vq3hzck6lv3rb9cqyzqyvby98rvg3zra4";
|
||||
};
|
||||
meta.homepage = "https://github.com/saecki/crates.nvim/";
|
||||
};
|
||||
|
|
@ -2363,12 +2363,12 @@ final: prev:
|
|||
|
||||
gruvbox-community = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-community";
|
||||
version = "2021-10-10";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruvbox-community";
|
||||
repo = "gruvbox";
|
||||
rev = "961cc1850bd7d5657aa5789f81487d4d85747d2b";
|
||||
sha256 = "1kvl264xmk6vk5kqp6d32lfxyb5rx320kc3fhmjzkyaa2p4k3j25";
|
||||
rev = "1f8500f033813fcc6f41f0fe366e27faa163f2c2";
|
||||
sha256 = "0vvmzwlq5in1pn73gzsn2bbj4x5n7w48a635yn2qpkslh4qhnq82";
|
||||
};
|
||||
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
|
||||
};
|
||||
|
|
@ -2916,12 +2916,12 @@ final: prev:
|
|||
|
||||
LeaderF = buildVimPluginFrom2Nix {
|
||||
pname = "LeaderF";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yggdroot";
|
||||
repo = "LeaderF";
|
||||
rev = "189e96e8b0f831ea554afa95028aabf2171bb0de";
|
||||
sha256 = "1h960ayq3vi6alx2j8l7mzzhcwb6n6c57k77gaz5zjp7r2yzafjg";
|
||||
rev = "5626a1f71bcc2dd7a74156f22c53734621c12433";
|
||||
sha256 = "0xr76yf5wm4mggf5993m5sywim08dg3qsgx84xck5zcqiz84i3q9";
|
||||
};
|
||||
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
|
||||
};
|
||||
|
|
@ -3180,12 +3180,12 @@ final: prev:
|
|||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2021-12-19";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "7bb6f4c6f28ef0bcd81af85aa32331c90f832758";
|
||||
sha256 = "0did2hzcxf6c0q6dvc5wxr3kgrqggb1xjfyyi9a535fmlya1hw9a";
|
||||
rev = "c8a2a4033cb1769c8f3f67bb3f2e0cb121a2b70a";
|
||||
sha256 = "0md6jm42cr9vzkyiwrblyl92wyafl2i8cn3zxvyflhhm1rhkchgw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
|
|
@ -3756,12 +3756,12 @@ final: prev:
|
|||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2021-12-19";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "139ee79ae7a8a2590baacfeb56cea1ba23b07c55";
|
||||
sha256 = "0fmplszf461jhir7da0cck4z4n1ch0457b7hfwr4cncfia4yx4cj";
|
||||
rev = "e35a2eee66a5906c778ad4f57f8a015bea1be977";
|
||||
sha256 = "1vxdf8zp6kr1np4lg9khhfsjm7r1dyjggkbris3m7b2srmzpbxhz";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
|
|
@ -4056,12 +4056,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "28d581cc488b6cb981199107c0a8074d4e136da8";
|
||||
sha256 = "0bb4s5fzsqjq2bbzsxd0jwi98ibjy8nsgifsim8qxnd4qfx59x43";
|
||||
rev = "1c80377e0ab63f692540e75fba2a0c0c8d51de71";
|
||||
sha256 = "1jmk8xhpiy9jn2qaplkw0ax6npgp45052rcyxz5cxz3b7zn04944";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
|
@ -4128,12 +4128,12 @@ final: prev:
|
|||
|
||||
nvim-bqf = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-bqf";
|
||||
version = "2021-12-13";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "nvim-bqf";
|
||||
rev = "df3d541557186cb9c1d27905aeb898281c1bddb0";
|
||||
sha256 = "1ldiwh7vaddnd52pav4c2739mfjv5cv3jaim2bbzp2yb25jdwp56";
|
||||
rev = "9e2c95ae530b71bd99cfeb88d108101b0db02a5c";
|
||||
sha256 = "16wa7nmh7ahxllbffak0jshkkcx2n3lywgnx7vazwfjndfyw7vjz";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
|
||||
};
|
||||
|
|
@ -4164,12 +4164,12 @@ final: prev:
|
|||
|
||||
nvim-cmp = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cmp";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "9c07c2d1c5581b22f742b891cadd42a311c1cf96";
|
||||
sha256 = "1il3725az2ilk5f3p31wrj4xm1qjn2ck82p640ynw9sxxwd3084a";
|
||||
rev = "4a19645374b3c10538bd363e92099d94221efaea";
|
||||
sha256 = "1x9k8wx9y7kdqnf13c2vgzq5cksdgps2b531d28bxwa88z32yddc";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
|
|
@ -4572,12 +4572,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "881cb5b8f2260c1e3b9e2d68ac459d81c1dff57b";
|
||||
sha256 = "0i69pab3xg7hqqgpgi7qwc5j02f0fg33zzs52rlap92cx6dbq53i";
|
||||
rev = "6c5f4b1b49aa2e6f948fb58fb9df82954bebf488";
|
||||
sha256 = "1jaljk7rl7rrn1n61yvi1spb520fmpb8ihjr2mhcvprjhc3n84kq";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -4620,12 +4620,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter-textobjects";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-textobjects";
|
||||
rev = "669a07b1bc94e425cbb5c9a89ae470a5c71474c5";
|
||||
sha256 = "1kpg6b5z5739bjqpwls0bmc1cywln7nnm57i08d2zvhbk3f8i67q";
|
||||
rev = "f51c3feb5abe1dea556c9076b8a8928d3bf56790";
|
||||
sha256 = "1m0gpnhd8pc1np5acs2vvd3my5s7pgvx3bvlqr8yip7aibl4ls0g";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
|
||||
};
|
||||
|
|
@ -4656,12 +4656,12 @@ final: prev:
|
|||
|
||||
nvim-web-devicons = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "2021-12-16";
|
||||
version = "2021-12-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-web-devicons";
|
||||
rev = "218658d091a824bbf121acaafd58293e2f970eb1";
|
||||
sha256 = "0spx5d1vk9l2bz3y33qpyw6ixn5jxlg5vd093pwfpwz3hrc01qjj";
|
||||
rev = "ac71ca88b1136e1ecb2aefef4948130f31aa40d1";
|
||||
sha256 = "1fgl4cyichzlrl6dc2mp362kncc4aiy10svzzcqad168aj2x8rhd";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
|
||||
};
|
||||
|
|
@ -5222,12 +5222,12 @@ final: prev:
|
|||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring.nvim";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "8526b4ab37ad9ac19d6eccc6db38a9f7c538bd3f";
|
||||
sha256 = "1b5ggmip19814ph9p5v21j17021vngzkxd82wzgjh9z7kdca8jnq";
|
||||
rev = "22a46b0e27e62cad61e1dabb106197575470ef85";
|
||||
sha256 = "0c1ihgwf1kvcsq20k5y6nk2mxs99c4la0l5b06pi5k316zkd45gc";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
|
|
@ -5282,12 +5282,12 @@ final: prev:
|
|||
|
||||
rnvimr = buildVimPluginFrom2Nix {
|
||||
pname = "rnvimr";
|
||||
version = "2021-12-03";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "rnvimr";
|
||||
rev = "3d02dc4a4b78a771a944e62af70f9931e9412763";
|
||||
sha256 = "0650sx14mp05lcxh5saa906nf81xl2ch5ihl8sscy8niadykj47b";
|
||||
rev = "f1f16e9b6e2f702990cc1eebbf6417eb451e417e";
|
||||
sha256 = "1bvdp6h81i2mfiyyk2yf2qr9d1aln37kvb9vjk0bfbhiilndfx9r";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
|
||||
};
|
||||
|
|
@ -6823,12 +6823,12 @@ final: prev:
|
|||
|
||||
vim-airline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-airline";
|
||||
version = "2021-12-14";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-airline";
|
||||
repo = "vim-airline";
|
||||
rev = "24cb98f48fbe5ba7a64d1099d334430a5937a175";
|
||||
sha256 = "0fyskqcnj0fi4fqcngvmjjn7yfl975knzx6c8cf160bv0dan0iqw";
|
||||
rev = "77d651ef1331797ee4af0b8249e54a9d9d1a18e9";
|
||||
sha256 = "0wzhpmflp6gqwng5daw05v5ncfrknwq1hpl25jkg6d56rm37kq0c";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-airline/vim-airline/";
|
||||
};
|
||||
|
|
@ -7435,12 +7435,12 @@ final: prev:
|
|||
|
||||
vim-dadbod-completion = buildVimPluginFrom2Nix {
|
||||
pname = "vim-dadbod-completion";
|
||||
version = "2021-11-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristijanhusak";
|
||||
repo = "vim-dadbod-completion";
|
||||
rev = "44832073ea3bd38a79b2bb639485b0f0e6d63a30";
|
||||
sha256 = "0nz41b9r37lr19j2zbfj0j5992zwirbr3h11h94q7vrjk393kp3g";
|
||||
rev = "10064d526001d98b6454235644e3e586b566f26d";
|
||||
sha256 = "07vlg4w9x0xs4xag02pyxram94mvizipwya7p6vg7s3rznj0bipd";
|
||||
};
|
||||
meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
|
||||
};
|
||||
|
|
@ -8408,12 +8408,12 @@ final: prev:
|
|||
|
||||
vim-illuminate = buildVimPluginFrom2Nix {
|
||||
pname = "vim-illuminate";
|
||||
version = "2021-11-14";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RRethy";
|
||||
repo = "vim-illuminate";
|
||||
rev = "2beae0581caa66cf8c09fad7c7c557f92d49d2bd";
|
||||
sha256 = "1qrc789a3aps99x89hiwwrmnxm5hm1qsjp8xjhhls6jk8scqq2qv";
|
||||
rev = "8e68a8c75eee7fbfb5e94d779979fa41713ec8b2";
|
||||
sha256 = "10gl1gj5apmn2yjr4fdm51n0wxgkx951d7hz7zfd0xhxyvsmp8dj";
|
||||
};
|
||||
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
|
||||
};
|
||||
|
|
@ -8829,12 +8829,12 @@ final: prev:
|
|||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2021-12-17";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "9c9db9ce7354ac1ace0e35703992de4c6e6ea791";
|
||||
sha256 = "0njf03ccp7hb9lwdyrf5zc0mx6sw2hpm99z5yy0nlkansha1wgip";
|
||||
rev = "69e6340c48571cc813c52d6acc2057b8aea6e742";
|
||||
sha256 = "0f8sg66l579lyq1apbksr22a9h9hdv94nvs2d36sb2c2f8im3g6k";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
|
|
@ -9490,12 +9490,12 @@ final: prev:
|
|||
|
||||
vim-polyglot = buildVimPluginFrom2Nix {
|
||||
pname = "vim-polyglot";
|
||||
version = "2021-11-21";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sheerun";
|
||||
repo = "vim-polyglot";
|
||||
rev = "918610d427503c5c7b380eae4a954bd8cb427db5";
|
||||
sha256 = "0ly1wwm97x6a2v1x7da4bh8xrcksapb8xyyxih7kmvwk7xn3wrqr";
|
||||
rev = "cb80947143fe342797bcf571b6190c86b3c07700";
|
||||
sha256 = "0inim34psrkndsr93q1ax8xpg9hcjfchfn7dp84hc629bc2ziv13";
|
||||
};
|
||||
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
|
||||
};
|
||||
|
|
@ -10006,12 +10006,12 @@ final: prev:
|
|||
|
||||
vim-sleuth = buildVimPluginFrom2Nix {
|
||||
pname = "vim-sleuth";
|
||||
version = "2021-12-19";
|
||||
version = "2021-12-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-sleuth";
|
||||
rev = "84408b75ac028f6febce3d5c1761f1b93a345d1e";
|
||||
sha256 = "04c458q6ig3n000z0xyb8ywgm3yh18z3z5m8cyp6yvwyjihy9w03";
|
||||
rev = "769ade8741a3d39d0902d23737ca0ce8bdb93020";
|
||||
sha256 = "08q9l1va932jcfyflvkbal7fba8mfm88rxnmhrr6y0bs2awj1l0a";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-sleuth/";
|
||||
};
|
||||
|
|
@ -10343,12 +10343,12 @@ final: prev:
|
|||
|
||||
vim-test = buildVimPluginFrom2Nix {
|
||||
pname = "vim-test";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-test";
|
||||
repo = "vim-test";
|
||||
rev = "74693c21eada4da2173774b1ed24705c28c244c3";
|
||||
sha256 = "138j06jlxhnspmnc2jz46gkm6kwjyxmp2kq6gsrf22c10vv2gdcg";
|
||||
rev = "2d240b96221a8ef2cf2ed9db59f14c5871df80f0";
|
||||
sha256 = "1yc4mjhx2vv6ybpn9yblg4zfv7cmf2glsvvr1a5wsq0w0mn3yv69";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-test/vim-test/";
|
||||
};
|
||||
|
|
@ -11003,12 +11003,12 @@ final: prev:
|
|||
|
||||
vimspector = buildVimPluginFrom2Nix {
|
||||
pname = "vimspector";
|
||||
version = "2021-12-20";
|
||||
version = "2021-12-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "puremourning";
|
||||
repo = "vimspector";
|
||||
rev = "303d31cafc0fc704b1b62ef04ce8acb80428e872";
|
||||
sha256 = "1f3rlkvk13z2xvy0pl1hvwnw4mb4zv7mlx61c92ly2i2kibzbvpq";
|
||||
rev = "9e833b22a7aee667e92fb578130fa617369d5b23";
|
||||
sha256 = "1r0m54h1f277ldjxh9qz87w2wrjvsmy6hfp0sbz77gzvkighqg9l";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/puremourning/vimspector/";
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
{ stdenv, lib, fetchurl }:
|
||||
{ stdenv, lib, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "power-calibrate";
|
||||
version = "0.01.29";
|
||||
version = "0.01.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1v8wvhjqglkvk9cl2b48lkcwhbc6nsdi3hjd7sap4hyvd6703pgs";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-T2fCTE+snNt1ylOpVR0JfT2x0lWrgItpfjtUx/zjaQw=";
|
||||
};
|
||||
|
||||
installFlags = [
|
||||
"BINDIR=${placeholder "out"}/bin"
|
||||
"MANDIR=${placeholder "out"}/share/man/man8"
|
||||
"BASHDIR=${placeholder "out"}/share/bash-completion/completions"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to calibrate power consumption";
|
||||
homepage = "https://kernel.ubuntu.com/~cking/power-calibrate/";
|
||||
homepage = "https://github.com/ColinIanKing/power-calibrate";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
|
|
|
|||
|
|
@ -1,24 +1,25 @@
|
|||
{ stdenv, lib, fetchurl }:
|
||||
{ stdenv, lib, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerstat";
|
||||
version = "0.02.25";
|
||||
version = "0.02.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-C6MCOXnElDI69QkLKd2X2SLved8cRCN0Q6BhUvvqsTY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-P6DhsHnB+ak35JpUfD8Q8XbgMhI1QKKe31B8uMT2ZcY=";
|
||||
};
|
||||
|
||||
installFlags = [ "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/usr/* $out
|
||||
rm -r $out/usr
|
||||
'';
|
||||
installFlags = [
|
||||
"BINDIR=${placeholder "out"}/bin"
|
||||
"MANDIR=${placeholder "out"}/share/man/man8"
|
||||
"BASHDIR=${placeholder "out"}/share/bash-completion/completions"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Laptop power measuring tool";
|
||||
homepage = "https://kernel.ubuntu.com/~cking/powerstat/";
|
||||
homepage = "https://github.com/ColinIanKing/powerstat";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ womfoo ];
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ let
|
|||
# However, the version string is more useful for end-users.
|
||||
# These are contained in a attrset of their own to make it obvious that
|
||||
# people should update both.
|
||||
version = "1.17.3";
|
||||
commit = "46bf743b97d0d3f01ff437b2f10cc0bd9cdfe6e4";
|
||||
version = "1.19.1";
|
||||
commit = "a2a1e3eed4214a38608ec223859fcfa8fb679b14";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
|
|
@ -28,7 +28,7 @@ buildBazelPackage rec {
|
|||
owner = "envoyproxy";
|
||||
repo = "envoy";
|
||||
rev = srcVer.commit;
|
||||
hash = "sha256:09zzr4h3zjsb2rkxrvlazpx0jy33yn9j65ilxiqbvv0ckaralqfc";
|
||||
hash = "sha256:1v1hv4blrppnhllsxd9d3k2wl6nhd59r4ydljy389na3bb41jwf9";
|
||||
|
||||
extraPostFetch = ''
|
||||
chmod -R +w $out
|
||||
|
|
@ -58,7 +58,7 @@ buildBazelPackage rec {
|
|||
];
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "sha256:1cy2b73x8jzczq9z9c1kl7zrg5iasvsakb50zxn4mswpmajkbj5h";
|
||||
sha256 = "sha256:0vnl0gq6nhvyzz39jg1bvvna0xyhxalg71bp1jbxib7ql026004r";
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseGnConfigure = true;
|
||||
preInstall = ''
|
||||
|
|
@ -75,12 +75,6 @@ buildBazelPackage rec {
|
|||
$bazelOut/external/local_config_sh/BUILD
|
||||
rm -r $bazelOut/external/go_sdk
|
||||
|
||||
# Replace some wheels which are only used for tests with empty files;
|
||||
# they're nondeterministically built and packed.
|
||||
>$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
|
||||
>$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
|
||||
>$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl
|
||||
|
||||
# Remove Unix timestamps from go cache.
|
||||
rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (lib) concatStringsSep mapAttrsToList;
|
||||
inherit (lib) concatStringsSep concatMap id mapAttrsToList;
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "pomerium";
|
||||
version = "0.14.7";
|
||||
version = "0.15.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256:1jb96jk5qmary4fi1z9zwmppdyskj0qb6qii8s8mwazjjxqj1z2s";
|
||||
hash = "sha256:0adlk4ylny1z43x1dw3ny0s1932vhb61hpf5wdz4r65y8k9qyfgr";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1daabi9qc9nx8bafn26iw6rv4vx2xpd0nnk06265aqaksx26db0s";
|
||||
vendorSha256 = "sha256:1fszfbra84pcs8v1h2kf7iy603vf9v2ysg6il76aqmqrxmb1p7nv";
|
||||
subPackages = [
|
||||
"cmd/pomerium"
|
||||
"cmd/pomerium-cli"
|
||||
|
|
@ -28,39 +28,50 @@ buildGoModule rec {
|
|||
ldflags = let
|
||||
# Set a variety of useful meta variables for stamping the build with.
|
||||
setVars = {
|
||||
Version = "v${version}";
|
||||
BuildMeta = "nixpkgs";
|
||||
ProjectName = "pomerium";
|
||||
ProjectURL = "github.com/pomerium/pomerium";
|
||||
"github.com/pomerium/pomerium/internal/version" = {
|
||||
Version = "v${version}";
|
||||
BuildMeta = "nixpkgs";
|
||||
ProjectName = "pomerium";
|
||||
ProjectURL = "github.com/pomerium/pomerium";
|
||||
};
|
||||
"github.com/pomerium/pomerium/internal/envoy" = {
|
||||
OverrideEnvoyPath = "${envoy}/bin/envoy";
|
||||
};
|
||||
};
|
||||
varFlags = concatStringsSep " " (mapAttrsToList (name: value: "-X github.com/pomerium/pomerium/internal/version.${name}=${value}") setVars);
|
||||
concatStringsSpace = list: concatStringsSep " " list;
|
||||
mapAttrsToFlatList = fn: list: concatMap id (mapAttrsToList fn list);
|
||||
varFlags = concatStringsSpace (
|
||||
mapAttrsToFlatList (package: packageVars:
|
||||
mapAttrsToList (variable: value:
|
||||
"-X ${package}.${variable}=${value}"
|
||||
) packageVars
|
||||
) setVars);
|
||||
in [
|
||||
"${varFlags}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
zip
|
||||
];
|
||||
preBuild = ''
|
||||
# Replace embedded envoy with nothing.
|
||||
# We set OverrideEnvoyPath above, so rawBinary should never get looked at
|
||||
# but we still need to set a checksum/version.
|
||||
rm internal/envoy/files/files_{darwin,linux}*.go
|
||||
cat <<EOF >internal/envoy/files/files_generic.go
|
||||
package files
|
||||
|
||||
# Pomerium expects to have envoy append to it in a zip.
|
||||
# We use a store-only (-0) zip, so that the Nix scanner can find any store references we had in the envoy binary.
|
||||
postBuild = ''
|
||||
# Append Envoy
|
||||
pushd $NIX_BUILD_TOP
|
||||
mkdir -p envoy
|
||||
cd envoy
|
||||
cp ${envoy}/bin/envoy envoy
|
||||
zip -0 envoy.zip envoy
|
||||
popd
|
||||
import _ "embed" // embed
|
||||
|
||||
mv $GOPATH/bin/pomerium $GOPATH/bin/pomerium.old
|
||||
cat $GOPATH/bin/pomerium.old $NIX_BUILD_TOP/envoy/envoy.zip >$GOPATH/bin/pomerium
|
||||
zip --adjust-sfx $GOPATH/bin/pomerium
|
||||
var rawBinary []byte
|
||||
|
||||
//go:embed envoy.sha256
|
||||
var rawChecksum string
|
||||
|
||||
//go:embed envoy.version
|
||||
var rawVersion string
|
||||
EOF
|
||||
sha256sum '${envoy}/bin/envoy' > internal/envoy/files/envoy.sha256
|
||||
echo '${envoy.version}' > internal/envoy/files/envoy.version
|
||||
'';
|
||||
|
||||
# We also need to set dontStrip to avoid having the envoy ZIP stripped off the end.
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium
|
||||
install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bgpq3";
|
||||
version = "0.1.35";
|
||||
version = "0.1.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj";
|
||||
sha256 = "sha256-FBtt++w2WzCnSim+r+MVy287w2jmdNEaQIro2KaVeRI=";
|
||||
};
|
||||
|
||||
# Fix binary install location. Remove with next upstream release.
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dnsperf";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DNS-OARC";
|
||||
repo = "dnsperf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jemce+ix18IPAusEHh5QWcSQn/QRUOc3HTSk9jGt+SA=";
|
||||
sha256 = "sha256-TWFi3oPTIKjBaw0Rq0AfZgxyVukvL2SWa2qvWw2WAQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
buildGoModule rec {
|
||||
pname = "kapp";
|
||||
version = "0.42.0";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-kapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-unjfUecfvuobhvsSGSqMAs19ncOLkaJZ2uJv5uVcHr0=";
|
||||
sha256 = "sha256-9e5vgOIB8PHbM5nsDaasyEfWP5dr7j3vU3+WzFua6bI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.18.5";
|
||||
version = "0.18.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bbxOavpEVVRv5czl2UiV6brulvjod7X7n+j8/9bO+SE=";
|
||||
sha256 = "sha256-4ZXur3Hja5nlJ2GLGei9r7ZPz+bvw41rm9xzaIo68gw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-E0Mo+hgI0uRaV2GAX52YtdNyZdd9wHVOBB3tJz36/8I=";
|
||||
cargoSha256 = "sha256-vBr3RYBFoeCJquS8ugVpl29J7CUraN/HuxtKv8Dqi/k=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btop";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+z6bWX2mgvH6nW7SamDzAexeCn/i3+RaPF8RfoikR2k=";
|
||||
sha256 = "sha256-uKR1ogQwEoyxyWBiLnW8BsOsYgTpeIpKrKspq0JwYjY=";
|
||||
};
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -186,6 +186,8 @@ with pkgs;
|
|||
|
||||
antsimulator = callPackage ../games/antsimulator { };
|
||||
|
||||
astrolog = callPackage ../applications/science/astronomy/astrolog { };
|
||||
|
||||
atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
|
||||
|
||||
atuin = callPackage ../tools/misc/atuin {
|
||||
|
|
@ -15064,6 +15066,7 @@ with pkgs;
|
|||
nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
|
||||
|
||||
gn = callPackage ../development/tools/build-managers/gn { };
|
||||
gn1924 = callPackage ../development/tools/build-managers/gn/rev1924.nix { };
|
||||
|
||||
nixbang = callPackage ../development/tools/misc/nixbang {
|
||||
pythonPackages = python3Packages;
|
||||
|
|
@ -20888,6 +20891,7 @@ with pkgs;
|
|||
envoy = callPackage ../servers/http/envoy {
|
||||
go = go_1_15;
|
||||
jdk = openjdk11;
|
||||
gn = gn1924;
|
||||
};
|
||||
|
||||
etcd = callPackage ../servers/etcd { };
|
||||
|
|
@ -24136,6 +24140,8 @@ with pkgs;
|
|||
|
||||
foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { };
|
||||
|
||||
pdfstudio = callPackage ../applications/misc/pdfstudio { };
|
||||
|
||||
aeolus = callPackage ../applications/audio/aeolus { };
|
||||
|
||||
aewan = callPackage ../applications/editors/aewan { };
|
||||
|
|
@ -28840,10 +28846,19 @@ with pkgs;
|
|||
thunderbird = wrapThunderbird thunderbird-unwrapped { };
|
||||
thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; };
|
||||
|
||||
thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
|
||||
|
||||
thunderbird-bin = thunderbird-bin-91;
|
||||
thunderbird-bin-91 = callPackage ../applications/networking/mailreaders/thunderbird-bin { };
|
||||
thunderbird-bin-unwrapped = thunderbird-bin-91-unwrapped;
|
||||
|
||||
thunderbird-bin-91 = wrapThunderbird thunderbird-bin-91-unwrapped {
|
||||
applicationName = "thunderbird";
|
||||
pname = "thunderbird-bin";
|
||||
desktopName = "Thunderbird";
|
||||
};
|
||||
thunderbird-bin-91-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin {
|
||||
inherit (gnome) adwaita-icon-theme;
|
||||
};
|
||||
|
||||
thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
|
||||
|
||||
ticpp = callPackage ../development/libraries/ticpp { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue