Merge staging-next into staging
This commit is contained in:
commit
7dc2d52e3b
@ -2877,6 +2877,12 @@
|
||||
githubId = 1382175;
|
||||
name = "Oliver Matthews";
|
||||
};
|
||||
cwyc = {
|
||||
email = "hello@cwyc.page";
|
||||
github = "cwyc";
|
||||
githubId = 16950437;
|
||||
name = "cwyc";
|
||||
};
|
||||
cyounkins = {
|
||||
name = "Craig Younkins";
|
||||
email = "cyounkins@gmail.com";
|
||||
|
@ -195,6 +195,25 @@ in
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.sync_api.search = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Dendrite's full-text search engine");
|
||||
index_path = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "${workingDir}/searchindex";
|
||||
description = lib.mdDoc ''
|
||||
The path the search index will be created in.
|
||||
'';
|
||||
};
|
||||
language = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "en";
|
||||
description = lib.mdDoc ''
|
||||
The language most likely to be used on the server - used when indexing, to
|
||||
ensure the returned results match expectations. A full list of possible languages
|
||||
can be found at https://github.com/blevesearch/bleve/tree/master/analysis/lang
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.user_api = {
|
||||
account_database = {
|
||||
connection_string = lib.mkOption {
|
||||
|
78
pkgs/applications/audio/eartag/default.nix
Normal file
78
pkgs/applications/audio/eartag/default.nix
Normal file
@ -0,0 +1,78 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, libadwaita
|
||||
, gettext
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
, gtk4
|
||||
, librsvg
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eartag";
|
||||
version = "0.2.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knuxify";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TlY2F2y7ZZ9f+vkYYkES5zoIGcuTWP1+rOJI62wc4SU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
chmod +x ./build-aux/meson/postinstall.py
|
||||
patchShebangs ./build-aux/meson/postinstall.py
|
||||
substituteInPlace ./build-aux/meson/postinstall.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
glib
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
pkg-config
|
||||
gettext
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
] ++ lib.optional stdenv.isDarwin gtk4; # for gtk4-update-icon-cache
|
||||
|
||||
buildInputs = [
|
||||
librsvg
|
||||
libadwaita
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
eyeD3
|
||||
pillow
|
||||
mutagen
|
||||
pytaglib
|
||||
python-magic
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/knuxify/eartag";
|
||||
description = "Simple music tag editor";
|
||||
# This seems to be using ICU license but we're flagging it to MIT license
|
||||
# since ICU license is a modified version of MIT and to prevent it from
|
||||
# being incorrectly identified as unfree software.
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ foo-dogsquared ];
|
||||
};
|
||||
}
|
@ -37,11 +37,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "sha256-YydpWzGH+Orb8Vot8hchh+FFcd327VwQ8Kr7x8WYnv4=";
|
||||
sha256 = "sha256-/ZESysxaDhMpyTKHjjoRMiLM7SMESA5VIfgWCqdyDck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
@ -1368,11 +1368,16 @@ let
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.8.0";
|
||||
sha256 = "sha256-VD1g4DJfA0vDJ0cyHFDEtCEqQo0nXfPC5vknEU91cPk=";
|
||||
version = "0.11.0";
|
||||
sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls";
|
||||
homepage = "https://github.com/elixir-lsp/elixir-ls";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ datafoo ];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
|
||||
sha256 = "0y456ssfsx4cy6pcnihiwi64y90s91399qhgs4abn4pp9wr0h08g";
|
||||
sha256 = "sha256-SJDUfAFEwYnOR+y/6Dg2S/CkA84QogoRpMXOPP5PyrM=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.4.12";
|
||||
version = "2.4.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U3Qct7wL/oJDgU+PXL5UMMTsQo4maeKShDwU2crSWxk=";
|
||||
sha256 = "sha256-txVNv/JowIGKMvNjsMUzwLT328qJg/DkS/R0RkN8b34=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc=";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openasar";
|
||||
version = "unstable-2022-08-07";
|
||||
version = "unstable-2022-10-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GooseMod";
|
||||
repo = "OpenAsar";
|
||||
rev = "e0870784008a584229d3094e0988f5da155c7fd7";
|
||||
hash = "sha256-t0b2SFlDDBSQEkOCQME0jsLJ8NvoXROTxoQgnoXM9eQ=";
|
||||
rev = "c72f1a3fc064f61cc5c5a578d7350240e26a27af";
|
||||
hash = "sha256-6V9vLmj5ptMALFV57pMU2IGxNbFNyVcdvnrPgCEaUJ0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
|
||||
sha256 = "sha256-BIVeY4H5pn8hdjUkSDrlVMTXy5wuMskkSlccfgCWc6Q=";
|
||||
sha256 = "sha256-ZvCdxUg1eWeE3/4DLCf7FbDF4B1ZdLTcipKeb/1+xOk=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
@ -194,10 +194,6 @@ let
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications/Slack.app
|
||||
cp -R . $out/Applications/Slack.app
|
||||
'' + lib.optionalString (!stdenv.isAarch64) ''
|
||||
# on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting
|
||||
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
@ -11,7 +11,7 @@
|
||||
, portaudio
|
||||
, speexdsp
|
||||
, hamlib
|
||||
, wxGTK31-gtk3
|
||||
, wxGTK32
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, AppKit
|
||||
, AVFoundation
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
lpcnetfreedv
|
||||
speexdsp
|
||||
hamlib
|
||||
wxGTK31-gtk3
|
||||
wxGTK32
|
||||
] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ])
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
@ -60,6 +60,10 @@ stdenv.mkDerivation rec {
|
||||
"-DUSE_STATIC_DEPS:BOOL=FALSE"
|
||||
] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
"-DAPPLE_OLD_XCODE"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://freedv.org/";
|
||||
description = "Digital voice for HF radio";
|
||||
|
@ -20,14 +20,14 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simgrid";
|
||||
version = "3.31";
|
||||
version = "3.32";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K6YkkCMxc2lqxHIwyuLiwcp3m49sqbEtOlwZh4L1YJg=";
|
||||
sha256 = "sha256-o25wOROkUm07JPdNTJQcJw6apeoysnjd+YBMHlPpAYI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ boost ];
|
||||
|
52
pkgs/development/compilers/heptagon/default.nix
Normal file
52
pkgs/development/compilers/heptagon/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, makeWrapper
|
||||
, ocamlPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "heptagon";
|
||||
version = "1.05.00";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "synchrone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b4O48MQT3Neh8a1Z5wRgS701w6XrwpsbSMprlqTT+CE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
ocaml
|
||||
findlib
|
||||
menhir
|
||||
menhirLib
|
||||
ocamlgraph
|
||||
camlp4
|
||||
ocamlbuild
|
||||
lablgtk
|
||||
];
|
||||
|
||||
# the heptagon library in lib/heptagon is not executable
|
||||
postInstall = ''
|
||||
find $out/lib/heptagon -type f -exec chmod -x {} \;
|
||||
'';
|
||||
|
||||
postFixup = with ocamlPackages; ''
|
||||
wrapProgram $out/bin/hepts \
|
||||
--prefix CAML_LD_LIBRARY_PATH : "${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compiler for the Heptagon/BZR synchronous programming language";
|
||||
homepage = "https://gitlab.inria.fr/synchrone/heptagon";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
mainProgram = "heptc";
|
||||
};
|
||||
}
|
59
pkgs/development/libraries/webp-pixbuf-loader/default.nix
Normal file
59
pkgs/development/libraries/webp-pixbuf-loader/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, makeWrapper
|
||||
, gdk-pixbuf, libwebp
|
||||
}:
|
||||
let
|
||||
moduleDir = gdk-pixbuf.moduleDir;
|
||||
|
||||
# turning lib/gdk-pixbuf-#.#/#.#.#/loaders into lib/gdk-pixbuf-#.#/#.#.#/loaders.cache
|
||||
# removeSuffix is just in case moduleDir gets a trailing slash
|
||||
loadersPath = (lib.strings.removeSuffix "/" gdk-pixbuf.moduleDir) + ".cache";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webp-pixbuf-loader";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dcdydWYrXZJjo4FxJtvzGzrQLOs87/BmxshFZwsT2ws=";
|
||||
};
|
||||
|
||||
# It looks for gdk-pixbuf-thumbnailer in this package's bin rather than the gdk-pixbuf bin. We need to patch that.
|
||||
postPatch = ''
|
||||
substituteInPlace webp-pixbuf.thumbnailer.in --replace @bindir@/gdk-pixbuf-thumbnailer $out/bin/webp-thumbnailer
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gdk-pixbuf meson ninja pkg-config makeWrapper ];
|
||||
buildInputs = [ gdk-pixbuf libwebp ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgdk_pixbuf_query_loaders_path=${gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders"
|
||||
"-Dgdk_pixbuf_moduledir=${placeholder "out"}/${moduleDir}"
|
||||
];
|
||||
|
||||
# It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
|
||||
# So we replace it with a wrapped executable.
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer $out/bin/webp-thumbnailer \
|
||||
--set GDK_PIXBUF_MODULE_FILE $out/${loadersPath}
|
||||
'';
|
||||
|
||||
# environment variables controlling loaders.cache generation by gdk-pixbuf-query-loaders
|
||||
preInstall = ''
|
||||
export GDK_PIXBUF_MODULE_FILE=$out/${loadersPath}
|
||||
export GDK_PIXBUF_MODULEDIR=$out/${moduleDir}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "WebP GDK Pixbuf Loader library";
|
||||
homepage = "https://github.com/aruiz/webp-pixbuf-loader";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.cwyc ];
|
||||
# meson.build:16:0: ERROR: Program or command 'gcc' not found or not executable
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.116";
|
||||
version = "0.6.118";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4W6Ew80HN436mEG+gjEj8cuVY3iCQBpqNO1voAMDX1o=";
|
||||
sha256 = "sha256-nUhVHVjhrZm+Y/kIF3D85orm/EECug2xYSpcItYCThU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
rec {
|
||||
version = "1.1.4";
|
||||
version = "1.1.6";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -9,7 +9,7 @@ rec {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-ffmpeg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IM7bzOZAZQjLz4YjRTMU5fZgrA2QTZcSDMgclDo4sn0=";
|
||||
sha256 = "sha256-NlWmt98QwuGFNP8FHnAR3C0DIiSfJ1ZJXeVFFZiOSXs=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,15 +2,15 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "pcre";
|
||||
version = "7.4.6";
|
||||
version = "7.5.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz";
|
||||
sha256 = "17ajl0ra5xkxn5pf0m0zalylp44wsfy6mvcq213djh2pwznh4gya";
|
||||
sha256 = "sha256-ZxFC9AtthhccvAZyU/qt+QMBkWHVdIi9D7bFRWwsvRo=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "taglib";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-taglib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n8Vv8Vepvhx7anZdWIdBfw+HSQShKWjNe6l0gqRRsSs=";
|
||||
sha256 = "sha256-tAvzVr0PW1o0kKFxdi/ks4obqnyBm8YfiiFupXZkUho=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.05.0"; # Documented version 4.02.0. 4.05.0 actually required.
|
||||
|
@ -1,8 +1,15 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pysha3, setuptools }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pysha3
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "crytic-compile";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -10,13 +17,19 @@ buildPythonPackage rec {
|
||||
owner = "crytic";
|
||||
repo = "crytic-compile";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-l8a9QXERpkVrx7zHluMlb3zBvJSODsviNtJPzvL3hDo=";
|
||||
hash = "sha256-phb4Y8CUxuHsNt43oKsgDAZTraNauPkcYQtzcsiWyy8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pysha3 setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
pysha3
|
||||
setuptools
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "crytic_compile" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"crytic_compile"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Abstraction layer for smart contract build systems";
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discogs-client";
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "joalla";
|
||||
repo = "discogs_client";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-gGAtRhAg/W0dREhCOmif1XlQ4gldIGQ2hIC8gzifRu8=";
|
||||
sha256 = "sha256-whLneq8RE1bok8jPlOteqIb5U07TvEa0O2mrzORp5HU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gRM4tOq3nXV6koBNqBxwY3OS576E8gnVjzwDAsS2Ols=";
|
||||
hash = "sha256-4M3qIYO2tHj3PKtkaetahlxjaDI3hkg938csDwPDsHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZabPYA56yhoKOYAgvXJLgxAv3VkmV4wiDiAYGoZ61Es=";
|
||||
hash = "sha256-V7gSzWH5ua648A1WzmYVOFzftG8a8vaMKT6b3mRVhcQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-U3j9ohPdZ6sTLJ/tII4HeG28h40IGDH+Ljbz/fS8WBk=";
|
||||
hash = "sha256-+w1f/FrL8968WHbKFCu3ayQ/G7TEx4wuZ/RCadryeIM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-AohJ0TAQy3GFALvzqd4i2BiyaCzfTjMMAVIe1ZUZ5eI=";
|
||||
sha256 = "sha256-Q/NLGD6ALwJ4mK/LUqovlDQ5lVnf3uMBnpwURya3BEI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.9.0";
|
||||
version = "3.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fTBNCox9Hbk4iNQfxZZRfNiOozaIL5HTrsN/Parc6m0=";
|
||||
hash = "sha256-UZ44USwAVUCXYUelrFj+5DZ7x67BIU7Q6zPeV5Fh68s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-error-reporting";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PPY5DIaGkx5EXcAO04qbLf6JRPVXU450XnjE+n+v97o=";
|
||||
hash = "sha256-uiKJOec6chc0YB3OowQ2CQajo/iQekcEwIDkXVLEve8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.22.0";
|
||||
version = "3.22.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3EZMUyF9Se+DD3EK0/srYODRJo8OQkAr5RilTbMTHIo=";
|
||||
hash = "sha256-lJn1x77C1oiYFZqTRQGCop/1DQ8OsrqRH42bnxJ7Xio=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homematicip";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "hahn-th";
|
||||
repo = "homematicip-rest-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1nT5P3HNwwEJSSRbl77DXCuPPxGqiVFXNUK6Q3ZiByU=";
|
||||
hash = "sha256-xltdHxmCiVQopyVw+a/Ra9NaWIujTfqvx7hBx7l104w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "panel";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
# tries to fetch even more artifacts
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-1GC119AUfmse3fhQQxSi9eDJJorYvt2NeE7UY1GrW3E=";
|
||||
hash = "sha256-3kZba0R9J978bvjsjRMLSTo7dOPd5Ml7VPkZqMQV2uY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,22 +1,34 @@
|
||||
{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pebble";
|
||||
version = "5.0.0";
|
||||
disabled = isPy27;
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Pebble";
|
||||
inherit version;
|
||||
sha256 = "sha256-rdKgfXHmZphfG9AkAkeH3XkPcfGi27n1+sA3y7NY4M4=";
|
||||
hash = "sha256-7kHDO+PUEihVcfLMfPkU1MKoGrPTiMaLPHRrerOwuGU=";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pebble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "API to manage threads and processes within an application";
|
||||
homepage = "https://github.com/noxdafox/pebble";
|
||||
|
@ -8,15 +8,19 @@
|
||||
, scipy
|
||||
, spglib
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonopy";
|
||||
version = "2.16.2";
|
||||
version = "2.16.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-tOTkI71BkqKgnX5HrzlPLVohSMtrSpHs9PzeuWQOVis=";
|
||||
hash = "sha256-xTbTVRVmJvJuXV/RWLA+EMShPEYdagKiawXjtjEbnXk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -37,9 +41,13 @@ buildPythonPackage rec {
|
||||
rm -r phonopy
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"phonopy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A package for phonon calculations at harmonic and quasi-harmonic levels";
|
||||
homepage = "https://atztogo.github.io/phonopy/";
|
||||
description = "Modulefor phonon calculations at harmonic and quasi-harmonic levels";
|
||||
homepage = "https://phonopy.github.io/phonopy/";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ psyanticy ];
|
||||
};
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1PTlNW40lqg10c1wtAqwIvUwanDFgg81DIZNbfaHhXE=";
|
||||
hash = "sha256-+2L62GG9amP+0RROk9GzJqcaXsXCv+BMmMyUMH7VxYI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.8.2";
|
||||
version = "0.8.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3XzY3p9tYQX39uM/LUcz9XpKrQ4+XofGSPl9gHwrDog=";
|
||||
hash = "sha256-eTJZ6gAorGf7n1C/5psvaW9Q7py3/b7ZEldmtFHAQ4c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.19.13";
|
||||
version = "0.19.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AkaFymWvHLPLHp/Z5RqRGe5RcJk8utcDkO33UzBQ+OA=";
|
||||
hash = "sha256-GGYGIzjlFbRxT56UBHSvWEea5EAxVl0JO2nBK9WWLZk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.25.2";
|
||||
version = "0.25.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gR2AAI/ZQ7TX48QsTCwv8qZJOGb978nWLP2+cY9XcI8=";
|
||||
hash = "sha256-QpKPGAksaKfdLpiBn4fbVxTsoBUd8S6loSKF+EE443g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ultraheat-api";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "ultraheat_api";
|
||||
inherit version;
|
||||
hash = "sha256-sdZweq5TDl54UKHqQ0zlFQq0h+piisMKs2P/3E2vqX8=";
|
||||
hash = "sha256-fXTv4rWMkAOBYwKeb0MCC9mwEfeYT/YFYW0OpwXN4OQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
|
||||
./remove-config-store-paths.patch
|
||||
# Pick up sysdirs from NIX_LDFLAGS
|
||||
./nix-ldflags-sysdirs.patch
|
||||
|
||||
./remove-const-void-param.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- build2-0.14.0_/libbuild2/cc/pkgconfig.cxx 2022-10-04 14:18:24.864604892 -0400
|
||||
+++ build2-0.14.0/libbuild2/cc/pkgconfig.cxx 2022-10-04 14:20:58.153254961 -0400
|
||||
@@ -186,7 +186,7 @@
|
||||
;
|
||||
|
||||
static bool
|
||||
- pkgconf_error_handler (const char* msg, const pkgconf_client_t*, const void*)
|
||||
+ pkgconf_error_handler (const char* msg, const pkgconf_client_t*, void*)
|
||||
{
|
||||
error << runtime_error (msg); // Sanitize the message.
|
||||
return true;
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clj-kondo";
|
||||
version = "2022.09.08";
|
||||
version = "2022.10.05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-HOGxSIRH6uD3ZrrEjddZtomzpfWBJa1FhTmlk8HTxSM=";
|
||||
sha256 = "sha256-0X+DWjxkXqcST5Wwecqiv8BpJK+xJsXl0Kjfdvx18xU=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2022.09.01-15.27.31";
|
||||
version = "2022.10.05-16.39.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+LdHdEPwfU712KHk7NLJeOgaTdfFADqglT1TEXrFWt8=";
|
||||
sha256 = "sha256-44GAG9PSLpeV6rBGnw6f0EvmQDwCGtrTbPrKWx5pP8Q=";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
|
||||
sha256 = "0yi0ni172by7kp9sfw29rsdva5xpgmc0sha2s4rff72lq9js3xp0";
|
||||
sha256 = "7976ad30713ff0886421de42906622aa84d1409b37c8d603189059201daa4fb3";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sd-local";
|
||||
version = "1.0.43";
|
||||
version = "1.0.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "screwdriver-cd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qFEug8fGOi5IwnA1P3FHKte7eiviNk/x8SdDss9J5vo=";
|
||||
sha256 = "sha256-ziCDuGpvBPKC3p+kuPi5+Hjfkld/Kh0ZqnLKwdMrXNM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y=";
|
||||
|
@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.5.2";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-l632b+Cxs9jiahbeZYzjXDiw+LE2MUgx4negEh9jMAc=";
|
||||
sha256 = "sha256-ua8U1sYQoSi4xYmJ34icJyblu2VPoVtJMXdZWbhbIF0=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "sha256-uVzUCwYJo3CRykGHSfxigi2N9YSsxh0q8xMXuOe2Zsk=";
|
||||
cargoSha256 = "sha256-bwggklnaT1x/jhz4v7po0uNi65V+u1Jbqk6Ij07DAUU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.sentry.io/cli/";
|
||||
|
30
pkgs/os-specific/darwin/rectangle/default.nix
Normal file
30
pkgs/os-specific/darwin/rectangle/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, stdenv, fetchurl, cpio, xar, undmg, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rectangle";
|
||||
version = "0.59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
|
||||
sha256 = "sha256-6K4HJ4qWjf/BsoxmSWyO/Km3BZujCnMJ2/xCMkH3TaI=";
|
||||
};
|
||||
|
||||
sourceRoot = "Rectangle.app";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/Applications/Rectangle.app
|
||||
cp -R . $out/Applications/Rectangle.app
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Move and resize windows in macOS using keyboard shortcuts or snap areas";
|
||||
homepage = "https://rectangleapp.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ Enzime ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.9.9";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HPcPaI0JACyDJAHTGSXHoIuWU34A8pV7blmt/zKOUB4=";
|
||||
sha256 = "sha256-o+vdxjxbgTPhXtmjrMXf/kBGYaaF3nvVnrG+PGnaM70=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jX8NJYrhUHRUiZRTqzgMK3mgRhzPJGFNTCK4SuEHKzg=";
|
||||
vendorSha256 = "sha256-sd2frDxtMd0YUVCCQGaNYU7KopZQC1Ld5OHnjttTrgA=";
|
||||
|
||||
# some tests are racy, re-enable once upstream has fixed them
|
||||
doCheck = false;
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustypaste";
|
||||
version = "0.7.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub{
|
||||
owner = "orhun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NGrz08cpio745oVYtfNO1jpViYLaxZ9ZRXQdQG/f0oM=";
|
||||
sha256 = "sha256-EKW/Cik4La66bI7EVbFnhivk1o0nIudJdBW7F5dbQaI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-UQNe2O664PXvcSu6MI5F8RdYJJholjF9iO2I5OSMm2A=";
|
||||
cargoSha256 = "sha256-zIrvBHPthPAzReojmBLb0odDQGcGwZS10rP15qb/zgs=";
|
||||
|
||||
# Some tests need network
|
||||
checkFlags = [
|
||||
|
@ -1,17 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv, Libsystem }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/xq1aLdr672v4iAXXLcu47QcsdbLErn3VN/w3sYo9y0=";
|
||||
sha256 = "sha256-lf+vJHR4+PZgoZNP4cSJswP0hi8YkUV85JISJxSjyjU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-BykfUGKBiqr3DoYcqKpY3R84LAuJ19D94xnZcQGKwuI=";
|
||||
cargoSha256 = "sha256-evnUG94PagkgKoVwyd4aBaLXYYpF2k7zGhLRhdNDcoU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellCompletion procs.{bash,fish} --zsh _procs
|
||||
'';
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv Libsystem ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern replacement for ps written in Rust";
|
||||
@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 sciencentistguy ];
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
let
|
||||
pname = "liquidsoap";
|
||||
version = "2.0.6";
|
||||
version = "2.1.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-1wD9BApbDA/ovzZoniay+jciP/V2C8EoGQehd5N8PPQ=";
|
||||
sha256 = "sha256-e7iCBY9xKQZrkQ+IlahE1KEbDW89tTIlpGvHZubh3bM=";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
@ -35,11 +35,13 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.mm
|
||||
ocamlPackages.ocaml_pcre
|
||||
ocamlPackages.menhir ocamlPackages.menhirLib
|
||||
ocamlPackages.camomile
|
||||
ocamlPackages.ocurl
|
||||
ocamlPackages.uri
|
||||
ocamlPackages.sedlex
|
||||
|
||||
# Recommended dependencies
|
||||
ocamlPackages.camomile
|
||||
ocamlPackages.samplerate
|
||||
ocamlPackages.ffmpeg
|
||||
|
||||
# Optional dependencies
|
||||
ocamlPackages.camlimages
|
||||
@ -51,8 +53,6 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.dssi
|
||||
ocamlPackages.faad
|
||||
ocamlPackages.fdkaac
|
||||
ocamlPackages.srt
|
||||
ocamlPackages.ffmpeg
|
||||
ocamlPackages.flac
|
||||
ocamlPackages.frei0r
|
||||
ocamlPackages.gstreamer
|
||||
@ -60,6 +60,7 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.ladspa
|
||||
ocamlPackages.lame
|
||||
ocamlPackages.lastfm
|
||||
ocamlPackages.lilv
|
||||
ocamlPackages.lo
|
||||
ocamlPackages.mad
|
||||
ocamlPackages.magic
|
||||
@ -68,6 +69,7 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.portaudio
|
||||
ocamlPackages.pulseaudio
|
||||
ocamlPackages.shine
|
||||
ocamlPackages.samplerate
|
||||
ocamlPackages.soundtouch
|
||||
ocamlPackages.speex
|
||||
ocamlPackages.srt
|
||||
@ -82,10 +84,7 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.tsdl-ttf
|
||||
|
||||
# Undocumented dependencies
|
||||
ocamlPackages.ocurl
|
||||
ocamlPackages.lilv
|
||||
ocamlPackages.graphics
|
||||
ocamlPackages.yojson
|
||||
ocamlPackages.cohttp-lwt-unix
|
||||
];
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzip3";
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "kspalaiologos";
|
||||
repo = "bzip3";
|
||||
rev = version;
|
||||
hash = "sha256-HTflIcEZ57EC1zxcmG6Wg0QErpqiq8DNawhLkVogCYI=";
|
||||
hash = "sha256-MtD1pAznoH3yqaMO5P8GVexZSWZJxqADwh1sYvecAew=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, testers
|
||||
, adrgen
|
||||
}:
|
||||
@ -13,10 +14,19 @@ buildGoModule rec {
|
||||
owner = "asiermarques";
|
||||
repo = "adrgen";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ=";
|
||||
hash = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aDtUD+KKKSE0TpSi4+6HXSBMqF/TROZZhT0ox3a8Idk=";
|
||||
patches = [
|
||||
# https://github.com/asiermarques/adrgen/pull/14
|
||||
(fetchpatch {
|
||||
name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
|
||||
url = "https://github.com/asiermarques/adrgen/commit/485dc383106467d1029ee6d92c9bcbc3c2281626.patch";
|
||||
hash = "sha256-38ktHrRgW5ysQmafvFthNtkZ6nnM61z4yEA7wUGmWb4=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-RXwwv3Q/kQ6FondpiUm5XZogAVK2aaVmKu4hfr+AnAM=";
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = adrgen;
|
||||
|
63
pkgs/tools/networking/whatip/default.nix
Normal file
63
pkgs/tools/networking/whatip/default.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, python3
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, librsvg
|
||||
, blueprint-compiler
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "whatip";
|
||||
version = "1.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GabMus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ltimqdFTvvjXtvLC5jAdRaNX15i2Ww5mB3DIr4r9Yzg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
blueprint-compiler
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
librsvg
|
||||
libadwaita
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
netaddr
|
||||
requests
|
||||
pygobject3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Info on your IP";
|
||||
homepage = "https://gitlab.gnome.org/GabMus/whatip";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
@ -1,19 +1,21 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maigret";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soxoj";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-0Ni4rXVu3ZQyHBvD3IpV0i849CnumLj+n6/g4sMhHEs=";
|
||||
hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiodns
|
||||
aiohttp
|
||||
@ -24,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
beautifulsoup4
|
||||
certifi
|
||||
chardet
|
||||
cloudscraper
|
||||
colorama
|
||||
future
|
||||
html5lib
|
||||
@ -60,14 +63,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove all version pinning
|
||||
sed -i -e "s/==[0-9.]*//" requirements.txt
|
||||
|
||||
# We are not build for Python < 3.7
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "future-annotations" ""
|
||||
'';
|
||||
pythonRelaxDeps = true;
|
||||
pythonRemoveDeps = [ "future-annotations" ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# DeprecationWarning: There is no current event loop
|
||||
@ -82,6 +79,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"test_pdf_report"
|
||||
"test_self_check_db_negative_enabled"
|
||||
"test_self_check_db_positive_enable"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# AsyncioProgressbarExecutor is slower on darwin than it should be,
|
||||
# Upstream issue: https://github.com/soxoj/maigret/issues/679
|
||||
"test_asyncio_progressbar_executor"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tlsx";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tyZDmtqQLTV06mLo1lg/qWRjvxvgVvGpoRXWX9HtXeo=";
|
||||
hash = "sha256-TqYBLNnh4wjinoduFrmyNe+FgnGSCckwMy5zX0XhnlM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ERZ4mWmtOsW1nYUshSbCzhy+KcujviPtL4LS/soPrFQ=";
|
||||
vendorSha256 = "sha256-BppRtzTjiMcuc7xIz37bDcjnQHhOlstncES1vILTKYM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "TLS grabber focused on TLS based data collection";
|
||||
|
@ -14,17 +14,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tectonic";
|
||||
version = "0.9.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tectonic-typesetting";
|
||||
repo = "tectonic";
|
||||
rev = "tectonic@${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "mfIEfue64kG4NmIEdTPRAqt6y22XfcgH6GtvJxuH6TU=";
|
||||
sha256 = "tBX737Yv4TvDo64cDYuALX61vzKjhz6PTMXQhWc5S/I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "CH1FdZ7cPrE0V0yjauOjDKrRNioC3MjtcnZaOTkMptc=";
|
||||
cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
@ -2508,6 +2508,8 @@ with pkgs;
|
||||
|
||||
droidmote = callPackage ../tools/inputmethods/droidmote { };
|
||||
|
||||
eartag = callPackage ../applications/audio/eartag { };
|
||||
|
||||
ecdsautils = callPackage ../tools/security/ecdsautils { };
|
||||
|
||||
echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { });
|
||||
@ -4666,8 +4668,9 @@ with pkgs;
|
||||
|
||||
pyznap = python3Packages.callPackage ../tools/backup/pyznap {};
|
||||
|
||||
procs = callPackage ../tools/admin/procs {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Security;
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin) libiconv;
|
||||
};
|
||||
|
||||
@ -12333,6 +12336,8 @@ with pkgs;
|
||||
|
||||
wf-recorder = callPackage ../applications/video/wf-recorder { };
|
||||
|
||||
whatip = callPackage ../tools/networking/whatip {};
|
||||
|
||||
whatweb = callPackage ../tools/security/whatweb { };
|
||||
|
||||
whipper = callPackage ../applications/audio/whipper { };
|
||||
@ -14120,6 +14125,8 @@ with pkgs;
|
||||
inherit (emacs.pkgs.melpaStablePackages) irony;
|
||||
};
|
||||
|
||||
heptagon = callPackage ../development/compilers/heptagon { };
|
||||
|
||||
holo-build = callPackage ../tools/package-management/holo-build { };
|
||||
|
||||
hugs = callPackage ../development/interpreters/hugs { };
|
||||
@ -22432,6 +22439,8 @@ with pkgs;
|
||||
gtk3 = gtk4;
|
||||
};
|
||||
|
||||
webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader {};
|
||||
|
||||
websocketpp = callPackage ../development/libraries/websocket++ { };
|
||||
|
||||
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; };
|
||||
@ -25217,6 +25226,8 @@ with pkgs;
|
||||
|
||||
reap = callPackage ../os-specific/linux/reap { };
|
||||
|
||||
rectangle = callPackage ../os-specific/darwin/rectangle { };
|
||||
|
||||
regionset = callPackage ../os-specific/linux/regionset { };
|
||||
|
||||
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
|
||||
@ -28046,7 +28057,7 @@ with pkgs;
|
||||
|
||||
gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
|
||||
|
||||
inherit (ocaml-ng.ocamlPackages_4_10) google-drive-ocamlfuse;
|
||||
inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse;
|
||||
|
||||
googler = callPackage ../applications/misc/googler {
|
||||
python = python3;
|
||||
|
Loading…
Reference in New Issue
Block a user