Merge master into haskell-updates
This commit is contained in:
commit
a6cc7c406e
|
@ -139,6 +139,16 @@
|
|||
githubId = 1714287;
|
||||
name = "Owen Shepherd";
|
||||
};
|
||||
_4825764518 = {
|
||||
email = "4825764518@purelymail.com";
|
||||
matrix = "@kenzie:matrix.kenzi.dev";
|
||||
github = "4825764518";
|
||||
githubId = 100122841;
|
||||
name = "Kenzie";
|
||||
keys = [{
|
||||
fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B";
|
||||
}];
|
||||
};
|
||||
_6AA4FD = {
|
||||
email = "f6442954@gmail.com";
|
||||
github = "6AA4FD";
|
||||
|
@ -11785,6 +11795,12 @@
|
|||
githubId = 3958212;
|
||||
name = "Tom Sorlie";
|
||||
};
|
||||
sioodmy = {
|
||||
name = "Antoni Sokołowski";
|
||||
email = "81568712+sioodmy@users.noreply.github.com";
|
||||
github = "sioodmy";
|
||||
githubId = 81568712;
|
||||
};
|
||||
schmitthenner = {
|
||||
email = "development@schmitthenner.eu";
|
||||
github = "fkz";
|
||||
|
|
|
@ -273,6 +273,14 @@
|
|||
<link xlink:href="options.html#opt-services.patroni.enable">services.patroni</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/prometheus-community/ipmi_exporter">Prometheus
|
||||
IPMI exporter</link>, an IPMI exporter for Prometheus.
|
||||
Available as
|
||||
<link linkend="opt-services.prometheus.exporters.ipmi.enable">services.prometheus.exporters.ipmi</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://writefreely.org">WriteFreely</link>,
|
||||
|
|
|
@ -97,6 +97,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul.
|
||||
Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- [Prometheus IPMI exporter](https://github.com/prometheus-community/ipmi_exporter), an IPMI exporter for Prometheus. Available as [services.prometheus.exporters.ipmi](#opt-services.prometheus.exporters.ipmi.enable).
|
||||
|
||||
- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
@ -8,23 +8,14 @@ let
|
|||
|
||||
makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x);
|
||||
|
||||
isUnicode = '' \
|
||||
LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive \
|
||||
LANG=${config.i18n.defaultLocale} \
|
||||
LC_IDENTIFICATION=${config.i18n.defaultLocale} \
|
||||
locale -k identification-codeset | grep -i UTF-8 \
|
||||
'';
|
||||
isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);
|
||||
|
||||
optimizedKeymap = pkgs.runCommand "keymap" {
|
||||
nativeBuildInputs = with pkgs.buildPackages; [ kbd locale ];
|
||||
nativeBuildInputs = [ pkgs.buildPackages.kbd ];
|
||||
LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**";
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
if ${isUnicode} ; then
|
||||
loadkeys -b -u "${cfg.keyMap}" > $out
|
||||
else
|
||||
loadkeys -b "${cfg.keyMap}" > $out
|
||||
fi
|
||||
loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out
|
||||
'';
|
||||
|
||||
# Sadly, systemd-vconsole-setup doesn't support binary keymaps.
|
||||
|
@ -139,7 +130,7 @@ in
|
|||
})
|
||||
|
||||
(mkIf setVconsole (mkMerge [
|
||||
{ environment.systemPackages = with pkgs; [ kbd locale ];
|
||||
{ environment.systemPackages = [ pkgs.kbd ];
|
||||
|
||||
# Let systemd-vconsole-setup.service do the work of setting up the
|
||||
# virtual consoles.
|
||||
|
@ -148,13 +139,8 @@ in
|
|||
environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share";
|
||||
|
||||
boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ''
|
||||
if ${isUnicode} ; then
|
||||
kbd_mode -u -C /dev/console
|
||||
printf "\033%%G" >> /dev/console
|
||||
else
|
||||
kbd_mode -a -C /dev/console
|
||||
printf "\033%%@" >> /dev/console
|
||||
fi
|
||||
kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
|
||||
printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console
|
||||
loadkmap < ${optimizedKeymap}
|
||||
|
||||
${optionalString cfg.earlySetup ''
|
||||
|
|
|
@ -36,6 +36,7 @@ let
|
|||
"fastly"
|
||||
"fritzbox"
|
||||
"influxdb"
|
||||
"ipmi"
|
||||
"json"
|
||||
"jitsi"
|
||||
"kea"
|
||||
|
@ -243,6 +244,22 @@ in
|
|||
|
||||
config = mkMerge ([{
|
||||
assertions = [ {
|
||||
assertion = cfg.ipmi.enable -> (cfg.ipmi.configFile != null) -> (
|
||||
!(lib.hasPrefix "/tmp/" cfg.ipmi.configFile)
|
||||
);
|
||||
message = ''
|
||||
Config file specified in `services.prometheus.exporters.ipmi.configFile' must
|
||||
not reside within /tmp - it won't be visible to the systemd service.
|
||||
'';
|
||||
} {
|
||||
assertion = cfg.ipmi.enable -> (cfg.ipmi.webConfigFile != null) -> (
|
||||
!(lib.hasPrefix "/tmp/" cfg.ipmi.webConfigFile)
|
||||
);
|
||||
message = ''
|
||||
Config file specified in `services.prometheus.exporters.ipmi.webConfigFile' must
|
||||
not reside within /tmp - it won't be visible to the systemd service.
|
||||
'';
|
||||
} {
|
||||
assertion = cfg.snmp.enable -> (
|
||||
(cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null)
|
||||
);
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
logPrefix = "services.prometheus.exporter.ipmi";
|
||||
cfg = config.services.prometheus.exporters.ipmi;
|
||||
in {
|
||||
port = 9290;
|
||||
|
||||
extraOpts = {
|
||||
configFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Path to configuration file.
|
||||
'';
|
||||
};
|
||||
|
||||
webConfigFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Path to configuration file that can enable TLS or authentication.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts.serviceConfig = {
|
||||
ExecStart = with cfg; concatStringsSep " " ([
|
||||
"${pkgs.prometheus-ipmi-exporter}/bin/ipmi_exporter"
|
||||
"--web.listen-address ${listenAddress}:${toString port}"
|
||||
] ++ optionals (cfg.webConfigFile != null) [
|
||||
"--web.config.file ${escapeShellArg cfg.webConfigFile}"
|
||||
] ++ optionals (cfg.configFile != null) [
|
||||
"--config.file ${escapeShellArg cfg.configFile}"
|
||||
] ++ extraFlags);
|
||||
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
}
|
|
@ -307,6 +307,19 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
ipmi = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-ipmi-exporter.service")
|
||||
wait_for_open_port(9290)
|
||||
succeed(
|
||||
"curl -sSf http://localhost:9290/metrics | grep 'ipmi_scrape_duration_seconds'"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
jitsi = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osdlyrics";
|
||||
version = "0.5.11";
|
||||
version = "0.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osdlyrics";
|
||||
repo = "osdlyrics";
|
||||
rev = version;
|
||||
sha256 = "sha256-VxLNaNe4hFwgSW4JEF1T4BWC2NwiOgfwVGiAIOszfGE=";
|
||||
sha256 = "sha256-QGgwxmurdwo0xyq7p+1xditRebv64ewGTvNJI7MUnq4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec {
|
|||
--replace share/pixmaps share/icons
|
||||
|
||||
cp requirements.in requirements.txt
|
||||
sed -i requirements.txt -e 's/^chromaprint$//'
|
||||
'' + lib.concatMapStringsSep "\n"
|
||||
(e: ''
|
||||
sed -i requirements.txt -e 's/^${e}.*/${e}/'
|
||||
|
@ -49,7 +50,6 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyacoustid
|
||||
chromaprint
|
||||
configobj
|
||||
levenshtein
|
||||
lxml
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
# DualShock 3 over USB
|
||||
KERNEL=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0268", MODE="0666"
|
||||
|
||||
# DualShock 3 over Bluetooth
|
||||
KERNEL=="hidraw*", KERNELS=="*054C:0268*", MODE="0666"
|
14
pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules
Normal file
14
pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules
Normal file
|
@ -0,0 +1,14 @@
|
|||
# DualShock 4 over USB
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", MODE="0666"
|
||||
|
||||
# DualShock 4 Wireless Adapter over USB
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", MODE="0666"
|
||||
|
||||
# DualShock 4 Slim over USB
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", MODE="0666"
|
||||
|
||||
# DualShock 4 over Bluetooth
|
||||
KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0666"
|
||||
|
||||
# DualShock 4 Slim over Bluetooth
|
||||
KERNEL=="hidraw*", KERNELS=="*054C:09CC*", MODE="0666"
|
|
@ -0,0 +1,5 @@
|
|||
# PS5 DualSense controller over USB hidraw
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", MODE="0660", TAG+="uaccess"
|
||||
|
||||
# PS5 DualSense controller over bluetooth hidraw
|
||||
KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess"
|
|
@ -70,6 +70,13 @@ gcc11Stdenv.mkDerivation {
|
|||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional waylandSupport wayland;
|
||||
|
||||
postInstall = ''
|
||||
# Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration
|
||||
install -D ${./99-ds3-controllers.rules} $out/etc/udev/rules.d/99-ds3-controllers.rules
|
||||
install -D ${./99-ds4-controllers.rules} $out/etc/udev/rules.d/99-ds4-controllers.rules
|
||||
install -D ${./99-dualsense-controllers.rules} $out/etc/udev/rules.d/99-dualsense-controllers.rules
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PS3 emulator/debugger";
|
||||
homepage = "https://rpcs3.net/";
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
, python3
|
||||
, zbar
|
||||
|
@ -21,7 +20,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
libsecp256k1_name =
|
||||
if stdenv.isLinux then "libsecp256k1.so.0"
|
||||
|
@ -38,7 +37,7 @@ let
|
|||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg=";
|
||||
sha256 = "wYblwD+ej65TVkYS7u5MiB37Ka8jENI3aoHi64xAFtU=";
|
||||
|
||||
postFetch = ''
|
||||
mv $out ./all
|
||||
|
@ -54,7 +53,7 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw=";
|
||||
sha256 = "pAhsHKIMCB3OutJTrgGNT9PKfTcXcgxUj/x16uBK2Is=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
@ -116,10 +115,6 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
pytestFlagsArray = [ "electrum/tests" ];
|
||||
|
||||
disabledTests = [
|
||||
"test_loop" # test tries to bind 127.0.0.1 causing permission error
|
||||
];
|
||||
|
||||
postCheck = ''
|
||||
$out/bin/electrum help >/dev/null
|
||||
'';
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "106.0.5249.21",
|
||||
"sha256": "0d3ha2r54sjx1rhaas0mrgk2dl4xvgb83r5pbq9qzh52z43ynmlv",
|
||||
"sha256bin64": "1lcfggqrzr8rbrayffgdygzx0g1i289zvg9fbq282p2x9nwb36cm",
|
||||
"version": "106.0.5249.30",
|
||||
"sha256": "11sn0syhxzjz4lcw09aifcnrj2nf72siqh8v60zx6cpqj8jpgk48",
|
||||
"sha256bin64": "13yg8kb1k3n2vgh5l71vjyx6jf5zsibn41wvqnk0qds0kq6vnxxm",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "8.1.1";
|
||||
version = "8.2.0";
|
||||
|
||||
ptFiles = stdenv.mkDerivation {
|
||||
name = "PacketTracer8Drv";
|
||||
|
@ -36,7 +36,7 @@ let
|
|||
dontUnpack = true;
|
||||
src = requireFile {
|
||||
name = "CiscoPacketTracer_${builtins.replaceStrings ["."] [""] version}_Ubuntu_64bit.deb";
|
||||
sha256 = "08c53171aa0257a64ae7de1540f242214033cfa4f879fbc9fed5cc0d32232abf";
|
||||
sha256 = "1b19885d59f6130ee55414fb02e211a1773460689db38bfd1ac7f0d45117ed16";
|
||||
url = "https://www.netacad.com";
|
||||
};
|
||||
|
||||
|
@ -108,7 +108,8 @@ let
|
|||
cp "${desktopItem}"/share/applications/* "$out/share/applications/"
|
||||
'';
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ciscoPacketTracer8";
|
||||
inherit version;
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "argocd-autopilot";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj-labs";
|
||||
repo = "argocd-autopilot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0UQpqQ0qvBuTGI6xG+y/f9JijA4CukdqvQbr0KFir1c=";
|
||||
sha256 = "sha256-qlxs0dafmGbJdsBgFJGpaEkcKVyOoSeiQknqzJwUs8A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2uMPj4/jluBW0N2+AyDb7QmuVwlCavfQZ3i2fg32m8o=";
|
||||
sha256 = "sha256-nbpRdAkctLiG/hP6vhfEimplAzzj70d5nnaFcJ1NykY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw=";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubespy";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "pulumi";
|
||||
repo = "kubespy";
|
||||
sha256 = "1xrwhxw2y0zpzsxp1rlm1wd0aqw6jda5ai5y1ards5djqsbsv87g";
|
||||
sha256 = "sha256-ChHrDAmPUjdyiF+XQONQMDN3UZQMM80BR+m+E8o3gnw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ajhbjs9ijpxp3svvj7pjiac78ps7vkqmqrizq18mllsry0m9pcl";
|
||||
vendorSha256 = "sha256-HmMh5jrRGs4rtN9GLddS9IwITyvVmOrL5TShhQeyxKU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+cipDqPsBrUw4Q3uDkV76buPWTgtJXnvFsEaqqifTH8=";
|
||||
sha256 = "sha256-MdKeczst9t7VOxTx4/cAfbEUFOCIS3jQRYJcCJ8AH0Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-58XLmJaE3g2KG9e4rOyO1ouBBlCGX96e8AWfr0XVHC4=";
|
||||
vendorSha256 = "sha256-rYPkY6dH4DJ6uwckTbohlutXNnlQBMODPKntu5EVVTY=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
--zsh <($out/bin/talosctl completion zsh)
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI for out-of-band management of Kubernetes nodes created by Talos";
|
||||
|
|
|
@ -169,8 +169,8 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.2.8";
|
||||
sha256 = "sha256-FJHZtYQHzRPWlSlXYu8mdd0YddIrBy8eBzhsvAHwfZw=";
|
||||
version = "1.2.9";
|
||||
sha256 = "sha256-Q5AJiFnbHXhIJP06SCJNvuMKGwEJUOsmueCI7QCeQlk=";
|
||||
vendorSha256 = "sha256-VKJ+aWZYD6N8HDJwUEtgWxoBMGOa27K9ze2RUJvuipc=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.24";
|
||||
version = "3.3.25";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AjYX9f7v6lxMO6vTjAanDMluvGDAvTwcvcq/fwMzSfk=";
|
||||
hash = "sha256-kfpri6AFNb9GcAIDVhFV1uSDSNNSopReWRKuvWifcTU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "psi-plus";
|
||||
version = "1.5.1633";
|
||||
version = "1.5.1640";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = version;
|
||||
sha256 = "sha256-kXdDxpIOcwcFy+OmsqlE8a19sGPfMNI08fMy5OFuP9w=";
|
||||
sha256 = "sha256-vzEZUY9EiOPWdk60EQneMDuX4IAQh4BbBh9MO3Fj04Y=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "2.9.33";
|
||||
version = "2.9.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-BK5fTPV4glBg4a4QI5L3ZBmWYGrfLDx6hAOzlNbMxJU=";
|
||||
sha256 = "sha256-oytnWzIsxLOeQvy1iSWysyMQuJ3vTnv7Ot9izOvgPHg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xBlGqHmAX08LlHmZ9Vr+j06Cf2soIPDFJKZh36ku8cw=";
|
||||
vendorSha256 = "sha256-1/EnIPUufPwJqH24mqok5ijMenaPUldHBx8dOydECj8=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
|
|
@ -12,20 +12,20 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pympress";
|
||||
version = "1.7.0";
|
||||
version = "1.7.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-AxH0PyAWYEEIqQAx9gG2eYyXMijLZGZqXkRhld32ieE=";
|
||||
sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
poppler_gi
|
||||
] ++ lib.optional withGstreamer libcanberra-gtk3;
|
||||
|
||||
|
|
24
pkgs/applications/science/math/qalculate-qt/default.nix
Normal file
24
pkgs/applications/science/math/qalculate-qt/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-qt";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7H1nQLJBiuTj/GwojfOPpRbDseOHvLa94LK+bXvLhws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [ libqalculate qtbase qttools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The ultimate desktop calculator";
|
||||
homepage = "http://qalculate.github.io";
|
||||
maintainers = with maintainers; [ _4825764518 ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
|
@ -11,3 +11,9 @@ thisroot () {
|
|||
}
|
||||
|
||||
postHooks+=(thisroot)
|
||||
|
||||
addRootInludePath() {
|
||||
addToSearchPath ROOT_INCLUDE_PATH $1/include
|
||||
}
|
||||
|
||||
addEnvHooks "$targetOffset" addRootInludePath
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "7.12.1";
|
||||
version = "7.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QfSk6K/Vpj3+k+5w0thiP9O4CTvL8JDRwj4lDSt2NnU=";
|
||||
hash = "sha256-JuoZ/xE3Z6uB7iJQj72l+VX0cHHi/ZV+6q3QZ/CYjAk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
, yajl
|
||||
, nixosTests
|
||||
, criu
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -39,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eirCENgt25VRPub7c9cxYQ1uFxYbzm75cJ1v4r6O/+k=";
|
||||
sha256 = "sha256-JO07bF2Xucz8lSvj7om17a/NT0I7Vru1vayZhPDFLIw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.62.2";
|
||||
version = "1.63.0";
|
||||
|
||||
goPackagePath = "github.com/aws/${pname}";
|
||||
subPackages = [ "agent" ];
|
||||
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
sha256 = "sha256-pxlszIIxq86Dnz+lnD8s9QUJSbx6lpMutHd7gXeqcJ4=";
|
||||
sha256 = "sha256-SDDfwFnnoq2fCeg+wfJsczXb4dDChgyfsNrZkwGMHCc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -12,8 +12,10 @@ in fetchFromGitHub {
|
|||
sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks=";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
install -Dm644 -t $out/share/fonts/opentype fonts/otf/*
|
||||
install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/*
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -8,9 +8,12 @@ in fetchzip rec {
|
|||
|
||||
url = "https://pcaro.es/d/otf-${name}.tar.gz";
|
||||
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile
|
||||
install -m444 -Dt $out/share/fonts/opentype *.otf
|
||||
install -m444 -Dt $out/share/fonts/opentype $out/*.otf
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
'';
|
||||
sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl";
|
||||
|
||||
|
|
|
@ -1,55 +1,55 @@
|
|||
{
|
||||
"3270" = "1bzrgc3iksm9n8gxljwbgzm0ch115vvafiwrih2n5caz8wvs86qn";
|
||||
"Agave" = "1xkl9xjqlm1g2864sf4z5bcxhfaxmszvhm4lbp6cnkzg0m1chypj";
|
||||
"AnonymousPro" = "1g8p6g9rfm7adazii5swrn1m0w733wlbclqq4r0xbykn1gdghbmz";
|
||||
"Arimo" = "01gijkyfs97ij7iraajgbkvhnj1cxjyppw9q5y67fwgz8wa22q2j";
|
||||
"AurulentSansMono" = "1hy8gf2h552vr4fnr53pn5biqnwakw15yqwlswi8g4l3jxp0f1xi";
|
||||
"BigBlueTerminal" = "0avczgq4dl1kgyp0c7j53asmqmggjd9cmcq190fc4n10d7g6n98w";
|
||||
"BitstreamVeraSansMono" = "1k01qsgsyqazlyl4z3qswq4rd8nh8ksarhrrjn1z88h150ynd3lh";
|
||||
"CascadiaCode" = "0r8c93f6ysqwl6bsb3avjnhx20fcxz6ng0mwddhcaz14dhl9y0q6";
|
||||
"CodeNewRoman" = "1b1lb66pxalhmr64y0vc75n1ngwkllsam771qwsjycr6crraqzjm";
|
||||
"Cousine" = "172aagpkfzdnja7dpvlampjzgw9w3r0pd8z0ppnkhj98xcpk680d";
|
||||
"DaddyTimeMono" = "1khfqbicxl19dh1hky541vk1n0j41w2qaxw4ih8z8hdzdwz8frz0";
|
||||
"DejaVuSansMono" = "1s40g91frl0ngak0q0qp0vh9nbkh22mlf25ly248aq46k3kqswv6";
|
||||
"DroidSansMono" = "1m2pnhs9rlf4kspxk0x3c22v0c1byidblmhm2b0kg284jjml9rql";
|
||||
"FantasqueSansMono" = "0yslgnr1gjqx4bm9ld7z9lmqqvivswqx5byilggr42v1m7dnayc1";
|
||||
"FiraCode" = "0bwfxrkpjpgh832bprch4kzrr03d0raf3cgl7n3w3n8a4d806hb3";
|
||||
"FiraMono" = "08swhnqyz334202dcd8dzjf800kd3n3dq26wajmcphlps269y2p6";
|
||||
"FontPatcher" = "1icakcp6p805d2afa5vaynrhyxsvl7p1j2dyfgxplqgsfclj2cs1";
|
||||
"Go-Mono" = "01yy8mcffa6pz6hj6cwrdlsqhc6fbsnd2npqzi8zlx32qdzsrkj3";
|
||||
"Gohu" = "0dyxam4rmpfjw59x5b2c1mdg3jcvjsgjcdpw83gih261d05kmx13";
|
||||
"Hack" = "0rjxy98b16qxam8nr00cj4cd82jq0r23p2wymn9g3vy6bl836bvl";
|
||||
"Hasklig" = "0qpq14allkr3x5i1sfbpaa9n6ilb6f9hy4z5r0i2vj1qbksbdffb";
|
||||
"HeavyData" = "1zk4vilqq1v5hw687an57mf1msrj6iyin1kbm4b38jcq1d7wc5sp";
|
||||
"Hermit" = "043hqz5mxjghpfg5kninavy6p24r4i4ryhj89bhpwrgq6vbpbk7l";
|
||||
"iA-Writer" = "0l3bbpdiw20vxqmpaf42zvcsj08hjl644qjkpp9z53a184jxsad5";
|
||||
"IBMPlexMono" = "00cib33fxwdq48b26hm3vg6svwmmpr7rb537002h21ykvyw7my2n";
|
||||
"Inconsolata" = "00y47m077pwhx4165ifgdqxbdsigy0y6f9p6y4py8qz8jnfimc9i";
|
||||
"InconsolataGo" = "103lf5dy65k6ik87sr91iji44ali81mf18af7vw8qr5w9j3v88m1";
|
||||
"InconsolataLGC" = "0f598lnywpv8s6m9dzhklk490f5lq5ykfxaql9q6yp5fg7d9pc6z";
|
||||
"Iosevka" = "14mk8n7w2mjdrwzz4hf3zdkqvkm2zkk3l91kx0lldyfyapdz0z1i";
|
||||
"JetBrainsMono" = "1f0x9zpmvsr4hmxchxpyy470qrcl232ljd13dhf6skm50702vpar";
|
||||
"Lekton" = "0zj7rvz9bi9apsb068vf04lhggif78s4mwvgi85vpi8wsncj2df5";
|
||||
"LiberationMono" = "0syx7jgglxvaif7rp0kh1ywyyza5frssd20zphj42bdf6pcladgm";
|
||||
"Lilex" = "0gxlmylri3251zd76hkql6ck7x07x5yn3jcbg8ccq1vnw402v1vl";
|
||||
"Meslo" = "160z4v8pvpqk1zw1flanspcdmjb5bdpfmhkz8gv6ywflmlhnf87s";
|
||||
"Monofur" = "125bnmz2a0xm1qcyqpf72cm44bw5rqf06mcp8n982md27lckypcn";
|
||||
"Monoid" = "1zr6wh3zkgm5azys75szbzagnkj840czzz50fs8j5vi2j5x1gqzx";
|
||||
"Mononoki" = "15g910k4w5gdd6c4hrnxapb2irbpnlx2yvhmifnmmisyrvzpqdg1";
|
||||
"MPlus" = "0f5s9jxk7c9g9h5vrfh4b14w5pfzpidna8k5zpaqj1xz8m80ry98";
|
||||
"NerdFontsSymbolsOnly" = "0qxx0p4fija26aqya8az9vjwprbncjdpl9cnl756ap8db8ymrf4q";
|
||||
"Noto" = "03q8sar4vw0fscrvmnphr82mgh6ijgmsmw04ci4x4kz0371zbvbs";
|
||||
"OpenDyslexic" = "13yg3skw55vi721mbymcnyxwmlf92jzwankj7ggf6fzmmw9r72j8";
|
||||
"Overpass" = "0rnwzvd1zfwybf1gvxbqac4nl2rb2fpdpjj86qrydrjnszd5r1rf";
|
||||
"ProFont" = "0fkhzkqs3srsdhi3rgpvsqdifhsbfydw8q5h2s40v6jqaq6i7pv0";
|
||||
"ProggyClean" = "0smdg5sawy5ykph0whj2q4s89c08czfdfp7w5ipc3pzq598d0ahz";
|
||||
"RobotoMono" = "0wy99prkr1anhc5d1gd4dbvvi2krhcjh4nx9ib2fvw374fmys4mx";
|
||||
"ShareTechMono" = "09xg72wgkgl68hygbzndvizjshnir661jwz0iyx0nhsqsmfpg8gh";
|
||||
"SourceCodePro" = "1g9kj8gpsc3lqj8cik7zisfsm28jvmh29r399wc4aaaz41hcpigr";
|
||||
"SpaceMono" = "128pg00ay5n2havfjk116a0gfqqdlm5xy30akgjszhgsnpfg214x";
|
||||
"Terminus" = "02yf6id9nnxm2li1s9izvcbqzrhznh1041lh604dvkxqnnriq6n4";
|
||||
"Tinos" = "0ksx8x4917kl7h6y4lk7mwq1s2ag5zjjyz9amc2w80qxfdqwgc1m";
|
||||
"Ubuntu" = "1mlkpsnwj5bgkw1671v939pnb1shk31nj6pm7p73bjrvihwgdbwz";
|
||||
"UbuntuMono" = "1g51a9giv096hnd7jr3xgbnhx7m4andfd0jm892f99n65fqy2x6y";
|
||||
"VictorMono" = "1gaf7ysd9gqhksbvb877n3qiki3iny2dgkfpgfwl4p8nzrxcn8jm";
|
||||
"3270" = "0k33cnwbsi9wkrmfm4ps455gg81ihlldmk5mk4k9p7bkvxzcgpb9";
|
||||
"Agave" = "1xnhl8idwx1ivj8k1dnz1ca4k1cx2irbazavr1b2zlixxbjq2vhq";
|
||||
"AnonymousPro" = "01ab38j5wnkjjfh91van4p7s3qb0rmdbcah9njmxj7swqr30q66r";
|
||||
"Arimo" = "0p3dh1sgpq1gjlz0blav8j5jf9gsrg4pg63qk0raw3kyzpwp9liq";
|
||||
"AurulentSansMono" = "06hi0xravvpmzww2i233jzf3nrqwkxmmybbpcamwswbgxg2sakc8";
|
||||
"BigBlueTerminal" = "0pizwa8mf2mlzh85zxfy0ns7rk1792fvjgj2ldvz4kryjj3sdi4f";
|
||||
"BitstreamVeraSansMono" = "1664srkg1i1n7w1iv93a25bg588qxqgpdnw1prf3gryl5zxj5wcd";
|
||||
"CascadiaCode" = "01q4kdmb6wz3rjph3i12i7rhiipj9vfzmlbxmvcmvxdvnq5g5x5l";
|
||||
"CodeNewRoman" = "0sw4hnr36l2yb3yhgxkmrn98ch6ywkxfqybv7vdqh1g44l81fx6z";
|
||||
"Cousine" = "1w2m7sgm0f9kzhbkd7hfb63n3y7kv4m3j97a52imp5sk6w4gc3w4";
|
||||
"DaddyTimeMono" = "1vs0cvdhyrn7dhd1q58bnpz5vk1i0bnx31ijydkpdl09y9nfg60q";
|
||||
"DejaVuSansMono" = "0hl4ajgqlx3vlgbdzm6817n3hq1xnyjj2gazv5xl7w3n98cvnpph";
|
||||
"DroidSansMono" = "14i1ssd2c67dnkg67lbv4dxsnidbg9fqnn4jn4bz7ll9yz3g1zmn";
|
||||
"FantasqueSansMono" = "1sfw2x9g30qbivn6ixlafazp2bcxndjy27wfc8xz8da7df14qdww";
|
||||
"FiraCode" = "1653r5bcsgkrxfncv02fpp4iw9k608hg6fnqg6s8mks2gip2w610";
|
||||
"FiraMono" = "1hrac6asm7rppm4nslfcr9vx53xhhyanqknqzcixf2zy19ggizr9";
|
||||
"FontPatcher" = "1s9mrm3bfs1s3syx4jbqgcc7f5dx7xand3cxdcqr8p002aba9ds9";
|
||||
"Go-Mono" = "00lcl89f3730mg4vvm4kj96v9q15wkpqqdhy5lhsxbrhzg4f3qxa";
|
||||
"Gohu" = "1nv2s3x40rdj5bc8w65y0gbjwdxwa2fvkbxvqqaqn3slylcx95w7";
|
||||
"Hack" = "1csr6gfkfc1zq7r6kq851apd9yy7vlyqa06dx8q4h7ym11nin0qz";
|
||||
"Hasklig" = "00jm7dfh66ip8cmrxq9fq60hhncivijjvyayx5yc63y1vzfgp08s";
|
||||
"HeavyData" = "12pm75w65mgjmmkfxbqv5k78k7jnvpmphywpc6k852wj72f09dl1";
|
||||
"Hermit" = "0mqy6c94smi900zhc1liml8z4h1a5if9n0fvd0afiidpmpb7x02l";
|
||||
"iA-Writer" = "173wdcqw7aqwnsrg1af902fa4jvyix35n0a4cwabbj4x28516liq";
|
||||
"IBMPlexMono" = "0fadrcjiribzk3vcc3k80bddffr63b28ikrv9qrppbkwc846xiq5";
|
||||
"Inconsolata" = "18sndnds39j7af8hj1v20jky79mln50l6rab60fgq8a5v01kbkls";
|
||||
"InconsolataGo" = "1gbbbgyka597ygmdxd65hphsvhx1rp0g13hsr2r88rw08iavqg16";
|
||||
"InconsolataLGC" = "1izxzlsgdiz10rbf0kbrcjc8cy7nvsnkcb4fpcq4k95n7kl6mpck";
|
||||
"Iosevka" = "0cb9qpnnr5n0h628xv7b2ir76j1mcz9rscx9prqavasnhz963in9";
|
||||
"JetBrainsMono" = "0yzfha4i7di90631axyqcqgbc95x3lhnp6l3a36rw5qx11c6r6wb";
|
||||
"Lekton" = "04sgkdds9cgw60z0a2gb13sfm0vkiv172j9biv9f0a70bn0bxkda";
|
||||
"LiberationMono" = "0aq2bjkxic78d59zn9wqnjb9yqmpr1w19lm73wh5xssaqbxr590n";
|
||||
"Lilex" = "0b56dq7nfmx8l47cgx6p39vbhnhf0w0kh06s6zavrgv0v6g2h0rg";
|
||||
"Meslo" = "0wjfd1kf442cw1c1zqjydf8pg2ajl2h0is3ilnvbyi1d8jr3pp59";
|
||||
"Monofur" = "1lmkaz72yc6azk32qbcv34bwj3fwkdh2dy4ik0zaxbld186gmwyi";
|
||||
"Monoid" = "0kay83hwbl5k2kl8ms34m5bidigclrf3cppxh73w6y82y8vgi2wz";
|
||||
"Mononoki" = "01cxiimrsk8bznv7jbnvl1klyva6f91s7rn1sl0wzj0sjxli9lnn";
|
||||
"MPlus" = "1z1r7i1fpbglkplpllljakms5080vzqz2yjx5f3xyggixj9c1gnw";
|
||||
"NerdFontsSymbolsOnly" = "1nb9bhl16lwvr58phcj0hyrzdxqv45gycj6a1nl95pcqy76a06zz";
|
||||
"Noto" = "1wjz60pjs6h1wkwrblw3afs6bafj8zmdy3fan9xlrmh9wp15l0qg";
|
||||
"OpenDyslexic" = "07q50mdg6axs5957h0ggn6krk9hcxiyr2fh9cfw1ybnh979425fx";
|
||||
"Overpass" = "0kxw9qqp9a9nh5ir0ll34965k15nyrs708ffry6bvccy6sl723n4";
|
||||
"ProFont" = "04dy3rngh4c4a2yy8b6pyh0ck6xmiwxwhbbgm77bdspp40b5m9bc";
|
||||
"ProggyClean" = "0jzs0qiav8fqiz69djl14sa06j5q3mcnprwl52gki3wbbp0inshr";
|
||||
"RobotoMono" = "1grszlqbwdb27d02g4gcyiqbz2sigzqhs0m3fvapq7by9pp2cwq6";
|
||||
"ShareTechMono" = "1m3hy87wbxdf2zljygns9876m30xkvf81vcv2fvd0kg79lll84vp";
|
||||
"SourceCodePro" = "0cf7a1v5hi7wg50wh886d84fql4jbm504v1mzkzdwfy70j7l8dm7";
|
||||
"SpaceMono" = "1a3srh177r80190sa4jswp2paqasv0fsx09i2vkzqms07pd69j7p";
|
||||
"Terminus" = "1qa9hjjjw3xn4qk5sqifxd87q5xgawwd9d2yh62b9n1rpgi37cip";
|
||||
"Tinos" = "14kpcimzrx1zzv4y0w78n2kdl83hm33vmprikg1cmbbypn0k2d9y";
|
||||
"Ubuntu" = "0hc71ybi7bnbblzzn86p4l8waagzgqsa5q1pfgm534j1bhn3gr02";
|
||||
"UbuntuMono" = "0mjcyriww7j0gc2lsmxn266x2jlly2hzzl2l70ywj83wxkv0qnva";
|
||||
"VictorMono" = "0n46glk3036i9cjz8gnlmlyx4p7ynk10i647q1zdjlsnk6yiy9i1";
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
"2.2.1"
|
||||
"2.2.2"
|
||||
|
|
|
@ -11,8 +11,10 @@ in fetchFromGitHub {
|
|||
sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I=";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix
|
||||
install -Dm0444 $out/public_suffix_list.dat $out/tests/test_psl.txt -t $out/share/publicsuffix
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
, coccinelle
|
||||
, pkg-config
|
||||
, gnome
|
||||
, update-script-combinators
|
||||
, _experimental-update-script-combinators
|
||||
, python3
|
||||
, gobject-introspection
|
||||
, gettext
|
||||
|
@ -158,9 +158,9 @@ stdenv.mkDerivation rec {
|
|||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
updateGsettingsPatch = update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
|
||||
updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
|
||||
in
|
||||
update-script-combinators.sequence [
|
||||
_experimental-update-script-combinators.sequence [
|
||||
updateSource
|
||||
updateGsettingsPatch
|
||||
];
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-dash-to-dock";
|
||||
version = "72";
|
||||
version = "73";
|
||||
|
||||
# Temporarily switched to commit hash because stable version is buggy.
|
||||
src = fetchFromGitHub {
|
||||
owner = "micheleg";
|
||||
repo = "dash-to-dock";
|
||||
rev = "extensions.gnome.org-v${version}";
|
||||
sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw=";
|
||||
sha256 = "/NOJWjotfYPujS5G7/zv1OLzfSW0MB+oIRsx9/LSEdA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aisleriot";
|
||||
version = "3.22.24";
|
||||
version = "3.22.25";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-G3JSqrHc2ca32RZOO6gFY8iVlEFX+kukZDcTb8O5UHk=";
|
||||
sha256 = "sha256-ur29fKSYRGzQBv14L5efN+UuAdTE8e8ooop6DGvO+Rg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "closure-compiler";
|
||||
version = "20220803";
|
||||
version = "20220905";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
|
||||
sha256 = "sha256-1h+/i2csV/rCdMVOFsoNG/HrzGfUPPEEfAeRUKnPNSs=";
|
||||
sha256 = "sha256-+1f6ILeoMO+6a+uL3y95PAbcyr2KXh0yMQfzsUcCg0E=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -32,13 +32,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "terra";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terralang";
|
||||
repo = "terra";
|
||||
rev = "release-${version}";
|
||||
sha256 = "080h718y3r3ca6jlxc985g3dac4q5ysqcalg3h0jl9bxm6rssv50";
|
||||
sha256 = "1bs76ibzb469rlqs7slw8pm65csjq1nf0lqh6i9kcvbzavmdfds7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A low-level counterpart to Lua";
|
||||
homepage = "https://terralang.org/";
|
||||
platforms = platforms.x86_64 ++ platforms.linux;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "0.9.160";
|
||||
version = "0.9.162";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-mLP9Jg18iNj4FMDAoa9n3jf5A3G+JekywDJBHM4HEwc=";
|
||||
sha256 = "sha256-eSn3E5opJO+7dVay+j5xEkCIKJvmymozZGVD+vAzO4A=";
|
||||
};
|
||||
|
||||
executable = "bb";
|
||||
|
|
|
@ -167,10 +167,10 @@ in {
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "7";
|
||||
patch = "13";
|
||||
patch = "14";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q=";
|
||||
sha256 = "sha256-QVeuMeuBrxnoHDaIJhBJGw+49Q4A+ooXsJXIiQi5xFw=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
@ -180,10 +180,10 @@ in {
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
patch = "13";
|
||||
patch = "14";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c=";
|
||||
sha256 = "sha256-XXfieCcbqAPpkJpBpPO6ygBhgck62mgqXl/o3EokxfM=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
|
@ -20,14 +20,14 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "3.1.3";
|
||||
version = "3.1.4";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fcft";
|
||||
rev = version;
|
||||
sha256 = "sha256-HDXq9/otJc64AHRNERyzLyurMH89ijT1NRPjp1+T0GY=";
|
||||
sha256 = "sha256-kSzUZR/5PcYTxPWNh/zAwLQbfeW/44u2elEmGR3NYcM=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsasl";
|
||||
version = "1.10.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM=";
|
||||
sha256 = "sha256-Mix1QgCIQbzYukrgkzsiAhHRkKe1anDdYfZVbezAG3o=";
|
||||
};
|
||||
|
||||
buildInputs = [ libidn libkrb5 ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration
|
||||
, withJava ? false, jdk, ant
|
||||
, withAACS ? false, libaacs
|
||||
, withBDplus ? false, libbdplus
|
||||
|
@ -20,6 +20,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./BDJ-JARFILE-path.patch
|
||||
(fetchpatch {
|
||||
name = "Initial-support-for-Java-18.patch";
|
||||
url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch";
|
||||
hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch";
|
||||
url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch";
|
||||
hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ]
|
||||
|
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "0.15.1b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz";
|
||||
url = "mirror://sourceforge/mad/libid3tag-${version}.tar.gz";
|
||||
sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151";
|
||||
};
|
||||
|
||||
|
|
80
pkgs/development/libraries/openturns/default.nix
Normal file
80
pkgs/development/libraries/openturns/default.nix
Normal file
|
@ -0,0 +1,80 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, swig
|
||||
, boost
|
||||
, spectra
|
||||
, libxml2
|
||||
, tbb
|
||||
, hmat-oss
|
||||
, nlopt
|
||||
, cminpack
|
||||
, ceres-solver
|
||||
, dlib
|
||||
, hdf5
|
||||
, primesieve
|
||||
, pagmo2
|
||||
, ipopt
|
||||
, Accelerate
|
||||
# tests take an hour to build on a 48-core machine
|
||||
, runTests ? false
|
||||
, enablePython ? false
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openturns";
|
||||
version = "1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openturns";
|
||||
repo = "openturns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hSvhKx7Ke5PXPYGcn9OJvq7YooAbHrbP6TdLZBotriE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx;
|
||||
buildInputs = [
|
||||
swig
|
||||
boost
|
||||
spectra
|
||||
libxml2
|
||||
tbb
|
||||
hmat-oss
|
||||
nlopt
|
||||
cminpack
|
||||
ceres-solver
|
||||
dlib
|
||||
hdf5
|
||||
primesieve
|
||||
pagmo2
|
||||
ipopt
|
||||
] ++ lib.optionals enablePython [
|
||||
python3Packages.python
|
||||
python3Packages.matplotlib
|
||||
python3Packages.psutil
|
||||
python3Packages.dill
|
||||
] ++ lib.optional stdenv.isDarwin Accelerate;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOPENTURNS_SYSCONFIG_PATH=$out/etc"
|
||||
"-DCMAKE_UNITY_BUILD=ON"
|
||||
"-DCMAKE_UNITY_BUILD_BATCH_SIZE=32"
|
||||
"-DSWIG_COMPILE_FLAGS='-O1'"
|
||||
"-DUSE_SPHINX=${if enablePython then "ON" else "OFF"}"
|
||||
"-DBUILD_PYTHON=${if enablePython then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
doCheck = runTests;
|
||||
|
||||
checkTarget = "tests check";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multivariate probabilistic modeling and uncertainty treatment library";
|
||||
license = with licenses; [ lgpl3 gpl3 ];
|
||||
homepage = "https://openturns.github.io/www/";
|
||||
maintainers = with maintainers; [ gdinh ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -6,6 +6,8 @@
|
|||
, ipopt
|
||||
, boost
|
||||
, tbb
|
||||
# tests pass but take 30+ minutes
|
||||
, runTests ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -20,24 +22,29 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ eigen nlopt ipopt boost tbb ];
|
||||
buildInputs = [ eigen nlopt boost tbb ] ++ lib.optional (!stdenv.isDarwin) ipopt;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPAGMO_BUILD_TESTS=no"
|
||||
"-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}"
|
||||
"-DPAGMO_WITH_EIGEN3=yes"
|
||||
"-DPAGMO_WITH_NLOPT=yes"
|
||||
"-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt.so"
|
||||
"-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-DPAGMO_WITH_IPOPT=yes"
|
||||
"-DCMAKE_CXX_FLAGS='-fuse-ld=gold'"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# FIXME: fails ipopt test with Invalid_Option on darwin, so disable.
|
||||
"-DPAGMO_WITH_IPOPT=no"
|
||||
"-DLLVM_USE_LINKER=gold"
|
||||
];
|
||||
|
||||
# tests pass but take 30+ minutes
|
||||
doCheck = false;
|
||||
doCheck = runTests;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://esa.github.io/pagmo2/";
|
||||
description = "Scientific library for massively parallel optimization";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,12 +6,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vmime";
|
||||
version = "0.9.2";
|
||||
# XXX: using unstable rev for now to comply with the removal of
|
||||
# deprecated symbols in the latest release of gsasl
|
||||
version = "unstable-2022-03-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kisli";
|
||||
repo = "vmime";
|
||||
rev = "v${version}";
|
||||
sha256 = "1304n50ny2av8bagjpgz55ag0nd7m313akm9bb73abjn6h5nzacv";
|
||||
rev = "fc69321d5304c73be685c890f3b30528aadcfeaf";
|
||||
sha256 = "sha256-DUcGQcT7hp5Rs2Z5C8wo+3BYwWqED0KrF3h3vgLiiow=";
|
||||
};
|
||||
|
||||
buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ];
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "pdepend";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar";
|
||||
sha256 = "sha256-3jZAhOw9wfR9Fl6Mlj8o0uinjUZO46CAHRkZxrQP5rU=";
|
||||
sha256 = "sha256-FiCqXQenr4PJ2KydRlKv66xWoi55LTOEunK0m5oxrjA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
# wrapped to be able to find aioconsole and any other packages.
|
||||
buildPythonPackage rec {
|
||||
pname = "aioconsole";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "vxgmichel";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-/20FR7yc2aMA9cL3l7XAL/kak3cBBTniAICLC/TOI+U=";
|
||||
sha256 = "sha256-PSXYXIWb2zTVC6kwMgkDovF+BVtEnqQh8NFPb96tFRY=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.8.2";
|
||||
version = "0.8.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k47cXi2CDtFIV3gzfdYU4i17ry0ABXcWK5CcWhwTdT0=";
|
||||
hash = "sha256-r5bBomAoRwlII8pT/2o+0va/oBr3s8b8v2jq9n6WDwI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,29 +1,31 @@
|
|||
{ stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }:
|
||||
|
||||
let ext = if stdenv.isDarwin then "dylib" else "so";
|
||||
in buildPythonPackage rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "bitcoinlib";
|
||||
version = "0.11.0";
|
||||
version = "0.11.2";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "petertodd";
|
||||
repo = "python-bitcoinlib";
|
||||
rev = "python-${pname}-v${version}";
|
||||
sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm";
|
||||
owner = "petertodd";
|
||||
repo = "python-bitcoinlib";
|
||||
rev = "refs/tags/python-bitcoinlib-v${version}";
|
||||
sha256 = "sha256-/VgCTN010W/Svdrs0mGA8W1YZnyTHhcaWJKgP/c8CN8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bitcoin/core/key.py --replace \
|
||||
"ctypes.util.find_library('ssl') or 'libeay32'" \
|
||||
"'${lib.getLib openssl}/lib/libssl.${ext}'"
|
||||
"'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = src.meta.homepage;
|
||||
pythonImportsCheck = [ "bitcoin" "bitcoin.core.key" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/petertodd/python-bitcoinlib";
|
||||
description = "Easy interface to the Bitcoin data structures and protocol";
|
||||
license = with lib.licenses; [ lgpl3 ];
|
||||
maintainers = with lib.maintainers; [ jb55 ];
|
||||
changelog = "https://github.com/petertodd/python-bitcoinlib/raw/${src.rev}/release-notes.md";
|
||||
license = with licenses; [ lgpl3Plus ];
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "croniter";
|
||||
version = "1.3.5";
|
||||
version = "1.3.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dZL8DooA2Cr5jfonaLdZg7b7TCrcj20NfJMacVt87+4=";
|
||||
hash = "sha256-cu940PgzfrNTk7iJPr+/vrNA8tKuR+DS14Ew40sN2Lk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
23
pkgs/development/python-modules/django-stubs-ext/default.nix
Normal file
23
pkgs/development/python-modules/django-stubs-ext/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ buildPythonPackage, django, fetchPypi, lib, typing-extensions }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-stubs-ext";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-m9dBg3arALf4jW1Wvp/s6Fv6DHw0isYhFV+k16kRRvI=";
|
||||
};
|
||||
|
||||
# setup.cfg tries to pull in nonexistent LICENSE.txt file
|
||||
postPatch = "rm setup.cfg";
|
||||
|
||||
propagatedBuildInputs = [ django typing-extensions ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extensions and monkey-patching for django-stubs";
|
||||
homepage = "https://github.com/typeddjango/django-stubs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elohmeier ];
|
||||
};
|
||||
}
|
38
pkgs/development/python-modules/django-stubs/default.nix
Normal file
38
pkgs/development/python-modules/django-stubs/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ buildPythonPackage
|
||||
, django
|
||||
, django-stubs-ext
|
||||
, fetchPypi
|
||||
, lib
|
||||
, mypy
|
||||
, tomli
|
||||
, types-pytz
|
||||
, types-pyyaml
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-stubs";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6os10NpJ97LumaeRJfGUPgM0Md0RRybWZDzDXeYZIw4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django-stubs-ext
|
||||
mypy
|
||||
tomli
|
||||
types-pytz
|
||||
types-pyyaml
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PEP-484 stubs for Django";
|
||||
homepage = "https://github.com/typeddjango/django-stubs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elohmeier ];
|
||||
};
|
||||
}
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Eve";
|
||||
version = "2.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-KVKUSPGGLXOusflL4OjzXdJDGi66q+895qvtaBrSFG8=";
|
||||
sha256 = "sha256-34dfYd1DSMAHSB0w6T8YPSQA3GUCgcNEFOD5sM+SapQ=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-plugins";
|
||||
version = "1.6.8";
|
||||
version = "1.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_plugins";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-nRt2rcP/UldnNzDxANQDCzuqkFCU4LQxfWarqyc5a5Y=";
|
||||
hash = "sha256-KAfy2AQWZYFT/+rX8dNe8aWTFI0kkGg5IaSHhwYGk3A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -52,6 +52,9 @@ buildPythonPackage rec {
|
|||
# Fail because of missing faraday
|
||||
"test_detect_report"
|
||||
"test_process_report_summary"
|
||||
# JSON parsing issue
|
||||
"test_process_report_ignore_info"
|
||||
"test_process_report_tags"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastbencode";
|
||||
version = "0.0.9";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pQhjLGRfLj/7tJhMtUQDXIlG1v7Iz+CuxeVWNAdzzpw=";
|
||||
sha256 = "sha256-hMLS59/BlzK7aPoTWN5YgE77xEBBYpvYurUD98XqkDI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.5.23";
|
||||
version = "1.5.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-Zf2+GOyLQelFR0gugSzHWJV9WSKD/8IEkc4li4N+jnI=";
|
||||
sha256 = "sha256-wlwpw6ELRsORQDs/TC+J3vIR84Te8FE9qec3NLyhFY8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
{ buildPythonPackage, fetchPypi
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, atpublic
|
||||
, pdm-pep517
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flufl.i18n";
|
||||
version = "4.1";
|
||||
version = "4.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ pdm-pep517 ];
|
||||
|
@ -17,6 +19,14 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-efEJ5rJXR7L0Lyh1loXC4h2ciGfXCJGD6iKyQuEph+E=";
|
||||
sha256 = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high level API for internationalizing Python libraries and applications";
|
||||
homepage = "https://gitlab.com/warsaw/flufl.i18n";
|
||||
changelog = "https://gitlab.com/warsaw/flufl.i18n/-/raw/${version}/docs/NEWS.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.28.30";
|
||||
version = "0.28.32";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ujox3Q8oyPw8+SBdF9O7ezu8FC/NnWxeSGW8Nfh7tZ8=";
|
||||
sha256 = "sha256-YZ0ox04xakpazOIAERM2EO5c4PzmaSwYWULSjp0MJbw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "huggingface-hub";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "huggingface_hub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XerI4dkGsnxbOE1Si70adVIwLIrStZ3HSuQPAQoJtnQ=";
|
||||
hash = "sha256-/FUr66lj0wgmuLcwc84oHKBGzU8jFnBVMOXk7uKUpSk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jq";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hqzixD8XtaZKOIh+3nLHuM4qsLz6ge4o/2Q06TUBCr4=";
|
||||
sha256 = "sha256-15bXqaa6c6RMoHKqUAcOhPrhMBbqYHrDdnZAaFaHElc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "3.4.5";
|
||||
version = "3.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ry9reZbHX2mRWSSDwm2f4gWlmnHMvOFYQkABVdxk9Zs=";
|
||||
sha256 = "sha256-41mci8dM7gZBFfluOIzSeipyUbHcAvStG/in/1Jw8Xk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathable";
|
||||
version = "0.4.0";
|
||||
version = "0.4.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "p1c2u";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-3qekweG+o7f6nm1cnCEHrWYn/fQ42GZrZkPwGbZcU38=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pure-cdb";
|
||||
version = "3.1.1";
|
||||
version = "4.0.0";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
# Archive on pypi has no tests.
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbayles";
|
||||
repo = "python-pure-cdb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/FAe4NkY5unt83BOnJ3QqBJFQCPdQnbMVl1fSZ511Fc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7zxQO+oTZJhXfM2yijGXchLixiQRuFTOSESVlEc+T0s=";
|
||||
};
|
||||
|
||||
checkInputs = [ flake8 ];
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LwlUib/CeVCCmgpTHtYHcFyxk9Esx1zhZ3yGHeGpugY=";
|
||||
hash = "sha256-YTcK5UCE6AuGk3iyhLOeqdl0rb8ccOhBRJEew40Rris=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysnmplib";
|
||||
version = "5.0.17";
|
||||
version = "5.0.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "pysnmp";
|
||||
repo = "pysnmp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RG8EJmNDXRozlFx76c7p4wILwkatHg/eAhVojp807uQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sruZWwvcpAACRPXAN+WKFsdOr9EXo4Ipu8H5I22iuRg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
55
pkgs/development/python-modules/sensorpro-ble/default.nix
Normal file
55
pkgs/development/python-modules/sensorpro-ble/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, bluetooth-data-tools
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensorpro-ble";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B5WtOl1Va2rqm6PZEUCYakN7mE2zz/edGj+TtwDcS+Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-data-tools
|
||||
bluetooth-sensor-state-data
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sensorpro_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Sensorpro BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/sensorpro-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
55
pkgs/development/python-modules/tilt-ble/default.nix
Normal file
55
pkgs/development/python-modules/tilt-ble/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tilt-ble";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-inr2cPl627w2klSqScMg3dvofIkX3hGb44+Go6ah/6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=tilt_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tilt_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Tilt BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/tilt-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "versioneer";
|
||||
version = "0.25";
|
||||
version = "0.26";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mo1axyDGbgmawguk+8LPAKXyuxYU3on0TIKTWsUQuuE=";
|
||||
hash = "sha256-hPxymqKW0dJmRaj2LxeAGYhf9vmhBzsppKIoJwrFJXs=";
|
||||
};
|
||||
|
||||
# Couldn't get tests to work because, for instance, they used virtualenv and
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazelisk";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4Xtopf+4WtD29eCyjbQfQjxVYZIDZ4JvB8UOXDn9rwg=";
|
||||
sha256 = "sha256-/6px3S03HJ5W03phGzJTzZ0ROcfA9eKXP+xfBrix1DM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-Zlk6wUQBftst8Tx+dAT67/WBID1BHD4aSAvRcGO9ErE=";
|
||||
sha256 = "sha256-MCZW642cjuC0XQ0MXnLlyQEJft3z1gaZaXYD1qIiffg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deadnix";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astro";
|
||||
repo = "deadnix";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a3zEPblkvj9cjGEQB6LKqB+h8C2df7p+IgkwqsUptmY=";
|
||||
sha256 = "sha256-uvW+PCJdpYHaIIi7YM+kXmHlhQgMbkXBGvAd0mzSb1U=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-zMVXl7kJEavv5zfSm0bTYtd8J3j/LtY3ikPUK2hod+E=";
|
||||
cargoSha256 = "sha256-cDInmOv1yMedJWHzwGT2wmoUd58ZwKh6IDcOvG65RV8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find and remove unused code in .nix source files";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hjson-go";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hjson";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ni8sT69+/RsVazmS4Gs9hSxz5oqeLkwCG+mVu7/5ZL8=";
|
||||
sha256 = "sha256-L438L50LgF/YUzWRyTcZz6JrBlJQ1/XMYZUUb0avb0w=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubie";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "sbstp";
|
||||
repo = "kubie";
|
||||
sha256 = "sha256-mAm3St5Uc715Y7PCs9mAIp+IYvEHGSoS5ASdWCNPq2A=";
|
||||
sha256 = "sha256-K7zoohyVBnRMqwpizBs+wlN/gkgGjBHNk1cwxY7P3Hs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Z3W+XYhDriO+uWUIXAq3zv3GN0x9GFUc5C3ycrPz1e8=";
|
||||
cargoSha256 = "sha256-feNmtUkpN+RdMrvF2ZY2BcZ0p8qEqw6Hr+p4be3YavA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -127,13 +127,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hydra";
|
||||
version = "2022-08-08";
|
||||
version = "2022-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "2b1c1e65d5fbbe25625a31ee93cb14c9a9edf969";
|
||||
sha256 = "sha256-mjCdJPB4t5OLGZ0r5usJTVs1BBr4cWeGGE7imyUfQnQ=";
|
||||
rev = "d6cbf227cba90cf281f72f464393d75a45f2f3a8";
|
||||
sha256 = "sha256-eMStY0/cS/blRGyyp1DUpP3N0SxYZrxah+hNJeKwDSw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
23
pkgs/development/tools/nasmfmt/default.nix
Normal file
23
pkgs/development/tools/nasmfmt/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, go }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "nasmfmt";
|
||||
version = "unstable-2021-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamnikov-oleg";
|
||||
repo = "nasmfmt";
|
||||
rev = "efba220c5252eb717f080d266dcc8304efdeab40";
|
||||
sha256 = "sha256-snhXF+IP0qzl43rKQ0Ugfo1zv3RyNfjxnMpjZEBgPQg=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/yamnikov-oleg/nasmfmt";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Formatter for NASM source files";
|
||||
homepage = "https://github.com/yamnikov-oleg/nasmfmt";
|
||||
platforms = go.meta.platforms;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
|
@ -3,17 +3,18 @@
|
|||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, babashka
|
||||
, jdk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neil";
|
||||
version = "0.1.36";
|
||||
version = "0.1.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "babashka";
|
||||
repo = "neil";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-byBQLYwFSUQJioV2FccsFqXGMlESSA1kg8aBeSaWbwA=";
|
||||
sha256 = "sha256-QEeJWR4aBx1DsXjlTanhDSQn91I9JzEitU+Az+wTVFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
install -D neil $out/bin/neil
|
||||
wrapProgram $out/bin/neil \
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka ]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka jdk ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-NwWoF7VkCy+9/8xwaIhR7763JGtC3UheuJdj/FtGzMg=";
|
||||
sha256 = "sha256-h5eLJyrk5n2lSSeAT6YHDALay7CsN/xApl3j0s3pIjc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-HFTGtDS4dWzt0q2iC0qgby4fDvnoaNd+Y1eKzhwb3Hs=";
|
||||
cargoSha256 = "sha256-1zt3q04LPER+Kvp6EQHziWzYeckFYO9MmPRlHto2Juo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, python3, enableNpm ? true }:
|
||||
{ callPackage, fetchpatch, python3, enableNpm ? true }:
|
||||
|
||||
let
|
||||
buildNodejs = callPackage ./nodejs.nix {
|
||||
|
@ -7,9 +7,17 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "18.8.0";
|
||||
sha256 = "sha256-K12YJdBe3mYU8WaKjZfXdP6S68gQiOxf31gYTc48hrk=";
|
||||
version = "18.9.0";
|
||||
sha256 = "sha256-x1zImv6tl2eRkArM3gKnsefnYnAvD2+mjqrLAZhNllQ=";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200
|
||||
name = "revert-arm64-pointer-auth.patch";
|
||||
url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch";
|
||||
sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY=";
|
||||
revert = true;
|
||||
})
|
||||
|
||||
./disable-darwin-v8-system-instrumentation.patch
|
||||
];
|
||||
}
|
||||
|
|
|
@ -17,12 +17,9 @@
|
|||
, polkit
|
||||
, protobuf
|
||||
, audit
|
||||
, libgcrypt
|
||||
, libsodium
|
||||
}:
|
||||
|
||||
assert libgcrypt != null -> libsodium == null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.1";
|
||||
pname = "usbguard";
|
||||
|
@ -51,21 +48,19 @@ stdenv.mkDerivation rec {
|
|||
libcap_ng
|
||||
libqb
|
||||
libseccomp
|
||||
libsodium
|
||||
polkit
|
||||
protobuf
|
||||
audit
|
||||
]
|
||||
++ (lib.optional (libgcrypt != null) libgcrypt)
|
||||
++ (lib.optional (libsodium != null) libsodium);
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-bundled-catch"
|
||||
"--with-bundled-pegtl"
|
||||
"--with-dbus"
|
||||
"--with-crypto-library=sodium"
|
||||
"--with-polkit"
|
||||
]
|
||||
++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
|
||||
++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-QS/GMUXZ3FlBDfgLXEUeqWb4jNDXaRpRlieWjxmMe5U=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-2QGXyXHU2p7DFKDWyau2+SCzaQnM+o0EbYqHFnErXX4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-LQcIlQUbL7fDQQKKEr5HdL87O/dv7sD4ESqAxfeMo28=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-16XJUh78B45d1uuLi1xcFeti6CvGUkXYUVe4pS/hhXs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-VIvQ+dhPi+gCGoCwwmnNscFPqfTCNqZdZsMYFYSFCuE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-ML9WSJwQTC8F07MOTQBpZXH/tHSlbQEzAofGpjHZrLU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-aTZ/nfzJBJX7pV/xn/7QwPvK95GY5DIzeNs4O/6UBDw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-fGSBfQzlYQbsZExOqsxa2Zdb/gvo0c9O313ziSkvOjY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-aYPMMjI7azFtGUvPy2KnS0o7lTmtsOaOVgIFCWkfNi4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-WR8omfW5udMmXNKuUIfqdXvggumG4Pb1gESJV9YZ9rc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.11";
|
||||
version = "0.107.12";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iaFVYvMEgjNAvjesMPwBNNput5IyVlBxoFCoJ+HTCdI=";
|
||||
sha256 = "sha256-IkskR/30vu/RYuCvIH3trPte0MkYhgWzHLBmb325bhM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KTux4XTIuyps5esvkEZIOfv3BTSU31kxxOeWeAavDMk=";
|
||||
vendorSha256 = "sha256-U3buvPu2mZh79DwKYrSj1Y0x3gNjuKscOyAWNKeloXQ=";
|
||||
|
||||
# some tests are racy, re-enable once upstream has fixed them
|
||||
doCheck = false;
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.1768";
|
||||
version = "0.20.1850";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "fyaAz17PSyenf8fHl9M3cFrCgKNGJ/7arzDseh4twQw=";
|
||||
sha256 = "lELuwSC0TKsnU5zsUsA0ihBxsJv/IiAs9tf+Yi5aL8E=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.41.0";
|
||||
version = "2.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dJWxOUw+G3U19HSeL9rebWGdilQnNC9x89e99vFbp0s=";
|
||||
hash = "sha256-BfHqVuTjgcObJm6bFwlXgHdcc1IalpY9opTamHqB0Zs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
41
pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
Normal file
41
pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, makeWrapper, freeipmi }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipmi_exporter";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus-community";
|
||||
repo = "ipmi_exporter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hifG1lpFUVLoy7Ol3N6h+s+hZjnQxja5svpY4lFFsxw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UuPZmxoKVj7FusOS6H1gn6SAzQIZAKyX+m+QS657yXw=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ipmi_exporter --prefix PATH : ${lib.makeBinPath [ freeipmi ]}
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) ipmi; };
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/prometheus/common/version.Version=${version}"
|
||||
"-X github.com/prometheus/common/version.Revision=0000000"
|
||||
"-X github.com/prometheus/common/version.Branch=unknown"
|
||||
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
|
||||
"-X github.com/prometheus/common/version.BuildDate=unknown"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An IPMI exporter for Prometheus";
|
||||
homepage = "https://github.com/prometheus-community/ipmi_exporter";
|
||||
changelog = "https://github.com/prometheus-community/ipmi_exporter/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ snaar ];
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rmfakecloud";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddvk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q9zymQW8XWApy5ssfMtojN4AhteqrQzZyMeAkOsJDyw=";
|
||||
sha256 = "sha256-SefgXJUe0fh4BW7vOIKW6O26oEngq/1+dAYStBfkKao=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A=";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildGo117Module, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGo117Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.8.10";
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, rustPlatform
|
||||
, openssl
|
||||
, zlib
|
||||
|
@ -10,10 +11,12 @@
|
|||
, xorg
|
||||
, libiconv
|
||||
, AppKit
|
||||
, Foundation
|
||||
, Security
|
||||
# darwin.apple_sdk.sdk
|
||||
, sdk
|
||||
, nghttp2
|
||||
, libgit2
|
||||
, cargo-edit
|
||||
, withExtraFeatures ? true
|
||||
, testers
|
||||
, nushell
|
||||
|
@ -21,39 +24,41 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell";
|
||||
version = "0.65.0";
|
||||
version = "0.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-KgXhmAOJaAvmNuDqSaW+h6GF5rWYgj8/wn+vz9V9S7M=";
|
||||
sha256 = "sha256-O5uM27DvcpwlZStFFLYRDRtFXzAzUdG7v0phK9LJsSo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-YqtM/1p6oP0+E0rYSFPeCbof06E81eC2PZIwkU7J0I4=";
|
||||
# Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
|
||||
# `parquet`, for dataframe support), which by default has an impure build
|
||||
# (git submodule for the `zstd` C library). The `pkg-config` feature flag
|
||||
# fixes this, but it's hard to invoke this in the right place, because of
|
||||
# the indirect dependencies. So add a direct dependency on `zstd-sys` here
|
||||
# at the top level, along with this feature flag, to ensure that when
|
||||
# `zstd-sys` is transitively invoked, it triggers a pure build using the
|
||||
# system `zstd` library provided above.
|
||||
depsExtraArgs = { nativeBuildInputs = [ cargo-edit ]; };
|
||||
# cargo add has been merged in to cargo so the above can be removed once 1.62.0 is available in nixpkgs
|
||||
# https://github.com/rust-lang/cargo/pull/10472
|
||||
cargoUpdateHook = ''
|
||||
cargo add zstd-sys --features pkg-config --offline
|
||||
# write the change to the lockfile
|
||||
cargo update --package zstd-sys --offline
|
||||
'';
|
||||
cargoSha256 = "sha256-eGUI+/Vmqv+BCIQCGoF4Egf3oNyonM3tpt1R3EjIocQ=";
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]
|
||||
++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = [ openssl zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
|
||||
++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
Foundation
|
||||
(
|
||||
# Pull a header that contains a definition of proc_pid_rusage().
|
||||
# (We pick just that one because using the other headers from `sdk` is not
|
||||
# compatible with our C++ standard library. This header is already in
|
||||
# the standard library on aarch64)
|
||||
# See also:
|
||||
# https://github.com/shanesveller/nixpkgs/tree/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/development/libraries/webkitgtk/default.nix
|
||||
# https://github.com/shanesveller/nixpkgs/blob/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/tools/system/btop/default.nix#L32-L38
|
||||
runCommand "${pname}_headers" { } ''
|
||||
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||
''
|
||||
)
|
||||
] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
|
||||
|
||||
buildFeatures = lib.optional withExtraFeatures "extra";
|
||||
|
|
31
pkgs/shells/nushell/zstd-pkg-config.patch
Normal file
31
pkgs/shells/nushell/zstd-pkg-config.patch
Normal file
|
@ -0,0 +1,31 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index d4c2ebe3a..bc78478c3 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2641,6 +2641,7 @@ dependencies = [
|
||||
"wax",
|
||||
"which",
|
||||
"windows",
|
||||
+ "zstd",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5604,4 +5605,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
+ "pkg-config",
|
||||
]
|
||||
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
|
||||
index 8a9d29562..374ffa153 100644
|
||||
--- a/crates/nu-command/Cargo.toml
|
||||
+++ b/crates/nu-command/Cargo.toml
|
||||
@@ -89,6 +89,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] }
|
||||
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
|
||||
sqlparser = { version = "0.16.0", features = ["serde"], optional = true }
|
||||
|
||||
+zstd = { version = "*", features = [ "pkg-config" ] }
|
||||
+
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
umask = "2.0.0"
|
||||
users = "0.11.0"
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-08-14";
|
||||
version = "2022-09-07";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "3668ec2a82250020ca0c285ef8b277f1385a8085";
|
||||
rev = "875a4553204679cc1e3023a7d0e0bf2cf7d60800";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "nWnvjqjXVUr45wIJSsfvJ/tQGYtWR0nEnNUguycDe5s=";
|
||||
sha256 = "iPW6u4LxXFNL1n9NzhoA9uGAZvykx+sDI0syYwUf4+k=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "discordchatexporter-cli";
|
||||
version = "2.35";
|
||||
version = "2.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyrrrz";
|
||||
repo = "discordchatexporter";
|
||||
rev = version;
|
||||
sha256 = "xPHXs7lk7WaSTr5jH7q8mN1O6Z9cdD2EACx2CmLelJ8=";
|
||||
sha256 = "Zl9uYwbCSMj+hEvZdI57gALegDizwe4Z1k8qa3hSeIc=";
|
||||
};
|
||||
|
||||
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; })
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; })
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.3.0"; sha256 = "0dxxd5hm7gnc1lhq7k266nkcl84w0844r3cdxdcksvcc786f43vp"; })
|
||||
(fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.3.1"; sha256 = "0zsicyizachdam64mjm1brh5a3nzf7j8nalyhwnw26wk3v3rgmc9"; })
|
||||
(fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; })
|
||||
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
|
||||
|
@ -9,5 +9,5 @@
|
|||
(fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; })
|
||||
(fetchNuGet { pname = "Spectre.Console"; version = "0.44.0"; sha256 = "0f4q52rmib0q3vg7ij6z73mnymyas7c7wrm8dfdhrkdzn53zwl6p"; })
|
||||
(fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
|
||||
(fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.9.0"; sha256 = "1m184n0zdfxzk9vi2q9y8c8987a0c044vy97i9iginndzxvwazgg"; })
|
||||
(fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.12.0"; sha256 = "1v4dcrpz2icm73w1pfrcjanx0x4j1khi65pyf1xd712lfpm7gpyd"; })
|
||||
]
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzip3";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "kspalaiologos";
|
||||
repo = "bzip3";
|
||||
rev = version;
|
||||
hash = "sha256-rbJUvFm8WYgQLNpbX6kcXb5qAGAJfylTo4HgOvZVCu8=";
|
||||
hash = "sha256-HTflIcEZ57EC1zxcmG6Wg0QErpqiq8DNawhLkVogCYI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
|
|||
"--enable-udev"
|
||||
"--with-scanbdconfdir=/etc/scanbd"
|
||||
"--with-systemdsystemunitdir=$out/lib/systemd/system"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# AC_FUNC_MALLOC is broken on cross builds.
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, ffmpeg_4, libxslt }:
|
||||
{ lib, stdenv, fetchurl, buildPackages, pkg-config, ffmpeg_4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unpaper";
|
||||
|
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ ffmpeg_4 libxslt ];
|
||||
nativeBuildInputs = [ pkg-config buildPackages.libxslt.bin ];
|
||||
buildInputs = [ ffmpeg_4 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.flameeyes.eu/projects/unpaper";
|
||||
|
|
|
@ -6,23 +6,26 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "depotdownloader";
|
||||
version = "2.4.5";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SteamRE";
|
||||
repo = "DepotDownloader";
|
||||
rev = "DepotDownloader_${version}";
|
||||
sha256 = "0i5qgjnliji1g408ks1034r69vqdmfnzanb0qm7jmyzwww7vwpnh";
|
||||
sha256 = "F67bRIIN9aRbcPVFge3o0I9RF5JqHNDlTPhOpwqdADY=";
|
||||
};
|
||||
|
||||
projectFile = "DepotDownloader.sln";
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Steam depot downloader utilizing the SteamKit2 library";
|
||||
changelog = "https://github.com/SteamRE/DepotDownloader/releases/tag/DepotDownloader_${version}";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.babbaj ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
mainProgram = "DepotDownloader";
|
||||
};
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue