Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-06-21 00:13:19 +00:00 committed by GitHub
commit 260df62919
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
273 changed files with 4275 additions and 9514 deletions

View file

@ -109,6 +109,8 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.
* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`.
* `selfContainedBuild` allows to enable the [self-contained](https://docs.microsoft.com/en-us/dotnet/core/deploying/#publish-self-contained) build flag. By default, it is set to false and generated applications have a dependency on the selected dotnet runtime. If enabled, the dotnet runtime is bundled into the executable and the built app has no dependency on Dotnet.
* `useAppHost` will enable creation of a binary executable that runs the .NET application using the specified root. More info in [Microsoft docs](https://learn.microsoft.com/en-us/dotnet/core/deploying/#publish-framework-dependent). Enabled by default.
* `useDotnetFromEnv` will change the binary wrapper so that it uses the .NET from the environment. The runtime specified by `dotnet-runtime` is given as a fallback in case no .NET is installed in the user's environment. This is most useful for .NET global tools and LSP servers, which often extend the .NET CLI and their runtime should match the users' .NET runtime.
* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build.
* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore.
* `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute.
@ -151,3 +153,60 @@ in buildDotnetModule rec {
runtimeDeps = [ ffmpeg ]; # This will wrap ffmpeg's library path into `LD_LIBRARY_PATH`.
}
```
## Dotnet global tools {#dotnet-global-tools}
[.NET Global tools](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools) are a mechanism provided by the dotnet CLI to install .NET binaries from Nuget packages.
They can be installed either as a global tool for the entire system, or as a local tool specific to project.
The local installation is the easiest and works on NixOS in the same way as on other Linux distributions.
[See dotnet documention](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools#install-a-local-tool) to learn more.
[The global installation method](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools#install-a-global-tool)
should also work most of the time. You have to remember to update the `PATH`
value to the location the tools are installed to (the CLI will inform you about it during installation) and also set
the `DOTNET_ROOT` value, so that the tool can find the .NET SDK package.
You can find the path to the SDK by running `nix eval --raw nixpkgs#dotnet-sdk` (substitute the `dotnet-sdk` package for
another if a different SDK version is needed).
This method is not recommended on NixOS, since it's not declarative and involves installing binaries not made for NixOS,
which will not always work.
The third, and preferred way, is packaging the tool into a Nix derivation.
### Packaging Dotnet global tools {#packaging-dotnet-global-tools}
Dotnet global tools are standard .NET binaries, just made available through a special
NuGet package. Therefore, they can be built and packaged like every .NET application,
using `buildDotnetModule`.
If however the source is not available or difficult to build, the
`buildDotnetGlobalTool` helper can be used, which will package the tool
straight from its NuGet package.
This helper has the same arguments as `buildDotnetModule`, with a few differences:
* `pname` and `version` are required, and will be used to find the NuGet package of the tool
* `nugetName` can be used to override the NuGet package name that will be downloaded, if it's different from `pname`
* `nugetSha256` is the hash of the fetched NuGet package. Set this to `lib.fakeHash256` for the first build, and it will error out, giving you the proper hash. Also remember to update it during version updates (it will not error out if you just change the version while having a fetched package in `/nix/store`)
* `dotnet-runtime` is set to `dotnet-sdk` by default. When changing this, remember that .NET tools fetched from NuGet require an SDK.
Here is an example of packaging `pbm`, an unfree binary without source available:
```nix
{ buildDotnetGlobalTool, lib }:
buildDotnetGlobalTool {
pname = "pbm";
version = "1.3.1";
nugetSha256 = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo=";
meta = with lib; {
homepage = "https://cmd.petabridge.com/index.html";
changelog = "https://cmd.petabridge.com/articles/RELEASE_NOTES.html";
license = licenses.unfree;
platforms = platforms.linux;
};
}
```

View file

@ -809,6 +809,12 @@ in mkLicense lset) ({
fullName = "Microsoft Public License";
};
mulan-psl2 = {
spdxId = "MulanPSL-2.0";
fullName = "Mulan Permissive Software License, Version 2";
url = "https://license.coscl.org.cn/MulanPSL2";
};
nasa13 = {
spdxId = "NASA-1.3";
fullName = "NASA Open Source Agreement 1.3";

View file

@ -15052,6 +15052,12 @@
githubId = 1437166;
name = "Xia Bin";
};
sochotnicky = {
email = "stanislav+github@ochotnicky.com";
github = "sochotnicky";
githubId = 55726;
name = "Stanislav Ochotnický";
};
softinio = {
email = "code@softinio.com";
github = "softinio";

View file

@ -89,7 +89,7 @@ let
PrivateNetwork = mkDefault (!needNetwork);
ProcSubset = "pid";
ProtectClock = true;
ProtectHome = mkDefault true;
ProtectHome = "tmpfs";
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectProc = "invisible";
@ -460,6 +460,8 @@ in
after = [ "public-inbox-init.service" "public-inbox-watch.service" ];
requires = [ "public-inbox-init.service" ];
serviceConfig = {
BindPathsReadOnly =
map (c: c.dir) (lib.attrValues cfg.settings.coderepo);
ExecStart = escapeShellArgs (
[ "${cfg.package}/bin/public-inbox-httpd" ] ++
cfg.http.args ++
@ -563,16 +565,7 @@ in
${pkgs.git}/bin/git config core.sharedRepository 0640
fi
'') cfg.inboxes
) + ''
shopt -s nullglob
for inbox in ${stateDir}/inboxes/*/; do
# This should be idempotent, but only do it for new
# inboxes anyway because it's only needed once, and could
# be slow for large pre-existing inboxes.
ls -1 "$inbox" | grep -q '^xap' ||
${cfg.package}/bin/public-inbox-index "$inbox"
done
'';
);
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;

View file

@ -41,6 +41,20 @@ in
'';
};
allowDHCP = mkOption {
default = cfg.settings.dhcp.enabled or false;
defaultText = literalExpression ''config.services.adguardhome.settings.dhcp.enabled or false'';
type = bool;
description = lib.mdDoc ''
Allows AdGuard Home to open raw sockets (`CAP_NET_RAW`), which is
required for the integrated DHCP server.
The default enables this conditionally if the declarative configuration
enables the integrated DHCP server. Manually setting this option is only
required for non-declarative setups.
'';
};
mutableSettings = mkOption {
default = true;
type = bool;
@ -147,7 +161,7 @@ in
serviceConfig = {
DynamicUser = true;
ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}";
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ] ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ];
Restart = "always";
RestartSec = 10;
RuntimeDirectory = "AdGuardHome";

View file

@ -1,10 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.fakeroute;
routeConf = pkgs.writeText "route.conf" (concatStringsSep "\n" cfg.route);
routeConf = pkgs.writeText "route.conf" (lib.concatStringsSep "\n" cfg.route);
in
@ -16,16 +14,10 @@ in
services.fakeroute = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to enable the fakeroute service.
'';
};
enable = lib.mkEnableOption (lib.mdDoc "the fakeroute service");
route = mkOption {
type = types.listOf types.str;
route = lib.mkOption {
type = with lib.types; listOf str;
default = [];
example = [
"216.102.187.130"
@ -46,14 +38,16 @@ in
###### implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
systemd.services.fakeroute = {
description = "Fakeroute Daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
User = "root";
User = "fakeroute";
DynamicUser = true;
AmbientCapabilities = [ "CAP_NET_RAW" ];
ExecStart = "${pkgs.fakeroute}/bin/fakeroute -f ${routeConf}";
};
};

View file

@ -115,10 +115,12 @@ in
ShowStatus=no
# Allow very slow start
DefaultTimeoutStartSec=300
DefaultDeviceTimeoutSec=300
'';
systemd.user.extraConfig = ''
# Allow very slow start
DefaultTimeoutStartSec=300
DefaultDeviceTimeoutSec=300
'';
boot.initrd.systemd.extraConfig = config.systemd.extraConfig;

View file

@ -40,6 +40,67 @@
};
};
};
dhcpConf = { lib, ... }: {
virtualisation.vlans = [ 1 ];
networking = {
# Configure static IP for DHCP server
useDHCP = false;
interfaces."eth1" = lib.mkForce {
useDHCP = false;
ipv4 = {
addresses = [{
address = "10.0.10.1";
prefixLength = 24;
}];
routes = [{
address = "10.0.10.0";
prefixLength = 24;
}];
};
};
# Required for DHCP
firewall.allowedUDPPorts = [ 67 68 ];
};
services.adguardhome = {
enable = true;
allowDHCP = true;
mutableSettings = false;
settings = {
schema_version = 0;
dns = {
bind_host = "0.0.0.0";
bootstrap_dns = "127.0.0.1";
};
dhcp = {
# This implicitly enables CAP_NET_RAW
enabled = true;
interface_name = "eth1";
local_domain_name = "lan";
dhcpv4 = {
gateway_ip = "10.0.10.1";
range_start = "10.0.10.100";
range_end = "10.0.10.101";
subnet_mask = "255.255.255.0";
};
};
};
};
};
client = { lib, ... }: {
virtualisation.vlans = [ 1 ];
networking = {
interfaces.eth1 = {
useDHCP = true;
ipv4.addresses = lib.mkForce [ ];
};
};
};
};
testScript = ''
@ -63,5 +124,13 @@
mixedConf.systemctl("restart adguardhome.service")
mixedConf.wait_for_unit("adguardhome.service")
mixedConf.wait_for_open_port(3000)
with subtest("Testing successful DHCP start"):
dhcpConf.wait_for_unit("adguardhome.service")
client.wait_for_unit("network-online.target")
# Test IP assignment via DHCP
dhcpConf.wait_until_succeeds("ping -c 5 10.0.10.100")
# Test hostname resolution over DHCP-provided DNS
dhcpConf.wait_until_succeeds("ping -c 5 client.lan")
'';
}

View file

@ -253,6 +253,7 @@ in {
etebase-server = handleTest ./etebase-server.nix {};
etesync-dav = handleTest ./etesync-dav.nix {};
evcc = handleTest ./evcc.nix {};
fakeroute = handleTest ./fakeroute.nix {};
fancontrol = handleTest ./fancontrol.nix {};
fcitx5 = handleTest ./fcitx5 {};
fenics = handleTest ./fenics.nix {};

22
nixos/tests/fakeroute.nix Normal file
View file

@ -0,0 +1,22 @@
import ./make-test-python.nix ({ lib, pkgs, ...} : {
name = "fakeroute";
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
nodes.machine = { ... }: {
imports = [ ../modules/profiles/minimal.nix ];
services.fakeroute.enable = true;
services.fakeroute.route =
[ "216.102.187.130" "4.0.1.122"
"198.116.142.34" "63.199.8.242"
];
environment.systemPackages = [ pkgs.traceroute ];
};
testScript =
''
start_all()
machine.wait_for_unit("fakeroute.service")
machine.succeed("traceroute 127.0.0.1 | grep -q 216.102.187.130")
'';
})

View file

@ -13,8 +13,5 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
testScript = ''
start_all()
machine.succeed("hello")
# test fallback if NIX_LD is not set
machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; hello")
'';
})

View file

@ -223,5 +223,8 @@ in
# require to use --all
machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
# Compact the database
machine.succeed("sudo -u public-inbox public-inbox-compact --all")
'';
})

View file

@ -1,23 +1,29 @@
{ lib, stdenv, fetchurl, ladspaH
{ lib
, stdenv
, fetchurl
, ladspaH
}:
stdenv.mkDerivation rec {
pname = "FIL-plugins";
version = "0.3.0";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw";
hash = "sha256-HAvycSEZZfZwoVp3g7QWcwfbdyZKwWJKBuVmeWTajuk=";
};
buildInputs = [ ladspaH ];
patchPhase = ''
sed -i 's@/usr/bin/install@install@g' Makefile
sed -i 's@/bin/rm@rm@g' Makefile
sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile
postPatch = ''
substituteInPlace Makefile \
--replace /usr/lib/ladspa "$out/lib/ladspa" \
--replace g++ "$CXX"
'';
preInstall="mkdir -p $out/lib/ladspa";
preInstall = ''
mkdir -p "$out/lib/ladspa"
'';
meta = {
description = "a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed";

View file

@ -0,0 +1,55 @@
From 1217722e4bf6c65b5c24da17a7de4bf712ca6775 Mon Sep 17 00:00:00 2001
From: Tamara Schmitz <tamara.zoe.schmitz@posteo.de>
Date: Sat, 17 Jun 2023 14:05:53 +0200
Subject: [PATCH] add NixOS plugin paths as default search paths
Since NixOS uses unusual paths, we should tell Ardour about this. During
first launch, Ardour does indeed check for environmentals but not when
you press the "Reset to Defaults" button in the Settings menu. This
path fixes this by including NixOS paths in the defaults.
---
libs/ardour/plugin_manager.cc | 5 +++--
libs/ardour/search_paths.cc | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index a572ed55dd..3dd6c2fda6 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -305,7 +305,8 @@ PluginManager::PluginManager ()
if (lxvst_path.length() == 0) {
lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst:"
"/usr/local/lib64/linux_vst:/usr/local/lib/linux_vst:/usr/lib64/linux_vst:/usr/lib/linux_vst:"
- "/usr/lib/vst:/usr/local/lib/vst";
+ "/usr/lib/vst:/usr/local/lib/vst:"
+ "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst:/etc/profiles/per-user/$USER/lib/lxvst";
}
/* first time setup, use 'default' path */
@@ -2040,7 +2041,7 @@ PluginManager::vst3_refresh (bool cache_only)
std::string prog = PBD::get_win_special_folder_path (CSIDL_PROGRAM_FILES);
vst3_discover_from_path (Glib::build_filename (prog, "Common Files", "VST3"), cache_only);
#else
- vst3_discover_from_path ("~/.vst3:/usr/local/lib/vst3:/usr/lib/vst3", cache_only);
+ vst3_discover_from_path ("~/.vst3:/usr/local/lib/vst3:/usr/lib/vst3:~/.nix-profile/lib/vst3:/run/current-system/sw/lib/vst3:/etc/profiles/per-user/$USER/lib/vst3", cache_only);
#endif
}
diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc
index e6d8744369..b9774cb006 100644
--- a/libs/ardour/search_paths.cc
+++ b/libs/ardour/search_paths.cc
@@ -112,6 +112,10 @@ ladspa_search_path ()
spath.push_back ("/usr/local/lib/ladspa");
spath.push_back ("/usr/lib64/ladspa");
spath.push_back ("/usr/lib/ladspa");
+ spath.push_back ("/run/current-system/sw/lib/ladspa");
+ spath.push_back (path_expand ("$HOME/.ladspa"));
+ spath.push_back (path_expand ("$HOME/.nix-profile/lib/ladspa"));
+ spath.push_back (path_expand ("/etc/profiles/per-user/$USER/lib/ladspa"));
#endif
#ifdef __APPLE__
--
2.40.1

View file

@ -78,6 +78,7 @@ stdenv.mkDerivation rec {
patches = [
# AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096
./as-flags.patch
./default-plugin-search-paths.patch
];
# Ardour's wscript requires git revision and date to be available.

View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, bison
, flex
, which
@ -13,18 +13,22 @@
, audioBackend ? "pulse" # "pulse", "alsa", or "jack"
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "miniaudicle";
version = "1.3.5.2";
version = "1.4.2.0";
src = fetchurl {
url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz";
hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI=";
src = fetchFromGitHub {
owner = "ccrma";
repo = "miniAudicle";
rev = "miniAudicle-${finalAttrs.version}";
hash = "sha256-NENpqgCCGiVzVE6rYqBu2RwkzWSiGHe7dZVwBfSomEo=";
fetchSubmodules = true;
};
sourceRoot = "miniAudicle-${version}/src";
sourceRoot = "source/src";
postPatch = ''
echo '#define GIT_REVISION "${finalAttrs.version}-NixOS"' > git-rev.h
substituteInPlace miniAudicle.pro \
--replace "/usr/local" $out
'';
@ -56,4 +60,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
broken = stdenv.isDarwin; # not attempted
};
}
})

View file

@ -14,14 +14,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
version = "1.2.9.743.g85d9593d";
version = "1.2.11.916.geb595a67";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "64";
rev = "67";
deps = [
alsa-lib
@ -84,7 +84,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
sha512 = "5e8f4a1901c26e9bb5986e048226d8a15f5bc4c2acf16b20a404f228ef142e4d21c6a88a4a54c8d9e654ba5b15cb1fea1cdc50c21fbe8e3c374e241a44adf12d";
sha512 = "3d5a9fda88a076a22bb6d0b6b586334865f03a4e852ca8e022468e3dd3520a81dea314721e26e54ba9309603e08f66588f005ee8970e73eccbf805ff70e89dca";
};
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];

View file

@ -14,8 +14,8 @@ let
sha256Hash = "sha256-X+ZuH4cHKfQtfvOF0kLk+QjQ5AR3pTEparczHEUk+uY=";
};
betaVersion = {
version = "2022.3.1.12"; # "Android Studio Giraffe (2022.3.1) Beta 1"
sha256Hash = "sha256-Wy5iifscL1Ko7ZInx/uAvyJyM4cS6LfTYWxdJbZk6po=";
version = "2022.3.1.16"; # "Android Studio Giraffe (2022.3.1) Beta 5"
sha256Hash = "sha256-D+Hoa50fzvtO0/6DsExmGSDzcgDIT2Bg+HvI6mCle14=";
};
latestVersion = betaVersion;
in {

View file

@ -386,6 +386,9 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
inherit withTreeSitter;
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
tests = { inherit (nixosTests) emacs-daemon; };
# Backwards compatibility aliases. Remove this at some point before 23.11 release cut-off.
nativeComp = builtins.trace "emacs.passthru: nativeComp was renamed to withNativeCompilation and will be removed in 23.11" withNativeCompilation;
treeSitter = builtins.trace "emacs.passthru: treeSitter was renamed to withTreeSitter and will be removed in 23.11" withTreeSitter;
};
meta = {

View file

@ -17,12 +17,12 @@
emacs29 = import ./generic.nix {
pname = "emacs";
version = "29.0.91";
version = "29.0.92";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
rev = "29.0.91";
hash = "sha256-YU/sbIr7xX5ELJtPcTL9ZQgZtjEW5oI7YC20fQsOVSY=";
rev = "29.0.92";
hash = "sha256-Vkry+2zYejZVwZKQlmQiAJnbjsj87DiIZ1ungooYd8A=";
};
};

View file

@ -29,12 +29,12 @@ final: prev:
ChatGPT-nvim = buildVimPluginFrom2Nix {
pname = "ChatGPT.nvim";
version = "2023-06-18";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "jackMort";
repo = "ChatGPT.nvim";
rev = "98764f0ff4858b354923ecd17eeb7be09cc95b64";
sha256 = "0gngz3ydzm9f6xgd7f15d4igaiv6qrym737fd753lhm3jdi0sv00";
rev = "ef0cf1f28a22bbf2e9be531f4856d2cace57e4b2";
sha256 = "1d3q9bhzx7r4kgjqqgb7h5g0hh1nwj7y0rd8h7ikfnfwfdpw9mpn";
};
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
};
@ -365,12 +365,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2023-06-19";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "db52071cb4397ffaf7edbd9e849f3ab832e3a864";
sha256 = "11a26rds6iqbx0681hr9p4y91qy941n0f88ax4f3y37hh0xdzvqg";
rev = "b737573667d1212ff4c76ed2a999c84c966da83d";
sha256 = "10v89a853dakhgmmlpf6gig16764w481jy4acw0h7nrqn28y4qfr";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -2923,6 +2923,18 @@ final: prev:
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
dropbar-nvim = buildVimPluginFrom2Nix {
pname = "dropbar.nvim";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "Bekaboo";
repo = "dropbar.nvim";
rev = "c4ca1cd78917bc28269278f92a791e819803576b";
sha256 = "14ymbknhsa198mywcz5ph4aj16z89cqmc381a3an26s3a3xbmk07";
};
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
};
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc.vim";
version = "2022-11-27";
@ -2961,12 +2973,12 @@ final: prev:
edgy-nvim = buildVimPluginFrom2Nix {
pname = "edgy.nvim";
version = "2023-06-17";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "folke";
repo = "edgy.nvim";
rev = "4ccdcbbf15222b0d2cc83e3826191f190bb92717";
sha256 = "1qpdiqk5zvfi6q2a7gcisvjazfc6wz46f9dk663w1dvp433rs19v";
rev = "a93f3111301ce6e059cdd1a66f108e58a0e5f0ef";
sha256 = "03lrqdizwhf9yvs8x097y6h04x44gmdvs5w1ipcgk6psj1iy83l0";
};
meta.homepage = "https://github.com/folke/edgy.nvim/";
};
@ -3069,6 +3081,18 @@ final: prev:
meta.homepage = "https://github.com/sainnhe/everforest/";
};
eyeliner-nvim = buildVimPluginFrom2Nix {
pname = "eyeliner.nvim";
version = "2023-04-26";
src = fetchFromGitHub {
owner = "jinh0";
repo = "eyeliner.nvim";
rev = "fa3a0986cb072fe2ab29ef79e022514d2533f0db";
sha256 = "072qnpn30sz72gwppsdg9npbr897a2xlh1wj0706n58lkd7nhl2v";
};
meta.homepage = "https://github.com/jinh0/eyeliner.nvim/";
};
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
version = "2023-03-12";
@ -3324,12 +3348,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2023-06-17";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "70b727d3454cceb3a818b1746be09786568b7e33";
sha256 = "13winfmabdpxwgig519qr11znjngdlmbgbmksyrilxangaw3zgjf";
rev = "91dc01efa4cbb6d6a2b77eb98953b9a1d5c78f5f";
sha256 = "1hvwn1k57lzc2lpdfr1sgyqpd6qhjj6vaad0ybi9p8ifjbmmc68y";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -3432,12 +3456,12 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2023-06-18";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "b58799714513083bd646f0b716e29f224ebba48e";
sha256 = "0xyng49hdwsmlfqmknal558x7sypk4g36kn5i45p9jvbq05flzfs";
rev = "cb0943a41df4bb59475a13c4dcc7256cc230a2e3";
sha256 = "1pv06v6g30d9ggq97lgl8jhlwzfkimg088102bxfin43l8r09f7h";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@ -3600,12 +3624,12 @@ final: prev:
gitsigns-nvim = buildNeovimPlugin {
pname = "gitsigns.nvim";
version = "2023-06-19";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "3ef12dfdc293969fac736a7a580d6ae1f57ea406";
sha256 = "1gdp98m8az66q8229055anjiqz89znq4b4xq6gzbrgrnvzfmm9ps";
rev = "a36bc3360d584d39b4fb076d855c4180842d4444";
sha256 = "1kq2ykmpagan4d4anjv8s8dp2gi22n8paqzkk933zr5azd9q6pjp";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -3863,12 +3887,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim";
version = "2023-06-18";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "0c1af5b004a6035fe6ce6bc0bf894a693f0005d0";
sha256 = "13km915xpj17m64wc9az1cz43aqzcns337hfgm0x86yr0hqap0f7";
rev = "8b2f24298a175f41543372dcbdc2b29319260376";
sha256 = "1ax3nx1zc3wra7xc2lrrrz8wspfxhzxdpm958027xpg0yjsv3l43";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@ -3921,6 +3945,18 @@ final: prev:
meta.homepage = "https://github.com/rebelot/heirline.nvim/";
};
hex-nvim = buildVimPluginFrom2Nix {
pname = "hex.nvim";
version = "2023-05-25";
src = fetchFromGitHub {
owner = "RaafatTurki";
repo = "hex.nvim";
rev = "d47b87d49b870e2170e992fa6301fc08c9590388";
sha256 = "0giiwjlvx53zsg8xsz7v1mrmv3c8yfajnfx6jdzzb64pzsagsxq3";
};
meta.homepage = "https://github.com/RaafatTurki/hex.nvim/";
};
hiPairs = buildVimPluginFrom2Nix {
pname = "hiPairs";
version = "2020-12-10";
@ -3933,6 +3969,18 @@ final: prev:
meta.homepage = "https://github.com/Yggdroot/hiPairs/";
};
highlight-undo-nvim = buildVimPluginFrom2Nix {
pname = "highlight-undo.nvim";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "tzachar";
repo = "highlight-undo.nvim";
rev = "1aeada51fb956f1ef121f29ddbb2ef6108a3c480";
sha256 = "18ckz8c0yrpr3n09j4rmdpzcbzds8v8hwzrprr5rygvicx3zkfzx";
};
meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/";
};
himalaya-vim = buildVimPluginFrom2Nix {
pname = "himalaya-vim";
version = "2023-02-15";
@ -5603,12 +5651,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2023-06-15";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "b41da3926ce1c022a2f6a7ea8858889c3a8be4d7";
sha256 = "0vnl1g7bxi9b68gczm3b8xn4ygcfzmzqx32q0p96p24q9lhb28sb";
rev = "78f1c370173e7689bd58d64229b4d92c5dfb2793";
sha256 = "00lmk9dnpvp6qd8ymav6z0i07fg0pbnmf0xrhvlrbglxl09dg4ym";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@ -5699,12 +5747,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-06-07";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "9a55117b6175e63d86346bb893392cdf0b6ad2cc";
sha256 = "0xgfvb9psv1i3nq2gjrs051g6wzjljlw17qg5bdrk438y9w9nfq3";
rev = "6fece1546d051a5f2a2d932d5978beec1ef920ab";
sha256 = "1wy0kb19xw21bh893fipd6nypi0fizac6021h3spf466bvlb82dz";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5915,12 +5963,12 @@ final: prev:
neotest-rust = buildVimPluginFrom2Nix {
pname = "neotest-rust";
version = "2023-05-26";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "rouge8";
repo = "neotest-rust";
rev = "cc1821d580e8ee36bdd13d67b3291b8cd1792ec9";
sha256 = "0a9z0sk6fgxqzr42hcmy7cqsgidk6vny0xba5q1ma7lbqzq5bb58";
rev = "cb788ceeae9a0d336b1c9d325a835129868c3f65";
sha256 = "1d8y5pdw7a9x79555wr8kvhzz0d5kggxc8hji6l815dx6ckvij9k";
};
meta.homepage = "https://github.com/rouge8/neotest-rust/";
};
@ -6213,6 +6261,18 @@ final: prev:
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
};
notifier-nvim = buildVimPluginFrom2Nix {
pname = "notifier.nvim";
version = "2023-06-09";
src = fetchFromGitHub {
owner = "vigoux";
repo = "notifier.nvim";
rev = "eea2d368ffd1b527e6f0c454c2cd907fd63420d8";
sha256 = "1d858gdgkmarw8rsxlywan9dw4rmr7v4bf7j1pb2jl4lm3m1b9kh";
};
meta.homepage = "https://github.com/vigoux/notifier.nvim/";
};
nterm-nvim = buildVimPluginFrom2Nix {
pname = "nterm.nvim";
version = "2022-05-10";
@ -6755,12 +6815,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-06-19";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "444eab07bb7881cad984c68c89fde276f7a26d81";
sha256 = "1pdm4c731qzc8xclpk9svcfkqk1di1n3cppa3cbp9zk3p9a1jpkh";
rev = "a51892484c2002c083a8b0a9dfcefb3a569be36d";
sha256 = "02yxlfqlvv8nprk9mbxhw2mh52plcjka5kwbn4h8s4d49dzp396w";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -6933,6 +6993,18 @@ final: prev:
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
nvim-pqf = buildVimPluginFrom2Nix {
pname = "nvim-pqf";
version = "2023-04-20";
src = fetchFromGitHub {
owner = "yorickpeterse";
repo = "nvim-pqf";
rev = "0c83602f9b3de057c5d4bf76e849c3d589a1d836";
sha256 = "1rjxxv2k67xb0zk599h4bmyi9qipagaa82fgx0g8ma19kvqqn28a";
};
meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/";
};
nvim-rename-state = buildVimPluginFrom2Nix {
pname = "nvim-rename-state";
version = "2023-01-30";
@ -6959,12 +7031,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2023-06-12";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "cb5e6a7692453624beb122f3d154c266a24d9195";
sha256 = "047ra6mqhvlgj6af90sf0jywdvwk9smnr9mdxwc6knwf2cqjmprj";
rev = "e8a92cf4952c35644ae420d3ba1f04c609db303c";
sha256 = "0mcm6r3if5h5wx6kr2mcj0c4263vy27iwxdrws2n0brh7k7chs8k";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -7079,12 +7151,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-19";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "517a79c84890507e0868982f23c7723541a0d0ea";
sha256 = "1acjqz940ykz8xdykb9wirb5aaglsx85wf7f62w3fcxcq4cm7p2h";
rev = "19385830ab737f5c49a4cd44d0cdab5e5ee697d1";
sha256 = "0mz6m1xh4pzqipniawdkslpwk3kaqnlf6drrfbsygljh32fqbl6s";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7439,12 +7511,12 @@ final: prev:
openscad-nvim = buildVimPluginFrom2Nix {
pname = "openscad.nvim";
version = "2023-05-09";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "salkin-mada";
repo = "openscad.nvim";
rev = "2b9263d16fde830133a513a12f968f78c533e5ee";
sha256 = "0fm4xipqj9r888izy93g566cpqg891rkw2j3n7fg7yzjq3pifdzc";
rev = "d77e7b3822da685d24a58081e94c4384e254d91f";
sha256 = "1sf8fhp7mfr9kwf7x1qf4gdbi4xc6qfwjlyyj1aykbxd1b39kg2x";
};
meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
};
@ -8631,12 +8703,12 @@ final: prev:
statuscol-nvim = buildVimPluginFrom2Nix {
pname = "statuscol.nvim";
version = "2023-06-15";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "luukvbaal";
repo = "statuscol.nvim";
rev = "98d335ca2c0781ad0d06189441cf7d9e4b0cf073";
sha256 = "0zwh5hbsmzw01616zh9iivvqw6il6j67nqppmb2x22j0g1sjmkxs";
rev = "9f1ff2dcf614544c5022e876d83b4894c1944e87";
sha256 = "1gw8c2aw3s99xxjyh0j62z91g68258gjbz172jh7vkfvqxpbxy3d";
};
meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
};
@ -8653,6 +8725,18 @@ final: prev:
meta.homepage = "https://github.com/teto/stylish.nvim/";
};
substitute-nvim = buildVimPluginFrom2Nix {
pname = "substitute.nvim";
version = "2023-05-16";
src = fetchFromGitHub {
owner = "gbprod";
repo = "substitute.nvim";
rev = "46a78e02b5b009d22df7566cbc25f4ef565c5731";
sha256 = "1k4rmrkl2ggsrp1c2r846g98kz8my8snzi5yk825is839acs517l";
};
meta.homepage = "https://github.com/gbprod/substitute.nvim/";
};
substrata-nvim = buildVimPluginFrom2Nix {
pname = "substrata.nvim";
version = "2022-10-07";
@ -9476,12 +9560,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
version = "2023-06-17";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "18259404c962736c70c0f670b71c976c4a5ac2bb";
sha256 = "0x8406ziys9hs54x1ahdrvxy23ms8wgh377pfp72sf1knpicxa35";
rev = "9a0deaa85219b18a9b7544098d1a1b16d396d856";
sha256 = "1xmhl38n4kjzv7irq5vjdy0dr8jg7snnjp4islq46ly6y53kapj8";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@ -11480,12 +11564,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2023-06-13";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "e3008d96bc9fe0d516cdc96d7471c793a7813a28";
sha256 = "0w5wb9bv9xvd8mz9pfjpgabij1c6arslxy9hdiqscbpi9cx2l3ng";
rev = "397a9c5796a5082b55b71dd3b55152dcf53261de";
sha256 = "1nhcbzi80k9x2g8cf3l7072ln5b9a5vgfplpzhjj9q7iqswhg4bg";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -14987,6 +15071,18 @@ final: prev:
meta.homepage = "https://github.com/lukaszkorecki/workflowish/";
};
wrapping-nvim = buildVimPluginFrom2Nix {
pname = "wrapping.nvim";
version = "2023-05-28";
src = fetchFromGitHub {
owner = "andrewferrier";
repo = "wrapping.nvim";
rev = "5e87f1424c86c50d3bc205830aa56ed1cad45467";
sha256 = "0byca5y7jz9lkb3f5rj97ckazymaz1wlgc3gyjsdzngc9dfliqcx";
};
meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/";
};
wstrip-vim = buildVimPluginFrom2Nix {
pname = "wstrip.vim";
version = "2021-03-14";
@ -15158,12 +15254,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2023-06-14";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "ad6305594737e16155c41c176c611e865c26bb6d";
sha256 = "1j3s5ggzzf01y305zj82nyrvmmkd1rsv5n6x6mk0gc1x0djkg74b";
rev = "71b7a866e092bc2605d790c8d43c4aeb032d0a1c";
sha256 = "10gj36pf2hd5x4rpxwmjqlx129q5i59acdfjyc3dxmx7xxp6qpvi";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -15194,12 +15290,12 @@ final: prev:
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
version = "2023-06-13";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
rev = "0bf17b30c93dc1358b8fc01e126ad1d12a272adb";
sha256 = "035xz509s27r7l3v06vrr87003y1iaaqapjrfb0mbq8m7ywwdbmy";
rev = "3e52a0682a53dd7c2c53133d45948f5a49c5fd9a";
sha256 = "1rvfafi9l2m7bhr4lpccvmyyrf572k61y1bj3jr8vh10i21pmxf0";
};
meta.homepage = "https://github.com/dracula/vim/";
};

View file

@ -392,12 +392,12 @@
};
elixir = buildGrammar {
language = "elixir";
version = "0.0.0+rev=4ba9dab";
version = "0.0.0+rev=7be3905";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "4ba9dab6e2602960d95b2b625f3386c27e08084e";
hash = "sha256-V/7aS+H4X8YzoJOIU9xpJBVvBjbcvwvTxeCsb9X39/I=";
rev = "7be390548a870ca9cb1bd7f59ac92457bbec7bf5";
hash = "sha256-Id+c414ugW3PXOWx75ZMoN13qQdiyWs0cab9mNdT8/A=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@ -469,12 +469,12 @@
};
firrtl = buildGrammar {
language = "firrtl";
version = "0.0.0+rev=58e9655";
version = "0.0.0+rev=572ac53";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-firrtl";
rev = "58e9655caa6b6d0ef8dc0e6bd3d8e060beb6b40d";
hash = "sha256-yvfB5xFBeBP8iFXpeKeD86kCVdu/hxAEw7lQ7ghuKGY=";
rev = "572ac53752252c4b77bd7cf0ce6a07a2db177ab7";
hash = "sha256-TzToUf/9H4JQoE3BN81ELCp+F86fP64bF1bCo6ctZ3k=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl";
};
@ -1120,12 +1120,12 @@
};
matlab = buildGrammar {
language = "matlab";
version = "0.0.0+rev=47cd9bd";
version = "0.0.0+rev=5a047c1";
src = fetchFromGitHub {
owner = "acristoffers";
repo = "tree-sitter-matlab";
rev = "47cd9bde20c53a106cbd9ab1bd18fbfc600264e6";
hash = "sha256-GEFWop90wy9oHWUEWjdeX9sejCsHLVsR/z5RNqCIuuk=";
rev = "5a047c1572792ae943b51af7cf9307097b2fcce0";
hash = "sha256-KFNHhOJv+ZO1FXoI88c5MIrLNsL0HIOOnHiNL7syUkM=";
};
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
};
@ -1278,12 +1278,12 @@
};
org = buildGrammar {
language = "org";
version = "0.0.0+rev=081179c";
version = "0.0.0+rev=64cfbc2";
src = fetchFromGitHub {
owner = "milisims";
repo = "tree-sitter-org";
rev = "081179c52b3e8175af62b9b91dc099d010c38770";
hash = "sha256-tD9sL84LKvkhBzTU40pfd32ggxAcPG2Qk9HIhNXKM0E=";
rev = "64cfbc213f5a83da17632c95382a5a0a2f3357c1";
hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=";
};
meta.homepage = "https://github.com/milisims/tree-sitter-org";
};
@ -1696,12 +1696,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=aa50c24";
version = "0.0.0+rev=7cbac04";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "aa50c2474182c5da73f48fa5a00e02b029780fad";
hash = "sha256-VExitMBuchmOG0L/phH6D4X6uza+B7PpGgHsO94Y9ys=";
rev = "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d";
hash = "sha256-jUetr81AvJr2igJqCKG1Mt6REDTeeyFpgQNRRRwMJXw=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@ -1718,12 +1718,12 @@
};
starlark = buildGrammar {
language = "starlark";
version = "0.0.0+rev=8ad93a7";
version = "0.0.0+rev=80516b3";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-starlark";
rev = "8ad93a74c2a880bc16325affba3cc66c14bb2bde";
hash = "sha256-HHGE7P/QAPCyu7wecRiDLrQIm8lndFjKOOb9xiyXsfc=";
rev = "80516b3a8c2cf058b896d3481309bacf7497f933";
hash = "sha256-sjgJDe2TkGogRztgjNIKyFjlrf9yRulHVn54s2IPfDU=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-starlark";
};

View file

@ -55,6 +55,7 @@
, nodejs
, xdotool
, xorg
, xxd
, zathura
, zsh
@ -575,6 +576,12 @@ self: super: {
dependencies = with self; [ plenary-nvim ];
});
hex-nvim = super.hex-nvim.overrideAttrs (old: {
postPatch = ''
substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd
'';
});
himalaya-vim = super.himalaya-vim.overrideAttrs (old: {
buildInputs = [ himalaya ];
src = fetchFromSourcehut {

View file

@ -244,6 +244,7 @@ https://github.com/direnv/direnv.vim/,,
https://github.com/doki-theme/doki-theme-vim/,,
https://github.com/Mofiqul/dracula.nvim/,HEAD,
https://github.com/stevearc/dressing.nvim/,,
https://github.com/Bekaboo/dropbar.nvim/,HEAD,
https://github.com/Shougo/echodoc.vim/,,
https://github.com/sainnhe/edge/,,
https://github.com/edgedb/edgedb-vim/,,
@ -257,6 +258,7 @@ https://github.com/mattn/emmet-vim/,,
https://github.com/vim-scripts/emodeline/,,
https://github.com/sainnhe/everforest/,,
https://github.com/nvchad/extensions/,HEAD,nvchad-extensions
https://github.com/jinh0/eyeliner.nvim/,HEAD,
https://github.com/fenetikm/falcon/,,
https://github.com/brooth/far.vim/,,
https://github.com/konfekt/fastfold/,,
@ -329,7 +331,9 @@ https://github.com/neovimhaskell/haskell-vim/,,
https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
https://github.com/travitch/hasksyn/,,
https://github.com/rebelot/heirline.nvim/,,
https://github.com/RaafatTurki/hex.nvim/,HEAD,
https://github.com/Yggdroot/hiPairs/,,
https://github.com/tzachar/highlight-undo.nvim/,HEAD,
https://git.sr.ht/~soywod/himalaya-vim,,
https://github.com/mpickering/hlint-refactor-vim/,,
https://github.com/edluffy/hologram.nvim/,,
@ -523,6 +527,7 @@ https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
https://github.com/folke/noice.nvim/,HEAD,
https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,
https://github.com/vigoux/notifier.nvim/,HEAD,
https://github.com/jlesquembre/nterm.nvim/,,
https://github.com/MunifTanjim/nui.nvim/,main,
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
@ -584,6 +589,7 @@ https://github.com/rcarriga/nvim-notify/,,
https://github.com/LhKipp/nvim-nu/,HEAD,
https://github.com/ojroques/nvim-osc52/,,
https://github.com/gennaro-tedesco/nvim-peekup/,,
https://github.com/yorickpeterse/nvim-pqf/,HEAD,
https://github.com/olrtg/nvim-rename-state/,HEAD,
https://github.com/petertriho/nvim-scrollbar/,HEAD,
https://github.com/dstein64/nvim-scrollview/,,
@ -728,6 +734,7 @@ https://github.com/eigenfoo/stan-vim/,,
https://github.com/darfink/starsearch.vim/,,
https://github.com/luukvbaal/statuscol.nvim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/gbprod/substitute.nvim/,HEAD,
https://github.com/kvrohit/substrata.nvim/,HEAD,
https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
@ -1262,6 +1269,7 @@ https://github.com/sindrets/winshift.nvim/,,
https://github.com/wannesm/wmgraphviz.vim/,,
https://github.com/vim-scripts/wombat256.vim/,,
https://github.com/lukaszkorecki/workflowish/,,
https://github.com/andrewferrier/wrapping.nvim/,HEAD,
https://github.com/tweekmonster/wstrip.vim/,,
https://github.com/drmingdrmer/xptemplate/,,
https://github.com/guns/xterm-color-table.vim/,,

View file

@ -651,8 +651,8 @@ let
mktplcRef = {
name = "ruff";
publisher = "charliermarsh";
version = "2023.24.0";
sha256 = "sha256-wwunbseX/VxoU8mRDankDim6PQy8uwEhLXR4RUVo7Xw=";
version = "2023.26.0";
sha256 = "sha256-5JaOo0BqTWo3NAdzS9DSClTwB9YiBhICEPOqWmBv270=";
};
meta = {
license = lib.licenses.mit;
@ -1222,8 +1222,8 @@ let
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
version = "9.13.0";
sha256 = "sha256-Iqz1O6odSzAfojCgGDwDA1YtnWU5Ei7vx9Qt25/1SLw=";
version = "9.14.0";
sha256 = "sha256-0eb3W9SErsqPofjR1DaChDghvWOQFSYIMnnWbu8GiHY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";

View file

@ -1,7 +1,6 @@
{ lib
, buildDotnetModule
, dotnetCorePackages
, stdenvNoCC
, fetchFromGitHub
, wrapGAppsHook
, libX11
@ -29,13 +28,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.826"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.897"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "42b9c1e8fede88880454154f8c3683f1f8424ed9";
sha256 = "1r879kvs6v08lrxw75xs5jsffmf8j6bb7bs9szrrgj24aza0kl72";
rev = "f9a538bb0f02b4665f8cccbde0730e08da208024";
sha256 = "07y4235bjd2a3fssm6y2hdkzsriwlb7sdblmj6qjl55qh4q6xrqw";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View file

@ -2,25 +2,26 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Avalonia"; version = "0.10.19"; sha256 = "1yzrbp0b6kv9h9d4kl96ldr6ln40xj1j2yvbvpm0pgv7ajwr7qhc"; })
(fetchNuGet { pname = "Avalonia"; version = "0.10.21"; sha256 = "1x6z0wvlg5ww6n7idj2pwc6mxd7k9xsb7vh3v0z4in3rck0vwz95"; })
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.19"; sha256 = "0wlmr4dlz8x3madm7xwhmsf0kgdnwcy6n7zvfd9x6h0bllii1lbn"; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.19"; sha256 = "0vghwp1wx6l1z0dlvd9aqdaikz6k34q0i9yzaphqlzjp6ms2g2ny"; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.19"; sha256 = "1zlcp8mwn2nscrdsvxlspny22m054gsva9az27pvk7s2s5mrqgfk"; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.19"; sha256 = "01fin1w9nwa3c9kpvbri26x1r4g59hmayx9r5hxwbhq7s7vm5ghr"; })
(fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.19"; sha256 = "19b74qs4bfslzldvs87r3skynw9k0bh7m6a2g9q67xb9ppwspr8n"; })
(fetchNuGet { pname = "Avalonia.Native"; version = "0.10.19"; sha256 = "0c9rw2wckyx9h5yfhm0af5zbs53n9bnhv0mlshl7mn0p92v1wfl3"; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.19"; sha256 = "0klk9hqas0h3d3lmr0di175nw2kwq5br1xpprkb4y4m83r5lfy0s"; })
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.16"; sha256 = "11v3a4kda04jacznl7j8fc9zw16ysajwc3ljmdribbqz1rrr823v"; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.21"; sha256 = "0rx9qni3m1zhv6n73kskgj7vd6fxsalg84i2202gz53m11li7yvj"; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.21"; sha256 = "0jjx8lfbzqznqv7xpkfi8xvygqcqfk8wzkj9ambq30cn4h1ids05"; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.21"; sha256 = "10fl0nb8lhpvms1apb3mmswrpirc2j8vr78jvb63cni0885vxhab"; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.21"; sha256 = "038i1vim97niyh9qf5b1lbrakc8r7m03nk1yqn3iv563q8zbwfq7"; })
(fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.21"; sha256 = "0p0jz3za6y708fp0wpbjyqivfp6979ldwx8r95nmdmh10fm9q4yi"; })
(fetchNuGet { pname = "Avalonia.Native"; version = "0.10.21"; sha256 = "08f17zb0dq7p7naz96il15lhbrzan4897wghkl8rrd80dw0bhbb2"; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.21"; sha256 = "03ca99awvp178jsndy5zlsc17rlx29iz0x2jvj85fh6qdvds2dhj"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.19"; sha256 = "16cl9ssmyif2a25fq9kvxs2vr83j589yns53zkfr3wmggl9n6lf2"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.21"; sha256 = "0fja6rv0gw5kjiz0vpnyv5lv8xz5gzd71wz0052x9mrgq3jz00p8"; })
(fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.18"; sha256 = "06h7yh2lkm4rqfchn7nxqjbqx4afh42w61z9sby7b5gj56h5a84q"; })
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.18"; sha256 = "0s25aq3xz0km55jwdxp59z8cc0d1zqaag1hiwnxdzd30id2ahn66"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.19"; sha256 = "1pd3jmrdc738j7b4d8rzaj7fxrfq1m2pl3i62z2ym3h0sxl51xy2"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.19"; sha256 = "1h71w73r7r9ci059qwsjqnhp60l8sfd3i3xsw37qfnbhslcna6hh"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.21"; sha256 = "0ichldyigbsd82jrryq340bqlh7jw9zr850fyni2g3h0bbcx5327"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.21"; sha256 = "08vbdiv2k9vp8gp59rk0z63jyn8hlv8a4956jczy05ail5qfl94v"; })
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
(fetchNuGet { pname = "DynamicData"; version = "7.13.8"; sha256 = "10ywbzk58046kgsbd9rybpa9m1v11as45jvf1qvxnl42hyc7q654"; })
(fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; })
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; })
@ -44,26 +45,26 @@
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.30.1"; sha256 = "1jb7za7kc41zx4vafpmyj42vzqb407b34npb9g6f42sk7127hip1"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.30.1"; sha256 = "1c1hs0nrzlrpvdrpj01yr7cdknh19gdxrahndb5fmn8p4k1vljlv"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.30.1"; sha256 = "02dkmh0qc2sfayvhzp8fgvn58b84yn8z4x3aijvjqahcwv14wfzs"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.30.1"; sha256 = "1283v1ynl7wp5llyswj2nd8l3pkj7yhcksy2slanid52iyqzzan1"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.31.0"; sha256 = "0l1y4q5syl6kcnk6yrjphdj3clfjnmlnxrkvmfjffvfnl9slsh9m"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.31.0"; sha256 = "0vfrrrvz6axfg41pcnwlhqh7gkxl1vrm8hbxjkzkw5a5ijh0i4pc"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.31.0"; sha256 = "0dbvi7ifsl6gdsa1hc4bvma9qyr63gvgamwndy0k7wyvvh492rhm"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.31.0"; sha256 = "0yrsysxgjfwrh1n2mplpm4jwm0ws4p49pdd3zcsql7kjjhs525lv"; })
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
@ -72,7 +73,7 @@
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; })
(fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; })
(fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; })
(fetchNuGet { pname = "OpenTK.Core"; version = "4.7.7"; sha256 = "1jyambm9lp0cnzy2mirv5psm0gvk2xi92k3r5jf0mi2jqmd2aphn"; })
@ -177,7 +178,7 @@
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; })
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.30.1"; sha256 = "1f4x5sw9wpkk485lchl0nzdzkcy83s9b119c7g187x0qvkcvdpc2"; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.31.0"; sha256 = "03bwmmznb4axcvlx8ql5cgigpbldjc1zrxnf5kj25r4drq8yp1cm"; })
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; })
@ -189,7 +190,7 @@
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Management"; version = "7.0.1"; sha256 = "02sca1yg3inkqsh1lsjrv5hn10ijp2rsbgh0k5cvnf5k54d422vj"; })
(fetchNuGet { pname = "System.Management"; version = "7.0.2"; sha256 = "0mjdkzl459hnz0qg4m0xp2kwizsqgdc9vc3xk7y7cv0znhhbb7bc"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
@ -204,6 +205,7 @@
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })
(fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })

View file

@ -14,17 +14,19 @@
, curl
, libuchardet
, spdlog
, fribidi
, vte
}:
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.49";
version = "0.99.55";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
sha256 = "sha256-p7kiOxy4o0RwmN3LFfLSpkz08KcYYMVxVAEUvAX1KEA=";
hash = "sha256-1ytph2HTwIqVTD6+a5P1gvFG+2xsfZWRkmn7RpwuwKY=";
};
nativeBuildInputs = [
@ -44,6 +46,8 @@ stdenv.mkDerivation rec {
curl
libuchardet
spdlog
fribidi
vte
];
meta = with lib; {

View file

@ -16,7 +16,6 @@
, maven
, webkitgtk_4_1
, glib-networking
, javaPackages
}:
let
@ -24,9 +23,7 @@ let
jdk = jdk17;
};
in
(javaPackages.mavenfod.override {
maven = mavenJdk17;
}) rec {
mavenJdk17.buildMavenPackage rec {
pname = "dbeaver";
version = "22.2.2"; # When updating also update mvnHash
@ -37,7 +34,7 @@ in
hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
};
mvnHash = "sha256-87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
mvnHash = "sha256-ERZYDsPxp1YXteSmunFIgTGZUYqjZJhqrNytLnIUNBQ=";
mvnParameters = "-P desktop,all-platforms";
nativeBuildInputs = [

View file

@ -1,17 +1,25 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, buildPackages }:
{ stdenv
, lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
, buildPackages
, testers
, hugo
}:
buildGoModule rec {
pname = "hugo";
version = "0.113.0";
version = "0.114.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-oKGRbgr4jaau6wfo6Q/yhYgambGa+wb3ENtk6wrb0J0=";
hash = "sha256-ofHBpRXgfT8nadAtW0RWbuHhjtANX7gXqZoLLBrRarU=";
};
vendorHash = "sha256-+eVaV6iGsubMt6cq0lKP0i69BlYW8jwx6lT6rwhZAoA=";
vendorHash = "sha256-sogMGgBXB1cHbDbapbX/PvvOHRgzzT8s4h2xsX4irpM=";
doCheck = false;
@ -34,6 +42,12 @@ buildGoModule rec {
--zsh <(${emulator} $out/bin/hugo completion zsh)
'';
passthru.tests.version = testers.testVersion {
package = hugo;
command = "hugo version";
version = "v${version}";
};
meta = with lib; {
description = "A fast and modern static website engine";
homepage = "https://gohugo.io";

View file

@ -1528,7 +1528,7 @@ dependencies = [
[[package]]
name = "kord"
version = "0.5.16"
version = "0.6.1"
dependencies = [
"anyhow",
"async-trait",

View file

@ -7,7 +7,7 @@
rustPlatform.buildRustPackage rec {
pname = "kord";
version = "0.5.16";
version = "0.6.1";
# kord depends on nightly features
RUSTC_BOOTSTRAP = 1;
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
owner = "twitchax";
repo = "kord";
rev = "v${version}";
sha256 = "sha256-gI88fweOT2t+4cj58/mLygtTnue2Ai1QSC5oZf7Xv/g=";
sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84=";
};
cargoLock = {

View file

@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snagboot";
version = "1.0";
version = "1.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "bootlin";
repo = "snagboot";
rev = "v${version}";
hash = "sha256-QqGeELm2seX3tIKQvuXp9VsNDah+m9FNcaEVk6TMP0U=";
hash = "sha256-MU6LzjH6s2MS7T3u1OUeJ5ZmWgL0otA/q0ylwTNH4fA=";
};
passthru = {
@ -56,14 +56,14 @@ python3.pkgs.buildPythonApplication rec {
];
postInstall = lib.optionalString stdenv.isLinux ''
rules="src/snagrecover/80-snagboot.rules"
rules="src/snagrecover/50-snagboot.rules"
if [ ! -f "$rules" ]; then
echo "$rules is missing, must update the Nix file."
exit 1
fi
mkdir -p "$out/lib/udev/rules.d"
cp "$rules" "$out/lib/udev/rules.d/80-snagboot.rules"
cp "$rules" "$out/lib/udev/rules.d/50-snagboot.rules"
'';
# There are no tests

View file

@ -55,6 +55,7 @@
, gnum4
, gtk3
, icu
, icu72
, libGL
, libGLU
, libevent
@ -440,7 +441,6 @@ buildStdenv.mkDerivation ({
freetype
glib
gtk3
icu
libffi
libGL
libGLU
@ -468,6 +468,9 @@ buildStdenv.mkDerivation ({
zip
zlib
]
# icu73 changed how it follows symlinks which breaks in the firefox sandbox
# https://bugzilla.mozilla.org/show_bug.cgi?id=1839287
++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ]
++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional jackSupport libjack2

View file

@ -29,11 +29,11 @@
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
version = "114.0b7";
version = "115.0b7";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "6cfcaa08d74d6e123047cd33c1bc2e012e948890ea8bab5feb43459048a41c10f6bc549241386a3c81d438b59e966e7949161fe3f18b359ec8659bdf2ba0f187";
sha512 = "4ae6b74e7a47c06c3630c911d5bbcd6c390f1462f4335c8fd084cf455675c88872864390e22847da16564484b70fbac09625015fc6a4cf10a01ed8052016991e";
};
meta = {
@ -56,12 +56,12 @@
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
version = "114.0b7";
version = "115.0b7";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2aa9ec2eb57b6debe3a15ac43f4410a4d649c8373725be8ed2540effa758d970e29c9ca675d9ac27a4b58935fc428aaf8b84ecd769b88f3607e911178492ebf1";
sha512 = "f360ca7c5eb69d16a54b37a95195f4981c19e7e081cf7d494dafc1838ec69f2beabae5eaed23b0b551e71b32e3d0213383bc43e63416d390aa453bfa8b0f1993";
};
meta = {

View file

@ -61,8 +61,8 @@ rec {
};
kops_1_26 = mkKops rec {
version = "1.26.3";
sha256 = "sha256-8IQbVFqH5r8H7z7U441Aox4yp3KF/sqs3+JpMru8qwQ=";
version = "1.26.4";
sha256 = "sha256-dHwakorYSQCv5Pi6l32y5cajLd9teXwEds1LFgiH0ck=";
rev = "v${version}";
};
}

View file

@ -9,14 +9,14 @@
"vendorHash": null
},
"acme": {
"hash": "sha256-pmI/AOAfTrxE3PXaere2pzx5Lm4FuqGCn2O/4jZonfE=",
"hash": "sha256-oJ/z4NY/zba1fxH2uyzpbggc0C+8fRsJ2E/NrJyCvkQ=",
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
"owner": "vancluever",
"proxyVendor": true,
"repo": "terraform-provider-acme",
"rev": "v2.15.0",
"rev": "v2.15.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-5IAAxe1YK3MVnQIVO0/E1YaFU9ktOfUX8v3W6mwW090="
"vendorHash": "sha256-aeIZKd4f9fRyFGgeiAGABWkyj/mdtiCnEPhUenLqRXU="
},
"age": {
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
@ -882,11 +882,11 @@
"vendorHash": null
},
"ovh": {
"hash": "sha256-1AM0kHLr+wXkpncAQvt+nbYAaI25V/2asEiWDNCKsgA=",
"hash": "sha256-DAixUxPk0ilbZ6T6Vf9YUKWt+6x7Ru77uYmmzUkPM0M=",
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
"owner": "ovh",
"repo": "terraform-provider-ovh",
"rev": "v0.30.0",
"rev": "v0.31.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -954,11 +954,11 @@
"vendorHash": "sha256-ScY/hAb14SzEGhKLpnJ8HrWOccwc2l0XW6t+f62LyWM="
},
"remote": {
"hash": "sha256-up4+W2mLii7alqdcBoMBTAWI5Vwfc1QtsDK592sAcDM=",
"hash": "sha256-x0mTouv+hRGznyn2XxohWzPb0vjJvJf6kDlWrLJ/JvA=",
"homepage": "https://registry.terraform.io/providers/tenstad/remote",
"owner": "tenstad",
"repo": "terraform-provider-remote",
"rev": "v0.1.1",
"rev": "v0.1.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU="
},

View file

@ -1,12 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.17.1";
hash = "sha256-9m9+waQgQQk/7T7d4UZY3PqgPEhseaXmI8lZ5oiI92A=";
version = "6.21.0";
hash = "sha256-MDjh2slEmGCMn0Q4YsIzVQO2I7ZE5XUJX5qH4OYFFxw=";
};
signal-desktop-beta = {
dir = "Signal Beta";
version = "6.18.0-beta.2";
hash = "sha256-qfBc1+XwHbD/FAGLezmgOJsAYn4ZTuGU4w1aR8g/2U0=";
version = "6.22.0-beta.3";
hash = "sha256-Obc7JHfsFrkJkcgm/i9/6hDsoHczqz7txg4W+u/Jems=";
};
}

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
# few additional steps and might not be the best idea.)
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/${pname}/${pname}_${version}_amd64.deb";
url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb";
inherit hash;
};

View file

@ -0,0 +1,52 @@
{stdenv
,lib
, cmake
, pkg-config
, fetchFromGitHub
, qtbase
, qttools
, kwidgetsaddons
, kwindowsystem
, fmt
, libpsl
, cxxopts
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tremotesf";
version = "2.4.0";
src = fetchFromGitHub {
owner = "equeim";
repo = "tremotesf2";
rev = finalAttrs.version;
hash = "sha256-TKtBgMpCWIUl1bohAKCbTcZX2uaPmzeWut/OeNs/rME=";
# We need this for src/libtremotesf
fetchSubmodules = true;
};
buildInputs = [
qtbase
qttools
fmt
libpsl
kwidgetsaddons
kwindowsystem
cxxopts
];
nativeBuildInputs = [
cmake
pkg-config
];
propagatedBuildInputs = [ wrapQtAppsHook ];
meta = with lib; {
description = "Remote GUI for transmission-daemon";
license = licenses.gpl3Plus;
homepage = "https://github.com/equeim/tremotesf2";
maintainers = with maintainers; [ sochotnicky ];
};
})

View file

@ -1,33 +1,39 @@
{ lib
, stdenv
, fetchurl
, fetchzip
, desktop-file-utils
, intltool
, meson
, ninja
, pkg-config
, wrapGAppsHook
, gssdp
, gssdp_1_6
, gtk3
, gupnp
, gupnp_1_6
}:
stdenv.mkDerivation rec {
pname = "upnp-router-control";
version = "0.3.1";
version = "0.3.2";
src = fetchurl {
url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.gz";
hash = "sha256-bYbw4Z5hDlFTSGk5XE2gnnXRPYMl4IzV+kzlwfR98yg=";
src = fetchzip {
url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz";
hash = "sha256-724xcIYNufmSgrHwmIk3awEAVlta9huNa0o6Z0hdBwQ=";
};
nativeBuildInputs = [
desktop-file-utils
intltool
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
gssdp
gssdp_1_6
gtk3
gupnp
gupnp_1_6
];
meta = with lib; {

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
, jre, maven, git
{ lib, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
, jre, maven
}:
let
@ -25,54 +25,29 @@ let
# provide that version number manually as a property.
# (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481)
# Also use the commit date as a build and output timestamp.
mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
in
stdenv.mkDerivation rec {
maven.buildMavenPackage rec {
pname = "digital";
inherit version jre;
src = fetchFromGitHub {
owner = "hneemann";
repo = "Digital";
rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6";
sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM=";
rev = "v${version}";
hash = "sha256-cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM=";
};
# Fetching maven dependencies from "central" needs the network at build phase,
# we do that in this extra derivation that explicitly specifies its
# outputHash to ensure determinism.
mavenDeps = stdenv.mkDerivation {
name = "${pname}-${version}-maven-deps";
inherit src nativeBuildInputs version;
dontFixup = true;
buildPhase = ''
mvn package ${mvnOptions} -Dmaven.repo.local=$out
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with
# lastModified timestamps inside
installPhase = ''
find $out -type f \
-name \*.lastUpdated -or \
-name resolver-status.properties -or \
-name _remote.repositories \
-delete
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE=";
};
inherit mvnParameters;
mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68=";
nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
buildPhase = ''
mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps}
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/java
classpath=$(find ${mavenDeps} -name "*.jar" -printf ':%h/%f');
classpath=$(find $mvnDeps/.m2 -name "*.jar" -printf ':%h/%f');
install -Dm644 target/Digital.jar $out/share/java
makeWrapper ${jre}/bin/java $out/bin/${pname} \

View file

@ -1,6 +1,12 @@
{ lib, stdenv, fetchFromGitHub, jdk11, maven, javaPackages }:
{ lib, fetchFromGitHub, jdk11, maven, javaPackages }:
let
mavenJdk11 = maven.override {
jdk = jdk11;
};
in
mavenJdk11.buildMavenPackage rec {
pname = "gephi";
version = "0.10.1";
src = fetchFromGitHub {
@ -10,35 +16,9 @@ let
hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
deps = stdenv.mkDerivation {
name = "gephi-${version}-deps";
inherit src;
buildInputs = [ jdk11 maven ];
buildPhase = ''
while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading"
done
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-OdW4M5nGEkYkmHpRLM4cBQtk4SJII2uqM8TXb6y4eXk=";
};
in
stdenv.mkDerivation {
pname = "gephi";
inherit version;
mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg=";
inherit src;
buildInputs = [ jdk11 maven ];
buildPhase = ''
# 'maven.repo.local' must be writable so copy it out of nix store
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
'';
nativeBuildInputs = [ jdk11 mavenJdk11 ];
installPhase = ''
cp -r modules/application/target/gephi $out

View file

@ -83,7 +83,7 @@ let
else
fetchurl {
url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip";
sha256 = "1rqh3nprxfmnyihllw31nb8i3wfhybmsic6y7z6wn4rafyv3w4fk";
hash = "sha256:1f2qins5kaz5v6mkaclncqpirx3mlz177ywm13py9p6s9mk99g32";
};
mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11";
in

View file

@ -39,16 +39,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "rio";
version = "0.0.6.1-unstable-2023-06-18";
version = "0.0.7";
src = fetchFromGitHub {
owner = "raphamorim";
repo = "rio";
rev = "f3fbe7a020528d2f5ed8beaa3afd900a4c2e83a2";
hash = "sha256-emZqD/vvQHk43E8gTHVczCOni110sCRLMWp9igruYc8=";
rev = "v${version}";
hash = "sha256-SiDYOhwuxksmIp7hvrA3TX1TFB4PsojnOa8FpYvi9q0=";
};
cargoHash = "sha256-1ZQae5IHA+8HwyYGFBy1XPEYR8NAHHrU1JNOMT7T5zA=";
cargoHash = "sha256-A5hMJUHdewhMPcCZ3ogqhQLW7FAmXks8f8l5tTtyBac=";
nativeBuildInputs = [
autoPatchelfHook

View file

@ -10,24 +10,24 @@ with lib;
let
pname = "gitkraken";
version = "9.4.0";
version = "9.5.1";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-b2ntm5Yja806JZEmcrLi1CSsDRmBot85LPy39Zn7ULw=";
sha256 = "sha256-irKs0yvz2TrKvF34DMOBdmJvH+Lox/ZVbPSaHAl6Vyo=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-GV1TVjxPSosRIB99QSnOcowp8p9dWLNX2VxP6LDlQ6w=";
sha256 = "sha256-3g49FBbolEhBgSPanLnrWhfxHR5jg4C1p+70rIrQ2GM=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-65HloijD1Z7EEiiG+qUr5Rj+z+eYAaeN6HmuBm1bGgs=";
sha256 = "sha256-8ateh2LswWMOboPASWcYTy6OfK30h7wABIgoZXJ7GTM=";
};
};

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.22.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
sha256 = "sha256-K6xWTPu2a5NKYAYBt/sCWQOmuw9TCoKPA4ZxkoLWmeY=";
hash = "sha256-Mz4/Q1EmTg3vXIYbIdr5MtemGrBSkvBBwcfz+McEaJ8=";
};
cargoSha256 = "sha256-MZrx72poA6uOIulWIQkfOr9gy5qr5f61UtLITfES/rk=";
cargoHash = "sha256-hsu3WQfqMnD5frJP6wDcexG7HafXmzs5ZIGePGOBRVs=";
nativeBuildInputs = [ pkg-config ];
@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Blazing fast terminal-ui for Git written in Rust";
homepage = "https://github.com/extrawurst/gitui";
changelog = "https://github.com/extrawurst/gitui/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne yanganto ];
};

View file

@ -0,0 +1,53 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, openssl
, zlib
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "gql";
version = "0.1.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
hash = "sha256-UEfluWgoSuPnHGsoPcVLuAqmJsqCJL2B29UsQeZctuE=";
};
cargoHash = "sha256-y49pnx1OkUu7yKnwTGpPGv3ULUPpj/Z4bOPVIO3nS0E=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
env = {
OPENSSL_NO_VENDOR = true;
};
# Cargo.lock is outdated
preConfigure = ''
cargo metadata --offline
'';
meta = with lib; {
description = "A SQL like query language to perform queries on .git files";
homepage = "https://github.com/AmrDeveloper/GQL";
changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -0,0 +1,44 @@
{ lib, rustPlatform, fetchgit
, pkg-config, pixman, libcap_ng, cyrus_sasl
, libpulseaudio, libclang, gtk3, libusbgx, alsa-lib
, linuxHeaders, libseccomp
}:
rustPlatform.buildRustPackage rec {
pname = "stratovirt";
version = "2.2.0";
src = fetchgit {
url = "https://gitee.com/openeuler/stratovirt.git";
rev = "v${version}";
sha256 = "sha256-K99CmaBrJu30/12FxnsNsDKsTyX4f2uQSO7cwHsPuDw=";
};
cargoSha256 = "sha256-SFIOGGRzGkVWHIXkviVWuhDN29pa0uD3GqKh+G421xI=";
nativeBuildInputs = [
pkg-config
rustPlatform.bindgenHook
];
buildInputs = [
pixman
libcap_ng
cyrus_sasl
libpulseaudio
gtk3
libusbgx
alsa-lib
libclang
linuxHeaders
libseccomp
];
meta = with lib; {
homepage = "https://gitee.com/openeuler/stratovirt";
description = "Virtual Machine Manager from Huawei";
license = licenses.mulan-psl2;
maintainers = with maintainers; [ astro ];
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
}

View file

@ -0,0 +1,48 @@
{ buildDotnetModule, emptyDirectory, mkNugetDeps, dotnet-sdk }:
{ pname
, version
# Name of the nuget package to install, if different from pname
, nugetName ? pname
# Hash of the nuget package to install, will be given on first build
, nugetSha256 ? ""
# Additional nuget deps needed by the tool package
, nugetDeps ? (_: [])
# Executables to wrap into `$out/bin`, same as in `buildDotnetModule`, but with
# a default of `pname` instead of null, to avoid auto-wrapping everything
, executables ? pname
# The dotnet runtime to use, dotnet tools need a full SDK to function
, dotnet-runtime ? dotnet-sdk
, ...
} @ args:
buildDotnetModule (args // {
inherit pname version dotnet-runtime executables;
src = emptyDirectory;
nugetDeps = mkNugetDeps {
name = pname;
nugetDeps = { fetchNuGet }: [
(fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; })
] ++ (nugetDeps fetchNuGet);
};
projectFile = "";
useDotnetFromEnv = true;
dontBuld = true;
installPhase = ''
runHook preInstall
dotnet tool install --tool-path $out/lib/${pname} ${nugetName}
# remove files that contain nix store paths to temp nuget sources we made
find $out -name 'project.assets.json' -delete
find $out -name '.nupkg.metadata' -delete
runHook postInstall
'';
})

View file

@ -12,6 +12,7 @@
, nuget-to-nix
, cacert
, coreutils
, runtimeShellPackage
}:
{ name ? "${args.pname}-${args.version}"
@ -74,7 +75,10 @@
, buildType ? "Release"
# If set to true, builds the application as a self-contained - removing the runtime dependency on dotnet
, selfContainedBuild ? false
# Whether to explicitly enable UseAppHost when building
# Whether to use an alternative wrapper, that executes the application DLL using the dotnet runtime from the user environment. `dotnet-runtime` is provided as a default in case no .NET is installed
# This is useful for .NET tools and applications that may need to run under different .NET runtimes
, useDotnetFromEnv ? false
# Whether to explicitly enable UseAppHost when building. This is redundant if useDotnetFromEnv is enabledz
, useAppHost ? true
# The dotnet SDK to use.
, dotnet-sdk ? dotnetCorePackages.sdk_6_0
@ -158,7 +162,7 @@ stdenvNoCC.mkDerivation (args // {
# gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping
dontWrapGApps = args.dontWrapGApps or true;
inherit selfContainedBuild useAppHost;
inherit selfContainedBuild useAppHost useDotnetFromEnv;
passthru = {
inherit nuget-source;
@ -183,7 +187,7 @@ stdenvNoCC.mkDerivation (args // {
writeShellScript "fetch-${pname}-deps" ''
set -euo pipefail
export PATH="${lib.makeBinPath [ coreutils dotnet-sdk (nuget-to-nix.override { inherit dotnet-sdk; }) ]}"
export PATH="${lib.makeBinPath [ coreutils runtimeShellPackage dotnet-sdk (nuget-to-nix.override { inherit dotnet-sdk; }) ]}"
for arg in "$@"; do
case "$arg" in
@ -262,7 +266,7 @@ stdenvNoCC.mkDerivation (args // {
echo "Restoring project..."
${dotnet-sdk}/bin/dotnet tool restore
mv $HOME/.nuget/packages/* $tmp/nuget_pkgs || true
cp -r $HOME/.nuget/packages/* $tmp/nuget_pkgs || true
for rid in "${lib.concatStringsSep "\" \"" runtimeIds}"; do
(( ''${#projectFiles[@]} == 0 )) && dotnetRestore "" "$rid"
@ -271,6 +275,8 @@ stdenvNoCC.mkDerivation (args // {
dotnetRestore "$project" "$rid"
done
done
# Second copy, makes sure packages restored by ie. paket are included
cp -r $HOME/.nuget/packages/* $tmp/nuget_pkgs || true
echo "Succesfully restored project"

View file

@ -1,4 +1,7 @@
{ lib
, stdenv
, which
, coreutils
, callPackage
, makeSetupHook
, makeWrapper
@ -67,6 +70,9 @@ in
substitutions = {
dotnetRuntime = dotnet-runtime;
runtimeDeps = libraryPath;
shell = stdenv.shell;
which = "${which}/bin/which";
dirname = "${coreutils}/bin/dirname";
};
} ./dotnet-fixup-hook.sh) { };
}

View file

@ -25,8 +25,6 @@ dotnetConfigureHook() {
${dotnetFlags[@]}
}
(( "${#projectFile[@]}" == 0 )) && dotnetRestore
# Generate a NuGet.config file to make sure everything,
# including things like <Sdk /> dependencies, is restored from the proper source
cat <<EOF > "./NuGet.config"
@ -39,8 +37,16 @@ cat <<EOF > "./NuGet.config"
</configuration>
EOF
# Patch paket.dependencies and paket.lock (if found) to use the proper source. This ensures
# paket restore works correctly
# We use + instead of / in sed to avoid problems with slashes
find -name paket.dependencies -exec sed -i 's+source .*+source @nugetSource@/lib+g' {} \;
find -name paket.lock -exec sed -i 's+remote:.*+remote: @nugetSource@/lib+g' {} \;
env dotnet tool restore --add-source "@nugetSource@/lib"
(( "${#projectFile[@]}" == 0 )) && dotnetRestore
for project in ${projectFile[@]} ${testProjectFile[@]-}; do
dotnetRestore "$project"
done

View file

@ -5,13 +5,22 @@ makeWrapperArgs=( "${derivationMakeWrapperArgs[@]}" )
# First argument is the executable you want to wrap,
# the second is the destination for the wrapper.
wrapDotnetProgram() {
local dotnetRootFlags=()
if [ ! "${selfContainedBuild-}" ]; then
local -r dotnetRootFlag=("--set" "DOTNET_ROOT" "@dotnetRuntime@")
if [ "${useDotnetFromEnv-}" ]; then
# if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@dirname@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"')
dotnetRootFlags+=("--suffix" "PATH" ":" "@dotnetRuntime@/bin")
else
dotnetRootFlags+=("--set" "DOTNET_ROOT" "@dotnetRuntime@")
dotnetRootFlags+=("--prefix" "PATH" ":" "@dotnetRuntime@/bin")
fi
fi
makeWrapper "$1" "$2" \
--suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \
"${dotnetRootFlag[@]}" \
"${dotnetRootFlags[@]}" \
"${gappsWrapperArgs[@]}" \
"${makeWrapperArgs[@]}"

View file

@ -36,8 +36,8 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
self:
let
inherit (self) emacs;
withNativeCompilation = emacs.withNativeCompilation or false;
withTreeSitter = emacs.withTreeSitter or false;
withNativeCompilation = emacs.withNativeCompilation or emacs.nativeComp or false;
withTreeSitter = emacs.withTreeSitter or emacs.treeSitter or false;
in
packagesFun: # packages explicitly requested by the user
let

View file

@ -41,7 +41,6 @@ let
};
arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported");
isAarch64Darwin = stdenv.system == "aarch64-darwin";
nativeCheckInputs = [ git gmp openssl readline libxml2 libyaml libffi ];
@ -80,7 +79,7 @@ let
, extraBuildInputs ? [ ]
, buildFlags ? [ "all" "docs" "release=1"]
}:
lib.fix (compiler: stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "crystal";
inherit buildFlags doCheck version;
@ -235,7 +234,7 @@ let
passthru.buildBinary = binary;
passthru.buildCrystalPackage = callPackage ./build-package.nix {
crystal = compiler;
crystal = finalAttrs.finalPackage;
};
meta = with lib; {
@ -245,7 +244,7 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ david50407 manveru peterhoeg ];
};
}))
})
);
in

View file

@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
mesonAutoFeatures = "auto";
mesonFlags = [
(lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
(lib.mesonBool "tests" finalAttrs.doCheck)
(lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
];
doCheck =

View file

@ -15,12 +15,12 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.66.0";
version = "0.67.1";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-BFeNnpMT+WKqTvjVg+H2qHl5EUMcbe7xmJohbpD99gY=";
sha256 = "sha256-trLl4suIu2b+naw99Fwr+iEZrfYV3s4Sedg2lX3uUcA=";
fetchSubmodules = true;
};
@ -103,8 +103,6 @@ ocamlPackages.buildDunePackage rec {
# vendored tezos' deps
aches
aches-lwt
tezos-plonk
tezos-bls12-381-polynomial
ctypes
ctypes_stubs_js
class_group_vdf
@ -128,6 +126,8 @@ ocamlPackages.buildDunePackage rec {
pure-splitmix
zarith_stubs_js
simple-diff
seqes
stdint
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];

View file

@ -131,8 +131,13 @@ let
inherit llvm_meta;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
lldb = callPackage ../common/lldb.nix {
src = fetch "lldb" "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7";
patches = [
./lldb/procfs.patch
./lldb/gnu-install-dirs.patch
];
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -1,128 +0,0 @@
{ lib, stdenv, llvm_meta
, fetch
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, libxml2
, libllvm
, libclang
, python3
, version
, darwin
, lit
, makeWrapper
, enableManpages ? false
}:
stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
src = fetch pname "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7";
patches = [
./procfs.patch
./gnu-install-dirs.patch
];
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
buildInputs = [
ncurses zlib libedit libxml2 libllvm
] ++ lib.optionals stdenv.isDarwin [
darwin.libobjc
darwin.apple_sdk.libs.xpc
darwin.apple_sdk.frameworks.Foundation
darwin.bootstrap_cmds
darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.Cocoa
];
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger";
longDescription = ''
LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
buildPhase = ''
make docs-man
'';
propagatedBuildInputs = [];
# manually install lldb man page
installPhase = ''
mkdir -p $out/share/man/man1
install docs/man/lldb.1 -t $out/share/man/man1/
'';
postPatch = null;
postInstall = null;
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man pages for LLDB ${version}";
};
})

View file

@ -146,8 +146,13 @@ let
inherit llvm_meta;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
lldb = callPackage ../common/lldb.nix {
src = fetch "lldb" "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj";
patches = [
./lldb/procfs.patch
./lldb/gnu-install-dirs.patch
];
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -1,126 +0,0 @@
{ lib, stdenv, llvm_meta
, fetch
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, libxml2
, libllvm
, libclang
, python3
, version
, darwin
, lit
, makeWrapper
, enableManpages ? false
}:
stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj";
patches = [
./procfs.patch
./gnu-install-dirs.patch
];
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
buildInputs = [
ncurses zlib libedit libxml2 libllvm
] ++ lib.optionals stdenv.isDarwin [
darwin.libobjc
darwin.apple_sdk.libs.xpc
darwin.apple_sdk.frameworks.Foundation
darwin.bootstrap_cmds
darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.Cocoa
];
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger";
longDescription = ''
LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
buildPhase = ''
make docs-man
'';
propagatedBuildInputs = [];
# manually install lldb man page
installPhase = ''
mkdir -p $out/share/man/man1
install docs/man/lldb.1 -t $out/share/man/man1/
'';
postPatch = null;
postInstall = null;
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man pages for LLDB ${version}";
};
})

View file

@ -135,11 +135,23 @@ let
inherit (libraries) libunwind;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
inherit (darwin) libobjc bootstrap_cmds;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
lldb = callPackage ../common/lldb.nix {
src = fetch "lldb" "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78";
patches =
let
resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch"
{
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir
'')) { };
in
[
./lldb/procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
];
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -1,142 +0,0 @@
{ lib, stdenv, llvm_meta
, runCommand
, fetch
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, libxml2
, libllvm
, libclang
, python3
, version
, libobjc
, xpc
, Foundation
, bootstrap_cmds
, Carbon
, Cocoa
, lit
, makeWrapper
, enableManpages ? false
}:
stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
src = fetch pname "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78";
patches = [
./procfs.patch
(runCommand "resource-dir.patch" {
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'')
./gnu-install-dirs.patch
];
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
buildInputs = [
ncurses
zlib
libedit
libxml2
libllvm
]
++ lib.optionals stdenv.isDarwin [
libobjc
xpc
Foundation
bootstrap_cmds
Carbon
Cocoa
];
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger";
longDescription = ''
LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
buildPhase = ''
make docs-lldb-man
'';
propagatedBuildInputs = [];
# manually install lldb man page
installPhase = ''
mkdir -p $out/share/man/man1
install docs/man/lldb.1 -t $out/share/man/man1/
'';
postPatch = null;
postInstall = null;
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man pages for LLDB ${version}";
};
})

View file

@ -135,11 +135,36 @@ let
inherit llvm_meta;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
inherit (darwin) libobjc bootstrap_cmds;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
lldb = callPackage ../common/lldb.nix {
patches =
let
resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch"
{
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir
'')) { };
in
[
./lldb/procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./lldb/cpu_subtype_arm64e_replacement.patch;
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -1,159 +0,0 @@
{ lib, stdenv, llvm_meta
, runCommand
, src
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, libxml2
, libllvm
, libclang
, python3
, version
, libobjc
, xpc
, Foundation
, bootstrap_cmds
, Carbon
, Cocoa
, lit
, makeWrapper
, darwin
, enableManpages ? false
}:
stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
inherit src;
sourceRoot = "source/${pname}";
patches = [
./procfs.patch
(runCommand "resource-dir.patch" {
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'')
./gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./cpu_subtype_arm64e_replacement.patch;
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
buildInputs = [
ncurses
zlib
libedit
libxml2
libllvm
] ++ lib.optionals stdenv.isDarwin [
libobjc
xpc
Foundation
bootstrap_cmds
Carbon
Cocoa
];
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger";
longDescription = ''
LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
buildPhase = ''
make docs-lldb-man
'';
propagatedBuildInputs = [];
# manually install lldb man page
installPhase = ''
mkdir -p $out/share/man/man1
install docs/man/lldb.1 -t $out/share/man/man1/
'';
postPatch = null;
postInstall = null;
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
broken = stdenv.isDarwin;
description = "man pages for LLDB ${version}";
};
})

View file

@ -136,11 +136,36 @@ let
inherit llvm_meta;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
inherit (darwin) libobjc bootstrap_cmds;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
lldb = callPackage ../common/lldb.nix {
patches =
let
resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch"
{
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir
'')) { };
in
[
./lldb/procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./lldb/cpu_subtype_arm64e_replacement.patch;
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -1,167 +0,0 @@
{ lib, stdenv, llvm_meta
, runCommand
, monorepoSrc
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, libxml2
, libllvm
, libclang
, python3
, version
, libobjc
, xpc
, Foundation
, bootstrap_cmds
, Carbon
, Cocoa
, lit
, makeWrapper
, darwin
, enableManpages ? false
, lua5_3
}:
stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
src = runCommand "${pname}-src-${version}" {} ''
mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/${pname} "$out"
'';
sourceRoot = "${src.name}/${pname}";
patches = [
./procfs.patch
(runCommand "resource-dir.patch" {
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'')
./gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./cpu_subtype_arm64e_replacement.patch;
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit makeWrapper lua5_3
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
buildInputs = [
ncurses
zlib
libedit
libxml2
libllvm
] ++ lib.optionals stdenv.isDarwin [
libobjc
xpc
Foundation
bootstrap_cmds
Carbon
Cocoa
];
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
echo "ERROR: lua files not installed where expected!";
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger";
longDescription = ''
LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
buildPhase = ''
make docs-lldb-man
'';
propagatedBuildInputs = [];
# manually install lldb man page
installPhase = ''
mkdir -p $out/share/man/man1
install docs/man/lldb.1 -t $out/share/man/man1/
'';
postPatch = null;
postInstall = null;
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man pages for LLDB ${version}";
};
})

View file

@ -184,11 +184,36 @@ in let
inherit llvm_meta;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
inherit (darwin) libobjc bootstrap_cmds;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
lldb = callPackage ../common/lldb.nix {
patches =
let
resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch"
{
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir
'')) { };
in
[
./lldb/procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./lldb/cpu_subtype_arm64e_replacement.patch;
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -184,11 +184,41 @@ in let
inherit llvm_meta;
};
lldb = callPackage ./lldb {
inherit llvm_meta;
inherit (darwin) libobjc bootstrap_cmds;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
lldb = callPackage ../common/lldb.nix {
src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} ''
mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/lldb "$out"
'') { };
patches =
let
resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch"
{
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir
'')) { };
in
[
# FIXME: do we need this? ./procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./lldb/cpu_subtype_arm64e_replacement.patch;
inherit llvm_meta release_version;
};
# Below, is the LLVM bootstrapping logic. It handles building a

View file

@ -1,186 +0,0 @@
{ lib, stdenv, llvm_meta
, runCommand
, monorepoSrc
, cmake
, ninja
, zlib
, ncurses
, swig
, which
, libedit
, libxml2
, libllvm
, libclang
, python3
, version
, libobjc
, xpc
, Foundation
, bootstrap_cmds
, Carbon
, Cocoa
, lit
, makeWrapper
, darwin
, enableManpages ? false
, lua5_3
}:
# TODO: we build the python bindings but don't expose them as a python package
# TODO: expose the vscode extension?
stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
src = runCommand "${pname}-src-${version}" {} ''
mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/${pname} "$out"
'';
sourceRoot = "${src.name}/${pname}";
patches = [
# FIXME: do we need this? ./procfs.patch
(runCommand "resource-dir.patch" {
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'')
./gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./cpu_subtype_arm64e_replacement.patch;
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake ninja python3 which swig lit makeWrapper lua5_3
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
buildInputs = [
ncurses
zlib
libedit
libxml2
libllvm
] ++ lib.optionals stdenv.isDarwin [
libobjc
xpc
Foundation
bootstrap_cmds
Carbon
Cocoa
]
# The older libSystem used on x86_64 macOS is missing the
# `<bsm/audit_session.h>` header which `lldb` uses.
#
# We copy this header over from macOS 10.12 SDK.
#
# See here for context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
) (
runCommand "bsm-audit-session-header" { } ''
install -Dm444 \
"${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \
"$out/include/bsm/audit_session.h"
''
);
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
# docs reference `automodapi` but it's not added to the extensions list when
# only building the manpages:
# https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54
#
# so, we just ignore the resulting errors
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger";
longDescription = ''
LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
ninjaFlags = [ "docs-lldb-man" ];
propagatedBuildInputs = [];
# manually install lldb man page
installPhase = ''
mkdir -p $out/share/man/man1
install docs/man/lldb.1 -t $out/share/man/man1/
'';
postPatch = null;
postInstall = null;
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man pages for LLDB ${version}";
};
})

View file

@ -1,8 +1,8 @@
{ lib, stdenv, llvm_meta
, runCommand
, monorepoSrc
{ lib
, stdenv
, llvm_meta
, release_version
, cmake
, ninja
, zlib
, ncurses
, swig
@ -13,64 +13,57 @@
, libclang
, python3
, version
, libobjc
, xpc
, Foundation
, bootstrap_cmds
, Carbon
, Cocoa
, darwin
, lit
, makeWrapper
, darwin
, enableManpages ? false
, lua5_3
, ninja
, runCommand
, src ? null
, monorepoSrc ? null
, patches ? [ ]
, enableManpages ? false
}:
# TODO: we build the python bindings but don't expose them as a python package
# TODO: expose the vscode extension?
let
src' =
if monorepoSrc != null then
runCommand "lldb-src-${version}" { } ''
mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/lldb "$out"
'' else src;
in
stdenv.mkDerivation (rec {
passthru.monorepoSrc = monorepoSrc;
pname = "lldb";
inherit version;
src = runCommand "${pname}-src-${version}" {} ''
mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/${pname} "$out"
'';
sourceRoot = "${src.name}/${pname}";
patches = [
./procfs.patch
(runCommand "resource-dir.patch" {
clangLibDir = "${libclang.lib}/lib";
} ''
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'')
./gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
) ./cpu_subtype_arm64e_replacement.patch;
src = src';
inherit patches;
outputs = [ "out" "lib" "dev" ];
sourceRoot =
if lib.versionOlder release_version "13" then null
else "${src.name}/${pname}";
nativeBuildInputs = [
cmake ninja python3 which swig lit makeWrapper lua5_3
cmake
] ++ lib.optionals (lib.versionAtLeast release_version "15") [
ninja
] ++ [
python3
which
swig
lit
makeWrapper
] ++ lib.optionals (lib.versionAtLeast release_version "14") [
lua5_3
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
python3.pkgs.sphinx
python3.pkgs.recommonmark
];
buildInputs = [
@ -80,12 +73,12 @@ stdenv.mkDerivation (rec {
libxml2
libllvm
] ++ lib.optionals stdenv.isDarwin [
libobjc
xpc
Foundation
bootstrap_cmds
Carbon
Cocoa
darwin.libobjc
darwin.apple_sdk.libs.xpc
darwin.apple_sdk.frameworks.Foundation
darwin.bootstrap_cmds
darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.Cocoa
]
# The older libSystem used on x86_64 macOS is missing the
# `<bsm/audit_session.h>` header which `lldb` uses.
@ -96,7 +89,8 @@ stdenv.mkDerivation (rec {
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& !stdenv.targetPlatform.isAarch64
&& !stdenv.targetPlatform.isAarch64
&& (lib.versionAtLeast release_version "15")
) (
runCommand "bsm-audit-session-header" { } ''
install -Dm444 \
@ -116,29 +110,45 @@ stdenv.mkDerivation (rec {
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals enableManpages [
] ++ lib.optionals enableManpages ([
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
] ++ lib.optionals (lib.versionAtLeast release_version "15") [
# docs reference `automodapi` but it's not added to the extensions list when
# only building the manpages:
# https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54
#
# so, we just ignore the resulting errors
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ lib.optionals doCheck [
]) ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
];
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
# TODO: cleanup with mass-rebuild
installCheckPhase =
if ((lib.versions.major release_version) == "14") then ''
if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
echo "ERROR: lua files not installed where expected!";
return 1;
fi
'' else if (((lib.versions.major release_version) == "15") || (lib.versions.major release_version) == "16") then ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'' else ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
@ -147,7 +157,7 @@ stdenv.mkDerivation (rec {
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/${if (lib.versionOlder release_version "12") then "llvm-vscode" else "lldb-vscode"} $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
'';
meta = llvm_meta // {
@ -159,13 +169,24 @@ stdenv.mkDerivation (rec {
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
# llvm <10 never built on aarch64-darwin since first introduction in nixpkgs
broken =
(lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64)
|| (((lib.versions.major release_version) == "13") && stdenv.isDarwin);
};
} // lib.optionalAttrs (lib.versionOlder release_version "15") {
doInstallCheck = true;
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";
ninjaFlags = [ "docs-lldb-man" ];
buildPhase =
if lib.versionOlder release_version "15" then ''
make ${if (lib.versionOlder release_version "12") then "docs-man" else "docs-lldb-man"}
'' else null;
propagatedBuildInputs = [];
ninjaFlags = if lib.versionAtLeast release_version "15" then [ "docs-lldb-man" ] else null;
propagatedBuildInputs = [ ];
# manually install lldb man page
installPhase = ''

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "lobster";
version = "2023.6";
version = "2023.9";
src = fetchFromGitHub {
owner = "aardappel";
repo = "lobster";
rev = "v${version}";
sha256 = "sha256-10QucCDHL7Hk3P4NI94J4Kw6L5+8BNd90DKX6LN7D+E=";
sha256 = "sha256-30OOdl/BzWJeLhSWuzLAhwELRPcOJIi7FqwL/ztUOUo=";
};
nativeBuildInputs = [ cmake ];

View file

@ -29,7 +29,6 @@ let
{ cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; }
{ cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; }
{ cases = [ (range "8.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; }
{ cases = [ (range "8.11" "8.12") "1.11.0" ]; out = "0.3.4"; }
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
{ cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }
@ -39,7 +38,7 @@ let
packages = [ "classical" "analysis" ];
mathcomp_ = package: let
classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ];
classical-deps = [ mathcomp.algebra mathcomp-finmap ];
analysis-deps = [ mathcomp.field mathcomp-bigenough ];
intra-deps = if package == "single" then []
else map mathcomp_ (head (splitList (lib.pred.equal package) packages));

View file

@ -6,9 +6,11 @@ mkCoqDerivation {
owner = "affeldt-aist";
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [
{ cases = [ (isGe "8.17") (isGe "0.6.0") ]; out = "0.5.2"; }
{ cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.2") ]; out = "0.5.1"; }
] null;
release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y=";
release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA=";
propagatedBuildInputs = [ mathcomp-analysis ];

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
antLauncher_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant-launcher";
groupId = "org.apache.ant";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "3h1xmlamkh39lz3dgpbyxj0mai9a266qmxkcyb7kqpzkl0xxvgyi8i2l4nnn02n4qbxznhmvsba77v52ldh67qmhxk3vw1q3xqnn2xx"; }
{ type = "pom"; sha512 = "3fvz9di9lbfgy5370gwwdp2d380gl42sn44kr97l8i7k0n9crrbjrxs2dpy9cnsnnavvk14nrrkc72n9f1gkg1dvdxqpxlwm0y9lxhy"; }
];
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
ant_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant";
groupId = "org.apache.ant";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "3x9m09i4kn57avkjbz57v1chx0356lp4mz77adslcbmr59gxfs3km1f4dq3lm1nxspldwxqk654yzh5sgrcfz13r1zlg3bvlsjbb1bs"; }
{ type = "pom"; sha512 = "2h8ajn6x40cn8cicx3h167blkv9p6478l610xrp2n1k1zlfnh1rz2kcsi74gy7psb4h98118p3zp90gvw4h8gsphz1n30f3c96qnpiq"; }
];
}

View file

@ -1,25 +0,0 @@
{ fetchMaven }:
{
commonsCli_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "commons-cli";
groupId = "commons-cli";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "1pm5ba95viabcgpjhsqw21iwis9ajn8hwpyc6rzs9frr5k62hs7lj8darxmmp21hf14mxrs37a8swayhagq6i6g8js4nl4r8mmwjlvp"; }
{ type = "jar"; sha512 = "0ybdbpfzadkncwcmnzkscbp2fhmcsqmpy60qppz7s8hs00hgqy64jr4qpdyz5bj0l4bc434vn0pv4gzxzi7y1lhh7b2rk4zv1mgs3ff"; }
];
commonsCli_1_2 = map (obj: fetchMaven {
version = "1.2";
artifactId = "commons-cli";
groupId = "commons-cli";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "3lrjnrkq0vq1mjp1z6zbi6x0x45hj20yvs74aqnpzayd0prwv22hyfyadgrj343is54s6m2p5mx2kpziqz9wcih5hmwg5f80ni8mxp7"; }
{ type = "jar"; sha512 = "2mdzpng0cybpnw5dw1q4dmpn2i89zhg13m8xjv8pdbn5q28zsf8m3m7w0y8irbjyplwrfdrxipkxxvnz5f61bxi4s85hnm0sc84d3qb"; }
];
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
commonsIo_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-io";
groupId = "commons-io";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "30bzhsnn2vhi3wfmkas58spl6sxvl9rvwkzaqf9z1lr3iz4iym6x1xgspgq1dvy7pwr7ajny1dfpj1l6vzh7adqm2b4pidjf2w00fp2"; }
{ type = "jar"; sha512 = "14b2kcjsn12cnrl1qc7v7r48m9vmpw5h9jljhsx58ac8xrlb8g6l71j9lnhp8cf8vc3jwz4drrwn4l9p3r5sk02cparl3h2r0y4cp2c"; }
];
}

View file

@ -1,36 +0,0 @@
{ fetchMaven }:
{
commonsLang_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-lang";
groupId = "commons-lang";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "1hr3q67cn0nk5kn9vdfs8155cw814jf20jk7dsn3cn0a6l2j6dx297z6akz5f62dkkn0nj4pac7z4wvnawisnvzhpg6q6qhwj7wwc8n"; }
{ type = "jar"; sha512 = "2phbi7q2k3v48gyys7s0yw8xaa9kpczwif5jfqgfarzf7il1r0vplpwgwcnlsxpifjjnap7lw0yq38zp0mbajp7h8p5z0qp7gisa4m3"; }
];
commonsLang_2_3 = map (obj: fetchMaven {
version = "2.3";
artifactId = "commons-lang";
groupId = "commons-lang";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "0i94xb3fgq0ig0aids9r1h1kblhlf762gsjxh422ra23saa4474q4iywgfk596bpcflngf2sarq8ch6lw09p0g43779d23b74bd939n"; }
{ type = "jar"; sha512 = "1f30pryvd39m2yazflzy5l1h4l473dj8ccrd9v8z8lb6iassn4xc142f2snkzxlc7ncqsi6fbfd3zfxsy8afivmxmxds6mbsrxayqwk"; }
];
commonsLang_2_6 = map (obj: fetchMaven {
version = "2.6";
artifactId = "commons-lang";
groupId = "commons-lang";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "2b3yp5bawbh9b0gh56g35x03swrjv2c5jpvwjwric7ywadaf4p6cw1kmabldmi0y3rja5cypz7gfdm1pwdrpr9lmi48ijjssimmgsh1"; }
{ type = "jar"; sha512 = "11gnsj6c1rz61j19wnr0j5rbdnl63hq9axwm7wwampmdq70n3m1szbn014phl8y3nccvrq2ifcgwb48q6jwqs50rki4bij196z3snja"; }
];
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
commonsLang3_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "commons-lang3";
groupId = "org.apache.commons";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "0msypmqn5q4sxks97zbvi85rq2zclkyz8j09riqw7c95n96nyv7x3pysi83vdgc53d0lhl4apkp7warl52xq1qzdyjxipjdlhqmhdcw"; }
{ type = "jar"; sha512 = "3lw2naanwxjqrwgbg5ij6abzlkch0l6bcx44sl4a59m2r5fi2rvmc07pqai2l9kqwql05fyx9h1md5jjh2wzia15rqnvwssprykjwvi"; }
];
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
commonsLoggingApi_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "commons-logging-api";
groupId = "commons-logging";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "3fp3d08l6m1xmma6pz7hvkvj5isbnyjimgvxf4plrwqmalifw0ywjbal5r5kmmrdlcda7l49mxdsv43ygglm9g22dzkbhdqlhlrn934"; }
{ type = "jar"; sha512 = "316dgnyhwai9n8dqjkp9chkkbhkyli9mfbgsj8ch6cdpmzmcvzirnjj7z1xbxm7v8hlybqhyaf5075pxwz3cg1w5ih3rhwjfi19f8dq"; }
];
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
xbeanReflect_3_4 = map (obj: fetchMaven {
version = "3.4";
artifactId = "xbean-reflect";
groupId = "org.apache.xbean";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "1nny6dcwif0kd0kr2l55j2l5rb1aw8l2f2fbhanj6j48zhcz3vv1wx5xi0l6vg4j70y12fxyg1kyn4lq0bx19by19r73k06wlxs001k"; }
{ type = "jar"; sha512 = "3w22jbm4sii16lzkzwi6hv5zbid5jw8dv356q9hr0pnb8d4gm6ypl2pjqj0brzmpq9pydqya14wk798ddjalqjh25rl2ry9qhjx3hlm"; }
];
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
bsh_2_0_b4 = map (obj: fetchMaven {
version = "2.0b4";
artifactId = "bsh";
groupId = "org.beanshell";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "1xgl3zw2gaca7f09224k3bi22dqdcd589c5jqk7p87s6dlbaai8sivklbq225yxmcpmwsi98r0a6xlgxnxnhk3b0qplf1bj4qp17dx9"; }
{ type = "jar"; sha512 = "1idcadxcphpqh2f6qjijd2gdcklcv9qmv1aalh2z5rk5vipqm89hm05lwjapw2gy5x5q1grzxraalnspbhacrrwm15np07580k6vki9"; }
];
}

View file

@ -1,34 +0,0 @@
{ lib, stdenv, maven, pkgs }:
{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
with builtins;
with lib;
let
mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs ; };
in stdenv.mkDerivation rec {
inherit mavenDeps src name meta m2Path;
flatDeps = unique (flatten (mavenDeps ++ mavenMinimal.mavenMinimal));
propagatedBuildInput = [ maven ] ++ flatDeps;
find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2'';
dontInstall = true;
buildPhase = ''
mkdir -p $out/target
mkdir -p $out/m2/${m2Path}
${optionalString (length flatDeps > 0) find}
${optionalString (length flatDeps > 0) copy}
if [ -f $out/m2/settings.xml ]; then rm $out/m2/settings.xml; fi
echo "<settings><mirrors>\
<mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\
<localRepository>$out/m2/</localRepository></settings>" >> $out/m2/settings.xml
${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${boolToString skipTests} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
cp ./target/*.jar $out/m2/${m2Path}
cp -v ./target/*.jar $out/target/
'';
}

View file

@ -1,25 +0,0 @@
{ fetchMaven }:
{
classworlds_1_1_alpha2 = map (obj: fetchMaven {
version = "1.1-alpha-2";
artifactId = "classworlds";
groupId = "classworlds";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "027b0s13ck41wg75z7bz1zxazdxp56llxlg4z9kp01wys1sbkng8s0i0mxyvjaq61q5lg2gfrxypnzg7vha23vq57hkdhwyksjdcd5c"; }
{ type = "jar"; sha512 = "36vir8jja85cg7khaf2qjln7m8q5iq0n43vvkxkwwngv67ffpvqqz6j1fscvl16hzb0nf6j9gzkcrgk3mk9jl49vrj3fw7c173m4xzb"; }
];
classworlds_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "classworlds";
groupId = "classworlds";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "202zfp93ly15q5iamjwy2vsrip8i87pmv5pqyxl9v7wvcmd4flyhlhkkx7hw9jy82dbzglrs2jklsm96dy22nv1njm5dw5kbzarhakq"; }
{ type = "jar"; sha512 = "1cs8v7hhbgwfmlx4dm7r78mki5vk0gjn798qy4w1qzkz90hf9yl52srpjair2fg96qsmk22nd73r92vdmjji65l75ji3kfghzx9872x"; }
];
}

View file

@ -1,77 +0,0 @@
{ pkgs }:
with pkgs.javaPackages;
{
mavenLibs_2_0_1 = [
mavenArtifact_2_0_1
mavenArtifactManager_2_0_1
mavenCore_2_0_1
mavenErrorDiagnostics_2_0_1
mavenModel_2_0_1
mavenMonitor_2_0_1
mavenPluginApi_2_0_1
mavenPluginDescriptor_2_0_1
mavenPluginParameterDocumenter_2_0_1
mavenPluginRegistry_2_0_1
mavenProfile_2_0_1
mavenProject_2_0_1
mavenReportingApi_2_0_1
mavenRepositoryMetadata_2_0_1
mavenSettings_2_0_1
];
mavenLibs_2_0_6 = [
mavenArtifact_2_0_6
mavenArtifactManager_2_0_6
mavenCore_2_0_6
mavenErrorDiagnostics_2_0_6
mavenModel_2_0_6
mavenMonitor_2_0_6
mavenPluginApi_2_0_6
mavenPluginDescriptor_2_0_6
mavenPluginParameterDocumenter_2_0_6
mavenPluginRegistry_2_0_6
mavenProfile_2_0_6
mavenProject_2_0_6
mavenReportingApi_2_0_6
mavenRepositoryMetadata_2_0_6
mavenSettings_2_0_6
];
mavenLibs_2_0_9 = [
mavenArtifact_2_0_9
mavenArtifactManager_2_0_9
mavenCore_2_0_9
mavenErrorDiagnostics_2_0_9
mavenModel_2_0_9
mavenMonitor_2_0_9
mavenPluginApi_2_0_9
mavenPluginDescriptor_2_0_9
mavenPluginParameterDocumenter_2_0_9
mavenPluginRegistry_2_0_9
mavenProfile_2_0_9
mavenProject_2_0_9
mavenReportingApi_2_0_9
mavenRepositoryMetadata_2_0_9
mavenSettings_2_0_9
];
mavenLibs_2_2_1 = [
mavenArtifact_2_2_1
mavenArtifactManager_2_2_1
mavenCore_2_2_1
mavenErrorDiagnostics_2_2_1
mavenModel_2_2_1
mavenMonitor_2_2_1
mavenPluginApi_2_2_1
mavenPluginDescriptor_2_2_1
mavenPluginParameterDocumenter_2_2_1
mavenPluginRegistry_2_2_1
mavenProfile_2_2_1
mavenProject_2_2_1
mavenReportingApi_2_2_1
mavenRepositoryMetadata_2_2_1
mavenSettings_2_2_1
];
}

View file

@ -1,15 +0,0 @@
{ fetchMaven }:
{
aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
version = "0.9.0.M2";
artifactId = "aether-util";
groupId = "org.eclipse.aether";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "1qh3vzdf33fffsry9256vbaskhp0xsw1d8s7c429a1hiyz8qi9p2sqsh2mqj5vrfj0mxri1nm68pv0nm9fhqzrwfy6f2sihl8rp7df1"; }
{ type = "pom"; sha512 = "2a0z5r5avm7gfkabkha6h1b0gbnma725dqby9wz6lhhkwqhn3zmdr69a0ll6vfh1mv0ir4spcr02hi61xlng4lakdlmwllm0g5ixaiz"; }
];
}

View file

@ -1,15 +0,0 @@
{ fetchMaven }:
{
findbugsJsr305_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "jsr305";
groupId = "com.google.code.findbugs";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "33flq50603n496c90981a0gsv30pgk6cnf859vdj6c8n4iq973prq847z5q8ld64j3rdmakxy9rsp49w7pddfd0v0i9n97rkr435f5k"; }
{ type = "pom"; sha512 = "2iavm6d9nmy4g2i6y7q4l68bpjpncng1qfhbxdj44l3nqi7ixcjw0y38ymial7g2z0r1kd9qydr5lawjspr0fbzpjkcln2q7gsf0hfw"; }
];
}

View file

@ -1,15 +0,0 @@
{ fetchMaven }:
{
googleCollections_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "google-collections";
groupId = "com.google.collections";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "3vvgac799ilrmab28ya894jkyq3jj4217ix8mfyxzbkb8v0wy2rpmdbni3irrrdhc9skd0sldlcnfpvs1hjv5v07ajxlm1dbkgvqhap"; }
{ type = "pom"; sha512 = "38x885cglwmx0chqlzhx83jcrqvnwwr9qj6awx3n0xqp175qznjwn0i94rwxhyj00a7xgvvm9jvwkppwfkcdiyxmimb1z8frdhkkh7p"; }
];
}

View file

@ -1,15 +0,0 @@
{ fetchMaven }:
{
hamcrestAll_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-all";
groupId = "org.hamcrest";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "3pmh19hhwr2vcvj3wqx0m8gipilny4ap9gax1xpks4k5pwykh74w0x9iwpns7cl8r7kqd6rbq4khhc0shcmfh6gydr8ax201wc7lvb8"; }
{ type = "pom"; sha512 = "1w0byl3qy1gq2d8r66fzpffalc7pqm82iz5k3bqcxhclb60ifadmsxi1icqdhfpa29gvr5p1j5723zqpr11dk9w3p16njxc0arqxp2h"; }
];
}

View file

@ -1,15 +0,0 @@
{ fetchMaven }:
{
hamcrestCore_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-core";
groupId = "org.hamcrest";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "14vx453pk5shchdn3sz17s5im1cq1vav19rwnybafnsq2blfn3d0xz01cf9h1gnzclivhc4wgf7vvs23wcr7iiy4nksakxcb9rswdz2"; }
{ type = "pom"; sha512 = "3rn4bs9ixdnwg916qdkjjv9m17l0ym7zj6cxaf18304wlbshxcb1fpa11rnll9g76ap0f4z8r70z3snfj6kyf6sw9xf9xpq4n1796rg"; }
];
}

View file

@ -1,66 +0,0 @@
{ lib, pkgs, mavenbuild, fetchMaven, maven, jdk8 }:
with pkgs.javaPackages;
let
poms = import (../poms.nix) { inherit fetchMaven; };
collections = import (../collections.nix) { inherit pkgs; };
mavenbuild-jdk8 = mavenbuild.override {
maven = maven.override {
jdk = jdk8;
};
};
in rec {
junitGen = { mavenDeps, sha512, version }: mavenbuild-jdk8 {
inherit mavenDeps sha512 version;
name = "junit-${version}";
src = pkgs.fetchFromGitHub {
inherit sha512;
owner = "junit-team";
repo = "junit4";
rev = "r${version}";
};
m2Path = "/junit/junit/${version}";
meta = {
homepage = "https://junit.org/junit4/";
description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
license = lib.licenses.epl10;
platforms = lib.platforms.all;
maintainers = with lib.maintainers;
[ nequissimus ];
};
};
junit_3_8_1 = map (obj: fetchMaven {
version = "3.8.1";
artifactId = "junit";
groupId = "junit";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "2b368057s8i61il387fqvznn70r9ndm815r681fn9i5afs1qgkw7i1d6vsn3pv2bbif1kmhb7qzcc574m3xcwc8a2mqw44b4bbxsfyl"; }
{ type = "jar"; sha512 = "25yk0lzwk46r867nhrw4hg7cvz28wb8ln9nw1dqrb6zarifl54p4h1mcz90vmih405bsk96g0qb6hn1h4df0fas3f5kma9vxfjryvwf"; }
];
junit_3_8_2 = map (obj: fetchMaven {
version = "3.8.2";
artifactId = "junit";
groupId = "junit";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "pom"; sha512 = "01npyfwl1f44l44x92cvqqcp58sckcjraf78dav6zgag3x6ispd9gz594nhpqckmjw0hlrkbqfxnzdcq1mlsj9rw6zyq4wk5ch8rl5j"; }
{ type = "jar"; sha512 = "2jcih102666lcm7b23rgs5cd59ww49m78c8mja52mrcm25630zw28rjqkj5lsws18k5jf75div9wkd1sxcvwvq5cvvphgyg7550i8r9"; }
];
junit_4_12 = junitGen {
mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ])
++ collections.mavenLibs_2_0_1
++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginTestingHarness_1_1 mavenProject_2_0_8 mavenReportingApi_2_2_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 asmParent_4_0 beanshell_2_0_b4 codehausParent_4 commonsParent_11 commonsParent_17 doxia_1_0_alpha6 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_2_0_8 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenReporting_2_0_1 mavenReporting_2_2_1 mavenSharedComponents_7 mavenSharedComponents_11 mojoParent_32 ow2_1_3 plexus_1_0_12 plexusComponents_1_1_4 plexusComponents_1_1_6 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]);
sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
version = "4.12";
};
}

View file

@ -1,15 +0,0 @@
{ fetchMaven }:
{
log4j_1_2_12 = map (obj: fetchMaven {
version = "1.2.12";
artifactId = "log4j";
groupId = "log4j";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "23amz03i51w4vhh2wfq4fppi5qp2rzy0gqz4fdaqg4s3mz0aj86jylp7akj7aprnm28q2y1v4sj0s64qqvakj1vj020hr9y8rrifdga"; }
{ type = "pom"; sha512 = "0n5w0ywp90lllnyyxhaa7py1gapdw85jnnyyk86rm46k132q1lq6j7rh1mvzw1z01lh7bzb800r0rmgcc1mgn3fjgr9hxlr4ssm7gbx"; }
];
}

View file

@ -1,30 +0,0 @@
{ lib, stdenv, fetchurl }:
{ version
, artifactId
, groupId
, sha512
, type ? "jar"
, suffix ? ""
, sourceProvenance ? (lib.optionals (type == "jar") [ lib.sourceTypes.binaryBytecode ])
}:
let
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
m2File = "${artifactId}-${version}${suffix}.${type}";
src = fetchurl {
inherit sha512;
url = "mirror://maven/${m2Path}/${m2File}";
};
in stdenv.mkDerivation {
inherit version m2Path m2File src;
pname = artifactId;
dontUnpack = true;
installPhase = ''
mkdir -p $out/m2/$m2Path
cp $src $out/m2/$m2Path/$m2File
'';
meta.sourceProvenance = sourceProvenance;
}

View file

@ -1,55 +0,0 @@
{ lib
, pkgs
, mavenbuild
, maven
, jdk8
}:
with pkgs.javaPackages;
let
poms = import ../poms.nix { inherit fetchMaven; };
mavenbuild-jdk8 = mavenbuild.override {
maven = maven.override {
jdk = jdk8;
};
};
in rec {
mavenHelloRec = { mavenDeps, mavenbuild, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
inherit mavenDeps sha512 version skipTests quiet;
name = "maven-hello-${version}";
src = pkgs.fetchFromGitHub {
inherit sha512;
owner = "NeQuissimus";
repo = "maven-hello";
rev = "v${version}";
};
m2Path = "/com/nequissimus/maven-hello/${version}";
meta = {
homepage = "https://github.com/NeQuissimus/maven-hello/";
description = "Maven Hello World";
license = lib.licenses.unlicense;
platforms = lib.platforms.all;
maintainers = with lib.maintainers;
[ nequissimus ];
};
};
mavenHello_1_0 = mavenHelloRec {
mavenDeps = [];
sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2";
version = "1.0";
mavenbuild = mavenbuild-jdk8;
};
mavenHello_1_1 = mavenHelloRec {
mavenDeps = [ junit_4_12 mavenSurefireJunit4_2_12_4 hamcrestCore_1_3 ] ++ (with poms; [ surefireProviders_2_12_4 ]);
sha512 = "2f13592blvfgwad61174fza99ncb5jlch4sjjindk1pcaixqw26fnjfxb4ck80cknkihvcsylhviyfvhpm1ivvpg0zkicxva37cr4ri";
version = "1.1";
skipTests = false;
quiet = false;
mavenbuild = mavenbuild-jdk8;
};
}

View file

@ -1,151 +0,0 @@
{ lib, pkgs }:
with pkgs.javaPackages;
let
collections = import ./collections.nix { inherit pkgs; };
fetchMaven = pkgs.callPackage ./m2install.nix { };
plugins = import ./mavenPlugins.nix { inherit pkgs; };
poms = import ./poms.nix { inherit fetchMaven; };
in {
# Maven needs all of these to function
mavenMinimal = lib.flatten
collections.mavenLibs_2_0_6
++ collections.mavenLibs_2_0_9
++ collections.mavenLibs_2_2_1
++ [
classworlds_1_1_alpha2
classworlds_1_1
commonsCli_1_0
commonsLang_2_1
commonsLang3_3_1
commonsLoggingApi_1_1
findbugsJsr305_2_0_1
googleCollections_1_0
junit_3_8_1
junit_3_8_2
log4j_1_2_12
mavenArchiver_2_5
mavenCommonArtifactFilters_1_3
mavenDoxiaSinkApi_1_0_alpha7
mavenFiltering_1_1
mavenPluginAnnotations_3_1
mavenSharedIncremental_1_1
mavenSharedUtils_0_1
mavenSurefireApi_2_12_4
mavenSurefireBooter_2_12_4
mavenSurefireCommon_2_12_4
mavenToolchain_1_0
mavenToolchain_2_0_9
plexusArchiver_2_1
plexusBuildApi_0_0_4
plexusClassworlds_2_2_2
plexusCompilerApi_2_2
plexusCompilerJavac_2_2
plexusCompilerManager_2_2
plexusComponentAnnotations_1_5_5
plexusContainerDefault_1_0_alpha9
plexusContainerDefault_1_0_alpha9_stable1
plexusContainerDefault_1_5_5
plexusDigest_1_0
plexusInteractivityApi_1_0_alpha4
plexusInterpolation_1_11
plexusInterpolation_1_12
plexusInterpolation_1_13
plexusInterpolation_1_15
plexusIo_2_0_2
plexusUtils_1_0_4
plexusUtils_1_4_1
plexusUtils_1_4_5
plexusUtils_1_5_1
plexusUtils_1_5_5
plexusUtils_1_5_8
plexusUtils_1_5_15
plexusUtils_2_0_5
plexusUtils_3_0
plexusUtils_3_0_5
plexusUtils_3_0_8
xbeanReflect_3_4
] ++ (with plugins; [
mavenClean_2_5
mavenCompiler_3_1
mavenInstall_2_4
mavenJar_2_4
mavenResources_2_6
mavenSurefire_2_12_4
]) ++ (with poms; [
apache_3
apache_4
apache_5
apache_6
apache_9
apache_10
apache_11
apache_13
apache_14
backportUtilConcurrent_3_1
commonsParent_22
doxia_1_0_alpha7
googleParent_1
jclOverSlf4j_1_5_6
maven_2_0_6
maven_2_0_9
maven_2_2_1
mavenParent_5
mavenParent_8
mavenParent_11
mavenParent_13
mavenParent_21
mavenParent_22
mavenParent_23
mavenParent_24
mavenPlugins_22
mavenPlugins_23
mavenPlugins_24
mavenPlugins_25
mavenPluginTools_3_1
mavenReporting_2_0_6
mavenReporting_2_0_9
mavenSharedComponents_12
mavenSharedComponents_17
mavenSharedComponents_18
mavenSharedComponents_19
plexus_1_0_4
plexus_1_0_8
plexus_1_0_11
plexus_2_0_2
plexus_2_0_3
plexus_2_0_6
plexus_2_0_7
plexus_3_0_1
plexus_3_1
plexus_3_2
plexus_3_3_1
plexusCipher_1_4
plexusCompiler_2_2
plexusCompiler_2_4
plexusCompilers_2_2
plexusCompilers_2_4
plexusComponents_1_1_7
plexusComponents_1_1_14
plexusComponents_1_1_15
plexusComponents_1_1_19
plexusComponents_1_3_1
plexusContainers_1_0_3
plexusContainers_1_5_5
plexusSecDispatcher_1_3
slf4jApi_1_5_6
slf4jJdk14_1_5_6
slf4jParent_1_5_6
sonatypeForgeParent_3
sonatypeForgeParent_4
sonatypeForgeParent_5
sonatypeForgeParent_10
sonatypeSpiceParent_10
sonatypeSpiceParent_12
sonatypeSpiceParent_16
sonatypeSpiceParent_17
surefire_2_12_4
xbean_3_4
]);
}

View file

@ -1,14 +0,0 @@
{ fetchMaven }:
{
mavenArchiver_2_5 = map (obj: fetchMaven {
version = "2.5";
artifactId = "maven-archiver";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "0wx6248rn0821nnag659mm1n77r56chgx2lr26x81l7apx4zkc2nidjzy2d73snkir98h9bmcz09wnx21pkrq8mk50x7mjgkc0yziky"; }
{ type = "pom"; sha512 = "1rfnwxnk45084rdc52a17bmg8zfyylq1m38wvp956xy455abjvxpnp7il7xpkq6wv16f3bq5yx35hk1b9nycw19w6123rz4v5cs3b0b"; }
];
}

View file

@ -1,47 +0,0 @@
{ fetchMaven }:
{
mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-artifact-manager";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "0xciyvsl2l6fnd5k5dbhz5iih66fgacdagcrflk6cfiiv3qng5zrhx61v9fbjr0fpxbj7rswkczv7vn46359nlkb80513jwhzs8gqwv"; }
{ type = "pom"; sha512 = "1j20ygljm0qa10ryw72j9q4jlwnsjdrcdg08a10ar456zi8gxzszp5cd0xsp0j29q69bp3wck2ggfr028v0zxivxgvakm4fa6l33sya"; }
];
mavenArtifactManager_2_0_6 = map (obj: fetchMaven {
version = "2.0.6";
artifactId = "maven-artifact-manager";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "1alp2iahaaf39yd3xp8817sz93nhz53flkkv5dx87vybsizpykb1g7jn6bnx0cbqqr9k5pi27z8mbkmry05vwqc6jyic1pyvzy1y3vn"; }
{ type = "pom"; sha512 = "3pvj8gpcg57akalj4574k4mzw2skgm0w69bdvh0ivyd8skgdrf5gwxf57hl5rbgsdpr82m2za7yvi63fw82k7v84sib904fs639r3pf"; }
];
mavenArtifactManager_2_0_9 = map (obj: fetchMaven {
version = "2.0.9";
artifactId = "maven-artifact-manager";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; }
{ type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; }
];
mavenArtifactManager_2_2_1 = map (obj: fetchMaven {
version = "2.2.1";
artifactId = "maven-artifact-manager";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "04i9c4k5diyqz8hn20sxvrqkqrxxm7wxqh7xgyk3dm1hwhrqy3h29irvpb335kp8i0sxljz2p2a9cmjpx9wyl0266bj5y313whmfkr5"; }
{ type = "pom"; sha512 = "02ryc46in725q4y11l1kmy6ra01wjnfq5gqwic005wc090l2j39kn5drvn3av6g7413v9x0cksy8qcbagc2jnz6wwxn8z2g5krynw6z"; }
];
}

View file

@ -1,69 +0,0 @@
{ fetchMaven }:
{
mavenArtifact_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-artifact";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "3xmim81k0p3l7fpgr8xlbj3mcz83d1rw3nwzdlrnwh3nkc5xryxl8fx499351vjlmjs009bhd68a20v59y3flxz8hxiy07cijgcbqnx"; }
{ type = "pom"; sha512 = "30y2mirgqvdm3gdalxkzjljswh9xhygsw6v2jfrd9y61wqng2hzyn7dawkn5q4cyiknmw1b9660pvbnysvh3rbic75lhw5xqqgdjmih"; }
];
mavenArtifact_2_0_6 = map (obj: fetchMaven {
version = "2.0.6";
artifactId = "maven-artifact";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; }
{ type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; }
];
mavenArtifact_2_0_8 = map (obj: fetchMaven {
version = "2.0.8";
artifactId = "maven-artifact";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "0i2xd2fkvp5glb7yx8zhh96px4v2yq0bgxa6xxcy6if0sn8c3vps8jmd1z3ys27jzj1gvwgg4rpa17k0nk1c8szz1v7vwvyhp7s22pi"; }
{ type = "pom"; sha512 = "37563kfswgk9yfzm46vk4nr44rncdd3y705vgg20lj4nsrqn7iwg55fx1a4f039gbaf8dzb6xwp0ypyspsx9q742wkwrsr5q41d99v7"; }
];
mavenArtifact_2_0_9 = map (obj: fetchMaven {
version = "2.0.9";
artifactId = "maven-artifact";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "17g913m1zbrvarkwvmz5xx9nv7mrk2984rc9pkbc2laid7n1nb226g0262xyhcnc2s57av96337ag6jg2bq9p1kgx7gbd2z6gnvkkia"; }
{ type = "pom"; sha512 = "0g0cbqihzxyaa1b0z9a7qb8lkhcm8bzxi7qnqaab2n2zaaql6jyy7cf4z4yzqw3yfj7ylqvydiwp32j2c7nqacyx0hmcydqkqg46kxv"; }
];
mavenArtifact_2_2_1 = map (obj: fetchMaven {
version = "2.2.1";
artifactId = "maven-artifact";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "1wfffq39ay1cdzany6x0d6h7icdqrvmj4py35a8i2aw94bc8mf6cam7lf8z7jjckhrnb7yxbqz6pj8sxsgpkwnl2q4flqaczr8nnx4j"; }
{ type = "pom"; sha512 = "099hkdbccd9cf6w64c37z1b2i54h4y0bfx5n56birikgy3s92rrl4x454gvw3wnrpvhkikwvdyw9dv03w40rn50kdwgy0mxc3zgs6l4"; }
];
mavenArtifact_3_0_3 = map (obj: fetchMaven {
version = "3.0.3";
artifactId = "maven-artifact";
groupId = "org.apache.maven";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "0f842m7wi9ajvphgshnmsn8dppiwr326yp663gic45xzkpfvka118npl8xxqnr683dipvbnbrddim974qcpz4mgpypir0922803i3qv"; }
{ type = "pom"; sha512 = "3wpambpgm68rap906gdvwlbywgjs57nkc8k05r8rx701800zbpwlrzc9b3ipxgjb7y6f2z1vi14yj9ia12wv7k8jn2aspf31pzp5plq"; }
];
}

Some files were not shown because too many files have changed in this diff Show more