Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
705cd79939
|
|
@ -8125,13 +8125,6 @@
|
|||
githubId = 1001112;
|
||||
name = "Marcin Janczyk";
|
||||
};
|
||||
mjlbach = {
|
||||
email = "m.j.lbach@gmail.com";
|
||||
matrix = "@atrius:matrix.org";
|
||||
github = "mjlbach";
|
||||
githubId = 13316262;
|
||||
name = "Michael Lingelbach";
|
||||
};
|
||||
mjp = {
|
||||
email = "mike@mythik.co.uk";
|
||||
github = "MikePlayle";
|
||||
|
|
@ -13222,6 +13215,12 @@
|
|||
githubId = 1297598;
|
||||
name = "Konrad Borowski";
|
||||
};
|
||||
xgroleau = {
|
||||
email = "xgroleau@gmail.com";
|
||||
github = "xgroleau";
|
||||
githubId = 31734358;
|
||||
name = "Xavier Groleau";
|
||||
};
|
||||
xiorcale = {
|
||||
email = "quentin.vaucher@pm.me";
|
||||
github = "xiorcale";
|
||||
|
|
|
|||
|
|
@ -214,7 +214,6 @@ with lib.maintainers; {
|
|||
mguentner
|
||||
ekleog
|
||||
ralith
|
||||
mjlbach
|
||||
dandellion
|
||||
sumnerevans
|
||||
];
|
||||
|
|
|
|||
|
|
@ -173,13 +173,18 @@ sub parseSystemdIni {
|
|||
#
|
||||
# If a directory with the same basename ending in .d exists next to the unit file, it will be
|
||||
# assumed to contain override files which will be parsed as well and handled properly.
|
||||
sub parseUnit {
|
||||
my ($unitPath) = @_;
|
||||
sub parse_unit {
|
||||
my ($unit_path) = @_;
|
||||
|
||||
# Parse the main unit and all overrides
|
||||
my %unitData;
|
||||
parseSystemdIni(\%unitData, $_) for glob("${unitPath}{,.d/*.conf}");
|
||||
return %unitData;
|
||||
my %unit_data;
|
||||
# Replace \ with \\ so glob() still works with units that have a \ in them
|
||||
# Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\"
|
||||
$unit_path =~ s/\\/\\\\/gmsx;
|
||||
foreach (glob "${unit_path}{,.d/*.conf}") {
|
||||
parseSystemdIni(\%unit_data, "$_")
|
||||
}
|
||||
return %unit_data;
|
||||
}
|
||||
|
||||
# Checks whether a specified boolean in a systemd unit is true
|
||||
|
|
@ -310,7 +315,7 @@ sub handleModifiedUnit {
|
|||
# Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609
|
||||
# More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430
|
||||
} else {
|
||||
my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parseUnit($newUnitFile);
|
||||
my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parse_unit($newUnitFile);
|
||||
if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0) and not $unitsToRestart->{$unit} and not $unitsToStop->{$unit}) {
|
||||
$unitsToReload->{$unit} = 1;
|
||||
recordUnit($reloadListFile, $unit);
|
||||
|
|
@ -412,12 +417,12 @@ while (my ($unit, $state) = each %{$activePrev}) {
|
|||
|
||||
if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
|
||||
if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
|
||||
my %unitInfo = parseUnit($prevUnitFile);
|
||||
my %unitInfo = parse_unit($prevUnitFile);
|
||||
$unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1);
|
||||
}
|
||||
|
||||
elsif ($unit =~ /\.target$/) {
|
||||
my %unitInfo = parseUnit($newUnitFile);
|
||||
my %unitInfo = parse_unit($newUnitFile);
|
||||
|
||||
# Cause all active target units to be restarted below.
|
||||
# This should start most changed units we stop here as
|
||||
|
|
@ -451,8 +456,8 @@ while (my ($unit, $state) = each %{$activePrev}) {
|
|||
}
|
||||
|
||||
else {
|
||||
my %old_unit_info = parseUnit($prevUnitFile);
|
||||
my %new_unit_info = parseUnit($newUnitFile);
|
||||
my %old_unit_info = parse_unit($prevUnitFile);
|
||||
my %new_unit_info = parse_unit($newUnitFile);
|
||||
my $diff = compare_units(\%old_unit_info, \%new_unit_info);
|
||||
if ($diff eq 1) {
|
||||
handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip);
|
||||
|
|
|
|||
|
|
@ -145,6 +145,23 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
systemd.services.test.serviceConfig."X-Test" = "test";
|
||||
};
|
||||
|
||||
unitWithBackslash.configuration = {
|
||||
systemd.services."escaped\\x2ddash" = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.coreutils}/bin/true";
|
||||
ExecReload = "${pkgs.coreutils}/bin/true";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
unitWithBackslashModified.configuration = {
|
||||
imports = [ unitWithBackslash.configuration ];
|
||||
systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test";
|
||||
};
|
||||
|
||||
restart-and-reload-by-activation-script.configuration = {
|
||||
systemd.services = rec {
|
||||
simple-service = {
|
||||
|
|
@ -433,6 +450,25 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
assert_lacks(out, "as well:")
|
||||
assert_contains(out, "would start the following units: test.service\n")
|
||||
|
||||
# Ensure \ works in unit names
|
||||
out = switch_to_specialisation("${machine}", "unitWithBackslash")
|
||||
assert_contains(out, "stopping the following units: test.service\n")
|
||||
assert_lacks(out, "NOT restarting the following changed units:")
|
||||
assert_lacks(out, "reloading the following units:")
|
||||
assert_lacks(out, "\nrestarting the following units:")
|
||||
assert_lacks(out, "\nstarting the following units:")
|
||||
assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n")
|
||||
assert_lacks(out, "as well:")
|
||||
|
||||
out = switch_to_specialisation("${machine}", "unitWithBackslashModified")
|
||||
assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n")
|
||||
assert_lacks(out, "NOT restarting the following changed units:")
|
||||
assert_lacks(out, "reloading the following units:")
|
||||
assert_lacks(out, "\nrestarting the following units:")
|
||||
assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n")
|
||||
assert_lacks(out, "the following new units were started:")
|
||||
assert_lacks(out, "as well:")
|
||||
|
||||
with subtest("failing units"):
|
||||
# Let the simple service fail
|
||||
switch_to_specialisation("${machine}", "simpleServiceModified")
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "99.0.4844.27",
|
||||
"sha256": "07srkycb92sajbxcjbwgjcj0xgb17k9i4b7cg50dvz3pwdvm7y8y",
|
||||
"sha256bin64": "1a3a66kmcim3f8wvi19330m2iixxngsfiwv44g8zz51qk4rg4wx3",
|
||||
"version": "99.0.4844.35",
|
||||
"sha256": "085vsfp08y4vmv73z37ncynvax645qm302h883skx9xk4yyjkynj",
|
||||
"sha256bin64": "18kys3f0zjkrp1x2vkcc9vx6vhj5yfrpb88lli7ql6q9b0ijjjn4",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-10",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -8,13 +8,13 @@
|
|||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "6.4.15";
|
||||
version = "6.4.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3JPnXOpjHjBZMdOtggjSns4cKc7uffJS1RkTAKGxAVI=";
|
||||
sha256 = "sha256-yjW0XlMXa1MyNIud3uGm7RNj47B4Bp3DK9tvBrfqkoA=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bgc9M7shcgL1gQ9klUP0JIY4UeraO1oLsLEdG5tOLpY=";
|
||||
sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0=";
|
||||
vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
inherit (pkgs) callPackage fetchurl;
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.16";
|
||||
stable = "0.0.17";
|
||||
ptb = "0.0.27";
|
||||
canary = "0.0.133";
|
||||
} else {
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
stable = fetchurl {
|
||||
url =
|
||||
"https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk=";
|
||||
sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url =
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ mkDerivation rec {
|
|||
description = "A client for matrix, the decentralized communication protocol.";
|
||||
homepage = "https://apps.kde.org/en/neochat";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ mjlbach peterhoeg ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SPAdes";
|
||||
version = "3.15.3";
|
||||
version = "3.15.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-suWp/XplruWriGIi1q9Pe3vH91XaegOUFXH6vWueFJk=";
|
||||
sha256 = "sha256-OyQcUopCqL398j5b+PAISDR5BZDQhJHezqnw8AnYWJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ assert !cudaSupport || cudatoolkit != null;
|
|||
let boost_static = boost17x.override { enableStatic = true; };
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
pname = "colmap";
|
||||
src = fetchFromGitHub {
|
||||
owner = "colmap";
|
||||
repo = "colmap";
|
||||
rev = version;
|
||||
sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n";
|
||||
sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -30,7 +30,7 @@ mkDerivation rec {
|
|||
with a graphical and command-line interface.
|
||||
'';
|
||||
homepage = "https://colmap.github.io/index.html";
|
||||
license = licenses.bsd2;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lebastr ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, python3Packages }:
|
||||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "6.10.0";
|
||||
version = "6.15.5";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
appdirs
|
||||
|
|
@ -29,12 +29,31 @@ python3Packages.buildPythonApplication rec {
|
|||
wrapt
|
||||
];
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "199a86c8d1fcfdb88c4271a1507b0ab371a15bc407f2dad9b0ab8c43438adff8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU=";
|
||||
};
|
||||
|
||||
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
|
||||
# See
|
||||
# https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99
|
||||
# for the current basic test suite. Tibanna and Tes require extra
|
||||
# setup.
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
pandas
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_tes.py"
|
||||
"tests/test_tibanna.py"
|
||||
"tests/test_linting.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "snakemake" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://snakemake.github.io";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qgroundcontrol";
|
||||
version = "4.1.4";
|
||||
version = "4.2.0";
|
||||
|
||||
qtInputs = [
|
||||
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
|
||||
|
|
@ -29,6 +29,8 @@ mkDerivation rec {
|
|||
"CONFIG+=StableBuild"
|
||||
# Default install tries to copy Qt files into package
|
||||
"CONFIG+=QGC_DISABLE_BUILD_SETUP"
|
||||
# Tries to download x86_64-only prebuilt binaries
|
||||
"DEFINES+=DISABLE_AIRMAP"
|
||||
"../qgroundcontrol.pro"
|
||||
];
|
||||
|
||||
|
|
@ -62,13 +64,13 @@ mkDerivation rec {
|
|||
owner = "mavlink";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0lhc36jpy7a5bnysqi574nk5izglj557mf8n9lcsgvzwxlkb2rbf";
|
||||
sha256 = "sha256-TBnJQKO9cwxP9q+bIB1CaGnm9npymJ3iEAD9kPJi9JA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
|
||||
homepage = "http://qgroundcontrol.org/";
|
||||
homepage = "http://qgroundcontrol.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lopsided98 ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, jdupes
|
||||
, colorVariants ? [] # default: all
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "vimix-icon-theme";
|
||||
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vimix-icon-theme";
|
||||
inherit pname;
|
||||
version = "2021-11-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -23,10 +36,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
patchShebangs install.sh
|
||||
./install.sh -a -d $out/share/icons
|
||||
|
||||
./install.sh \
|
||||
${if colorVariants != [] then builtins.toString colorVariants else "-a"} \
|
||||
-d $out/share/icons
|
||||
|
||||
# replace duplicate files with symlinks
|
||||
jdupes -l -r $out/share/icons
|
||||
jdupes -L -r $out/share/icons
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Look at your windows and desktops from above.";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ mjlbach ];
|
||||
maintainers = with maintainers; [ ];
|
||||
inherit (src.meta) homepage;
|
||||
inherit (kwindowsystem.meta) platforms;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BoCA";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enzo1982";
|
||||
repo = "boca";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo=";
|
||||
sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk4";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
|
||||
sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw=";
|
||||
sha256 = "2FUI0hy7zWPVaKeGKvXs1juXjX1XmcvkBMkdI4nQ7F8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, poetry
|
||||
, rich
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
pname = "pipenv-poetry-migrate";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhino";
|
||||
repo = "pipenv-poetry-migrate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poetry
|
||||
rich
|
||||
setuptools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"'
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is simple migration script, migrate pipenv to poetry";
|
||||
homepage = "https://github.com/yhino/pipenv-poetry-migrate";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
|
|
@ -48,6 +48,6 @@ buildPythonPackage rec {
|
|||
description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python";
|
||||
homepage = "https://github.com/romis2012/python-socks";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mjlbach ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
24
pkgs/development/tools/rust/probe-rs-cli/default.nix
Normal file
24
pkgs/development/tools/rust/probe-rs-cli/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs-cli";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for on-chip debugging and flashing of ARM chips";
|
||||
homepage = "https://probe.rs/";
|
||||
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ xgroleau ];
|
||||
};
|
||||
}
|
||||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Lua Language Server coded by Lua ";
|
||||
homepage = "https://github.com/sumneko/lua-language-server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mjlbach ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
mainProgram = "lua-language-server";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,37 +1,68 @@
|
|||
{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2
|
||||
, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL
|
||||
, glew
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, assimp
|
||||
, curl
|
||||
, freetype
|
||||
#, glew
|
||||
, libGL
|
||||
, libGLU
|
||||
, libpng
|
||||
, libsigcxx
|
||||
, libvorbis
|
||||
, lua5_2
|
||||
, mesa
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pioneer";
|
||||
version = "20210723";
|
||||
version = "20220203";
|
||||
|
||||
src = fetchFromGitHub{
|
||||
owner = "pioneerspacesim";
|
||||
repo = "pioneer";
|
||||
rev = version;
|
||||
sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI=";
|
||||
hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng
|
||||
assimp libGLU libGL glew
|
||||
assimp
|
||||
curl
|
||||
freetype
|
||||
libGL
|
||||
libGLU
|
||||
libpng
|
||||
libsigcxx
|
||||
libvorbis
|
||||
lua5_2
|
||||
mesa
|
||||
SDL2
|
||||
SDL2_image
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export PIONEER_DATA_DIR="$out/share/pioneer/data";
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DPIONEER_DATA_DIR:PATH=${placeholder "out"}/share/pioneer/data"
|
||||
"-DUSE_SYSTEM_LIBLUA:BOOL=YES"
|
||||
];
|
||||
|
||||
makeFlags = [ "build-data" ];
|
||||
makeFlags = [ "all" "build-data" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century";
|
||||
homepage = "https://pioneerspacesim.net";
|
||||
license = with licenses; [
|
||||
gpl3 cc-by-sa-30
|
||||
gpl3Only cc-by-sa-30
|
||||
];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -759,6 +759,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/";
|
||||
};
|
||||
|
||||
cmp-nvim-ultisnips = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-nvim-ultisnips";
|
||||
version = "2022-01-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "quangnguyen30192";
|
||||
repo = "cmp-nvim-ultisnips";
|
||||
rev = "0e8f501facdcc5bfdb5664ee185e040464a79625";
|
||||
sha256 = "tQ3xkJ34q5+ioi6lQY7F/ZjGngzmv4FDkpNeU5sRqK0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips";
|
||||
};
|
||||
|
||||
cmp-omni = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-omni";
|
||||
version = "2022-01-08";
|
||||
|
|
@ -6447,6 +6459,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tomtom/tcomment_vim/";
|
||||
};
|
||||
|
||||
telescope-asynctasks-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-asynctasks.nvim";
|
||||
version = "2021-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GustavoKatel";
|
||||
repo = "telescope-asynctasks.nvim";
|
||||
rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f";
|
||||
sha256 = "Ow7iSmosMs/hGEfnKKorZhS4tKVKal+pkZ52LIFsEu4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim";
|
||||
};
|
||||
|
||||
telescope-cheat-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-cheat.nvim";
|
||||
version = "2021-12-05";
|
||||
|
|
@ -6628,6 +6652,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
||||
telescope-ultisnips-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-ultisnips.nvim";
|
||||
version = "2021-09-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fhill2";
|
||||
repo = "telescope-ultisnips.nvim";
|
||||
rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8";
|
||||
sha256 = "h2PfstopgjCMFYVOnzEX7gkkIHCamcJPJux5B+qYYww=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim";
|
||||
};
|
||||
|
||||
tender-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tender.vim";
|
||||
version = "2021-05-24";
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ FelikZ/ctrlp-py-matcher
|
|||
feline-nvim/feline.nvim
|
||||
fenetikm/falcon
|
||||
fhill2/floating.nvim
|
||||
fhill2/telescope-ultisnips.nvim
|
||||
fiatjaf/neuron.vim
|
||||
filipdutescu/renamer.nvim
|
||||
fisadev/vim-isort
|
||||
|
|
@ -223,6 +224,7 @@ guns/vim-clojure-highlight
|
|||
guns/vim-clojure-static
|
||||
guns/vim-sexp
|
||||
guns/xterm-color-table.vim
|
||||
GustavoKatel/telescope-asynctasks.nvim
|
||||
gyim/vim-boxdraw
|
||||
haringsrob/nvim_context_vt
|
||||
hashivim/vim-packer
|
||||
|
|
@ -654,6 +656,7 @@ pwntester/octo.nvim
|
|||
python-mode/python-mode
|
||||
qnighy/lalrpop.vim
|
||||
qpkorr/vim-bufkill
|
||||
quangnguyen30192/cmp-nvim-ultisnips
|
||||
Quramy/tsuquyomi
|
||||
racer-rust/vim-racer
|
||||
radenling/vim-dispatch-neovim
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.19";
|
||||
version = "5.15.24";
|
||||
release = "1";
|
||||
suffix = "xanmod${release}-tt";
|
||||
in
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-4DChsTFWm/9X0iV9yhWZqOz7dxfNbok7cFLKAYKs+Dw=";
|
||||
sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.41.5";
|
||||
version = "0.42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
sha256 = "sha256-DH1xy1cTVDNNXyOIaayGHzOi4g0ZukNFFbZjufY+XLk=";
|
||||
hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -14,13 +14,15 @@ stdenv.mkDerivation rec {
|
|||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The easy, open source way for everyone in your company to ask questions and learn from data";
|
||||
homepage = "https://metabase.com";
|
||||
license = licenses.agpl3;
|
||||
license = licenses.agpl3Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ schneefux thoughtpolice mmahut ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, curl, libiconv, ncurses, openssl, pcre, pcre2
|
||||
, libkrb5, libaio, liburing, systemd
|
||||
, CoreServices, cctools, perl
|
||||
, jemalloc, less
|
||||
, jemalloc, less, libedit
|
||||
# Server components
|
||||
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
|
||||
, cracklib, judy, libevent, libxml2
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
, withStorageRocks ? true
|
||||
}:
|
||||
|
||||
let # in mariadb # spans the whole file
|
||||
let
|
||||
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds
|
|||
] ++ (packageSettings.extraBuildInputs or [])
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ]
|
||||
++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]))
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
|
||||
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]);
|
||||
|
||||
|
|
|
|||
25
pkgs/tools/audio/mpd-discord-rpc/default.nix
Normal file
25
pkgs/tools/audio/mpd-discord-rpc/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mpd-discord-rpc";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence";
|
||||
homepage = "https://github.com/JakeStanger/mpd-discord-rpc";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsx";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "dnsx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-92J9yRTSk2EP3lXCWH1+Ha+dx3dTNur6LIDMKbGmseI=";
|
||||
sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-692PcWFYNInWcZm9NQHLQmRHGFV9XUSFoCqHo7fcGEU=";
|
||||
vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-purpose DNS toolkit";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtpms";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanberger";
|
||||
repo = "libtpms";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-30P/YggrPEVpsh2qo751aW6RtrpIVe1XQWyYZm8P4yA=";
|
||||
sha256 = "sha256-sfAmyx9MgzCVA1Da7hl6/sKxhS9ptaNLeSB8wmJIKDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -352,6 +352,10 @@ with pkgs;
|
|||
|
||||
buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
|
||||
|
||||
probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
probe-run = callPackage ../development/tools/rust/probe-run {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
|
||||
};
|
||||
|
|
@ -3507,6 +3511,8 @@ with pkgs;
|
|||
|
||||
mpdris2 = callPackage ../tools/audio/mpdris2 { };
|
||||
|
||||
mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { };
|
||||
|
||||
mpd-mpris = callPackage ../tools/audio/mpd-mpris { };
|
||||
|
||||
mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { };
|
||||
|
|
|
|||
|
|
@ -6074,6 +6074,8 @@ in {
|
|||
|
||||
pipdate = callPackage ../development/python-modules/pipdate { };
|
||||
|
||||
pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { };
|
||||
|
||||
pip-tools = callPackage ../development/python-modules/pip-tools { };
|
||||
|
||||
pipx = callPackage ../development/python-modules/pipx { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue