Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
30f0a9c291
|
|
@ -452,6 +452,8 @@ The list of source files or directories to be unpacked or copied. One of these m
|
|||
|
||||
After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. Set `sourceRoot = ".";` if you use `srcs` and control the unpack phase yourself.
|
||||
|
||||
By default the `sourceRoot` is set to `"source"`. If you want to point to a sub-directory inside your project, you therefore need to set `sourceRoot = "source/my-sub-directory"`.
|
||||
|
||||
##### `setSourceRoot` {#var-stdenv-setSourceRoot}
|
||||
|
||||
Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`.
|
||||
|
|
|
|||
|
|
@ -8975,7 +8975,7 @@
|
|||
name = "Millian Poquet";
|
||||
};
|
||||
mpscholten = {
|
||||
email = "marc@mpscholten.de";
|
||||
email = "marc@digitallyinduced.com";
|
||||
github = "mpscholten";
|
||||
githubId = 2072185;
|
||||
name = "Marc Scholten";
|
||||
|
|
@ -15146,4 +15146,14 @@
|
|||
fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4";
|
||||
}];
|
||||
};
|
||||
cafkafk = {
|
||||
email = "cafkafk@cafkafk.com";
|
||||
matrix = "@cafkafk:matrix.cafkafk.com";
|
||||
name = "Christina Sørensen";
|
||||
github = "cafkafk";
|
||||
githubId = 89321978;
|
||||
keys = [{
|
||||
fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8";
|
||||
}];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,6 +206,13 @@
|
|||
<link xlink:href="options.html#opt-services.kanata.enable">services.kanata</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://languagetool.org/">languagetool</link>,
|
||||
a multilingual grammar, style, and spell checker. Available as
|
||||
<link xlink:href="options.html#opt-services.languagetool.enable">services.languagetool</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://www.getoutline.com/">Outline</link>,
|
||||
|
|
@ -384,6 +391,14 @@
|
|||
<literal>cosigned</literal> binary anymore.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Emacs now uses the Lucid toolkit by default instead of GTK
|
||||
because of stability and compatibility issues. Users who still
|
||||
wish to remain using GTK can do so by using
|
||||
<literal>emacs-gtk</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
riak package removed along with
|
||||
|
|
|
|||
|
|
@ -76,6 +76,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization.
|
||||
Available as [services.kanata](options.html#opt-services.kanata.enable).
|
||||
|
||||
- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker.
|
||||
Available as [services.languagetool](options.html#opt-services.languagetool.enable).
|
||||
|
||||
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
|
||||
|
||||
- [netbird](https://netbird.io), a zero configuration VPN.
|
||||
|
|
@ -134,6 +137,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- `pkgs.cosign` does not provide the `cosigned` binary anymore.
|
||||
|
||||
- Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues.
|
||||
Users who still wish to remain using GTK can do so by using `emacs-gtk`.
|
||||
|
||||
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
|
||||
|
||||
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
||||
|
|
|
|||
|
|
@ -426,7 +426,9 @@ class Machine:
|
|||
self.monitor.send(message)
|
||||
return self.wait_for_monitor_prompt()
|
||||
|
||||
def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
|
||||
def wait_for_unit(
|
||||
self, unit: str, user: Optional[str] = None, timeout: int = 900
|
||||
) -> None:
|
||||
"""Wait for a systemd unit to get into "active" state.
|
||||
Throws exceptions on "failed" and "inactive" states as well as
|
||||
after timing out.
|
||||
|
|
@ -456,7 +458,7 @@ class Machine:
|
|||
unit, f" with user {user}" if user is not None else ""
|
||||
)
|
||||
):
|
||||
retry(check_active)
|
||||
retry(check_active, timeout)
|
||||
|
||||
def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
|
||||
status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)
|
||||
|
|
|
|||
|
|
@ -233,11 +233,8 @@ in
|
|||
}
|
||||
|
||||
{
|
||||
assertion = cfg.powerManagement.enable -> (
|
||||
builtins.pathExists (cfg.package.out + "/bin/nvidia-sleep.sh") &&
|
||||
builtins.pathExists (cfg.package.out + "/lib/systemd/system-sleep/nvidia")
|
||||
);
|
||||
message = "Required files for driver based power management don't exist.";
|
||||
assertion = cfg.powerManagement.enable -> versionAtLeast nvidia_x11.version "430.09";
|
||||
message = "Required files for driver based power management only exist on versions >= 430.09.";
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -589,6 +589,7 @@
|
|||
./services/misc/jackett.nix
|
||||
./services/misc/jellyfin.nix
|
||||
./services/misc/klipper.nix
|
||||
./services/misc/languagetool.nix
|
||||
./services/misc/logkeys.nix
|
||||
./services/misc/leaps.nix
|
||||
./services/misc/lidarr.nix
|
||||
|
|
|
|||
78
nixos/modules/services/misc/languagetool.nix
Normal file
78
nixos/modules/services/misc/languagetool.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ config, lib, options, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.languagetool;
|
||||
settingsFormat = pkgs.formats.javaProperties {};
|
||||
in {
|
||||
options.services.languagetool = {
|
||||
enable = mkEnableOption (mdDoc "the LanguageTool server");
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8081;
|
||||
example = 8081;
|
||||
description = mdDoc ''
|
||||
Port on which LanguageTool listens.
|
||||
'';
|
||||
};
|
||||
|
||||
public = mkEnableOption (mdDoc "access from anywhere (rather than just localhost)");
|
||||
|
||||
allowOrigin = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "https://my-website.org";
|
||||
description = mdDoc ''
|
||||
Set the Access-Control-Allow-Origin header in the HTTP response,
|
||||
used for direct (non-proxy) JavaScript-based access from browsers.
|
||||
`null` to allow access from all sites.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options.cacheSize = mkOption {
|
||||
type = types.ints.unsigned;
|
||||
default = 1000;
|
||||
apply = toString;
|
||||
description = mdDoc "Number of sentences cached.";
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
Configuration file options for LanguageTool, see
|
||||
'languagetool-http-server --help'
|
||||
for supported settings.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.languagetool = {
|
||||
description = "LanguageTool HTTP server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
User = "languagetool";
|
||||
Group = "languagetool";
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
RestrictNamespaces = [ "" ];
|
||||
SystemCallFilter = [ "@system-service" "~ @privileged" ];
|
||||
ProtectHome = "yes";
|
||||
ExecStart = ''
|
||||
${pkgs.languagetool}/bin/languagetool-http-server \
|
||||
--port ${toString cfg.port} \
|
||||
${optionalString cfg.public "--public"} \
|
||||
${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \
|
||||
"--configuration" ${settingsFormat.generate "languagetool.conf" cfg.settings}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -284,5 +284,5 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
meta.maintainers = [ majewsky ] ++ teams.c3d2.members;
|
||||
meta.maintainers = [ maintainers.majewsky ] ++ teams.c3d2.members;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,6 +152,7 @@ in
|
|||
WorkingDirectory = cfg.dataDir;
|
||||
User = user;
|
||||
Group = group;
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -276,6 +276,7 @@ in {
|
|||
krb5 = discoverTests (import ./krb5 {});
|
||||
ksm = handleTest ./ksm.nix {};
|
||||
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
|
||||
languagetool = handleTest ./languagetool.nix {};
|
||||
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
|
||||
leaps = handleTest ./leaps.nix {};
|
||||
lemmy = handleTest ./lemmy.nix {};
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in
|
|||
|
||||
hardware.opengl.enable = true;
|
||||
programs.xwayland.enable = true;
|
||||
services.udisks2.enable = true;
|
||||
security.polkit.enable = true;
|
||||
environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ];
|
||||
|
||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch:
|
||||
|
|
|
|||
19
nixos/tests/languagetool.nix
Normal file
19
nixos/tests/languagetool.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
let port = 8082;
|
||||
in {
|
||||
name = "languagetool";
|
||||
meta = with lib.maintainers; { maintainers = [ fbeffa ]; };
|
||||
|
||||
nodes.machine = { ... }:
|
||||
{
|
||||
services.languagetool.enable = true;
|
||||
services.languagetool.port = port;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("languagetool.service")
|
||||
machine.wait_for_open_port(${toString port})
|
||||
machine.wait_until_succeeds('curl -d "language=en-US" -d "text=a simple test" http://localhost:${toString port}/v2/check')
|
||||
'';
|
||||
})
|
||||
|
|
@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("phpfpm-moodle.service")
|
||||
machine.wait_for_unit("phpfpm-moodle.service", timeout=1800)
|
||||
machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "zigbee2mqtt";
|
||||
nodes.machine = { pkgs, ... }:
|
||||
{
|
||||
services.zigbee2mqtt = {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
, nlohmann_json
|
||||
, pipewire
|
||||
, pkg-config
|
||||
, python3
|
||||
, rnnoise
|
||||
, rubberband
|
||||
, speexdsp
|
||||
|
|
@ -35,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyeffects";
|
||||
version = "6.2.8";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iADECt0m74Irm3JEQgZVLCr6Z2SKATAh9SvPwzd7HCo=";
|
||||
sha256 = "sha256-OLxuE1jiALuKlC9U9esVlhaMBEaoZyNae8OO8upE4ZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
|
|
@ -76,11 +74,6 @@ stdenv.mkDerivation rec {
|
|||
zita-convolver
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
preFixup =
|
||||
let
|
||||
lv2Plugins = [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, boost
|
||||
, curl
|
||||
, eigen
|
||||
, faust
|
||||
, fftw
|
||||
, gettext
|
||||
, glib
|
||||
|
|
@ -42,22 +43,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guitarix";
|
||||
version = "0.42.1";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
|
||||
sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr";
|
||||
sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "guitarix-gcc11.patch";
|
||||
url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch";
|
||||
stripLen = 1;
|
||||
sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
hicolor-icon-theme
|
||||
|
|
@ -74,6 +66,7 @@ stdenv.mkDerivation rec {
|
|||
boost
|
||||
curl
|
||||
eigen
|
||||
faust
|
||||
fftw
|
||||
glib
|
||||
glib-networking.out
|
||||
|
|
@ -96,11 +89,7 @@ stdenv.mkDerivation rec {
|
|||
zita-resampler
|
||||
];
|
||||
|
||||
# this doesnt build, probably because we have the wrong faust version:
|
||||
# "--faust"
|
||||
# aproved versions are 2.20.2 and 2.15.11
|
||||
wafConfigureFlags = [
|
||||
"--no-faust"
|
||||
"--no-font-cache-update"
|
||||
"--shared-lib"
|
||||
"--no-desktop-update"
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
, withX ? !stdenv.isDarwin
|
||||
, withNS ? stdenv.isDarwin
|
||||
, withGTK2 ? false, gtk2-x11 ? null
|
||||
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
|
||||
, withGTK3 ? false, gtk3-x11 ? null, gsettings-desktop-schemas ? null
|
||||
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
|
||||
, withMotif ? false, motif ? null
|
||||
, withSQLite3 ? false
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
, withAthena ? false
|
||||
, withToolkitScrollBars ? true
|
||||
, withPgtk ? false
|
||||
, withXinput2 ? false
|
||||
, withXinput2 ? withX && lib.versionAtLeast version "29"
|
||||
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
|
||||
, toolkit ? (
|
||||
if withGTK2 then "gtk2"
|
||||
|
|
@ -204,15 +204,10 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
|||
-f batch-native-compile $out/share/emacs/site-lisp/site-start.el
|
||||
'';
|
||||
|
||||
postFixup = lib.concatStringsSep "\n" [
|
||||
|
||||
(lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
|
||||
patchelf --set-rpath \
|
||||
"$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \
|
||||
"$out/bin/emacs"
|
||||
postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
|
||||
patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs
|
||||
patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
|
||||
'')
|
||||
];
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit nativeComp;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "leo-editor";
|
||||
version = "6.6.3";
|
||||
version = "6.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-editor";
|
||||
repo = "leo-editor";
|
||||
rev = version;
|
||||
sha256 = "sha256-QBK+4V9Nff3K6KcJ1PEyU0Ohn3cLawKe/5sR4Tih0dM=";
|
||||
sha256 = "sha256-NwqvlDG37OpWaLJHb6NqkRYvWwDzICKqfgIJRTBDnkI=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -375,18 +375,6 @@ final: prev:
|
|||
meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
|
||||
};
|
||||
|
||||
TrueZen-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "TrueZen.nvim";
|
||||
version = "2022-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pocco81";
|
||||
repo = "true-zen.nvim";
|
||||
rev = "98740c76254c65576ec294551028b65081053588";
|
||||
sha256 = "1g7wwb081yliqzpzmgjgvv9fn9qcry9k4xbgv0zcgz7z1lbhmyj1";
|
||||
};
|
||||
meta.homepage = "https://github.com/Pocco81/true-zen.nvim/";
|
||||
};
|
||||
|
||||
VimCompletesMe = buildVimPluginFrom2Nix {
|
||||
pname = "VimCompletesMe";
|
||||
version = "2022-02-18";
|
||||
|
|
@ -4449,6 +4437,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tomasr/molokai/";
|
||||
};
|
||||
|
||||
moonscript-vim = buildVimPluginFrom2Nix {
|
||||
pname = "moonscript-vim";
|
||||
version = "2016-11-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "leafo";
|
||||
repo = "moonscript-vim";
|
||||
rev = "715c96c7c3b02adc507f84bf5754985460afc426";
|
||||
sha256 = "1m4yz2xnazqagmkcli2xvwidsgssy9p650ykgdybk7wwlrq2vvqi";
|
||||
};
|
||||
meta.homepage = "https://github.com/leafo/moonscript-vim/";
|
||||
};
|
||||
|
||||
mru = buildVimPluginFrom2Nix {
|
||||
pname = "mru";
|
||||
version = "2022-08-20";
|
||||
|
|
@ -7757,6 +7757,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/folke/trouble.nvim/";
|
||||
};
|
||||
|
||||
true-zen-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "true-zen.nvim";
|
||||
version = "2022-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pocco81";
|
||||
repo = "true-zen.nvim";
|
||||
rev = "98740c76254c65576ec294551028b65081053588";
|
||||
sha256 = "1g7wwb081yliqzpzmgjgvv9fn9qcry9k4xbgv0zcgz7z1lbhmyj1";
|
||||
};
|
||||
meta.homepage = "https://github.com/Pocco81/true-zen.nvim/";
|
||||
};
|
||||
|
||||
tslime-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tslime.vim";
|
||||
version = "2020-09-09";
|
||||
|
|
@ -10231,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";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ https://github.com/jaredgorski/SpaceCamp/,,
|
|||
https://github.com/SpaceVim/SpaceVim/,,
|
||||
https://github.com/ackyshake/Spacegray.vim/,,
|
||||
https://github.com/chrisbra/SudoEdit.vim/,,
|
||||
https://github.com/Pocco81/TrueZen.nvim/,,
|
||||
https://github.com/ackyshake/VimCompletesMe/,,
|
||||
https://github.com/hsitz/VimOrganizer/,,
|
||||
https://github.com/VundleVim/Vundle.vim/,,
|
||||
|
|
@ -373,6 +372,7 @@ https://github.com/jghauser/mkdir.nvim/,main,
|
|||
https://github.com/SidOfc/mkdx/,,
|
||||
https://github.com/tomasr/molokai/,,
|
||||
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
|
||||
https://github.com/leafo/moonscript-vim/,HEAD,
|
||||
https://github.com/yegappan/mru/,,
|
||||
https://github.com/ncm2/ncm2/,,
|
||||
https://github.com/ncm2/ncm2-bufword/,,
|
||||
|
|
@ -650,6 +650,7 @@ https://github.com/tjdevries/train.nvim/,,
|
|||
https://github.com/tremor-rs/tremor-vim/,,
|
||||
https://github.com/cappyzawa/trim.nvim/,,
|
||||
https://github.com/folke/trouble.nvim/,,
|
||||
https://github.com/Pocco81/true-zen.nvim/,,
|
||||
https://github.com/jgdavey/tslime.vim/,,
|
||||
https://github.com/Quramy/tsuquyomi/,,
|
||||
https://github.com/folke/twilight.nvim/,,
|
||||
|
|
@ -859,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;
|
||||
|
|
@ -15,22 +18,23 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "08p4l47zr4dm7mw65wwdsf6q1wkzkzg3l2y5zrs3ng3nafql96zs";
|
||||
x86_64-darwin = "1pf8xpg2sb0iwfaixvzhmglqrrky2625b66fjwlc5zkj0dlff106";
|
||||
aarch64-linux = "1c35s7zykcrqf3va1cv7hqf1dp3cl70kdvqv3vgflqldc1wcza9h";
|
||||
aarch64-darwin = "1jpsf54x7yy53d6766gpw90ngdi6kicpqm1qbzbmmsasndl7rklp";
|
||||
armv7l-linux = "10vj751bjdkzsdcrdpq6xb430pdhdbz8ysk835ir64i3mv6ygi7k";
|
||||
x86_64-linux = "0cnrbjqcnkv7ybj9j7l0lcnfnxq18mddhdkj9797928q643bmj6z";
|
||||
x86_64-darwin = "1d9gb3i2k0c9cn38igg1nm91bfqdi4xg29zlprqsqh98ijwqy25y";
|
||||
aarch64-linux = "1jm8ll8f4m99ly53rv7000ng9a0l8jn4xpc6kfhmqdnf0jqfncsh";
|
||||
aarch64-darwin = "1awmaxkr5nl513c50g6k4r2j3w8p2by1j9i3kw7vkmwn91bk24i4";
|
||||
armv7l-linux = "1d2hl9jy1kfkzn4j7qkp3k8j1qc3r9rpqhvkfrr2axcqrahcrfsd";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.70.2";
|
||||
version = "1.71.0";
|
||||
pname = "vscode";
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "496";
|
||||
version = "497";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Ng3ogPxyzn4cKVE/0iz56VWGyABkM2ZF7ktajaJ9Mn8=";
|
||||
sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.24.0";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
sha256 = "sha256-2yEUMD3FQ9JrecCnWSr0Fej4ngk7HVCZUgbRqmGbCK8=";
|
||||
sha256 = "sha256-Uoi12odfJGyNc8Ap7E/zm4xklYdPPQvCGNxjb9AWJOI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.19.1";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-ARBi+8IAheEJ5keyiDCub6Y83hT/dU/BajPChi3f1po=";
|
||||
sha256 = "sha256-zDCvRwAtjBbBOa5D1k7khZGXeql5COMlWMi/dpwiiYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
# shell completions
|
||||
installShellCompletion --cmd khal \
|
||||
--bash <(_KHAL_COMPLETE=bash_source $out/bin/khal) \
|
||||
--fish <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \
|
||||
--zsh <(_KHAL_COMPLETE=fish_source $out/bin/khal)
|
||||
--zsh <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \
|
||||
--fish <(_KHAL_COMPLETE=fish_source $out/bin/khal)
|
||||
|
||||
# man page
|
||||
PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sioyek";
|
||||
version = "1.4.0";
|
||||
version = "unstable-2022-08-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F71JXgYaWAye+nlSrZvGjJ4ucvHTx3tPZHRC5QI4QiU=";
|
||||
rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916";
|
||||
sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ]
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "105.0.5195.54",
|
||||
"sha256": "0hj40scp54hp5xw036vb9v0h951hik4dq8skr52hffw24jqa9d5k",
|
||||
"sha256bin64": null,
|
||||
"version": "105.0.5195.102",
|
||||
"sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw",
|
||||
"sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-07-11",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "105.0.5195.54-1",
|
||||
"sha256": "021y7cm1fdwkakhqrvz3jw5hx30740qn827wcvih0jdc3msfgd97"
|
||||
"rev": "105.0.5195.102-1",
|
||||
"sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.10";
|
||||
version = "1.12.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ez98npQDkRmtE+Bh9O/bAOePwMQCvc0UZRcw5R2hAPY=";
|
||||
hash = "sha256-vG1FSBHXaJBJk9dC61yZK1Vkr8PyQ7Q4TVZWRIsDY3E=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
vendorSha256 = "sha256-wY0f9RUe9Z1FpjqWDpDG6QXQlFDChfAkjJzlvBMaaFE=";
|
||||
vendorSha256 = "sha256-6AgsnPrkLtUgvPMcXDZ9qVngnlN/65pwjdtBPdf0Jzw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ rec {
|
|||
};
|
||||
|
||||
kops_1_24 = mkKops rec {
|
||||
version = "1.24.1";
|
||||
sha256 = "sha256-rePNCk76/j6ssvi+gSvxn4GqoW/QovTFCJ0rj2Dd+0A=";
|
||||
version = "1.24.2";
|
||||
sha256 = "sha256-QEoaSkJ3fzUr2Fr3M2EOd/3iwq1ZX2YHEez2i0kjRmY=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ let
|
|||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.19";
|
||||
ptb = "0.0.29";
|
||||
canary = "0.0.137";
|
||||
canary = "0.0.138";
|
||||
} else {
|
||||
stable = "0.0.264";
|
||||
ptb = "0.0.59";
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "sha256-dreKO2yBDP547VYuJziBhC2sLdpbM2fcK5bxeds0zUQ=";
|
||||
sha256 = "sha256-NojoHrrgdvLiMgWYPClXzWjWXuvHz7urhyHzMnZwvBY=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = {
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aerc";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rjarry";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-w0h6BNuGwXV1CzyvXvsRs2MXHKLbK3EUaK4mKiuNBxc=";
|
||||
hash = "sha256-n5rRvLhCy2d8xUoTNyM5JYKGJWN0nEwkQeBCOpUrUrc=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-vw9lDIZMswh/vrF1g8FvZ/faN5jWWPwfgnm66EWaohw=";
|
||||
vendorHash = "sha256-Z1dW3cK3Anl8JpAfwppsSBRgV5SdRmQemOG+652z0KA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
python2.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp-daily";
|
||||
version = "20211016";
|
||||
version = "20220823";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw";
|
||||
sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2.pkgs; [
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -4,14 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kissat";
|
||||
version = "2.0.1";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminbiere";
|
||||
repo = "kissat";
|
||||
# https://github.com/arminbiere/kissat/issues/18
|
||||
rev = "abfa45fb782fa3b7c6e2eb6b939febe74d7270b7";
|
||||
sha256 = "06pbmkjxgf2idhsrd1yzvbxr2wf8l06pjb38bzbygm6n9ami89b8";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "sha256-C1lvkyYgFNhV7jGVLlrpJ5zZ8SFHg8g+iW1lDczhpBM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
|
||||
, setuptools, wxPython_4_0, billiard, gnureadline }:
|
||||
, setuptools, wxPython_4_0, billiard, gnureadline, opencv4 }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "MAVProxy";
|
||||
version = "1.8.52";
|
||||
version = "1.8.55";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-H30QZbUj6SXuwhhQUvHoPDM1D4ynm/vt1Mi4rkCB1oo=";
|
||||
sha256 = "sha256-RS3/U52n1Gs3cJtlZeE5z5q1EmC8NrPFt0mHhvIWVTA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -22,6 +22,7 @@ buildPythonApplication rec {
|
|||
pyserial
|
||||
setuptools
|
||||
wxPython_4_0
|
||||
opencv4
|
||||
] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ];
|
||||
|
||||
# No tests
|
||||
|
|
|
|||
|
|
@ -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,18 +1,15 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, gnome
|
||||
, pkg-config
|
||||
, meson
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, blueprint-compiler
|
||||
, ninja
|
||||
, python3
|
||||
, gtk3-x11
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk4
|
||||
, libadwaita
|
||||
|
|
@ -37,31 +34,25 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# The metainfo.xml file has a URL to a screenshot of the application,
|
||||
# unaccessible in the build's sandbox. We don't need the screenshot, so
|
||||
# it's best to remove it.
|
||||
./remove-screenshot-metainfo.diff
|
||||
# https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/commit/2faf4bb13d44463ea940c39ece9187f76627dbe9.diff";
|
||||
sha256 = "sha256-BPjwfFCDIqnS1rAlIinQ982VKdAYLyzDAPLCmPDvdp4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
build-aux/meson/postinstall.py \
|
||||
build-aux/cargo.sh \
|
||||
build-aux/dist-vendor.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
gobject-introspection
|
||||
desktop-file-utils
|
||||
blueprint-compiler
|
||||
ninja
|
||||
# For post-install.py
|
||||
python3
|
||||
gtk3-x11 # For gtk-update-icon-cache
|
||||
glib # For glib-compile-schemas
|
||||
# Present here in addition to buildInputs, because meson runs
|
||||
# `gtk4-update-icon-cache` during installPhase, thanks to:
|
||||
# https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12
|
||||
gtk4
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
|
|
@ -69,7 +60,6 @@ stdenv.mkDerivation rec {
|
|||
]);
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk4
|
||||
libadwaita
|
||||
gst_all_1.gstreamer
|
||||
|
|
@ -79,10 +69,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer";
|
||||
description = "Trim videos quickly";
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
|
||||
index 9bd25b6..c627369 100644
|
||||
--- i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
|
||||
+++ w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
|
||||
@@ -19,12 +19,6 @@
|
||||
Video Trimmer cuts out a fragment of a video given the start and end timestamps. The video is never re-encoded, so the process is very fast and does not reduce the video quality.
|
||||
</p>
|
||||
</description>
|
||||
- <screenshots>
|
||||
- <screenshot type="default">
|
||||
- <image>https://gitlab.gnome.org/YaLTeR/video-trimmer/uploads/e840fa093439348448007197d07c8033/image.png</image>
|
||||
- <caption>Main Window</caption>
|
||||
- </screenshot>
|
||||
- </screenshots>
|
||||
<releases>
|
||||
<release version="0.7.1" date="2022-03-23">
|
||||
<description>
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, intltool
|
||||
, meson
|
||||
, ninja
|
||||
, gobject-introspection
|
||||
, gmime
|
||||
, gmime3
|
||||
, libxml2
|
||||
, libsoup
|
||||
, pkg-config
|
||||
|
|
@ -11,23 +12,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xplayer-plparser";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1i7sld8am6b1wwbpfb18v7qp17vk2a5p8xcfds50yznr30lddsb2";
|
||||
sha256 = "6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gmime
|
||||
gmime3
|
||||
libxml2
|
||||
libsoup
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,32 +1,42 @@
|
|||
{ callPackage, lib, fetchFromGitHub }:
|
||||
{ callPackage, lib, fetchFromSourcehut }:
|
||||
|
||||
let
|
||||
sets = [ "comfy" "comfy-fixed" "comfy-duo" "comfy-wide" "comfy-wide-fixed" ];
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "protesilaos";
|
||||
sets = [
|
||||
"comfy"
|
||||
"comfy-fixed"
|
||||
"comfy-duo"
|
||||
"comfy-wide"
|
||||
"comfy-wide-fixed"
|
||||
"comfy-motion"
|
||||
"comfy-motion-duo"
|
||||
];
|
||||
version = "0.4.0";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~protesilaos";
|
||||
repo = "iosevka-comfy";
|
||||
rev = version;
|
||||
sha256 = "sha256-SMy3Kqve65ZU13lf1vZQR61mH7gcl1DvIZt3yD6tIf4=";
|
||||
sha256 = "sha256-d3C5HNiZCd0xva6zvMP9NmvmeU4uXuaO04pbgIepwfw=";
|
||||
};
|
||||
privateBuildPlan = src.outPath + "/private-build-plans.toml";
|
||||
overrideAttrs = (attrs: {
|
||||
inherit version;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/protesilaos/iosevka-comfy";
|
||||
inherit (src.meta) homepage;
|
||||
description = ''
|
||||
Custom build of Iosevka with a rounded style and open shapes,
|
||||
adjusted metrics, and overrides for almost all individual glyphs
|
||||
in both roman (upright) and italic (slanted) variants.
|
||||
'';
|
||||
Custom build of Iosevka with a rounded style and open shapes,
|
||||
adjusted metrics, and overrides for almost all individual glyphs
|
||||
in both roman (upright) and italic (slanted) variants.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
platforms = attrs.meta.platforms;
|
||||
maintainers = [ maintainers.DamienCassou ];
|
||||
};
|
||||
});
|
||||
makeIosevkaFont = set: (callPackage ./. {
|
||||
inherit set privateBuildPlan;
|
||||
}).overrideAttrs overrideAttrs;
|
||||
in
|
||||
builtins.listToAttrs (builtins.map (set: {name=set; value=makeIosevkaFont set;}) sets)
|
||||
makeIosevkaFont = set:
|
||||
(callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs
|
||||
overrideAttrs;
|
||||
in builtins.listToAttrs (builtins.map (set: {
|
||||
name = set;
|
||||
value = makeIosevkaFont set;
|
||||
}) sets)
|
||||
|
|
|
|||
|
|
@ -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; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20220727";
|
||||
version = "20220830";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-IpHlI07Ymagww28rQFb/XnYjX0uge1k0IfSGUpBjTV4=";
|
||||
sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4c";
|
||||
version = "1.2.3.0";
|
||||
version = "1.2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p4lang";
|
||||
repo = "p4c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LwRfLvnn1JAvSXPTkVcIB4PbPrrVweIv72Xk5g015ck=";
|
||||
sha256 = "sha256-mOswMUvr7LGN4GmczPUqNMUjs0c1Pc8SiC5k2Ou52Iw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, zlib, openssl }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
pname = "libre";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "re";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S+RvD7sXn8yjGAHv1OqiJJMAA45r8N1Rhz89d8yGv1Q=";
|
||||
sha256 = "sha256-YGd0ft61L5ZmcWY0+wON2YgX1fKAcQlIGHNaD7I7exg=";
|
||||
};
|
||||
buildInputs = [ zlib openssl ];
|
||||
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
pname = "librem";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "rem";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rn3KKYW5OBInZYaDhwYVyPvL3UiuRG8CyHtPvW1S0Zo=";
|
||||
sha256 = "sha256-t+klxuDiP7KAbN3ZK8eTWHTzNNpNTrlFINktjPDfeoo=";
|
||||
};
|
||||
buildInputs = [ zlib openssl libre ];
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -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,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suitesparse";
|
||||
version = "5.11.0";
|
||||
version = "5.13.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "DrTimothyAldenDavis";
|
||||
repo = "SuiteSparse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AM16ngJ/CoSV6BOb80Pi9EqWoRILryOO4Rk+S5DffLU=";
|
||||
sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
"CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
|
||||
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.11.0/SuiteSparse_config/SuiteSparse_config.mk#L368
|
||||
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368
|
||||
"BLAS=-lblas"
|
||||
"LAPACK=-llapack"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,40 +1,25 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr
|
||||
, result, uucp, uuseg, uutf
|
||||
, lwt ? null }:
|
||||
{ lib, buildDunePackage, fetchurl, cppo
|
||||
, uutf
|
||||
, lwt
|
||||
}:
|
||||
|
||||
with lib;
|
||||
buildDunePackage rec {
|
||||
version = "0.2.3";
|
||||
pname = "notty";
|
||||
|
||||
if versionOlder ocaml.version "4.05"
|
||||
|| versionAtLeast ocaml.version "4.14"
|
||||
then throw "notty is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let withLwt = lwt != null; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2.2";
|
||||
pname = "ocaml${ocaml.version}-notty";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz";
|
||||
sha256 = "1y3hx8zjri3x50nyiqal5gak1sw54gw3xssrqbj7srinvkdmrz1q";
|
||||
sha256 = "sha256-dGWfsUBz20Q4mJiRqyTyS++Bqkl9rBbZpn+aHJwgCCQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
||||
buildInputs = [ ocb-stubblr topkg ocamlbuild ];
|
||||
propagatedBuildInputs = [ result uucp uuseg uutf ] ++
|
||||
optional withLwt lwt;
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
strictDeps = true;
|
||||
propagatedBuildInputs = [ lwt uutf ];
|
||||
|
||||
buildPhase = topkg.buildPhase
|
||||
+ " --with-lwt ${boolToString withLwt}";
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pqwy/notty";
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "Declarative terminal graphics for OCaml";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ sternenseemann ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "pdepend";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar";
|
||||
sha256 = "sha256-QhNO/yI2oJNhkwSn32gdId5IY0VR69eF/b/yMklhPKs=";
|
||||
sha256 = "sha256-3jZAhOw9wfR9Fl6Mlj8o0uinjUZO46CAHRkZxrQP5rU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yAqGVZnnragi3+jaAGnkYNH/XtpH3bojXHmPCrANgJU=";
|
||||
hash = "sha256-mWb/24/9O8HvzblgudbVaLDR1igTkYpWZn53VqN2vbg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.14.3";
|
||||
version = "0.14.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nLlldO4otyWKn91L6vCiBh9csplFrN8tiK1tfeik6Y4=";
|
||||
hash = "sha256-5dmPTN86DtEtGTgvX1T8QfvPdqZNdyBQP3lt4e4tH3o=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "biliass";
|
||||
version = "1.3.5";
|
||||
version = "1.3.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU=";
|
||||
sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "idasen";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "newAM";
|
||||
repo = "idasen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7Tg+/3BXRmzG39jIC281MKxyJyf9e9/1uOqUji08B3U=";
|
||||
hash = "sha256-QMHxQLHp2p3/kGDd995CjBvQqn2BVM6d02NCzrjExr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "python-swiftclient";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-O2jHNpnF+8OKzXtvEUPWmSOz+vcQ82XZd6QQS9kni/8=";
|
||||
hash = "sha256-+CKY5KSPfL3WgPJjjIXRynrhp27b4wA20htM16KcCes=";
|
||||
};
|
||||
|
||||
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 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-swagger";
|
||||
version = "0.30.0";
|
||||
version = "0.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-swagger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hc3b1r8Wr8cXAWoqINneBRU1Mdv4RkAeOOCK7O9Vp9g=";
|
||||
sha256 = "sha256-RV+oXcu74lyc3v3i3aQvKqrm6KrKwvPwED4JAwXgjqw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-g/0OjAqT+0P0VtB0i0o2QfMqU8YDnoRtwA5isNJlSBE=";
|
||||
vendorSha256 = "sha256-F20/EQjlrwYzejLPcnuzb7K9RmbbrqU+MwzBO1MvhL4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ let
|
|||
|
||||
in buildPythonApplication rec {
|
||||
pname = "pipenv";
|
||||
version = "2022.8.30";
|
||||
version = "2022.9.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QUda28Wt4XGEZDvP36mWMuf2FROhfsccSDIDG4hiy6s=";
|
||||
sha256 = "sha256-EMCIPt0f2Aqin9Yz34JoPCSVjol3i/UMRnNhC/ttv7A=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue