mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge branch 'staging-next' into staging
; Conflicts: ; pkgs/development/libraries/nss/generic.nixfa93045a5badds `< 3.91` conjunct for the `remove-c25519-support.patch` conditionbb53634671removes the ≥ 3.90 condition for the `remove-c25519-support.patch` since nss < 3.90 is no longer provided
This commit is contained in:
Jan Tojnar
commit
ff15350944
|
|
@ -16,6 +16,12 @@ Example usages:
|
|||
pkgs.foo.override { arg1 = val1; arg2 = val2; ... }
|
||||
```
|
||||
|
||||
It's also possible to access the previous arguments.
|
||||
|
||||
```nix
|
||||
pkgs.foo.override (previous: { arg1 = previous.arg1; ... })
|
||||
```
|
||||
|
||||
<!-- TODO: move below programlisting to a new section about extending and overlays and reference it -->
|
||||
|
||||
```nix
|
||||
|
|
@ -36,15 +42,15 @@ In the first example, `pkgs.foo` is the result of a function call with some defa
|
|||
|
||||
The function `overrideAttrs` allows overriding the attribute set passed to a `stdenv.mkDerivation` call, producing a new derivation based on the original one. This function is available on all derivations produced by the `stdenv.mkDerivation` function, which is most packages in the nixpkgs expression `pkgs`.
|
||||
|
||||
Example usage:
|
||||
Example usages:
|
||||
|
||||
```nix
|
||||
helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {
|
||||
separateDebugInfo = true;
|
||||
helloBar = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {
|
||||
pname = previousAttrs.pname + "-bar";
|
||||
});
|
||||
```
|
||||
|
||||
In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package.
|
||||
In the above example, "-bar" is appended to the pname attribute, while all other attributes will be retained from the original `hello` package.
|
||||
|
||||
The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
|
||||
|
||||
|
|
@ -52,6 +58,16 @@ The argument `finalAttrs` refers to the final attributes passed to `mkDerivation
|
|||
|
||||
If only a one-argument function is written, the argument has the meaning of `previousAttrs`.
|
||||
|
||||
Function arguments can be omitted entirely if there is no need to access `previousAttrs` or `finalAttrs`.
|
||||
|
||||
```nix
|
||||
helloWithDebug = pkgs.hello.overrideAttrs {
|
||||
separateDebugInfo = true;
|
||||
};
|
||||
```
|
||||
|
||||
In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`.
|
||||
|
||||
::: {.note}
|
||||
Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing).
|
||||
:::
|
||||
|
|
|
|||
|
|
@ -632,7 +632,6 @@ with lib.maintainers; {
|
|||
|
||||
openstack = {
|
||||
members = [
|
||||
emilytrau
|
||||
SuperSandro2000
|
||||
];
|
||||
scope = "Maintain the ecosystem around OpenStack";
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ In addition to numerous new and updated packages, this release has the following
|
|||
|
||||
- The ppp plugin `rp-pppoe.so` has been renamed to `pppoe.so` in ppp 2.4.9. Starting from ppp 2.5.0, there is no longer an alias for backwards compatibility. Configurations that use this plugin must be updated accordingly from `plugin rp-pppoe.so` to `plugin pppoe.so`. See [upstream change](https://github.com/ppp-project/ppp/commit/610a7bd76eb1f99f22317541b35001b1e24877ed).
|
||||
|
||||
- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use.
|
||||
- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. Note that this __does not__ affect your regular graphics drivers; this only concerns the DDX component of the driver, which most people are not relying on.
|
||||
|
||||
- [services.xserver.libinput.enable](options.html#opt-services.xserver.libinput.enable) is now set by default, enabling the more actively maintained and consistently behaved input device driver.
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@
|
|||
|
||||
- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.
|
||||
|
||||
- The `services.vaultwarden.config` option default value was changed to make Vaultwarden only listen on localhost, following the [secure defaults for most NixOS services](https://github.com/NixOS/nixpkgs/issues/100192).
|
||||
|
||||
- `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details.
|
||||
|
||||
- The following packages in `haskellPackages` have now a separate bin output: `cabal-fmt`, `calligraphy`, `eventlog2html`, `ghc-debug-brick`, `hindent`, `nixfmt`, `releaser`. This means you need to replace e.g. `"${pkgs.haskellPackages.nixfmt}/bin/nixfmt"` with `"${lib.getBin pkgs.haskellPackages.nixfmt}/bin/nixfmt"` or `"${lib.getExe pkgs.haskellPackages.nixfmt}"`. The binaries also won’t be in scope if you rely on them being installed e.g. via `ghcWithPackages`. `environment.packages` picks the `bin` output automatically, so for normal installation no intervention is required. Also, toplevel attributes like `pkgs.nixfmt` are not impacted negatively by this change.
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
with lib;
|
||||
|
||||
{
|
||||
boot.vesa = false;
|
||||
|
||||
# Don't start a tty on the serial consoles.
|
||||
systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false;
|
||||
systemd.services."serial-getty@hvc0".enable = false;
|
||||
|
|
@ -15,7 +13,7 @@ with lib;
|
|||
systemd.services."autovt@".enable = false;
|
||||
|
||||
# Since we can't manually respond to a panic, just reboot.
|
||||
boot.kernelParams = [ "panic=1" "boot.panic_on_fail" ];
|
||||
boot.kernelParams = [ "panic=1" "boot.panic_on_fail" "vga=0x317" "nomodeset" ];
|
||||
|
||||
# Don't allow emergency mode, because we don't have a console.
|
||||
systemd.enableEmergencyMode = false;
|
||||
|
|
|
|||
|
|
@ -159,6 +159,8 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.etc."pdns-recursor".source = configDir;
|
||||
|
||||
services.pdns-recursor.settings = mkDefaultAttrs {
|
||||
local-address = cfg.dns.address;
|
||||
local-port = cfg.dns.port;
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.etc.pdns.source = finalConfigDir;
|
||||
|
||||
systemd.packages = [ pkgs.pdns ];
|
||||
|
||||
systemd.services.pdns = {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,12 @@ in {
|
|||
|
||||
config = mkOption {
|
||||
type = attrsOf (nullOr (oneOf [ bool int str ]));
|
||||
default = {};
|
||||
default = {
|
||||
config = {
|
||||
ROCKET_ADDRESS = "::1"; # default to localhost
|
||||
ROCKET_PORT = 8222;
|
||||
};
|
||||
};
|
||||
example = literalExpression ''
|
||||
{
|
||||
DOMAIN = "https://bitwarden.example.com";
|
||||
|
|
|
|||
|
|
@ -207,7 +207,9 @@ in
|
|||
# conflicts display-manager.service, then when nixos-rebuild
|
||||
# switch starts multi-user.target, display-manager.service is
|
||||
# stopped so plymouth-quit.service can be started.)
|
||||
systemd.services.plymouth-quit.wantedBy = lib.mkForce [];
|
||||
systemd.services.plymouth-quit = mkIf config.boot.plymouth.enable {
|
||||
wantedBy = lib.mkForce [];
|
||||
};
|
||||
|
||||
systemd.services.display-manager.serviceConfig = {
|
||||
# Restart = "always"; - already defined in xserver.nix
|
||||
|
|
|
|||
|
|
@ -6,6 +6,15 @@ let
|
|||
|
||||
bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems;
|
||||
|
||||
mountCommand = pkgs.runCommand "mount.bcachefs" {} ''
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/mount.bcachefs <<EOF
|
||||
#!/bin/sh
|
||||
exec "/bin/bcachefs" mount "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/mount.bcachefs
|
||||
'';
|
||||
|
||||
commonFunctions = ''
|
||||
prompt() {
|
||||
local name="$1"
|
||||
|
|
@ -58,13 +67,12 @@ in
|
|||
|
||||
boot.initrd.systemd.extraBin = {
|
||||
"bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
|
||||
"mount.bcachefs" = pkgs.runCommand "mount.bcachefs" {} ''
|
||||
cp -pdv ${pkgs.bcachefs-tools}/bin/.mount.bcachefs.sh-wrapped $out
|
||||
'';
|
||||
"mount.bcachefs" = "${mountCommand}/bin/mount.bcachefs";
|
||||
};
|
||||
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
|
||||
copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs
|
||||
'';
|
||||
boot.initrd.extraUtilsCommandsTest = ''
|
||||
$out/bin/bcachefs version
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
"keyctl link @u @s",
|
||||
"echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
|
||||
"echo password | bcachefs unlock /dev/vdb1",
|
||||
"mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
|
||||
"echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
|
||||
"udevadm settle",
|
||||
"bcachefs fs usage /tmp/mnt",
|
||||
"umount /tmp/mnt",
|
||||
|
|
|
|||
|
|
@ -834,7 +834,7 @@ in {
|
|||
"keyctl link @u @s",
|
||||
"echo password | mkfs.bcachefs -L root --encrypted /dev/vda3",
|
||||
"echo password | bcachefs unlock /dev/vda3",
|
||||
"mount -t bcachefs /dev/vda3 /mnt",
|
||||
"echo password | mount -t bcachefs /dev/vda3 /mnt",
|
||||
"mkfs.ext3 -L boot /dev/vda1",
|
||||
"mkdir -p /mnt/boot",
|
||||
"mount /dev/vda1 /mnt/boot",
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
};
|
||||
|
||||
testScript = ''
|
||||
import re
|
||||
|
||||
with subtest("PowerDNS database exists"):
|
||||
server.wait_for_unit("mysql")
|
||||
server.succeed("echo 'SHOW DATABASES;' | sudo -u pdns mysql -u pdns >&2")
|
||||
|
|
@ -46,11 +44,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
|
||||
with subtest("Adding an example zone works"):
|
||||
# Extract configuration file needed by pdnsutil
|
||||
unit = server.succeed("systemctl cat pdns")
|
||||
match = re.search("(--config-dir=[^ ]+)", unit)
|
||||
assert(match is not None)
|
||||
conf = match.group(1)
|
||||
pdnsutil = "sudo -u pdns pdnsutil " + conf
|
||||
pdnsutil = "sudo -u pdns pdnsutil "
|
||||
server.succeed(f"{pdnsutil} create-zone example.com ns1.example.com")
|
||||
server.succeed(f"{pdnsutil} add-record example.com ns1 A 192.168.1.2")
|
||||
|
||||
|
|
|
|||
|
|
@ -10,27 +10,30 @@
|
|||
, productShort ? product
|
||||
, src
|
||||
, version
|
||||
, plugins ? [ ]
|
||||
, buildNumber
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
loname = lib.toLower productShort;
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname meta src version;
|
||||
desktopName = product;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
APP_DIR="$out/Applications/${product}.app"
|
||||
mkdir -p "$APP_DIR"
|
||||
cp -Tr "${product}.app" "$APP_DIR"
|
||||
mkdir -p "$out/bin"
|
||||
cat << EOF > "$out/bin/${loname}"
|
||||
open -na '$APP_DIR' --args "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/${loname}"
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ undmg ];
|
||||
sourceRoot = ".";
|
||||
}
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname meta src version plugins;
|
||||
passthru.buildNumber = buildNumber;
|
||||
desktopName = product;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
APP_DIR="$out/Applications/${product}.app"
|
||||
mkdir -p "$APP_DIR"
|
||||
cp -Tr "${product}.app" "$APP_DIR"
|
||||
mkdir -p "$out/bin"
|
||||
cat << EOF > "$out/bin/${loname}"
|
||||
open -na '$APP_DIR' --args "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/${loname}"
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ undmg ];
|
||||
sourceRoot = ".";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,13 @@
|
|||
{ lib, stdenv, callPackage, fetchurl
|
||||
, jdk, cmake, gdb, zlib, python3, icu
|
||||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchurl
|
||||
, jdk
|
||||
, cmake
|
||||
, gdb
|
||||
, zlib
|
||||
, python3
|
||||
, icu
|
||||
, lldb
|
||||
, dotnet-sdk_6
|
||||
, maven
|
||||
|
|
@ -27,9 +35,9 @@ let
|
|||
|
||||
# Sorted alphabetically
|
||||
|
||||
buildClion = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildClion = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "CLion";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/clion/";
|
||||
|
|
@ -41,11 +49,10 @@ let
|
|||
maintainers = with maintainers; [ edwtjo mic92 ];
|
||||
};
|
||||
}).overrideAttrs (attrs: {
|
||||
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ lib.optionals (stdenv.isLinux) [
|
||||
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [
|
||||
autoPatchelfHook
|
||||
patchelf
|
||||
];
|
||||
buildInputs = (attrs.buildInputs or []) ++ lib.optionals (stdenv.isLinux) [
|
||||
buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [
|
||||
python3
|
||||
stdenv.cc.cc
|
||||
libdbusmenu
|
||||
|
|
@ -57,12 +64,12 @@ let
|
|||
postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) ''
|
||||
(
|
||||
cd $out/clion
|
||||
# bundled cmake does not find libc
|
||||
rm -rf bin/cmake/linux
|
||||
ln -s ${cmake} bin/cmake/linux
|
||||
# bundled gdb does not find libcrypto 10
|
||||
rm -rf bin/gdb/linux
|
||||
ln -s ${gdb} bin/gdb/linux
|
||||
|
||||
# I think the included gdb has a couple of patches, so we patch it instead of replacing
|
||||
ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* |
|
||||
xargs patchelf \
|
||||
--replace-needed libssl.so.10 libssl.so \
|
||||
--replace-needed libcrypto.so.10 libcrypto.so
|
||||
|
||||
ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* |
|
||||
xargs patchelf \
|
||||
|
|
@ -70,16 +77,15 @@ let
|
|||
--replace-needed libcrypto.so.10 libcrypto.so
|
||||
|
||||
autoPatchelf $PWD/bin
|
||||
|
||||
wrapProgram $out/bin/clion \
|
||||
--set CL_JDK "${jdk}"
|
||||
)
|
||||
'';
|
||||
});
|
||||
|
||||
buildDataGrip = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildDataGrip = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "DataGrip";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/datagrip/";
|
||||
|
|
@ -93,9 +99,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildDataSpell = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "DataSpell";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/dataspell/";
|
||||
|
|
@ -108,9 +114,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildGateway = { pname, version, src, license, description, wmClass, product, ... }:
|
||||
buildGateway = { pname, version, src, license, description, wmClass, buildNumber, product, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk product;
|
||||
inherit pname version src wmClass jdk buildNumber product;
|
||||
productShort = "Gateway";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/remote-development/gateway/";
|
||||
|
|
@ -124,9 +130,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildGoland = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildGoland = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "Goland";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/go/";
|
||||
|
|
@ -143,18 +149,16 @@ let
|
|||
postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux ''
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv
|
||||
|
||||
chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv
|
||||
|
||||
# fortify source breaks build since delve compiles with -O0
|
||||
wrapProgram $out/bin/goland \
|
||||
--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
|
||||
'';
|
||||
});
|
||||
|
||||
buildIdea = { pname, version, src, license, description, wmClass, product, ... }:
|
||||
buildIdea = { pname, version, src, license, description, wmClass, buildNumber, product, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk product;
|
||||
inherit pname version src wmClass jdk buildNumber product;
|
||||
productShort = "IDEA";
|
||||
extraLdPath = [ zlib ];
|
||||
extraWrapperArgs = [
|
||||
|
|
@ -175,9 +179,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildMps = { pname, version, src, license, description, wmClass, product, ... }:
|
||||
buildMps = { pname, version, src, license, description, wmClass, product, buildNumber, ... }:
|
||||
(mkJetBrainsProduct rec {
|
||||
inherit pname version src wmClass jdk product;
|
||||
inherit pname version src wmClass jdk buildNumber product;
|
||||
productShort = "MPS";
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
|
|
@ -193,9 +197,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildPhpStorm = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildPhpStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "PhpStorm";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/phpstorm/";
|
||||
|
|
@ -209,9 +213,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildPycharm = { pname, version, src, license, description, wmClass, product, cythonSpeedup ? stdenv.isLinux, ... }:
|
||||
buildPycharm = { pname, version, src, license, description, wmClass, buildNumber, product, cythonSpeedup ? stdenv.isLinux, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk product;
|
||||
inherit pname version src wmClass jdk buildNumber product;
|
||||
productShort = "PyCharm";
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
|
|
@ -230,24 +234,24 @@ let
|
|||
providing you almost everything you need for your comfortable
|
||||
and productive development!
|
||||
'';
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
};
|
||||
}).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup {
|
||||
buildInputs = with python3.pkgs; [ python3 setuptools ];
|
||||
preInstall = ''
|
||||
echo "compiling cython debug speedups"
|
||||
if [[ -d plugins/python-ce ]]; then
|
||||
${python3.interpreter} plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace
|
||||
else
|
||||
${python3.interpreter} plugins/python/helpers/pydev/setup_cython.py build_ext --inplace
|
||||
fi
|
||||
echo "compiling cython debug speedups"
|
||||
if [[ -d plugins/python-ce ]]; then
|
||||
${python3.interpreter} plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace
|
||||
else
|
||||
${python3.interpreter} plugins/python/helpers/pydev/setup_cython.py build_ext --inplace
|
||||
fi
|
||||
'';
|
||||
# See https://www.jetbrains.com/help/pycharm/2022.1/cython-speedups.html
|
||||
});
|
||||
|
||||
buildRider = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildRider = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "Rider";
|
||||
# icu is required by Rider.Backend
|
||||
extraLdPath = [ icu ];
|
||||
|
|
@ -276,9 +280,9 @@ let
|
|||
'');
|
||||
});
|
||||
|
||||
buildRubyMine = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildRubyMine = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "RubyMine";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/ruby/";
|
||||
|
|
@ -288,9 +292,9 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
buildWebStorm = { pname, version, src, license, description, wmClass, ... }:
|
||||
buildWebStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }:
|
||||
(mkJetBrainsProduct {
|
||||
inherit pname version src wmClass jdk;
|
||||
inherit pname version src wmClass jdk buildNumber;
|
||||
product = "WebStorm";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/webstorm/";
|
||||
|
|
@ -312,7 +316,8 @@ in
|
|||
clion = buildClion rec {
|
||||
pname = "clion";
|
||||
version = products.clion.version;
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
buildNumber = products.clion.build_number;
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = products.clion.url;
|
||||
|
|
@ -325,6 +330,7 @@ in
|
|||
datagrip = buildDataGrip rec {
|
||||
pname = "datagrip";
|
||||
version = products.datagrip.version;
|
||||
buildNumber = products.datagrip.build_number;
|
||||
description = "Your Swiss Army Knife for Databases and SQL";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -338,6 +344,7 @@ in
|
|||
dataspell = buildDataSpell rec {
|
||||
pname = "dataspell";
|
||||
version = products.dataspell.version;
|
||||
buildNumber = products.dataspell.build_number;
|
||||
description = "The IDE for Professional Data Scientists";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -352,6 +359,7 @@ in
|
|||
pname = "gateway";
|
||||
product = "JetBrains Gateway";
|
||||
version = products.gateway.version;
|
||||
buildNumber = products.gateway.build_number;
|
||||
description = "Your single entry point to all remote development environments";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -365,6 +373,7 @@ in
|
|||
goland = buildGoland rec {
|
||||
pname = "goland";
|
||||
version = products.goland.version;
|
||||
buildNumber = products.goland.build_number;
|
||||
description = "Up and Coming Go IDE";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -379,6 +388,7 @@ in
|
|||
pname = "idea-community";
|
||||
product = "IntelliJ IDEA CE";
|
||||
version = products.idea-community.version;
|
||||
buildNumber = products.idea-community.build_number;
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
|
|
@ -393,6 +403,7 @@ in
|
|||
pname = "idea-ultimate";
|
||||
product = "IntelliJ IDEA";
|
||||
version = products.idea-ultimate.version;
|
||||
buildNumber = products.idea-ultimate.build_number;
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -407,6 +418,7 @@ in
|
|||
pname = "mps";
|
||||
product = "MPS ${products.mps.version}";
|
||||
version = products.mps.version;
|
||||
buildNumber = products.mps.build_number;
|
||||
description = "Create your own domain-specific language";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
|
|
@ -420,6 +432,7 @@ in
|
|||
phpstorm = buildPhpStorm rec {
|
||||
pname = "phpstorm";
|
||||
version = products.phpstorm.version;
|
||||
buildNumber = products.phpstorm.build_number;
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -434,6 +447,7 @@ in
|
|||
pname = "pycharm-community";
|
||||
product = "PyCharm CE";
|
||||
version = products.pycharm-community.version;
|
||||
buildNumber = products.pycharm-community.build_number;
|
||||
description = "PyCharm Community Edition";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
|
|
@ -448,6 +462,7 @@ in
|
|||
pname = "pycharm-professional";
|
||||
product = "PyCharm";
|
||||
version = products.pycharm-professional.version;
|
||||
buildNumber = products.pycharm-community.build_number;
|
||||
description = "PyCharm Professional Edition";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -461,6 +476,7 @@ in
|
|||
rider = buildRider rec {
|
||||
pname = "rider";
|
||||
version = products.rider.version;
|
||||
buildNumber = products.rider.build_number;
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -474,6 +490,7 @@ in
|
|||
ruby-mine = buildRubyMine rec {
|
||||
pname = "ruby-mine";
|
||||
version = products.ruby-mine.version;
|
||||
buildNumber = products.ruby-mine.build_number;
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -487,6 +504,7 @@ in
|
|||
webstorm = buildWebStorm rec {
|
||||
pname = "webstorm";
|
||||
version = products.webstorm.version;
|
||||
buildNumber = products.webstorm.build_number;
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
|
|
@ -497,4 +515,6 @@ in
|
|||
update-channel = products.webstorm.update-channel;
|
||||
};
|
||||
|
||||
plugins = callPackage ./plugins { };
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,51 @@
|
|||
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
|
||||
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs
|
||||
, python3, vmopts ? null
|
||||
{ stdenv
|
||||
, lib
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, patchelf
|
||||
, writeText
|
||||
, coreutils
|
||||
, gnugrep
|
||||
, which
|
||||
, git
|
||||
, unzip
|
||||
, libsecret
|
||||
, libnotify
|
||||
, e2fsprogs
|
||||
, python3
|
||||
, vmopts ? null
|
||||
}:
|
||||
|
||||
{ pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args:
|
||||
{ pname
|
||||
, product
|
||||
, productShort ? product
|
||||
, version
|
||||
, src
|
||||
, wmClass
|
||||
, buildNumber
|
||||
, jdk
|
||||
, meta
|
||||
, extraLdPath ? [ ]
|
||||
, extraWrapperArgs ? [ ]
|
||||
}@args:
|
||||
|
||||
let loName = lib.toLower productShort;
|
||||
hiName = lib.toUpper productShort;
|
||||
vmoptsName = loName
|
||||
+ lib.optionalString stdenv.hostPlatform.is64bit "64"
|
||||
+ ".vmoptions";
|
||||
let
|
||||
loName = lib.toLower productShort;
|
||||
hiName = lib.toUpper productShort;
|
||||
vmoptsName = loName
|
||||
+ lib.optionalString stdenv.hostPlatform.is64bit "64"
|
||||
+ ".vmoptions";
|
||||
in
|
||||
|
||||
with stdenv; lib.makeOverridable mkDerivation (rec {
|
||||
inherit pname version src;
|
||||
passthru.buildNumber = buildNumber;
|
||||
meta = args.meta // { mainProgram = pname; };
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
comment = lib.replaceStrings ["\n"] [" "] meta.longDescription;
|
||||
comment = lib.replaceStrings [ "\n" ] [ " " ] meta.longDescription;
|
||||
desktopName = product;
|
||||
genericName = meta.description;
|
||||
categories = [ "Development" ];
|
||||
|
|
@ -32,30 +58,30 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
|
|||
nativeBuildInputs = [ makeWrapper patchelf unzip ];
|
||||
|
||||
postPatch = ''
|
||||
get_file_size() {
|
||||
local fname="$1"
|
||||
echo $(ls -l $fname | cut -d ' ' -f5)
|
||||
}
|
||||
get_file_size() {
|
||||
local fname="$1"
|
||||
echo $(ls -l $fname | cut -d ' ' -f5)
|
||||
}
|
||||
|
||||
munge_size_hack() {
|
||||
local fname="$1"
|
||||
local size="$2"
|
||||
strip $fname
|
||||
truncate --size=$size $fname
|
||||
}
|
||||
munge_size_hack() {
|
||||
local fname="$1"
|
||||
local size="$2"
|
||||
strip $fname
|
||||
truncate --size=$size $fname
|
||||
}
|
||||
|
||||
rm -rf jbr
|
||||
rm -rf jbr
|
||||
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
|
||||
target_size=$(get_file_size bin/fsnotifier64)
|
||||
patchelf --set-interpreter "$interpreter" bin/fsnotifier64
|
||||
munge_size_hack bin/fsnotifier64 $target_size
|
||||
else
|
||||
target_size=$(get_file_size bin/fsnotifier)
|
||||
patchelf --set-interpreter "$interpreter" bin/fsnotifier
|
||||
munge_size_hack bin/fsnotifier $target_size
|
||||
fi
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
|
||||
target_size=$(get_file_size bin/fsnotifier64)
|
||||
patchelf --set-interpreter "$interpreter" bin/fsnotifier64
|
||||
munge_size_hack bin/fsnotifier64 $target_size
|
||||
else
|
||||
target_size=$(get_file_size bin/fsnotifier)
|
||||
patchelf --set-interpreter "$interpreter" bin/fsnotifier
|
||||
munge_size_hack bin/fsnotifier $target_size
|
||||
fi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
122
pkgs/applications/editors/jetbrains/plugins/default.nix
Normal file
122
pkgs/applications/editors/jetbrains/plugins/default.nix
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
{ fetchurl
|
||||
, fetchzip
|
||||
, lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, autoPatchelfHook
|
||||
, glib
|
||||
}:
|
||||
|
||||
let
|
||||
pluginsJson = builtins.fromJSON (builtins.readFile ./plugins.json);
|
||||
specialPluginsInfo = callPackage ./specialPlugins.nix { };
|
||||
fetchPluginSrc = url: hash:
|
||||
let
|
||||
isJar = lib.hasSuffix ".jar" url;
|
||||
fetcher = if isJar then fetchurl else fetchzip;
|
||||
in
|
||||
fetcher {
|
||||
executable = isJar;
|
||||
inherit url hash;
|
||||
};
|
||||
files = builtins.mapAttrs (key: value: fetchPluginSrc key value) pluginsJson.files;
|
||||
ids = builtins.attrNames pluginsJson.plugins;
|
||||
|
||||
mkPlugin = id: file:
|
||||
if !specialPluginsInfo ? "${id}"
|
||||
then files."${file}"
|
||||
else
|
||||
stdenv.mkDerivation ({
|
||||
name = "jetbrains-plugin-${id}";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out && cp -r . $out
|
||||
runHook postInstall
|
||||
'';
|
||||
src = files."${file}";
|
||||
} // specialPluginsInfo."${id}");
|
||||
|
||||
selectFile = id: ide: build:
|
||||
if !builtins.elem ide pluginsJson.plugins."${id}".compatible then
|
||||
throw "Plugin with id ${id} does not support IDE ${ide}"
|
||||
else if !pluginsJson.plugins."${id}".builds ? "${build}" then
|
||||
throw "Jetbrains IDEs with build ${build} are not in nixpkgs. Try update_plugins.py with --with-build?"
|
||||
else if pluginsJson.plugins."${id}".builds."${build}" == null then
|
||||
throw "Plugin with id ${id} does not support build ${build}"
|
||||
else
|
||||
pluginsJson.plugins."${id}".builds."${build}";
|
||||
|
||||
byId = builtins.listToAttrs
|
||||
(map
|
||||
(id: {
|
||||
name = id;
|
||||
value = ide: build: mkPlugin id (selectFile id ide build);
|
||||
})
|
||||
ids);
|
||||
|
||||
byName = builtins.listToAttrs
|
||||
(map
|
||||
(id: {
|
||||
name = pluginsJson.plugins."${id}".name;
|
||||
value = byId."${id}";
|
||||
})
|
||||
ids);
|
||||
|
||||
|
||||
in
|
||||
rec {
|
||||
# Only use if you know what youre doing
|
||||
raw = { inherit files byId byName; };
|
||||
|
||||
addPlugins = ide: unprocessedPlugins:
|
||||
let
|
||||
|
||||
processPlugin = plugin:
|
||||
if lib.isDerivation plugin then plugin else
|
||||
if byId ? "${plugin}" then byId."${plugin}" ide.pname ide.buildNumber else
|
||||
if byName ? "${plugin}" then byName."${plugin}" ide.pname ide.buildNumber else
|
||||
throw "Could not resolve plugin ${plugin}";
|
||||
|
||||
plugins = map processPlugin unprocessedPlugins;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = meta.mainProgram + "-with-plugins";
|
||||
version = ide.version;
|
||||
src = ide;
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
passthru.plugins = plugins ++ (ide.plugins or [ ]);
|
||||
newPlugins = plugins;
|
||||
disallowedReferences = [ ide ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ] ++ (ide.nativeBuildInputs or [ ]);
|
||||
buildInputs = lib.unique ((ide.buildInputs or [ ]) ++ [ glib ]);
|
||||
|
||||
inherit (ide) meta;
|
||||
|
||||
buildPhase =
|
||||
let
|
||||
pluginCmdsLines = map (plugin: "ln -s ${plugin} \"$out\"/${meta.mainProgram}/plugins/${baseNameOf plugin}") plugins;
|
||||
pluginCmds = builtins.concatStringsSep "\n" pluginCmdsLines;
|
||||
extraBuildPhase = rec {
|
||||
clion = ''
|
||||
sed "s|${ide}|$out|" -i $out/bin/.clion-wrapped
|
||||
'';
|
||||
goland = ''
|
||||
sed "s|${ide}|$out|" -i $out/bin/.goland-wrapped
|
||||
'';
|
||||
};
|
||||
in
|
||||
''
|
||||
cp -r ${ide} $out
|
||||
chmod +w -R $out
|
||||
IFS=' ' read -ra pluginArray <<< "$newPlugins"
|
||||
for plugin in "''${pluginArray[@]}"
|
||||
do
|
||||
ln -s "$plugin" -t $out/${meta.mainProgram}/plugins/
|
||||
done
|
||||
sed "s|${ide.outPath}|$out|" -i $out/bin/${meta.mainProgram}
|
||||
autoPatchelf $out/${meta.mainProgram}/bin
|
||||
'' + (extraBuildPhase."${ide.meta.mainProgram}" or "");
|
||||
};
|
||||
}
|
||||
387
pkgs/applications/editors/jetbrains/plugins/plugins.json
Normal file
387
pkgs/applications/editors/jetbrains/plugins/plugins.json
Normal file
|
|
@ -0,0 +1,387 @@
|
|||
{
|
||||
"plugins": {
|
||||
"164": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
|
||||
},
|
||||
"name": "ideavim"
|
||||
},
|
||||
"631": {
|
||||
"compatible": [
|
||||
"idea-ultimate"
|
||||
],
|
||||
"builds": {
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/631/350772/python-231.9161.38.zip"
|
||||
},
|
||||
"name": "python"
|
||||
},
|
||||
"6954": {
|
||||
"compatible": [
|
||||
"idea-community",
|
||||
"idea-ultimate"
|
||||
],
|
||||
"builds": {
|
||||
"231.9161.38": null
|
||||
},
|
||||
"name": "kotlin"
|
||||
},
|
||||
"6981": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": null,
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip"
|
||||
},
|
||||
"name": "ini"
|
||||
},
|
||||
"7322": {
|
||||
"compatible": [
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"rider"
|
||||
],
|
||||
"builds": {
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip"
|
||||
},
|
||||
"name": "python-community-edition"
|
||||
},
|
||||
"8182": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip"
|
||||
},
|
||||
"name": "rust"
|
||||
},
|
||||
"8182-beta": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/330017/intellij-rust-0.4.194.5384-223-beta.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip"
|
||||
},
|
||||
"name": "rust-beta"
|
||||
},
|
||||
"8554": {
|
||||
"compatible": [
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
|
||||
},
|
||||
"name": "ide-features-trainer"
|
||||
},
|
||||
"8607": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
|
||||
},
|
||||
"name": "nixidea"
|
||||
},
|
||||
"9568": {
|
||||
"compatible": [
|
||||
"idea-ultimate"
|
||||
],
|
||||
"builds": {
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/9568/343928/go-plugin-231.9161.14.zip"
|
||||
},
|
||||
"name": "go"
|
||||
},
|
||||
"10037": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/332761/CSVEditor-3.2.0-223.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip"
|
||||
},
|
||||
"name": "csv-editor"
|
||||
},
|
||||
"12559": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
|
||||
},
|
||||
"name": "eclipse-keymap"
|
||||
},
|
||||
"13017": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
|
||||
},
|
||||
"name": "visual-studio-keymap"
|
||||
},
|
||||
"14059": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
},
|
||||
"name": "darcula-pitch-black"
|
||||
},
|
||||
"17718": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
|
||||
},
|
||||
"name": "github-copilot"
|
||||
},
|
||||
"18444": {
|
||||
"compatible": [
|
||||
"clion",
|
||||
"datagrip",
|
||||
"goland",
|
||||
"idea-community",
|
||||
"idea-ultimate",
|
||||
"mps",
|
||||
"phpstorm",
|
||||
"pycharm-community",
|
||||
"pycharm-professional",
|
||||
"rider",
|
||||
"ruby-mine",
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
},
|
||||
"name": "netbeans-6-5-keymap"
|
||||
}
|
||||
},
|
||||
"files": {
|
||||
"https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip": "sha256-TZs6ColXUvrp2jw74h8M+6UhSqi9u/gDXlzTNhIt+oo=",
|
||||
"https://plugins.jetbrains.com/files/10037/332761/CSVEditor-3.2.0-223.zip": "sha256-m52ukvz7pqOBPoyNr5l58glD19wXluguZVQKYajCYN8=",
|
||||
"https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=",
|
||||
"https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=",
|
||||
"https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=",
|
||||
"https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=",
|
||||
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
|
||||
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
|
||||
"https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip": "sha256-K4HQXGdvFhs7X25Kw+pljep/lqJ9lwewnGSEvbnNetE=",
|
||||
"https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip": "sha256-imh+3U+HWM9jia2HfRXInHl1pfw+T6D4ls3DGqbqbsw=",
|
||||
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
||||
"https://plugins.jetbrains.com/files/631/350772/python-231.9161.38.zip": "sha256-vQfCR7WMrknRminRcd0AoGrxofAf5dcD8/aXLwWBo3k=",
|
||||
"https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip": "sha256-PtBDN+FNA518HaewPIr9pq5S3Z9RGSCA2NT+YnZ0l8c=",
|
||||
"https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
|
||||
"https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=",
|
||||
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
|
||||
"https://plugins.jetbrains.com/files/8182/330017/intellij-rust-0.4.194.5384-223-beta.zip": "sha256-+iYFqpc4Qn+KGWX3IXpM1sHQV+IPYJZBLFNo0kdx8oE=",
|
||||
"https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip": "sha256-dyJc5O06QLNLQ/D1tX9cGRLqalPX4prcRXz0WcD2RU4=",
|
||||
"https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip": "sha256-P/8tr5n8yVFFTLB4ML2tobJqeuxHWkkEargMjVpnF2Y=",
|
||||
"https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=",
|
||||
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
|
||||
"https://plugins.jetbrains.com/files/9568/343928/go-plugin-231.9161.14.zip": "sha256-67SuJKJZEzEYojsL33zvtWArvADkkjd643cVb4s9EUk="
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
{ delve, autoPatchelfHook, stdenv, lib, glibc, gcc-unwrapped }:
|
||||
# This is a list of plugins that need special treatment. For example, the go plugin (id is 9568) comes with delve, a
|
||||
# debugger, but that needs various linking fixes. The changes here replace it with the system one.
|
||||
{
|
||||
"631" = {
|
||||
# Python
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
};
|
||||
"7322" = {
|
||||
# Python community edition
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
};
|
||||
"8182" = {
|
||||
# Rust
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
chmod +x -R bin
|
||||
runHook postBuild
|
||||
'';
|
||||
};
|
||||
"9568" = {
|
||||
# Go
|
||||
buildInputs = [ delve ];
|
||||
buildPhase =
|
||||
let
|
||||
arch = (if stdenv.isLinux then "linux" else "mac") + (if stdenv.isAarch64 then "arm" else "");
|
||||
in ''
|
||||
runHook preBuild
|
||||
ln -sf ${delve}/bin/dlv lib/dlv/${arch}/dlv
|
||||
runHook postBuild
|
||||
'';
|
||||
};
|
||||
"17718" = {
|
||||
# Github Copilot
|
||||
# Modified version of https://github.com/ktor/nixos/commit/35f4071faab696b2a4d86643726c9dd3e4293964
|
||||
buildPhase = ''
|
||||
agent="copilot-agent/bin/copilot-agent-linux"
|
||||
orig_size=$(stat --printf=%s $agent)
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $agent
|
||||
patchelf --set-rpath ${lib.makeLibraryPath [glibc gcc-unwrapped]} $agent
|
||||
chmod +x $agent
|
||||
new_size=$(stat --printf=%s $agent)
|
||||
var_skip=20
|
||||
var_select=22
|
||||
shift_by=$(($new_size-$orig_size))
|
||||
function fix_offset {
|
||||
# $1 = name of variable to adjust
|
||||
location=$(grep -obUam1 "$1" $agent | cut -d: -f1)
|
||||
location=$(expr $location + $var_skip)
|
||||
value=$(dd if=$agent iflag=count_bytes,skip_bytes skip=$location \
|
||||
bs=1 count=$var_select status=none)
|
||||
value=$(expr $shift_by + $value)
|
||||
echo -n $value | dd of=$agent bs=1 seek=$location conv=notrunc
|
||||
}
|
||||
fix_offset PAYLOAD_POSITION
|
||||
fix_offset PRELUDE_POSITION
|
||||
'';
|
||||
};
|
||||
}
|
||||
385
pkgs/applications/editors/jetbrains/plugins/update_plugins.py
Executable file
385
pkgs/applications/editors/jetbrains/plugins/update_plugins.py
Executable file
|
|
@ -0,0 +1,385 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 python3.pkgs.requests nix.out
|
||||
|
||||
from json import load, dumps
|
||||
from pathlib import Path
|
||||
from requests import get
|
||||
from subprocess import run
|
||||
from argparse import ArgumentParser
|
||||
|
||||
# Token priorities for version checking
|
||||
# From https://github.com/JetBrains/intellij-community/blob/94f40c5d77f60af16550f6f78d481aaff8deaca4/platform/util-rt/src/com/intellij/util/text/VersionComparatorUtil.java#L50
|
||||
TOKENS = {
|
||||
"snap": 10, "snapshot": 10,
|
||||
"m": 20,
|
||||
"eap": 25, "pre": 25, "preview": 25,
|
||||
"alpha": 30, "a": 30,
|
||||
"beta": 40, "betta": 40, "b": 40,
|
||||
"rc": 50,
|
||||
"sp": 70,
|
||||
"rel": 80, "release": 80, "r": 80, "final": 80
|
||||
}
|
||||
SNAPSHOT_VALUE = 99999
|
||||
PLUGINS_FILE = Path(__file__).parent.joinpath("plugins.json").resolve()
|
||||
IDES_FILE = Path(__file__).parent.joinpath("../versions.json").resolve()
|
||||
# The plugin compatibility system uses a different naming scheme to the ide update system.
|
||||
# These dicts convert between them
|
||||
FRIENDLY_TO_PLUGIN = {
|
||||
"clion": "CLION",
|
||||
"datagrip": "DBE",
|
||||
"goland": "GOLAND",
|
||||
"idea-community": "IDEA_COMMUNITY",
|
||||
"idea-ultimate": "IDEA",
|
||||
"mps": "MPS",
|
||||
"phpstorm": "PHPSTORM",
|
||||
"pycharm-community": "PYCHARM_COMMUNITY",
|
||||
"pycharm-professional": "PYCHARM",
|
||||
"rider": "RIDER",
|
||||
"ruby-mine": "RUBYMINE",
|
||||
"webstorm": "WEBSTORM"
|
||||
}
|
||||
PLUGIN_TO_FRIENDLY = {j: i for i, j in FRIENDLY_TO_PLUGIN.items()}
|
||||
|
||||
|
||||
def tokenize_stream(stream):
|
||||
for item in stream:
|
||||
if item in TOKENS:
|
||||
yield TOKENS[item], 0
|
||||
elif item.isalpha():
|
||||
for char in item:
|
||||
yield 90, ord(char) - 96
|
||||
elif item.isdigit():
|
||||
yield 100, int(item)
|
||||
|
||||
|
||||
def split(version_string: str):
|
||||
prev_type = None
|
||||
block = ""
|
||||
for char in version_string:
|
||||
|
||||
if char.isdigit():
|
||||
cur_type = "number"
|
||||
elif char.isalpha():
|
||||
cur_type = "letter"
|
||||
else:
|
||||
cur_type = "other"
|
||||
|
||||
if cur_type != prev_type and block:
|
||||
yield block.lower()
|
||||
block = ""
|
||||
|
||||
if cur_type in ("letter", "number"):
|
||||
block += char
|
||||
|
||||
prev_type = cur_type
|
||||
|
||||
if block:
|
||||
yield block
|
||||
|
||||
|
||||
def tokenize_string(version_string: str):
|
||||
return list(tokenize_stream(split(version_string)))
|
||||
|
||||
|
||||
def pick_newest(ver1: str, ver2: str) -> str:
|
||||
if ver1 is None or ver1 == ver2:
|
||||
return ver2
|
||||
|
||||
if ver2 is None:
|
||||
return ver1
|
||||
|
||||
presort = [tokenize_string(ver1), tokenize_string(ver2)]
|
||||
postsort = sorted(presort)
|
||||
if presort == postsort:
|
||||
return ver2
|
||||
else:
|
||||
return ver1
|
||||
|
||||
|
||||
def is_build_older(ver1: str, ver2: str) -> int:
|
||||
ver1 = [int(i) for i in ver1.replace("*", str(SNAPSHOT_VALUE)).split(".")]
|
||||
ver2 = [int(i) for i in ver2.replace("*", str(SNAPSHOT_VALUE)).split(".")]
|
||||
|
||||
for i in range(min(len(ver1), len(ver2))):
|
||||
if ver1[i] == ver2[i] and ver1[i] == SNAPSHOT_VALUE:
|
||||
return 0
|
||||
if ver1[i] == SNAPSHOT_VALUE:
|
||||
return 1
|
||||
if ver2[i] == SNAPSHOT_VALUE:
|
||||
return -1
|
||||
result = ver1[i] - ver2[i]
|
||||
if result != 0:
|
||||
return result
|
||||
|
||||
return len(ver1) - len(ver2)
|
||||
|
||||
|
||||
def is_compatible(build, since, until) -> bool:
|
||||
return (not since or is_build_older(since, build) < 0) and (not until or 0 < is_build_older(until, build))
|
||||
|
||||
|
||||
def get_newest_compatible(pid: str, build: str, plugin_infos: dict, quiet: bool) -> [None, str]:
|
||||
newest_ver = None
|
||||
newest_index = None
|
||||
for index, info in enumerate(plugin_infos):
|
||||
if pick_newest(newest_ver, info["version"]) != newest_ver and \
|
||||
is_compatible(build, info["since"], info["until"]):
|
||||
newest_ver = info["version"]
|
||||
newest_index = index
|
||||
|
||||
if newest_ver is not None:
|
||||
return "https://plugins.jetbrains.com/files/" + plugin_infos[newest_index]["file"]
|
||||
else:
|
||||
if not quiet:
|
||||
print(f"WARNING: Could not find version of plugin {pid} compatible with build {build}")
|
||||
return None
|
||||
|
||||
|
||||
def flatten(main_list: list[list]) -> list:
|
||||
return [item for sublist in main_list for item in sublist]
|
||||
|
||||
|
||||
def get_compatible_ides(pid: str) -> list[str]:
|
||||
int_id = pid.split("-", 1)[0]
|
||||
url = f"https://plugins.jetbrains.com/api/plugins/{int_id}/compatible-products"
|
||||
result = get(url).json()
|
||||
return sorted([PLUGIN_TO_FRIENDLY[i] for i in result if i in PLUGIN_TO_FRIENDLY])
|
||||
|
||||
|
||||
def id_to_name(pid: str, channel="") -> str:
|
||||
channel_ext = "-" + channel if channel else ""
|
||||
|
||||
resp = get("https://plugins.jetbrains.com/api/plugins/" + pid).json()
|
||||
return resp["link"].split("-", 1)[1] + channel_ext
|
||||
|
||||
|
||||
def sort_dict(to_sort: dict) -> dict:
|
||||
return {i: to_sort[i] for i in sorted(to_sort.keys())}
|
||||
|
||||
|
||||
def make_name_mapping(infos: dict) -> dict[str, str]:
|
||||
return sort_dict({i: id_to_name(*i.split("-", 1)) for i in infos.keys()})
|
||||
|
||||
|
||||
def make_plugin_files(plugin_infos: dict, ide_versions: dict, quiet: bool, extra_builds: list[str]) -> dict:
|
||||
result = {}
|
||||
names = make_name_mapping(plugin_infos)
|
||||
for pid in plugin_infos:
|
||||
plugin_versions = {
|
||||
"compatible": get_compatible_ides(pid),
|
||||
"builds": {},
|
||||
"name": names[pid]
|
||||
}
|
||||
relevant_builds = [builds for ide, builds in ide_versions.items() if ide in plugin_versions["compatible"]] + [extra_builds]
|
||||
relevant_builds = sorted(list(set(flatten(relevant_builds)))) # Flatten, remove duplicates and sort
|
||||
for build in relevant_builds:
|
||||
plugin_versions["builds"][build] = get_newest_compatible(pid, build, plugin_infos[pid], quiet)
|
||||
result[pid] = plugin_versions
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def get_old_file_hashes() -> dict[str, str]:
|
||||
return load(open(PLUGINS_FILE))["files"]
|
||||
|
||||
|
||||
def get_hash(url):
|
||||
print(f"Downloading {url}")
|
||||
args = ["nix-prefetch-url", url, "--print-path"]
|
||||
if url.endswith(".zip"):
|
||||
args.append("--unpack")
|
||||
else:
|
||||
args.append("--executable")
|
||||
path_process = run(args, capture_output=True)
|
||||
path = path_process.stdout.decode().split("\n")[1]
|
||||
result = run(["nix", "--extra-experimental-features", "nix-command", "hash", "path", path], capture_output=True)
|
||||
result_contents = result.stdout.decode()[:-1]
|
||||
if not result_contents:
|
||||
raise RuntimeError(result.stderr.decode())
|
||||
return result_contents
|
||||
|
||||
|
||||
def print_file_diff(old, new):
|
||||
added = new.copy()
|
||||
removed = old.copy()
|
||||
to_delete = []
|
||||
|
||||
for file in added:
|
||||
if file in removed:
|
||||
to_delete.append(file)
|
||||
|
||||
for file in to_delete:
|
||||
added.remove(file)
|
||||
removed.remove(file)
|
||||
|
||||
if removed:
|
||||
print("\nRemoved:")
|
||||
for file in removed:
|
||||
print(" - " + file)
|
||||
print()
|
||||
|
||||
if added:
|
||||
print("\nAdded:")
|
||||
for file in added:
|
||||
print(" + " + file)
|
||||
print()
|
||||
|
||||
|
||||
def get_file_hashes(file_list: list[str], refetch_all: bool) -> dict[str, str]:
|
||||
old = {} if refetch_all else get_old_file_hashes()
|
||||
print_file_diff(list(old.keys()), file_list)
|
||||
|
||||
file_hashes = {}
|
||||
for file in sorted(file_list):
|
||||
if file in old:
|
||||
file_hashes[file] = old[file]
|
||||
else:
|
||||
file_hashes[file] = get_hash(file)
|
||||
return file_hashes
|
||||
|
||||
|
||||
def get_args() -> tuple[list[str], list[str], bool, bool, bool, list[str]]:
|
||||
parser = ArgumentParser(
|
||||
description="Add/remove/update entries in plugins.json",
|
||||
epilog="To update all plugins, run with no args.\n"
|
||||
"To add a version of a plugin from a different channel, append -[channel] to the id.\n"
|
||||
"The id of a plugin is the number before the name in the address of its page on https://plugins.jetbrains.com/"
|
||||
)
|
||||
parser.add_argument("-r", "--refetch-all", action="store_true",
|
||||
help="don't use previously collected hashes, redownload all")
|
||||
parser.add_argument("-l", "--list", action="store_true",
|
||||
help="list plugin ids")
|
||||
parser.add_argument("-q", "--quiet", action="store_true",
|
||||
help="suppress warnings about not being able to find compatible plugin versions")
|
||||
parser.add_argument("-w", "--with-build", action="append", default=[],
|
||||
help="append [builds] to the list of builds to fetch plugin versions for")
|
||||
sub = parser.add_subparsers(dest="action")
|
||||
sub.add_parser("add").add_argument("ids", type=str, nargs="+", help="plugin(s) to add")
|
||||
sub.add_parser("remove").add_argument("ids", type=str, nargs="+", help="plugin(s) to remove")
|
||||
|
||||
args = parser.parse_args()
|
||||
add = []
|
||||
remove = []
|
||||
|
||||
if args.action == "add":
|
||||
add = args.ids
|
||||
elif args.action == "remove":
|
||||
remove = args.ids
|
||||
|
||||
return add, remove, args.refetch_all, args.list, args.quiet, args.with_build
|
||||
|
||||
|
||||
def sort_ids(ids: list[str]) -> list[str]:
|
||||
sortable_ids = []
|
||||
for pid in ids:
|
||||
if "-" in pid:
|
||||
split_pid = pid.split("-", 1)
|
||||
sortable_ids.append((int(split_pid[0]), split_pid[1]))
|
||||
else:
|
||||
sortable_ids.append((int(pid), ""))
|
||||
sorted_ids = sorted(sortable_ids)
|
||||
return [(f"{i}-{j}" if j else str(i)) for i, j in sorted_ids]
|
||||
|
||||
|
||||
def get_plugin_ids(add: list[str], remove: list[str]) -> list[str]:
|
||||
ids = list(load(open(PLUGINS_FILE))["plugins"].keys())
|
||||
|
||||
for pid in add:
|
||||
if pid in ids:
|
||||
raise ValueError(f"ID {pid} already in JSON file")
|
||||
ids.append(pid)
|
||||
|
||||
for pid in remove:
|
||||
try:
|
||||
ids.remove(pid)
|
||||
except ValueError:
|
||||
raise ValueError(f"ID {pid} not in JSON file")
|
||||
return sort_ids(ids)
|
||||
|
||||
|
||||
def get_plugin_info(pid: str, channel: str) -> dict:
|
||||
url = f"https://plugins.jetbrains.com/api/plugins/{pid}/updates?channel={channel}"
|
||||
resp = get(url)
|
||||
decoded = resp.json()
|
||||
|
||||
if resp.status_code != 200:
|
||||
print(f"Server gave non-200 code {resp.status_code} with message " + decoded["message"])
|
||||
exit(1)
|
||||
|
||||
return decoded
|
||||
|
||||
|
||||
def ids_to_infos(ids: list[str]) -> dict:
|
||||
result = {}
|
||||
for pid in ids:
|
||||
|
||||
if "-" in pid:
|
||||
int_id, channel = pid.split("-", 1)
|
||||
else:
|
||||
channel = ""
|
||||
int_id = pid
|
||||
|
||||
result[pid] = get_plugin_info(int_id, channel)
|
||||
return result
|
||||
|
||||
|
||||
def get_ide_versions() -> dict:
|
||||
ide_data = load(open(IDES_FILE))
|
||||
result = {}
|
||||
for platform in ide_data:
|
||||
for product in ide_data[platform]:
|
||||
|
||||
version = ide_data[platform][product]["build_number"]
|
||||
if product not in result:
|
||||
result[product] = [version]
|
||||
elif version not in result[product]:
|
||||
result[product].append(version)
|
||||
|
||||
# Gateway isn't a normal IDE, so it doesn't use the same plugins system
|
||||
del result["gateway"]
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def get_file_names(plugins: dict[str, dict]) -> list[str]:
|
||||
result = []
|
||||
for plugin_info in plugins.values():
|
||||
for url in plugin_info["builds"].values():
|
||||
if url is not None:
|
||||
result.append(url)
|
||||
|
||||
return list(set(result))
|
||||
|
||||
|
||||
def dump(obj, file):
|
||||
file.write(dumps(obj, indent=2))
|
||||
file.write("\n")
|
||||
|
||||
|
||||
def write_result(to_write):
|
||||
dump(to_write, open(PLUGINS_FILE, "w"))
|
||||
|
||||
|
||||
def main():
|
||||
add, remove, refetch_all, list_ids, quiet, extra_builds = get_args()
|
||||
result = {}
|
||||
|
||||
print("Fetching plugin info")
|
||||
ids = get_plugin_ids(add, remove)
|
||||
if list_ids:
|
||||
print(*ids)
|
||||
plugin_infos = ids_to_infos(ids)
|
||||
|
||||
print("Working out which plugins need which files")
|
||||
ide_versions = get_ide_versions()
|
||||
result["plugins"] = make_plugin_files(plugin_infos, ide_versions, quiet, extra_builds)
|
||||
|
||||
print("Getting file hashes")
|
||||
file_list = get_file_names(result["plugins"])
|
||||
result["files"] = get_file_hashes(file_list, refetch_all)
|
||||
|
||||
write_result(result)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
@ -173,12 +173,12 @@ final: prev:
|
|||
|
||||
LazyVim = buildVimPluginFrom2Nix {
|
||||
pname = "LazyVim";
|
||||
version = "2023-06-29";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LazyVim";
|
||||
repo = "LazyVim";
|
||||
rev = "0e33010937d9f759d5f6de04c2ef6f2340ff1483";
|
||||
sha256 = "034853449qa8shg4i98hazv7azz6q0vam6vgv2mvsh7fm1xi011x";
|
||||
rev = "4ba5086b3d9f9690e8fd7d93102db66173b02638";
|
||||
sha256 = "0phfi9chdwzcp3i6fk7zd4vpyn2cjrnmf5hlskdcdb9bin9fpwq3";
|
||||
};
|
||||
meta.homepage = "https://github.com/LazyVim/LazyVim/";
|
||||
};
|
||||
|
|
@ -305,12 +305,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-06-23";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "7322390c9abff6f137774d9e04bddb3cd725afd1";
|
||||
sha256 = "1r9kqnhr3b14fs929xbh6qfrxmki961svlj2208vmlfmbsp7sx13";
|
||||
rev = "0ba3914a03a4689441170d6b6796500a09b5c189";
|
||||
sha256 = "1bh5idm700li7757il9k2wk6i84n7ghxz9753gz9d1bdw9rxkg7b";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
|
|
@ -1975,12 +1975,12 @@ final: prev:
|
|||
|
||||
codeium-vim = buildVimPluginFrom2Nix {
|
||||
pname = "codeium.vim";
|
||||
version = "2023-06-29";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "codeium.vim";
|
||||
rev = "f053fad7826a77860b5bc33a6076c86408f3b255";
|
||||
sha256 = "0a43zx7pxy6z3pnl7w31b9g73brpffqwigwz20bc9pasnw3x5zaw";
|
||||
rev = "a14c7501beda5d3814d498875565c754ad006693";
|
||||
sha256 = "0y6yyv5v6jx01n63q3y7phv8llw1vjn9x6qs1plagkmfwd0ldzqr";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
|
||||
};
|
||||
|
|
@ -2251,24 +2251,24 @@ final: prev:
|
|||
|
||||
copilot-lua = buildVimPluginFrom2Nix {
|
||||
pname = "copilot.lua";
|
||||
version = "2023-06-29";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zbirenbaum";
|
||||
repo = "copilot.lua";
|
||||
rev = "686670843e6f555b8a42fb0a269c1bbaee745421";
|
||||
sha256 = "00nrc6ywmc51gh6pphdhxlanw03vn9r6xxlm2lx7f8yf1gpg3ajn";
|
||||
rev = "e48bd7020a98be217d85c006a298656294fd6210";
|
||||
sha256 = "1fx8pm1jk6hvbf2r0bhd4sls3pdj2jfsl7rj0rzsfrwan9slagwl";
|
||||
};
|
||||
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
|
||||
};
|
||||
|
||||
copilot-vim = buildVimPluginFrom2Nix {
|
||||
pname = "copilot.vim";
|
||||
version = "2023-06-23";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "copilot.vim";
|
||||
rev = "98c293994f1bbebd5bade5d5840ead3b2feb5074";
|
||||
sha256 = "1wm36wba1pcmr0slmdvgjixm587sm13zcsdrc2cykra54p87ky2m";
|
||||
rev = "a4a6d6b3f9e284e7f5c849619e06cd228cad8abd";
|
||||
sha256 = "1ychdiz76xrhras9fynzf5sb5cragv8lxyv3gpmjy8grb8znwyzq";
|
||||
};
|
||||
meta.homepage = "https://github.com/github/copilot.vim/";
|
||||
};
|
||||
|
|
@ -2287,12 +2287,12 @@ final: prev:
|
|||
|
||||
coq-thirdparty = buildVimPluginFrom2Nix {
|
||||
pname = "coq.thirdparty";
|
||||
version = "2023-06-28";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.thirdparty";
|
||||
rev = "f4b97c68bcd217e6aebc301c69deb125ea6f390f";
|
||||
sha256 = "1fjigaark1lkdavdrxgm4szywif10lsvalrcgah4rf6vaz48lndb";
|
||||
rev = "4b252a3eea17b2c69f3fbd1f675c0b4bf55f1961";
|
||||
sha256 = "18r90dx7zlznjkgiqmafppa93jh6ag4bnfq2q88dawrkjya35y2r";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
|
||||
};
|
||||
|
|
@ -2311,12 +2311,12 @@ final: prev:
|
|||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2023-06-29";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "5f51b80d08321fb0854f71b663aeca1828895835";
|
||||
sha256 = "1q3d1gq6cj51a7va10mv8ljsrn6yy8xs9k2fwp7p4g8sgfacdv8n";
|
||||
rev = "8f8fa1a00360eedc9c57c3dec605907a5b075439";
|
||||
sha256 = "1hr85665fgnhjmkn73xgcyj7h2x45bj8mi228qbsyhzl24ldrh2s";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
|
@ -2937,12 +2937,12 @@ final: prev:
|
|||
|
||||
dropbar-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dropbar.nvim";
|
||||
version = "2023-06-25";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bekaboo";
|
||||
repo = "dropbar.nvim";
|
||||
rev = "2cc0381cd7ef1d69d289a36715a3ea817bee2691";
|
||||
sha256 = "137hn2v4yzsapq35ad3vx1xnq1i3vf867wnq5j94c8kp7bivjff7";
|
||||
rev = "02ec281110859185c3c09203245c3e42b359dfcb";
|
||||
sha256 = "0dhag2z5ghhifdjr4d2ixbxig2fnhh8x18psjyd35rf2c9ifrafj";
|
||||
};
|
||||
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
|
||||
};
|
||||
|
|
@ -2985,12 +2985,12 @@ final: prev:
|
|||
|
||||
edgy-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "edgy.nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "edgy.nvim";
|
||||
rev = "c2a056a72e59d239218dd5d50848851fba33a378";
|
||||
sha256 = "14ibg69jbwz67fflhlvay15csy6l3py0j8mhjd6nc7xghp4pnpcp";
|
||||
rev = "422dbda0f3a074475947b2338f06889da6606e32";
|
||||
sha256 = "106cr80l4y0m2ljw11dpgv0di7pkq0yinmhmhbn5pg6bivn025wv";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/edgy.nvim/";
|
||||
};
|
||||
|
|
@ -3022,12 +3022,12 @@ final: prev:
|
|||
|
||||
elixir-tools-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "elixir-tools.nvim";
|
||||
version = "2023-06-26";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-tools";
|
||||
repo = "elixir-tools.nvim";
|
||||
rev = "2ede39073ce5f2a1c861c5b213122d99e655a493";
|
||||
sha256 = "086qxhax858ibdg9f8p656vbyy2c81f2g0cswhmvqvi6mmrip3y3";
|
||||
rev = "bb9f59b2b51612bc99c2f1efbc6c5241b3213286";
|
||||
sha256 = "1q1hivrvbcf48ryldpr6g5b839fyyqz7fs750bsny2mq5v11bq2y";
|
||||
};
|
||||
meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
|
||||
};
|
||||
|
|
@ -3119,12 +3119,12 @@ final: prev:
|
|||
|
||||
eyeliner-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "eyeliner.nvim";
|
||||
version = "2023-06-27";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jinh0";
|
||||
repo = "eyeliner.nvim";
|
||||
rev = "0b21a862fa0782090350c13c8b32ccd58adc4d82";
|
||||
sha256 = "16qx8nlwrbgpdypp4s052gk166k5bq2258i8728ri7ikqbj6vm1a";
|
||||
rev = "a6c05ed7f2a59640bd18ff0702694deda483a08e";
|
||||
sha256 = "1clla449ab1r71hwi9f96vf7l7ixqizvmh9vapcl7605p6iy6mny";
|
||||
};
|
||||
meta.homepage = "https://github.com/jinh0/eyeliner.nvim/";
|
||||
};
|
||||
|
|
@ -3276,12 +3276,12 @@ final: prev:
|
|||
|
||||
flash-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "flash.nvim";
|
||||
version = "2023-06-29";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "flash.nvim";
|
||||
rev = "cdf8f0e07527657b7cf6143f77181cac1e04419b";
|
||||
sha256 = "03izlyq8p9y80dbxd3gja667sm7rb2lm3jmzsgvqp8nf68qa7vg9";
|
||||
rev = "2950466a4f815e3e3297d8e8f03dc6fbf4dbd7c1";
|
||||
sha256 = "0mfd41mf6zjd1a6lid5vhd827rckz31a6qxiz9yvzidg6ndcyb34";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/flash.nvim/";
|
||||
};
|
||||
|
|
@ -3504,12 +3504,12 @@ final: prev:
|
|||
|
||||
fzf-lua = buildVimPluginFrom2Nix {
|
||||
pname = "fzf-lua";
|
||||
version = "2023-06-28";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "fzf-lua";
|
||||
rev = "26cc8e35ecdd02e03aeab39149187c3af3641add";
|
||||
sha256 = "1i7wps57sd87yx5zkqlck9nj5hr8ganr37dcb1cjkylx960kzij8";
|
||||
rev = "1b809d167e1b82ac1e9b2c7af2e1abc81d143708";
|
||||
sha256 = "0r278arw3airl1s58xbq2in5yz2fyiiq556ppqi8prcmgpi6cdq1";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||
};
|
||||
|
|
@ -4571,12 +4571,12 @@ final: prev:
|
|||
|
||||
lazy-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lazy.nvim";
|
||||
version = "2023-06-26";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "lazy.nvim";
|
||||
rev = "4c8b625bc873ca76b76eee0c28c98f1f7148f17f";
|
||||
sha256 = "0i4f49cspx78cp0bnry3h3im032fxihabgcfqagjfmgzx62psklm";
|
||||
rev = "d65d5441d997c98be8c261ca8537694c5f4642be";
|
||||
sha256 = "1pd1qxvgxx8l99g3ylnkq139aks2zs87drlbgadb978mfasz28pd";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/lazy.nvim/";
|
||||
};
|
||||
|
|
@ -4643,12 +4643,12 @@ final: prev:
|
|||
|
||||
legendary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "legendary.nvim";
|
||||
version = "2023-06-27";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "legendary.nvim";
|
||||
rev = "fa8f72c13874146953c4d07c3b24b5c00d7d7d7a";
|
||||
sha256 = "0w7cdqb5hvsrps91lvdbiyg7jqbq6q6gr97gbzsnh9ynhrgcd7vn";
|
||||
rev = "09beae8257a821a0ad4cc3f9178c3ba80067258c";
|
||||
sha256 = "0j0zd825bvyh1gm1hl65phd31g8s6k5hc5bz3v8nbyxr45pgm9kx";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
|
||||
};
|
||||
|
|
@ -5098,12 +5098,12 @@ final: prev:
|
|||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2023-06-24";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "c7984d1cca3d8615e4daefc196597872a0b8d590";
|
||||
sha256 = "09bcxi7ss1j9g5f09xqqarlii77fx82sl7pnx94mfs4vcmrq4k76";
|
||||
rev = "105b5f7f72c13e682a3aa5d29eac2408ae513b22";
|
||||
sha256 = "1vb4crvs7dcasac7kdjqa58l2wjibm85r7hg47ia7pw258d575gc";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
|
|
@ -5303,12 +5303,12 @@ final: prev:
|
|||
|
||||
mini-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mini.nvim";
|
||||
version = "2023-06-27";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.nvim";
|
||||
rev = "a4241b6f51393d5e4d91a12d94e386bae287dae5";
|
||||
sha256 = "03mhcvlw7nx0l9dsflj3kkg829kl5icjxdynmc3wna0cxmajp1na";
|
||||
rev = "4fd0f9c72fb54696442c81a64c71514c95239148";
|
||||
sha256 = "1x97jrh3pr1gsl2rlzl9x8lcgbj4lkq11v873mk2dh81rvw0a4d0";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||
};
|
||||
|
|
@ -5711,12 +5711,12 @@ final: prev:
|
|||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2023-06-13";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "1412d2016a772aef6aea818c840eb7803ade0312";
|
||||
sha256 = "172wyky154gwwnwhlr64l29l99ssb9m2gw15jkcpkrn0pg9zyz10";
|
||||
rev = "1dd282cd64f03418ef9cc345a12ca82b8dcf6e73";
|
||||
sha256 = "0sly3hspfia8hpgdqq2dc6lylc5qbil3cxmlph27j3yy01yl1f52";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
|
|
@ -6011,12 +6011,12 @@ final: prev:
|
|||
|
||||
neotest-rspec = buildVimPluginFrom2Nix {
|
||||
pname = "neotest-rspec";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "neotest-rspec";
|
||||
rev = "5fe7d860def0539f7f5d375fbf9c481c097062c8";
|
||||
sha256 = "1za4ikrkd7qy2wiik6i9bxk4f1l1wffdh02sj79fh4kr294r106c";
|
||||
rev = "f5569be7d462585576eb19282aab83887ba84a6c";
|
||||
sha256 = "174gj5kxvippr52qz4glij09dand627fy3q6l02fvfdir371q3sj";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/neotest-rspec/";
|
||||
};
|
||||
|
|
@ -6287,12 +6287,12 @@ final: prev:
|
|||
|
||||
noice-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "noice.nvim";
|
||||
version = "2023-06-26";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "noice.nvim";
|
||||
rev = "4f4a1702a3b2677878e68111af95cc4e775322e1";
|
||||
sha256 = "0pi6hnx92d8p2bc5vrbhxqigs5qlkiiz79wpb7k5z8n0hckyvcgi";
|
||||
rev = "2cb37edea88b7baa45324ac7b791f1f1b4e48316";
|
||||
sha256 = "0xi78d2px2fx4ihnhbaqwpd8awicy6m5dfrcfdg77wra88xl65r9";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/noice.nvim/";
|
||||
};
|
||||
|
|
@ -6359,12 +6359,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2023-06-28";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "b919452c84e461c21a79185bef90c96e1cfecff9";
|
||||
sha256 = "1liw8w2hfgk99ix4rfg1la9yb1yr36nf77ymz2042rjr0zc8qjfk";
|
||||
rev = "aac27a1fa550de3d0b2c651168167cc0d5366a9a";
|
||||
sha256 = "17ik96d969wbq460h4z834kw2kahn6a3ikqs0qbavqs7wx1p8bg3";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
|
@ -6503,12 +6503,12 @@ final: prev:
|
|||
|
||||
nvim-cmp = buildNeovimPlugin {
|
||||
pname = "nvim-cmp";
|
||||
version = "2023-06-23";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0";
|
||||
sha256 = "1gz02cy11r5bdrr0bz0xl0cmph6kpb3fv4xdnsbnxzq5jwia24m9";
|
||||
rev = "2743dd989e9b932e1b4813a4927d7b84272a14e2";
|
||||
sha256 = "13k2y9ggfvpzm463dhivy70j8vpzbv8j2nmscqs1l5y0rad93bww";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
|
|
@ -6527,12 +6527,12 @@ final: prev:
|
|||
|
||||
nvim-cokeline = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cokeline";
|
||||
version = "2023-06-29";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "willothy";
|
||||
repo = "nvim-cokeline";
|
||||
rev = "469800429c6e71cd46ee226c40035c31bc6a6ba1";
|
||||
sha256 = "1z13lfghyb9a24myb4k1jkf75ipcxs5hnhci9bcwgz2l3smz31ww";
|
||||
rev = "bd34d316a3b4787802cb2a524d9b9d33008726b9";
|
||||
sha256 = "08kvr5891x87vhpqr2r1mn3nn0k5pyxj7g52ldzdlzdfzhdx2wwl";
|
||||
};
|
||||
meta.homepage = "https://github.com/willothy/nvim-cokeline/";
|
||||
};
|
||||
|
|
@ -6623,12 +6623,12 @@ final: prev:
|
|||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2023-06-14";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "a6d48d23407fbad7a4c1451803b8f34cab31c441";
|
||||
sha256 = "0g1j69wja33cmin5lvrc5qwnvc37q4xnqzbl5qsyjgcjcbq08bbr";
|
||||
rev = "bb1ddce6cd951ef3c1319e4fd8596131113163c3";
|
||||
sha256 = "0jqbc4fgg7agzzfpgm80vvlfrsmpvy38mkxkpnf1kk31ig11mlms";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
|
|
@ -6887,12 +6887,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-06-29";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "a2c8ad6c7b4e35ed33d648795dcb1e08dbd4ec01";
|
||||
sha256 = "1zqhxk33513ncc0d9ljlvfcdd0p358awdhb1n99y80l9w1qmf3n1";
|
||||
rev = "0011c435282f043a018e23393cae06ed926c3f4a";
|
||||
sha256 = "12b1gbzj84jj8k4q5d5lb30yh923711fi0b5fqlya73y39bzmffp";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -7139,12 +7139,12 @@ final: prev:
|
|||
|
||||
nvim-spectre = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-spectre";
|
||||
version = "2023-06-23";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-pack";
|
||||
repo = "nvim-spectre";
|
||||
rev = "f4dc98ec45ecded2344aa3aac2d7cc43ad236858";
|
||||
sha256 = "1p2s7a18d13irrf5yg1c4hq3ffqd8a7vqr4iw70rzvllr2mwzlbm";
|
||||
rev = "6e9dfd6f0ad24074ba03fe420b2b5c59075bc205";
|
||||
sha256 = "1nm707d9gixqd739jqr201jk7qdw7kshkvvkgldrrwg4wv0gfig4";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
|
||||
};
|
||||
|
|
@ -7211,36 +7211,36 @@ final: prev:
|
|||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2023-06-25";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "3cc698b35b0a67792c61e1726830bb9ecfc4c9f4";
|
||||
sha256 = "17d329x2264qv30pnqrank0lzxx1xl49jz6fsdbcw3z050h0w03x";
|
||||
rev = "1fe32286db79719dd6e52236f82c5b52df3ccaa9";
|
||||
sha256 = "130zccj9ydfgcjcljhcpm6cpf5yn7qadb6qril3070i5kzh0gp9i";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
|
||||
};
|
||||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-06-29";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "4c3912dfa865e3ee97c8164322847b8b487779b2";
|
||||
sha256 = "1ma9yai44j2224migk1zjdq5dqgdj397b1ikllmhzmccwas3sdk5";
|
||||
rev = "393bc5bec591caeedb0a4c696d15946c5d6c2de8";
|
||||
sha256 = "0nl5vn7i5qaxnsdf1vycfn6f761kgbplin0pgdxf0fg75w3pnm0v";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
||||
nvim-treesitter-context = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter-context";
|
||||
version = "2023-06-19";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-context";
|
||||
rev = "6eccc445394df5ab9b1c1e2c445c033949a6a784";
|
||||
sha256 = "11s97cz3xdfyw4rvwjw1ncnbvac34z5il2q5nqi68xf5hspfzs6g";
|
||||
rev = "63f3ffc50b0afc59be1015153d00922498085be8";
|
||||
sha256 = "1jvsf80q8dxhdxbphrms755aj4ak58xacpzgs91v5jb5zjcvmsx9";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
|
||||
};
|
||||
|
|
@ -7450,24 +7450,24 @@ final: prev:
|
|||
|
||||
octo-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "octo.nvim";
|
||||
version = "2023-06-15";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwntester";
|
||||
repo = "octo.nvim";
|
||||
rev = "f498fd88bc0d9983a7fb566fa5535f8e38b874c0";
|
||||
sha256 = "094sh9m1rzc0srh1ffabpwyw720bcyk992kniff90xhfs2i89jbv";
|
||||
rev = "22328c578bc013fa4b0cef3d00af35efe0c0f256";
|
||||
sha256 = "08ik7v5gfpy52z09wbx1rbdhcz1v1c41i5l9kx4p25rxw8g9cl8v";
|
||||
};
|
||||
meta.homepage = "https://github.com/pwntester/octo.nvim/";
|
||||
};
|
||||
|
||||
oil-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "oil.nvim";
|
||||
version = "2023-06-27";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "oil.nvim";
|
||||
rev = "0138a2e0f9baacd98d5531ebb5078fafc5114fae";
|
||||
sha256 = "06kskpjhb5n59ls4wpv9a6mxyyv24zyfs7rahfb7p0jd96mnwylp";
|
||||
rev = "a5ff72a8da0df1042ee4c7705c301901062fa6d5";
|
||||
sha256 = "105ldc37iywalh82snfr3rk750hz7vszi01ipzbfzd8hqvwr930g";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/oil.nvim/";
|
||||
|
|
@ -7799,12 +7799,12 @@ final: prev:
|
|||
|
||||
plenary-nvim = buildNeovimPlugin {
|
||||
pname = "plenary.nvim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "36aaceb6e93addd20b1b18f94d86aecc552f30c4";
|
||||
sha256 = "0r0z27kwpgd8ladjj86h9gmyq2mxcwbiaj3a6mi1bz2dwxqiddxb";
|
||||
rev = "102c02903c74b93c705406bf362049383abc87c8";
|
||||
sha256 = "1h0d4qz14s63h0c6g2lf89bvaj6ksn75f2wsk2z326bpnlyz255k";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
|
||||
};
|
||||
|
|
@ -8015,6 +8015,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/dannyob/quickfixstatus/";
|
||||
};
|
||||
|
||||
quickmath-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "quickmath.nvim";
|
||||
version = "2023-03-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbyuki";
|
||||
repo = "quickmath.nvim";
|
||||
rev = "dcfc5450fa686714817a0d4767299f37f94bdb43";
|
||||
sha256 = "1rmbrdxz26f4b12yvb4yjb6b3rn89nky6an4wclh4c68li70h54l";
|
||||
};
|
||||
meta.homepage = "https://github.com/jbyuki/quickmath.nvim/";
|
||||
};
|
||||
|
||||
rainbow = buildVimPluginFrom2Nix {
|
||||
pname = "rainbow";
|
||||
version = "2022-10-08";
|
||||
|
|
@ -8281,12 +8293,12 @@ final: prev:
|
|||
|
||||
satellite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "satellite.nvim";
|
||||
version = "2023-06-26";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "satellite.nvim";
|
||||
rev = "022c884978b888d5b5812052c64d0d243092155e";
|
||||
sha256 = "0i3d6di7hfgy665j7v99q2ghm62bhny9yz4w3jyd7as4wwnlqbzi";
|
||||
rev = "18c3b4d581cb0eb1a81c00a7f0d268aab842d404";
|
||||
sha256 = "1cxazg2sb9vhssih4mrmrnj7piszb2sjd2kndvr22w9pf1j6q076";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
|
||||
};
|
||||
|
|
@ -8907,12 +8919,12 @@ final: prev:
|
|||
|
||||
switch-vim = buildVimPluginFrom2Nix {
|
||||
pname = "switch.vim";
|
||||
version = "2023-02-25";
|
||||
version = "2023-04-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "switch.vim";
|
||||
rev = "a3fd7bf4d61fdbe00356a646744b2fe6f97524b6";
|
||||
sha256 = "03crzap4czx1am4jsxq6c58nf6f5kg9wrmvcf9l5cic2vj5gwh6a";
|
||||
rev = "6b6cfda7ba751617599fcf3a96c1694e7924255d";
|
||||
sha256 = "1filijmx87g6yiv9bfgf89yiffqwq2qmvw5f73zfq0sh3pyxk6ja";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/switch.vim/";
|
||||
|
|
@ -9149,12 +9161,12 @@ final: prev:
|
|||
|
||||
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-file-browser.nvim";
|
||||
version = "2023-06-25";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-file-browser.nvim";
|
||||
rev = "acf2eade45563803afdd4e9873a8481bc98bd726";
|
||||
sha256 = "05rrkmyk6ma08h3xqhzy2wxsj6qmdnf4ypi3dqzycklavb44r10k";
|
||||
rev = "721f716f7392284ded78b4867fa67cf4b0605945";
|
||||
sha256 = "05b383yl68mzjk149y3s5ncclml4rn9xxqsqy1by1f8x1f215x1n";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
|
||||
};
|
||||
|
|
@ -9379,12 +9391,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-06-25";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "6074847b6ee4b725747c8fc540d9b6b128ac8a12";
|
||||
sha256 = "1glqmvk5q6k3qa55lq2a39qkqbsh7hkfqx7kssl143z76g7f1w04";
|
||||
rev = "c5b11f4fe780f4acd6ed0d58575d3cb7af3e893a";
|
||||
sha256 = "11ccs7vvaa20i1lnqswqmch5sxgswwg6w4s1x5syzy9yzknxfbrk";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -9848,12 +9860,12 @@ final: prev:
|
|||
|
||||
unison = buildVimPluginFrom2Nix {
|
||||
pname = "unison";
|
||||
version = "2023-06-28";
|
||||
version = "2023-07-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "f30648e1a56f4c528a01e83fafbb93b05a11d4e9";
|
||||
sha256 = "0nnlwl8wm20m266b6a039h6ld254xgwqczphm8hqvqmdkr8vnfgw";
|
||||
rev = "943149be2094f2396f9575e932a74156f228602a";
|
||||
sha256 = "1w29dpc9kj1g0ryhqikagmvbip0dxvfwkh160y33a3q9v0d7zg3n";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
|
|
@ -12635,12 +12647,12 @@ final: prev:
|
|||
|
||||
vim-matchup = buildVimPluginFrom2Nix {
|
||||
pname = "vim-matchup";
|
||||
version = "2023-06-17";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andymass";
|
||||
repo = "vim-matchup";
|
||||
rev = "3a17944bfa3942da805a381750a1be4b314c64d2";
|
||||
sha256 = "00kc4zkr1hd8qcls3midmdb2lr205lw0r6r6gb7xc8yqvv1bcv9h";
|
||||
rev = "61cef7921ecbb412f341a6d1a7f9ad1ca55243de";
|
||||
sha256 = "0jrrvx7a6v7gxkyvyrh9wkhaaqlvww90v2lijvxwgys9iy79c4nz";
|
||||
};
|
||||
meta.homepage = "https://github.com/andymass/vim-matchup/";
|
||||
};
|
||||
|
|
@ -12863,12 +12875,12 @@ final: prev:
|
|||
|
||||
vim-nickel = buildVimPluginFrom2Nix {
|
||||
pname = "vim-nickel";
|
||||
version = "2023-06-19";
|
||||
version = "2023-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickel-lang";
|
||||
repo = "vim-nickel";
|
||||
rev = "490e81372ad1e8fbd0e2d040a3300eeac0537658";
|
||||
sha256 = "1vl2gs1164q05rkj79hz4iqq8nbqfl9aa4flyyphppr6lz1392vh";
|
||||
rev = "6e91be2605b6b83d04fbdb402f205defc748d998";
|
||||
sha256 = "0n1b6l29fffsbm1hn7fj34ky4l01a9izyshsgg7wda8wq7lk2xgr";
|
||||
};
|
||||
meta.homepage = "https://github.com/nickel-lang/vim-nickel/";
|
||||
};
|
||||
|
|
@ -15386,12 +15398,12 @@ final: prev:
|
|||
|
||||
catppuccin-vim = buildVimPluginFrom2Nix {
|
||||
pname = "catppuccin-vim";
|
||||
version = "2023-01-21";
|
||||
version = "2023-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "vim";
|
||||
rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34";
|
||||
sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v";
|
||||
rev = "5280d241fe6a4f4ddef17078a215b81a113388e8";
|
||||
sha256 = "1l8a7gn5wd7ry04lvm94x5s2fwf9dcl281200f5yq9ic6aw18p99";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/vim/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -49,23 +49,23 @@
|
|||
};
|
||||
awk = buildGrammar {
|
||||
language = "awk";
|
||||
version = "0.0.0+rev=8eaa762";
|
||||
version = "0.0.0+rev=16e6fd8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beaglefoot";
|
||||
repo = "tree-sitter-awk";
|
||||
rev = "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2";
|
||||
hash = "sha256-H10WU81pDlIvERF5h999B1bho1ycKO6kdEyUZFddlp4=";
|
||||
rev = "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff";
|
||||
hash = "sha256-TbDVyXBcg/0jzs3cFMZCRw7v2iqTfPXmRVBZM4kp0m8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
|
||||
};
|
||||
bash = buildGrammar {
|
||||
language = "bash";
|
||||
version = "0.0.0+rev=ee2a8f9";
|
||||
version = "0.0.0+rev=4936467";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-bash";
|
||||
rev = "ee2a8f9906b53a785b784ee816c0016c2b6866d2";
|
||||
hash = "sha256-dpzEuNa0371ikYmFxViYM18M/BclVoAuPWWKTgmvV8A=";
|
||||
rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841";
|
||||
hash = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
|
||||
};
|
||||
|
|
@ -491,12 +491,12 @@
|
|||
};
|
||||
foam = buildGrammar {
|
||||
language = "foam";
|
||||
version = "0.0.0+rev=ec73f2e";
|
||||
version = "0.0.0+rev=0244495";
|
||||
src = fetchFromGitHub {
|
||||
owner = "FoamScience";
|
||||
repo = "tree-sitter-foam";
|
||||
rev = "ec73f2e317f9c09356e7be452d85671b9923a428";
|
||||
hash = "sha256-S/j4evMQiSmtA9V8GCedCHCZe8nqpE1R5zJFmzHHEQI=";
|
||||
rev = "024449594c2841c944463481b741b141d1ab5727";
|
||||
hash = "sha256-GUXet7WkH4yVoLBtPmmXR4VLwQ0MjwabH2dRS963ZsY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/FoamScience/tree-sitter-foam";
|
||||
};
|
||||
|
|
@ -819,14 +819,25 @@
|
|||
};
|
||||
meta.homepage = "https://github.com/antosha417/tree-sitter-hocon";
|
||||
};
|
||||
hoon = buildGrammar {
|
||||
language = "hoon";
|
||||
version = "0.0.0+rev=5b61ea6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "urbit-pilled";
|
||||
repo = "tree-sitter-hoon";
|
||||
rev = "5b61ea6129dd6841140fa0d16172ca5d105526fd";
|
||||
hash = "sha256-MY+nm0bKZXkgNCRF1/eBezll/uSfg2SnUTh7icQXuOg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
|
||||
};
|
||||
html = buildGrammar {
|
||||
language = "html";
|
||||
version = "0.0.0+rev=ab91d87";
|
||||
version = "0.0.0+rev=d2592b0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-html";
|
||||
rev = "ab91d87963c47ffd08a7967b9aa73eb53293d120";
|
||||
hash = "sha256-OJ1RcYRU2A8y3taXe+sO+HnUt2o2G8tznwDzwPL0H7Y=";
|
||||
rev = "d2592b006e5270a281c6bafdbcb3768cd97fa47a";
|
||||
hash = "sha256-COWv6rCcA2Km2N+D6kperFlmPr31AnWaPR6uMCWwFr4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
|
||||
};
|
||||
|
|
@ -1142,12 +1153,12 @@
|
|||
};
|
||||
matlab = buildGrammar {
|
||||
language = "matlab";
|
||||
version = "0.0.0+rev=b09c27e";
|
||||
version = "0.0.0+rev=d7b24aa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "acristoffers";
|
||||
repo = "tree-sitter-matlab";
|
||||
rev = "b09c27e42732c59321604a15163480ebb4f82f1c";
|
||||
hash = "sha256-gIaHyExmgFSEe6Nm7G5NPNafWWhl50Fn1UQm35MrAuE=";
|
||||
rev = "d7b24aaaf3e4814d073517d072727319d2b5ffc3";
|
||||
hash = "sha256-oODBui19Ihyy9MJ0Nj1C4Ru1MN2ooMKu+njGFjUq1ao=";
|
||||
};
|
||||
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
|
||||
};
|
||||
|
|
@ -1198,12 +1209,12 @@
|
|||
};
|
||||
nickel = buildGrammar {
|
||||
language = "nickel";
|
||||
version = "0.0.0+rev=b1a4718";
|
||||
version = "0.0.0+rev=e1d9337";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickel-lang";
|
||||
repo = "tree-sitter-nickel";
|
||||
rev = "b1a4718601ebd29a62bf3a7fd1069a99ccf48093";
|
||||
hash = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU=";
|
||||
rev = "e1d9337864d209898a08c26b8cd4c2dd14c15148";
|
||||
hash = "sha256-RcVBptlJ4lYwdDo64pwzxx5z90yqS96Dhyuj4VZWOiM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
|
||||
};
|
||||
|
|
@ -1476,12 +1487,12 @@
|
|||
};
|
||||
python = buildGrammar {
|
||||
language = "python";
|
||||
version = "0.0.0+rev=6ecc2b5";
|
||||
version = "0.0.0+rev=36f9e33";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-python";
|
||||
rev = "6ecc2b54b39ac390848d81dfcf5ee961f33a2f03";
|
||||
hash = "sha256-gfFD1E6hXaNU0z81VHvo0oMU9iLcyRWP6sIRj6uagYU=";
|
||||
rev = "36f9e33d52b7572536ac1a8af8d7e78363ad52c3";
|
||||
hash = "sha256-pUxVuG1xjjXxVWfh6UPZ2WZ5jo3GXmWKrCHSiMnCM+M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
|
||||
};
|
||||
|
|
@ -1641,12 +1652,12 @@
|
|||
};
|
||||
scala = buildGrammar {
|
||||
language = "scala";
|
||||
version = "0.0.0+rev=cda0de8";
|
||||
version = "0.0.0+rev=8062487";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-scala";
|
||||
rev = "cda0de8a038b0e4ad79a97f7aa281250fcf88560";
|
||||
hash = "sha256-739c8THPQchATVQqaE5sAAg2aW5x8NXyn7OUT5yDRQs=";
|
||||
rev = "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203";
|
||||
hash = "sha256-nCmQjLqunccXVgmNUMbMbm6SYuwCRtf1v2CFXrgKXqo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
|
|
@ -1729,12 +1740,12 @@
|
|||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=bd53a6c";
|
||||
version = "0.0.0+rev=e35a16e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "bd53a6c482d865365cbfb034168ca78364d1d136";
|
||||
hash = "sha256-JpEi+bX2e7fo1Cgp3VZNZlsK850nBnBGBsMnt6UrQTA=";
|
||||
rev = "e35a16e4b7b342de6a0fbeee108d536bb6633562";
|
||||
hash = "sha256-BNLZxpJTmAIAFqmktejHYsWJnGXx4sGFA0p3V8Ym6sc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
|
|
@ -1920,12 +1931,12 @@
|
|||
};
|
||||
tsx = buildGrammar {
|
||||
language = "tsx";
|
||||
version = "0.0.0+rev=286e90c";
|
||||
version = "0.0.0+rev=3429d8c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-typescript";
|
||||
rev = "286e90c32060032225f636a573d0e999f7766c97";
|
||||
hash = "sha256-lg/FxjosZkhosllT0PyCKggV1Z2V4rPdKFD4agRLeBo=";
|
||||
rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772";
|
||||
hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U=";
|
||||
};
|
||||
location = "tsx";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
|
||||
|
|
@ -1954,12 +1965,12 @@
|
|||
};
|
||||
typescript = buildGrammar {
|
||||
language = "typescript";
|
||||
version = "0.0.0+rev=286e90c";
|
||||
version = "0.0.0+rev=3429d8c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-typescript";
|
||||
rev = "286e90c32060032225f636a573d0e999f7766c97";
|
||||
hash = "sha256-lg/FxjosZkhosllT0PyCKggV1Z2V4rPdKFD4agRLeBo=";
|
||||
rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772";
|
||||
hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U=";
|
||||
};
|
||||
location = "typescript";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
|
||||
|
|
@ -2099,12 +2110,12 @@
|
|||
};
|
||||
wing = buildGrammar {
|
||||
language = "wing";
|
||||
version = "0.0.0+rev=bb54f98";
|
||||
version = "0.0.0+rev=e532784";
|
||||
src = fetchFromGitHub {
|
||||
owner = "winglang";
|
||||
repo = "wing";
|
||||
rev = "bb54f98e55db82d67711abadefdbd3b933c9efc3";
|
||||
hash = "sha256-z4n4VneiCfCoEg7GHa8GAyUYAbJkoe973aPMUEheU+Y=";
|
||||
rev = "e5327844f545d4b6d78d23afc97439fae2aa5944";
|
||||
hash = "sha256-8MIWnLTHVNZRrSSbibr/wb0Fd8Mu5K3Ip+5htpvGS8w=";
|
||||
};
|
||||
location = "libs/tree-sitter-wing";
|
||||
generate = true;
|
||||
|
|
|
|||
|
|
@ -674,6 +674,7 @@ https://github.com/AlphaTechnolog/pywal.nvim/,,
|
|||
https://github.com/unblevable/quick-scope/,,
|
||||
https://github.com/stefandtw/quickfix-reflector.vim/,,
|
||||
https://github.com/dannyob/quickfixstatus/,,
|
||||
https://github.com/jbyuki/quickmath.nvim/,HEAD,
|
||||
https://github.com/luochen1990/rainbow/,,
|
||||
https://github.com/kien/rainbow_parentheses.vim/,,
|
||||
https://github.com/vim-scripts/random.vim/,,
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "halftone";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfuxu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-C/AzaKXZx/0mbrG5v2I5kKcw3N0gh/m/9zshbZfzECw=";
|
||||
hash = "sha256-hUaI5omYUa5Fq95N0FqJJe+WVoRWkANy0/mmaURWIzg=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gimoji";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeenix";
|
||||
repo = "gimoji";
|
||||
rev = version;
|
||||
hash = "sha256-fRAi+ac/NzG6FQZq6ohpan5ZNtiwJXLV6k1BsMwaJsg=";
|
||||
hash = "sha256-8aMm6OHDYBGvLYrQmQh33SI3jap6fS7lgOYDn9lWS18=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-57A/D6XgedQEaTn+lx5Ce/O8wR2xO3ozemLQOOF8/84=";
|
||||
cargoHash = "sha256-IENW19FlqWLk7K0+r9IUhXkS7C/wmik2bGDZdRk0jzA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OtA7mhypPNDD7IH5XKOoE2ytcjR0uhed8B3MoMrPd0Y=";
|
||||
hash = "sha256-ohk3CKcB6LD1gRKDDNYK+MbFxWa7QEiqmRYYpSkwj8E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QzD0Stbr8QuQ8n9l9qv16KFqSFBsRbxETmQ8LHdk3nI=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.32.4";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GZ9FgseJmaWiMSscLSqMutv5yQ/e8qCjoJEPPTH2Ix0=";
|
||||
sha256 = "sha256-3CRE+gpifV3MHyKdiiHmGwGre0ne3IjheYH0r6NMKY8=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members ++ teams.pantheon.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,22 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc
|
||||
, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
|
||||
, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
|
||||
, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
|
||||
, thin-provisioning-tools, makeWrapper
|
||||
, thin-provisioning-tools, makeWrapper, e2fsprogs, libnvme, keyutils
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libblockdev";
|
||||
version = "2.28";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "libblockdev";
|
||||
rev = "${version}-1";
|
||||
sha256 = "sha256-6MrM3psLqMcpf4haaEHg3FwrhUDz5h/DeY1w96T0UlE=";
|
||||
sha256 = "sha256-pdS3rMqAgNdYSyXN2ItvOmDO9MEEiHTgPWFVc24N6VE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
sgdisk = "${gptfdisk}/bin/sgdisk";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
'';
|
||||
|
|
@ -34,8 +27,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid util-linux libbytesize
|
||||
libndctl nss volume_key libyaml
|
||||
e2fsprogs glib udev keyutils kmod parted gptfdisk cryptsetup lvm2 util-linux libbytesize
|
||||
libndctl libnvme nss volume_key libyaml
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
--- a/src/plugins/part.c
|
||||
+++ b/src/plugins/part.c
|
||||
@@ -146,7 +146,7 @@ static GMutex deps_check_lock;
|
||||
#define DEPS_LAST 2
|
||||
|
||||
static const UtilDep deps[DEPS_LAST] = {
|
||||
- {"sgdisk", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"},
|
||||
+ {"@sgdisk@", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"},
|
||||
{"sfdisk", NULL, NULL, NULL},
|
||||
};
|
||||
|
||||
@@ -355,7 +355,7 @@ gboolean bd_part_create_table (const gchar *disk, BDPartTableType type, gboolean
|
||||
}
|
||||
|
||||
static gchar* get_part_type_guid_and_gpt_flags (const gchar *device, int part_num, guint64 *flags, GError **error) {
|
||||
- const gchar *args[4] = {"sgdisk", NULL, device, NULL};
|
||||
+ const gchar *args[4] = {"@sgdisk@", NULL, device, NULL};
|
||||
gchar *output = NULL;
|
||||
gchar **lines = NULL;
|
||||
gchar **line_p = NULL;
|
||||
@@ -1325,7 +1325,7 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size
|
||||
|
||||
|
||||
static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag, gboolean state, GError **error) {
|
||||
- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL};
|
||||
+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL};
|
||||
int bit_num = 0;
|
||||
gboolean success = FALSE;
|
||||
|
||||
@@ -1351,7 +1351,7 @@ static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag
|
||||
}
|
||||
|
||||
static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, GError **error) {
|
||||
- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL};
|
||||
+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL};
|
||||
guint64 real_flags = 0;
|
||||
gchar *mask_str = NULL;
|
||||
gboolean success = FALSE;
|
||||
@@ -1791,7 +1791,7 @@ gboolean bd_part_set_part_name (const gchar *disk, const gchar *part, const gcha
|
||||
* Tech category: %BD_PART_TECH_GPT-%BD_PART_TECH_MODE_MODIFY_PART
|
||||
*/
|
||||
gboolean bd_part_set_part_type (const gchar *disk, const gchar *part, const gchar *type_guid, GError **error) {
|
||||
- const gchar *args[5] = {"sgdisk", "--typecode", NULL, disk, NULL};
|
||||
+ const gchar *args[5] = {"@sgdisk@", "--typecode", NULL, disk, NULL};
|
||||
const gchar *part_num_str = NULL;
|
||||
gboolean success = FALSE;
|
||||
guint64 progress_id = 0;
|
||||
|
|
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
|||
# Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
|
||||
./85_security_load_3.85+.patch
|
||||
./fix-cross-compilation.patch
|
||||
] ++ lib.optionals (lib.versionOlder version "3.91") [
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1836925
|
||||
# https://phabricator.services.mozilla.com/D180068
|
||||
./remove-c25519-support.patch
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.90";
|
||||
hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y=";
|
||||
version = "3.91";
|
||||
hash = "sha256-hL1GN23xcRjFX21z0w/ZOgryEpbGbnaQRxVH5YmPxLM=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, msrest
|
||||
, msrestazure
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.0";
|
||||
pname = "azure-mgmt-appcontainers";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
msrest
|
||||
msrestazure
|
||||
];
|
||||
|
||||
# no tests included
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.appcontainers" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Appcontainers Management Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appcontainers/azure-mgmt-appcontainers";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jfroche ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.35.5";
|
||||
version = "0.35.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JpRL4RxVcH+hzz7YTlRw+FHH95RavS/m1HWyBiLLWME=";
|
||||
hash = "sha256-N0Rxa685jWAvlvCTUw3SKF+VqnkIaKyXPU58o9VOrjE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsplaining";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "salesforce";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-L7sEv0xe8+riJb7DW2N6+MsoXBXJNzK96oGkpAkAyLU=";
|
||||
hash = "sha256-1p0Lrx4uirgyhE8cdhrSOJLBSN11f6X5WqdWtVutDzQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dparse";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1FJVvaIfmYvH3fKv1eYlBbphNHVrotQqhMVrCCZhTf4=";
|
||||
hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A parser for Python dependency files";
|
||||
homepage = "https://github.com/pyupio/dparse";
|
||||
changelog = "https://github.com/pyupio/dparse/blob/${version}/HISTORY.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thomasdesr ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,24 +1,30 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "heatshrink2";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eerimoq";
|
||||
repo = "pyheatshrink";
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-P3IofGbW4x+erGCyxIPvD9aNHIJ/GjjWgno4n95SQoQ=";
|
||||
hash = "sha256-JthHYq78SYr49+sTNtLZ8GjtrHcr1dzXcPskTrb4M3o=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "heatshrink2" ];
|
||||
pythonImportsCheck = [
|
||||
"heatshrink2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compression using the Heatshrink algorithm in Python 3.";
|
||||
description = "Compression using the Heatshrink algorithm";
|
||||
homepage = "https://github.com/eerimoq/pyheatshrink";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mmengine";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "open-mmlab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ook85XWosxbvshsQxZEoAWI/Ugl2uSO8zoNJ5EuuW1E=";
|
||||
hash = "sha256-eridbYHagwAyXX3/JggfvC0vuy6nBAIISRy1ARrQ7Kk=";
|
||||
};
|
||||
|
||||
# tests are disabled due to sandbox env.
|
||||
|
|
|
|||
|
|
@ -6,22 +6,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mss";
|
||||
version = "7.0.1";
|
||||
version = "9.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI=";
|
||||
hash = "sha256-bre5AIzydCiBH6M66zXzM024Hj98wt1J7HxuWpSznxI=";
|
||||
};
|
||||
|
||||
# By default it attempts to build Windows-only functionality
|
||||
prePatch = ''
|
||||
rm mss/windows.py
|
||||
# By default it attempts to build Windows-only functionality
|
||||
rm src/mss/windows.py
|
||||
'';
|
||||
|
||||
# Skipping tests due to most relying on DISPLAY being set
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mss"
|
||||
];
|
||||
|
|
@ -29,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Cross-platform multiple screenshots module";
|
||||
homepage = "https://github.com/BoboTiG/python-mss";
|
||||
changelog = "https://github.com/BoboTiG/python-mss/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ austinbutler ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20230617";
|
||||
version = "0.10.0.20230701";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Ncq/VuUCNR8TZvYSiXBG93xanQcw0FQGrHOBtIc1y2k=";
|
||||
hash = "sha256-vlmo1pQpMRlMF9Wmd9bw0cocmcpcxj4MC1YHqNUyriU=";
|
||||
};
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
|
|||
|
|
@ -3,21 +3,26 @@
|
|||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymazda";
|
||||
version = "0.3.8";
|
||||
format = "setuptools";
|
||||
version = "0.3.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CBPBmzghuc+kvBt50qmU+jHyUdGgLgNX3jcVm9CC7/Q=";
|
||||
hash = "sha256-S5mM15DcEBwczsLk6VJDzgMo80NjsCeehz66SALYeV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
cryptography
|
||||
|
|
@ -33,6 +38,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python client for interacting with the MyMazda API";
|
||||
homepage = "https://github.com/bdr99/pymazda";
|
||||
changelog = "https://github.com/bdr99/pymazda/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qutip";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-W5iqRWAB6D1Dnxz0Iyl7ZmP3yrXvLyV7BdBdIgFCiQY=";
|
||||
hash = "sha256-qItj+MSiFKBgRiz/1+AWsmMzdaQs6rFT1FWWHbReudY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -87,6 +87,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Open-source software for simulating the dynamics of closed and open quantum systems";
|
||||
homepage = "https://qutip.org/";
|
||||
changelog = "https://github.com/qutip/qutip/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fabiangd ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svlint";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yo0SgNnwy0LnbIOCLwHUpzjgTZzOoO5GHzKmNVFQOtE=";
|
||||
sha256 = "sha256-ykAuypWBbZ+53ImzNJGsztLHG8OQLIGBHC6Z3Amu+L0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3ELBEalMQE+Ozgud+RECl5ClBLy3TqGaEry2OwZ2pGk=";
|
||||
cargoHash = "sha256-517AXkFqYaHC/FejtxolAQxJVpvcFhmf3Nptzcy9idY=";
|
||||
|
||||
cargoBuildFlags = [ "--bin" "svlint" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YUDvsgY5bLZwTCvBejqeRScgH6wu68ym3VxkSUmeqwI=";
|
||||
hash = "sha256-7eRLv1ZrD3eVGoR0lmtefpW7NlokF+4vuleiT8BzCc8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-blcXhWaIWIA4BhmMX/T1mDDr1tUvxiauq7tXKBeZGbY=";
|
||||
cargoHash = "sha256-jETjBGIwNh2Jt6aNNrOF+JOwGHKWIpMEacPp6zjbIhU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.10";
|
||||
version = "0.18.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mJ6q/Ccg7Lm6OXncLnA7QAyiDS/tZJJqobPG+shGPJQ=";
|
||||
hash = "sha256-j1hOzSqnEmbatfIxOnS551gXTjJp09Qw1A1R6k1cWN8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
30
pkgs/development/tools/fastgron/default.nix
Normal file
30
pkgs/development/tools/fastgron/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, curl, testers }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastgron";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adamritter";
|
||||
repo = "fastgron";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SqJdJnepfX/qHiACjpaTNM+/lApcADCCbcX+BNgXswg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ curl ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/adamritter/fastgron/releases/tag/${finalAttrs.src.rev}";
|
||||
description = "High-performance JSON to GRON (greppable, flattened JSON) converter";
|
||||
homepage = "https://github.com/adamritter/fastgron";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zowoq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jql";
|
||||
version = "6.0.9";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = pname;
|
||||
rev = "jql-v${version}";
|
||||
hash = "sha256-2CCbDhZQpefsiHS+b9ZYY1oFcBMZqxSkNKbvhkBdL64=";
|
||||
hash = "sha256-D1L7C7oKvKtsphqOTEuJ7i6/xTg2nN6VwcUjSFb3hz0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Vu0QFyz+kyI28pGAArwu4bBTPieB5GjGXFCPiW/sbi4=";
|
||||
cargoHash = "sha256-CHltLd7uj6ZFJ3uq+NRxOTLyMtkP9a+dAyhfBlqjoAY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON Query Language CLI tool built with Rust";
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
|
@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
|
|
@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
|
|||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
|
|
@ -150,7 +150,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"serde",
|
||||
|
|
@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
|
|||
|
||||
[[package]]
|
||||
name = "cov-mark"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
|
|
@ -415,7 +415,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
|
|
@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
|
|||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
|
|
@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
|
|
@ -575,7 +575,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"codespan-reporting",
|
||||
|
|
@ -593,7 +593,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
|
|
@ -622,7 +622,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
|
|
@ -633,7 +633,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
|
@ -657,7 +657,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
|
|
@ -729,7 +729,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
|
|
@ -923,7 +923,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
|
|
@ -931,14 +931,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
|
|
@ -949,7 +949,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-dynamics-tests"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"pretty_assertions",
|
||||
|
|
@ -965,7 +965,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
|
|
@ -979,7 +979,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
|
|
@ -988,7 +988,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"sml-lab",
|
||||
|
|
@ -999,7 +999,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-hir-lower"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"cov-mark",
|
||||
|
|
@ -1014,14 +1014,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-lab"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"cov-mark",
|
||||
"diagnostic",
|
||||
|
|
@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e
|
|||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
|
|
@ -1045,11 +1045,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
|
|
@ -1061,14 +1061,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-scon"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
|
|
@ -1077,7 +1077,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"config",
|
||||
|
|
@ -1100,7 +1100,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
|
|
@ -1119,7 +1119,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-symbol-kind"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"sml-namespace",
|
||||
"sml-statics-types",
|
||||
|
|
@ -1127,7 +1127,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"char-name",
|
||||
"code-h2-md-map",
|
||||
|
|
@ -1140,7 +1140,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
|
|
@ -1208,7 +1208,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
|
|
@ -1552,7 +1552,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.12.0"
|
||||
version = "0.12.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.12.0";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WoawuH0fuhVrTEtcdfkKpJUQBcbMnbybDST4DDkJEqM=";
|
||||
hash = "sha256-qfBDwbAbj4XoZeH0hyS09iUfg0G1X1RjpVOSd+2twT0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.5.2";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4bslw+BADUQO9cUCEYZ1U4eRdr/2652Shty+NVY0ZYI=";
|
||||
rev = version;
|
||||
hash = "sha256-iU7UtyF5isyc4G3vYu7f1bU7U38HsgkzNF+LctE08ds=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ed6hc7MIo/Hu1JY7yy6dYHbaTZ9S+T0dh/2H3sTT52Y=";
|
||||
cargoHash = "sha256-30cYsRj10uFUlxhr7kgOy3I0m9qtq6kVNednX7OSQUk=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
|
@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://ast-grep.github.io/";
|
||||
changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ montchr ];
|
||||
maintainers = with maintainers; [ montchr lord-valen ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-validate";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "protoc-gen-validate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VXGsSlqVScqyScOsYoXcVfXFvH73GFc+4qPRETqbre0=";
|
||||
sha256 = "sha256-sztpUzrVvYT3GFVbfd91rOudj/PEHHizTOzTrH1fQts=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OOjVlRHaOLIJVg3r97qZ3lPv8ANYY2HSn7hUJhg3Cfs=";
|
||||
vendorHash = "sha256-UPmeb36kF+z37+RcyXaOsJvAto1xrJUyJqcPyODAQrY=";
|
||||
|
||||
excludedPackages = [ "tests" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "0.6.9";
|
||||
version = "0.6.12";
|
||||
pname = "bun";
|
||||
|
||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
|
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
|
|||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
sha256 = "19NWXqC6HNBP45IYeZYQQE8/cp0M5VTEspmg/Sf0GMU=";
|
||||
sha256 = "CCfBRrvG1OFThIQ/udmXK/civUFPow7aXlrJO1o00Cg=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
sha256 = "qmjYq+UhYO4uYvygVtetTrGfbsRDuZDrViui+Dg4TU4=";
|
||||
sha256 = "V5csrlGcxwUsKu078vIMgbWkxBa8OvFUeCvPFhcTOPE=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
||||
sha256 = "TBpqRY+ZLdS33S/tYdyZCflZMRjLwMQknE+H22AsPJg=";
|
||||
sha256 = "GSzjmoBhCXj6LOUoviRhbJtftWXIYXcc6HWx9N4npMY=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
sha256 = "rOoeiinBgzTuoVb+Bhdo+gHvT2RXCF1fROau6A4CzJk=";
|
||||
sha256 = "M/YDVAOXK7TUbrcey+J7plrTzTXPBOps7JPBioGew7E=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
, stdenv
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, commitDate ? "2023-02-01"
|
||||
, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f"
|
||||
, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk="
|
||||
|
||||
, commitDate ? "2023-06-28"
|
||||
# bcachefs-tools stores the expected-revision in:
|
||||
# https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision
|
||||
# but this does not means that it'll be the latest-compatible revision
|
||||
, currentCommit ? "84f132d5696138bb038d2dc8f1162d2fab5ac832"
|
||||
, diffHash ? "sha256-RaBWBU7rXjJFb1euFAFBHWCBQAG7npaCodjp/vMYpyw="
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, fetchpatch, pkg-config, gnused, autoreconfHook
|
||||
{ lib, stdenv, fetchFromGitHub, substituteAll, pkg-config, gnused, autoreconfHook
|
||||
, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which
|
||||
, expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted
|
||||
, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "udisks";
|
||||
version = "2.9.4";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "udisks";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-MYQztzIyp5kh9t1bCIlj08/gaOmZfuu/ZOwo3F+rZiw=";
|
||||
sha256 = "sha256-M0L2MjVKv7VmtML/JZx0I8vNj+m6KDWGezvcwFqoTNI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "dev" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
|
||||
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
|||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
bash = "${bash}/bin/bash";
|
||||
blkid = "${util-linux}/bin/blkid";
|
||||
false = "${coreutils}/bin/false";
|
||||
mdadm = "${mdadm}/bin/mdadm";
|
||||
mkswap = "${util-linux}/bin/mkswap";
|
||||
|
|
@ -40,11 +39,6 @@ stdenv.mkDerivation rec {
|
|||
xfsprogs ntfs3g parted util-linux
|
||||
];
|
||||
})
|
||||
# Fix crash on exit, remove on upgrade to 2.10.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/storaged-project/udisks/commit/6464e3083c27b9e4d97848b9e69e862f265511d5.patch";
|
||||
hash = "sha256-XGprXjJLIL8l4P5MRTHV8GOQR1hpaaFiLgexGnO9Lvg=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -8,101 +8,12 @@ index ca802cce..bfd1c29e 100644
|
|||
#
|
||||
-SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="raid", ENV{ID_FS_TYPE}=="linux_raid_member", ENV{UDISKS_MD_MEMBER_LEVEL}=="", IMPORT{program}="/bin/sh -c '/sbin/mdadm --examine --export $tempnode | /bin/sed s/^MD_/UDISKS_MD_MEMBER_/g'"
|
||||
+SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="raid", ENV{ID_FS_TYPE}=="linux_raid_member", ENV{UDISKS_MD_MEMBER_LEVEL}=="", IMPORT{program}="@sh@ -c '@mdadm@ --examine --export $tempnode | @sed@ s/^MD_/UDISKS_MD_MEMBER_/g'"
|
||||
|
||||
|
||||
-SUBSYSTEM=="block", KERNEL=="md*", ENV{DEVTYPE}!="partition", IMPORT{program}="/bin/sh -c '/sbin/mdadm --detail --export $tempnode | /bin/sed s/^MD_/UDISKS_MD_/g'"
|
||||
+SUBSYSTEM=="block", KERNEL=="md*", ENV{DEVTYPE}!="partition", IMPORT{program}="@sh@ -c '@mdadm@ --detail --export $tempnode | @sed@ s/^MD_/UDISKS_MD_/g'"
|
||||
|
||||
|
||||
LABEL="udisks_probe_end"
|
||||
|
||||
diff --git a/modules/zram/data/udisks2-zram-setup@.service.in b/modules/zram/data/udisks2-zram-setup@.service.in
|
||||
index ac868e84..03fdd887 100644
|
||||
--- a/modules/zram/data/udisks2-zram-setup@.service.in
|
||||
+++ b/modules/zram/data/udisks2-zram-setup@.service.in
|
||||
@@ -8,7 +8,7 @@ Requires=dev-%i.device
|
||||
Type=oneshot
|
||||
RemainAfterExit=no
|
||||
EnvironmentFile=-@zramconfdir@/%i
|
||||
-ExecStart=-/bin/sh -c 'if [ -n "$ZRAM_NUM_STR" ]; then echo "$ZRAM_NUM_STR" > /sys/class/block/%i/max_comp_streams; fi'
|
||||
-ExecStart=-/bin/sh -c 'if [ -n "$ZRAM_DEV_SIZE" ]; then echo "$ZRAM_DEV_SIZE" > /sys/class/block/%i/disksize; fi'
|
||||
-ExecStart=-/bin/sh -c 'if [ "$SWAP" = "y" ]; then mkswap /dev/%i && swapon /dev/%i; fi'
|
||||
-# ExecStop=-/bin/sh -c 'echo 1 > /sys/class/block/%i/reset'
|
||||
+ExecStart=-@sh@ -c 'if [ -n "$ZRAM_NUM_STR" ]; then echo "$ZRAM_NUM_STR" > /sys/class/block/%i/max_comp_streams; fi'
|
||||
+ExecStart=-@sh@ -c 'if [ -n "$ZRAM_DEV_SIZE" ]; then echo "$ZRAM_DEV_SIZE" > /sys/class/block/%i/disksize; fi'
|
||||
+ExecStart=-@sh@ -c 'if [ "$SWAP" = "y" ]; then @mkswap@ /dev/%i && @swapon@ /dev/%i; fi'
|
||||
+# ExecStop=-@sh@ -c 'echo 1 > /sys/class/block/%i/reset'
|
||||
diff --git a/modules/zram/udiskslinuxmanagerzram.c b/modules/zram/udiskslinuxmanagerzram.c
|
||||
index f647f653..df81e910 100644
|
||||
--- a/modules/zram/udiskslinuxmanagerzram.c
|
||||
+++ b/modules/zram/udiskslinuxmanagerzram.c
|
||||
@@ -243,7 +243,7 @@ create_conf_files (guint64 num_devices,
|
||||
|
||||
g_snprintf (tmp, 255, "zram%" G_GUINT64_FORMAT, i);
|
||||
filename = g_build_filename (PACKAGE_ZRAMCONF_DIR, tmp, NULL);
|
||||
- contents = g_strdup_printf ("#!/bin/bash\n"
|
||||
+ contents = g_strdup_printf ("#!@bash@\n"
|
||||
"# UDisks2 managed ZRAM configuration\n\n"
|
||||
"ZRAM_NUM_STR=%" G_GUINT64_FORMAT "\n"
|
||||
"ZRAM_DEV_SIZE=%" G_GUINT64_FORMAT "\n"
|
||||
diff --git a/src/tests/install-udisks/runtest.sh b/src/tests/install-udisks/runtest.sh
|
||||
index e7df4ed2..ab4356d9 100644
|
||||
--- a/src/tests/install-udisks/runtest.sh
|
||||
+++ b/src/tests/install-udisks/runtest.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!@bash@
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
||||
index 07e4e029..3bd8ec51 100755
|
||||
--- a/src/tests/integration-test
|
||||
+++ b/src/tests/integration-test
|
||||
@@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase):
|
||||
if not device:
|
||||
device = cls.devname(partition)
|
||||
result = {}
|
||||
- cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
|
||||
+ cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
|
||||
for l in cmd.stdout:
|
||||
(key, value) = l.decode('UTF-8').split('=', 1)
|
||||
result[key] = value.strip()
|
||||
@@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase):
|
||||
f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", '
|
||||
'ATTRS{model}=="scsi_debug*", '
|
||||
'ENV{ID_CDROM_MEDIA}=="?*", '
|
||||
- 'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n')
|
||||
+ 'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n')
|
||||
# reload udev
|
||||
subprocess.call('sync; pkill --signal HUP udevd || '
|
||||
'pkill --signal HUP systemd-udevd',
|
||||
@@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):
|
||||
self.assertFalse(os.access(f, os.X_OK))
|
||||
|
||||
f = os.path.join(mount_point, 'simple.exe')
|
||||
- shutil.copy('/bin/bash', f)
|
||||
+ shutil.copy('@bash@', f)
|
||||
self.assertTrue(os.access(f, os.R_OK))
|
||||
self.assertTrue(os.access(f, os.W_OK))
|
||||
self.assertTrue(os.access(f, os.X_OK))
|
||||
@@ -1155,7 +1155,7 @@ class FS(UDisksTestCase):
|
||||
self.assertFalse(os.access(f, os.X_OK))
|
||||
|
||||
f = os.path.join(mount_point, 'subdir', 'subdir.exe')
|
||||
- shutil.copy('/bin/bash', f)
|
||||
+ shutil.copy('@bash@', f)
|
||||
self.assertTrue(os.access(f, os.R_OK))
|
||||
self.assertTrue(os.access(f, os.W_OK))
|
||||
self.assertTrue(os.access(f, os.X_OK))
|
||||
diff --git a/src/tests/storadectl/runtest.sh b/src/tests/storadectl/runtest.sh
|
||||
index f03885f9..baca6a93 100644
|
||||
--- a/src/tests/storadectl/runtest.sh
|
||||
+++ b/src/tests/storadectl/runtest.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!@bash@
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
|
||||
diff --git a/src/tests/test.c b/src/tests/test.c
|
||||
index 3ddbdf2c..a87f960a 100644
|
||||
--- a/src/tests/test.c
|
||||
|
|
@ -110,7 +21,7 @@ index 3ddbdf2c..a87f960a 100644
|
|||
@@ -71,7 +71,7 @@ test_spawned_job_successful (void)
|
||||
{
|
||||
UDisksSpawnedJob *job;
|
||||
|
||||
|
||||
- job = udisks_spawned_job_new ("/bin/true", NULL, getuid (), geteuid (), NULL, NULL);
|
||||
+ job = udisks_spawned_job_new ("@true@", NULL, getuid (), geteuid (), NULL, NULL);
|
||||
udisks_spawned_job_start (job);
|
||||
|
|
@ -119,7 +30,7 @@ index 3ddbdf2c..a87f960a 100644
|
|||
@@ -84,10 +84,10 @@ test_spawned_job_failure (void)
|
||||
{
|
||||
UDisksSpawnedJob *job;
|
||||
|
||||
|
||||
- job = udisks_spawned_job_new ("/bin/false", NULL, getuid (), geteuid (), NULL, NULL);
|
||||
+ job = udisks_spawned_job_new ("@false@", NULL, getuid (), geteuid (), NULL, NULL);
|
||||
udisks_spawned_job_start (job);
|
||||
|
|
@ -128,9 +39,9 @@ index 3ddbdf2c..a87f960a 100644
|
|||
+ (gpointer) "Command-line `@false@' exited with non-zero exit status 1: ");
|
||||
g_object_unref (job);
|
||||
}
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@ test_spawned_job_cancelled_at_start (void)
|
||||
|
||||
|
||||
cancellable = g_cancellable_new ();
|
||||
g_cancellable_cancel (cancellable);
|
||||
- job = udisks_spawned_job_new ("/bin/true", NULL, getuid (), geteuid (), NULL, cancellable);
|
||||
|
|
@ -140,7 +51,7 @@ index 3ddbdf2c..a87f960a 100644
|
|||
(gpointer) "Operation was cancelled (g-io-error-quark, 19)");
|
||||
@@ -144,7 +144,7 @@ test_spawned_job_cancelled_midway (void)
|
||||
GCancellable *cancellable;
|
||||
|
||||
|
||||
cancellable = g_cancellable_new ();
|
||||
- job = udisks_spawned_job_new ("/bin/sleep 0.5", NULL, getuid (), geteuid (), NULL, cancellable);
|
||||
+ job = udisks_spawned_job_new ("@sleep@ 0.5", NULL, getuid (), geteuid (), NULL, cancellable);
|
||||
|
|
@ -150,7 +61,7 @@ index 3ddbdf2c..a87f960a 100644
|
|||
@@ -197,7 +197,7 @@ test_spawned_job_premature_termination (void)
|
||||
{
|
||||
UDisksSpawnedJob *job;
|
||||
|
||||
|
||||
- job = udisks_spawned_job_new ("/bin/sleep 1000", NULL, getuid (), geteuid (), NULL, NULL /* GCancellable */);
|
||||
+ job = udisks_spawned_job_new ("@sleep@ 1000", NULL, getuid (), geteuid (), NULL, NULL /* GCancellable */);
|
||||
udisks_spawned_job_start (job);
|
||||
|
|
|
|||
|
|
@ -21,8 +21,11 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--enable-reproducible"
|
||||
"--enable-systemd"
|
||||
"sysconfdir=/etc/pdns-recursor"
|
||||
];
|
||||
|
||||
installFlags = [ "sysconfdir=$(out)/etc/pdns-recursor" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--with-libsodium"
|
||||
"--with-sqlite3"
|
||||
"--with-libcrypto=${openssl.dev}"
|
||||
"sysconfdir=/etc/pdns"
|
||||
];
|
||||
|
||||
# nix destroy with-modules arguments, when using configureFlags
|
||||
|
|
@ -79,6 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
)
|
||||
'';
|
||||
|
||||
# We want the various utilities to look for the powerdns config in
|
||||
# /etc/pdns, but to actually install the sample config file in
|
||||
# $out
|
||||
installFlags = [ "sysconfdir=$(out)/etc/pdns" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.31.2";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-Pl/v1Uj+6VpuAXBVpCmcuioRGtYYNektXI96HBXn+Ck=";
|
||||
hash = "sha256-OUd6Q9/JtllTSAzR879MrgWz5MZnRsEolGsuQbxURh8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZbfR/dcIdiy/0FlPPodAgRvEW/muXSP5qfmQR7ym3lM=";
|
||||
npmDepsHash = "sha256-GoowjWCBfMcN5qWG2rV6wSPx01TozIb5KDh77D49F/M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ let
|
|||
else x;
|
||||
in
|
||||
makeDerivationExtensible
|
||||
(self: let super = rattrs self; in super // f self super);
|
||||
(self: let super = rattrs self; in super // (if builtins.isFunction f0 || f0?__functor then f self super else f0));
|
||||
|
||||
finalPackage =
|
||||
mkDerivationSimple overrideAttrs args;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,11 @@ let
|
|||
expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack";
|
||||
expected = true;
|
||||
})
|
||||
({
|
||||
name = "overriding-using-only-attrset";
|
||||
expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden";
|
||||
expected = true;
|
||||
})
|
||||
];
|
||||
|
||||
addEntangled = origOverrideAttrs: f:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "2.44.1";
|
||||
version = "2.49.0";
|
||||
srcName = "azure-cli-${version}-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -9,7 +9,7 @@ let
|
|||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
hash = "sha256-QcY08YxwGywFCXy3PslEzc5qZd62y4XAcuIC9Udp6Cc=";
|
||||
hash = "sha256-4R89RD4mDdhLdpgHQ8QT48cX+GzTLrSYPCwg0xWM8Ss=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
|
|
@ -55,11 +55,14 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
|||
azure-keyvault
|
||||
azure-keyvault-administration
|
||||
azure-keyvault-keys
|
||||
azure-keyvault-certificates
|
||||
azure-keyvault-secrets
|
||||
azure-loganalytics
|
||||
azure-mgmt-advisor
|
||||
azure-mgmt-apimanagement
|
||||
azure-mgmt-applicationinsights
|
||||
azure-mgmt-appconfiguration
|
||||
azure-mgmt-appcontainers
|
||||
azure-mgmt-authorization
|
||||
azure-mgmt-batch
|
||||
azure-mgmt-batchai
|
||||
|
|
@ -201,6 +204,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
|||
"azure.mgmt.apimanagement"
|
||||
"azure.mgmt.applicationinsights"
|
||||
"azure.mgmt.appconfiguration"
|
||||
"azure.mgmt.appcontainers"
|
||||
"azure.mgmt.authorization"
|
||||
"azure.mgmt.batch"
|
||||
"azure.mgmt.batchai"
|
||||
|
|
|
|||
|
|
@ -32,10 +32,12 @@ let
|
|||
azure-common
|
||||
azure-cli-telemetry
|
||||
azure-data-tables
|
||||
azure-mgmt-appcontainers
|
||||
azure-mgmt-core
|
||||
azure-mgmt-resource
|
||||
colorama
|
||||
cryptography
|
||||
distro
|
||||
humanfriendly
|
||||
jmespath
|
||||
knack
|
||||
|
|
@ -105,7 +107,7 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
antlr4-python3-runtime = super.antlr4-python3-runtime.override(_: {
|
||||
antlr4-python3-runtime = super.antlr4-python3-runtime.override (_: {
|
||||
antlr4 = super.pkgs.antlr4_9;
|
||||
});
|
||||
|
||||
|
|
@ -136,38 +138,35 @@ let
|
|||
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b2" "zip"
|
||||
"sha256-e+I5MdbbX7WhxHCj1Ery3z2WUrJtpWGD1bhLbqReb58=";
|
||||
|
||||
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b5" "zip"
|
||||
"sha256-YaokPCleAiwM893QFU+tbhL+8UngvGGshdeEBDCVTu4=";
|
||||
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b8" "zip"
|
||||
"sha256-OyA0O10UMx8BKUvxTQU6/eZupuKoxFQk2kvd/qINjFU=";
|
||||
|
||||
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.1.0" "zip"
|
||||
"sha256-2DeOemVpkjeI/hUdG04IuHU2h3cmk3oG4kr1wIDvdbM=";
|
||||
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.2.0" "zip"
|
||||
"sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss=";
|
||||
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "5.1.0b1" "zip"
|
||||
"sha256-4djPfDzj9ql5WFn5fafLZWRKbofvb1Y7j05S77ly75s=";
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "6.0.0" "zip"
|
||||
"sha256-lIEYi/jvF9pYbnH+clUzfU0fExlY+dZojIyZRtTLQh8=";
|
||||
|
||||
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "21.1.0b1" "zip"
|
||||
"sha256-oiC5k+Mg9KJn940jMxG4AB9Pom+t/DWRA5KRv8HO0HI=";
|
||||
|
||||
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.2.0" "zip"
|
||||
"sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ=";
|
||||
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "3.0.0" "zip"
|
||||
"sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw=";
|
||||
|
||||
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.3.0" "zip"
|
||||
"sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI=";
|
||||
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "29.0.0" "zip"
|
||||
"sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI=";
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "29.1.0" "zip"
|
||||
"sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg=";
|
||||
|
||||
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
|
||||
"sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk=";
|
||||
|
||||
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip"
|
||||
"sha256-IhZLDFkTize8SLptR2v2NRUrxCjctCC1IaFLjCXHl60=";
|
||||
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip"
|
||||
"sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4=";
|
||||
|
||||
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "21.1.0" "zip"
|
||||
"sha256-5EOythXO7spLzzlqDWrwcdkkJAMH9W8OBv96rYaWxAY=";
|
||||
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "23.0.0" "zip"
|
||||
"sha256-V8IUTQvbUSOpsqkGfBqLo4DVIB7fryYMVx6WpfWzOnc=";
|
||||
|
||||
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "8.0.0" "zip"
|
||||
"sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo=";
|
||||
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip"
|
||||
"sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k=";
|
||||
|
||||
azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip"
|
||||
"sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc=";
|
||||
|
|
@ -178,8 +177,8 @@ let
|
|||
azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip"
|
||||
"sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA=";
|
||||
|
||||
azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.1.0" "zip"
|
||||
"sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss=";
|
||||
azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.2.0" "zip"
|
||||
"sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI=";
|
||||
|
||||
azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip"
|
||||
"sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=";
|
||||
|
|
@ -196,8 +195,8 @@ let
|
|||
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
||||
"sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r";
|
||||
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "9.0.1" "zip"
|
||||
"sha256-PYRMOWaJUXrRgqW3+pLBY+L6HvU1WlPvaatFe4O7RY8=";
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.0.0" "zip"
|
||||
"sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE=";
|
||||
|
||||
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
|
||||
"sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg=";
|
||||
|
|
@ -223,11 +222,11 @@ let
|
|||
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip"
|
||||
"sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM=";
|
||||
|
||||
azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec {
|
||||
version = "6.1.0";
|
||||
azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs(old: rec {
|
||||
version = "7.0.0";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ=";
|
||||
hash = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI=";
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -237,8 +236,8 @@ let
|
|||
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip"
|
||||
"sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA=";
|
||||
|
||||
azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.1.0" "zip"
|
||||
"sha256-Tq8h3fvajxIG2QjtCyHCQDE2deBDioxLLaQQek/O24U=";
|
||||
azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.2.0" "zip"
|
||||
"sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec=";
|
||||
|
||||
azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "14.1.0" "zip"
|
||||
"sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig=";
|
||||
|
|
@ -246,8 +245,8 @@ let
|
|||
azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "2.0.0" "zip"
|
||||
"sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E=";
|
||||
|
||||
azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip"
|
||||
"sha256-qW1QyIUHIzopPnVyAt7q2YDGeAj0Mrjol8TfHKCI2n4=";
|
||||
azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "9.0.0" "zip"
|
||||
"sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0=";
|
||||
|
||||
azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "3.0.0" "zip"
|
||||
"sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q=";
|
||||
|
|
@ -255,11 +254,11 @@ let
|
|||
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip"
|
||||
"sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE=";
|
||||
|
||||
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b6" "zip"
|
||||
"sha256-1/0VGMW9yZsilJ0yNjhFzVO7WbJlB4yJmDL/RxpQLKc=";
|
||||
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b10" "zip"
|
||||
"sha256-QHvbO6Toh5QflMIaNYmxXBy0Dmw++RVdim3HEDtLBrQ=";
|
||||
|
||||
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b4" "zip"
|
||||
"sha256-IB/ihVFm8WrJ2ZZfALp167Sq4u0cvIq1hllNriJxaz0=";
|
||||
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip"
|
||||
"sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc=";
|
||||
|
||||
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip"
|
||||
"sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k=";
|
||||
|
|
@ -273,32 +272,32 @@ let
|
|||
azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip"
|
||||
"sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA=";
|
||||
|
||||
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.1.0" "zip"
|
||||
"sha256-DpO+6FvsNwjjcz2ImhHpColHVNpPUMgCtEMrfUzfAaA=";
|
||||
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.0" "zip"
|
||||
"sha256-QZbbdvgCbPleZnPpYTZI/Cgmeus8Kb5uyXuobnf6Ox4=";
|
||||
|
||||
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
|
||||
"sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
|
||||
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.0.0" "zip"
|
||||
"sha256-HjejK28Em5AeoQ20o4fucnXTlAwADF/SEpVfHn9anZk=";
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip"
|
||||
"sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc=";
|
||||
|
||||
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip"
|
||||
"sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE=";
|
||||
|
||||
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip"
|
||||
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip"
|
||||
"sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs=";
|
||||
|
||||
azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip"
|
||||
"sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs=";
|
||||
|
||||
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
|
||||
"sha256-9czuo63QTpRF6ohJLxXuz2wSbwQG2WfJX25It5vo23U=";
|
||||
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "3.0.0" "zip"
|
||||
"sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0=";
|
||||
|
||||
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip"
|
||||
"sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c=";
|
||||
|
||||
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.1.0" "zip"
|
||||
"sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg=";
|
||||
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.2.0" "zip"
|
||||
"sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI=";
|
||||
|
||||
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip"
|
||||
"sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM=";
|
||||
|
|
@ -309,8 +308,8 @@ let
|
|||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip"
|
||||
"sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o=";
|
||||
|
||||
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.0.0" "tar.gz"
|
||||
"sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg=";
|
||||
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.1.0" "tar.gz"
|
||||
"sha256-VvNI+mhi2nCFBAXUEL5ph3xj/cBRMf2Mo2uXIgKC+oc=";
|
||||
|
||||
azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec {
|
||||
version = "1.1.1";
|
||||
|
|
@ -353,11 +352,11 @@ let
|
|||
});
|
||||
|
||||
azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec {
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
src = fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
hash = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs=";
|
||||
hash = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE=";
|
||||
extension = "zip";
|
||||
};
|
||||
propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [
|
||||
|
|
@ -376,11 +375,11 @@ let
|
|||
});
|
||||
|
||||
azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec {
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
src = fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
hash = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY=";
|
||||
hash = "sha256-kA6urM/9zQEBKySKfQSQCMkoB7dJ7dHJB0ypJIVUwX4=";
|
||||
extension = "zip";
|
||||
};
|
||||
});
|
||||
|
|
@ -405,19 +404,23 @@ let
|
|||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
azure-common azure-nspkg msrest msrestazure cryptography
|
||||
azure-common
|
||||
azure-nspkg
|
||||
msrest
|
||||
msrestazure
|
||||
cryptography
|
||||
];
|
||||
pythonNamespaces = [ "azure" ];
|
||||
pythonImportsCheck = [ ];
|
||||
});
|
||||
|
||||
azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "4.0.0b3";
|
||||
version = "4.3.0";
|
||||
src = fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
extension = "zip";
|
||||
hash = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ=";
|
||||
hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY=";
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -549,6 +552,14 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "22.0.0";
|
||||
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-/rXZeeGLUvLP0CO0oKM+VKb3bMaiUtyM117OLGMpjpQ=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, openssl
|
||||
, pam
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, which
|
||||
, xkbcomp
|
||||
|
|
@ -26,15 +27,15 @@
|
|||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "turbovnc";
|
||||
version = "3.0.1";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TurboVNC";
|
||||
repo = "turbovnc";
|
||||
rev = version;
|
||||
sha256 = "sha256-GRY6aW6Kvy5sDQRiOVz2cUgKEG0IMveh80S26/rGWdM=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-akkkbDb5ZHTG5GEEeDm1ns60GedQ+DnFXgVMZumRQHc=";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
|
|
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
# * `-- FONT_ENCODINGS_DIRECTORY = /var/empty/share/X11/fonts/encodings`
|
||||
# Maybe relevant what the tigervnc and tightvnc derivations
|
||||
# do with their `fontDirectories`?
|
||||
# * `SERVER_MISC_CONFIG_PATH = /var/empty/lib64/xorg`
|
||||
# * `XORG_REGISTRY_PATH = /var/empty/lib64/xorg`
|
||||
# * The thing about xorg `protocol.txt`
|
||||
# * Does SSH support require `openssh` on PATH?
|
||||
# * Add `enableClient ? true` flag that disables the client GUI
|
||||
|
|
@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
|
|||
cmake
|
||||
makeWrapper
|
||||
openjdk_headless
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
|
|
@ -92,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
# to the swrast dri driver in Mesa.
|
||||
# Can also be given at runtime to its `Xvnc` as:
|
||||
# -dridir /nix/store/...-mesa-20.1.10-drivers/lib/dri/
|
||||
"-DDRI_DRIVER_PATH=${mesa.drivers}/lib/dri"
|
||||
"-DXORG_DRI_DRIVER_PATH=${mesa.drivers}/lib/dri"
|
||||
# The build system doesn't find these files automatically.
|
||||
"-DTJPEG_JAR=${libjpeg_turbo.out}/share/java/turbojpeg.jar"
|
||||
"-DTJPEG_JNILIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so"
|
||||
|
|
@ -137,6 +139,6 @@ stdenv.mkDerivation rec {
|
|||
description = "High-speed version of VNC derived from TightVNC";
|
||||
maintainers = with lib.maintainers; [ nh2 ];
|
||||
platforms = with lib.platforms; linux;
|
||||
changelog = "https://github.com/TurboVNC/turbovnc/blob/${version}/ChangeLog.md";
|
||||
changelog = "https://github.com/TurboVNC/turbovnc/blob/${finalAttrs.version}/ChangeLog.md";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2,9 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, docutils
|
||||
, libuuid
|
||||
, libscrypt
|
||||
, libsodium
|
||||
, keyutils
|
||||
, liburcu
|
||||
|
|
@ -12,67 +10,89 @@
|
|||
, libaio
|
||||
, zstd
|
||||
, lz4
|
||||
, python3Packages
|
||||
, util-linux
|
||||
, attr
|
||||
, udev
|
||||
, valgrind
|
||||
, nixosTests
|
||||
, makeWrapper
|
||||
, getopt
|
||||
, fuse3
|
||||
, cargo
|
||||
, rustc
|
||||
, coreutils
|
||||
, rustPlatform
|
||||
, makeWrapper
|
||||
, fuseSupport ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
let
|
||||
rev = "cfa816bf3f823a3bedfedd8e214ea929c5c755fe";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "bcachefs-tools";
|
||||
version = "unstable-2023-01-31";
|
||||
version = "unstable-2023-06-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "3c39b422acd3346321185be0ce263809e2a9a23f";
|
||||
hash = "sha256-2ci/m4JfodLiPoWfP+QCEqlk0k48zq3mKb8Pdrtln0o=";
|
||||
inherit rev;
|
||||
hash = "sha256-XgXUwyZV5N8buYTuiu1Y1ZU3uHXjZ/OZ1kbZ9d6Rt5I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace Makefile \
|
||||
--replace "pytest-3" "pytest --verbose" \
|
||||
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
|
||||
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
|
||||
'';
|
||||
# errors on fsck_err function. Maybe miss-detection?
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config docutils python3Packages.python makeWrapper
|
||||
pkg-config
|
||||
cargo
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.bindgenHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
cargoRoot = "rust-src";
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"bindgen-0.64.0" = "sha256-GNG8as33HLRYJGYe0nw6qBzq86aHiGonyynEM7gaEE4=";
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libuuid libscrypt libsodium keyutils liburcu zlib libaio
|
||||
zstd lz4 python3Packages.pytest udev valgrind
|
||||
libaio
|
||||
keyutils
|
||||
lz4
|
||||
|
||||
libsodium
|
||||
liburcu
|
||||
libuuid
|
||||
zstd
|
||||
zlib
|
||||
attr
|
||||
udev
|
||||
] ++ lib.optional fuseSupport fuse3;
|
||||
|
||||
doCheck = false; # needs bcachefs module loaded on builder
|
||||
checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
|
||||
nativeCheckInputs = [ valgrind ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"VERSION=${lib.strings.substring 0 7 rev}"
|
||||
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
|
||||
];
|
||||
|
||||
preCheck = lib.optionalString fuseSupport ''
|
||||
rm tests/test_fuse.py
|
||||
'';
|
||||
|
||||
# this symlink is needed for mount -t bcachefs to work
|
||||
postFixup = ''
|
||||
ln -s $out/bin/mount.bcachefs.sh $out/bin/mount.bcachefs
|
||||
wrapProgram $out/bin/mount.bcachefs.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ getopt util-linux ]}
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.bcachefs;
|
||||
inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti;
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/mount.bcachefs \
|
||||
--prefix PATH : ${lib.makeBinPath [ coreutils ]}
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gifsicle";
|
||||
version = "1.93";
|
||||
version = "1.94";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc=";
|
||||
sha256 = "sha256-S8lwBcB4liDedfiZl9PC9wdYxyxhqgou8E96Zxov+Js=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals gifview [ xorgproto libXt libX11 ];
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtx";
|
||||
version = "1.32.0";
|
||||
version = "1.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdxcode";
|
||||
repo = "rtx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1TaBxVu/aNZ3iZWlo1Gn9pFK5j/vKsx6yT+eAPkmYSw=";
|
||||
sha256 = "sha256-de3d3tW1VWx91fFXhfMKcWlAraUltfkT9p4i9AciSB0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wgTckF1IqnTa6gYVYHDNLdyx2w2urYG5Qqkq1iyuA3M=";
|
||||
cargoHash = "sha256-dz6q7sfmtSzk5UwoAx969oImGDPifr2Nhh/vrXV5fxc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "twspace-crawler";
|
||||
version = "1.11.13";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HitomaruKonpaku";
|
||||
repo = "twspace-crawler";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MGFVIQDb++oVbTQubl7CNYwT/ofTNFQfFiveXcNgQpA=";
|
||||
rev = "21d305a63e7d70c5fd441ae80e4908383655508a"; # version not tagged
|
||||
hash = "sha256-VVA3Yer+2TdDlevOfYVi3plXiZd7TA1/ijPp2WfjNPo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-zKy/DngBwnfUqG6JfCULoDIrg1V16hX0Q4zNz45z888=";
|
||||
npmDepsHash = "sha256-6AsHmEoKSZBjTA2JUeu9A/ZDl914yDw7ePes/GKclw8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Script to monitor & download Twitter Spaces 24/7";
|
||||
homepage = "https://github.com/HitomaruKonpaku/twspace-crawler";
|
||||
changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/raw/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,23 +4,26 @@
|
|||
, fetchFromGitHub
|
||||
, libiconv
|
||||
, Security
|
||||
, iputils
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gping";
|
||||
version = "1.3.2";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orf";
|
||||
repo = "gping";
|
||||
rev = "gping-v${version}";
|
||||
sha256 = "sha256-hAUmRUMhP3rD1k6UhIN94/Kt+OjaytUTM3XIcrvasco=";
|
||||
hash = "sha256-0+qSBnWewWg+PE5y9tTLLaB/uxUy+9uQkR1dnsk7MIY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-SqQsKTS3psF/xfwyBRQB9c3/KIZU1fpyqVy9fh4Rqkk=";
|
||||
cargoHash = "sha256-N2V6Wwb2YB2YlBjyHZrh73RujTAmgsFOBLiN/SILP1k=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
nativeCheckInputs = [ iputils ];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/gping --version | grep "${version}"
|
||||
|
|
@ -29,6 +32,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Ping, but with a graph";
|
||||
homepage = "https://github.com/orf/gping";
|
||||
changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andrew-d ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,25 +1,42 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, testers
|
||||
, nix-update-script
|
||||
, biscuit-cli
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "biscuit-cli";
|
||||
version = "0.2.0-next-pre20230103";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biscuit-auth";
|
||||
repo = "biscuit-cli";
|
||||
rev = "0ecf1ec4c98a90b1bf3614558a029b47c57288df";
|
||||
sha256 = "sha256-ADJWqx70IwuvCBeK9rb9WBIsD+oQROQSduSQ8Bu8mfk=";
|
||||
rev = version;
|
||||
sha256 = "sha256-Fd5wBvQe7S/UZ42FMlU+f9qTwcLIMnQrCWVRoHxOx64=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
outputHashes."biscuit-auth-3.0.0-alpha4" = "sha256-4SzOupoD33D0KHZyVLriGzUHy9XXnWK1pbgqOjJH4PI=";
|
||||
lockFile = ./Cargo.lock;
|
||||
cargoHash = "sha256-SHRqdKRAHkWK/pEVFYo3d+r761K4j9BkTg2angQOubk=";
|
||||
|
||||
# Version option does not report the correct version
|
||||
# https://github.com/biscuit-auth/biscuit-cli/issues/44
|
||||
patches = [ ./version-0.4.0.patch ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
inherit version;
|
||||
package = biscuit-cli;
|
||||
command = "biscuit --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "CLI to generate and inspect biscuit tokens";
|
||||
homepage = "https://www.biscuitsec.org/";
|
||||
maintainers = [ lib.maintainers.shlevy ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with maintainers; [ shlevy gaelreyrol ];
|
||||
license = licenses.bsd3;
|
||||
mainProgram = "biscuit";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
13
pkgs/tools/security/biscuit-cli/version-0.4.0.patch
Normal file
13
pkgs/tools/security/biscuit-cli/version-0.4.0.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/cli.rs b/src/cli.rs
|
||||
index f40cfc7..d587eeb 100644
|
||||
--- a/src/cli.rs
|
||||
+++ b/src/cli.rs
|
||||
@@ -89,7 +89,7 @@ fn parse_param(kv: &str) -> Result<Param, std::io::Error> {
|
||||
|
||||
/// biscuit creation and inspection CLI. Run `biscuit --help` to see what's available.
|
||||
#[derive(Parser)]
|
||||
-#[clap(version = "0.2.0", author = "Clément D. <clement@delafargue.name>")]
|
||||
+#[clap(version = "0.4.0", author = "Clément D. <clement@delafargue.name>")]
|
||||
pub struct Opts {
|
||||
#[clap(subcommand)]
|
||||
pub subcmd: SubCommand,
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fulcio";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d9PTio6BYJ+WmHH53NRFBI1BG/aOM+BauV398FKaQg0=";
|
||||
sha256 = "sha256-MkvHztIpPVUPeJbPOgeKbYCqXJHkOzmu4u5WdMaFL50=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-RnCQ0KKT1azPZGPwbtRBLxNMng2mnYVT7xBI3Cxm9Q0=";
|
||||
vendorHash = "sha256-v027osOhD83tNjGfsJ6LDU4BVDBZVKRsc1ceF49G02c=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.63.0";
|
||||
version = "0.63.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MccjZ7EDpyiu/Bv7KItwG5JtGKOSSwMevd21hXBi3+o=";
|
||||
hash = "sha256-mygfK8UMvjpqnbo+Zz1x+G9zDZa7QTotvWaERVkYaSo=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-RbQvWIy8yebohKNaT3ixJqvz+8vewpxMoBALO5kJpWw=";
|
||||
vendorHash = "sha256-T1dfdXlYCOdeZT1rgWgIrh9Jpl70csRI9xX/7QZGNag=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv
|
||||
, addOpenGLRunpath
|
||||
, config
|
||||
, cudaPackages ? {}
|
||||
, cudaSupport ? config.cudaSupport or false
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, opencl-headers
|
||||
|
|
@ -15,7 +19,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-sl4Qd7zzSQjMjxjBppouyYsEeyy88PURRNzzuh4Leyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
] ++ lib.optionals cudaSupport [
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
buildInputs = [ opencl-headers xxHash ];
|
||||
|
||||
makeFlags = [
|
||||
|
|
@ -34,8 +43,20 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
|
||||
postFixup = let
|
||||
LD_LIBRARY_PATH = builtins.concatStringsSep ":" ([
|
||||
"${ocl-icd}/lib"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
"${cudaPackages.cudatoolkit}/lib"
|
||||
]);
|
||||
in ''
|
||||
wrapProgram $out/bin/hashcat \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.escapeShellArg LD_LIBRARY_PATH}
|
||||
'' + lib.optionalString cudaSupport ''
|
||||
for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do
|
||||
isELF "$program" || continue
|
||||
addOpenGLRunpath "$program"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.22"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.23"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: b32d454d51c2a114658ee8b8f8ce571869e0b91e
|
||||
ref: refs/tags/6.3.22
|
||||
revision: 35d2581f8aacfa08c444a037f5a81f354d1667cc
|
||||
ref: refs/tags/6.3.23
|
||||
specs:
|
||||
metasploit-framework (6.3.22)
|
||||
metasploit-framework (6.3.23)
|
||||
actionpack (~> 7.0)
|
||||
activerecord (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
|
|
@ -34,7 +34,7 @@ GIT
|
|||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.143)
|
||||
metasploit-payloads (= 2.0.147)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.20)
|
||||
mqtt
|
||||
|
|
@ -102,25 +102,25 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
Ascii85 (1.1.0)
|
||||
actionpack (7.0.5.1)
|
||||
actionview (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
actionpack (7.0.6)
|
||||
actionview (= 7.0.6)
|
||||
activesupport (= 7.0.6)
|
||||
rack (~> 2.0, >= 2.2.4)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actionview (7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
actionview (7.0.6)
|
||||
activesupport (= 7.0.6)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activemodel (7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activerecord (7.0.5.1)
|
||||
activemodel (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activesupport (7.0.5.1)
|
||||
activemodel (7.0.6)
|
||||
activesupport (= 7.0.6)
|
||||
activerecord (7.0.6)
|
||||
activemodel (= 7.0.6)
|
||||
activesupport (= 7.0.6)
|
||||
activesupport (7.0.6)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
|
@ -131,29 +131,29 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.781.0)
|
||||
aws-sdk-core (3.175.0)
|
||||
aws-partitions (1.782.0)
|
||||
aws-sdk-core (3.176.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-ec2 (1.386.0)
|
||||
aws-sdk-core (~> 3, >= 3.174.0)
|
||||
aws-sdk-ec2 (1.387.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.82.0)
|
||||
aws-sdk-core (~> 3, >= 3.174.0)
|
||||
aws-sdk-iam (1.83.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.174.0)
|
||||
aws-sdk-kms (1.68.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.126.0)
|
||||
aws-sdk-core (~> 3, >= 3.174.0)
|
||||
aws-sdk-s3 (1.127.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
aws-sdk-ssm (1.152.0)
|
||||
aws-sdk-core (~> 3, >= 3.174.0)
|
||||
aws-sigv4 (~> 1.6)
|
||||
aws-sdk-ssm (1.154.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sigv4 (1.5.2)
|
||||
aws-sigv4 (1.6.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
bcrypt (3.1.19)
|
||||
bcrypt_pbkdf (1.1.0)
|
||||
|
|
@ -184,7 +184,7 @@ GEM
|
|||
eventmachine (1.2.7)
|
||||
faker (3.2.0)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
faraday (2.7.7)
|
||||
faraday (2.7.9)
|
||||
faraday-net_http (>= 2.0, < 3.1)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-net_http (3.0.2)
|
||||
|
|
@ -245,7 +245,7 @@ GEM
|
|||
activemodel (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
railties (~> 7.0)
|
||||
metasploit-payloads (2.0.143)
|
||||
metasploit-payloads (2.0.147)
|
||||
metasploit_data_models (6.0.2)
|
||||
activerecord (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
|
|
@ -285,8 +285,8 @@ GEM
|
|||
openssl-ccm (1.2.3)
|
||||
openssl-cmac (2.0.2)
|
||||
openvas-omp (0.0.4)
|
||||
packetfu (1.1.13)
|
||||
pcaprub
|
||||
packetfu (2.0.0)
|
||||
pcaprub (~> 0.13.1)
|
||||
patch_finder (1.0.2)
|
||||
pcaprub (0.13.1)
|
||||
pdf-reader (2.11.0)
|
||||
|
|
@ -305,15 +305,16 @@ GEM
|
|||
rack
|
||||
rack-test (2.1.0)
|
||||
rack (>= 1.3)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
rails-dom-testing (2.1.1)
|
||||
activesupport (>= 5.0.0)
|
||||
minitest
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.6.0)
|
||||
loofah (~> 2.21)
|
||||
nokogiri (~> 1.14)
|
||||
railties (7.0.5.1)
|
||||
actionpack (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
railties (7.0.6)
|
||||
actionpack (= 7.0.6)
|
||||
activesupport (= 7.0.6)
|
||||
method_source
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
|
|
@ -450,4 +451,4 @@ DEPENDENCIES
|
|||
metasploit-framework!
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.4.14
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.3.22";
|
||||
version = "6.3.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-9G6SXmQrQMvq56JBfCV3OH7X9cLXgEmQWtTehAybU8k=";
|
||||
sha256 = "sha256-371D1PyU4q2RHBcmz44tZAvFPcctUU3uL1ANCrm+x9o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -4,50 +4,50 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "003y7cdxwzdqx8hgw02kf1b5mp8qr8syx07f35sk3ghhqxp39ksy";
|
||||
sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.6";
|
||||
};
|
||||
actionview = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11ihpqcvz3f38ka85zdjkdcvgdbcan81dbr0y9bi784jn1v5ggwa";
|
||||
sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.6";
|
||||
};
|
||||
activemodel = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y";
|
||||
sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.6";
|
||||
};
|
||||
activerecord = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796";
|
||||
sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.6";
|
||||
};
|
||||
activesupport = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c";
|
||||
sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.6";
|
||||
};
|
||||
addressable = {
|
||||
groups = ["default"];
|
||||
|
|
@ -104,80 +104,80 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1y9ghr029lf5kbci9xylhqqjfphfx5ds8g1n72x90r9qdzn1wr1z";
|
||||
sha256 = "02idgi5pm6f2g36y68k44570drgc5w00n22g8pwak89r5yrjknmb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.781.0";
|
||||
version = "1.782.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fbbzcszpdjy2yzxfvl5fzgn0jgznkwxvqpb46nxv69gqhv3dpsg";
|
||||
sha256 = "12my2gnp04i5zfv5xpd6mipfwmk3k7p08cb5arj8k49rxigjlcdw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.175.0";
|
||||
version = "3.176.1";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fn9b7asb7rrvcjj9iid3q8q4gd27k2hkiyiiijbjzf76lkm74rs";
|
||||
sha256 = "0drsgpa4ba08hcgbksdf9pjs4np0wjix7nsc2c09nfkq20i5slrh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.386.0";
|
||||
version = "1.387.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0v13fcm4214js2gy2iwws4zri2dbj1ipkmql8iwy8sa093g59bh8";
|
||||
sha256 = "0xn6fjm2wg5gwy9x8pzgiwv8c3ip1ar0xam6x1z42zb9dy3fm2ga";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.82.0";
|
||||
version = "1.83.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dkgcgvif4hjlq5jhixd2hf17pm2pib7p3jxg9g92pybsff9rk7c";
|
||||
sha256 = "0db8gjanj4hv7wg0aidjpd3i1220b7pzh81m49xdyvrpb1a3ya5i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17ya49rwjzimqhzsj6vlc4xfvj2sixy04kr4b6ddg3r6y0jrsixi";
|
||||
sha256 = "1h4dnqhsn269i4d1gg7w1q6l9mc2wnw942fz913fw7sxa0ng5q6k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.126.0";
|
||||
version = "1.127.0";
|
||||
};
|
||||
aws-sdk-ssm = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08n63a4grhrylg5k055ksklp7dsh1rww59d3rshyphkjr5wyg3nv";
|
||||
sha256 = "0drga2wr7az4gcmps5q5x4dzlfwcnf646zq2hxa7dq9jrrdj6q81";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.152.0";
|
||||
version = "1.154.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
|
||||
sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
};
|
||||
bcrypt = {
|
||||
groups = ["default"];
|
||||
|
|
@ -374,10 +374,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy";
|
||||
sha256 = "1lv5c8bmphkhy2cxkcvswfkd2qga7gb2qgl4fynn1mfmf7ymai7i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.7";
|
||||
version = "2.7.9";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
|
|
@ -634,12 +634,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "b32d454d51c2a114658ee8b8f8ce571869e0b91e";
|
||||
sha256 = "1jakkc689pnlba84k06pqbsxfziqfwjpqhd2wzmcnh1bcig94vpl";
|
||||
rev = "35d2581f8aacfa08c444a037f5a81f354d1667cc";
|
||||
sha256 = "1nn7pswhl3ah5zp4sl9dqwywa2v45n7cy9hp3j8svqllzka47gfz";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.3.22";
|
||||
version = "6.3.23";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -656,10 +656,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y72am25xqa8fip3i1ann6xyap3aik745fl1qfcjix7faakmka8c";
|
||||
sha256 = "00xazpl7fhk5nmvnqy0md4k5ybsw79mr8jwkafs0zw1lbvx28scb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.143";
|
||||
version = "2.0.147";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
|
|
@ -897,10 +897,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll";
|
||||
sha256 = "0crsc4mcikpc01d19ppryzwgvhk9hg9r73g5bwac32x979zwyks8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.13";
|
||||
version = "2.0.0";
|
||||
};
|
||||
patch_finder = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1007,10 +1007,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
|
||||
sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.3";
|
||||
version = "2.1.1";
|
||||
};
|
||||
rails-html-sanitizer = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1027,10 +1027,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z4lqqbd4i5izsg97mx5yf3gj7y5d07wgvad0jzjghjg12pf142i";
|
||||
sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.6";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -3,25 +3,44 @@
|
|||
, fetchFromGitHub
|
||||
, hyperscan
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, protoc-gen-go
|
||||
, protoc-gen-go-grpc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "secretscanner";
|
||||
version = "20210214-${lib.strings.substring 0 7 rev}";
|
||||
rev = "42a38f9351352bf6240016b5b93d971be35cad46";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepfence";
|
||||
repo = "SecretScanner";
|
||||
inherit rev;
|
||||
sha256 = "0yga71f7bx5a3hj5agr88pd7j8jnxbwqm241fhrvv8ic4sx0mawg";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-lTUZLuEiC9xpHYWn3uv4ZtbvHX6ETsjxacjd/O0kU8I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0b7qa83iqnigihgwlqsxi28n7d9h0dk3wx1bqvhn4k01483cipsd";
|
||||
vendorHash = "sha256-lB+fiSdflIYGw0hMN0a9IOtRcJwYEUPQqaeU7mAfSQs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
excludedPackages = [
|
||||
"./agent-plugins-grpc/proto" # No need to build submodules
|
||||
];
|
||||
|
||||
buildInputs = [ hyperscan ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
protoc-gen-go
|
||||
protoc-gen-go-grpc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hyperscan
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Compile proto files
|
||||
make -C agent-plugins-grpc go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/SecretScanner $out/bin/$pname
|
||||
|
|
@ -30,6 +49,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Tool to find secrets and passwords in container images and file systems";
|
||||
homepage = "https://github.com/deepfence/SecretScanner";
|
||||
changelog = "https://github.com/deepfence/SecretScanner/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,29 +2,20 @@
|
|||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "snowcrash";
|
||||
version = "unstable-2021-04-29";
|
||||
version = "unstable-2022-08-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redcode-labs";
|
||||
repo = "SNOWCRASH";
|
||||
rev = "514cceea1ca82f44e0c8a8744280f3a16abb6745";
|
||||
sha256 = "sha256-jQrd7sluDd9eC4VdNtxvGct7Y4Y3zOylc4y2n6Kz4Zo=";
|
||||
rev = "32e62f9ff7d3dda9fac8acfc56176f1f2a70d066";
|
||||
hash = "sha256-mURF/VUqygd5bLJdmbwnZq003IXJKn+k8HtS+CxoQJQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
|
||||
url = "https://github.com/redcode-labs/SNOWCRASH/commit/24eefdcc944ade0cf435f7f35dee59ef3f0497fd.patch";
|
||||
sha256 = "sha256-UXk7cMyEVAVcOkELcC9TlQNppZOXIvn6DBYu1j2iVNg=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-WTDE+MYL8CjeNvGHRNiMgBFrydDJWIcG8TYvbQTH/6o=";
|
||||
vendorHash = "sha256-WTDE+MYL8CjeNvGHRNiMgBFrydDJWIcG8TYvbQTH/6o=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spyre";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spyre-project";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-408UOY7kvukMYOVqQfpugk6Z+LNQV9XyfJirKyBRWd4=";
|
||||
hash = "sha256-wlGZTMCJE6Ki5/6R6J9EJP06/S125BNNd/jNPYGwKNw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qZkt5WwicDXrExwMT0tCO+FZgClIHhrVtMR8xNsdAaQ=";
|
||||
vendorHash = "sha256-qZkt5WwicDXrExwMT0tCO+FZgClIHhrVtMR8xNsdAaQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zdns";
|
||||
version = "2022-03-14-unstable";
|
||||
version = "2023-04-09-unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmap";
|
||||
repo = pname;
|
||||
rev = "d659a361f6d5165462c10e1c1243f420175e066b";
|
||||
hash = "sha256-856O6H03me3IM39/+6n56KJIetL+v4on6+lJx5D2Pcw=";
|
||||
rev = "ac6c7f30a7f5e11f87779f5275adeed117227cd6";
|
||||
hash = "sha256-que2uzIH8GybU6Ekumg/MjgBHSmFCF+T7PWye+25kaY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5kZ0voyicnqK/0yrMYW+gR1vVDyptW6I1HgyG4zleX8=";
|
||||
vendorHash = "sha256-daMPk1TKrUXXqCb4WVkrUIJsBL7uzXLJnxWNbHQ/Im4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI DNS lookup tool";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erdtree";
|
||||
version = "3.0.2";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solidiquis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fxGAvWECTQZXHIZRiMY9NGBwzsKdjbIGrzYQfj+vzww=";
|
||||
hash = "sha256-iiGtpzoyA4PpS5redrwYeAQb/sJ149e1/ZJ0R1ctYFk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zdSLiTmuOnomJe9hkV9qeud7SSjJZAI7SfW9acQaH+Q=";
|
||||
cargoHash = "sha256-TfGA6AMG9zBrossM0vsRt6OY0etfWNR1FnpgiP/mfi4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "File-tree visualizer and disk usage analyzer";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "SystemdJournal2Gelf";
|
||||
version = "unstable-2022-02-15";
|
||||
version = "unstable-2023-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parse-nl";
|
||||
repo = "SystemdJournal2Gelf";
|
||||
rev = "86f9f41b26b6848345c2424fbf1ff907b876bb5b";
|
||||
sha256 = "sha256-xsrKuZVN6Eb0vG98LbQnFqNxHthv+uL/h2HCDiFY0Oo=";
|
||||
rev = "863a15df5ed2d50365bb9c27424e3b118ce404c0";
|
||||
hash = "sha256-AwJq0xZAoIpBz9kGERfmZZTn28LbAKIl3gUsFKL3yvs=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "svt-av1";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "AOMediaCodec";
|
||||
repo = "SVT-AV1";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-EBWtvHOcFa6co0NeYns7Wkhz3LhqWJIRjBWfCrWJyss=";
|
||||
sha256 = "sha256-rGe4h3d2Ql8tB/5vKFJGPkhmjMHnqgMUpnGzeh+PasA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18722,6 +18722,8 @@ with pkgs;
|
|||
|
||||
fastddsgen = callPackage ../development/tools/fastddsgen { };
|
||||
|
||||
fastgron = callPackage ../development/tools/fastgron { };
|
||||
|
||||
findbugs = callPackage ../development/tools/analysis/findbugs { };
|
||||
|
||||
findnewest = callPackage ../development/tools/misc/findnewest { };
|
||||
|
|
|
|||
|
|
@ -80,8 +80,7 @@ in {
|
|||
|
||||
package-list = callPackage ../development/haskell-modules/package-list.nix {};
|
||||
|
||||
compiler = rec {
|
||||
|
||||
compiler = {
|
||||
ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix {
|
||||
llvmPackages = pkgs.llvmPackages_6;
|
||||
};
|
||||
|
|
@ -127,7 +126,7 @@ in {
|
|||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
|
||||
llvmPackages = pkgs.llvmPackages_7;
|
||||
};
|
||||
ghc88 = ghc884;
|
||||
ghc88 = compiler.ghc884;
|
||||
ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
|
||||
bootPkgs =
|
||||
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
|
||||
|
|
@ -148,7 +147,7 @@ in {
|
|||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc810 = ghc8107;
|
||||
ghc810 = compiler.ghc8107;
|
||||
ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix {
|
||||
bootPkgs =
|
||||
# aarch64 ghc8107Binary exceeds max output size on hydra
|
||||
|
|
@ -164,7 +163,7 @@ in {
|
|||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc90 = ghc902;
|
||||
ghc90 = compiler.ghc902;
|
||||
ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix {
|
||||
bootPkgs =
|
||||
# aarch64 ghc8107Binary exceeds max output size on hydra
|
||||
|
|
@ -250,7 +249,7 @@ in {
|
|||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc92 = ghc928;
|
||||
ghc92 = compiler.ghc928;
|
||||
ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {
|
||||
bootPkgs =
|
||||
# Building with 9.2 is broken due to
|
||||
|
|
@ -347,7 +346,7 @@ in {
|
|||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc94 = ghc945;
|
||||
ghc94 = compiler.ghc945;
|
||||
ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix {
|
||||
bootPkgs =
|
||||
# For GHC 9.2 no armv7l bindists are available.
|
||||
|
|
@ -368,7 +367,7 @@ in {
|
|||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
|
||||
llvmPackages = pkgs.llvmPackages_15;
|
||||
};
|
||||
ghc96 = ghc962;
|
||||
ghc96 = compiler.ghc962;
|
||||
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
|
||||
bootPkgs =
|
||||
# For GHC 9.2 no armv7l bindists are available.
|
||||
|
|
@ -422,7 +421,7 @@ in {
|
|||
packageOverrides = self : super : {};
|
||||
|
||||
# Always get compilers from `buildPackages`
|
||||
packages = let bh = buildPackages.haskell; in rec {
|
||||
packages = let bh = buildPackages.haskell; in {
|
||||
|
||||
ghc865Binary = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc865Binary;
|
||||
|
|
@ -471,19 +470,19 @@ in {
|
|||
ghc = bh.compiler.ghc884;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
|
||||
};
|
||||
ghc88 = ghc884;
|
||||
ghc88 = packages.ghc884;
|
||||
ghc8107 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc8107;
|
||||
ghc = bh.compiler.ghc8107;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
|
||||
};
|
||||
ghc810 = ghc8107;
|
||||
ghc810 = packages.ghc8107;
|
||||
ghc902 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc902;
|
||||
ghc = bh.compiler.ghc902;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
|
||||
};
|
||||
ghc90 = ghc902;
|
||||
ghc90 = packages.ghc902;
|
||||
ghc924 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc924;
|
||||
ghc = bh.compiler.ghc924;
|
||||
|
|
@ -509,7 +508,7 @@ in {
|
|||
ghc = bh.compiler.ghc928;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
|
||||
};
|
||||
ghc92 = ghc928;
|
||||
ghc92 = packages.ghc928;
|
||||
ghc942 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc942;
|
||||
ghc = bh.compiler.ghc942;
|
||||
|
|
@ -530,13 +529,13 @@ in {
|
|||
ghc = bh.compiler.ghc945;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
|
||||
};
|
||||
ghc94 = ghc945;
|
||||
ghc94 = packages.ghc945;
|
||||
ghc962 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc962;
|
||||
ghc = bh.compiler.ghc962;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
|
||||
};
|
||||
ghc96 = ghc962;
|
||||
ghc96 = packages.ghc962;
|
||||
ghcHEAD = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghcHEAD;
|
||||
ghc = bh.compiler.ghcHEAD;
|
||||
|
|
|
|||
|
|
@ -205,16 +205,8 @@ in {
|
|||
|
||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
|
||||
# Pinned on the last version which Kent's commits can be cleany rebased up.
|
||||
kernel = buildLinux rec {
|
||||
version = "6.1.3";
|
||||
modDirVersion = lib.versions.pad 3 version;
|
||||
extraMeta.branch = lib.versions.majorMinor version;
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc=";
|
||||
};
|
||||
};
|
||||
kernelPatches = linux_6_1.kernelPatches;
|
||||
kernel = linux_6_4;
|
||||
kernelPatches = linux_6_4.kernelPatches;
|
||||
};
|
||||
|
||||
linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {
|
||||
|
|
|
|||
|
|
@ -961,6 +961,8 @@ self: super: with self; {
|
|||
|
||||
azure-mgmt-appconfiguration = callPackage ../development/python-modules/azure-mgmt-appconfiguration { };
|
||||
|
||||
azure-mgmt-appcontainers = callPackage ../development/python-modules/azure-mgmt-appcontainers { };
|
||||
|
||||
azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { };
|
||||
|
||||
azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue