Merge master into staging-next
This commit is contained in:
commit
5ed67a849a
|
@ -675,6 +675,33 @@ in {
|
|||
User = "grafana";
|
||||
RuntimeDirectory = "grafana";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
# Hardening
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "full";
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
UMask = "0027";
|
||||
};
|
||||
preStart = ''
|
||||
ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir}
|
||||
|
|
107
pkgs/applications/audio/exaile/default.nix
Normal file
107
pkgs/applications/audio/exaile/default.nix
Normal file
|
@ -0,0 +1,107 @@
|
|||
{ stdenv, lib, fetchFromGitHub
|
||||
, gobject-introspection, makeWrapper, wrapGAppsHook
|
||||
, gtk3, gst_all_1, python3
|
||||
, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
|
||||
, iconTheme ? gnome.adwaita-icon-theme
|
||||
, deviceDetectionSupport ? true
|
||||
, documentationSupport ? true
|
||||
, notificationSupport ? true
|
||||
, scalableIconSupport ? true
|
||||
, translationSupport ? true
|
||||
, bpmCounterSupport ? false
|
||||
, ipythonSupport ? false
|
||||
, lastfmSupport ? false
|
||||
, lyricsManiaSupport ? false
|
||||
, lyricsWikiSupport ? false
|
||||
, multimediaKeySupport ? false
|
||||
, musicBrainzSupport ? false
|
||||
, podcastSupport ? false
|
||||
, streamripperSupport ? false
|
||||
, wikipediaSupport ? false
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exaile";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exaile";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0s29lm0i4slgaw5l5s9a2zx0b83xac43rnil5cvyi210dxm5s048";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/exaile/exaile/pull/751.patch";
|
||||
sha256 = "sha256-jCJh85Z3HQcyS4ntQP5HwYJgM7WNHcWzjf0BdNJitsM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
] ++ lib.optionals documentationSupport [
|
||||
help2man
|
||||
python3.pkgs.sphinx
|
||||
python3.pkgs.sphinx_rtd_theme
|
||||
] ++ lib.optional translationSupport gettext;
|
||||
|
||||
buildInputs = [
|
||||
iconTheme
|
||||
gtk3
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]) ++ (with python3.pkgs; [
|
||||
bsddb3
|
||||
dbus-python
|
||||
mutagen
|
||||
pygobject3
|
||||
pycairo
|
||||
gst-python
|
||||
]) ++ lib.optional deviceDetectionSupport udisks
|
||||
++ lib.optional notificationSupport libnotify
|
||||
++ lib.optional scalableIconSupport librsvg
|
||||
++ lib.optional bpmCounterSupport gst_all_1.gst-plugins-bad
|
||||
++ lib.optional ipythonSupport python3.pkgs.ipython
|
||||
++ lib.optional lastfmSupport python3.pkgs.pylast
|
||||
++ lib.optional (lyricsManiaSupport || lyricsWikiSupport) python3.pkgs.lxml
|
||||
++ lib.optional lyricsWikiSupport python3.pkgs.beautifulsoup4
|
||||
++ lib.optional multimediaKeySupport keybinder3
|
||||
++ lib.optional musicBrainzSupport python3.pkgs.musicbrainzngs
|
||||
++ lib.optional podcastSupport python3.pkgs.feedparser
|
||||
++ lib.optional wikipediaSupport webkitgtk;
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
mox3
|
||||
pytest
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
substituteInPlace Makefile --replace "PYTHONPATH=$(shell pwd)" "PYTHONPATH=$PYTHONPATH:$(shell pwd)"
|
||||
export PYTEST="py.test"
|
||||
export XDG_CACHE_HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/exaile \
|
||||
--set PYTHONPATH $PYTHONPATH \
|
||||
${lib.optionalString streamripperSupport "--prefix PATH : ${lib.makeBinPath [ streamripper ]}"}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.exaile.org/";
|
||||
description = "A music player with a simple interface and powerful music management capabilities";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ryneeverett ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cni-plugins";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = "plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RcDZW/iOAcJodGiuzmeZk3obtD0/mQoMF9vL0xNehbQ=";
|
||||
sha256 = "sha256-zIL9KG1WL+DlgC5c+b9gV1i7mB0Ge8bapcuSV4GNIck=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-network-displays";
|
||||
version = "0.90.4";
|
||||
version = "0.90.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498";
|
||||
sha256 = "sha256-2SBVQK4fJeK8Y2UrrL0g5vQIerDdGE1nhFc6ke4oIpI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -36,11 +36,6 @@ stdenv.mkDerivation rec {
|
|||
url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff";
|
||||
sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p";
|
||||
})
|
||||
# Fixes an upstream bug: https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/147
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/23164b58f4d5dd59de988525906d6e5e82c5a63c.patch";
|
||||
sha256 = "0x32dvkzv9m04q41aicscpf4aspghx81a65462kjqnsavi64lga5";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.36.2";
|
||||
version = "1.36.4";
|
||||
|
||||
goPackagePath = "github.com/docker-slim/docker-slim";
|
||||
|
||||
|
@ -14,7 +14,7 @@ buildGoPackage rec {
|
|||
owner = "docker-slim";
|
||||
repo = "docker-slim";
|
||||
rev = version;
|
||||
sha256 = "sha256-Q8M8+krPC6WRDCxe88gzX5bDG8x6sJ8TduTKjA85WFA=";
|
||||
sha256 = "0hgiigai5jpczjll4s4r4jzbq272s3p8f0r6mj4r3mjjs89hkqz1";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
|
||||
|
@ -38,7 +38,7 @@ buildGoPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Minify and secure Docker containers";
|
||||
homepage = "https://dockersl.im/";
|
||||
changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ];
|
||||
};
|
||||
|
|
|
@ -14,8 +14,9 @@
|
|||
, ...
|
||||
}@attrs:
|
||||
let
|
||||
mergeInputs = name: lib.concatLists (lib.catAttrs name
|
||||
([ attrs ] ++ inputsFrom));
|
||||
mergeInputs = name:
|
||||
(attrs.${name} or []) ++
|
||||
(lib.subtractLists inputsFrom (lib.catAttrs name inputsFrom));
|
||||
|
||||
rest = builtins.removeAttrs attrs [
|
||||
"packages"
|
||||
|
|
|
@ -5,13 +5,12 @@ with lib; mkCoqDerivation rec {
|
|||
inherit version;
|
||||
defaultVersion = switch coq.coq-version [
|
||||
{ case = "8.6"; out = "8.8.1"; }
|
||||
{ case = (versions.range "8.7" "8.12"); out = "8.12.0"; }
|
||||
{ case = (versions.range "8.13" "8.13"); out = "c366d3f01ec1812b145117a4da940518b092d3a6"; }
|
||||
{ case = (versions.range "8.7" "8.13"); out = "8.13.0"; }
|
||||
] null;
|
||||
release = {
|
||||
"8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
|
||||
"8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi";
|
||||
"c366d3f01ec1812b145117a4da940518b092d3a6".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b";
|
||||
"8.13.0".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b";
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs ./configure.sh";
|
||||
|
|
|
@ -1,15 +1,23 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ip2location-c";
|
||||
version = "7.0.2"; # meta.homepage might change after a major update
|
||||
version = "8.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
|
||||
url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrislim2888";
|
||||
repo = "IP2Location-C-Library";
|
||||
rev = version;
|
||||
sha256 = "0rqjgmv62s7abiiqi3ff3ff838qx4pzr509irmzvqlflnkxxi0q6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -25,8 +33,9 @@ stdenv.mkDerivation rec {
|
|||
weather, MCC, MNC, mobile brand name, elevation and usage type of
|
||||
any IP address or host name in the IP2Location databases.
|
||||
'';
|
||||
homepage = "http://www.ip2location.com/developers/c-7";
|
||||
homepage = "https://www.ip2location.com/developers/c";
|
||||
license = with licenses; [ gpl3Plus lgpl3Plus ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
7236
pkgs/development/node-packages/node-packages.nix
generated
7236
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "denonavr";
|
||||
version = "0.10.8";
|
||||
version = "0.10.9";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scarface-4711";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk";
|
||||
sha256 = "sha256-Y0sFRKnKZAdP95EyE3h1g92AJeT0Xkshjjwfv/vnfW8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dnachisel";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Edinburgh-Genome-Foundry";
|
||||
repo = "DnaChisel";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zhq7cai47649njjp3m8zaglsv9ci6ci855dymyip8qx5ppnkfj0";
|
||||
sha256 = "17jldscmsq5lwp3pnjlxg56k3vfpr7rj4qbcbzkzhphifrfgm729";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "karton-core";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = "karton";
|
||||
rev = "v${version}";
|
||||
sha256 = "08j1bm9g58576sswcrpfczaki24nlqqaypp7qv1rxxwsyp5pq6h6";
|
||||
sha256 = "sha256-pIYDY+pie4xqH11UHBal7/+MVmJDgNCFVpSD9we9ZPA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ minio redis ];
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{ buildPythonPackage
|
||||
, enum34
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, lib
|
||||
, mutagen
|
||||
, six
|
||||
|
@ -10,30 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mediafile";
|
||||
version = "0.6.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o/tSAHu8FTr6LZoMHvegr9uCZovNLHS9KkP2U9y4uko=";
|
||||
sha256 = "sha256-19K5DZMstRWu/6+N/McEdM1swedI5qr15kmnIAMA60Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mutagen six ] ++ lib.optional isPy27 enum34;
|
||||
|
||||
# NB: Remove in the next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/beetbox/mediafile/commit/0ff753d493a1a7f406cb3378545ffe2c85a9afa3.patch";
|
||||
sha256 = "sha256-AQ7YedoYPmLqt4a/odgghIKOY61i9YfA0To0RVFqlk8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/beetbox/mediafile/commit/f0fb4e5111d9dfaa3b38d196ec41fcd237d97953.patch";
|
||||
sha256 = "sha256-5O6RiAqkQEz3Bvqjwwv/LOS33nSIBnT2H/vasGGVrpI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4.patch";
|
||||
sha256 = "sha256-SMH0XhCaKLDNB4M8VmZWfGuuelfY5xladZyQYtXtP18=";
|
||||
})
|
||||
];
|
||||
propagatedBuildInputs = [ mutagen six ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MediaFile is a simple interface to the metadata tags for many audio file formats.";
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "numpy-stl";
|
||||
version = "2.16.2";
|
||||
version = "2.16.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77";
|
||||
sha256 = "95890627001efb2cb8d17418730cdc1bdd64b8dbb9862b01a8e0359d79fe863e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pubnub";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jd3rr8dydfaxz5g8idpwacp4bnbmhg74dwz7qwmzn34336s4ji6";
|
||||
sha256 = "151f9vhgjlr3maniry3vin8vxvz7h8kxnfby9zgsrlvjs4nfgdf9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfma";
|
||||
version = "0.1.4";
|
||||
version = "0.1.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nschloe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1wkcl41j2d1yflc5dl30ys1yxx68w9zn3vj8brwkm1ar9jnfmg4h";
|
||||
rev = version;
|
||||
sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
|
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymazda";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-tEe70gvEglxqECiPjS3k29zZi70OSGMv6JxhrXqPhnY=";
|
||||
sha256 = "sha256-Dg7oVNEjKZB6zksm1We2JGBW+cGkOOQOP3bS4CNL4q8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-nomad";
|
||||
version = "1.3.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "67731d050472923581c43a39a8f01567468e8b3c8e83465b762c99eb0e5e23bc";
|
||||
sha256 = "087a7d5d2af9fd8ce5da70d29e4b456c6b8b0ea3cd16613ed50f6eb8ad6cdba6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Like jq, but for HTML";
|
||||
homepage = "https://github.com/mgdm/htmlq";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
maintainers = with maintainers; [ siraben nerdypepper ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2021-08-30";
|
||||
cargoSha256 = "sha256-ba/4mQSBJin3yoIZjzFTiEIRY2eWFQI2pY1dOCZ1ALw=";
|
||||
version = "2021-09-06";
|
||||
cargoSha256 = "sha256-CTCDSoViyVMHxUKQz8fE+r3rkXf7yRgzZ90fZmMtcNM=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-mgwoJfvO3W4MYk6ikgck14e+hMjA2D+4lpnkAEeLEWA=";
|
||||
sha256 = "sha256-TacpTVvHAIs4kZ5vibj8luy/kryYwxY+OXFNPnqiXP0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.2.727",
|
||||
"version": "0.2.735",
|
||||
"dependencies": {
|
||||
"https-proxy-agent": "^5.0.0",
|
||||
"node-fetch": "^2.6.1",
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, libxslt
|
||||
|
@ -16,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "upower";
|
||||
version = "0.99.11";
|
||||
version = "0.99.13";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz";
|
||||
sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4";
|
||||
url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz";
|
||||
sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,11 +12,11 @@ let
|
|||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.41.1";
|
||||
version = "1.42.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vaym6mxnwg2xdqjcigi2sb0kkdi0ly5d5ghakfsysxcfn08d1z8";
|
||||
sha256 = "sha256-wJFjjm9apRqjk5eN/kIEgecHgm/XLbtwXHEpM2pmvO8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -14,6 +14,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
postPatch = ''
|
||||
sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
|
||||
sed -i -e '/namespace_packages/d' setup.py
|
||||
sed -i -e 's/mediafile~=0.6.0/mediafile>=0.6.0/' setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ beets ];
|
||||
|
|
|
@ -1,20 +1,33 @@
|
|||
{ lib, stdenv, fetchurl, getopt, ip2location-c, openssl, perl
|
||||
, libmaxminddb ? null, geolite-legacy ? null }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, getopt
|
||||
, ip2location-c
|
||||
, openssl
|
||||
, perl
|
||||
, libmaxminddb ? null
|
||||
, geolite-legacy ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipv6calc";
|
||||
version = "2.2.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://www.deepspace6.net/ftp/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "18acy0sy3n6jcjjwpxskysinw06czyayx1q4rqc7zc3ic4pkad8r";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbiering";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1iis7qw803k9z52j30hn9sv8c3b0xyr9v7kb4fvcyiry1iaxcgfk";
|
||||
};
|
||||
|
||||
buildInputs = [ libmaxminddb geolite-legacy getopt ip2location-c openssl perl ];
|
||||
buildInputs = [
|
||||
libmaxminddb
|
||||
geolite-legacy
|
||||
getopt
|
||||
ip2location-c
|
||||
openssl
|
||||
perl
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs *.sh */*.sh
|
||||
|
@ -30,9 +43,13 @@ stdenv.mkDerivation rec {
|
|||
"--disable-bundled-md5"
|
||||
"--disable-dynamic-load"
|
||||
"--enable-shared"
|
||||
] ++ lib.optional (libmaxminddb != null) "--enable-mmdb"
|
||||
++ lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP"
|
||||
++ lib.optional (ip2location-c != null) "--enable-ip2location";
|
||||
] ++ lib.optional (libmaxminddb != null) [
|
||||
"--enable-mmdb"
|
||||
] ++ lib.optional (geolite-legacy != null) [
|
||||
"--with-geoip-db=${geolite-legacy}/share/GeoIP"
|
||||
] ++ lib.optional (ip2location-c != null) [
|
||||
"--enable-ip2location"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -47,7 +64,8 @@ stdenv.mkDerivation rec {
|
|||
Now only one utiltity is needed to do a lot.
|
||||
'';
|
||||
homepage = "http://www.deepspace6.net/projects/ipv6calc.html";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,15 +1,13 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
foreman (0.78.0)
|
||||
thor (~> 0.19.1)
|
||||
thor (0.19.1)
|
||||
foreman (0.87.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
x86_64-linux
|
||||
|
||||
DEPENDENCIES
|
||||
foreman
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.2.20
|
||||
|
|
|
@ -1,18 +1,12 @@
|
|||
{
|
||||
thor = {
|
||||
version = "0.19.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
|
||||
};
|
||||
};
|
||||
foreman = {
|
||||
version = "0.78.0";
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
|
||||
sha256 = "0szgxvnzwkzrfbq5dkwa98mig78aqglfy6irdsvq1gq045pbq9r7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.87.2";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.6.2";
|
||||
version = "5.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9Qdl+5BvzYbBw90+9V5bKBrikxlxMt7UxMQ54XwgbTk=";
|
||||
sha256 = "sha256-zotCn8J6zQtHd/YDT87l6Vh4Xh51tOJENBCdxZ5rqWU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-TxtYsM1qtpvI5IbkM3vicCgJ0+EqelFJ8Vc6+Ff5wd8=";
|
||||
vendorSha256 = "sha256-TBWhF2YmlJPNFr3sKSFhuzoBD0Hp1tnYAMJDUwO/QFM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -23822,6 +23822,8 @@ with pkgs;
|
|||
|
||||
evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };
|
||||
|
||||
exaile = callPackage ../applications/audio/exaile { };
|
||||
|
||||
exercism = callPackage ../applications/misc/exercism { };
|
||||
|
||||
expenses = callPackage ../applications/misc/expenses { };
|
||||
|
|
|
@ -1221,6 +1221,26 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
BarcodeZBar = buildPerlPackage {
|
||||
pname = "Barcode-ZBar";
|
||||
version = "0.04pre";
|
||||
# The meta::cpan version of this module has been unmaintained from 2009
|
||||
# This uses an updated version from the ZBar repo that works with the current ZBar library
|
||||
src = "${pkgs.zbar.src}/perl";
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.PL --replace "-lzbar" "-L${pkgs.zbar.lib}/lib -lzbar"
|
||||
rm t/Processor.t
|
||||
'';
|
||||
buildInputs =[ ExtUtilsMakeMaker ];
|
||||
propagatedBuildInputs = [ pkgs.zbar PerlMagick ];
|
||||
perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC";
|
||||
meta = {
|
||||
homepage = "https://github.com/mchehab/zbar/tree/master/perl";
|
||||
description = "Perl interface to the ZBar Barcode Reader";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
BC = buildPerlPackage {
|
||||
pname = "B-C";
|
||||
version = "1.57";
|
||||
|
@ -5009,6 +5029,21 @@ let
|
|||
buildInputs = [ TestFailWarnings ];
|
||||
};
|
||||
|
||||
DataSectionSimple = buildPerlPackage {
|
||||
pname = "Data-Section-Simple";
|
||||
version = "0.07";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Data-Section-Simple-0.07.tar.gz";
|
||||
sha256 = "0b3035ffdb909aa1f7ded6b608fa9d894421c82c097d51e7171170d67579a9cb";
|
||||
};
|
||||
buildInputs = [ TestRequires ];
|
||||
meta = {
|
||||
homepage = "https://github.com/miyagawa/Data-Section-Simple";
|
||||
description = "Read data from __DATA__";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
DataSerializer = buildPerlModule {
|
||||
pname = "Data-Serializer";
|
||||
version = "0.65";
|
||||
|
@ -21742,6 +21777,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
TestSnapshot = buildPerlPackage {
|
||||
pname = "Test-Snapshot";
|
||||
version = "0.06";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/ET/ETJ/Test-Snapshot-0.06.tar.gz";
|
||||
sha256 = "f4dd7a9a55baa2247540ae34210cd05a04f9d1061befec97a1c90eda95bfae45";
|
||||
};
|
||||
buildInputs = [ CaptureTiny ];
|
||||
propagatedBuildInputs = [ TextDiff ];
|
||||
meta = {
|
||||
description = "Test against data stored in automatically-named file";
|
||||
license = lib.licenses.artistic2;
|
||||
};
|
||||
};
|
||||
|
||||
TestSpec = buildPerlPackage {
|
||||
pname = "Test-Spec";
|
||||
version = "0.54";
|
||||
|
|
Loading…
Reference in a new issue