gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-03 00:02:20 +00:00
committed by GitHub
parent cc3ee6d82b 5704f71613
commit 4b2e2c8b39
58 changed files with 1001 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+12
View File
@@ -1639,6 +1639,12 @@
fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B";
}];
};
azd325 = {
email = "tim.kleinschmidt@gmail.com";
github = "Azd325";
githubId = 426541;
name = "Tim Kleinschmidt";
};
azuwis = {
email = "azuwis@gmail.com";
github = "azuwis";
@@ -10680,6 +10686,12 @@
githubId = 708570;
name = "Manuel Mendez";
};
mmusnjak = {
email = "marko.musnjak@gmail.com";
github = "mmusnjak";
githubId = 668956;
name = "Marko Mušnjak";
};
mnacamura = {
email = "m.nacamura@gmail.com";
github = "mnacamura";
nixos/modules/services/misc/ntfy-sh.nix
+12
View File
@@ -61,8 +61,17 @@ in
services.ntfy-sh.settings = {
auth-file = mkDefault "/var/lib/ntfy-sh/user.db";
listen-http = mkDefault "127.0.0.1:2586";
attachment-cache-dir = mkDefault "/var/lib/ntfy-sh/attachments";
cache-file = mkDefault "/var/lib/ntfy-sh/cache-file.db";
};
systemd.tmpfiles.rules = [
"f ${cfg.settings.auth-file} 0600 ${cfg.user} ${cfg.group} - -"
"d ${cfg.settings.attachment-cache-dir} 0700 ${cfg.user} ${cfg.group} - -"
"f ${cfg.settings.cache-file} 0600 ${cfg.user} ${cfg.group} - -"
];
systemd.services.ntfy-sh = {
description = "Push notifications server";
@@ -74,6 +83,7 @@ in
User = cfg.user;
StateDirectory = "ntfy-sh";
DynamicUser = true;
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
PrivateTmp = true;
NoNewPrivileges = true;
@@ -88,6 +98,8 @@ in
RestrictNamespaces = true;
RestrictRealtime = true;
MemoryDenyWriteExecute = true;
# Upstream Recommandation
LimitNOFILE = 20500;
};
};
nixos/tests/all-tests.nix
+1
View File
@@ -614,6 +614,7 @@ in {
postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};
postfixadmin = handleTest ./postfixadmin.nix {};
postgis = handleTest ./postgis.nix {};
apache_datasketches = handleTest ./apache_datasketches.nix {};
postgresql = handleTest ./postgresql.nix {};
postgresql-jit = handleTest ./postgresql-jit.nix {};
postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
nixos/tests/apache_datasketches.nix
+29
View File
@@ -0,0 +1,29 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "postgis";
meta = with pkgs.lib.maintainers; {
maintainers = [ lsix ]; # TODO: Who's the maintener now?
};
nodes = {
master =
{ pkgs, ... }:
{
services.postgresql = let mypg = pkgs.postgresql_15; in {
enable = true;
package = mypg;
extraPlugins = with mypg.pkgs; [
apache_datasketches
];
};
};
};
testScript = ''
start_all()
master.wait_for_unit("postgresql")
master.sleep(10) # Hopefully this is long enough!!
master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION datasketches;'")
master.succeed("sudo -u postgres psql -c 'SELECT hll_sketch_to_string(hll_sketch_build(1));'")
'';
})
nixos/tests/ntfy-sh.nix
+6 -3
View File
@@ -3,6 +3,7 @@ import ./make-test-python.nix {
nodes.machine = { ... }: {
services.ntfy-sh.enable = true;
services.ntfy-sh.settings.base-url = "http://localhost:2586";
};
testScript = ''
@@ -12,12 +13,14 @@ import ./make-test-python.nix {
machine.wait_for_unit("multi-user.target")
machine.wait_for_open_port(80)
machine.wait_for_open_port(2586)
machine.succeed(f"curl -d '{msg}' localhost:80/test")
machine.succeed(f"curl -d '{msg}' localhost:2586/test")
notif = json.loads(machine.succeed("curl -s localhost:80/test/json?poll=1"))
notif = json.loads(machine.succeed("curl -s localhost:2586/test/json?poll=1"))
assert msg == notif["message"], "Wrong message"
machine.succeed("ntfy user list")
'';
}
pkgs/applications/editors/jetbrains/default.nix
+28
View File
@@ -93,6 +93,21 @@ let
};
});
buildDataSpell = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct {
inherit pname version src wmClass jdk;
product = "DataSpell";
meta = with lib; {
homepage = "https://www.jetbrains.com/dataspell/";
inherit description license platforms;
longDescription = ''
DataSpell is a new IDE from JetBrains built for Data Scientists.
Mainly it integrates Jupyter notebooks in the IntelliJ platform.
'';
maintainers = with maintainers; [ leona ];
};
});
buildGateway = { pname, version, src, license, description, wmClass, product, ... }:
(mkJetBrainsProduct {
inherit pname version src wmClass jdk product;
@@ -320,6 +335,19 @@ in
update-channel = products.datagrip.update-channel;
};
dataspell = buildDataSpell rec {
pname = "dataspell";
version = products.dataspell.version;
description = "The IDE for Professional Data Scientists";
license = lib.licenses.unfree;
src = fetchurl {
url = products.dataspell.url;
sha256 = products.dataspell.sha256;
};
wmClass = "jetbrains-dataspell";
update-channel = products.dataspell.update-channel;
};
gateway = buildGateway rec {
pname = "gateway";
product = "JetBrains Gateway";
pkgs/applications/editors/jetbrains/versions.json
+24
View File
@@ -16,6 +16,14 @@
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.tar.gz",
"build_number": "231.9011.35"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
"version": "2023.1",
"sha256": "12856b7571ff789a427361cfcb4cb1743e7f3af77f611ceda57aafe847328865",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.tar.gz",
"build_number": "231.8109.197"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
@@ -123,6 +131,14 @@
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.dmg",
"build_number": "231.9011.35"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
"version": "2023.1",
"sha256": "dc118f466b6e5fa3e6c449f25977d5d1fc6746c004a000464802c535a1bdaa90",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.dmg",
"build_number": "231.8109.197"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
@@ -230,6 +246,14 @@
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2-aarch64.dmg",
"build_number": "231.9011.35"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "7b5b4388303bf7d381597995e3f4d5684c0f60a4e5ad5a4481ab4e451be6e2cf",
"url": "https://download.jetbrains.com/python/dataspell-2023.1-aarch64.dmg",
"build_number": "231.8109.197"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
pkgs/applications/editors/vscode/extensions/default.nix
+89 -8
View File
@@ -616,18 +616,51 @@ let
};
};
catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension {
catppuccin = {
catppuccin-vsc = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "catppuccin-vsc";
publisher = "catppuccin";
version = "2.6.1";
sha256 = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY=";
};
meta = {
description = "Soothing pastel theme for VSCode";
license = lib.licenses.mit;
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc";
maintainers = [ lib.maintainers.nullx76 ];
};
};
catppuccin-vsc-icons = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "catppuccin-vsc-icons";
publisher = "catppuccin";
version = "0.12.0";
sha256 = "sha256-i47tY6DSVtV8Yf6AgZ6njqfhaUFGEpgbRcBF70l2Xe0=";
};
meta = {
description = "Soothing pastel icon theme for VSCode";
license = lib.licenses.mit;
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc-icons";
maintainers = [ lib.maintainers.laurent-f1z1 ];
};
};
};
charliermarsh.ruff = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "catppuccin-vsc";
publisher = "catppuccin";
version = "2.6.1";
sha256 = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY=";
name = "ruff";
publisher = "charliermarsh";
version = "2023.16.0";
sha256 = "sha256-MCRfG2CmGXLX15Qv/cxuH8VE1lJLPs4tXlCNnFqm5lc=";
};
meta = {
description = "Soothing pastel theme for VSCode";
license = lib.licenses.mit;
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc";
maintainers = [ lib.maintainers.nullx76 ];
changelog = "https://github.com/charliermarsh/ruff-vscode/releases";
description = "Ruff extension for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff";
homepage = "https://github.com/charliermarsh/ruff-vscode/";
maintainers = [ lib.maintainers.azd325 ];
};
};
@@ -1452,6 +1485,22 @@ let
};
};
github.copilot-chat = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
name = "copilot-chat";
version = "0.1.2023060101";
sha256 = "sha256-g3UIcy2TpD3m8EamxneUXYAV/bbCPvPhOWdcuXPkK9g=";
};
meta = {
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot-chat";
homepage = "https://github.com/features/copilot";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.laurent-f1z1 ];
};
};
github.github-vscode-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "github-vscode-theme";
@@ -1737,6 +1786,22 @@ let
};
};
janet-lang.vscode-janet = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-janet";
publisher = "janet-lang";
version = "0.0.2";
sha256 = "sha256-oj0e++z2BtadIXOnTlocIIHliYweZ1iyrV08DwatfLI=";
};
meta = {
description = "Janet language support for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=janet-lang.vscode-janet";
homepage = "https://github.com/janet-lang/vscode-janet";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.wackbyte ];
};
};
jdinhlife.gruvbox = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gruvbox";
@@ -2774,6 +2839,22 @@ let
};
};
seatonjiang.gitmoji-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "seatonjiang";
name = "gitmoji-vscode";
version = "1.2.2";
sha256 = "sha256-+lwbCLV62y1IHrjCygBphQZJUu+ZApYTwBQld5uu12w=";
};
meta = {
description = "Gitmoji tool for git commit messages in VSCode";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=seatonjiang.gitmoji-vscode";
homepage = "https://github.com/seatonjiang/gitmoji-vscode/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.laurent-f1z1 ];
};
};
serayuzgur.crates = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "crates";
pkgs/applications/file-managers/browsr/default.nix
+85
View File
@@ -0,0 +1,85 @@
{ lib
, python3
, fetchFromGitHub
, extras ? [ "all" ]
}:
python3.pkgs.buildPythonApplication rec {
pname = "browsr";
version = "1.10.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "juftin";
repo = "browsr";
rev = "v${version}";
hash = "sha256-AT5cFQ4CldlHv3MQYAGXdZVB3bNAAvbJeosdxZjcPBM=";
};
nativeBuildInputs = with python3.pkgs; [
hatchling
pythonRelaxDepsHook
pytestCheckHook
];
propagatedBuildInputs = with python3.pkgs; [
art
click
fsspec
pandas
pillow
pymupdf
rich
rich-click
rich-pixels
textual
universal-pathlib
] ++ lib.attrVals extras passthru.optional-dependencies;
passthru.optional-dependencies = with python3.pkgs; {
all = [
adlfs
aiohttp
gcsfs
paramiko
pyarrow
requests
s3fs
];
parquet = [
pyarrow
];
remote = [
adlfs
aiohttp
gcsfs
paramiko
requests
s3fs
];
};
pythonRelaxDeps = [
"fsspec"
"pymupdf"
"rich-click"
"textual"
];
pythonImportsCheck = [ "browsr" ];
# requires internet access
disabledTests = [
"test_github_screenshot"
"test_github_screenshot_license"
"test_textual_app_context_path_github"
];
meta = with lib; {
description = "A file explorer in your terminal";
homepage = "https://github.com/juftin/browsr";
changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/applications/graphics/halftone/default.nix
+61
View File
@@ -0,0 +1,61 @@
{ lib
, fetchFromGitHub
, wrapGAppsHook4
, meson
, ninja
, pkg-config
, appstream-glib
, desktop-file-utils
, gobject-introspection
, glib
, blueprint-compiler
, libadwaita
, python3Packages
}:
python3Packages.buildPythonApplication rec {
pname = "halftone";
version = "0.2.1";
src = fetchFromGitHub {
owner = "tfuxu";
repo = pname;
rev = version;
hash = "sha256-EYxnGpVKPV3Xg6dH3m1aC3/pDigUxkNF7C8U16n8al8=";
};
format = "other";
dontWrapGApps = true;
nativeBuildInputs = [
appstream-glib
blueprint-compiler
desktop-file-utils
meson
ninja
pkg-config
wrapGAppsHook4
glib
gobject-introspection
];
buildInputs = [
libadwaita
];
propagatedBuildInputs = with python3Packages; [
pygobject3
wand
];
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
homepage = "https://github.com/tfuxu/halftone";
description = "Simple app for giving images that pixel-art style";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ foo-dogsquared ];
};
}
pkgs/applications/misc/p2pool/default.nix
+2 -2
View File
@@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation rec {
pname = "p2pool";
version = "3.3";
version = "3.4";
src = fetchFromGitHub {
owner = "SChernykh";
repo = "p2pool";
rev = "v${version}";
sha256 = "sha256-sCG2Dr0gDznOyuSCVm/Zop+64elUZLt+XSDff2jQlwg=";
sha256 = "sha256-JtBl+ZNqBbCl8gFZy+q5PP2qoRKULA++leGsyrT3DaQ=";
fetchSubmodules = true;
};
pkgs/applications/networking/cluster/kubectl-images/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-images";
version = "0.5.2";
version = "0.6.1";
src = fetchFromGitHub {
owner = "chenjiandongx";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aDWtLTnMQklTU6X6LF0oBuh1317I5/kiEZVePgJjIdU";
sha256 = "sha256-Zs9ok5jDhNeEw+dbER0cpLYn41uXwHNx0w0t1A3CSlI=";
};
vendorSha256 = "sha256-FxaOOFwDf3LNREOlA7frqhDXzc91LC3uJev3kzLDEy8";
vendorHash = "sha256-8zV2iZ10H5X6fkRqElfc7lOf3FhmDzR2lb3Jgyhjyio=";
postInstall = ''
mv $out/bin/cmd $out/bin/kubectl-images
pkgs/applications/networking/cluster/kyverno/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.9.5";
version = "1.10.0";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-e/CZ5XiJFvj/HVSBPTyLybu5ZZNVte3Bf/qGhEK7k80=";
sha256 = "sha256-Phiswg3ouIVkk1hsO0Hm5mFdcpZb403ypETrKKHOyTw=";
};
ldflags = [
@@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorHash = "sha256-5eHLnzbjqbF8meHMfSo6NuK+SdokRkyPwoedunU2ECs=";
vendorHash = "sha256-AjfWxRwAWLX/TF1bI6Q7AUcfYhMHBgDNtKQsZSrBMn4=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+4
View File
@@ -123,6 +123,10 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
mimeTypes = [ "x-scheme-handler/element" ];
};
postFixup = lib.optionalString stdenv.isDarwin ''
cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns
'';
passthru = {
updateScript = ./update.sh;
pkgs/applications/office/morgen/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "morgen";
version = "2.7.0";
version = "2.7.2";
src = fetchurl {
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
sha256 = "sha256-v01mytnyJA1GQ/9/+7/HDIbwW1Jl4dpgf+84k0sRf4o=";
sha256 = "sha256-s3gGDBxT0kHEuWiE79P/CKMknTljIdxzAP4GkS+hk+g=";
};
nativeBuildInputs = [
pkgs/applications/radio/sdrangel/default.nix
+2 -2
View File
@@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "sdrangel";
version = "7.14.1";
version = "7.14.2";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
hash = "sha256-AsKjsoIyGjGpRGA+pYQsO4x2C5Rb7xaG+Q0cS3xANcM=";
hash = "sha256-A9/uOecV1qRbAGcKI1brPFsbjfJG/8/zKrMwKMGw9rE=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];
pkgs/development/compilers/bfc/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib
, rustPlatform
, fetchFromGitHub
, llvmPackages_13
, libxml2
, ncurses
, zlib
}:
rustPlatform.buildRustPackage {
pname = "bfc";
version = "unstable-2023-02-02";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "bfc";
rev = "647379de6ec36b64ba0a098589c8374d0ce32690";
hash = "sha256-pPx9S7EnrL6aIvLlrCjGDKNYLhzd6ud1RvN+qCiZGXk=";
};
cargoHash = "sha256-5RPB4biLB2BTmfgOGzvnnQjnGp3cTmJdU1CVTAFRvKE=";
buildInputs = [
libxml2
ncurses
zlib
];
env = {
LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev;
};
# process didn't exit successfully: <...> SIGSEGV
doCheck = false;
meta = with lib; {
description = "An industrial-grade brainfuck compiler";
homepage = "https://bfc.wilfred.me.uk";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/development/libraries/armadillo/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "12.2.0";
version = "12.4.0";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-sNzgQil+hlrdM1Ha1394wsdjjWYy9YNXsBXlDty9IYY=";
sha256 = "sha256-mQUoJ4HO0/mXabDkWnBey1AZLKFiIwBwezMC6hZ9yIM=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/spice/default.nix
+3 -3
View File
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "spice";
version = "0.15.1";
version = "0.15.2";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
sha256 = "ramvZ6syGRa9frWePWGaSneWwIooxzLt/H8C/ICxo3o=";
sha256 = "sha256-bZ62EX8DkXRxxLwQAEq+z/SKefuF64WhxF8CM3cBW4E=";
};
patches = [
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs build-aux
# Forgotten in 0.15.1 tarball
# Forgotten in 0.15.2 tarball
sed -i /meson.add_dist_script/d meson.build
'';
pkgs/development/python-modules/aigpy/default.nix
+30
View File
@@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, mutagen
, requests
, colorama
, prettytable
, pycrypto
, pydub
}:
buildPythonPackage rec {
pname = "aigpy";
version = "2022.7.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w=";
};
propagatedBuildInputs = [ mutagen requests colorama prettytable pycrypto pydub ];
meta = {
homepage = "https://github.com/AIGMix/AIGPY";
description = "A python library with miscellaneous tools";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.misterio77 ];
platforms = lib.platforms.all;
};
}
pkgs/development/python-modules/art/default.nix
+38
View File
@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "art";
version = "5.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "sepandhaghighi";
repo = "art";
rev = "v${version}";
hash = "sha256-3fX0kYYyeJ9tHX8/+hlv5aRE6LujXW915N5Ov6Q+EW8=";
};
pythonImportsCheck = [ "art" ];
# TypeError: art() missing 1 required positional argument: 'artname'
checkPhase = ''
runHook preCheck
$out/bin/art
$out/bin/art test
$out/bin/art test2
runHook postCheck
'';
meta = with lib; {
description = "ASCII art library for Python";
homepage = "https://github.com/sepandhaghighi/art";
changelog = "https://github.com/sepandhaghighi/art/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/development/python-modules/dtlssocket/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "dtlssocket";
version = "0.1.14";
version = "0.1.15";
format = "pyproject";
src = fetchPypi {
pname = "DTLSSocket";
inherit version;
hash = "sha256-BLNfdKDKUvc+BJnhLqx7VzJg0opvrdaXhNLCigLH02k=";
hash = "sha256-RWscUxJsmLkI2GPjnpS1oJVPsJ+xbqPAKk4Q1G7ISu4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/furo/default.nix
+11 -2
View File
@@ -2,6 +2,7 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
, pythonRelaxDepsHook
, sphinx
, beautifulsoup4
, sphinx-basic-ng
@@ -9,7 +10,7 @@
buildPythonPackage rec {
pname = "furo";
version = "2023.3.27";
version = "2023.5.20";
format = "wheel";
disable = pythonOlder "3.7";
@@ -18,9 +19,17 @@ buildPythonPackage rec {
inherit pname version format;
dist = "py3";
python = "py3";
hash = "sha256-SrK+JUotXlJ5LQynk6EsNVgt0JiXIopt1HiF2r1clSE=";
hash = "sha256-WUqENt3+DAcfOp6aIJwxSiGdg0Hz8a8z/ffGlUT6ueY=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"sphinx"
];
propagatedBuildInputs = [
sphinx
beautifulsoup4
pkgs/development/python-modules/hvplot/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "hvplot";
version = "0.8.2";
version = "0.8.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs=";
hash = "sha256-JiuN5WNEcN4jaUgVgvoHjx5Zj9fldYwoPhuGBawuhiM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/peewee-migrate/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "peewee-migrate";
version = "1.7.1";
version = "1.10.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "klen";
repo = "peewee_migrate";
rev = "refs/tags/${version}";
hash = "sha256-s7/Ev4nAKUr5OBgziETVCtjlxvBoeoZXriUBuAUi4eE=";
hash = "sha256-YDL7J/LmCRz6kRHQ0NrnVnvtS3rFkH08umjPI95mn6w=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-roborock/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "0.20.1";
version = "0.20.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
rev = "refs/tags/v${version}";
hash = "sha256-JtbtAiQnAeGUoBS954xIEXHZkk3s976amodlFJOOJZY=";
hash = "sha256-AmvUJmvbsVRlKOreF+3JvtLujLqtM04CL94chd85Wk8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/rich-pixels/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, syrupy
, pillow
, rich
}:
buildPythonPackage rec {
pname = "rich-pixels";
version = "2.1.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "darrenburns";
repo = "rich-pixels";
rev = version;
hash = "sha256-zI6jtEdmBAEGxyASo/6fiHdzwzoSwXN7A5x1CmYS5qc=";
};
nativeBuildInputs = [
poetry-core
];
nativeCheckInputs = [
pytestCheckHook
];
checkInputs = [
syrupy
];
propagatedBuildInputs = [
pillow
rich
];
pythonImportsCheck = [ "rich_pixels" ];
meta = with lib; {
description = "A Rich-compatible library for writing pixel images and ASCII art to the terminal";
homepage = "https://github.com/darrenburns/rich-pixels";
changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${src.rev}";
# upstream has no license specified
# https://github.com/darrenburns/rich-pixels/issues/11
license = licenses.unfree;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/development/python-modules/universal-pathlib/default.nix
+37
View File
@@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, fsspec
}:
buildPythonPackage rec {
pname = "universal-pathlib";
version = "0.0.23";
format = "pyproject";
src = fetchFromGitHub {
owner = "fsspec";
repo = "universal_pathlib";
rev = "v${version}";
hash = "sha256-UT4S7sqRn0/YFzFL1KzByK44u8G7pwWHERzJEm7xmiw=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
fsspec
];
pythonImportsCheck = [ "upath" ];
meta = with lib; {
description = "Pathlib api extended to use fsspec backends";
homepage = "https://github.com/fsspec/universal_pathlib";
changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/development/tools/buf/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "buf";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
hash = "sha256-vLiOAlzIrIwMKPn8yl/YyFmXbFHFAZB1yLejQbAEivg=";
hash = "sha256-Tr8vsa7PfjoShep2/qhMFLWd4H9xXm9G2YwDS3RenSE=";
};
vendorHash = "sha256-DT3vffs33hGlylQLKc5o7Xble8Blyy4hgvE27CHnmJc=";
vendorHash = "sha256-NnN0MvcyMdIc7vCTTz8yHdRu0SzmmO0DgyYR2k9NPdk=";
patches = [
# Skip a test that requires networking to be available to work.
pkgs/development/tools/database/mermerd/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "mermerd";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "KarnerTh";
repo = "mermerd";
rev = "refs/tags/v${version}";
hash = "sha256-15eaZ7EwKysRjXGbS0okMUkmwSxtb+CP08JWLoj/L8c=";
hash = "sha256-fqM+sOWk3gqbZ5xKR6CS1SY5bSRrAhHcM1d6ugqFbw4=";
};
vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ=";
pkgs/development/tools/earthly/default.nix
+22 -15
View File
@@ -1,35 +1,42 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, stdenv }:
buildGoModule rec {
pname = "earthly";
version = "0.6.23";
version = "0.7.7";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "sha256-RbLAnk2O7wqY0OQLprWuRDUWMicqcLOPia+7aRuXbsk=";
sha256 = "sha256-tYoC9OCNAtdQwWyznac5PVl7KLObbFfjs138y5LeQ2A=";
};
vendorSha256 = "sha256-MDyQ9Wn5A5F5CQCfEXzkXZi/Fg6sT/Ikv+Y7fvLY8LA=";
vendorSha256 = "sha256-1y34WH1JGAs1eDxreHMqUlGTyrixUFIV1DPN/N5wzS4=";
subPackages = [ "cmd/earthly" "cmd/debugger" ];
CGO_ENABLED = 0;
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X main.Version=v${version}"
"-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}"
"-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${version}"
"-X main.GitSha=v${version}"
"-X main.DefaultInstallationName=earthly"
] ++ lib.optionals stdenv.isLinux [
"-extldflags '-static'"
];
BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork";
preBuild = ''
makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}")
'';
# For some reasons the tests fail, but the program itself seems to work.
doCheck = false;
tags = [
"dfrunmount"
"dfrunnetwork"
"dfrunsecurity"
"dfsecrets"
"dfssh"
];
postInstall = ''
mv $out/bin/debugger $out/bin/earthly-debugger
mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater
'';
meta = with lib; {
@@ -37,6 +44,6 @@ buildGoModule rec {
homepage = "https://earthly.dev/";
changelog = "https://github.com/earthly/earthly/releases/tag/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ zoedsoupe ];
maintainers = with maintainers; [ zoedsoupe konradmalik ];
};
}
pkgs/development/tools/hclfmt/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hclfmt";
version = "2.16.2";
version = "2.17.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "hcl";
rev = "v${version}";
hash = "sha256-7RHRUIZhF6UOZDi85HAzQhzD7c8Y4aPjt4Ly3KUM26k=";
hash = "sha256-6OALbouj1b6Jbtv0znpkfgYS4MyBpxQ56Sen3OJYaHs=";
};
vendorHash = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs=";
vendorHash = "sha256-SjewF3q4vQ3oWR+vxqpZVP6St8db/GXezTDWYUeK2g8=";
# The code repository includes other tools which are not useful. Only build
# hclfmt.
pkgs/development/tools/misc/typical/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "typical";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = "typical";
rev = "v${version}";
hash = "sha256-MkMcJY0J3wvJE01VpphS84zNWv62hbed5ZypvLzrnpo=";
hash = "sha256-4OByyczbHucav9v9pXqWYyreG+F36G0IodcDTedJxic=";
};
cargoHash = "sha256-msRfZYvDnb/WeKZhCIabUB2k/AzSYVU1OYdwZNbANbM=";
cargoHash = "sha256-BtnPCMBPVUGL+6ufhE2TF+dnHCeC/12DMHBaTPlYqBg=";
nativeBuildInputs = [
installShellFiles
pkgs/development/tools/relic/default.nix
+19 -2
View File
@@ -1,4 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
, testers
, relic
}:
buildGoModule rec {
pname = "relic";
@@ -13,11 +18,23 @@ buildGoModule rec {
vendorHash = "sha256-EZohpGzMDYKUbjSOIfoUbbsABNDOddrTt52pv+VQLdI=";
ldflags = [
"-s"
"-w"
"-X=main.version=${version}"
"-X=main.commit=${src.rev}"
];
passthru.tests = {
version = testers.testVersion {
package = relic;
};
};
meta = with lib; {
homepage = "https://github.com/sassoftware/relic";
description = "A service and a tool for adding digital signatures to operating system packages for Linux and Windows";
license = licenses.asl20;
maintainers = with maintainers; [ strager ];
platforms = platforms.unix;
};
}
pkgs/development/web/deno/default.nix
+3 -3
View File
@@ -11,15 +11,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.34.0";
version = "1.34.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-B9YzJsnbohzQQQj2Ec1szh/aY2zoYFOoEXTShwOzMlE=";
hash = "sha256-LpW1cbedMPG8VeuQldfYfnxdLrOeDSSf60WfYJbDwHw=";
};
cargoHash = "sha256-rwN7pEb6bDLb7YrcfuWC9Y0m7b+50AeLKMKx7WLKYT8=";
cargoHash = "sha256-HRsEekv1vSDm2Nk7xvcRmMfHxl4M6BWwHbdPNNop4Ic=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
pkgs/development/web/deno/librusty_v8.nix
+5 -5
View File
@@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.72.0";
version = "0.73.0";
shas = {
x86_64-linux = "sha256-APF8pCLLJ2m2XdvsecEQu5HBuNZx+WO/qRGdwogZi10=";
aarch64-linux = "sha256-clhSbml1qnPGEU6KfhVouIHqWTWjZeN6xLw+AIhHuKI=";
x86_64-darwin = "sha256-2pEpeDJucUIOY0pOpbaUAKW4is7A1Axz+ZDhDSiIEa8=";
aarch64-darwin = "sha256-BL9u5nS0okQyLzLWJh70vyqBoSGW6bJaYzxeCNHGBwg=";
x86_64-linux = "sha256-rDthrqAs4yUl9BpFm8yJ2sKbUImydMMZegUBhcu6vdk=";
aarch64-linux = "sha256-fM7yteYrPxCLNIUKvUpH6XTdD2aYsK4SEyrkknZgzLk=";
x86_64-darwin = "sha256-3c3oNq6WJkFR7E/EeJ7CnN+JO7X5x+wSlqo39TbEDQk=";
aarch64-darwin = "sha256-fO1R99XWfgAGcZXJX8nHbfnPZOlz28kXO7fkkeEF43A=";
};
}
pkgs/development/web/netlify-cli/generate.sh
+1 -1
View File
@@ -10,5 +10,5 @@ node2nix \
--output node-packages.nix \
--composition composition.nix \
--node-env node-env.nix \
--nodejs-16 \
--nodejs-18 \
;
pkgs/development/web/netlify-cli/node-env.nix
+5 -2
View File
@@ -530,12 +530,15 @@ let
then
ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
# Fixup all executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
if isScript "$file"
then
sed -i 's/\r$//' "$file" # convert crlf to lf
fi
done
fi
pkgs/games/doom-ports/slade/default.nix
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "slade";
version = "3.2.2";
version = "3.2.3";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = version;
sha256 = "sha256-UAxGNJ66o5wO8i/g0CgY395uHfJRJSxTlXlBbhgDAbM=";
sha256 = "sha256-YZTCviGhOlAgD3RidPu8gPqqo4MLURiBGV7nazILwFg=";
};
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
pkgs/games/maptool/default.nix
+119
View File
@@ -0,0 +1,119 @@
{ lib
, copyDesktopItems
, fetchurl
, ffmpeg
, gitUpdater
, jre
, libarchive
, makeDesktopItem
, openjfx
, stdenvNoCC
, wrapGAppsHook
}:
let
pname = "maptool";
version = "1.13.0";
repoBase = "https://github.com/RPTools/${pname}";
src = fetchurl {
url = "${repoBase}/releases/download/${version}/MapTool-${version}.jar";
hash = "sha256-0jiUYdr2KwMNc8VBgJsEsf4dkrzYfMGwv+jT1RLhUAg=";
};
icon = fetchurl {
url = "https://raw.githubusercontent.com/RPTools/${pname}/${version}/package/linux/MapTool.png";
hash = "sha256-xkVYjMprTanHu8r4b9PHORI8E1aJp+9KDSP5mqCE8ew=";
};
meta = with lib; {
description = "Virtual Tabletop for playing roleplaying games with remote players or face to face";
homepage = "https://www.rptools.net/toolbox/maptool/";
sourceProvenance = with sourceTypes; [
binaryBytecode
binaryNativeCode
];
license = licenses.agpl3;
maintainers = with maintainers; [ rhendric ];
};
javafxModules = [ "base" "controls" "media" "swing" "web" "fxml" "graphics" ];
classpath =
lib.concatMap (mod: [
"${openjfx}/modules_src/javafx.${mod}/module-info.java"
"${openjfx}/modules/javafx.${mod}"
"${openjfx}/modules_libs/javafx.${mod}"
]) javafxModules ++
[ src ];
jvmArgs = [
"-cp" (lib.concatStringsSep ":" classpath)
"-Xss8M"
"-Dsun.java2d.d3d=false"
"-Dfile.encoding=UTF-8"
"-Dpolyglot.engine.WarnInterpreterOnly=false"
"-XX:+ShowCodeDetailsInExceptionMessages"
"--add-opens=java.desktop/java.awt=ALL-UNNAMED"
"--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED"
"--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED"
"--add-opens=java.base/java.util=ALL-UNNAMED"
"--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED"
"--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED"
"--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED"
"--add-opens=java.desktop/javax.swing=ALL-UNNAMED"
"--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED"
"--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED"
# disable telemetry (the empty DSN disables the Sentry library, setting the
# environment to Development disables some logic inside MapTool)
"-Dsentry.dsn"
"-Dsentry.environment=Development"
];
binName = pname;
rdnsName = "net.rptools.maptool";
in
stdenvNoCC.mkDerivation {
inherit pname version src meta;
dontUnpack = true;
dontBuild = true;
dontWrapGApps = true;
nativeBuildInputs = [
copyDesktopItems
libarchive
wrapGAppsHook
];
desktopItems = [
(makeDesktopItem {
name = rdnsName;
desktopName = "MapTool";
icon = rdnsName;
exec = binName;
comment = meta.description;
categories = [ "Game" ];
})
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/${binName} \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \
--add-flags '${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions'
dest=$out/share/icons/hicolor/256x256/apps
mkdir -p "$dest"
ln -s ${icon} "$dest/${rdnsName}.png"
runHook postInstall
'';
passthru.updateScript = gitUpdater {
url = "${repoBase}.git";
ignoredVersions = "-";
};
}
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+4 -4
View File
@@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
version = "6.1.30";
hash = "sha256-F5N0PkjVBSpidP08SdBtOx5n+97RUqN32bwyQ6y+CYY=";
version = "6.1.31";
hash = "sha256-quYsp6h7IV6gUT0e55FeBlS8rH9OGrqdbM1XSIYNRV4=";
variant = "lts";
};
mainVariant = {
version = "6.3.3";
hash = "sha256-3vkY79dmRUITXUIStYVlrR/JVLtLH2hfH1YKCF03Wmo=";
version = "6.3.5";
hash = "sha256-2+8WDj1VdmIdC0DjmKyY/fMi5zoiXDAWy7EAmkImvXk=";
variant = "main";
};
pkgs/servers/monitoring/mackerel-agent/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mackerel-agent";
version = "0.75.2";
version = "0.76.0";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xRujItV8xgIiQZktcEeq+hCDaD7HaHFEOsbtzmWfLQQ=";
sha256 = "sha256-IfrJd7EQ9t/whypxyW7uwUQ5O1pcqDgRf1AbG6d9LPw=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/servers/nosql/mongodb/6.0.nix
+2 -2
View File
@@ -6,8 +6,8 @@ let
};
in
buildMongoDB {
version = "6.0.5";
sha256 = "sha256-iUY5nbyaoMknBlWy3ItkgY87lHNVbZ1N9ricbzMpWX4=";
version = "6.0.6";
sha256 = "sha256-/AUe87fCM/BFJy3sPSuRBrOWMoE8zHIGhKYf/5NNCjc=";
patches = [
(fetchpatch {
name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch";
pkgs/servers/nosql/rethinkdb/default.nix
+12 -13
View File
@@ -1,22 +1,21 @@
{ lib, stdenv, fetchurl, which, m4
, protobuf, boost170, zlib, curl, openssl, icu, jemalloc, libtool
, python2Packages, makeWrapper
, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
, python3Packages, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "rethinkdb";
version = "2.4.1";
version = "2.4.3";
src = fetchurl {
url = "https://download.rethinkdb.com/repository/raw/dist/${pname}-${version}.tgz";
sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b";
hash = "sha256-w3iMeicPu0nj2kV4e2vlAHY8GQ+wWeObfe+UVPmkZ08=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
# very meta
substituteInPlace mk/support/pkg/re2.sh --replace "-i '''" "-i"
postPatch = ''
substituteInPlace external/quickjs_*/Makefile \
--replace "gcc-ar" "${stdenv.cc.targetPrefix}ar" \
--replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
preConfigure = ''
@@ -31,17 +30,17 @@ stdenv.mkDerivation rec {
makeFlags = [ "rethinkdb" ];
buildInputs = [ protobuf boost170 zlib curl openssl icu ]
buildInputs = [ protobuf boost zlib curl openssl icu ]
++ lib.optional (!stdenv.isDarwin) jemalloc
++ lib.optional stdenv.isDarwin libtool;
nativeBuildInputs = [ which m4 python2Packages.python makeWrapper ];
nativeBuildInputs = [ which m4 python3Packages.python makeWrapper ];
enableParallelBuilding = true;
postInstall = ''
wrapProgram $out/bin/rethinkdb \
--prefix PATH ":" "${python2Packages.rethinkdb}/bin"
--prefix PATH ":" "${python3Packages.rethinkdb}/bin"
'';
meta = {
@@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://rethinkdb.com";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ];
};
}
pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+71
View File
@@ -0,0 +1,71 @@
{ stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests }:
stdenv.mkDerivation (finalAttrs: {
pname = "apache_datasketches";
version = "1.6.0";
srcs = [
( fetchFromGitHub {
name = "datasketches-postgresql";
owner = "apache";
repo = "datasketches-postgresql";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-sz94fIe7nyWhjiw8FAm6ZzVpB0sAK5YxUrtbaZt/guA=";
})
( fetchFromGitHub {
name = "datasketches-cpp";
owner = "apache";
repo = "datasketches-cpp";
rev = "refs/tags/4.1.0";
hash = "sha256-vPoFzRxOXlEAiiHH9M5S6255ahzaKsGNYS0cdHwrRYw=";
})
];
sourceRoot = "datasketches-postgresql";
buildInputs = [ postgresql boost182 ];
patchPhase = ''
runHook prePatch
cp -r ../datasketches-cpp .
runHook postPatch
'';
installPhase = ''
runHook preInstall
install -D -m 644 ./datasketches.so -t $out/lib/
cat \
sql/datasketches_cpc_sketch.sql \
sql/datasketches_kll_float_sketch.sql \
sql/datasketches_kll_double_sketch.sql \
sql/datasketches_theta_sketch.sql \
sql/datasketches_frequent_strings_sketch.sql \
sql/datasketches_hll_sketch.sql \
sql/datasketches_aod_sketch.sql \
sql/datasketches_req_float_sketch.sql \
sql/datasketches_quantiles_double_sketch.sql \
> sql/datasketches--${finalAttrs.version}.sql
install -D -m 644 ./datasketches.control -t $out/share/postgresql/extension
install -D -m 644 \
./sql/datasketches--${finalAttrs.version}.sql \
./sql/datasketches--1.3.0--1.4.0.sql \
./sql/datasketches--1.4.0--1.5.0.sql \
./sql/datasketches--1.5.0--1.6.0.sql \
-t $out/share/postgresql/extension
runHook postInstall
'';
passthru.tests.apache_datasketches = nixosTests.apache_datasketches;
meta = {
description = "PostgreSQL extension providing approximate algorithms for distinct item counts, quantile estimation and frequent items detection";
longDescription = ''
apache_datasketches is an extension to support approximate algorithms on PostgreSQL. The implementation
is based on the Apache Datasketches CPP library, and provides support for HyperLogLog,
Compressed Probabilistic Counting, KLL, Frequent strings, and Theta sketches.
'';
homepage = "https://datasketches.apache.org/";
platforms = postgresql.meta.platforms;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mmusnjak ];
};
})
pkgs/servers/sql/postgresql/packages.nix
+2
View File
@@ -2,6 +2,8 @@ self: super: {
age = super.callPackage ./ext/age.nix { };
apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { };
jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { };
periods = super.callPackage ./ext/periods.nix { };
pkgs/servers/tautulli/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "Tautulli";
version = "2.12.3";
version = "2.12.4";
format = "other";
pythonPath = [ setuptools ];
@@ -12,7 +12,7 @@ buildPythonApplication rec {
owner = "Tautulli";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UENYnXEdrKlU+gUmGdw46jslN8B5qWPDIFU03Z7aMps=";
sha256 = "sha256-9E2qEdPfxnvx7WCHE/I2rP6Qk9CtsVrisQbq202+2uE=";
};
installPhase = ''
pkgs/servers/tidb/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tidb";
version = "7.0.0";
version = "7.1.0";
src = fetchFromGitHub {
owner = "pingcap";
repo = pname;
rev = "v${version}";
sha256 = "sha256-giYAD6BJqK1Z9Rkpy3Xhf4Y4+lmZW6y1CJur0OqZHTU=";
sha256 = "sha256-KiF76SD2YbZ4GFXiuCLODIb1guOTYJ7MHCFTVQKytyY=";
};
vendorHash = "sha256-IyVfML4XwogW/SMoZoZcQA32DxuHzuBoNePqk3u1vSw=";
vendorHash = "sha256-yfsOIQGqHk6kX2usQwkSHGcaOkJnF8ZFfM58Owpjvec=";
ldflags = [
"-s"
pkgs/tools/admin/scaleway-cli/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-NAo+nI4oaWTFqBfIHmkWGVYlFz5WjImvF3pfOFmw+cM=";
sha256 = "sha256-iKyUtUm+vDwHZmjoeNTEE3rabw0krSganaHiEIN9BWE=";
};
vendorHash = "sha256-iJLOkwXjfapZHGJ47raxmSW11HYsuB3ahEGDx2hFY10=";
vendorHash = "sha256-m03VMzLCBASn0O66Zh/E7UlC6GmgghgY0rdcKadL3mk=";
ldflags = [
"-w"
pkgs/tools/archivers/xarchiver/default.nix
+2 -2
View File
@@ -2,14 +2,14 @@
coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
stdenv.mkDerivation rec {
version = "0.5.4.20";
version = "0.5.4.21";
pname = "xarchiver";
src = fetchFromGitHub {
owner = "ib";
repo = "xarchiver";
rev = version;
sha256 = "sha256-OzcfIFYaWez2B1lmAYvhm+knuYbyMu2ohs+kGEVG7K0=";
sha256 = "sha256-pYrF9fyEbay+iboL9EuoTETTI3RTcgv3yeVtAWvAe1Q=";
};
nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ];
pkgs/tools/audio/audiowaveform/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "audiowaveform";
version = "1.7.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "bbc";
repo = "audiowaveform";
rev = version;
sha256 = "sha256-DxVEAe9j4BAMrfMiaxDfkGvL6CCT/v5oKTrxmgkHuyM=";
sha256 = "sha256-3Fpc0HvtuAYIkyuFrZ+sHkHRHaP4vo0Q4IoGqTksyqE=";
};
nativeBuildInputs = [ cmake gtest ];
pkgs/tools/audio/tidal-dl/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ lib
, buildPythonApplication
, fetchPypi
, aigpy
}:
buildPythonApplication rec {
pname = "tidal-dl";
version = "2022.10.31.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-b2AAsiI3n2/v6HC37fMI/d8UcxZxsWM+fnWvdajHrOg=";
};
propagatedBuildInputs = [ aigpy ];
meta = {
homepage = "https://github.com/yaronzz/Tidal-Media-Downloader";
description = "An application that lets you download videos and tracks from Tidal";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.misterio77 ];
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/hyfetch/default.nix
+2 -2
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "hyfetch";
version = "1.4.7";
version = "1.4.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "hykilpikonna";
repo = "hyfetch";
rev = "refs/tags/${version}";
hash = "sha256-DfPU42X9WCvOXf/BvFkfIM4yWQnunBgjjSfncaL6HPA=";
hash = "sha256-n+Aa6HrGB7aKrHLQijKNcUVGMYxuqYVrAAnHFPDYH40=";
};
propagatedBuildInputs = with python3.pkgs; [
pkgs/tools/misc/sagoin/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "sagoin";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "figsoda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CSkij/3WCeEq26Uhlrgdf503hGf0OwSUQNmx5mspD08=";
hash = "sha256-bhBC7Cblw8vmP4BalYv2DMRQWPK2AELb8Ia9PSeWcXE=";
};
cargoSha256 = "sha256-Zos3ox6VQv9t1KoblAJhVblTOQOn9rJyvaXK48Y/K1c=";
cargoHash = "sha256-1XcI2LUo6xOs6bJDXKVDqMangH2dq2E6fNokuSDzpK0=";
nativeBuildInputs = [ installShellFiles ];
pkgs/tools/package-management/home-manager/default.nix
+67 -33
View File
@@ -1,58 +1,92 @@
#Adapted from
#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix
{ bash, coreutils, findutils, gnused, less, ncurses, gettext, nixos-option, lib, stdenv, makeWrapper, fetchFromGitHub }:
stdenv.mkDerivation rec {
{ lib
, stdenvNoCC
, fetchFromGitHub
, bash
, coreutils
, findutils
, gettext
, gnused
, less
, ncurses
, nixos-option
, unixtools
, installShellFiles
, unstableGitUpdater
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "2023-04-02";
version = "2023-05-30";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8";
sha256 = "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=";
rev = "54a9d6456eaa6195998a0f37bdbafee9953ca0fb";
hash = "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
gettext
installShellFiles
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
install -v -D -m755 ${src}/home-manager/home-manager $out/bin/home-manager
runHook preInstall
install -D -m755 home-manager/home-manager $out/bin/home-manager
install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh
substituteInPlace $out/bin/home-manager \
--subst-var-by bash "${bash}" \
--subst-var-by DEP_PATH "${
lib.makeBinPath [ coreutils findutils gettext gnused less ncurses nixos-option ]
lib.makeBinPath [
coreutils
findutils
gettext
gnused
less
ncurses
nixos-option
unixtools.hostname
]
}" \
--subst-var-by HOME_MANAGER_LIB '${src}/lib/bash/home-manager.sh' \
--subst-var-by HOME_MANAGER_PATH '${src}' \
--subst-var-by OUT "$out"
--subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \
--subst-var-by HOME_MANAGER_PATH "" \
--subst-var-by OUT '${placeholder "out"}'
install -D -m755 ${src}/home-manager/completion.bash \
$out/share/bash-completion/completions/home-manager
install -D -m755 ${src}/home-manager/completion.zsh \
$out/share/zsh/site-functions/_home-manager
install -D -m755 ${src}/home-manager/completion.fish \
$out/share/fish/vendor_completions.d/home-manager.fish
installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
installShellCompletion --fish --name home-manager.fish home-manager/completion.fish
installShellCompletion --zsh --name _home-manager home-manager/completion.zsh
install -D -m755 ${src}/lib/bash/home-manager.sh \
"$out/share/bash/home-manager.sh"
for path in ${src}/home-manager/po/*.po; do
lang="''${path##*/}"
for pofile in home-manager/po/*.po; do
lang="''${pofile##*/}"
lang="''${lang%%.*}"
mkdir -p "$out/share/locale/$lang/LC_MESSAGES"
${gettext}/bin/msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$path"
msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile"
done
runHook postInstall
'';
meta = with lib; {
description = "A user environment configurator";
homepage = "https://rycee.gitlab.io/home-manager/";
platforms = platforms.unix;
license = licenses.mit;
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/nix-community/home-manager/";
};
}
meta = {
homepage = "https://nix-community.github.io/home-manager/";
description = "A Nix-based user environment configurator";
longDescription = ''
The Home-Manager project provides a basic system for managing a user
environment using the Nix package manager together with the Nix libraries
found in Nixpkgs. It allows declarative configuration of user specific
(non global) packages and dotfiles.
'';
platforms = lib.platforms.unix;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
})
pkgs/tools/text/languagetool-rust/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "languagetool-rust";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "jeertmans";
repo = pname;
rev = "v${version}";
hash = "sha256-tgx1LcVAlBcgYAdtn4n5TiLzinmOImLoatGowUFHpUM=";
hash = "sha256-2RIfavAPxi8986f1hz7cnuIuKsPQ13PYy66FTnozIp0=";
};
cargoHash = "sha256-8Q+Li4wLkS9/HlSdtfOFnojtUBojO3oUpNHkyOu5clA=";
cargoHash = "sha256-PE/q8laWos8K9b+sWg47iw/w0g4c3utkVd+KXXPJKhY=";
buildFeatures = [ "full" ];
pkgs/top-level/all-packages.nix
+16 -1
View File
@@ -2563,6 +2563,8 @@ with pkgs;
### APPLICATIONS/FILE-MANAGERS
browsr = callPackage ../applications/file-managers/browsr { };
cfm = callPackage ../applications/file-managers/cfm { };
clex = callPackage ../applications/file-managers/clex { };
@@ -8244,6 +8246,8 @@ with pkgs;
gyb = callPackage ../tools/backup/gyb { };
halftone = callPackage ../applications/graphics/halftone { };
harminv = callPackage ../development/libraries/science/chemistry/harminv { };
igrep = callPackage ../tools/text/igrep {
@@ -14649,6 +14653,8 @@ with pkgs;
beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { };
bfc = callPackage ../development/compilers/bfc { };
bigloo = callPackage ../development/compilers/bigloo { };
binaryen = callPackage ../development/compilers/binaryen {
@@ -25990,7 +25996,6 @@ with pkgs;
boost = boost177; # Configure checks for specific version.
protobuf = protobuf3_19;
icu = icu69;
openssl = openssl_1_1;
};
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
@@ -36764,6 +36769,14 @@ with pkgs;
gtk = gtk2;
};
maptool = callPackage ../games/maptool {
# MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
# at launch in a class initialization deadlock. MapTool ships Temurin with
# their pre-built releases so we might as well use it too.
jre = temurin-bin-17;
openjfx = openjfx17;
};
mari0 = callPackage ../games/mari0 { };
manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; };
@@ -40703,6 +40716,8 @@ with pkgs;
tuner = callPackage ../applications/audio/tuner { };
tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { };
jfrog-cli = callPackage ../tools/misc/jfrog-cli { };
pkgs/top-level/python-packages.nix
+8
View File
@@ -106,6 +106,8 @@ self: super: with self; {
aggdraw = callPackage ../development/python-modules/aggdraw { };
aigpy = callPackage ../development/python-modules/aigpy { };
aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { };
aio-geojson-generic-client = callPackage ../development/python-modules/aio-geojson-generic-client { };
@@ -628,6 +630,8 @@ self: super: with self; {
arsenic = callPackage ../development/python-modules/arsenic { };
art = callPackage ../development/python-modules/art { };
arviz = callPackage ../development/python-modules/arviz { };
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };
@@ -10583,6 +10587,8 @@ self: super: with self; {
rich-click = callPackage ../development/python-modules/rich-click { };
rich-pixels = callPackage ../development/python-modules/rich-pixels { };
rich-rst = callPackage ../development/python-modules/rich-rst { };
ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
@@ -12614,6 +12620,8 @@ self: super: with self; {
univers = callPackage ../development/python-modules/univers { };
universal-pathlib = callPackage ../development/python-modules/universal-pathlib { };
unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { };
unrardll = callPackage ../development/python-modules/unrardll { };