Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1c0ef46804
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -278,6 +278,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>,
|
||||
|
|
|
|||
|
|
@ -99,6 +99,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;
|
||||
|
|
|
|||
|
|
@ -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/";
|
||||
|
|
|
|||
|
|
@ -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 = "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 = "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";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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"; })
|
||||
]
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
9
pkgs/tools/misc/depotdownloader/deps.nix
generated
9
pkgs/tools/misc/depotdownloader/deps.nix
generated
|
|
@ -1,12 +1,9 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
|
||||
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
|
||||
(fetchNuGet { pname = "SteamKit2"; version = "2.4.0-Alpha.3"; sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv"; })
|
||||
(fetchNuGet { pname = "protobuf-net"; version = "3.1.17"; sha256 = "1pyx9gnzd91m6viph8gyf57l10jspfphczm5m11wriy3ydrzh6yc"; })
|
||||
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.1.17"; sha256 = "0gk3zi1iaxssgjw4kdkpj98sy6hyx8m18fijxy413p19zknvnb0n"; })
|
||||
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
|
||||
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../. -i bash -p nuget-to-nix dotnet-sdk
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
deps_file="$(realpath "./deps.nix")"
|
||||
|
||||
cd ../../../..
|
||||
store_src="$(nix-build . -A depotdownloader.src --no-out-link)"
|
||||
src="$(mktemp -d /tmp/depotdownloader-src.XXX)"
|
||||
cp -rT "$store_src" "$src"
|
||||
chmod -R +w "$src"
|
||||
|
||||
pushd "$src"
|
||||
|
||||
mkdir ./nuget_tmp.packages
|
||||
dotnet restore DepotDownloader.sln --packages ./nuget_tmp.packages
|
||||
|
||||
nuget-to-nix ./nuget_tmp.packages > "$deps_file"
|
||||
|
||||
popd
|
||||
rm -r "$src"
|
||||
17
pkgs/tools/misc/depotdownloader/update.sh
Executable file
17
pkgs/tools/misc/depotdownloader/update.sh
Executable file
|
|
@ -0,0 +1,17 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p jq curl common-updater-scripts nix coreutils
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
depsFile="$(realpath "$(dirname "${BASH_SOURCE[0]}")/deps.nix")"
|
||||
currentVersion="$(nix eval --raw -f . depotdownloader.version)"
|
||||
latestVersion="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/SteamRE/DepotDownloader/releases?per_page=1" \
|
||||
| jq -r '.[].name' | cut -d' ' -f2)"
|
||||
|
||||
if [[ "$currentVersion" = "$latestVersion" ]]; then
|
||||
echo "Already up to date!"
|
||||
exit
|
||||
fi
|
||||
|
||||
update-source-version depotdownloader "$latestVersion"
|
||||
$(nix-build -A depotdownloader.fetch-deps --no-out-link) "$depsFile"
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RSARAcId8U5b6vH4m5Zr6FqV1OFolqC+wyfqZbJZH4w=";
|
||||
sha256 = "sha256-6YpC6JDBYwP+RHQUYXmgOWUWa7DgvjowhGCpr2bNl4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles cmake ];
|
||||
|
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
|||
--zsh <($out/bin/starship completions zsh)
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-UhTbrORUp+aP0SF1XjgpTunS0bpRvYxvUwEKBH7wFnQ=";
|
||||
cargoSha256 = "sha256-skNvlifjRHTrJPMjpRv2E+M9/XA+3m6dHbb+gczaYoo=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
|
|
|
|||
35
pkgs/tools/misc/todo/default.nix
Normal file
35
pkgs/tools/misc/todo/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, openssl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "todo";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sioodmy";
|
||||
repo = "todo";
|
||||
rev = version;
|
||||
sha256 = "Z3kaCNZyknNHkZUsHARYh3iWWR+v//JhuYoMIrq54Wo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "82xB+9kiLBwCE6yC3tlmgzJJgA1cMDq6Mjc48GBZ9B8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
preFixup = ''
|
||||
mv $out/bin/todo-bin $out/bin/todo
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Simple todo cli program written in rust";
|
||||
homepage = "https://github.com/sioodmy/todo";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sioodmy ];
|
||||
mainProgram = "todo";
|
||||
};
|
||||
}
|
||||
|
|
@ -10298,6 +10298,8 @@ with pkgs;
|
|||
|
||||
qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
|
||||
|
||||
qalculate-qt = libsForQt5.callPackage ../applications/science/math/qalculate-qt { };
|
||||
|
||||
qastools = libsForQt5.callPackage ../tools/audio/qastools { };
|
||||
|
||||
qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;
|
||||
|
|
@ -11630,6 +11632,8 @@ with pkgs;
|
|||
|
||||
top-git = callPackage ../applications/version-management/git-and-tools/topgit { };
|
||||
|
||||
todo = callPackage ../tools/misc/todo { };
|
||||
|
||||
tor = callPackage ../tools/security/tor { };
|
||||
|
||||
tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
|
||||
|
|
@ -14328,6 +14332,8 @@ with pkgs;
|
|||
|
||||
nasm = callPackage ../development/compilers/nasm { };
|
||||
|
||||
nasmfmt = callPackage ../development/tools/nasmfmt { };
|
||||
|
||||
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
|
||||
|
||||
obliv-c = callPackage ../development/compilers/obliv-c
|
||||
|
|
@ -18804,7 +18810,7 @@ with pkgs;
|
|||
|
||||
hwloc = callPackage ../development/libraries/hwloc {};
|
||||
|
||||
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_9; };
|
||||
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_11; };
|
||||
|
||||
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
|
||||
|
||||
|
|
@ -20956,6 +20962,10 @@ with pkgs;
|
|||
|
||||
opensupaplex = callPackage ../games/opensupaplex { };
|
||||
|
||||
openturns = callPackage ../development/libraries/openturns {
|
||||
inherit (darwin.apple_sdk.frameworks) Accelerate;
|
||||
};
|
||||
|
||||
open-wbo = callPackage ../applications/science/logic/open-wbo {};
|
||||
|
||||
openwsman = callPackage ../development/libraries/openwsman {};
|
||||
|
|
@ -23496,6 +23506,7 @@ with pkgs;
|
|||
prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };
|
||||
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
|
||||
prometheus-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { };
|
||||
prometheus-ipmi-exporter = callPackage ../servers/monitoring/prometheus/ipmi-exporter.nix { };
|
||||
prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };
|
||||
prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { };
|
||||
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
|
||||
|
|
@ -25118,9 +25129,7 @@ with pkgs;
|
|||
|
||||
upower = callPackage ../os-specific/linux/upower { };
|
||||
|
||||
usbguard = callPackage ../os-specific/linux/usbguard {
|
||||
libgcrypt = null;
|
||||
};
|
||||
usbguard = callPackage ../os-specific/linux/usbguard { };
|
||||
|
||||
usbrelay = callPackage ../os-specific/linux/usbrelay { };
|
||||
usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
|
||||
|
|
|
|||
|
|
@ -6390,6 +6390,11 @@ in {
|
|||
|
||||
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
|
||||
|
||||
openturns = toPythonModule (pkgs.openturns.override {
|
||||
python3Packages = self;
|
||||
enablePython = true;
|
||||
});
|
||||
|
||||
opentracing = callPackage ../development/python-modules/opentracing { };
|
||||
|
||||
openvino = toPythonModule (pkgs.openvino.override {
|
||||
|
|
|
|||
Loading…
Reference in a new issue