Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ed777c26b3
36 changed files with 234 additions and 88 deletions
|
|
@ -9686,6 +9686,12 @@
|
|||
githubId = 3359345;
|
||||
name = "obadz";
|
||||
};
|
||||
oberblastmeister = {
|
||||
email = "littlebubu.shu@gmail.com";
|
||||
github = "oberblastmeister";
|
||||
githubId = 61095988;
|
||||
name = "Brian Shu";
|
||||
};
|
||||
obsidian-systems-maintenance = {
|
||||
name = "Obsidian Systems Maintenance";
|
||||
email = "maintainer@obsidian.systems";
|
||||
|
|
@ -13500,6 +13506,15 @@
|
|||
fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335";
|
||||
}];
|
||||
};
|
||||
unhammer = {
|
||||
email = "unhammer@fsfe.org";
|
||||
github = "unhammer";
|
||||
githubId = 56868;
|
||||
name = "Kevin Brubeck Unhammer";
|
||||
keys = [{
|
||||
fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C";
|
||||
}];
|
||||
};
|
||||
uniquepointer = {
|
||||
email = "uniquepointer@mailbox.org";
|
||||
matrix = "@uniquepointer:matrix.org";
|
||||
|
|
|
|||
|
|
@ -35,20 +35,20 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||
|
||||
with subtest("create index"):
|
||||
machine.succeed(
|
||||
"curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}"
|
||||
"curl -X POST -H 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}"
|
||||
)
|
||||
indexes = json.loads(machine.succeed("curl ${apiUrl}/indexes"))
|
||||
assert len(indexes) == 1, "index wasn't created"
|
||||
assert indexes["total"] == 1, "index wasn't created"
|
||||
|
||||
with subtest("add documents"):
|
||||
response = json.loads(
|
||||
machine.succeed(
|
||||
"curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}"
|
||||
"curl -X POST -H 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data-binary @${moviesJSON}"
|
||||
)
|
||||
)
|
||||
update_id = response["updateId"]
|
||||
task_uid = response["taskUid"]
|
||||
machine.wait_until_succeeds(
|
||||
f"curl ${apiUrl}/indexes/${uid}/updates/{update_id} | jq -e '.status == \"processed\"'"
|
||||
f"curl ${apiUrl}/tasks/{task_uid} | jq -e '.status == \"succeeded\"'"
|
||||
)
|
||||
|
||||
with subtest("search"):
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "1lvdym7wcg9042an03zxvckq6kmcd5v5snp2ma54f4knj9kmzwyf";
|
||||
sha256 = "1l8axsf9d7a370fs96j16bnsi8fcdgwq036yxc4r4ykpnnskf1ds";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
|
||||
, sigtool, jansson, harfbuzz, sqlite, nixosTests
|
||||
, dontRecurseIntoAttrs, emacsPackagesFor
|
||||
, recurseIntoAttrs, emacsPackagesFor
|
||||
, libgccjit, targetPlatform, makeWrapper # native-comp params
|
||||
, fetchFromSavannah
|
||||
, systemd ? null
|
||||
|
|
@ -216,7 +216,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
|||
|
||||
passthru = {
|
||||
inherit nativeComp;
|
||||
pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
|
||||
pkgs = recurseIntoAttrs (emacsPackagesFor emacs);
|
||||
tests = { inherit (nixosTests) emacs-daemon; };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tesseract";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = version;
|
||||
sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU=";
|
||||
sha256 = "sha256-SvnV6sY+66ozOvgznTE6Gd/GFx/NfugpkpgeANMoUTU=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,18 @@
|
|||
35cab741af069571cf4c55e0ce1ae96617d5778c nixify
|
||||
diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
|
||||
index d8b4039..1ab89f8 100755
|
||||
index d8b4039..1f2a7b5 100755
|
||||
--- a/scripts/msmtpq/msmtpq
|
||||
+++ b/scripts/msmtpq/msmtpq
|
||||
@@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; }
|
||||
## e.g. ( export MSMTP=/path/to/msmtp )
|
||||
if [ "$MSMTP" = "" ] ; then # If MSMTP is unset or empty...
|
||||
MSMTP=msmtp
|
||||
-elif [ ! -x "$MSMTP" ] ; then
|
||||
- log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
|
||||
+# elif [ ! -x "$MSMTP" ] ; then
|
||||
+# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
|
||||
fi
|
||||
##
|
||||
## set the queue var to the location of the msmtp queue directory
|
||||
@@ -71,7 +71,7 @@ fi
|
||||
## ( chmod 0700 msmtp.queue )
|
||||
##
|
||||
|
|
|
|||
|
|
@ -45,14 +45,14 @@ let
|
|||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "manim";
|
||||
format = "pyproject";
|
||||
version = "0.16.0";
|
||||
version = "0.16.0.post0";
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-NQI+kJV0Mu2O/DlwwLYQw2jjJk/TmR7avBX9Fe7zmdk=";
|
||||
sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmplay2";
|
||||
version = "22.06.16";
|
||||
version = "22.08.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaps166";
|
||||
repo = "QMPlay2";
|
||||
rev = version;
|
||||
sha256 = "sha256-nSlmbBCfN+yZlCcgTujBSkZc1uOO0wYpMPUwgLudJEY=";
|
||||
sha256 = "sha256-UQf1aJGoUlXBo2lejw8A3lF6rFOKK6LUGDxRY9207Dw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-vm-tools";
|
||||
version = "12.0.5";
|
||||
version = "12.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "open-vm-tools";
|
||||
rev = "stable-${version}";
|
||||
sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg=";
|
||||
hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/open-vm-tools";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "0.10.0",
|
||||
"sha256": "sha256-3/Ndf7cOZZ9H+Oq6LQgoMcbtUNoBaDuiy5YKT40yA3E=",
|
||||
"depsSha256": "sha256-6FghRXKNXgwxwtGeW+ejVsbaCN7rrCDYu3AZgJCYODU="
|
||||
"version": "0.11.0",
|
||||
"sha256": "sha256-z2KkhTjw8AumD1FWbTCxYB6PHZIWmUPnwBnxKbpHfRQ=",
|
||||
"depsSha256": "sha256-BMi9bVnQjbcvfIi1xup3sZ7QrPtHAdHqdcGlzKw+YbE="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,9 @@
|
|||
, haskellLib
|
||||
|
||||
, # hashes for downloading Hackage packages
|
||||
# This is either a directory or a .tar.gz containing the cabal files and
|
||||
# hashes of Hackage as exemplified by this repository:
|
||||
# https://github.com/commercialhaskell/all-cabal-hashes/tree/hackage
|
||||
all-cabal-hashes
|
||||
|
||||
, # compiler to use
|
||||
|
|
@ -136,10 +139,20 @@ let
|
|||
cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
|
||||
'';
|
||||
|
||||
# Given a package name and version, e.g. name = "async", version = "2.2.4",
|
||||
# gives its cabal file and hashes (JSON file) as discovered from the
|
||||
# all-cabal-hashes value. If that's a directory, it will copy the relevant
|
||||
# files to $out; if it's a tarball, it will extract and move them to $out.
|
||||
all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
|
||||
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
|
||||
mkdir -p $out
|
||||
mv */${name}/${version}/${name}.{json,cabal} $out
|
||||
if [ -d ${all-cabal-hashes} ]
|
||||
then
|
||||
cp ${all-cabal-hashes}/${name}/${version}/${name}.json $out
|
||||
cp ${all-cabal-hashes}/${name}/${version}/${name}.cabal $out
|
||||
else
|
||||
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
|
||||
mv */${name}/${version}/${name}.{json,cabal} $out
|
||||
fi
|
||||
'';
|
||||
|
||||
hackage2nix = name: version: let component = all-cabal-hashes-component name version; in self.haskellSrc2nix {
|
||||
|
|
|
|||
61
pkgs/development/interpreters/cg3/default.nix
Normal file
61
pkgs/development/interpreters/cg3/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, dieHook
|
||||
, cmake
|
||||
, icu
|
||||
, boost
|
||||
}:
|
||||
|
||||
let cg3 = stdenv.mkDerivation rec {
|
||||
pname = "cg3";
|
||||
version = "1.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrammarSoft";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "Ena3dGoZsXOIY6mbvnfI0H7QqRifoxWIBKQrK3yQSmY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
boost
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests.minimal = runCommand "${pname}-test" {
|
||||
buildInputs = [
|
||||
cg3
|
||||
dieHook
|
||||
];
|
||||
} ''
|
||||
echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3
|
||||
printf '"<a>"\n\t"a" tag\n\n' >want.txt
|
||||
printf '"<a>"\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt
|
||||
diff -s want.txt got.txt || die "Grammar application did not produce expected parse"
|
||||
touch $out
|
||||
'';
|
||||
|
||||
|
||||
# TODO, consider optionals:
|
||||
# - Enable tcmalloc unless darwin?
|
||||
# - Enable python bindings?
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/GrammarSoft/cg3";
|
||||
description = "Constraint Grammar interpreter, compiler and applicator vislcg3";
|
||||
maintainers = with maintainers; [ unhammer ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
cg3
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-sdk";
|
||||
version = "22.5.1";
|
||||
version = "22.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Intel-Media-SDK";
|
||||
repo = "MediaSDK";
|
||||
rev = "intel-mediasdk-${version}";
|
||||
sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk=";
|
||||
sha256 = "sha256-HBG1JsTwAbl7p42Crmx82M7VnIaLk0oBXc4SJoIdEIs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "allure-behave";
|
||||
version = "2.9.45";
|
||||
version = "2.10.0";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo=";
|
||||
sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "allure-pytest";
|
||||
version = "2.9.45";
|
||||
version = "2.10.0";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18ys5gi64jlfya6a7shj5lqhwc6cplwgyq3s2n5mg5x513g0yqi0";
|
||||
sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "0.15.1";
|
||||
version = "1.0.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gAi0gKd9ihEseHAvZGda299Z+tw545HzuovKycTUzYY=";
|
||||
sha256 = "sha256-/DR3evRK1d7Kz9dCp4RzeAD5opsYPZF0ox0HqR9u710=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hepunits";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6A5hb+8oF/PGbHXcDkHtJjYkiMzgX5Stz977jgXry1g=";
|
||||
sha256 = "sha256-YJfmlUekg73Az+TRBuRHteuofFUBBg0xLNnWGqniJBQ=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.15.19";
|
||||
version = "0.15.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ch8ddN9J8STw3qjAwP9sAta5YBgEg/2wSYgDyWEAXhU=";
|
||||
sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3-credentials";
|
||||
version = "0.12.1";
|
||||
version = "0.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-w0pwQidSAh/CQPVbv4UocbbETyyOT/rcNFE1ixYz4lY=";
|
||||
hash = "sha256-kzu+ySeAi+nRIJSBSJUQzNHD7KVANlWoi0OWKXkc0/8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-sqlalchemy";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9IooTfzXRmOE22huBSduM4kX8ltI6F50nvkUnXRkAFo=";
|
||||
sha256 = "sha256-dJK1biZ6rEpS4kTncfJzHjBLktDZSsqvSGekbmfhves=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-design";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
format = "flit";
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "sphinx_design";
|
||||
sha256 = "b148a5258061a46ee826d57ea0729260f29b4e9131d2a681545e0d4f3c0f19ee";
|
||||
sha256 = "sha256-cYP6H65Vs37wG9pRJaIe6EH1u8v1mjU4K+WYGAxM77o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
|
|
|||
|
|
@ -1,31 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-fts4";
|
||||
version = "1.0.1";
|
||||
disabled = !isPy3k;
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "15r1mijk306fpm61viry5wjhqyxlbqqdk4nfcd901qarx7vqypgy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sqlite_fts4"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Custom Python functions for working with SQLite FTS4";
|
||||
homepage = "https://github.com/simonw/sqlite-fts4";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ meatcar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.17.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8rp0bfgqPl48RHIPSp3rpDAmPQ0eZnvAbO66jbp6TCk=";
|
||||
sha256 = "sha256-NZFjocmmrOFGnGvLcgJPuUpzfG27FM+CnjUCjxI4l7M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4Hm8zqeRNhIX2aN7JdEX1GruqbEafpBjY1r/vijPs8M=";
|
||||
vendorSha256 = "sha256-DJmN7KAOgKYIzcsOyW3v7PTbuNgFaH0JSdRPDqi0q+w=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.11.2";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ouL3qxBzhsQYXTHTeNM3Ezxo72XY9KwTXNYPlLUr4nU=";
|
||||
sha256 = "sha256-FGRuThptgcNttciYxNLUiY5oVoiODnXgMDiw1hz71mM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1db3Ar3UtHS/MkhiaLt7wHuCCg8qGGL7jOHZXh1TywI=";
|
||||
vendorSha256 = "sha256-8mFTswOgBTSDypgtfovJT9Xsykis7Q1CCQL751SuTY8=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# - favorites_default_to_git_if_not_defined: requires network access to github.com
|
||||
# - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant.
|
||||
checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "--skip git::should_canonicalize" ];
|
||||
++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "cargo, make me a project";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "so";
|
||||
version = "0.4.5";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samtay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KiIffq8olpNpynmV4lwdY0yu2ch4MAwp5VspfLZtkf4=";
|
||||
sha256 = "sha256-LVhYcxXhjFNtmGKapZrmN/5PxCZO6RF9/Wqavg5JLFg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-VBuWKit50cSHYg7WzUP5ein3MEoZN/KFfm+YEEu544Q=";
|
||||
cargoSha256 = "sha256-b+ftdRreGS2weVeZF9zZjkNX28qh+WC6TcMhTumFU3g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pciutils, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ryzenadj";
|
||||
version = "0.10.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlyGoat";
|
||||
repo = "RyzenAdj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SEM+HN5ecxp64jZTOouWuFO1HICtc6M+GitnS+bdfb4=";
|
||||
sha256 = "sha256-tfki+7W2RbqzEHG/Ibton/V5koT89emdQ7aX8WDUzdI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pciutils cmake ];
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ buildGoModule rec {
|
|||
'';
|
||||
|
||||
preBuild = ''
|
||||
if [[ -d vendor ]]; then make -o assets assets-compress plugins; fi
|
||||
if [[ -d vendor ]]; then GOARCH= make -o assets assets-compress plugins; fi
|
||||
'';
|
||||
|
||||
tags = [ "builtinassets" ];
|
||||
|
|
|
|||
|
|
@ -23,11 +23,9 @@ rustPlatform.buildRustPackage {
|
|||
# Default features include mini dashboard which downloads something from the internet.
|
||||
buildNoDefaultFeatures = true;
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];
|
||||
# Test fail at the moment.
|
||||
# > Test "create index" failed with error: "index wasn't created"
|
||||
# passthru.tests = {
|
||||
# meilisearch = nixosTests.meilisearch;
|
||||
# };
|
||||
passthru.tests = {
|
||||
meilisearch = nixosTests.meilisearch;
|
||||
};
|
||||
|
||||
# Tests will try to compile with mini-dashboard features which downloads something from the internet.
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,23 +1,32 @@
|
|||
{ lib, stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, postgresql
|
||||
, openssl
|
||||
, withPam ? stdenv.isLinux
|
||||
, pam
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgpool-II";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
|
||||
url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz";
|
||||
name = "pgpool-II-${version}.tar.gz";
|
||||
sha256 = "sha256-bHNDS67lgThqlVX+WWKL9GeCD31b2+M0F2g5mgOCyXk=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql openssl pam libmemcached ];
|
||||
buildInputs = [
|
||||
postgresql
|
||||
openssl
|
||||
] ++ lib.optional withPam pam;
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--with-openssl"
|
||||
] ++ lib.optional (pam != null) "--with-pam"
|
||||
++ lib.optional (libmemcached != null) "--with-memcached=${libmemcached}";
|
||||
] ++ lib.optional withPam "--with-pam";
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=\${out}/etc"
|
||||
|
|
@ -30,5 +39,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A middleware that works between postgresql servers and postgresql clients";
|
||||
license = licenses.free;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
31
pkgs/tools/misc/trashy/default.nix
Normal file
31
pkgs/tools/misc/trashy/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trashy";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oberblastmeister";
|
||||
repo = "trashy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preFixup = ''
|
||||
installShellCompletion --cmd trash \
|
||||
--bash <($out/bin/trash completions bash) \
|
||||
--fish <($out/bin/trash completions fish) \
|
||||
--zsh <($out/bin/trash completions zsh) \
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, fast, and featureful alternative to rm and trash-cli.";
|
||||
homepage = "https://github.com/oberblastmeister/trashy";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ oberblastmeister ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,13 +4,13 @@ let
|
|||
generic = { pname, packageToBuild, description }:
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "rekor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jwV6qPItuNrXl3rknY2RVIw3f3VwyiEefomnvGKiluI=";
|
||||
sha256 = "sha256-55socfx7qTQ3F5JcDgPTHQP+96X7lwFJ8IIz52hFxow=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -23,7 +23,7 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qT1vY+YLmehQYS+jiCEx7vOJACIGPcl7VNfUEMc8w0U=";
|
||||
vendorSha256 = "sha256-A3fG756BoUSJwxyGdfpJlbb+nVQgzo39mjT+QD4knlk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul-template";
|
||||
version = "0.29.0";
|
||||
version = "0.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "consul-template";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HxzniR4z3YzvFww3KqhtelaqMQJBsSw83pfz+jHxvKQ=";
|
||||
sha256 = "sha256-wvnOKbxS1j+MhmOs9INPusA1whLDo1sLGNxmzBQWPWc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wRNfxJVX45dfIBZ0sy48qbPkAsD0CIB1PDTiGs8Fjhs=";
|
||||
vendorSha256 = "sha256-uR1hzP17hFo9DUNCeKcwepZSxJJoV8WBsX9l+1CR4Ek=";
|
||||
|
||||
# consul-template tests depend on vault and consul services running to
|
||||
# execute tests so we skip them here
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hostctl";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guumaster";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rvUm31WRSLusM9VGsIHKGTH6Vs8LWPtzPDs3azA710w=";
|
||||
hash = "sha256-3CfUU74e79eilu7WP+EeoGlXUYnxmRpjb8RaH/XXjxo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M=";
|
||||
vendorSha256 = "sha256-3UM9w3o3qSlUvgg0k87aODJXqx1ryFvxHs6hlovBILY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -384,7 +384,6 @@ mapAliases ({
|
|||
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
|
||||
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
|
||||
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
|
||||
emacsPackages = emacs.pkgs; # Added 2020-12-18
|
||||
emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22
|
||||
emacsPackagesNg = emacs.pkgs; # Added 2019-08-07
|
||||
emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07
|
||||
|
|
|
|||
|
|
@ -11628,6 +11628,8 @@ with pkgs;
|
|||
|
||||
trash-cli = callPackage ../tools/misc/trash-cli { };
|
||||
|
||||
trashy = callPackage ../tools/misc/trashy { };
|
||||
|
||||
trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom {
|
||||
inherit (xorg) libXxf86vm;
|
||||
};
|
||||
|
|
@ -14852,6 +14854,8 @@ with pkgs;
|
|||
|
||||
ceptre = callPackage ../development/interpreters/ceptre { };
|
||||
|
||||
cg3 = callPackage ../development/interpreters/cg3 { };
|
||||
|
||||
cling = callPackage ../development/interpreters/cling { };
|
||||
|
||||
clips = callPackage ../development/interpreters/clips { };
|
||||
|
|
@ -23303,10 +23307,7 @@ with pkgs;
|
|||
|
||||
pgbouncer = callPackage ../servers/sql/pgbouncer { };
|
||||
|
||||
pgpool = callPackage ../servers/sql/pgpool {
|
||||
pam = if stdenv.isLinux then pam else null;
|
||||
libmemcached = null; # Detection is broken upstream
|
||||
};
|
||||
pgpool = callPackage ../servers/sql/pgpool { };
|
||||
|
||||
tang = callPackage ../servers/tang {
|
||||
asciidoc = asciidoc-full;
|
||||
|
|
@ -27127,6 +27128,9 @@ with pkgs;
|
|||
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
|
||||
};
|
||||
|
||||
# This alias should live in aliases.nix but that would cause Hydra not to evaluate/build the packages.
|
||||
emacsPackages = emacs.pkgs;
|
||||
|
||||
inherit (gnome) empathy;
|
||||
|
||||
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue