mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge master into staging-next
This commit is contained in:
commit
941a6593c8
35
.github/workflows/editorconfig.yml
vendored
35
.github/workflows/editorconfig.yml
vendored
|
@ -13,33 +13,30 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.repository_owner == 'NixOS'
|
if: github.repository_owner == 'NixOS'
|
||||||
steps:
|
steps:
|
||||||
- name: Get list of changed files from PR
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
run: |
|
|
||||||
echo 'PR_DIFF<<EOF' >> $GITHUB_ENV
|
|
||||||
gh api \
|
|
||||||
repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \
|
|
||||||
| jq '.[] | select(.status != "removed") | .filename' \
|
|
||||||
>> $GITHUB_ENV
|
|
||||||
echo 'EOF' >> $GITHUB_ENV
|
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
|
||||||
# pull_request_target checks out the base branch by default
|
|
||||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
|
||||||
if: env.PR_DIFF
|
|
||||||
- uses: cachix/install-nix-action@v16
|
- uses: cachix/install-nix-action@v16
|
||||||
if: env.PR_DIFF
|
|
||||||
with:
|
with:
|
||||||
# nixpkgs commit is pinned so that it doesn't break
|
# nixpkgs commit is pinned so that it doesn't break
|
||||||
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
|
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
|
||||||
- name: install editorconfig-checker
|
- name: install editorconfig-checker
|
||||||
run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
|
run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
|
||||||
if: env.PR_DIFF
|
- name: Get list of changed files from PR
|
||||||
- name: Checking EditorConfig
|
|
||||||
if: env.PR_DIFF
|
|
||||||
run: |
|
run: |
|
||||||
echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size
|
git fetch origin --depth 1 ${{ github.event.pull_request.head.sha }}
|
||||||
|
git checkout ${{ github.event.pull_request.head.sha }}
|
||||||
|
|
||||||
|
git fetch origin --depth 1 ${{ github.event.pull_request.base.sha }}
|
||||||
|
git checkout ${{ github.event.pull_request.base.sha }}
|
||||||
|
|
||||||
|
git fetch origin --depth 1 pull/${{ github.event.pull_request.number }}/merge
|
||||||
|
# check this out last as editorconfig should check this commit
|
||||||
|
git checkout FETCH_HEAD
|
||||||
|
|
||||||
|
# everything except --diff-filter=D (deleted)
|
||||||
|
git diff --diff-filter=ACMRTUXB --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > $HOME/changed_files
|
||||||
|
- name: Checking EditorConfig
|
||||||
|
run: |
|
||||||
|
cat $HOME/changed_files | xargs -r editorconfig-checker -disable-indent-size
|
||||||
- if: ${{ failure() }}
|
- if: ${{ failure() }}
|
||||||
run: |
|
run: |
|
||||||
echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."
|
echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."
|
||||||
|
|
|
@ -6382,6 +6382,13 @@
|
||||||
githubId = 449813;
|
githubId = 449813;
|
||||||
name = "Roman Kuznetsov";
|
name = "Roman Kuznetsov";
|
||||||
};
|
};
|
||||||
|
kvark = {
|
||||||
|
name = "Dzmitry Malyshau";
|
||||||
|
email = "kvark@fastmail.com";
|
||||||
|
matrix = "@kvark:matrix.org";
|
||||||
|
github = "kvark";
|
||||||
|
githubId = 107301;
|
||||||
|
};
|
||||||
kwohlfahrt = {
|
kwohlfahrt = {
|
||||||
email = "kai.wohlfahrt@gmail.com";
|
email = "kai.wohlfahrt@gmail.com";
|
||||||
github = "kwohlfahrt";
|
github = "kwohlfahrt";
|
||||||
|
|
|
@ -281,7 +281,7 @@ let format' = format; in let
|
||||||
--substituters ""
|
--substituters ""
|
||||||
|
|
||||||
${optionalString (additionalPaths' != []) ''
|
${optionalString (additionalPaths' != []) ''
|
||||||
nix copy --to $root --no-check-sigs ${concatStringsSep " " additionalPaths'}
|
nix --extra-experimental-features nix-command copy --to $root --no-check-sigs ${concatStringsSep " " additionalPaths'}
|
||||||
''}
|
''}
|
||||||
|
|
||||||
diskImage=nixos.raw
|
diskImage=nixos.raw
|
||||||
|
|
|
@ -83,14 +83,14 @@ in
|
||||||
default = true;
|
default = true;
|
||||||
description = ''
|
description = ''
|
||||||
Allow GDM to run on Wayland instead of Xserver.
|
Allow GDM to run on Wayland instead of Xserver.
|
||||||
Note to enable Wayland with Nvidia you need to
|
Note to enable Wayland with Nvidia the <option>nvidiaWayland</option>
|
||||||
enable the <option>nvidiaWayland</option>.
|
must not be disabled.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
nvidiaWayland = mkOption {
|
nvidiaWayland = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = true;
|
||||||
description = ''
|
description = ''
|
||||||
Whether to allow wayland to be used with the proprietary
|
Whether to allow wayland to be used with the proprietary
|
||||||
NVidia graphics driver.
|
NVidia graphics driver.
|
||||||
|
|
|
@ -103,10 +103,10 @@ if (stat($bootPath)->dev != stat("/nix/store")->dev) {
|
||||||
|
|
||||||
# Discover information about the location of the bootPath
|
# Discover information about the location of the bootPath
|
||||||
struct(Fs => {
|
struct(Fs => {
|
||||||
device => '$',
|
device => '$',
|
||||||
type => '$',
|
type => '$',
|
||||||
mount => '$',
|
mount => '$',
|
||||||
});
|
});
|
||||||
sub PathInMount {
|
sub PathInMount {
|
||||||
my ($path, $mount) = @_;
|
my ($path, $mount) = @_;
|
||||||
my @splitMount = split /\//, $mount;
|
my @splitMount = split /\//, $mount;
|
||||||
|
@ -155,9 +155,9 @@ sub GetFs {
|
||||||
return $bestFs;
|
return $bestFs;
|
||||||
}
|
}
|
||||||
struct (Grub => {
|
struct (Grub => {
|
||||||
path => '$',
|
path => '$',
|
||||||
search => '$',
|
search => '$',
|
||||||
});
|
});
|
||||||
my $driveid = 1;
|
my $driveid = 1;
|
||||||
sub GrubFs {
|
sub GrubFs {
|
||||||
my ($dir) = @_;
|
my ($dir) = @_;
|
||||||
|
@ -254,8 +254,8 @@ if ($grubVersion == 1) {
|
||||||
# $defaultEntry might be "saved", indicating that we want to use the last selected configuration as default.
|
# $defaultEntry might be "saved", indicating that we want to use the last selected configuration as default.
|
||||||
# Incidentally this is already the correct value for the grub 1 config to achieve this behaviour.
|
# Incidentally this is already the correct value for the grub 1 config to achieve this behaviour.
|
||||||
$conf .= "
|
$conf .= "
|
||||||
default $defaultEntry
|
default $defaultEntry
|
||||||
timeout $timeout
|
timeout $timeout
|
||||||
";
|
";
|
||||||
if ($splashImage) {
|
if ($splashImage) {
|
||||||
copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n";
|
copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n";
|
||||||
|
@ -305,7 +305,7 @@ else {
|
||||||
|
|
||||||
if ($copyKernels == 0) {
|
if ($copyKernels == 0) {
|
||||||
$conf .= "
|
$conf .= "
|
||||||
" . $grubStore->search;
|
" . $grubStore->search;
|
||||||
}
|
}
|
||||||
# FIXME: should use grub-mkconfig.
|
# FIXME: should use grub-mkconfig.
|
||||||
my $defaultEntryText = $defaultEntry;
|
my $defaultEntryText = $defaultEntry;
|
||||||
|
@ -313,55 +313,55 @@ else {
|
||||||
$defaultEntryText = "\"\${saved_entry}\"";
|
$defaultEntryText = "\"\${saved_entry}\"";
|
||||||
}
|
}
|
||||||
$conf .= "
|
$conf .= "
|
||||||
" . $grubBoot->search . "
|
" . $grubBoot->search . "
|
||||||
if [ -s \$prefix/grubenv ]; then
|
if [ -s \$prefix/grubenv ]; then
|
||||||
load_env
|
load_env
|
||||||
fi
|
|
||||||
|
|
||||||
# ‘grub-reboot’ sets a one-time saved entry, which we process here and
|
|
||||||
# then delete.
|
|
||||||
if [ \"\${next_entry}\" ]; then
|
|
||||||
set default=\"\${next_entry}\"
|
|
||||||
set next_entry=
|
|
||||||
save_env next_entry
|
|
||||||
set timeout=1
|
|
||||||
set boot_once=true
|
|
||||||
else
|
|
||||||
set default=$defaultEntryText
|
|
||||||
set timeout=$timeout
|
|
||||||
fi
|
|
||||||
|
|
||||||
function savedefault {
|
|
||||||
if [ -z \"\${boot_once}\"]; then
|
|
||||||
saved_entry=\"\${chosen}\"
|
|
||||||
save_env saved_entry
|
|
||||||
fi
|
fi
|
||||||
}
|
|
||||||
|
|
||||||
# Setup the graphics stack for bios and efi systems
|
# ‘grub-reboot’ sets a one-time saved entry, which we process here and
|
||||||
if [ \"\${grub_platform}\" = \"efi\" ]; then
|
# then delete.
|
||||||
insmod efi_gop
|
if [ \"\${next_entry}\" ]; then
|
||||||
insmod efi_uga
|
set default=\"\${next_entry}\"
|
||||||
else
|
set next_entry=
|
||||||
insmod vbe
|
save_env next_entry
|
||||||
fi
|
set timeout=1
|
||||||
|
set boot_once=true
|
||||||
|
else
|
||||||
|
set default=$defaultEntryText
|
||||||
|
set timeout=$timeout
|
||||||
|
fi
|
||||||
|
|
||||||
|
function savedefault {
|
||||||
|
if [ -z \"\${boot_once}\"]; then
|
||||||
|
saved_entry=\"\${chosen}\"
|
||||||
|
save_env saved_entry
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Setup the graphics stack for bios and efi systems
|
||||||
|
if [ \"\${grub_platform}\" = \"efi\" ]; then
|
||||||
|
insmod efi_gop
|
||||||
|
insmod efi_uga
|
||||||
|
else
|
||||||
|
insmod vbe
|
||||||
|
fi
|
||||||
";
|
";
|
||||||
|
|
||||||
if ($font) {
|
if ($font) {
|
||||||
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n";
|
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n";
|
||||||
$conf .= "
|
$conf .= "
|
||||||
insmod font
|
insmod font
|
||||||
if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then
|
if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then
|
||||||
insmod gfxterm
|
insmod gfxterm
|
||||||
if [ \"\${grub_platform}\" = \"efi\" ]; then
|
if [ \"\${grub_platform}\" = \"efi\" ]; then
|
||||||
set gfxmode=$gfxmodeEfi
|
set gfxmode=$gfxmodeEfi
|
||||||
set gfxpayload=$gfxpayloadEfi
|
set gfxpayload=$gfxpayloadEfi
|
||||||
else
|
else
|
||||||
set gfxmode=$gfxmodeBios
|
set gfxmode=$gfxmodeBios
|
||||||
set gfxpayload=$gfxpayloadBios
|
set gfxpayload=$gfxpayloadBios
|
||||||
fi
|
fi
|
||||||
terminal_output gfxterm
|
terminal_output gfxterm
|
||||||
fi
|
fi
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
if ($splashImage) {
|
if ($splashImage) {
|
||||||
|
@ -378,14 +378,14 @@ else {
|
||||||
}
|
}
|
||||||
copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n";
|
copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n";
|
||||||
$conf .= "
|
$conf .= "
|
||||||
insmod " . substr($suffix, 1) . "
|
insmod " . substr($suffix, 1) . "
|
||||||
if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then
|
if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then
|
||||||
set color_normal=white/black
|
set color_normal=white/black
|
||||||
set color_highlight=black/white
|
set color_highlight=black/white
|
||||||
else
|
else
|
||||||
set menu_color_normal=cyan/blue
|
set menu_color_normal=cyan/blue
|
||||||
set menu_color_highlight=white/blue
|
set menu_color_highlight=white/blue
|
||||||
fi
|
fi
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -395,20 +395,20 @@ else {
|
||||||
# Copy theme
|
# Copy theme
|
||||||
rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n";
|
rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n";
|
||||||
$conf .= "
|
$conf .= "
|
||||||
# Sets theme.
|
# Sets theme.
|
||||||
set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt
|
set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt
|
||||||
export theme
|
export theme
|
||||||
# Load theme fonts, if any
|
# Load theme fonts, if any
|
||||||
";
|
";
|
||||||
|
|
||||||
find( { wanted => sub {
|
find( { wanted => sub {
|
||||||
if ($_ =~ /\.pf2$/i) {
|
if ($_ =~ /\.pf2$/i) {
|
||||||
$font = File::Spec->abs2rel($File::Find::name, $theme);
|
$font = File::Spec->abs2rel($File::Find::name, $theme);
|
||||||
$conf .= "
|
$conf .= "
|
||||||
loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font
|
loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
}, no_chdir => 1 }, $theme );
|
}, no_chdir => 1 }, $theme );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -474,8 +474,8 @@ sub addEntry {
|
||||||
# FIXME: $confName
|
# FIXME: $confName
|
||||||
|
|
||||||
my $kernelParams =
|
my $kernelParams =
|
||||||
"init=" . Cwd::abs_path("$path/init") . " " .
|
"init=" . Cwd::abs_path("$path/init") . " " .
|
||||||
readFile("$path/kernel-params");
|
readFile("$path/kernel-params");
|
||||||
my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : "";
|
my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : "";
|
||||||
|
|
||||||
if ($grubVersion == 1) {
|
if ($grubVersion == 1) {
|
||||||
|
@ -524,9 +524,9 @@ foreach my $link (@links) {
|
||||||
|
|
||||||
my $date = strftime("%F", localtime(lstat($link)->mtime));
|
my $date = strftime("%F", localtime(lstat($link)->mtime));
|
||||||
my $version =
|
my $version =
|
||||||
-e "$link/nixos-version"
|
-e "$link/nixos-version"
|
||||||
? readFile("$link/nixos-version")
|
? readFile("$link/nixos-version")
|
||||||
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
|
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
|
||||||
|
|
||||||
if ($cfgName) {
|
if ($cfgName) {
|
||||||
$entryName = $cfgName;
|
$entryName = $cfgName;
|
||||||
|
@ -551,8 +551,8 @@ sub addProfile {
|
||||||
sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; }
|
sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; }
|
||||||
|
|
||||||
my @links = sort
|
my @links = sort
|
||||||
{ nrFromGen($b) <=> nrFromGen($a) }
|
{ nrFromGen($b) <=> nrFromGen($a) }
|
||||||
(glob "$profile-*-link");
|
(glob "$profile-*-link");
|
||||||
|
|
||||||
my $curEntry = 0;
|
my $curEntry = 0;
|
||||||
foreach my $link (@links) {
|
foreach my $link (@links) {
|
||||||
|
@ -563,9 +563,9 @@ sub addProfile {
|
||||||
}
|
}
|
||||||
my $date = strftime("%F", localtime(lstat($link)->mtime));
|
my $date = strftime("%F", localtime(lstat($link)->mtime));
|
||||||
my $version =
|
my $version =
|
||||||
-e "$link/nixos-version"
|
-e "$link/nixos-version"
|
||||||
? readFile("$link/nixos-version")
|
? readFile("$link/nixos-version")
|
||||||
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
|
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
|
||||||
addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
|
addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -653,13 +653,13 @@ foreach my $fn (glob "$bootPath/kernels/*") {
|
||||||
#
|
#
|
||||||
|
|
||||||
struct(GrubState => {
|
struct(GrubState => {
|
||||||
name => '$',
|
name => '$',
|
||||||
version => '$',
|
version => '$',
|
||||||
efi => '$',
|
efi => '$',
|
||||||
devices => '$',
|
devices => '$',
|
||||||
efiMountPoint => '$',
|
efiMountPoint => '$',
|
||||||
extraGrubInstallArgs => '@',
|
extraGrubInstallArgs => '@',
|
||||||
});
|
});
|
||||||
# If you add something to the state file, only add it to the end
|
# If you add something to the state file, only add it to the end
|
||||||
# because it is read line-by-line.
|
# because it is read line-by-line.
|
||||||
sub readGrubState {
|
sub readGrubState {
|
||||||
|
|
|
@ -487,6 +487,7 @@ in
|
||||||
vault-postgresql = handleTest ./vault-postgresql.nix {};
|
vault-postgresql = handleTest ./vault-postgresql.nix {};
|
||||||
vaultwarden = handleTest ./vaultwarden.nix {};
|
vaultwarden = handleTest ./vaultwarden.nix {};
|
||||||
vector = handleTest ./vector.nix {};
|
vector = handleTest ./vector.nix {};
|
||||||
|
vengi-tools = handleTest ./vengi-tools.nix {};
|
||||||
victoriametrics = handleTest ./victoriametrics.nix {};
|
victoriametrics = handleTest ./victoriametrics.nix {};
|
||||||
vikunja = handleTest ./vikunja.nix {};
|
vikunja = handleTest ./vikunja.nix {};
|
||||||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||||
|
|
29
nixos/tests/vengi-tools.nix
Normal file
29
nixos/tests/vengi-tools.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||||
|
name = "vengi-tools";
|
||||||
|
meta = with pkgs.lib.maintainers; {
|
||||||
|
maintainers = [ fgaz ];
|
||||||
|
};
|
||||||
|
|
||||||
|
machine = { config, pkgs, ... }: {
|
||||||
|
imports = [
|
||||||
|
./common/x11.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
services.xserver.enable = true;
|
||||||
|
environment.systemPackages = [ pkgs.vengi-tools ];
|
||||||
|
};
|
||||||
|
|
||||||
|
enableOCR = true;
|
||||||
|
|
||||||
|
testScript =
|
||||||
|
''
|
||||||
|
machine.wait_for_x()
|
||||||
|
machine.execute("vengi-voxedit >&2 &")
|
||||||
|
machine.wait_for_window("voxedit")
|
||||||
|
# OCR on voxedit's window is very expensive, so we avoid wasting a try
|
||||||
|
# by letting the window load fully first
|
||||||
|
machine.sleep(15)
|
||||||
|
machine.wait_for_text("Palette")
|
||||||
|
machine.screenshot("screen")
|
||||||
|
'';
|
||||||
|
})
|
119
pkgs/applications/graphics/vengi-tools/default.nix
Normal file
119
pkgs/applications/graphics/vengi-tools/default.nix
Normal file
|
@ -0,0 +1,119 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchurl
|
||||||
|
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, ninja
|
||||||
|
, python3
|
||||||
|
, makeWrapper
|
||||||
|
|
||||||
|
, glm
|
||||||
|
, lua5_4
|
||||||
|
, SDL2
|
||||||
|
, SDL2_mixer
|
||||||
|
, enet
|
||||||
|
, libuv
|
||||||
|
, libuuid
|
||||||
|
, wayland-protocols
|
||||||
|
, Carbon
|
||||||
|
# optionals
|
||||||
|
, opencl-headers
|
||||||
|
, OpenCL
|
||||||
|
|
||||||
|
, callPackage
|
||||||
|
, nixosTests
|
||||||
|
}:
|
||||||
|
|
||||||
|
# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently
|
||||||
|
# related to
|
||||||
|
# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html
|
||||||
|
let cmake3_22 = cmake.overrideAttrs (old: {
|
||||||
|
version = "3.22.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz";
|
||||||
|
sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
|
pname = "vengi-tools";
|
||||||
|
version = "0.0.14";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mgerhardy";
|
||||||
|
repo = "engine";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-v82hKskTSwM0NDgLVHpHZNRQW6tWug4pPIt91MrUwUo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake3_22
|
||||||
|
pkg-config
|
||||||
|
ninja
|
||||||
|
python3
|
||||||
|
makeWrapper
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
glm
|
||||||
|
lua5_4
|
||||||
|
SDL2
|
||||||
|
SDL2_mixer
|
||||||
|
enet
|
||||||
|
libuv
|
||||||
|
libuuid
|
||||||
|
# Only needed for the game
|
||||||
|
#postgresql
|
||||||
|
#libpqxx
|
||||||
|
#mosquitto
|
||||||
|
] ++ lib.optional stdenv.isLinux wayland-protocols
|
||||||
|
++ lib.optionals stdenv.isDarwin [ Carbon OpenCL ]
|
||||||
|
++ lib.optional (!stdenv.isDarwin) opencl-headers;
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
# Disable tests due to a problem in linking gtest:
|
||||||
|
# ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main':
|
||||||
|
# <artificial>:(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)'
|
||||||
|
"-DUNITTESTS=OFF"
|
||||||
|
"-DVISUALTESTS=OFF"
|
||||||
|
# We're only interested in the generic tools
|
||||||
|
"-DGAMES=OFF"
|
||||||
|
"-DMAPVIEW=OFF"
|
||||||
|
"-DAIDEBUG=OFF"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Set the data directory for each executable. We cannot set it at build time
|
||||||
|
# with the PKGDATADIR cmake variable because each executable needs a specific
|
||||||
|
# one.
|
||||||
|
# This is not needed on darwin, since on that platform data files are saved
|
||||||
|
# in *.app/Contents/Resources/ too, and are picked up automatically.
|
||||||
|
postInstall = lib.optionalString (!stdenv.isDarwin) ''
|
||||||
|
for prog in $out/bin/*; do
|
||||||
|
wrapProgram "$prog" \
|
||||||
|
--set CORE_PATH $out/share/$(basename "$prog")/
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {};
|
||||||
|
run-voxedit = nixosTests.vengi-tools;
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Tools from the vengi voxel engine, including a thumbnailer, a converter, and the VoxEdit voxel editor";
|
||||||
|
longDescription = ''
|
||||||
|
Tools from the vengi C++ voxel game engine. It includes a voxel editor
|
||||||
|
with character animation support and loading/saving into a lot of voxel
|
||||||
|
volume formats. There are other tools like e.g. a thumbnailer for your
|
||||||
|
filemanager and a command line tool to convert between several voxel
|
||||||
|
formats.
|
||||||
|
'';
|
||||||
|
homepage = "https://mgerhardy.github.io/engine/";
|
||||||
|
downloadPage = "https://github.com/mgerhardy/engine/releases";
|
||||||
|
license = [ licenses.mit licenses.cc-by-sa-30 ];
|
||||||
|
maintainers = with maintainers; [ fgaz ];
|
||||||
|
platforms = platforms.all;
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,15 @@
|
||||||
|
{ stdenv
|
||||||
|
, vengi-tools
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "vengi-tools-test-voxconvert-roundtrip";
|
||||||
|
meta.timeout = 10;
|
||||||
|
buildCommand = ''
|
||||||
|
${vengi-tools}/bin/vengi-voxconvert ${vengi-tools}/share/vengi-voxedit/chr_knight.qb chr_knight.vox
|
||||||
|
${vengi-tools}/bin/vengi-voxconvert chr_knight.vox chr_knight.qb
|
||||||
|
${vengi-tools}/bin/vengi-voxconvert chr_knight.qb chr_knight1.vox
|
||||||
|
diff chr_knight.vox chr_knight1.vox
|
||||||
|
touch $out
|
||||||
|
'';
|
||||||
|
}
|
57
pkgs/applications/misc/moz-phab/default.nix
Normal file
57
pkgs/applications/misc/moz-phab/default.nix
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonApplication
|
||||||
|
, fetchPypi
|
||||||
|
, mercurial
|
||||||
|
# build inputs
|
||||||
|
, distro
|
||||||
|
, glean-sdk
|
||||||
|
, python-hglib
|
||||||
|
, sentry-sdk
|
||||||
|
, setuptools
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonApplication rec {
|
||||||
|
pname = "moz-phab";
|
||||||
|
version = "0.1.99";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
pname = "MozPhab";
|
||||||
|
inherit version;
|
||||||
|
sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Relax python-hglib requirement
|
||||||
|
# https://phabricator.services.mozilla.com/D131618
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "==" ">="
|
||||||
|
'';
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
distro
|
||||||
|
glean-sdk
|
||||||
|
python-hglib
|
||||||
|
sentry-sdk
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
checkInputs = [
|
||||||
|
mercurial
|
||||||
|
];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
export HOME=$(mktemp -d)
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Phabricator CLI from Mozilla to support submission of a series of commits";
|
||||||
|
longDescription = ''
|
||||||
|
moz-phab is a custom command-line tool, which communicates to
|
||||||
|
Phabricator’s API, providing several conveniences, including support for
|
||||||
|
submitting series of commits.
|
||||||
|
'';
|
||||||
|
homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html";
|
||||||
|
license = licenses.mpl20;
|
||||||
|
maintainers = [ maintainers.kvark ];
|
||||||
|
platforms = platforms.unix;
|
||||||
|
};
|
||||||
|
}
|
|
@ -9,8 +9,10 @@ GEM
|
||||||
zeitwerk (~> 2.3)
|
zeitwerk (~> 2.3)
|
||||||
addressable (2.8.0)
|
addressable (2.8.0)
|
||||||
public_suffix (>= 2.0.2, < 5.0)
|
public_suffix (>= 2.0.2, < 5.0)
|
||||||
|
cgi (0.3.1)
|
||||||
colorize (0.8.1)
|
colorize (0.8.1)
|
||||||
concurrent-ruby (1.1.9)
|
concurrent-ruby (1.1.9)
|
||||||
|
date (3.2.2)
|
||||||
domain_name (0.5.20190701)
|
domain_name (0.5.20190701)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
ejson (1.3.0)
|
ejson (1.3.0)
|
||||||
|
@ -61,10 +63,12 @@ GEM
|
||||||
multi_json
|
multi_json
|
||||||
to_regexp (~> 0.2.1)
|
to_regexp (~> 0.2.1)
|
||||||
jwt (2.3.0)
|
jwt (2.3.0)
|
||||||
krane (2.3.2)
|
krane (2.3.4)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 5.0)
|
||||||
|
cgi
|
||||||
colorize (~> 0.8)
|
colorize (~> 0.8)
|
||||||
concurrent-ruby (~> 1.1)
|
concurrent-ruby (~> 1.1)
|
||||||
|
date
|
||||||
ejson (~> 1.0)
|
ejson (~> 1.0)
|
||||||
googleauth (~> 0.8)
|
googleauth (~> 0.8)
|
||||||
jsonpath (~> 0.9.6)
|
jsonpath (~> 0.9.6)
|
||||||
|
|
|
@ -21,6 +21,16 @@
|
||||||
};
|
};
|
||||||
version = "2.8.0";
|
version = "2.8.0";
|
||||||
};
|
};
|
||||||
|
cgi = {
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1vy8g58ns18x3dl566wg5rp4hymlx9584ddf75isdyig0yxjl0sn";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.3.1";
|
||||||
|
};
|
||||||
colorize = {
|
colorize = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
|
@ -41,6 +51,16 @@
|
||||||
};
|
};
|
||||||
version = "1.1.9";
|
version = "1.1.9";
|
||||||
};
|
};
|
||||||
|
date = {
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0j1ghv5lqpn8jdvvci2fqvl30j4x31hhgzzc0mj54cga1sgh97n7";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.2.2";
|
||||||
|
};
|
||||||
domain_name = {
|
domain_name = {
|
||||||
dependencies = ["unf"];
|
dependencies = ["unf"];
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
@ -271,15 +291,15 @@
|
||||||
version = "2.3.0";
|
version = "2.3.0";
|
||||||
};
|
};
|
||||||
krane = {
|
krane = {
|
||||||
dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
|
dependencies = ["activesupport" "cgi" "colorize" "concurrent-ruby" "date" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0x908645i92w012xglc07lb6k2irn1zpzwgn1n99h2x54qk1pz4v";
|
sha256 = "07pij3z7kz7n0nvf8xwcaackck8wyjwldjva7215k2dm8csdzaih";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.3.2";
|
version = "2.3.4";
|
||||||
};
|
};
|
||||||
kubeclient = {
|
kubeclient = {
|
||||||
dependencies = ["http" "recursive-open-struct" "rest-client"];
|
dependencies = ["http" "recursive-open-struct" "rest-client"];
|
||||||
|
|
|
@ -28,11 +28,11 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.8.4.210";
|
version = "5.8.6.739";
|
||||||
srcs = {
|
srcs = {
|
||||||
x86_64-linux = fetchurl {
|
x86_64-linux = fetchurl {
|
||||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||||
sha256 = "1qjr35wg1jk6a6c958s0hbgqqczq789iim77s02yqpy5kyjbnn1n";
|
sha256 = "12gzdfxf6xy558smsfazvjj4g1rnaiw7l2lznzlh2qazyaq6f3mq";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -49,11 +49,11 @@
|
||||||
md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
|
md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "bzip2-1.0.6.tar.gz";
|
name = "bzip2-1.0.8.tar.gz";
|
||||||
url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
|
url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz";
|
||||||
sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd";
|
sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269";
|
||||||
md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
|
md5 = "";
|
||||||
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
|
md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "cairo-1.16.0.tar.xz";
|
name = "cairo-1.16.0.tar.xz";
|
||||||
|
@ -112,11 +112,11 @@
|
||||||
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
|
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "curl-7.78.0.tar.xz";
|
name = "curl-7.79.1.tar.xz";
|
||||||
url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz";
|
url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz";
|
||||||
sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";
|
sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689";
|
||||||
md5 = "";
|
md5 = "";
|
||||||
md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";
|
md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "libe-book-0.1.3.tar.xz";
|
name = "libe-book-0.1.3.tar.xz";
|
||||||
|
@ -665,11 +665,11 @@
|
||||||
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
|
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "openldap-2.4.45.tgz";
|
name = "openldap-2.4.59.tgz";
|
||||||
url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
|
url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz";
|
||||||
sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
|
sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34";
|
||||||
md5 = "";
|
md5 = "";
|
||||||
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
|
md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "openssl-1.1.1l.tar.gz";
|
name = "openssl-1.1.1l.tar.gz";
|
||||||
|
@ -728,11 +728,11 @@
|
||||||
md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
|
md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "postgresql-13.1.tar.bz2";
|
name = "postgresql-13.5.tar.bz2";
|
||||||
url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
|
url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2";
|
||||||
sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";
|
sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3";
|
||||||
md5 = "";
|
md5 = "";
|
||||||
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
|
md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "Python-3.8.10.tar.xz";
|
name = "Python-3.8.10.tar.xz";
|
||||||
|
|
|
@ -8,7 +8,7 @@ rec {
|
||||||
|
|
||||||
major = "7";
|
major = "7";
|
||||||
minor = "2";
|
minor = "2";
|
||||||
patch = "2";
|
patch = "3";
|
||||||
tweak = "2";
|
tweak = "2";
|
||||||
|
|
||||||
subdir = "${major}.${minor}.${patch}";
|
subdir = "${major}.${minor}.${patch}";
|
||||||
|
@ -17,13 +17,13 @@ rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||||
sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1";
|
sha256 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# FIXME rename
|
# FIXME rename
|
||||||
translations = fetchSrc {
|
translations = fetchSrc {
|
||||||
name = "translations";
|
name = "translations";
|
||||||
sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq";
|
sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||||
|
@ -31,6 +31,6 @@ rec {
|
||||||
|
|
||||||
help = fetchSrc {
|
help = fetchSrc {
|
||||||
name = "help";
|
name = "help";
|
||||||
sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883";
|
sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }:
|
{ lib, stdenv, fetchurl, fetchpatch, zlib, htslib, perl, ncurses ? null }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "samtools";
|
pname = "samtools";
|
||||||
|
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA=";
|
sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Pull upstream patch for ncurses-6.3 support
|
||||||
|
(fetchpatch {
|
||||||
|
name = "ncurses-6.3.patch";
|
||||||
|
url = "https://github.com/samtools/samtools/commit/396ef20eb0854d6b223c3223b60bb7efe42301f7.patch";
|
||||||
|
sha256 = "sha256-p0l9ymXK9nqL2w8EytbW+qeaI7dD86IQgIVxacBj838=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ perl ];
|
nativeBuildInputs = [ perl ];
|
||||||
|
|
||||||
buildInputs = [ zlib ncurses htslib ];
|
buildInputs = [ zlib ncurses htslib ];
|
||||||
|
|
|
@ -19,11 +19,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
|
sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
postPatch = ''
|
||||||
sed -i -e s@/usr/local@$out@ \
|
sed -i -e s@/usr/local@$out@ \
|
||||||
-e s@/usr/lib@$out/lib@ \
|
-e s@/usr/lib@$out/lib@ \
|
||||||
-e 's@tic vwmterm@tic -o '$out/lib/terminfo' vwmterm@' \
|
-e 's@tic vwmterm@tic -o '$out/lib/terminfo' vwmterm@' \
|
||||||
-e /ldconfig/d Makefile modules/*/Makefile vwm.h
|
-e /ldconfig/d Makefile modules/*/Makefile vwm.h
|
||||||
|
|
||||||
|
# Fix ncurses-6.3 support:
|
||||||
|
substituteInPlace vwm_bkgd.c --replace \
|
||||||
|
'mvwprintw(window,height-1,width-(strlen(version_str)),version_str);' \
|
||||||
|
'mvwprintw(window,height-1,width-(strlen(version_str)),"%s", version_str);'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
|
|
|
@ -81,6 +81,8 @@ let
|
||||||
else if targetPlatform.system == "aarch64-linux" then "${sharedLibraryLoader}/lib/ld-linux-aarch64.so.1"
|
else if targetPlatform.system == "aarch64-linux" then "${sharedLibraryLoader}/lib/ld-linux-aarch64.so.1"
|
||||||
else if targetPlatform.system == "powerpc-linux" then "${sharedLibraryLoader}/lib/ld.so.1"
|
else if targetPlatform.system == "powerpc-linux" then "${sharedLibraryLoader}/lib/ld.so.1"
|
||||||
else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1"
|
else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1"
|
||||||
|
# `ld-linux-riscv{32,64}-<abi>.so.1`
|
||||||
|
else if targetPlatform.isRiscV then "${sharedLibraryLoader}/lib/ld-linux-riscv*.so.1"
|
||||||
else if targetPlatform.isDarwin then "/usr/lib/dyld"
|
else if targetPlatform.isDarwin then "/usr/lib/dyld"
|
||||||
else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1"
|
else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1"
|
||||||
else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
|
else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, fetchzip }:
|
{ lib, fetchzip }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.2";
|
version = "6";
|
||||||
in fetchzip {
|
in fetchzip {
|
||||||
name = "fira-code-${version}";
|
name = "fira-code-${version}";
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ in fetchzip {
|
||||||
unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype
|
unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sha256 = "1wbfjgvr9m5azl5w49y0hpqzgcraw6spd1wnxgxlzfx57x6gcw0k";
|
sha256 = "h2Q63rT26SxXeZ76CRCcFg+NfDAc0IgYaYD2ok09Jh4=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/tonsky/FiraCode";
|
homepage = "https://github.com/tonsky/FiraCode";
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
mkXfceDerivation {
|
mkXfceDerivation {
|
||||||
category = "apps";
|
category = "apps";
|
||||||
pname = "mousepad";
|
pname = "mousepad";
|
||||||
version = "0.5.7";
|
version = "0.5.8";
|
||||||
odd-unstable = false;
|
odd-unstable = false;
|
||||||
|
|
||||||
sha256 = "sha256-VLPzzM9dl+HAPI+Qn2QTjrKfRgngsExlPFRsdmsNcSM=";
|
sha256 = "sha256-Q5coRO2Swo0LpB+pzi+fxrwNyhcDbQXLuQtepPlCyxY=";
|
||||||
|
|
||||||
nativeBuildInputs = [ gobject-introspection ];
|
nativeBuildInputs = [ gobject-introspection ];
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
mkXfceDerivation {
|
mkXfceDerivation {
|
||||||
category = "apps";
|
category = "apps";
|
||||||
pname = "ristretto";
|
pname = "ristretto";
|
||||||
version = "0.12.0";
|
version = "0.12.1";
|
||||||
|
|
||||||
sha256 = "sha256-vf9OczDHG6iAd10BgbwfFG7uHBn3JnNT6AB/WGk40C8=";
|
sha256 = "sha256-Kwtema8mydSPQadeaw/OTnGCHUNuJpvHbf7l4YtICYE=";
|
||||||
|
|
||||||
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
|
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
mkXfceDerivation {
|
mkXfceDerivation {
|
||||||
category = "panel-plugins";
|
category = "panel-plugins";
|
||||||
pname = "xfce4-whiskermenu-plugin";
|
pname = "xfce4-whiskermenu-plugin";
|
||||||
version = "2.6.2";
|
version = "2.7.0";
|
||||||
rev-prefix = "v";
|
rev-prefix = "v";
|
||||||
odd-unstable = false;
|
odd-unstable = false;
|
||||||
sha256 = "sha256-Tg6jK2yvODvNykTRePmHWu3safgyKAd3tCMWGXuMhPM=";
|
sha256 = "sha256-wrFp+YMFfi1UZKQGkHnojAh+l170xW56ls9UJZXmzOo=";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,7 @@
|
||||||
, libuuid
|
, libuuid
|
||||||
, python3
|
, python3
|
||||||
, bc
|
, bc
|
||||||
, clang_9
|
|
||||||
, llvmPackages_9
|
, llvmPackages_9
|
||||||
, overrideCC
|
|
||||||
, lib
|
, lib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -24,7 +22,7 @@ else
|
||||||
throw "Unsupported architecture";
|
throw "Unsupported architecture";
|
||||||
|
|
||||||
buildStdenv = if stdenv.isDarwin then
|
buildStdenv = if stdenv.isDarwin then
|
||||||
overrideCC clangStdenv [ clang_9 llvmPackages_9.llvm llvmPackages_9.lld ]
|
llvmPackages_9.stdenv
|
||||||
else
|
else
|
||||||
stdenv;
|
stdenv;
|
||||||
|
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
#! /usr/bin/env nix-shell
|
|
||||||
#! nix-shell -p python3 dotnet-sdk_3 -i bash
|
|
||||||
|
|
||||||
# Run this script to generate deps.nix
|
|
||||||
# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
|
||||||
|
|
||||||
if [ -d "$1" ]; then
|
|
||||||
CHECKOUT_PATH="$1"
|
|
||||||
else
|
|
||||||
echo "First argument must be a directory, the path to the Microsoft Python Language Server source checkout"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate lockfiles in source checkout
|
|
||||||
cd "$CHECKOUT_PATH/src"
|
|
||||||
dotnet nuget locals all --clear
|
|
||||||
dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64
|
|
||||||
|
|
||||||
# Use the lockfiles to make a file with two columns: name and version number
|
|
||||||
# for all possible package dependencies
|
|
||||||
cd "$SCRIPTDIR"
|
|
||||||
echo "" > all_versions.txt
|
|
||||||
for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do
|
|
||||||
echo "Processing lockfile $lockfile"
|
|
||||||
python ./process_lockfile.py "$lockfile" >> all_versions.txt
|
|
||||||
done
|
|
||||||
# Add extra manually added packages
|
|
||||||
cat ./manual_deps.txt >> all_versions.txt
|
|
||||||
cat all_versions.txt | sed '/^$/d' | sort | uniq > tmp
|
|
||||||
mv tmp all_versions.txt
|
|
||||||
|
|
||||||
# Retrieve sha256 hashes for each dependency and format fetchNuGet calls into deps.nix
|
|
||||||
./format-deps.sh all_versions.txt > deps.nix
|
|
||||||
rm all_versions.txt
|
|
|
@ -1,105 +1,39 @@
|
||||||
{ lib, stdenv
|
{ lib
|
||||||
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchurl
|
, buildDotnetModule
|
||||||
, makeWrapper
|
, dotnetCorePackages
|
||||||
, dotnet-sdk_3
|
, autoPatchelfHook
|
||||||
, openssl
|
, openssl
|
||||||
, icu
|
, icu
|
||||||
, patchelf
|
|
||||||
, Nuget
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let deps = import ./deps.nix { inherit fetchurl; };
|
buildDotnetModule rec {
|
||||||
version = "2021-05-20";
|
|
||||||
|
|
||||||
# Build the nuget source needed for the later build all by itself
|
|
||||||
# since it's a time-consuming step that only depends on ./deps.nix.
|
|
||||||
# This makes it easier to experiment with the main build.
|
|
||||||
nugetSource = stdenv.mkDerivation {
|
|
||||||
pname = "python-language-server-nuget-deps";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ Nuget ];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
export HOME=$(mktemp -d)
|
|
||||||
|
|
||||||
mkdir -p $out/lib
|
|
||||||
|
|
||||||
# disable default-source so nuget does not try to download from online-repo
|
|
||||||
nuget sources Disable -Name "nuget.org"
|
|
||||||
# add all dependencies to the source
|
|
||||||
for package in ${toString deps}; do
|
|
||||||
nuget add $package -Source $out/lib
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontInstall = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "python-language-server";
|
pname = "python-language-server";
|
||||||
inherit version;
|
version = "2021-09-08";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "microsoft";
|
owner = "microsoft";
|
||||||
repo = "python-language-server";
|
repo = "python-language-server";
|
||||||
rev = "86825796eae15d4d46919bc6e32f1197196ba1b3";
|
rev = "26ea18997f45f7d7bc5a3c5a9efc723a8dbb02fa";
|
||||||
sha256 = "sha256-izDE7Oil9g47Jf3eHPtW5coNixF71t9i0oYSuelakCo=";
|
sha256 = "1m8pf9k20wy4fzv27v3bswvc8s01ag6ka2qm9nn6bgq0s0lq78mh";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [dotnet-sdk_3 openssl icu];
|
projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj";
|
||||||
|
nugetDeps = ./deps.nix;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
dotnet-sdk = dotnetCorePackages.sdk_3_1;
|
||||||
Nuget
|
dotnet-runtime = dotnetCorePackages.runtime_3_1;
|
||||||
makeWrapper
|
|
||||||
patchelf
|
|
||||||
];
|
|
||||||
|
|
||||||
buildPhase = ''
|
nativeBuildInputs = [ autoPatchelfHook ];
|
||||||
runHook preBuild
|
buildInputs = [ stdenv.cc.cc.lib ];
|
||||||
|
runtimeDeps = [ openssl icu ];
|
||||||
mkdir home
|
|
||||||
export HOME=$(mktemp -d)
|
|
||||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
|
||||||
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
|
||||||
|
|
||||||
pushd src
|
|
||||||
nuget sources Disable -Name "nuget.org"
|
|
||||||
dotnet restore --source ${nugetSource}/lib -r linux-x64
|
|
||||||
popd
|
|
||||||
|
|
||||||
pushd src/LanguageServer/Impl
|
|
||||||
dotnet publish --no-restore -c Release -r linux-x64
|
|
||||||
popd
|
|
||||||
|
|
||||||
runHook postBuild
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out
|
|
||||||
cp -r output/bin/Release/linux-x64/publish $out/lib
|
|
||||||
|
|
||||||
mkdir $out/bin
|
|
||||||
makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
patchelf --set-rpath ${icu}/lib $out/lib/System.Globalization.Native.so
|
mv $out/bin/Microsoft.Python.LanguageServer $out/bin/python-language-server
|
||||||
patchelf --set-rpath ${openssl.out}/lib $out/lib/System.Security.Cryptography.Native.OpenSsl.so
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# If we don't disable stripping, the executable fails to start with an error about being unable
|
passthru.updateScript = ./updater.sh;
|
||||||
# to find some of the packaged DLLs.
|
|
||||||
dontStrip = true;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Microsoft Language Server for Python";
|
description = "Microsoft Language Server for Python";
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,40 +0,0 @@
|
||||||
#! /usr/bin/env nix-shell
|
|
||||||
#! nix-shell -p gawk nix -i bash
|
|
||||||
|
|
||||||
# Retrieve sha256 hashes for each dependency in and format fetchNuGet calls
|
|
||||||
echo "" > deps.nix
|
|
||||||
urlbase="https://www.nuget.org/api/v2/package"
|
|
||||||
cat << EOL
|
|
||||||
# This file is autogenerated.
|
|
||||||
# To regenerate, run "create_deps.sh \$PATH_TO_LANGUAGE_SERVER_CHECKOUT"
|
|
||||||
|
|
||||||
{ fetchurl }: let
|
|
||||||
|
|
||||||
fetchNuGet = { name, version, sha256 }: fetchurl {
|
|
||||||
inherit sha256;
|
|
||||||
url = "$urlbase/\${name}/\${version}";
|
|
||||||
};
|
|
||||||
|
|
||||||
in [
|
|
||||||
EOL
|
|
||||||
IFS=''
|
|
||||||
while read line; do
|
|
||||||
name=$(echo $line | awk '{print $1}')
|
|
||||||
version=$(echo $line | awk '{print $2}')
|
|
||||||
sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null)
|
|
||||||
|
|
||||||
if [ -n "$sha256" ]; then
|
|
||||||
cat << EOL
|
|
||||||
|
|
||||||
(fetchNuGet {
|
|
||||||
name = "$name";
|
|
||||||
version = "$version";
|
|
||||||
sha256 = "$sha256";
|
|
||||||
})
|
|
||||||
EOL
|
|
||||||
fi
|
|
||||||
done < $1
|
|
||||||
cat << EOL
|
|
||||||
|
|
||||||
]
|
|
||||||
EOL
|
|
|
@ -1,2 +0,0 @@
|
||||||
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.21
|
|
||||||
Microsoft.NetCore.App.Runtime.linux-x64 3.1.21
|
|
|
@ -1,37 +0,0 @@
|
||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
|
|
||||||
|
|
||||||
def process_section(name, section):
|
|
||||||
packages = set()
|
|
||||||
|
|
||||||
if "resolved" in section:
|
|
||||||
packages.add((name, section["resolved"]))
|
|
||||||
|
|
||||||
if "dependencies" in section:
|
|
||||||
for name in section["dependencies"]:
|
|
||||||
packages.add((name, section["dependencies"][name]))
|
|
||||||
|
|
||||||
return packages
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
with open(sys.argv[1], 'r') as f:
|
|
||||||
tree = json.loads(f.read())
|
|
||||||
|
|
||||||
packages = set()
|
|
||||||
|
|
||||||
topDependencies = tree["dependencies"]
|
|
||||||
|
|
||||||
for area in topDependencies:
|
|
||||||
for name in topDependencies[area]:
|
|
||||||
packages = packages.union(process_section(name, topDependencies[area][name]))
|
|
||||||
|
|
||||||
for (name, version) in packages:
|
|
||||||
print("%s %s" % (name, version))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
41
pkgs/development/dotnet-modules/python-language-server/updater.sh
Executable file
41
pkgs/development/dotnet-modules/python-language-server/updater.sh
Executable file
|
@ -0,0 +1,41 @@
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i bash -p gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_3 nix-prefetch-git
|
||||||
|
set -eo pipefail
|
||||||
|
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||||
|
|
||||||
|
deps_file="$(realpath ./deps.nix)"
|
||||||
|
|
||||||
|
nix-prefetch-git https://github.com/microsoft/python-language-server --quiet > repo_info
|
||||||
|
new_version="$(jq -r ".date" < repo_info | cut -d"T" -f1)"
|
||||||
|
new_hash="$(jq -r ".sha256" < repo_info)"
|
||||||
|
new_rev="$(jq -r ".rev" < repo_info)"
|
||||||
|
rm repo_info
|
||||||
|
|
||||||
|
old_rev="$(sed -nE 's/\s*rev = "(.*)".*/\1/p' ./default.nix)"
|
||||||
|
|
||||||
|
if [[ $new_rev == $old_rev ]]; then
|
||||||
|
echo "Already up to date!"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
pushd ../../../..
|
||||||
|
|
||||||
|
update-source-version python-language-server "$new_version" "$new_hash" --rev="$new_rev"
|
||||||
|
store_src="$(nix-build -A python-language-server.src --no-out-link)"
|
||||||
|
src="$(mktemp -d /tmp/pylang-server-src.XXX)"
|
||||||
|
cp -rT "$store_src" "$src"
|
||||||
|
chmod -R +w "$src"
|
||||||
|
|
||||||
|
pushd "$src"
|
||||||
|
|
||||||
|
export DOTNET_NOLOGO=1
|
||||||
|
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||||
|
|
||||||
|
mkdir ./nuget_pkgs
|
||||||
|
dotnet restore src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj --packages ./nuget_pkgs
|
||||||
|
|
||||||
|
nuget-to-nix ./nuget_pkgs > "$deps_file"
|
||||||
|
|
||||||
|
trap ''
|
||||||
|
rm -r "$src"
|
||||||
|
'' EXIT
|
|
@ -17,8 +17,15 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
|
url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
|
||||||
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
|
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-parallel-test.patch";
|
||||||
|
url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=12654373c3b60541230921aae81f93b484ec5eaf";
|
||||||
|
sha256 = "1flzpbsfj7gjywv6v9qvm8wpdrkbpj7shryinfdpb40y7si9njdw";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -15,13 +15,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libdeltachat";
|
pname = "libdeltachat";
|
||||||
version = "1.67.0";
|
version = "1.68.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "deltachat";
|
owner = "deltachat";
|
||||||
repo = "deltachat-core-rust";
|
repo = "deltachat-core-rust";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-zb/U3JmGRqni45BOqNd+UTJzQuODx6IBBbmZWFZmSY4=";
|
hash = "sha256-T49E9pGetJqO5qj014efioZtlHM9ZAxH9WzwVmk85XM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
hash = "sha256-2QGC7pCH8MWhDDVKrQ6b/EU9cuJWSZHgYSWaXYPYDiw=";
|
hash = "sha256-jAL8siaMonTMYE88kK7E6RQesPahCLr082dHJovmoo0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
|
sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Add support for ncurses-6.3. A backport of patch pending upstream
|
||||||
|
# inclusion: https://github.com/octo/liboping/pull/61
|
||||||
|
./ncurses-6.3.patch
|
||||||
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = lib.optionalString
|
NIX_CFLAGS_COMPILE = lib.optionalString
|
||||||
stdenv.cc.isGNU "-Wno-error=format-truncation";
|
stdenv.cc.isGNU "-Wno-error=format-truncation";
|
||||||
|
|
||||||
|
|
21
pkgs/development/libraries/liboping/ncurses-6.3.patch
Normal file
21
pkgs/development/libraries/liboping/ncurses-6.3.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
A backport of https://github.com/octo/liboping/pull/61
|
||||||
|
--- a/src/oping.c
|
||||||
|
+++ b/src/oping.c
|
||||||
|
@@ -1125,7 +1125,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
|
||||||
|
wattron (ctx->window, COLOR_PAIR(color));
|
||||||
|
|
||||||
|
if (has_utf8())
|
||||||
|
- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol);
|
||||||
|
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol);
|
||||||
|
else
|
||||||
|
mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc);
|
||||||
|
|
||||||
|
@@ -1222,7 +1222,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */
|
||||||
|
if (counters[x] == 0)
|
||||||
|
mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
|
||||||
|
else if (has_utf8 ())
|
||||||
|
- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2,
|
||||||
|
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s",
|
||||||
|
hist_symbols_utf8[index]);
|
||||||
|
else
|
||||||
|
mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2,
|
|
@ -7,8 +7,18 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc";
|
sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = ''
|
postPatch = ''
|
||||||
sed -i -e s@/usr/local@$out@ -e /ldconfig/d -e '/cd vdk/d' Makefile
|
sed -i -e s@/usr/local@$out@ -e /ldconfig/d -e '/cd vdk/d' Makefile
|
||||||
|
|
||||||
|
# Fix pending upstream inclusion for ncurses-6.3 support:
|
||||||
|
# https://github.com/TragicWarrior/libviper/pull/16
|
||||||
|
# Not applied as it due to unrelated code changes in context.
|
||||||
|
substituteInPlace viper_msgbox.c --replace \
|
||||||
|
'mvwprintw(window,height-3,tmp,prompt);' \
|
||||||
|
'mvwprintw(window,height-3,tmp,"%s",prompt);'
|
||||||
|
substituteInPlace w_decorate.c --replace \
|
||||||
|
'mvwprintw(window,0,x,title);' \
|
||||||
|
'mvwprintw(window,0,x,"%s",title);'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
|
|
|
@ -1,31 +1,37 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, lief
|
, pefile
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "autoit-ripper";
|
pname = "autoit-ripper";
|
||||||
version = "1.0.1";
|
version = "1.1.0";
|
||||||
disabled = pythonOlder "3.6";
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0mbsrfa72n7y1vkm9jhwhn1z3k45jxrlgx58ia1l2bp6chnnn2zy";
|
sha256 = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
lief
|
pefile
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace requirements.txt --replace "lief==0.10.1" "lief>=0.10.1"
|
substituteInPlace requirements.txt \
|
||||||
|
--replace "pefile==2019.4.18" "pefile>=2019.4.18"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Project has no tests
|
# Project has no tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
pythonImportsCheck = [ "autoit_ripper" ];
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"autoit_ripper"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python module to extract AutoIt scripts embedded in PE binaries";
|
description = "Python module to extract AutoIt scripts embedded in PE binaries";
|
||||||
|
|
|
@ -16,12 +16,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "fakeredis";
|
pname = "fakeredis";
|
||||||
version = "1.6.1";
|
version = "1.7.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.5";
|
disabled = pythonOlder "3.5";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-DQapOE+3nanyFkzpbjTrnU4upGIVBwgF6m/TwXRZC0c=";
|
sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -45,7 +47,9 @@ buildPythonPackage rec {
|
||||||
"test/test_aioredis2.py"
|
"test/test_aioredis2.py"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "fakeredis" ];
|
pythonImportsCheck = [
|
||||||
|
"fakeredis"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Fake implementation of Redis API";
|
description = "Fake implementation of Redis API";
|
||||||
|
|
61
pkgs/development/python-modules/glean-parser/default.nix
Normal file
61
pkgs/development/python-modules/glean-parser/default.nix
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
, setuptools-scm
|
||||||
|
# build inputs
|
||||||
|
, appdirs
|
||||||
|
, click
|
||||||
|
, diskcache
|
||||||
|
, jinja2
|
||||||
|
, jsonschema
|
||||||
|
, pyyaml
|
||||||
|
, yamllint
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "glean_parser";
|
||||||
|
version = "4.3.1";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py --replace "pytest-runner" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
appdirs
|
||||||
|
click
|
||||||
|
diskcache
|
||||||
|
jinja2
|
||||||
|
jsonschema
|
||||||
|
pyyaml
|
||||||
|
yamllint
|
||||||
|
];
|
||||||
|
nativeBuildInputs = [
|
||||||
|
setuptools-scm
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
disabledTests = [
|
||||||
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1741668
|
||||||
|
"test_validate_ping"
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "glean_parser" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK";
|
||||||
|
homepage = "https://github.com/mozilla/glean_parser";
|
||||||
|
license = licenses.mpl20;
|
||||||
|
maintainers = [ maintainers.kvark ];
|
||||||
|
};
|
||||||
|
}
|
53
pkgs/development/python-modules/glean-sdk/default.nix
Normal file
53
pkgs/development/python-modules/glean-sdk/default.nix
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, rustPlatform
|
||||||
|
, rustc
|
||||||
|
, cargo
|
||||||
|
, setuptools-rust
|
||||||
|
# build inputs
|
||||||
|
, cffi
|
||||||
|
, glean-parser
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "glean-sdk";
|
||||||
|
version = "42.2.0";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix the environment for spawned process
|
||||||
|
# https://github.com/mozilla/glean/pull/1542
|
||||||
|
./fix-spawned-process-environment.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
|
inherit src;
|
||||||
|
name = "${pname}-${version}";
|
||||||
|
sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
rustc
|
||||||
|
cargo
|
||||||
|
setuptools-rust
|
||||||
|
rustPlatform.cargoSetupHook
|
||||||
|
];
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
cffi
|
||||||
|
glean-parser
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "glean" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Modern cross-platform telemetry client libraries and are a part of the Glean project";
|
||||||
|
homepage = "https://mozilla.github.io/glean/book/index.html";
|
||||||
|
license = licenses.mpl20;
|
||||||
|
maintainers = [ maintainers.kvark ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py
|
||||||
|
index 33a8b12796..a39b54a917 100644
|
||||||
|
--- a/glean-core/python/glean/_process_dispatcher.py
|
||||||
|
+++ b/glean-core/python/glean/_process_dispatcher.py
|
||||||
|
@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]:
|
||||||
|
Path(".coveragerc").absolute()
|
||||||
|
)
|
||||||
|
|
||||||
|
+ # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the
|
||||||
|
+ # subprocess so that there aren't any module search path
|
||||||
|
+ # differences.
|
||||||
|
+ python_path = ":".join(sys.path)[1:]
|
||||||
|
+
|
||||||
|
p = subprocess.Popen(
|
||||||
|
- [sys.executable, _process_dispatcher_helper.__file__, payload]
|
||||||
|
+ [sys.executable, _process_dispatcher_helper.__file__, payload],
|
||||||
|
+ env={"PYTHONPATH": python_path},
|
||||||
|
)
|
||||||
|
|
||||||
|
cls._last_process = p
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||||
doCheck = !stdenv.is32bit || isPy3k;
|
doCheck = !stdenv.is32bit || isPy3k;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
pytest -v tests -W ignore::ResourceWarning -W ignore::DeprecationWarning
|
pytest -v tests -W ignore::DeprecationWarning
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "libarchive-c";
|
pname = "libarchive-c";
|
||||||
version = "3.1";
|
version = "3.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Changaco";
|
owner = "Changaco";
|
||||||
repo = "python-${pname}";
|
repo = "python-${pname}";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1z4lqy9zlzymshzrcldsc9ipys2l7grqg4yff6ndl6dgbfb0g4jb";
|
sha256 = "1kj3y9vnsc9m2hvnvgk5inawxfknz5drj3q51hqgcbq8p4dm8vli";
|
||||||
};
|
};
|
||||||
|
|
||||||
LC_ALL="en_US.UTF-8";
|
LC_ALL="en_US.UTF-8";
|
||||||
|
|
|
@ -12,6 +12,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608
|
disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608
|
||||||
|
pytestFlagsArray = [ "nilearn" ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
joblib
|
joblib
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, isPy27
|
, pythonOlder
|
||||||
, pytest-runner
|
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, numpy
|
, numpy
|
||||||
, pillow
|
, pillow
|
||||||
|
, setuptools
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -20,7 +20,7 @@ let
|
||||||
sha256 = "sha256-iExy+mUs1uqs/u9N6btlqyP6/TvoPVsuOuzs56zZAS8=";
|
sha256 = "sha256-iExy+mUs1uqs/u9N6btlqyP6/TvoPVsuOuzs56zZAS8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Pydicom needs pydicom-data to run some tests. If these files are downloaded
|
# Pydicom needs pydicom-data to run some tests. If these files aren't downloaded
|
||||||
# before the package creation, it'll try to download during the checkPhase.
|
# before the package creation, it'll try to download during the checkPhase.
|
||||||
test_data = fetchFromGitHub {
|
test_data = fetchFromGitHub {
|
||||||
owner = "${pname}";
|
owner = "${pname}";
|
||||||
|
@ -32,11 +32,11 @@ let
|
||||||
in
|
in
|
||||||
buildPythonPackage {
|
buildPythonPackage {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
disabled = isPy27;
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
propagatedBuildInputs = [ numpy pillow ];
|
propagatedBuildInputs = [ numpy pillow setuptools ];
|
||||||
|
|
||||||
checkInputs = [ pytest-runner pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
|
||||||
# Setting $HOME to prevent pytest to try to create a folder inside
|
# Setting $HOME to prevent pytest to try to create a folder inside
|
||||||
# /homeless-shelter which is read-only.
|
# /homeless-shelter which is read-only.
|
||||||
|
|
32
pkgs/development/python-modules/python-hglib/default.nix
Normal file
32
pkgs/development/python-modules/python-hglib/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, mercurial
|
||||||
|
, nose
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "python-hglib";
|
||||||
|
version = "2.6.2";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [ mercurial nose ];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
export HGTMP=$(mktemp -d)
|
||||||
|
export HGUSER=test
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "hglib" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Library with a fast, convenient interface to Mercurial. It uses Mercurial’s command server for communication with hg.";
|
||||||
|
homepage = "https://www.mercurial-scm.org/wiki/PythonHglibs";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ maintainers.kvark ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -56,13 +56,13 @@ with py.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "2.0.605";
|
version = "2.0.606";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-3FSxk2T7JTDn73S+Wf1fJm3Qx4diP1Wf0hJAglBqlxM=";
|
sha256 = "sha256-2t/yYVhJVf5j+ya96zc3EY708ggU8BtsIIIh2ug9XF0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with py.pkgs; [
|
nativeBuildInputs = with py.pkgs; [
|
||||||
|
|
45
pkgs/development/tools/mani/default.nix
Normal file
45
pkgs/development/tools/mani/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
{ buildGoModule, fetchFromGitHub, lib, installShellFiles, git, makeWrapper}:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "mani";
|
||||||
|
version = "0.10.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "alajmo";
|
||||||
|
repo = "mani";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-9rcgPeYFHdIN73K0zGPEHqFFLFkVYkNYRXJ+0/Zo4zI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-ZivzDfjx2djzS0Xm3GISK3zpB5fUUMgy2o4Ti1Z9wMM=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
installShellCompletion --cmd mani \
|
||||||
|
--bash <($out/bin/mani completion bash) \
|
||||||
|
--fish <($out/bin/mani completion fish) \
|
||||||
|
--zsh <($out/bin/mani completion zsh)
|
||||||
|
|
||||||
|
wrapProgram $out/bin/mani \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ git ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Skip tests
|
||||||
|
# The repo's test folder has a README.md with detailed information. I don't
|
||||||
|
# know how to wrap the dependencies for these integration tests so skip for now.
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "CLI tool to help you manage multiple repositories";
|
||||||
|
longDescription = ''
|
||||||
|
mani is a CLI tool that helps you manage multiple repositories. It's useful
|
||||||
|
when you are working with microservices, multi-project systems, many
|
||||||
|
libraries or just a bunch of repositories and want a central place for
|
||||||
|
pulling all repositories and running commands over them.
|
||||||
|
'';
|
||||||
|
homepage = "https://manicli.com/";
|
||||||
|
changelog = "https://github.com/alajmo/mani/releases/tag/v${version}";
|
||||||
|
license = licenses.mit;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,7 +1,8 @@
|
||||||
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
|
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
|
||||||
|
|
||||||
, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
|
, xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype
|
||||||
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
|
, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, gconf, expat, systemd
|
||||||
|
, libcap, libdrm, libxkbcommon
|
||||||
, libnotify
|
, libnotify
|
||||||
, ffmpeg, libxcb, cups
|
, ffmpeg, libxcb, cups
|
||||||
, sqlite, udev
|
, sqlite, udev
|
||||||
|
@ -15,12 +16,13 @@ let
|
||||||
nwEnv = buildEnv {
|
nwEnv = buildEnv {
|
||||||
name = "nwjs-env";
|
name = "nwjs-env";
|
||||||
paths = [
|
paths = [
|
||||||
xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf
|
xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf
|
||||||
freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
|
freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
|
||||||
xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
|
xorg.libXext xorg.libXfixes mesa nss nspr gconf expat dbus
|
||||||
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
|
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
|
||||||
xorg.libXScrnSaver cups
|
xorg.libXScrnSaver xorg.libxshmfence cups
|
||||||
libcap libnotify
|
libcap libdrm libnotify
|
||||||
|
libxkbcommon
|
||||||
# libnw-specific (not chromium dependencies)
|
# libnw-specific (not chromium dependencies)
|
||||||
ffmpeg libxcb
|
ffmpeg libxcb
|
||||||
# chromium runtime deps (dlopen’d)
|
# chromium runtime deps (dlopen’d)
|
||||||
|
@ -33,18 +35,18 @@ let
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "nwjs";
|
pname = "nwjs";
|
||||||
version = "0.33.4";
|
version = "0.54.1";
|
||||||
|
|
||||||
src = if sdk then fetchurl {
|
src = if sdk then fetchurl {
|
||||||
url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
|
url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
|
||||||
sha256 = if bits == "x64" then
|
sha256 = if bits == "x64" then
|
||||||
"1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else
|
"sha256-1qeU4+EIki0M7yJPkRuzFwMdswfDOni5gltdmM6A/ds=" else
|
||||||
"00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s";
|
"sha256-wDEGePE9lrKa6OAzeiDLhVj992c0TJgiMHb8lJ4PF80=";
|
||||||
} else fetchurl {
|
} else fetchurl {
|
||||||
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
|
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
|
||||||
sha256 = if bits == "x64" then
|
sha256 = if bits == "x64" then
|
||||||
"09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else
|
"sha256-TACEM06K2t6dDXRD44lSW7GRi77yzSW4BZJw8gT+fl4=" else
|
||||||
"0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964";
|
"sha256-yX9knqFV5VQTT3TJDmQoDgt17NqH8fLt+bLQAqKleTU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# we have runtime deps like sqlite3 that should remain
|
# we have runtime deps like sqlite3 that should remain
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sumneko-lua-language-server";
|
pname = "sumneko-lua-language-server";
|
||||||
version = "2.4.7";
|
version = "2.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sumneko";
|
owner = "sumneko";
|
||||||
repo = "lua-language-server";
|
repo = "lua-language-server";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-lO+FUuU7uihbRLI1X9qhOvgukRGfhDeSM/JdIqr96Fk=";
|
sha256 = "sha256-3iWD0kXbF8Rad7fQ36ppD5q8V8COacLrT+vasCkygDc=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,34 @@
|
||||||
{ stdenvNoCC, fetchurl, lib }:
|
{ stdenvNoCC, fetchurl, lib }:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
let
|
||||||
pname = "symfony-cli";
|
version = "4.26.9";
|
||||||
version = "4.26.8";
|
|
||||||
|
|
||||||
src = fetchurl {
|
srcs = {
|
||||||
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz";
|
x86_64-linux = fetchurl {
|
||||||
sha256 = "sha256-/9jsdl39TOkuNCB4G7orJH4qR4Spdt7VTsC1jelyLs0=";
|
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz";
|
||||||
|
sha256 = "0ivqqrpzbpyzp60bv25scarmvisj401rp7h2s3cxa7d17prja91v";
|
||||||
|
};
|
||||||
|
|
||||||
|
i686-linux = fetchurl {
|
||||||
|
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_386.gz";
|
||||||
|
sha256 = "0ag5w70bkvj9wgp4yzzy824shj907sa5l20sqcgivi3r5gy0p277";
|
||||||
|
};
|
||||||
|
|
||||||
|
aarch64-linux = fetchurl {
|
||||||
|
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_arm64.gz";
|
||||||
|
sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51";
|
||||||
|
};
|
||||||
|
|
||||||
|
x86_64-darwin = fetchurl {
|
||||||
|
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_darwin_amd64.gz";
|
||||||
|
sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
in stdenvNoCC.mkDerivation rec {
|
||||||
|
inherit version;
|
||||||
|
pname = "symfony-cli";
|
||||||
|
|
||||||
|
src = srcs.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
|
@ -24,6 +45,6 @@ stdenvNoCC.mkDerivation rec {
|
||||||
homepage = "https://symfony.com/download";
|
homepage = "https://symfony.com/download";
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
maintainers = with maintainers; [ drupol ];
|
maintainers = with maintainers; [ drupol ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "augustus";
|
pname = "augustus";
|
||||||
version = "3.0.1";
|
version = "3.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Keriew";
|
owner = "Keriew";
|
||||||
repo = "augustus";
|
repo = "augustus";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "03pmnwq6bahq854vh1vmv1vabb8cs0alca8f36id8dlz8bw95nik";
|
sha256 = "1axm4x3ca5r08sv1b4q8y9c15mkwqd3rnc8k09a2fn3plbk2p2j4";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
pname = "steam-runtime";
|
pname = "steam-runtime";
|
||||||
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt
|
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt
|
||||||
version = "0.20210906.1";
|
version = "0.20211102.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
|
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
|
||||||
sha256 = "1dkynar5y4q0pi32ihdhl7r81v9jxsb7lhc91mqhy43f6462qz1h";
|
sha256 = "sha256-/ve4oVxKQ4uTaTiTg8Qc0Kyb4GRJKGZ5SQVLIyeJSpI=";
|
||||||
name = "scout-runtime-${version}.tar.gz";
|
name = "scout-runtime-${version}.tar.gz";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vintagestory";
|
pname = "vintagestory";
|
||||||
version = "1.15.5";
|
version = "1.15.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
|
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
|
||||||
sha256 = "sha256-38vLkH8B1yYC1I8P8uCsbC8CK8Btpfm9tNxgiuswsa8=";
|
sha256 = "sha256-aT6vndo/SSAqd4omyW4qWvGetkqEpgvapqaqDBrbTmo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||||
|
|
|
@ -15,6 +15,10 @@
|
||||||
"date": "2021-08-22",
|
"date": "2021-08-22",
|
||||||
"new": "toggleterm-nvim"
|
"new": "toggleterm-nvim"
|
||||||
},
|
},
|
||||||
|
"orgmode-nvim": {
|
||||||
|
"date": "2021-11-28",
|
||||||
|
"new": "orgmode"
|
||||||
|
},
|
||||||
"sql-nvim": {
|
"sql-nvim": {
|
||||||
"date": "2021-09-03",
|
"date": "2021-09-03",
|
||||||
"new": "sqlite-lua"
|
"new": "sqlite-lua"
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -363,7 +363,6 @@ kovisoft/slimv
|
||||||
kristijanhusak/defx-git
|
kristijanhusak/defx-git
|
||||||
kristijanhusak/defx-icons
|
kristijanhusak/defx-icons
|
||||||
kristijanhusak/deoplete-phpactor
|
kristijanhusak/deoplete-phpactor
|
||||||
kristijanhusak/orgmode.nvim
|
|
||||||
kristijanhusak/vim-carbon-now-sh
|
kristijanhusak/vim-carbon-now-sh
|
||||||
kristijanhusak/vim-dadbod-completion
|
kristijanhusak/vim-dadbod-completion
|
||||||
kristijanhusak/vim-dadbod-ui
|
kristijanhusak/vim-dadbod-ui
|
||||||
|
@ -546,6 +545,7 @@ nvim-lua/plenary.nvim
|
||||||
nvim-lua/popup.nvim
|
nvim-lua/popup.nvim
|
||||||
nvim-lualine/lualine.nvim
|
nvim-lualine/lualine.nvim
|
||||||
nvim-neorg/neorg@main
|
nvim-neorg/neorg@main
|
||||||
|
nvim-orgmode/orgmode
|
||||||
nvim-telescope/telescope-cheat.nvim
|
nvim-telescope/telescope-cheat.nvim
|
||||||
nvim-telescope/telescope-dap.nvim
|
nvim-telescope/telescope-dap.nvim
|
||||||
nvim-telescope/telescope-frecency.nvim
|
nvim-telescope/telescope-frecency.nvim
|
||||||
|
|
|
@ -12,8 +12,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ groff ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ libtool gettext zlib readline gsasl guile python3 pcre libffi groff ];
|
[ libtool gettext zlib readline gsasl guile python3 pcre libffi ];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"version": "3.4.1",
|
"version": "3.4.4",
|
||||||
"name": "@tootsuite/mastodon",
|
"name": "@mastodon/mastodon",
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12"
|
"node": ">=12"
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/tootsuite/mastodon.git"
|
"url": "https://github.com/mastodon/mastodon.git"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 2 versions",
|
"last 2 versions",
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
{ fetchgit, applyPatches }: let
|
{ fetchgit, applyPatches }: let
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/tootsuite/mastodon.git";
|
url = "https://github.com/tootsuite/mastodon.git";
|
||||||
rev = "v3.4.1";
|
rev = "v3.4.4";
|
||||||
sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5";
|
sha256 = "0gi818ns7ws63g7izhcqq5b28kifzmvg0p278lq82h02ysg9grj3";
|
||||||
};
|
};
|
||||||
in applyPatches {
|
in applyPatches {
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
|
@ -1,20 +1,30 @@
|
||||||
{ pkgs, stdenv, lib, makeWrapper, yarn2nix, bundix, coreutils,
|
{ pkgs
|
||||||
diffutils, nix-prefetch-github, gnused, jq }:
|
, runCommand
|
||||||
stdenv.mkDerivation rec {
|
, lib
|
||||||
name = "mastodon-update-script";
|
, makeWrapper
|
||||||
installPhase = ''
|
, yarn2nix
|
||||||
mkdir -p $out/bin
|
, bundix
|
||||||
cp ${./update.sh} $out/bin/update.sh
|
, coreutils
|
||||||
patchShebangs $out/bin/update.sh
|
, diffutils
|
||||||
wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs}
|
, nix-prefetch-github
|
||||||
'';
|
, gnused
|
||||||
|
, jq
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ];
|
||||||
|
in
|
||||||
|
runCommand "mastodon-update-script"
|
||||||
|
{
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ];
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
maintainers = with lib.maintainers; [ happy-river ];
|
maintainers = with lib.maintainers; [ happy-river ];
|
||||||
description = "Utility to generate Nix expressions for Mastodon's dependencies";
|
description = "Utility to generate Nix expressions for Mastodon's dependencies";
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
} ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ${./update.sh} $out/bin/update.sh
|
||||||
|
patchShebangs $out/bin/update.sh
|
||||||
|
wrapProgram $out/bin/update.sh --prefix PATH : ${binPath}
|
||||||
|
''
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
"3.4.1"
|
"3.4.4"
|
||||||
|
|
|
@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag
|
||||||
+++ b/package.json
|
+++ b/package.json
|
||||||
@@ -1,4 +1,5 @@
|
@@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
+ "version": "3.4.1",
|
+ "version": "3.4.4",
|
||||||
"name": "@tootsuite/mastodon",
|
"name": "@mastodon/mastodon",
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pgbouncer";
|
pname = "pgbouncer";
|
||||||
version = "1.16.0";
|
version = "1.16.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
|
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0li66jk1v07bpfmmqzcqjn5vkhglfhwnbncc5bpalg5qidhr38x4";
|
sha256 = "1z7p3ghpmbp5qv1bz9s186jn0hfnr300dc5p0hmh6vbnwklpfx08";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -2274,21 +2274,6 @@ lib.makeScope newScope (self: with self; {
|
||||||
meta.platforms = lib.platforms.unix;
|
meta.platforms = lib.platforms.unix;
|
||||||
}) {};
|
}) {};
|
||||||
|
|
||||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
|
||||||
xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
|
|
||||||
pname = "xf86-video-mach64";
|
|
||||||
version = "6.9.6";
|
|
||||||
builder = ./builder.sh;
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2";
|
|
||||||
sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs";
|
|
||||||
};
|
|
||||||
hardeningDisable = [ "bindnow" "relro" ];
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
|
||||||
buildInputs = [ xorgproto libdrm libpciaccess xorgserver ];
|
|
||||||
meta.platforms = lib.platforms.unix;
|
|
||||||
}) {};
|
|
||||||
|
|
||||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||||
xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
|
xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
|
||||||
pname = "xf86-video-mga";
|
pname = "xf86-video-mga";
|
||||||
|
|
|
@ -101,7 +101,6 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2
|
||||||
mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2
|
mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2
|
||||||
mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
|
mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
|
||||||
mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
|
mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
|
||||||
mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2
|
|
||||||
mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2
|
mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2
|
||||||
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
|
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
|
||||||
mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
|
mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
|
||||||
|
|
25
pkgs/shells/zsh/zsh-better-npm-completion/default.nix
Normal file
25
pkgs/shells/zsh/zsh-better-npm-completion/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "zsh-better-npm-completion";
|
||||||
|
version = "unstable-2019-11-19";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "lukechilds";
|
||||||
|
repo = "zsh-better-npm-completion";
|
||||||
|
rev = "0a7cf042415324ec38a186fdcbc9af163f0d7e69";
|
||||||
|
sha256 = "16z7k5n1rcl9i61lrm7i5dsqsmhvdp1y4y5ii6hv2xpp470addgy";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm 0644 zsh-better-npm-completion.plugin.zsh $out/share/zsh-better-npm-completion
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Better completion for npm";
|
||||||
|
homepage = "https://github.com/lukechilds/zsh-better-npm-completion";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = [ maintainers.gerschtli ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -279,6 +279,10 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# `libtool` comes with obsolete config.sub/config.guess that don't recognize Risc-V.
|
||||||
|
extraNativeBuildInputs =
|
||||||
|
lib.optional (localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -160,6 +160,11 @@ in with pkgs; rec {
|
||||||
# pkgs/stdenv/linux/default.nix for the details.
|
# pkgs/stdenv/linux/default.nix for the details.
|
||||||
cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib
|
cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib
|
||||||
|
|
||||||
|
'' + lib.optionalString (stdenv.hostPlatform.isRiscV) ''
|
||||||
|
# libatomic is required on RiscV platform for C/C++ atomics and pthread
|
||||||
|
# even though they may be translated into native instructions.
|
||||||
|
cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib
|
||||||
|
|
||||||
'' + ''
|
'' + ''
|
||||||
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
|
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
From 52662c71f7b043f374d4062d07a28b59ef010cbe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zane van Iperen <zane@zanevaniperen.com>
|
||||||
|
Date: Wed, 22 Sep 2021 18:41:36 +1000
|
||||||
|
Subject: [PATCH] jpsxdec: hackfix build with newer JDKs
|
||||||
|
|
||||||
|
---
|
||||||
|
jpsxdec/build.xml | 6 ++----
|
||||||
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/jpsxdec/build.xml b/jpsxdec/build.xml
|
||||||
|
index 713941c..f5aa902 100644
|
||||||
|
--- a/jpsxdec/build.xml
|
||||||
|
+++ b/jpsxdec/build.xml
|
||||||
|
@@ -43,8 +43,8 @@
|
||||||
|
<property name="build-lgpl.dir" location="${working.dir}/build-lgpl"/>
|
||||||
|
<property name="testbuild.dir" location="${working.dir}/build-test"/>
|
||||||
|
|
||||||
|
- <property name="javac.target.ver" value="1.6"/>
|
||||||
|
- <property name="javac.source.ver" value="1.6" />
|
||||||
|
+ <property name="javac.target.ver" value="1.8"/>
|
||||||
|
+ <property name="javac.source.ver" value="1.8" />
|
||||||
|
|
||||||
|
<!-- output -->
|
||||||
|
<property name="release.dir" location="${working.dir}/release"/>
|
||||||
|
@@ -76,7 +76,6 @@
|
||||||
|
<compilerarg value="-Xlint:static"/>
|
||||||
|
<compilerarg value="-Xlint:unchecked"/>
|
||||||
|
<compilerarg value="-Xlint:varargs"/>
|
||||||
|
- <compilerarg value="-Werror"/>
|
||||||
|
</javac>
|
||||||
|
|
||||||
|
<!-- Copy over resources -->
|
||||||
|
@@ -109,7 +108,6 @@
|
||||||
|
<compilerarg value="-Xlint:static"/>
|
||||||
|
<compilerarg value="-Xlint:unchecked"/>
|
||||||
|
<compilerarg value="-Xlint:varargs"/>
|
||||||
|
- <compilerarg value="-Werror"/>
|
||||||
|
</javac>
|
||||||
|
|
||||||
|
<!-- Copy over resources -->
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
84
pkgs/tools/games/jpsxdec/default.nix
Normal file
84
pkgs/tools/games/jpsxdec/default.nix
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, jdk
|
||||||
|
/*
|
||||||
|
* jPSXdec needs to be built with no later than JDK8, but
|
||||||
|
* should be run with the latest to get HiDPI fixes, etc.
|
||||||
|
*/
|
||||||
|
, jre ? jdk
|
||||||
|
, ant
|
||||||
|
, unoconv
|
||||||
|
, makeWrapper
|
||||||
|
, makeDesktopItem
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
pname = "jpsxdec";
|
||||||
|
version = "1.05";
|
||||||
|
|
||||||
|
description = "Cross-platform PlayStation 1 audio and video converter";
|
||||||
|
|
||||||
|
desktopItem = makeDesktopItem {
|
||||||
|
name = pname;
|
||||||
|
exec = pname;
|
||||||
|
icon = pname;
|
||||||
|
comment = description;
|
||||||
|
desktopName = "jPSXdec";
|
||||||
|
categories = "AudioVideo;Utility;";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
inherit pname version;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "m35";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0wnfvvcyldf699b08lzlc0gshl7rn09a6q4i7jmr41izlcdszdbz";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ ant jdk unoconv makeWrapper ];
|
||||||
|
buildInputs = [ jre ];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./0001-jpsxdec-hackfix-build-with-newer-JDKs.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
cd jpsxdec
|
||||||
|
mkdir -p _ant/release/doc/
|
||||||
|
unoconv -d document -f pdf -o _ant/release/doc/jPSXdec-manual.pdf doc/jPSXdec-manual.odt
|
||||||
|
|
||||||
|
ant release
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/{bin,share/pixmaps}
|
||||||
|
mv _ant/release $out/jpsxdec
|
||||||
|
|
||||||
|
makeWrapper ${jre}/bin/java $out/bin/jpsxdec \
|
||||||
|
--add-flags "-jar $out/jpsxdec/jpsxdec.jar"
|
||||||
|
|
||||||
|
cp ${src}/jpsxdec/src/jpsxdec/gui/icon48.png $out/share/pixmaps/${pname}.png
|
||||||
|
ln -s ${desktopItem}/share/applications $out/share
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
inherit description;
|
||||||
|
homepage = "https://jpsxdec.blogspot.com/";
|
||||||
|
platforms = platforms.all;
|
||||||
|
license = {
|
||||||
|
url = "https://raw.githubusercontent.com/m35/jpsxdec/readme/.github/LICENSE.md";
|
||||||
|
free = true;
|
||||||
|
};
|
||||||
|
maintainers = with maintainers; [ zane ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool
|
{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool, bash
|
||||||
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config
|
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
@ -51,10 +51,9 @@ stdenv.mkDerivation rec {
|
||||||
pname = "grub";
|
pname = "grub";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchurl {
|
||||||
url = "git://git.savannah.gnu.org/grub.git";
|
url = "mirror://gnu/grub/grub-${version}.tar.xz";
|
||||||
rev = "${pname}-${version}";
|
sha256 = "sha256-t56kSvkbk9F80/6Ava5u1DdwZ4qaWuGSzOqAPrtlfuE=";
|
||||||
sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -75,8 +74,8 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext freetype ];
|
nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ];
|
||||||
buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ]
|
buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ]
|
||||||
++ optional doCheck qemu
|
++ optional doCheck qemu
|
||||||
++ optional zfsSupport zfs;
|
++ optional zfsSupport zfs;
|
||||||
|
|
||||||
|
@ -109,8 +108,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
|
||||||
./bootstrap --no-git --gnulib-srcdir=${gnulib}
|
|
||||||
|
|
||||||
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
|
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -144,6 +141,9 @@ stdenv.mkDerivation rec {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# Avoid a runtime reference to gcc
|
# Avoid a runtime reference to gcc
|
||||||
sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|"
|
sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|"
|
||||||
|
# just adding bash to buildInputs wasn't enough to fix the shebang
|
||||||
|
substituteInPlace $out/lib/grub/*/modinfo.sh \
|
||||||
|
--replace ${buildPackages.bash} "/usr/bin/bash"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
|
|
|
@ -1,22 +1,22 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildGoPackage
|
, buildGoModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with builtins;
|
buildGoModule rec {
|
||||||
|
|
||||||
buildGoPackage rec {
|
|
||||||
pname = "safe";
|
pname = "safe";
|
||||||
version = "1.5.1";
|
version = "1.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "starkandwayne";
|
owner = "starkandwayne";
|
||||||
repo = "safe";
|
repo = "safe";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "12gzxrnyl890h79z9yx23m1wwgy8ahm74q4qwi8n2nh7ydq6mn2d";
|
sha256 = "sha256-ankX4BeMvBEd0e01mQHfaPg4z1z+IZqELaSEJ5deF8Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/starkandwayne/safe";
|
vendorSha256 = "sha256-7hX35FfFxfoiI/dSxWhZH8iJoRWa4slAJF0lULq8KL4=";
|
||||||
|
|
||||||
|
subPackages = [ "." ];
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-X main.Version=${version}"
|
"-X main.Version=${version}"
|
||||||
|
|
|
@ -1,36 +1,30 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
|
||||||
, buildPythonApplication
|
, buildPythonApplication
|
||||||
, jinja2
|
|
||||||
, oauthlib
|
|
||||||
, configobj
|
|
||||||
, pyyaml
|
|
||||||
, requests
|
|
||||||
, jsonschema
|
|
||||||
, jsonpatch
|
|
||||||
, httpretty
|
|
||||||
, dmidecode
|
|
||||||
, pytestCheckHook
|
|
||||||
, shadow
|
|
||||||
, cloud-utils
|
, cloud-utils
|
||||||
|
, dmidecode
|
||||||
|
, fetchFromGitHub
|
||||||
, openssh
|
, openssh
|
||||||
|
, python3
|
||||||
|
, shadow
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "cloud-init";
|
pname = "cloud-init";
|
||||||
version = "21.2";
|
version = "21.4";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "canonical";
|
owner = "canonical";
|
||||||
repo = "cloud-init";
|
repo = "cloud-init";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz";
|
sha256 = "09413qz9y2csvhjb4krjnkfj97vlykx79j912p27jjcrg82f1nib";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./0001-add-nixos-support.patch ];
|
patches = [ ./0001-add-nixos-support.patch ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
substituteInPlace setup.py --replace /lib/systemd $out/lib/systemd
|
substituteInPlace setup.py \
|
||||||
|
--replace /lib/systemd $out/lib/systemd
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -40,17 +34,18 @@ buildPythonApplication rec {
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
jinja2
|
|
||||||
oauthlib
|
|
||||||
configobj
|
configobj
|
||||||
|
jinja2
|
||||||
|
jsonpatch
|
||||||
|
jsonschema
|
||||||
|
netifaces
|
||||||
|
oauthlib
|
||||||
pyyaml
|
pyyaml
|
||||||
requests
|
requests
|
||||||
jsonschema
|
|
||||||
jsonpatch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = with python3.pkgs; [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
httpretty
|
httpretty
|
||||||
dmidecode
|
dmidecode
|
||||||
|
@ -78,6 +73,16 @@ buildPythonApplication rec {
|
||||||
"TestInstallChefOmnibus"
|
"TestInstallChefOmnibus"
|
||||||
# https://github.com/canonical/cloud-init/pull/893
|
# https://github.com/canonical/cloud-init/pull/893
|
||||||
"TestGetPackageMirrorInfo"
|
"TestGetPackageMirrorInfo"
|
||||||
|
# Disable failing VMware and PuppetAio tests
|
||||||
|
"test_get_data_iso9660_with_network_config"
|
||||||
|
"test_get_data_vmware_guestinfo_with_network_config"
|
||||||
|
"test_get_host_info"
|
||||||
|
"test_no_data_access_method"
|
||||||
|
"test_install_with_collection"
|
||||||
|
"test_install_with_custom_url"
|
||||||
|
"test_install_with_default_arguments"
|
||||||
|
"test_install_with_no_cleanup"
|
||||||
|
"test_install_with_version"
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
|
@ -99,7 +104,9 @@ buildPythonApplication rec {
|
||||||
export TMPDIR=/tmp
|
export TMPDIR=/tmp
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pythonImportsCheck = [ "cloudinit" ];
|
pythonImportsCheck = [
|
||||||
|
"cloudinit"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://cloudinit.readthedocs.org";
|
homepage = "https://cloudinit.readthedocs.org";
|
||||||
|
|
|
@ -6971,6 +6971,8 @@ with pkgs;
|
||||||
|
|
||||||
makebootfat = callPackage ../tools/misc/makebootfat { };
|
makebootfat = callPackage ../tools/misc/makebootfat { };
|
||||||
|
|
||||||
|
mani = callPackage ../development/tools/mani { };
|
||||||
|
|
||||||
mapcache = callPackage ../servers/mapcache { };
|
mapcache = callPackage ../servers/mapcache { };
|
||||||
|
|
||||||
mapserver = callPackage ../servers/mapserver { };
|
mapserver = callPackage ../servers/mapserver { };
|
||||||
|
@ -7072,6 +7074,8 @@ with pkgs;
|
||||||
|
|
||||||
motion = callPackage ../applications/video/motion { };
|
motion = callPackage ../applications/video/motion { };
|
||||||
|
|
||||||
|
moz-phab = python3Packages.callPackage ../applications/misc/moz-phab { };
|
||||||
|
|
||||||
mtail = callPackage ../servers/monitoring/mtail { };
|
mtail = callPackage ../servers/monitoring/mtail { };
|
||||||
|
|
||||||
multitail = callPackage ../tools/misc/multitail { };
|
multitail = callPackage ../tools/misc/multitail { };
|
||||||
|
@ -11126,6 +11130,8 @@ with pkgs;
|
||||||
|
|
||||||
zsh-bd = callPackage ../shells/zsh/zsh-bd { };
|
zsh-bd = callPackage ../shells/zsh/zsh-bd { };
|
||||||
|
|
||||||
|
zsh-better-npm-completion = callPackage ../shells/zsh/zsh-better-npm-completion { };
|
||||||
|
|
||||||
zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { };
|
zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { };
|
||||||
|
|
||||||
zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
|
zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
|
||||||
|
@ -14930,9 +14936,7 @@ with pkgs;
|
||||||
|
|
||||||
mdl = callPackage ../development/tools/misc/mdl { };
|
mdl = callPackage ../development/tools/misc/mdl { };
|
||||||
|
|
||||||
python-language-server = callPackage ../development/dotnet-modules/python-language-server {
|
python-language-server = callPackage ../development/dotnet-modules/python-language-server { };
|
||||||
inherit (dotnetPackages) Nuget;
|
|
||||||
};
|
|
||||||
|
|
||||||
minify = callPackage ../development/web/minify { };
|
minify = callPackage ../development/web/minify { };
|
||||||
|
|
||||||
|
@ -27532,6 +27536,10 @@ with pkgs;
|
||||||
wxGTK = wxGTK30-gtk3;
|
wxGTK = wxGTK30-gtk3;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
jpsxdec = callPackage ../tools/games/jpsxdec {
|
||||||
|
jdk = openjdk8;
|
||||||
|
};
|
||||||
|
|
||||||
pdfslicer = callPackage ../applications/misc/pdfslicer { };
|
pdfslicer = callPackage ../applications/misc/pdfslicer { };
|
||||||
|
|
||||||
pekwm = callPackage ../applications/window-managers/pekwm { };
|
pekwm = callPackage ../applications/window-managers/pekwm { };
|
||||||
|
@ -28829,6 +28837,10 @@ with pkgs;
|
||||||
|
|
||||||
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
|
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
|
||||||
|
|
||||||
|
vengi-tools = callPackage ../applications/graphics/vengi-tools {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) Carbon OpenCL;
|
||||||
|
};
|
||||||
|
|
||||||
verbiste = callPackage ../applications/misc/verbiste {
|
verbiste = callPackage ../applications/misc/verbiste {
|
||||||
inherit (gnome2) libgnomeui;
|
inherit (gnome2) libgnomeui;
|
||||||
};
|
};
|
||||||
|
|
|
@ -3148,6 +3148,10 @@ in {
|
||||||
|
|
||||||
glcontext = callPackage ../development/python-modules/glcontext { };
|
glcontext = callPackage ../development/python-modules/glcontext { };
|
||||||
|
|
||||||
|
glean-parser = callPackage ../development/python-modules/glean-parser { };
|
||||||
|
|
||||||
|
glean-sdk = callPackage ../development/python-modules/glean-sdk { };
|
||||||
|
|
||||||
glfw = callPackage ../development/python-modules/glfw { };
|
glfw = callPackage ../development/python-modules/glfw { };
|
||||||
|
|
||||||
glob2 = callPackage ../development/python-modules/glob2 { };
|
glob2 = callPackage ../development/python-modules/glob2 { };
|
||||||
|
@ -7599,6 +7603,8 @@ in {
|
||||||
|
|
||||||
python-gvm = callPackage ../development/python-modules/python-gvm { };
|
python-gvm = callPackage ../development/python-modules/python-gvm { };
|
||||||
|
|
||||||
|
python-hglib = callPackage ../development/python-modules/python-hglib { };
|
||||||
|
|
||||||
python-hosts = callPackage ../development/python-modules/python-hosts { };
|
python-hosts = callPackage ../development/python-modules/python-hosts { };
|
||||||
|
|
||||||
python-hpilo = callPackage ../development/python-modules/python-hpilo { };
|
python-hpilo = callPackage ../development/python-modules/python-hpilo { };
|
||||||
|
|
Loading…
Reference in a new issue