mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge master into staging-next
This commit is contained in:
commit
4a997ba4a6
|
@ -87,19 +87,19 @@ in
|
|||
boot.initrd.availableKernelModules =
|
||||
[ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ];
|
||||
|
||||
boot.postBootCommands =
|
||||
boot.postBootCommands = lib.mkIf (!boot.initrd.systemd.enable)
|
||||
''
|
||||
mkdir -p /mnt
|
||||
|
||||
cp ${dummyConfiguration} /etc/nixos/configuration.nix
|
||||
'';
|
||||
|
||||
boot.initrd.extraUtilsCommands =
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
|
||||
'';
|
||||
|
||||
boot.initrd.postDeviceCommands =
|
||||
boot.initrd.postDeviceCommands = lib.mkIf (!boot.initrd.systemd.enable)
|
||||
''
|
||||
hwclock -s
|
||||
'';
|
||||
|
|
|
@ -65,7 +65,6 @@ let
|
|||
"systemd-kexec.service"
|
||||
"systemd-modules-load.service"
|
||||
"systemd-poweroff.service"
|
||||
"systemd-random-seed.service"
|
||||
"systemd-reboot.service"
|
||||
"systemd-sysctl.service"
|
||||
"systemd-tmpfiles-setup-dev.service"
|
||||
|
@ -193,7 +192,7 @@ in {
|
|||
description = ''
|
||||
Store paths to copy into the initrd as well.
|
||||
'';
|
||||
type = types.listOf types.singleLineStr;
|
||||
type = with types; listOf (oneOf [ singleLineStr package ]);
|
||||
default = [];
|
||||
};
|
||||
|
||||
|
@ -396,7 +395,6 @@ in {
|
|||
"${cfg.package}/lib/systemd/systemd-journald"
|
||||
"${cfg.package}/lib/systemd/systemd-makefs"
|
||||
"${cfg.package}/lib/systemd/systemd-modules-load"
|
||||
"${cfg.package}/lib/systemd/systemd-random-seed"
|
||||
"${cfg.package}/lib/systemd/systemd-remount-fs"
|
||||
"${cfg.package}/lib/systemd/systemd-shutdown"
|
||||
"${cfg.package}/lib/systemd/systemd-sulogin-shell"
|
||||
|
@ -507,6 +505,5 @@ in {
|
|||
};
|
||||
|
||||
boot.kernelParams = lib.mkIf (config.boot.resumeDevice != "") [ "resume=${config.boot.resumeDevice}" ];
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,13 +1,23 @@
|
|||
{ pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
options.boot.initrd.services.bcache.enable = (lib.mkEnableOption "bcache support in the initrd") // {
|
||||
visible = false; # only works with systemd stage 1
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.bcache-tools ];
|
||||
config = {
|
||||
|
||||
services.udev.packages = [ pkgs.bcache-tools ];
|
||||
environment.systemPackages = [ pkgs.bcache-tools ];
|
||||
|
||||
boot.initrd.extraUdevRulesCommands = ''
|
||||
cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/
|
||||
'';
|
||||
services.udev.packages = [ pkgs.bcache-tools ];
|
||||
|
||||
boot.initrd.extraUdevRulesCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/
|
||||
'';
|
||||
|
||||
boot.initrd.services.udev = lib.mkIf config.boot.initrd.services.bcache.enable {
|
||||
packages = [ pkgs.bcache-tools ];
|
||||
binPackages = [ pkgs.bcache-tools ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -66,19 +66,19 @@ in
|
|||
]
|
||||
);
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs
|
||||
ln -sv btrfs $out/bin/btrfsck
|
||||
ln -sv btrfsck $out/bin/fsck.btrfs
|
||||
'';
|
||||
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
$out/bin/btrfs --version
|
||||
'';
|
||||
|
||||
boot.initrd.postDeviceCommands = mkIf inInitrd
|
||||
boot.initrd.postDeviceCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
btrfs device scan
|
||||
'';
|
||||
|
|
|
@ -16,7 +16,7 @@ in
|
|||
boot.initrd.availableKernelModules = mkIf inInitrd
|
||||
[ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs
|
||||
'';
|
||||
|
|
|
@ -1,14 +1,20 @@
|
|||
{ pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
|
||||
inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
config = {
|
||||
|
||||
system.fsPackages = [ pkgs.e2fsprogs ];
|
||||
system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ pkgs.e2fsprogs ];
|
||||
|
||||
# As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
|
||||
boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
|
||||
boot.initrd.availableKernelModules = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ "ext2" "ext4" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands =
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
|
||||
''
|
||||
# Copy e2fsck and friends.
|
||||
copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/e2fsck
|
||||
|
|
|
@ -13,7 +13,7 @@ in
|
|||
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" "crc32" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd ''
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs
|
||||
${optionalString (any (fs: fs.autoResize) fileSystems) ''
|
||||
# We need f2fs-tools' tools to resize filesystems
|
||||
|
|
|
@ -12,7 +12,7 @@ in
|
|||
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd ''
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -15,7 +15,7 @@ in
|
|||
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "reiserfs" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.reiserfsprogs}/sbin/reiserfsck
|
||||
ln -s reiserfsck $out/bin/fsck.reiserfs
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
(lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
|
||||
boot.initrd.kernelModules = [ "fuse" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.fuse}/sbin/mount.fuse
|
||||
copy_bin_and_libs ${pkgs.unionfs-fuse}/bin/unionfs
|
||||
substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \
|
||||
|
@ -16,12 +16,23 @@
|
|||
chmod +x $out/bin/mount.unionfs-fuse
|
||||
'';
|
||||
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
# Hacky!!! fuse hard-codes the path to mount
|
||||
mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
|
||||
ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
|
||||
ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
|
||||
'';
|
||||
|
||||
boot.initrd.systemd.extraBin = {
|
||||
"mount.fuse" = "${pkgs.fuse}/bin/mount.fuse";
|
||||
"unionfs" = "${pkgs.unionfs-fuse}/bin/unionfs";
|
||||
"mount.unionfs-fuse" = pkgs.runCommand "mount.unionfs-fuse" {} ''
|
||||
substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out \
|
||||
--replace '${pkgs.bash}/bin/bash' /bin/sh \
|
||||
--replace '${pkgs.fuse}/sbin' /bin \
|
||||
--replace '${pkgs.unionfs-fuse}/bin' /bin
|
||||
'';
|
||||
};
|
||||
})
|
||||
|
||||
(lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
|
||||
|
|
|
@ -15,7 +15,7 @@ in
|
|||
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "vfat" "nls_cp437" "nls_iso8859-1" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.dosfstools}/sbin/dosfsck
|
||||
ln -sv dosfsck $out/bin/fsck.vfat
|
||||
|
|
|
@ -15,14 +15,14 @@ in
|
|||
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs
|
||||
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/xfs_repair
|
||||
'';
|
||||
|
||||
# Trick just to set 'sh' after the extraUtils nuke-refs.
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !boot.initrd.systemd.enable)
|
||||
''
|
||||
sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs
|
||||
'';
|
||||
|
|
|
@ -524,6 +524,7 @@ in
|
|||
systemd-confinement = handleTest ./systemd-confinement.nix {};
|
||||
systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};
|
||||
systemd-escaping = handleTest ./systemd-escaping.nix {};
|
||||
systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {};
|
||||
systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix {};
|
||||
systemd-initrd-luks-password = handleTest ./systemd-initrd-luks-password.nix {};
|
||||
systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
|
||||
|
|
45
nixos/tests/systemd-initrd-btrfs-raid.nix
Normal file
45
nixos/tests/systemd-initrd-btrfs-raid.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "systemd-initrd-btrfs-raid";
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
# Use systemd-boot
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 512 512 ];
|
||||
useBootLoader = true;
|
||||
useEFIBoot = true;
|
||||
};
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ btrfs-progs ];
|
||||
boot.initrd.systemd = {
|
||||
enable = true;
|
||||
emergencyAccess = true;
|
||||
};
|
||||
|
||||
specialisation.boot-btrfs-raid.configuration = {
|
||||
fileSystems = lib.mkVMOverride {
|
||||
"/".fsType = lib.mkForce "btrfs";
|
||||
};
|
||||
virtualisation.bootDevice = "/dev/vdc";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Create RAID
|
||||
machine.succeed("mkfs.btrfs -d raid0 /dev/vdc /dev/vdd")
|
||||
machine.succeed("mkdir -p /mnt && mount /dev/vdc /mnt && echo hello > /mnt/test && umount /mnt")
|
||||
|
||||
# Boot from the RAID
|
||||
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-btrfs-raid.conf")
|
||||
machine.succeed("sync")
|
||||
machine.crash()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
# Ensure we have successfully booted from the RAID
|
||||
assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1
|
||||
assert "/dev/vdc on / type btrfs" in machine.succeed("mount")
|
||||
assert "hello" in machine.succeed("cat /test")
|
||||
assert "Total devices 2" in machine.succeed("btrfs filesystem show")
|
||||
'';
|
||||
})
|
76
pkgs/applications/audio/ChowPhaser/default.nix
Normal file
76
pkgs/applications/audio/ChowPhaser/default.nix
Normal file
|
@ -0,0 +1,76 @@
|
|||
{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut
|
||||
, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext
|
||||
, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux
|
||||
, libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config
|
||||
, python3, sqlite, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ChowPhaser";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jatinchowdhury18";
|
||||
repo = "ChowPhaser";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-core
|
||||
curl
|
||||
dbus
|
||||
libepoxy
|
||||
freeglut
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
libXcursor
|
||||
libXdmcp
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXtst
|
||||
libdatrie
|
||||
libjack2
|
||||
libpsl
|
||||
libselinux
|
||||
libsepol
|
||||
libsysprof-capture
|
||||
libthai
|
||||
libxkbcommon
|
||||
pcre
|
||||
python3
|
||||
sqlite
|
||||
gcc-unwrapped
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
|
||||
"-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
|
||||
"-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/ChowPhaser/
|
||||
cd ChowPhaserMono_artefacts/Release
|
||||
cp libChowPhaserMono_SharedCode.a $out/lib
|
||||
cp -r VST3/ChowPhaserMono.vst3 $out/lib/vst3
|
||||
cp Standalone/ChowPhaserMono $out/bin
|
||||
cd ../../ChowPhaserStereo_artefacts/Release
|
||||
cp libChowPhaserStereo_SharedCode.a $out/lib
|
||||
cp -r VST3/ChowPhaserStereo.vst3 $out/lib/vst3
|
||||
cp Standalone/ChowPhaserStereo $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jatinchowdhury18/ChowPhaser";
|
||||
description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -14,28 +14,29 @@
|
|||
, ninja
|
||||
, openssl
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, sqlite
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, cmake
|
||||
, libshumate
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shortwave";
|
||||
version = "2.0.1";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Shortwave";
|
||||
rev = version;
|
||||
sha256 = "sha256-25qPb7qlqCwYJzl4qZxAZYx5asxSlXBlc/0dGyBdk1o=";
|
||||
sha256 = "sha256-qwk63o9pfqpAm6l9ioj3RccacemQU8R6LF6El4yHkjQ";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-00dQXcSNmdZb2nSLG3q7jm4sugF9XR4LbH0OmcuHVxA=";
|
||||
hash = "sha256-YrB322nv9CgZqt5//VMvVwjWA51ePlX2PI6raRJGBxA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -46,11 +47,11 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
|
|||
libadwaita
|
||||
openssl
|
||||
sqlite
|
||||
libshumate
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
|
@ -68,10 +70,6 @@ stdenv.mkDerivation rec {
|
|||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/World/Shortwave";
|
||||
description = "Find and listen to internet radio stations";
|
||||
|
@ -80,7 +78,6 @@ stdenv.mkDerivation rec {
|
|||
desktop. It is the successor to the older Gradio application.
|
||||
'';
|
||||
maintainers = with maintainers; [ lasandell ];
|
||||
broken = true; # incompatible with latest libadwaita
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
@ -17,6 +17,13 @@
|
|||
, vulkan-loader
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, openssl
|
||||
, libobjc
|
||||
, Security
|
||||
, CoreServices
|
||||
, ApplicationServices
|
||||
, Carbon
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -40,7 +47,12 @@ rustPlatform.buildRustPackage rec {
|
|||
copyDesktopItems
|
||||
];
|
||||
|
||||
# Get openssl-sys to use pkg-config
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
freetype
|
||||
fontconfig
|
||||
libxkbcommon
|
||||
|
@ -50,10 +62,17 @@ rustPlatform.buildRustPackage rec {
|
|||
libXrandr
|
||||
libXi
|
||||
vulkan-loader
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libobjc
|
||||
Security
|
||||
CoreServices
|
||||
ApplicationServices
|
||||
Carbon
|
||||
AppKit
|
||||
];
|
||||
|
||||
# Add missing vulkan dependency to rpath
|
||||
preFixup = ''
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce
|
||||
'';
|
||||
|
||||
|
@ -76,6 +95,5 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/lapce/lapce";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ elliot ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, python3, fetchPypi }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
let
|
||||
defaultOverrides = [
|
||||
|
@ -37,11 +41,12 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "archivy";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UNGl5Dl/E3+uQ4HIxzHYliHF4lqD3GYdeoL+DtqUwCo=";
|
||||
hash = "sha256-o5dVJDbdKgo6hMMU9mKzoouSgVWl7xSAp+Aq61VcfeU=";
|
||||
};
|
||||
|
||||
# Relax some dependencies
|
||||
|
@ -54,6 +59,7 @@ buildPythonApplication rec {
|
|||
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
|
||||
--replace 'requests ==' 'requests >=' \
|
||||
--replace 'validators ==' 'validators >=' \
|
||||
--replace 'flask-login == ' 'flask-login >= ' \
|
||||
--replace 'tinydb ==' 'tinydb >=' \
|
||||
--replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \
|
||||
--replace 'Flask ==' 'Flask >='
|
||||
|
|
|
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
|
||||
"$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib"
|
||||
|
|
|
@ -1,19 +1,17 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm";
|
||||
version = "3.8.1";
|
||||
gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37";
|
||||
pname = "kubernetes-helm";
|
||||
version = "3.8.2";
|
||||
gitCommit = "6e3701edea09e5d55a8ca2aae03a68917630e91b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY=";
|
||||
sha256 = "sha256-lFAzp7ZxyMZAEO1cNFkEPLgTLEGa6azv36xiTIz4FZY=";
|
||||
};
|
||||
vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0=";
|
||||
|
||||
doCheck = false;
|
||||
vendorSha256 = "sha256-FLEydmR+UEZ80VYLxBU1ZdwpdLgTjUpqiMItnt9UuLY=";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
ldflags = [
|
||||
|
@ -23,6 +21,19 @@ buildGoModule rec {
|
|||
"-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# skipping version tests because they require dot git directory
|
||||
substituteInPlace cmd/helm/version_test.go \
|
||||
--replace "TestVersion" "SkipVersion"
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
# skipping plugin tests on linux
|
||||
substituteInPlace cmd/helm/plugin_test.go \
|
||||
--replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \
|
||||
--replace "TestLoadPlugins" "SkipLoadPlugins"
|
||||
substituteInPlace cmd/helm/helm_test.go \
|
||||
--replace "TestPluginExitCode" "SkipPluginExitCode"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
$out/bin/helm completion bash > helm.bash
|
||||
|
@ -33,7 +44,8 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/kubernetes/helm";
|
||||
description = "A package manager for kubernetes";
|
||||
mainProgram = "helm";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man ];
|
||||
maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
|
|||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.37.5";
|
||||
version = "1.37.6";
|
||||
|
||||
goPackagePath = "github.com/docker-slim/docker-slim";
|
||||
|
||||
|
@ -14,7 +14,7 @@ buildGoPackage rec {
|
|||
owner = "docker-slim";
|
||||
repo = "docker-slim";
|
||||
rev = version;
|
||||
sha256 = "sha256-MBs0ybBXsanNFt6R7+ZYvtCh7iHE3FtWXE9uy9tbrE4=";
|
||||
sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Y3nn7q6wGBqWN2JxfpGYd/KDxW5yeuwkos0w1AENkJA=";
|
||||
sha256 = "sha256-x1iZP+dGHeWwIr/AwQr1rYSFECtM6iDXEq9DrGH5J+s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, urllib3
|
||||
, mock
|
||||
, setuptools
|
||||
, six
|
||||
, stone
|
||||
, pythonOlder
|
||||
, mock
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -20,29 +21,54 @@ buildPythonPackage rec {
|
|||
owner = "dropbox";
|
||||
repo = "dropbox-sdk-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pq/LkyOCS0PnujfN9aIx42aeZ8tw4XvRQ4Vid/nXgWE=";
|
||||
hash = "sha256-w07r95MBAClf0F3SICiZsHLdslzf+JuxC+BVdTACCog=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
urllib3
|
||||
mock
|
||||
setuptools
|
||||
six
|
||||
stone
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner == 5.2.0'," ""
|
||||
'';
|
||||
|
||||
# Set DROPBOX_TOKEN environment variable to a valid token.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dropbox"
|
||||
];
|
||||
|
||||
# Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.
|
||||
disabledTests = [
|
||||
"test_default_oauth2_urls"
|
||||
"test_bad_auth"
|
||||
"test_multi_auth"
|
||||
"test_refresh"
|
||||
"test_app_auth"
|
||||
"test_downscope"
|
||||
"test_rpc"
|
||||
"test_upload_download"
|
||||
"test_bad_upload_types"
|
||||
"test_clone_when_user_linked"
|
||||
"test_with_path_root_constructor"
|
||||
"test_path_root"
|
||||
"test_path_root_err"
|
||||
"test_versioned_route"
|
||||
"test_team"
|
||||
"test_as_user"
|
||||
"test_as_admin"
|
||||
"test_clone_when_team_linked"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Dropbox's HTTP-based Core and Datastore APIs";
|
||||
homepage = "https://github.com/dropbox/dropbox-sdk-python";
|
||||
|
|
|
@ -4,19 +4,23 @@
|
|||
, attrs
|
||||
, flake8
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, hypothesis
|
||||
, hypothesmith
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-bugbear";
|
||||
version = "22.3.23";
|
||||
version = "22.4.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s1EnPM2He+R+vafu14XI1Xuft8Rg6W3vPH2Atc6N7I0=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-y/hpBlIQ3aJj3Y1snpArOCIv2w1ncQNMSYJ+G0CeM84=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -32,9 +36,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for Flake8 to find bugs and design problems";
|
||||
homepage = "https://github.com/PyCQA/flake8-bugbear";
|
||||
changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log";
|
||||
description = ''
|
||||
longDescription = ''
|
||||
A plugin for flake8 finding likely bugs and design problems in your
|
||||
program.
|
||||
'';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pyaes
|
||||
, pysocks
|
||||
, async-lru
|
||||
|
@ -12,14 +12,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "1.4.16";
|
||||
version = "2.0.13";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Pyrogram";
|
||||
inherit version;
|
||||
hash = "sha256-ZYAPaAa92z3KtciVHOexdZf9bwZjKQ9WKg6+We0dW+Q=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyrogram";
|
||||
repo = "pyrogram";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8mnGfW8/2RbU4gFS8e72KAxMGGkb8XrhsyK01wD97rI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,26 +1,64 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27, mock, pytest, isort }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, importlib-metadata
|
||||
, isort
|
||||
, poetry-core
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-isort";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-T+Sybq0q93ZzDsI/WHDXQh81qs4ipBxOk4WG702Hh8s=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephrdev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gbEO3HBDeZ+nUACzpeV6iVuCdNHS5956wFzIYkbam+M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ isort ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ]
|
||||
++ lib.optionals isPy27 [ mock ];
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test -vs --cache-clear
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
isort
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Can be removed with the next release, https://github.com/stephrdev/pytest-isort/pull/44
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/stephrdev/pytest-isort/commit/f17ed2d294ae90e415d051e1c720982e3dd01bff.patch";
|
||||
sha256 = "sha256-PiOs0c61BNx/tZN11DYblOd7tNzGthNnlkmYMTI9v18=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_isort"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin to perform isort checks (import ordering)";
|
||||
homepage = "https://github.com/moccu/pytest-isort/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
37
pkgs/development/python-modules/rjpl/default.nix
Normal file
37
pkgs/development/python-modules/rjpl/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, requests
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rjpl";
|
||||
version = "0.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GLNIpZuM3yuCnPyjBa8KjdaL5cFK8InluuY+LTCrimc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rjpl"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for interacting with the Rejseplanen API";
|
||||
homepage = "https://github.com/tomatpasser/python-rejseplanen";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -38,6 +38,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
disabledTests = [
|
||||
"build" # needs network connection
|
||||
"test_all_estimators" # sklearn.exceptions.NotFittedError: Estimator fails to pass `check_is_fitted` even though it has been fit.
|
||||
];
|
||||
|
||||
# Check packages with cythonized modules
|
||||
|
|
|
@ -2,32 +2,56 @@
|
|||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, fetchPypi
|
||||
, wrapQtAppsHook
|
||||
|
||||
# propagates
|
||||
, pyasn1
|
||||
, pyasn1-modules
|
||||
, cxxfilt
|
||||
, msgpack
|
||||
, pycparser
|
||||
|
||||
# extras: gui
|
||||
, pyqt5
|
||||
, pyqtwebengine
|
||||
|
||||
# knobs
|
||||
, withGui ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vivisect";
|
||||
version = "1.0.7";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'cxxfilt>=0.2.1,<0.3.0' 'cxxfilt'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyasn1
|
||||
pyasn1-modules
|
||||
cxxfilt
|
||||
msgpack
|
||||
pycparser
|
||||
] ++ lib.optionals (withGui) passthru.extras-require.gui;
|
||||
|
||||
passthru.extras-require.gui = [
|
||||
pyqt5
|
||||
pyqtwebengine
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
sed "s@==.*'@'@" -i setup.py
|
||||
postFixup = ''
|
||||
wrapQtApp $out/bin/vivbin
|
||||
'';
|
||||
|
||||
# requires another repo for test files
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.176.2";
|
||||
version = "0.176.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/4wEafdmrXj4ALUVYx8DM9XyRP/wvbwAl0St1S/+9Ws=";
|
||||
sha256 = "sha256-ZjWIaZ4XT7v66ozjQu+ld0Tz2gVjQFUD6JoL1nW/DmE=";
|
||||
};
|
||||
|
||||
makeFlags = [ "FLOW_RELEASE=1" ];
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-remote";
|
||||
version = "2.3.6";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-geb7uHCBvhmqyaDr8wK9sQUcHT3xVgSclovFDpHhIiw=";
|
||||
sha256 = "sha256-5VxPCfartTRYCmjwNrH7SM0o7IQ4+Tq8Q2IM8hFWyVc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";
|
||||
|
|
|
@ -1,23 +1,30 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dapr";
|
||||
version = "1.1.0";
|
||||
|
||||
vendorSha256 = "0fng5a1pvpbwil79xapdalzgkgc9dwsdxs6bznjfwnkyd1vvw6fm";
|
||||
pname = "dapr-cli";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0x2mvlzlmcik6ys6xp722px9l4lj9ssyxb06bzxd7yj7m1wwcwp9";
|
||||
|
||||
owner = "dapr";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+P1oXG+uvnFDGis5pz9VUQ4n1C7mjuetXz1OtN7IIrg=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
vendorSha256 = "sha256-EvOyOy7DFQtFavOC9eBUZRJsj3pNdx7jumVmZ/THdaM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/dapr
|
||||
|
||||
installShellCompletion --cmd dapr \
|
||||
--bash <($out/bin/dapr completion bash) \
|
||||
--zsh <($out/bin/dapr completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/golang/protobuf";
|
||||
description = " Go bindings for protocol buffer";
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, git }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-license-detector";
|
||||
version = "3.1.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "src-d";
|
||||
owner = "go-enry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4";
|
||||
sha256 = "sha256-MubQpxpUCPDBVsEz4NmY8MFEoECXQtzAaZJ89vv5bDc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0gan5l7vsq0hixxcymhhs8p07v92w60r0lhgvrr9a99nic12vmia";
|
||||
vendorSha256 = "sha256-a9yCnGg+4f+UoHbGG8a47z2duBD3qXcAzPKnE4PQsvM=";
|
||||
|
||||
doCheck = false;
|
||||
checkInputs = [ git ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reliable project licenses detector";
|
||||
homepage = "https://github.com/src-d/go-license-detector";
|
||||
homepage = "https://github.com/go-enry/go-license-detector";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
mainProgram = "license-detector";
|
||||
|
|
|
@ -1,19 +1,24 @@
|
|||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mockgen";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "mock";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5Kp7oTmd8kqUN+rzm9cLqp9nb3jZdQyltGGQDiRSWcE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5gkrn+OxbNN8J1lbgbxM8jACtKA7t07sbfJ7gVJWpJM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "mockgen" ];
|
||||
|
||||
preCheck = ''
|
||||
export GOROOT="$(go env GOROOT)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GoMock is a mocking framework for the Go programming language";
|
||||
homepage = "https://github.com/golang/mock";
|
||||
|
|
|
@ -1,19 +1,17 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-doc-unstable";
|
||||
version = "1.5.0";
|
||||
pname = "protoc-gen-doc";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pseudomuto";
|
||||
repo = "protoc-gen-doc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bpb5wv76p0sjffh5d1frbygp3q1p07sdh5c8pznl5bdh5pd7zxq";
|
||||
sha256 = "sha256-19CN62AwqQGq5Gb5kQqVYhs+LKsJ9K2L0VAakwzPD5Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "08pk9nxsl28dw3qmrlb7vsm8xbdzmx98qwkxgg93ykrhzx235k1b";
|
||||
|
||||
doCheck = false;
|
||||
vendorSha256 = "sha256-K0rZBERSKob5ubZW28QpbcPhgFKOOASkd9UyC9f8gyQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Documentation generator plugin for Google Protocol Buffers";
|
||||
|
|
|
@ -53,8 +53,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
|
||||
--replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \
|
||||
--replace "Flask-Login>=0.3.2,<0.5.1" "Flask-Login>=0.3.2" \
|
||||
--replace "flask-wtf>=0.14.2,<0.16.0" "flask-wtf>=0.14.2" \
|
||||
--replace "lxml>=3.8.0,<4.7.0" "lxml>=3.8.0" \
|
||||
--replace "lxml>=3.8.0,<4.8.0" "lxml>=3.8.0" \
|
||||
--replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" \
|
||||
--replace "requests>=2.11.1,<2.25.0" "requests" \
|
||||
--replace "unidecode>=0.04.19,<1.3.0" "unidecode>=0.04.19"
|
||||
|
|
|
@ -10,9 +10,8 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
sha256 = "10dq42d3hb6a3ln3x1rag1lqzhwqb66xn4q8k4igjkn5my81nr6q";
|
||||
};
|
||||
vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp";
|
||||
|
||||
doCheck = false;
|
||||
vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The RPKI-to-Router server used at Cloudflare";
|
||||
|
|
|
@ -2146,7 +2146,8 @@
|
|||
praw
|
||||
];
|
||||
"rejseplanen" = ps: with ps; [
|
||||
]; # missing inputs: rjpl
|
||||
rjpl
|
||||
];
|
||||
"remember_the_milk" = ps: with ps; [
|
||||
httplib2
|
||||
]; # missing inputs: RtmAPI
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "routinator";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8rILHWxUrQQx/ZpZQECa3JBCGD+a5Po8jdqb/rTx6WA=";
|
||||
sha256 = "sha256-C6BY+Ba5KQgi+jMUKRi7osZNEDMLMDOhA4TQlbqb9jY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-TYVpi4ZyM0Nl2RWRMEwLM+TeAEzk1IUCQTXZLG92vt4=";
|
||||
cargoSha256 = "sha256-5ZBE7jbhO4j4FwGSXLIbYjmtmNxFpiME9JqXBqwHSUA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
@ -1,30 +1,51 @@
|
|||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "awslogs";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgebastida";
|
||||
repo = "awslogs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gyry8b64psvmjcb2lb3yilpa7b17yllga06svls4hi69arvrd8f";
|
||||
sha256 = "sha256-DrW8s0omQqLp1gaoR6k/YR11afRjUbGYrFtfYhby2b8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
boto3 termcolor python-dateutil docutils setuptools jmespath
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
boto3
|
||||
termcolor
|
||||
python-dateutil
|
||||
docutils
|
||||
setuptools
|
||||
jmespath
|
||||
];
|
||||
|
||||
checkInputs = [ python3Packages.pytestCheckHook ];
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "jmespath>=0.7.1,<1.0.0" "jmespath>=0.7.1"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_main_get_query"
|
||||
"test_main_get_with_color"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"awslogs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jorgebastida/awslogs";
|
||||
description = "AWS CloudWatch logs for Humans";
|
||||
maintainers = with maintainers; [ dbrock ];
|
||||
homepage = "https://github.com/jorgebastida/awslogs";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ dbrock ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "czkawka";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qarmin";
|
||||
repo = "czkawka";
|
||||
rev = version;
|
||||
sha256 = "sha256-UIgyKWMVSKAgUNqfxFYSfP+l9x52XAzrXr1nnfKub9I=";
|
||||
sha256 = "sha256-N7fCYcjhYlFVkvWdFpR5cu98Vy+jStlBkR/vz/k1lLY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jPrkNKFmdVk3LEa20jtXSx+7S98fSrX7Rt/lexC0Gwo=";
|
||||
cargoSha256 = "sha256-4L7OjJ26Qpl5YuHil7JEYU8xWH65jiyFz0a/ufr7wYQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dotter";
|
||||
version = "0.12.9";
|
||||
version = "0.12.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SuperCuber";
|
||||
repo = "dotter";
|
||||
rev = version;
|
||||
sha256 = "0rxinrm110i5cbkl7c7vgk7dl0x79cg6g23bdjixsg7h0572c2gi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uSM7M//3LHzdLSOruTyu46sp1a6LeodT2cCEFsuoPW4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0fr2dvzbpwqvf98wwrxv76nwbrv4m9ppx7br4x78gm8dhf2nj4zx";
|
||||
cargoHash = "sha256-JpMEC2HjAQLQiXHSE6L0HBDc0vLhd465wDK2+35aBXA=";
|
||||
|
||||
checkInputs = [ which ];
|
||||
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
sha256 = "sha256-0gBb/U7tNNSjazJE/Z2qAxHPX53wRSPMJ8rHc7HtCNg=";
|
||||
sha256 = "sha256-edRdnMNYB5N9v9QlfSFNqJl93X0rSCllmzSZO9+sCOg=";
|
||||
};
|
||||
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
|
|
|
@ -1,10 +1,15 @@
|
|||
diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile
|
||||
--- chntpw-140201.orig/Makefile 2014-02-01 20:54:37.000000000 +0400
|
||||
+++ chntpw-140201/Makefile 2014-08-03 20:26:56.497161881 +0400
|
||||
@@ -12,14 +12,13 @@
|
||||
|
||||
CC=gcc
|
||||
--- chntpw-140201.orig/Makefile 2014-02-01 17:54:37.000000000 +0100
|
||||
+++ chntpw-140201/Makefile 2022-04-21 00:14:45.000000000 +0200
|
||||
@@ -6,24 +6,7 @@
|
||||
# See INSTALL for more info.
|
||||
#
|
||||
|
||||
-#SSLPATH=/usr/local/ssl
|
||||
-OSSLPATH=/usr
|
||||
-OSSLINC=$(OSSLPATH)/include
|
||||
-
|
||||
-CC=gcc
|
||||
-
|
||||
-# Force 32 bit
|
||||
-CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32
|
||||
-OSSLLIB=$(OSSLPATH)/lib
|
||||
|
@ -13,13 +18,11 @@ diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile
|
|||
-#CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall
|
||||
-#OSSLLIB=$(OSSLPATH)/lib64
|
||||
-
|
||||
+ifeq '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu'
|
||||
+ CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall
|
||||
+ OSSLLIB=$(OSSLPATH)/lib64
|
||||
+else ifeq '$(shell gcc -dumpmachine)' 'i686-unknown-linux-gnu'
|
||||
+ CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32
|
||||
+ OSSLLIB=$(OSSLPATH)/lib
|
||||
+endif
|
||||
-
|
||||
-# This is to link with whatever we have, SSL crypto lib we put in static
|
||||
-#LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a
|
||||
-LIBS=-L$(OSSLLIB)
|
||||
+CFLAGS= -DUSEOPENSSL -g -I. -Wall
|
||||
|
||||
# This is to link with whatever we have, SSL crypto lib we put in static
|
||||
#LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a
|
||||
|
||||
all: chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static
|
||||
|
|
|
@ -1,20 +1,14 @@
|
|||
diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile
|
||||
--- chntpw-140201.orig/Makefile 2014-08-03 20:26:56.497161881 +0400
|
||||
+++ chntpw-140201/Makefile 2014-08-04 12:57:16.563818342 +0400
|
||||
@@ -10,6 +10,8 @@
|
||||
OSSLPATH=/usr
|
||||
OSSLINC=$(OSSLPATH)/include
|
||||
--- chntpw-140201/Makefile 2022-04-21 00:14:45.000000000 +0200
|
||||
+++ chntpw-140201.new/Makefile 2022-04-21 09:15:42.000000000 +0200
|
||||
@@ -6,10 +6,16 @@
|
||||
# See INSTALL for more info.
|
||||
#
|
||||
|
||||
+PREFIX ?= /usr
|
||||
+
|
||||
CC=gcc
|
||||
CFLAGS= -DUSEOPENSSL -g -I. -Wall
|
||||
|
||||
ifeq '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu'
|
||||
@@ -24,8 +26,12 @@
|
||||
#LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a
|
||||
LIBS=-L$(OSSLLIB)
|
||||
|
||||
+BINARIES := chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static
|
||||
+BINARIES := chntpw cpnt reged samusrgrp sampasswd
|
||||
|
||||
-all: chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static
|
||||
+all: $(BINARIES)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, unzip }:
|
||||
{ lib, stdenv, fetchurl, unzip, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chntpw";
|
||||
|
@ -11,11 +11,47 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
|
||||
|
||||
patches = [
|
||||
./00-chntpw-build-arch-autodetect.patch
|
||||
./01-chntpw-install-target.patch
|
||||
# Import various bug fixes from debian
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/04_get_abs_path";
|
||||
sha256 = "17h0gaczqd5b792481synr1ny72frwslb779lm417pyrz6kh9q8n";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/06_correct_test_open_syscall";
|
||||
sha256 = "00lg83bimbki988n71w54mmhjp9529r0ngm40d7fdmnc2dlpj3hd";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/07_detect_failure_to_write_key";
|
||||
sha256 = "0pk6xnprh2pqyx4n4lw3836z6fqsw3mclkzppl5rhjaahriwxw4l";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/08_no_deref_null";
|
||||
sha256 = "1g7pfmjaj0c2sm64s3api2kglj7jbgddjjd3r4drw6phwdkah0zs";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/09_improve_robustness";
|
||||
sha256 = "1nszkdy01ixnain7cwdmfbhjngphw1300ifagc1wgl9wvghzviaa";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/11_improve_documentation";
|
||||
sha256 = "0yql6hj72q7cq69rrspsjkpiipdhcwb0b9w5j8nhq40cnx9mgqgg";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/12_readonly_filesystem";
|
||||
sha256 = "1kxcy7f2pl6fqgmjg8bnl3pl5wgiw5xnbyx12arinmqkkggp4fa4";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/13_write_to_hive";
|
||||
sha256 = "1638lcyxjkrkmbr3n28byixny0qrxvkciw1xd97x48mj6bnwqrkv";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/chntpw/140201-1/debian/patches/14_improve_description";
|
||||
sha256 = "11y5kc4dh4zv24nkb0jw2zwlifx6nzsd4jbizn63l6dbpqgb25rs";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -27,6 +63,6 @@ stdenv.mkDerivation rec {
|
|||
description = "An utility to reset the password of any user that has a valid local account on a Windows system";
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
license = licenses.gpl2;
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3749,7 +3749,10 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
lapce = callPackage ../applications/editors/lapce { };
|
||||
lapce = callPackage ../applications/editors/lapce {
|
||||
inherit (darwin) libobjc;
|
||||
inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit;
|
||||
};
|
||||
|
||||
lcdproc = callPackage ../servers/monitoring/lcdproc { };
|
||||
|
||||
|
@ -25405,6 +25408,8 @@ with pkgs;
|
|||
|
||||
ChowKick = callPackage ../applications/audio/ChowKick { };
|
||||
|
||||
ChowPhaser = callPackage ../applications/audio/ChowPhaser { };
|
||||
|
||||
CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { };
|
||||
|
||||
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
|
||||
|
@ -34662,6 +34667,8 @@ with pkgs;
|
|||
|
||||
vivid = callPackage ../tools/misc/vivid { };
|
||||
|
||||
vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });
|
||||
|
||||
vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { };
|
||||
|
||||
vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng {
|
||||
|
|
|
@ -8957,6 +8957,8 @@ in {
|
|||
python3 = python;
|
||||
});
|
||||
|
||||
rjpl = callPackage ../development/python-modules/rjpl { };
|
||||
|
||||
rjsmin = callPackage ../development/python-modules/rjsmin { };
|
||||
|
||||
rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { };
|
||||
|
@ -10675,7 +10677,9 @@ in {
|
|||
|
||||
vispy = callPackage ../development/python-modules/vispy { };
|
||||
|
||||
vivisect = callPackage ../development/python-modules/vivisect { };
|
||||
vivisect = callPackage ../development/python-modules/vivisect {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
viv-utils = callPackage ../development/python-modules/viv-utils { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue