Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1a9276956a
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, copyDesktopItems }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "NoiseTorch";
|
||||
|
|
@ -20,8 +20,6 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
preBuild = ''
|
||||
make -C c/ladspa/
|
||||
go generate
|
||||
|
|
@ -30,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
postInstall = ''
|
||||
install -D ./assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/noisetorch.png
|
||||
copyDesktopItems assets/noisetorch.desktop $out/share/applications/
|
||||
install -Dm444 ./assets/noisetorch.desktop $out/share/applications/noisetorch.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ in buildFHSUserEnv rec {
|
|||
# qsys requirements
|
||||
xorg.libXtst
|
||||
xorg.libXi
|
||||
libudev0-shim
|
||||
];
|
||||
multiPkgs = pkgs: with pkgs; let
|
||||
# This seems ugly - can we override `libpng = libpng12` for all `pkgs`?
|
||||
|
|
@ -44,6 +43,7 @@ in buildFHSUserEnv rec {
|
|||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXrender
|
||||
libudev0-shim
|
||||
];
|
||||
|
||||
passthru = { inherit unwrapped; };
|
||||
|
|
@ -71,7 +71,7 @@ in buildFHSUserEnv rec {
|
|||
EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}"
|
||||
for executable in $EXECUTABLES; do
|
||||
echo "#!${stdenv.shell}" >> $out/$executable
|
||||
echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable
|
||||
echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
|
||||
done
|
||||
|
||||
cd $out
|
||||
|
|
@ -80,7 +80,12 @@ in buildFHSUserEnv rec {
|
|||
ln --symbolic --relative --target-directory ./bin $EXECUTABLES
|
||||
'';
|
||||
|
||||
# LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when
|
||||
# starting most operations in many containerized environments, including WSL2, Docker, and LXC
|
||||
# (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation)
|
||||
# we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version
|
||||
# https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032
|
||||
runScript = writeScript "${name}-wrapper" ''
|
||||
exec $@
|
||||
exec env LD_PRELOAD=libudev.so.0 "$@"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, unstick, requireFile
|
||||
{ stdenv, lib, unstick, fetchurl
|
||||
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
|
||||
}:
|
||||
|
||||
|
|
@ -34,18 +34,18 @@ let
|
|||
};
|
||||
|
||||
version = "20.1.1.720";
|
||||
homepage = "https://fpgasoftware.intel.com";
|
||||
|
||||
require = {name, sha256}: requireFile {
|
||||
download = {name, sha256}: fetchurl {
|
||||
inherit name sha256;
|
||||
url = "${homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux";
|
||||
# e.g. "20.1.1.720" -> "20.1std.1/720"
|
||||
url = "https://downloads.intel.com/akdlm/software/acdsinst/${lib.versions.majorMinor version}std.${lib.versions.patch version}/${lib.elemAt (lib.splitVersion version) 3}/ib_installers/${name}";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
pname = "quartus-prime-lite-unwrapped";
|
||||
|
||||
src = map require ([{
|
||||
src = map download ([{
|
||||
name = "QuartusLiteSetup-${version}-linux.run";
|
||||
sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k";
|
||||
} {
|
||||
|
|
@ -87,12 +87,11 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit homepage;
|
||||
homepage = "https://fpgasoftware.intel.com";
|
||||
description = "FPGA design and simulation software";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ kwohlfahrt ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10243,6 +10243,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tpope/vim-liquid/";
|
||||
};
|
||||
|
||||
vim-llvm = buildVimPluginFrom2Nix {
|
||||
pname = "vim-llvm";
|
||||
version = "2022-05-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "vim-llvm";
|
||||
rev = "ac3fbdd79b0f5bd68049d38a4901e43a93d4cfd0";
|
||||
sha256 = "1nzmyd2fh2rfxqi87pgdx40xxq7b16izgi57fib8fpywcw26s2ga";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/vim-llvm/";
|
||||
};
|
||||
|
||||
vim-localvimrc = buildVimPluginFrom2Nix {
|
||||
pname = "vim-localvimrc";
|
||||
version = "2022-05-11";
|
||||
|
|
|
|||
|
|
@ -860,6 +860,7 @@ https://github.com/lfe-support/vim-lfe/,,
|
|||
https://github.com/josa42/vim-lightline-coc/,,
|
||||
https://github.com/tommcdo/vim-lion/,,
|
||||
https://github.com/tpope/vim-liquid/,,
|
||||
https://github.com/rhysd/vim-llvm/,HEAD,
|
||||
https://github.com/embear/vim-localvimrc/,,
|
||||
https://github.com/andreshazard/vim-logreview/,,
|
||||
https://github.com/mlr-msft/vim-loves-dafny/,,
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, nodePackages, bash
|
||||
|
||||
# Attributes inherit from specific versions
|
||||
, version, src, meta, sourceRoot
|
||||
, version, src, meta, sourceRoot, commandLineArgs
|
||||
, executableName, longName, shortName, pname, updateScript
|
||||
# sourceExecutableName is the name of the binary in the source archive, over
|
||||
# which we have no control
|
||||
|
|
@ -110,6 +110,7 @@ let
|
|||
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
|
||||
--prefix PATH : ${glib.bin}/bin
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
)
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ stdenv, lib, callPackage, fetchurl, isInsiders ? false }:
|
||||
{ stdenv, lib, callPackage, fetchurl
|
||||
, isInsiders ? false
|
||||
, commandLineArgs ? ""
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -31,6 +34,7 @@ in
|
|||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
shortName = "Code" + lib.optionalString isInsiders " - Insiders";
|
||||
inherit commandLineArgs;
|
||||
|
||||
src = fetchurl {
|
||||
name = "VSCode_${version}_${plat}.${archive_fmt}";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, callPackage, fetchurl, nixosTests }:
|
||||
{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "" }:
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -15,21 +15,21 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1b2603fcb28479dajwg9q2ck083fym6khjv02ax3l0p6jazjyc70";
|
||||
x86_64-darwin = "0xggqfmsm7zzbn43mjmmk8wg75nr2nvkiaddcgwq3a2xn1x90jb5";
|
||||
aarch64-linux = "1wfrfap840a9azik1dbzp7kib04amc3y2m6s45v3qa3c0kw1162a";
|
||||
aarch64-darwin = "1nfv5ysri6p2sfp47786alv7b8rrn7mxsaisdlz970r8d79mrp5n";
|
||||
armv7l-linux = "185ayjvahyqxqab7dkpygxd68adxai25sw4fcw00x5c4l5lgmvhl";
|
||||
x86_64-linux = "03lbfl3azrjhxzkadrz632dpwnv6hyyls10mc8wzspwraz77v1m5";
|
||||
x86_64-darwin = "1fd66fbs414lja7ca38sdgx02nw9w1qfrlxhcb52ijls5xbmbgm4";
|
||||
aarch64-linux = "0hwzx0lvrxrzrpggpsymjzy53dq4msg0j3vrxq82308ydc5ssnzd";
|
||||
aarch64-darwin = "0dqhi6br29bq8a97wgfxgz4d236cg0ydgaqv8j5nqjgvjwp13p9l";
|
||||
armv7l-linux = "07qq0ic9nckl9fkk5rl9dy4gksw3l248jsy7v8ws8f3mq4l8gi49";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
inherit sourceRoot;
|
||||
inherit sourceRoot commandLineArgs;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.70.2.22230";
|
||||
version = "1.71.0.22245";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
38
pkgs/applications/graphics/entwine/default.nix
Normal file
38
pkgs/applications/graphics/entwine/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pdal
|
||||
, curl
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "entwine";
|
||||
version = "unstable-2022-08-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "connormanning";
|
||||
repo = "entwine";
|
||||
rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae";
|
||||
sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
pdal
|
||||
curl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Point cloud organization for massive datasets";
|
||||
homepage = "https://entwine.io/";
|
||||
license = licenses.lgpl2Only;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.102.2";
|
||||
version = "0.102.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mAkdx42JaYSSpNLssBNkX45V3VniVKVbPt2SQ/QaXmY=";
|
||||
sha256 = "sha256-qk5iv/oJ2Q8vR5jFl0gR7gA0H/3sHJOOlr8rwg7HjUY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oWOu8vmxe0a/nIgkjpx7XrB49rjcuqnnpuOMtI9bLfY=";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,10 @@
|
|||
, python3
|
||||
, runtimeShell
|
||||
, wrapGAppsHook
|
||||
, fehSupport ? false, feh
|
||||
, imagemagickSupport ? true, imagemagick
|
||||
, fehSupport ? false
|
||||
, feh
|
||||
, imagemagickSupport ? true
|
||||
, imagemagick
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -29,17 +31,19 @@ python3.pkgs.buildPythonApplication rec {
|
|||
nativeBuildInputs = [
|
||||
intltool
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gexiv2
|
||||
gobject-introspection
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
libnotify
|
||||
librsvg
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
buildInputs = [
|
||||
gexiv2
|
||||
gobject-introspection
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
libnotify
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
configobj
|
||||
dbus-python
|
||||
|
|
@ -51,14 +55,17 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pygobject3
|
||||
requests
|
||||
setuptools
|
||||
])
|
||||
]
|
||||
++ lib.optional fehSupport feh
|
||||
++ lib.optional imagemagickSupport imagemagick;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
|
||||
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "5.4.2753.37-1";
|
||||
version = "5.4.2753.47";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
|
||||
sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw";
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
|
||||
sha256 = "1p155mcrmfz395yajxa6fqjk1paac216kim26i3r56wah5329gmr";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromium-codecs-ffmpeg-extra";
|
||||
version = "104.0.5112.79";
|
||||
version = "104.0.5112.101";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38=";
|
||||
url = "https://launchpadlibrarian.net/618703258/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-V+zqLhI8L/8ssxSR6S2v4gUAtoK3fB8Fi9bajBFEauU=";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ version() {
|
|||
}
|
||||
|
||||
vivaldi_version_old=$(version vivaldi)
|
||||
vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p')
|
||||
vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
|
||||
|
||||
if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
|
||||
echo "vivaldi is already up-to-date"
|
||||
|
|
@ -20,7 +20,7 @@ if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
|
|||
fi
|
||||
|
||||
# Download vivaldi and save hash and file path.
|
||||
url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb"
|
||||
url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb"
|
||||
mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
|
||||
hash=${prefetch[0]}
|
||||
path=${prefetch[1]}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LayPASPMSnRZkDs9LylWR62eS+b/5TB9PidDQCs+MXU=";
|
||||
sha256 = "sha256-mgyzdu7xzN6rDSHBcC8Uz8m5+5VEfA0RPe8cPZYfEgM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
|
||||
, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl
|
||||
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
|
||||
, zstd, enableZstd ? true, enableMixmaster ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -18,7 +19,8 @@ stdenv.mkDerivation rec {
|
|||
cyrus_sasl gss gpgme libkrb5 libidn ncurses
|
||||
notmuch openssl perl lmdb
|
||||
mailcap sqlite
|
||||
];
|
||||
]
|
||||
++ lib.optional enableZstd zstd;
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m
|
||||
|
|
@ -62,7 +64,9 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/neomutt/neomutt/pull/2367
|
||||
"--disable-include-path-in-cflags"
|
||||
"--zlib"
|
||||
];
|
||||
]
|
||||
++ lib.optional enableZstd "--zstd"
|
||||
++ lib.optional enableMixmaster "--mixmaster";
|
||||
|
||||
# Fix missing libidn in mutt;
|
||||
# this fix is ugly since it links all binaries in mutt against libidn
|
||||
|
|
@ -95,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A small but very powerful text-based mail client";
|
||||
homepage = "http://www.neomutt.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ];
|
||||
maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@
|
|||
, xclip
|
||||
, xdotool
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, Foundation
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -39,7 +43,12 @@ rustPlatform.buildRustPackage rec {
|
|||
libnotify
|
||||
xclip
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
xdotool
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
Cocoa
|
||||
Foundation
|
||||
];
|
||||
|
||||
# Some tests require networking
|
||||
|
|
@ -55,7 +64,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://espanso.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kimat ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
|
||||
longDescription = ''
|
||||
Espanso detects when you type a keyword and replaces it while you're typing.
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "2.5.10";
|
||||
version = "2.5.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-uKHLKZtvaaklJMYqAHtu4ULwcfbut1L2h6bjZkqI91o=";
|
||||
sha256 = "sha256-n9lZfg+0JRRaO3H+sDXRIrELTs6NE5G78Ni0RKWzYuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eggnog-mapper";
|
||||
version = "2.1.7";
|
||||
version = "2.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eggnogdb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
|
|||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gtk4
|
||||
libadwaita
|
||||
libpulseaudio
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder
|
||||
, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
|
||||
, afdko, appdirs, attrs, booleanoperations, brotlipy, click
|
||||
, defcon, fontmath, fontparts, fontpens, fonttools, lxml
|
||||
, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
|
||||
, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
|
||||
|
|
@ -28,7 +28,6 @@ buildPythonPackage rec {
|
|||
afdko
|
||||
appdirs
|
||||
attrs
|
||||
black
|
||||
booleanoperations
|
||||
brotlipy
|
||||
click
|
||||
|
|
@ -70,9 +69,10 @@ buildPythonPackage rec {
|
|||
cp -r third_party $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Noto fonts support tools and scripts plus web site generation";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/googlefonts/nototools";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2022-03-22";
|
||||
version = "2022-09-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891";
|
||||
sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc=";
|
||||
rev = version;
|
||||
sha256 = "PaqEkl0E3pUEJDEv1WwUqcjzAcQniN8rUGhVgbOxuhA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
)
|
||||
''}
|
||||
|
||||
jdupes -L -r $out/share
|
||||
jdupes --quiet --link-soft --recurse $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "greybird";
|
||||
version = "3.23.1";
|
||||
version = "3.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimmerproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "hfi2TBRrZTSN43tYKMPvb/dWwwUE7RakKTMBziHnCWA=";
|
||||
sha256 = "h4sPjKpTufaunVP0d4Z5x/K+vRW1FpuLrMJjydx/a6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-panel";
|
||||
version = "4.16.4";
|
||||
version = "4.16.5";
|
||||
|
||||
sha256 = "sha256-DlGcec5oUPDMzVztADw9fROmBIIO7isZ8gZEMGeDVcA=";
|
||||
sha256 = "sha256-RK4sEir8CvB1aa2dZWJftA+2n4YPUEkhF9afOfOTA0Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfdesktop";
|
||||
version = "4.16.0";
|
||||
version = "4.16.1";
|
||||
|
||||
sha256 = "sha256-w/JNjyAlxZqfVpm8EBt+ieHhUziOtfd//XHzIjJjy/4=";
|
||||
sha256 = "sha256-JecuD0DJASHaxL6gwmL3hcmAEA7sVIyaM0ushrdq4/Y=";
|
||||
|
||||
buildInputs = [
|
||||
exo
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }:
|
||||
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elf2uf2-rs";
|
||||
version = "unstable-2021-12-12";
|
||||
version = "1.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JoNil";
|
||||
repo = pname;
|
||||
rev = "91ae98873ed01971ab1543b98266a5ad2ec09210";
|
||||
sha256 = "sha256-DGrT+YdDLdTYy5SWcQ+DNbpifGjrF8UTXyEeE/ug564=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2ZilZIYXCNrKJlkHBsz/2/pMtF+UDfjDlt53ylcwgus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -19,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
|||
udev
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-5ui1+987xICP2wUSHy4YzKskn52W51Pi4DbEh+GbSPE=";
|
||||
cargoSha256 = "sha256-+3Rqlzkrw9XfM3PelGNbnRGaWQLbzVJ7iJgvGgVt5FE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert ELF files to UF2 for USB Flashing Bootloaders";
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igraph";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc=";
|
||||
hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opendht";
|
||||
version = "2.4.9";
|
||||
version = "2.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "opendht";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S/eJrSueJOv3+cUyzcCE3l287l0ihvzOZHB6ZCHtHpQ=";
|
||||
sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -131,9 +131,10 @@ in stdenvNoCC.mkDerivation ({
|
|||
install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt
|
||||
|
||||
# Dynamic libraries
|
||||
install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so*
|
||||
install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so*
|
||||
install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so*
|
||||
mkdir -p $out/lib
|
||||
cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
|
||||
cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib
|
||||
cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib
|
||||
|
||||
# Headers
|
||||
cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI=";
|
||||
sha256 = "sha256-yteZI35DcLUPd+cW543TVlp7P9gvzVpBp2qhUS1RB10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "black";
|
||||
version = "22.6.0";
|
||||
version = "22.8.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bG054ortN5rsQNocZUNMd9deZbtZoeHCg95UX7Tnxsk=";
|
||||
hash = "sha256-eS9+tUC6mhfoZWU4cB0+sa/LE047RbcfILJcd6jbfm4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.5.22";
|
||||
version = "1.5.23";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-pJGyfo+7Sz4IxurkAo+51veN+o6gHAqBor5SLXERNdo=";
|
||||
sha256 = "sha256-Zf2+GOyLQelFR0gugSzHWJV9WSKD/8IEkc4li4N+jnI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "geoalchemy2";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "GeoAlchemy2";
|
||||
inherit version;
|
||||
hash = "sha256-PHs6bS/I6BpJYEPHgB9yuM35Ix33fN5n/KxqKuQzwEk=";
|
||||
hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, black
|
||||
, graphql-core
|
||||
, promise
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-server-core";
|
||||
version = "2.0.0";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
|
|
@ -19,8 +20,6 @@ buildPythonPackage rec {
|
|||
sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr";
|
||||
};
|
||||
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/graphql-python/graphql-server-core/commit/865ee9d5602f352c958f6f7e15adbe9abe216784.patch";
|
||||
|
|
@ -33,18 +32,17 @@ buildPythonPackage rec {
|
|||
promise
|
||||
];
|
||||
|
||||
checkPhase = "black --check graphql_server tests";
|
||||
# fail with: cannot import name 'format_error' from 'graphql'
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
black
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Core package for using GraphQL in a custom server easily";
|
||||
homepage = "https://github.com/graphql-python/graphql-server-core";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
kamadorueda
|
||||
];
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "markdownify";
|
||||
version = "0.11.4";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-crOkiv/M8v7rJd/Tvsq67PU76vTgi+aNzthEcniDKBM=";
|
||||
sha256 = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ beautifulsoup4 six ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "napari-npe2";
|
||||
version = "0.5.1";
|
||||
version = "0.6.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "napari";
|
||||
repo = "npe2";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+tTJrtJFUGwOhFzWgA5cFVp458DGuPVkErN/5O2LHk4=";
|
||||
hash = "sha256-1wGMd4box+ulHcEL4zoArJ3ez95s7GcbXa9bWfLbSCw=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyphen";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b";
|
||||
sha256 = "sha256-Boc86//WWo/KfCDA49wDJlXH7o3g9VIgXK07V0JlwpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "python-glanceclient";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pfQnIvrZFw16eRF2kPxmthWpY7qWkBu9SUavQnXO8zQ=";
|
||||
hash = "sha256-fknYBKZzCA6sThugNQT5+p+/hqv8vW6M2LMMpbT+7rY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "python-heatclient";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs=";
|
||||
hash = "sha256-/SW8hRj588N++4Cuz7elbU0qO++4Jhm1va069JnNmZo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-keystoneclient";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-D1DaM78gtVrPxZ1PlGD6Lvwb4V/QXsPyNnTQPror6j8=";
|
||||
hash = "sha256-qLv2cfVsJKpaN6IluY8plLggY9c+NIZlfrUAozpAbSk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "python-manilaclient";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TEGzUNgYTkb2VrvW2E3lurD6N1XcIhH2tjmPlsJ/5MI=";
|
||||
hash = "sha256-yoyQyhyqRQZ8yyn3sv94JqkVZQMybwxLGFForZowr3o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "rdkit";
|
||||
version = "2022.03.4";
|
||||
version = "2022.03.5";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -50,7 +50,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Release_${versionTag}";
|
||||
sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2";
|
||||
sha256 = "19idgilabh04cbr1qj6zgrgsfjm248mmfz6fsr0smrd68d0xnml9";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sumo";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,16 +27,9 @@ buildPythonPackage rec {
|
|||
owner = "SMTG-UCL";
|
||||
repo = "sumo";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-XEs4lLbVwN00UDnDC0kUNlut9RFXPfcyevBA1f1UqSU=";
|
||||
sha256 = "sha256-kgTTYCTq8jTNOmc92TRskbsOcnk6wTZgf0UfoctJ4M4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Loosen castepxbin dependency version pinning
|
||||
# https://github.com/SMTG-UCL/sumo/issues/173
|
||||
substituteInPlace setup.py \
|
||||
--replace "castepxbin==0.1.0" "castepxbin>=0.1.0"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pmd";
|
||||
version = "6.48.0";
|
||||
version = "6.49.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip";
|
||||
hash = "sha256-DXoiV5AunDGagfq8BWHFcgGBv9OdGij5DDuxOKJYnE4=";
|
||||
hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }:
|
||||
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-xCw2Wuc2ndTcLrwR7uv5FFnwImxTcG/STeTQBiaKuIw=";
|
||||
sha256 = "sha256-Zlk6wUQBftst8Tx+dAT67/WBID1BHD4aSAvRcGO9ErE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jql";
|
||||
version = "4.0.7";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5QVktJpGpHzwRUN8oIFoLydnA+ELhUprcQASeGzgLG8=";
|
||||
sha256 = "sha256-UfVhkwb89OU7yENcCXM7JfYNsO//des0gsEnvnJGMjA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qmLmkWFP8T886uR8kJKCqB0G5XIfk+r+kubamKryktc=";
|
||||
cargoSha256 = "sha256-kkWslFEdjsWGIrRWylGyTDZnNXcfCVrWT+dVnyvTRqk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON Query Language CLI tool built with Rust";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "memray";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8uFAWcf9ookmFAnCdA97+oade+fECt58DuDSk1uTMQI=";
|
||||
hash = "sha256-zHdgVpe92OiwLC4jHVtT3oC+WnB30e5U3ZOHnmuo+Ao=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6laSFo8aBmZpeN5V3utZQHIWuoQcdy1hd1yU8LxpEJQ=";
|
||||
sha256 = "sha256-HV/0ORI3siAnVyLcNDzu4BwK/sFO841ptQoxK6c+1Xs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-bbyeI/cr5aBejiEcYyyyJO8UX5QoIlT9MFgnpDr/z1M=";
|
||||
cargoSha256 = "sha256-jhn795bTcqOG60yzydWJ5Y9eR2UTVUBteuMw03M7wM0=";
|
||||
|
||||
cargoBuildFlags = [ "--package" "lang-srv" ];
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A language server for Standard ML";
|
||||
homepage = "https://github.com/azdavis/millet";
|
||||
changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md";
|
||||
license = licenses.mit;
|
||||
license = [ licenses.mit /* or */ licenses.asl20 ];
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,8 @@ buildPythonApplication rec {
|
|||
substituteInPlace pyproject.toml \
|
||||
--replace 'requirements-detector = "^0.7"' 'requirements-detector = "*"' \
|
||||
--replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \
|
||||
--replace 'mccabe = "^0.6.0"' 'mccabe = "*"'
|
||||
--replace 'mccabe = "^0.6.0"' 'mccabe = "*"' \
|
||||
--replace 'pycodestyle = ">=2.6.0,<2.9.0"' 'pycodestyle = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, openssl
|
||||
, stdenv
|
||||
, Security
|
||||
, withLsp ? true
|
||||
|
|
@ -9,18 +8,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taplo";
|
||||
version = "0.6.9";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "taplo-cli";
|
||||
sha256 = "sha256-gf58V/KIsbM+mCT3SvjZ772cuikS2L81eRb7uy8OPys=";
|
||||
sha256 = "sha256-lJdDr6pXOxndv3mBAbqkDnVXOFklSMcnzTed0U1Nm9U=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-f+jefc3qw4rljmikvrmvZfCCadBKicBs7SMh/mJ4WSs=";
|
||||
|
||||
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
|
||||
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
|
||||
cargoSha256 = "sha256-1wN43HOyrSFTs9nKxUi3kcnGvtONW8SgKwIEK1ckCgk=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "legendary-gl"; # Name in pypi
|
||||
version = "0.20.27";
|
||||
version = "0.20.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derrod";
|
||||
repo = "legendary";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-h9WmeVONX19/pUBfE1T/OSMI/HkTKJiTfyyEJV/noB8=";
|
||||
sha256 = "sha256-33EsxwwvgkN9U8kpYywV0wsRnLzjGv87zYJ9jSVi91c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "groonga";
|
||||
version = "12.0.6";
|
||||
version = "12.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-DVum2fUa1BiSyL0d8hzRo3AzEVSRX2EBrJ4DBBIxftE=";
|
||||
sha256 = "sha256-Eaei4Zi0Rg9zu7DInLAcaRo8Fyu2mqBblcYNRaS46c8=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-ww5yy4W6voP5Wo1wVuCXUtmyA9CoVk1HU5UzPUoHf/E=";
|
||||
sha256 = "sha256-TzNjz1usnQ0CMu47i9pnCRR6N/d3ig2E0wVH3E8xJp0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ogq/4gBX4+5GZomk00Yu8J3JSbkhEFOWE6Ik+HqtkWk=";
|
||||
vendorSha256 = "sha256-+jqMokDuvw5LTqBxJ/2VyoT3wkdBHewTrYsK/5Uv6js=";
|
||||
|
||||
subPackages = [ "cmd/traefik" ];
|
||||
|
||||
|
|
|
|||
36
pkgs/tools/X11/smart-wallpaper/default.nix
Normal file
36
pkgs/tools/X11/smart-wallpaper/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, xdpyinfo
|
||||
, killall
|
||||
, xwinwrap
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "smart-wallpaper";
|
||||
version = "unstable-2022-09-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Baitinq";
|
||||
repo = "smart-wallpaper";
|
||||
rev = "d175695d3485fb14144c1908eb3569b20caa6ba5";
|
||||
sha256 = "sha256-cFgvuntdKPzdQJ7xE2DIT+aNAazocIhM6BBbcQOlryU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin smart-wallpaper
|
||||
wrapProgram $out/bin/smart-wallpaper \
|
||||
--prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Baitinq/smart-wallpaper";
|
||||
description = "A simple bash script that automatically changes your wallpaper depending on if its daytime or nighttime";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ baitinq ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
37
pkgs/tools/admin/auth0-cli/default.nix
Normal file
37
pkgs/tools/admin/auth0-cli/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "auth0-cli";
|
||||
version = "0.11.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1/T2hpSNamorWFuaSBoLsGpe9I06HGew9S3yJsDLmLQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d9ZwK/LAZGgeagGsg3bGYnVykfQcCLUex0pe/PUCtkA=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/auth0/auth0-cli/internal/buildinfo.Version=v${version}"
|
||||
"-X github.com/auth0/auth0-cli/internal/buildinfo.Revision=0000000"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Feed in all tests for testing
|
||||
# This is because subPackages above limits what is built to just what we
|
||||
# want but also limits the tests
|
||||
unset subPackages
|
||||
'';
|
||||
|
||||
subPackages = [ "cmd/auth0" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Supercharge your developer workflow";
|
||||
homepage = "https://auth0.github.io/auth0-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.59.0";
|
||||
version = "1.59.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QLIxoCV+QL+uXmT0IdeztzefiOpW9xNVf0XuZPVpp/Y=";
|
||||
sha256 = "sha256-dkiUO68NtWU/GOOuJvihlOfnEjF+5sNSkOAttCrQEHI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3004.2";
|
||||
version = "3005";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L6ZE9iANTja1WEbLNytuZ7bKD77AaX8djXPncbZl7XA=";
|
||||
hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -30,10 +30,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
patches = [
|
||||
./fix-libcrypto-loading.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/saltstack/salt/commit/6ec8b90e402ff3fa8f27c7da70ece898592416bc.patch";
|
||||
hash = "sha256-OQCJeG12cp2EZ0BErp6yqsqhv023923rVFDHAFUfF6c=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -46,14 +42,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# `extraInputs` like on any other platform
|
||||
echo -n > "requirements/darwin.txt"
|
||||
|
||||
# Bug in 3004.1: https://github.com/saltstack/salt/pull/61839
|
||||
substituteInPlace "salt/utils/entrypoints.py" \
|
||||
--replace 'if sys.version_info >= (3, 10):' 'if False:'
|
||||
|
||||
# Bug in 3004.1: https://github.com/saltstack/salt/issues/61865
|
||||
substituteInPlace "salt/transport/tcp.py" \
|
||||
--replace 'payload = self.pack_publish(package)' 'package = self.pack_publish(package)'
|
||||
|
||||
# 3004.1: requirement of pyzmq was restricted to <22.0.0; looks like that req was incorrect
|
||||
# https://github.com/saltstack/salt/commit/070597e525bb7d56ffadede1aede325dfb1b73a4
|
||||
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259279
|
||||
|
|
|
|||
|
|
@ -26,6 +26,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'rich = "^12.5.1"' 'rich = "*"' \
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ];
|
||||
|
||||
pythonImportsCheck = [ "pls" ];
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.8.10";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Re/tcS9aZhMtMuUIVrDLjTM8stm7LE6VF5H4EEmcqq4=";
|
||||
sha256 = "sha256-bVfe2Imklv1Q/5HoGJVlIO+CotrFQ1yG0L6p+MBE9vI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KtRQwrCBsOX7Jk9mKdDNOD7zfssADfBXCO1RPZbp5Aw=";
|
||||
vendorSha256 = "sha256-HGWKkvJKIEwTLhEK8i+4lraoFEDSljmwxMOhFHhobms=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
@ -84,6 +84,7 @@ buildGoModule rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://netbird.io";
|
||||
changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}";
|
||||
description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ misuzu ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-08-10";
|
||||
version = "2022-09-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-t+y28QDeu0tIUidPjSqSPcmOzfaH6SnreuiEBDtKzP0=";
|
||||
hash = "sha256-gZdoaY3wm45DhM2jlKneOzMupmKsPbeOzHIBhmgDeV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "difftastic";
|
||||
version = "0.34.0";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilfred";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HooO8T1FLIuERlI2dWGWMtPbtjVB9MPuA1IB+9CYytw=";
|
||||
sha256 = "sha256-gf8Q/x9JXQcYEPa7fHoxwEvLFjpXVraY5aEcA89xJsc=";
|
||||
};
|
||||
|
||||
depsExtraArgs = {
|
||||
|
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
popd
|
||||
'';
|
||||
};
|
||||
cargoSha256 = "sha256-5HwipbtQ/zW61fgam1BGnEJYVzA98TH7y3eZ8bES2Ck=";
|
||||
cargoSha256 = "sha256-CUbiEqFNEQCe9CKhpa8m8+/XVOOTv1ltmx0sXssx+e8=";
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = difftastic; };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }:
|
||||
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ltex-ls";
|
||||
version = "15.2.0";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mkdir -p $out
|
||||
cp -rfv bin/ lib/ $out
|
||||
rm -fv $out/bin/*.bat
|
||||
rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat
|
||||
for file in $out/bin/{ltex-ls,ltex-cli}; do
|
||||
wrapProgram $file --set JAVA_HOME "${jre_headless}"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -274,6 +274,8 @@ with pkgs;
|
|||
|
||||
authz0 = callPackage ../tools/security/authz0 { };
|
||||
|
||||
auth0-cli = callPackage ../tools/admin/auth0-cli { };
|
||||
|
||||
atomic-operator = callPackage ../tools/security/atomic-operator { };
|
||||
|
||||
avro-tools = callPackage ../development/tools/avro-tools { };
|
||||
|
|
@ -3748,6 +3750,8 @@ with pkgs;
|
|||
|
||||
ent = callPackage ../tools/misc/ent { };
|
||||
|
||||
entwine = callPackage ../applications/graphics/entwine { };
|
||||
|
||||
envconsul = callPackage ../tools/system/envconsul { };
|
||||
|
||||
envsubst = callPackage ../tools/misc/envsubst { };
|
||||
|
|
@ -3758,7 +3762,9 @@ with pkgs;
|
|||
|
||||
eschalot = callPackage ../tools/security/eschalot { };
|
||||
|
||||
espanso = callPackage ../applications/office/espanso { };
|
||||
espanso = callPackage ../applications/office/espanso {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
|
||||
};
|
||||
|
||||
esphome = callPackage ../tools/misc/esphome { };
|
||||
|
||||
|
|
@ -9254,6 +9260,8 @@ with pkgs;
|
|||
|
||||
nitrogen = callPackage ../tools/X11/nitrogen {};
|
||||
|
||||
smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { };
|
||||
|
||||
nms = callPackage ../tools/misc/nms { };
|
||||
|
||||
nomachine-client = callPackage ../tools/admin/nomachine-client { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue