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]
2022-11-22 18:01:20 +00:00
committed by GitHub
parent aab1a7cbca ccbe8c8072
commit 86a6b65907
30 changed files with 237 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/trivial.nix
+2 -2
View File
@@ -213,8 +213,8 @@ rec {
# Default value to return if revision can not be determined
default:
let
revisionFile = ./.. + "/.git-revision";
gitRepo = ./.. + "/.git";
revisionFile = "${toString ./..}/.git-revision";
gitRepo = "${toString ./..}/.git";
in if lib.pathIsGitRepo gitRepo
then lib.commitIdFromGitRepo gitRepo
else if lib.pathExists revisionFile then lib.fileContents revisionFile
pkgs/applications/emulators/cemu/default.nix
+9 -3
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-13";
version = "2.0-17";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM=";
hash = "sha256-ryFph55o7s3eiqQ8kx5+3Et5S2U9H5i3fmZTc1CaCnA=";
};
patches = [
@@ -106,7 +106,13 @@ stdenv.mkDerivation rec {
preFixup = let
libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs;
in ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}")
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}"
# Force X11 to be used until Wayland is natively supported
# <https://github.com/cemu-project/Cemu/pull/143>
--set GDK_BACKEND x11
)
'';
meta = with lib; {
pkgs/applications/misc/tut/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
version = "1.0.17";
version = "1.0.19";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "sha256-XuN1qpcCUX8xAE7tj21g6U3ilhQIeGWlSqMVik5Qc5Q=";
sha256 = "sha256-lT/3KXxrZYOK/oGrlorQUIv8J7tAfME0hRb1bwN+nXA=";
};
vendorSha256 = "sha256-WdhTdF8kdjAg6ztwSwx+smaA0rrLZjE76r4oVJqMtFU=";
vendorSha256 = "sha256-O7tre7eSGlB9mnf/9aNbe/Ji0ecmJyuLuaWKARskCjI=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";
pkgs/applications/science/math/form/default.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, gmp, zlib }:
stdenv.mkDerivation {
version = "4.2.1";
version = "4.3.0";
pname = "form";
# This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
src = fetchurl {
url = "https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz";
sha256 = "0a0smc10gm85vxd85942n5azy88w5qs5avbqrw0lw0yb9injswpj";
url = "https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz";
sha256 = "sha256-sjTg0JX3PssJBM3DsNjYMjqfp/RncKUvsiJnxiSq+/Y=";
};
buildInputs = [ gmp zlib ];
pkgs/development/python-modules/adafruit-platformdetect/default.nix
+3 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.33.0";
version = "3.34.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-Fj+LUTovZm6t0YRCa8QtoTBal+PefCvTIl9OeBoac6U=";
hash = "sha256-3eOYkzeEKC5xTUt5RF5Sm4TKZREu4YiXBrrD3c0Z8+0=";
};
nativeBuildInputs = [
@@ -32,6 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Platform detection for use by Adafruit libraries";
homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
changelog = "https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/aiomusiccast/default.nix
+4 -3
View File
@@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "aiomusiccast";
version = "0.14.5";
version = "0.14.6";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "vigonotion";
repo = "aiomusiccast";
rev = "refs/tags/${version}";
hash = "sha256-YssBrG4sFtQtrzKU/O/tWEVL9eq8dpszejY/1So5Mec=";
hash = "sha256-eQBVenB/WIqksohWtCU/3o3TGWMavPjJahlg0yus4aE=";
};
postPatch = ''
@@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Companion library for musiccast devices intended for the Home Assistant integration";
homepage = "https://github.com/vigonotion/aiomusiccast";
changelog = "https://github.com/vigonotion/aiomusiccast/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
pkgs/development/python-modules/arcam-fmj/default.nix
+5 -3
View File
@@ -12,15 +12,16 @@
buildPythonPackage rec {
pname = "arcam-fmj";
version = "0.12.0";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "elupus";
repo = "arcam_fmj";
rev = version;
sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U=";
rev = "refs/tags/${version}";
hash = "sha256-Lmz701qdqFlXro279AdNx+P1o3Q/Om63jKvy854ogto=";
};
propagatedBuildInputs = [
@@ -45,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for speaking to Arcam receivers";
homepage = "https://github.com/elupus/arcam_fmj";
changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
pkgs/development/python-modules/broadlink/default.nix
+3 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "broadlink";
version = "0.18.2";
version = "0.18.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2ktLSJ1Nsdry8dvWmY/BbhHApTYQMvSjCsNKX3PkocU=";
hash = "sha256-3+WKuMbH79v2i4wurObKQZowCmFbVsxlQp3aSk+eelg=";
};
propagatedBuildInputs = [
@@ -31,6 +31,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python API for controlling Broadlink IR controllers";
homepage = "https://github.com/mjg59/python-broadlink";
changelog = "https://github.com/mjg59/python-broadlink/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/cherrypy/default.nix
+1 -1
View File
@@ -102,7 +102,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Object-oriented HTTP framework";
homepage = "https://www.cherrypy.org";
homepage = "https://cherrypy.dev/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
pkgs/development/python-modules/debian/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "python-debian";
version = "0.1.48";
version = "0.1.49";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-YtUFR9BqVjjOHF6A19cB3fFpY7QHr89b3IPH3k25T3w=";
hash = "sha256-jPZ3ow28tL56mVNsF+ETCKgnpNIgKNxZpn9sbdPw9Yw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/h5py/default.nix
+29 -9
View File
@@ -1,6 +1,17 @@
{ lib, fetchPypi, isPy27, buildPythonPackage, pythonOlder
, numpy, hdf5, cython, six, pkgconfig, unittest2
, mpi4py ? null, openssh, pytestCheckHook, cached-property }:
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, setuptools
, numpy
, hdf5
, cython
, pkgconfig
, mpi4py ? null
, openssh
, pytestCheckHook
, cached-property
}:
assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@@ -10,7 +21,9 @@ let
in buildPythonPackage rec {
version = "3.7.0";
pname = "h5py";
disabled = isPy27;
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -35,16 +48,23 @@ in buildPythonPackage rec {
preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
# tests now require pytest-mpi, which isn't available and difficult to package
doCheck = false;
checkInputs = lib.optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
nativeBuildInputs = [ pkgconfig cython ];
nativeBuildInputs = [
cython
pkgconfig
setuptools
];
buildInputs = [ hdf5 ]
++ lib.optional mpiSupport mpi;
propagatedBuildInputs = [ numpy six]
propagatedBuildInputs = [ numpy ]
++ lib.optionals mpiSupport [ mpi4py openssh ]
++ lib.optionals (pythonOlder "3.8") [ cached-property ];
# tests now require pytest-mpi, which isn't available and difficult to package
doCheck = false;
checkInputs = [ pytestCheckHook openssh ];
pythonImportsCheck = [ "h5py" ];
meta = with lib; {
pkgs/development/python-modules/pychromecast/default.nix
+5 -4
View File
@@ -2,7 +2,7 @@
, buildPythonPackage
, casttube
, fetchPypi
, isPy3k
, pythonOlder
, protobuf
, requests
, zeroconf
@@ -10,15 +10,15 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "12.1.4";
version = "13.0.1";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "PyChromecast";
inherit version;
sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA=";
hash = "sha256-IDqvA3r7rKEnY6OpEZKd0lsKinse4A0BDTQ5vTGpglI=";
};
postPatch = ''
@@ -43,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for Python to communicate with the Google Chromecast";
homepage = "https://github.com/home-assistant-libs/pychromecast";
changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
pkgs/development/python-modules/smbprotocol/default.nix
+5 -6
View File
@@ -7,27 +7,25 @@
, pytest-mock
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "smbprotocol";
version = "1.9.0";
version = "1.10.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg=";
rev = "refs/tags/v${version}";
hash = "sha256-8T091yF/Hu60aaUr6IDZt2cLxz1sXUbMewSqW1Ch0Vo=";
};
propagatedBuildInputs = [
cryptography
pyspnego
six
];
checkInputs = [
@@ -52,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python SMBv2 and v3 Client";
homepage = "https://github.com/jborean93/smbprotocol";
changelog = "https://github.com/jborean93/smbprotocol/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/tools/analysis/brakeman/Gemfile.lock
+2 -2
View File
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
brakeman (5.3.1)
brakeman (5.4.0)
PLATFORMS
ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
brakeman
BUNDLED WITH
2.3.20
2.3.25
pkgs/development/tools/analysis/brakeman/gemset.nix
+2 -2
View File
@@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306";
sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds";
type = "gem";
};
version = "5.3.1";
version = "5.4.0";
};
}
pkgs/development/tools/build-managers/bob/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bob";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "benchkram";
repo = pname;
rev = version;
hash = "sha256-37VhzYxVrt+w1XTDXzKAkJT43TQSyCmX9SAoNnk+o3w=";
hash = "sha256-OuIE3saJxk8IBLPbAxdQ2uJ9oXJ3xBOaeZraw9csy1U=";
};
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
pkgs/development/tools/ginkgo/default.nix
+3 -3
View File
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-jZadmIefrK3kSStbG1Q3+R08/lEaBE/yWNSpPFSLW6I=";
sha256 = "sha256-xoZVo+JEOXaME7gE9PuTfNmAyVTgczNuSzA4zYAfUmc=";
};
vendorSha256 = "sha256-ZLDk61J7ci+OR1z3ddAfxeeDmRyTrVMHatc5thuCrl4=";
vendorSha256 = "sha256-a8NZ9Uws6OKfXWUL6oTZKoAG8pTYxxSNkefZtbqwyf4=";
# integration tests expect more file changes
# types tests are missing CodeLocation
pkgs/development/tools/typos/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.11.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-jQmihZl1mKBHg7HLKAbe9uuL1QM+cF0beFj8htz0IOU=";
hash = "sha256-/+M+yR28mUA3iJ8wJlsL5cNRHn19yypUpG/bcfFtwVQ=";
};
cargoHash = "sha256-bO9QMMJY+gQyV811qXdwiH1oxW+5Q+dZqG/oT35Eze4=";
cargoHash = "sha256-GeEQ00r7GYm4goeCWGXg5m+d3eaM2eBJtuip09a1OV0=";
meta = with lib; {
description = "Source code spell checker";
pkgs/games/harmonist/default.nix
+6 -9
View File
@@ -1,20 +1,17 @@
{lib, fetchurl, buildGoPackage}:
buildGoPackage rec {
{lib, fetchurl, buildGoModule}:
buildGoModule rec {
pname = "harmonist";
version = "0.4.1";
goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git";
src = fetchurl {
url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz";
sha256 = "19abqmzz9nnlnizkskvlkcpahk8lzrl57mgg6dfxn25l55vfznws";
hash = "sha256-mtvvdim0CNtdM+/VU2j+FE2oLpt0Tz1/tNTa9H/FS6U=";
};
goDeps = ./deps.nix;
vendorHash = "sha256-SrvJXTyLtPZ2PyhSZz/gJvuso9r7e5NbGe7EJRf2XlI=";
postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A stealth coffee-break roguelike game";
@@ -29,6 +26,6 @@ buildGoPackage rec {
homepage = "https://harmonist.tuxfamily.org/";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [];
maintainers = with maintainers; [ aaronjheng ];
};
}
pkgs/games/harmonist/deps.nix
Generated
-92
View File
@@ -1,92 +0,0 @@
[
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "59616a248b91ae20bf3eb93636a24c87d9ce6cea";
sha256 = "0jh9552ppqvkdfni7x623n0x5mbiaqqhjhmr0zkh28x56k4ysii4";
};
}
{
goPackagePath = "github.com/anaseto/gruid";
fetch = {
type = "git";
url = "https://github.com/anaseto/gruid";
rev = "976b3db42d20169cf44eca1406b3cff104a80979";
sha256 = "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y";
};
}
{
goPackagePath = "github.com/anaseto/gruid-tcell";
fetch = {
type = "git";
url = "https://github.com/anaseto/gruid-tcell";
rev = "4878126bb96fa0e529ec22c700d03b030e5c3bf7";
sha256 = "0spm9gqsdan1mvbpypywid00vvl92rii8akhmjdm8l1r9qk7a3i4";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "f4d402906fa3d330545365abbf970c048e677b35";
sha256 = "1wcbm5vxrh5s8g4mas32y3n0pjvfmngmc2yrxg1yn4333mh9mgf3";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "4d8f45c41ac988423342507a1fb6050239b5a742";
sha256 = "1p2rl5353fi4p3l0bz3dg0lifhxqj8hjyh1b6z1cn286qxwnnnm8";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d";
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
};
}
{
goPackagePath = "github.com/rivo/uniseg";
fetch = {
type = "git";
url = "https://github.com/rivo/uniseg";
rev = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d";
sha256 = "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q";
};
}
{
goPackagePath = "golang.org/x/term/";
fetch = {
type = "git";
url = "https://go.googlesource.com/term";
rev = "6a3ed077a48de71621ad530f9078fffa0bc0ce32";
sha256 = "0xni8n3q2r9f6fk223b2c1702fvqmgz7vk6738asri3fwby583q5";
};
}
{
goPackagePath = "golang.org/x/text/";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "e3aa4adf54f644ca0cb35f1f1fb19b239c40ef04";
sha256 = "03q5kjmp4sfp5yzwb76lyf8cs9qca26vlwry5qgqf8w03rq700hf";
};
}
{
goPackagePath = "golang.org/x/sys/";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "88b6017d06564827ae436c619d52116f470a3611";
sha256 = "14n7b6833lhxjzsgvi14c6c8nfiqqb4r71wvv4z5ksyssi95i3r7";
};
}
]
pkgs/os-specific/linux/kernel/common-config.nix
+21 -33
View File
@@ -53,8 +53,6 @@ let
DEBUG_KERNEL = yes;
DEBUG_DEVRES = no;
DYNAMIC_DEBUG = yes;
TIMER_STATS = whenOlder "4.11" yes;
DEBUG_NX_TEST = whenOlder "4.11" no;
DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = option no;
RCU_TORTURE_TEST = no;
@@ -109,10 +107,10 @@ let
BLK_CGROUP_IOLATENCY = whenAtLeast "4.19" yes;
BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes;
IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes;
BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes;
MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes;
IOSCHED_BFQ = whenAtLeast "4.12" module;
MQ_IOSCHED_DEADLINE = yes;
BFQ_GROUP_IOSCHED = yes;
MQ_IOSCHED_KYBER = yes;
IOSCHED_BFQ = module;
};
@@ -164,8 +162,8 @@ let
IPV6_MROUTE_MULTIPLE_TABLES = yes;
IPV6_PIMSM_V2 = yes;
IPV6_FOU_TUNNEL = module;
IPV6_SEG6_LWTUNNEL = whenAtLeast "4.10" yes;
IPV6_SEG6_HMAC = whenAtLeast "4.10" yes;
IPV6_SEG6_LWTUNNEL = yes;
IPV6_SEG6_HMAC = yes;
IPV6_SEG6_BPF = whenAtLeast "4.18" yes;
NET_CLS_BPF = module;
NET_ACT_BPF = module;
@@ -222,7 +220,7 @@ let
INET_DIAG = mkDefault module;
INET_TCP_DIAG = mkDefault module;
INET_UDP_DIAG = mkDefault module;
INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module);
INET_RAW_DIAG = mkDefault module;
INET_DIAG_DESTROY = mkDefault yes;
# enable multipath-tcp
@@ -231,7 +229,7 @@ let
INET_MPTCP_DIAG = whenAtLeast "5.9" (mkDefault module);
# Kernel TLS
TLS = whenAtLeast "4.13" module;
TLS = module;
TLS_DEVICE = whenAtLeast "4.18" yes;
# infiniband
@@ -308,7 +306,7 @@ let
DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module;
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
# enable HDMI-CEC on RPi boards
DRM_VC4_HDMI_CEC = whenAtLeast "4.14" yes;
DRM_VC4_HDMI_CEC = yes;
};
sound = {
@@ -321,8 +319,6 @@ let
SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
SND_OSSEMUL = yes;
SND_USB_CAIAQ_INPUT = yes;
# Enable PSS mixer (Beethoven ADSP-16 and other compatible)
PSS_MIXER = whenOlder "4.12" yes;
# Enable Sound Open Firmware support
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" &&
versionAtLeast version "5.5") {
@@ -455,7 +451,6 @@ let
CIFS_UPCALL = yes;
CIFS_ACL = whenOlder "5.3" yes;
CIFS_DFS_UPCALL = yes;
CIFS_SMB2 = whenOlder "4.13" yes;
CEPH_FSCACHE = yes;
CEPH_FS_POSIX_ACL = yes;
@@ -467,7 +462,7 @@ let
SQUASHFS_LZO = yes;
SQUASHFS_XZ = yes;
SQUASHFS_LZ4 = yes;
SQUASHFS_ZSTD = whenAtLeast "4.14" yes;
SQUASHFS_ZSTD = yes;
# Native Language Support modules, needed by some filesystems
NLS = yes;
@@ -485,12 +480,10 @@ let
};
security = {
FORTIFY_SOURCE = whenAtLeast "4.13" (option yes);
FORTIFY_SOURCE = option yes;
# https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html
DEBUG_LIST = yes;
# Detect writes to read-only module pages
DEBUG_SET_MODULE_RONX = whenOlder "4.11" (option yes);
HARDENED_USERCOPY = yes;
RANDOMIZE_BASE = option yes;
STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem
@@ -535,7 +528,6 @@ let
MICROCODE = yes;
MICROCODE_INTEL = yes;
MICROCODE_AMD = yes;
} // optionalAttrs (versionAtLeast version "4.10") {
# Write Back Throttling
# https://lwn.net/Articles/682582/
# https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
@@ -550,7 +542,7 @@ let
CGROUP_DEVICE = yes;
CGROUP_HUGETLB = yes;
CGROUP_PERF = yes;
CGROUP_RDMA = whenAtLeast "4.11" yes;
CGROUP_RDMA = yes;
MEMCG = yes;
MEMCG_SWAP = whenOlder "6.1" yes;
@@ -580,8 +572,7 @@ let
FTRACE_SYSCALLS = yes;
SCHED_TRACER = yes;
STACK_TRACER = yes;
UPROBE_EVENT = { optional = true; tristate = whenOlder "4.11" "y";};
UPROBE_EVENTS = { optional = true; tristate = whenAtLeast "4.11" "y";};
UPROBE_EVENTS = option yes;
BPF_SYSCALL = yes;
BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.16" yes;
BPF_EVENTS = yes;
@@ -596,8 +587,6 @@ let
PARAVIRT_SPINLOCKS = option yes;
KVM_ASYNC_PF = yes;
KVM_COMPAT = whenOlder "4.12" (option yes);
KVM_DEVICE_ASSIGNMENT = whenOlder "4.12" (option yes);
KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes;
KVM_GUEST = yes;
KVM_MMIO = yes;
@@ -646,7 +635,6 @@ let
MEDIA_USB_SUPPORT = yes;
MEDIA_ANALOG_TV_SUPPORT = yes;
VIDEO_STK1160_COMMON = module;
VIDEO_STK1160_AC97 = whenOlder "4.11" yes;
};
"9p" = {
@@ -762,7 +750,7 @@ let
DRAGONRISE_FF = yes;
GREENASIA_FF = yes;
HOLTEK_FF = yes;
JOYSTICK_PSXPAD_SPI_FF = whenAtLeast "4.14" yes;
JOYSTICK_PSXPAD_SPI_FF = yes;
LOGIG940_FF = yes;
NINTENDO_FF = whenAtLeast "5.16" yes;
PLAYSTATION_FF = whenAtLeast "5.12" yes;
@@ -808,16 +796,16 @@ let
BLK_DEV_INTEGRITY = yes;
BLK_SED_OPAL = whenAtLeast "4.14" yes;
BLK_SED_OPAL = yes;
BSD_PROCESS_ACCT_V3 = yes;
SERIAL_DEV_BUS = whenAtLeast "4.11" yes; # enables support for serial devices
SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices
SERIAL_DEV_BUS = yes; # enables support for serial devices
SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices
BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support
BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA
BT_HCIUART_SERDEV = yes; # required by BT_HCIUART_QCA
BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390)
BT_HCIUART_BCSP = option yes;
BT_HCIUART_H4 = option yes; # UART (H4) protocol support
@@ -897,8 +885,8 @@ let
SCSI_LOGGING = yes; # SCSI logging facility
SERIAL_8250 = yes; # 8250/16550 and compatible serial support
SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes;
SLAB_FREELIST_RANDOM = whenAtLeast "4.10" yes;
SLAB_FREELIST_HARDENED = yes;
SLAB_FREELIST_RANDOM = yes;
SLIP_COMPRESSED = yes; # CSLIP compressed headers
SLIP_SMART = yes;
@@ -974,7 +962,7 @@ let
NR_CPUS = freeform "384";
} // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enables support for the Allwinner Display Engine 2.0
SUN8I_DE2_CCU = whenAtLeast "4.13" yes;
SUN8I_DE2_CCU = yes;
# See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647
CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no;
pkgs/servers/klipper/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2022-11-03";
version = "unstable-2022-11-21";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "342d3f1414f905fc85ea14a125463ff2df4e9b51";
sha256 = "sha256-w5hvuKrtZUwYfrBWMJD9jntdjWDfDysAiwhQDTc9jb0=";
rev = "c51f169c06921152a2e9c386016660d0bb09f767";
sha256 = "sha256-l5dOj4cKrKdQ0grmbIdXm5dmkrQv6L+NqCMN1i3z3SE=";
};
sourceRoot = "source/klippy";
pkgs/servers/samba/4.x.nix
+1
View File
@@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
wafConfigureFlags = [
"--with-static-modules=NONE"
"--with-shared-modules=ALL"
"--with-libunwind"
"--enable-fhs"
"--sysconfdir=/etc"
"--localstatedir=/var"
pkgs/servers/sql/postgresql/ext/postgis.nix
+2 -2
View File
@@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
version = "3.3.1";
version = "3.3.2";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
sha256 = "sha256-kb6ACnLXSMWjpKANgqwd5CAj4p2mHs5uv5x3/iKPyxo=";
sha256 = "sha256-miohnaAFoXMKOdGVmhx87GGbHvsAm2W+gP/CW60pkGg=";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
pkgs/tools/admin/pgadmin/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@
let
pname = "pgadmin";
version = "6.15";
version = "6.16";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
sha256 = "sha256-S//Rfi8IiBo+lL0BCFVBw+hy2Tw37B349Gcpq2knqSM=";
sha256 = "sha256-v2CfoV7QAzLcPXKY5nkUi9+HbHujiulUJS4GVBKxTY4=";
};
yarnDeps = mkYarnModules {
pkgs/tools/admin/pgadmin/package.json
+3 -3
View File
@@ -138,7 +138,7 @@
"path-fx": "^2.0.0",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.9",
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee",
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6",
"postcss": "^8.2.15",
"raf": "^3.4.1",
"rc-dock": "^3.2.9",
@@ -162,7 +162,7 @@
"select2": "^4.0.13",
"shim-loader": "^1.0.1",
"snapsvg-cjs": "^0.0.6",
"socket.io-client": "^4.0.0",
"socket.io-client": "^4.5.0",
"split.js": "^1.5.10",
"styled-components": "^5.2.1",
"tempusdominus-bootstrap-4": "^5.1.2",
@@ -170,7 +170,7 @@
"underscore": "^1.13.1",
"url-loader": "^1.1.2",
"valid-filename": "^2.0.1",
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#b4d58f29b3a308ab555085ee444fa7010aa4b991",
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
"wkx": "^0.5.0",
"xterm": "^4.11.0",
"xterm-addon-fit": "^0.5.0",
pkgs/tools/admin/pgadmin/yarn.lock
+51 -79
View File
@@ -2396,10 +2396,10 @@
resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
"@socket.io/component-emitter@~3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9"
integrity sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==
"@socket.io/component-emitter@~3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
"@sphinxxxx/color-conversion@^2.2.2":
version "2.2.2"
@@ -2828,9 +2828,9 @@
semver "^5.7.0"
"@xmldom/xmldom@^0.7.2":
version "0.7.5"
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d"
integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==
version "0.7.8"
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.8.tgz#a8d0a0067c9554c187b0d04e86ad1845053c0e06"
integrity sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@@ -3460,11 +3460,6 @@ backbone@1.4.0:
dependencies:
underscore ">=1.8.3"
backo2@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
balanced-match@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -5126,20 +5121,16 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
dependencies:
once "^1.4.0"
engine.io-client@~6.0.1:
version "6.0.2"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.0.2.tgz#ccfc059051e65ca63845e65929184757754cc34e"
integrity sha512-cAep9lhZV6Q8jMXx3TNSU5cydMzMed8/O7Tz5uzyqZvpNPtQ3WQXrLYGADxlsuaFmOLN7wZLmT7ImiFhUOku8g==
engine.io-client@~6.2.3:
version "6.2.3"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458"
integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==
dependencies:
"@socket.io/component-emitter" "~3.0.0"
"@socket.io/component-emitter" "~3.1.0"
debug "~4.3.1"
engine.io-parser "~5.0.0"
has-cors "1.1.0"
parseqs "0.0.6"
parseuri "0.0.6"
engine.io-parser "~5.0.3"
ws "~8.2.3"
xmlhttprequest-ssl "~2.0.0"
yeast "0.1.2"
engine.io-parser@~5.0.0:
version "5.0.3"
@@ -5148,6 +5139,11 @@ engine.io-parser@~5.0.0:
dependencies:
"@socket.io/base64-arraybuffer" "~1.0.2"
engine.io-parser@~5.0.3:
version "5.0.4"
resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
engine.io@~6.1.0:
version "6.1.2"
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.2.tgz#e7b9d546d90c62246ffcba4d88594be980d3855a"
@@ -6197,11 +6193,6 @@ has-bigints@^1.0.1:
resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
has-cors@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==
has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -7215,14 +7206,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
dependencies:
minimist "^1.2.5"
json5@^2.2.1:
json5@^2.1.2, json5@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -7511,9 +7495,9 @@ loader-runner@^4.2.0:
integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
loader-utils@^1.0.3, loader-utils@^1.1.0, loader-utils@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
version "1.4.1"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
dependencies:
big.js "^5.2.2"
emojis-list "^3.0.0"
@@ -8028,9 +8012,9 @@ minimalistic-crypto-utils@^1.0.1:
integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
minimatch@^3.0.0, minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
dependencies:
brace-expansion "^1.1.7"
@@ -8050,11 +8034,16 @@ minimist-options@4.1.0:
is-plain-obj "^1.1.0"
kind-of "^6.0.3"
minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.5:
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
minimist@^1.2.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
minipass-collect@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -8185,7 +8174,7 @@ module-deps@^6.2.3:
moment-timezone@^0.5.31, moment-timezone@^0.5.34:
version "0.5.37"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e"
integrity "sha1-rfl/cZxORY/bEuK06HuL7J9O7x4= sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg=="
integrity "sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg=="
dependencies:
moment ">= 2.9.0"
@@ -8720,16 +8709,6 @@ parse5@^6.0.1:
resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
parseqs@0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
parseuri@0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
parseurl@~1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -8820,9 +8799,9 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee":
"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6":
version "1.0.0"
resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee"
resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6"
dependencies:
"@types/classnames" "^2.2.6"
"@types/react" "^16.7.18"
@@ -10394,33 +10373,31 @@ socket.io-adapter@~2.3.3:
resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486"
integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==
socket.io-client@^4.0.0:
version "4.3.2"
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.3.2.tgz#9cfdb8fecac8a24d5723daf8c8749e70c8fdeb25"
integrity sha512-2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g==
socket.io-client@^4.5.0:
version "4.5.3"
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.3.tgz#bed69209d001465b2fea650d2e95c1e82768ab5e"
integrity sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==
dependencies:
"@socket.io/component-emitter" "~3.0.0"
backo2 "~1.0.2"
"@socket.io/component-emitter" "~3.1.0"
debug "~4.3.2"
engine.io-client "~6.0.1"
parseuri "0.0.6"
socket.io-parser "~4.1.1"
engine.io-client "~6.2.3"
socket.io-parser "~4.2.0"
socket.io-parser@~4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
version "4.0.5"
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
dependencies:
"@types/component-emitter" "^1.2.10"
component-emitter "~1.3.0"
debug "~4.3.1"
socket.io-parser@~4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.1.tgz#0ad53d980781cab1eabe320417d8480c0133e62d"
integrity sha512-USQVLSkDWE5nbcY760ExdKaJxCE65kcsG/8k5FDGZVVxpD1pA7hABYXYkCUvxUuYYh/+uQw0N/fvBzfT8o07KA==
socket.io-parser@~4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==
dependencies:
"@socket.io/component-emitter" "~3.0.0"
"@socket.io/component-emitter" "~3.1.0"
debug "~4.3.1"
socket.io@^4.2.0:
@@ -11475,9 +11452,9 @@ watchpack@^2.2.0:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#b4d58f29b3a308ab555085ee444fa7010aa4b991":
"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8":
version "2.2.5"
resolved "git+https://github.com/EnterpriseDB/wcDocker/#b4d58f29b3a308ab555085ee444fa7010aa4b991"
resolved "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8"
dependencies:
"@fortawesome/fontawesome-free" "^5.14.0"
FileSaver "^0.10.0"
@@ -11768,11 +11745,6 @@ yauzl@^2.4.2:
buffer-crc32 "~0.2.3"
fd-slicer "~1.1.0"
yeast@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
pkgs/tools/admin/pgadmin/yarn.nix
+53 -85
View File
@@ -2210,11 +2210,11 @@
};
}
{
name = "_socket.io_component_emitter___component_emitter_3.0.0.tgz";
name = "_socket.io_component_emitter___component_emitter_3.1.0.tgz";
path = fetchurl {
name = "_socket.io_component_emitter___component_emitter_3.0.0.tgz";
url = "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz";
sha512 = "2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==";
name = "_socket.io_component_emitter___component_emitter_3.1.0.tgz";
url = "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz";
sha512 = "+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==";
};
}
{
@@ -2690,11 +2690,11 @@
};
}
{
name = "_xmldom_xmldom___xmldom_0.7.5.tgz";
name = "_xmldom_xmldom___xmldom_0.7.8.tgz";
path = fetchurl {
name = "_xmldom_xmldom___xmldom_0.7.5.tgz";
url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz";
sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==";
name = "_xmldom_xmldom___xmldom_0.7.8.tgz";
url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.8.tgz";
sha512 = "PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==";
};
}
{
@@ -3369,14 +3369,6 @@
sha512 = "RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==";
};
}
{
name = "backo2___backo2_1.0.2.tgz";
path = fetchurl {
name = "backo2___backo2_1.0.2.tgz";
url = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz";
sha512 = "zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==";
};
}
{
name = "balanced_match___balanced_match_1.0.2.tgz";
path = fetchurl {
@@ -5082,11 +5074,11 @@
};
}
{
name = "engine.io_client___engine.io_client_6.0.2.tgz";
name = "engine.io_client___engine.io_client_6.2.3.tgz";
path = fetchurl {
name = "engine.io_client___engine.io_client_6.0.2.tgz";
url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.0.2.tgz";
sha512 = "cAep9lhZV6Q8jMXx3TNSU5cydMzMed8/O7Tz5uzyqZvpNPtQ3WQXrLYGADxlsuaFmOLN7wZLmT7ImiFhUOku8g==";
name = "engine.io_client___engine.io_client_6.2.3.tgz";
url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz";
sha512 = "aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==";
};
}
{
@@ -5097,6 +5089,14 @@
sha512 = "BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==";
};
}
{
name = "engine.io_parser___engine.io_parser_5.0.4.tgz";
path = fetchurl {
name = "engine.io_parser___engine.io_parser_5.0.4.tgz";
url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz";
sha512 = "+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==";
};
}
{
name = "engine.io___engine.io_6.1.2.tgz";
path = fetchurl {
@@ -6153,14 +6153,6 @@
sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==";
};
}
{
name = "has_cors___has_cors_1.1.0.tgz";
path = fetchurl {
name = "has_cors___has_cors_1.1.0.tgz";
url = "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz";
sha512 = "g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==";
};
}
{
name = "has_flag___has_flag_3.0.0.tgz";
path = fetchurl {
@@ -7417,14 +7409,6 @@
sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
};
}
{
name = "json5___json5_2.2.0.tgz";
path = fetchurl {
name = "json5___json5_2.2.0.tgz";
url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz";
sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==";
};
}
{
name = "json5___json5_2.2.1.tgz";
path = fetchurl {
@@ -7714,11 +7698,11 @@
};
}
{
name = "loader_utils___loader_utils_1.4.0.tgz";
name = "loader_utils___loader_utils_1.4.1.tgz";
path = fetchurl {
name = "loader_utils___loader_utils_1.4.0.tgz";
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz";
sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
name = "loader_utils___loader_utils_1.4.1.tgz";
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz";
sha512 = "1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==";
};
}
{
@@ -8330,11 +8314,11 @@
};
}
{
name = "minimatch___minimatch_3.0.4.tgz";
name = "minimatch___minimatch_3.1.2.tgz";
path = fetchurl {
name = "minimatch___minimatch_3.0.4.tgz";
url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
name = "minimatch___minimatch_3.1.2.tgz";
url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz";
sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
};
}
{
@@ -8361,6 +8345,14 @@
sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==";
};
}
{
name = "minimist___minimist_1.2.7.tgz";
path = fetchurl {
name = "minimist___minimist_1.2.7.tgz";
url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz";
sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==";
};
}
{
name = "minipass_collect___minipass_collect_1.0.2.tgz";
path = fetchurl {
@@ -8494,7 +8486,7 @@
path = fetchurl {
name = "moment_timezone___moment_timezone_0.5.37.tgz";
url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz";
sha1 = "rfl/cZxORY/bEuK06HuL7J9O7x4=";
sha512 = "uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==";
};
}
{
@@ -9129,22 +9121,6 @@
sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==";
};
}
{
name = "parseqs___parseqs_0.0.6.tgz";
path = fetchurl {
name = "parseqs___parseqs_0.0.6.tgz";
url = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz";
sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==";
};
}
{
name = "parseuri___parseuri_0.0.6.tgz";
path = fetchurl {
name = "parseuri___parseuri_0.0.6.tgz";
url = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz";
sha512 = "AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==";
};
}
{
name = "parseurl___parseurl_1.3.3.tgz";
path = fetchurl {
@@ -9279,8 +9255,8 @@
let
repo = fetchgit {
url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";
rev = "07cc449e1d89ecc8cce3679d8cff5a35f1db67ee";
sha256 = "1a31ms86ldd5hxhwzxp7c2bn6q97wvkfvp3n7qaczc0jq3mrb45z";
rev = "96ceb7f27f43660a804e61d23a76aeb9aa188bb6";
sha256 = "1hvr7arywz8rql19ma6w6lj5hrfn8xr4cyiia4bw5l8d061ak1gj";
};
in
runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''
@@ -11042,27 +11018,27 @@
};
}
{
name = "socket.io_client___socket.io_client_4.3.2.tgz";
name = "socket.io_client___socket.io_client_4.5.3.tgz";
path = fetchurl {
name = "socket.io_client___socket.io_client_4.3.2.tgz";
url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.3.2.tgz";
sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g==";
name = "socket.io_client___socket.io_client_4.5.3.tgz";
url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.3.tgz";
sha512 = "I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==";
};
}
{
name = "socket.io_parser___socket.io_parser_4.0.4.tgz";
name = "socket.io_parser___socket.io_parser_4.0.5.tgz";
path = fetchurl {
name = "socket.io_parser___socket.io_parser_4.0.4.tgz";
url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
name = "socket.io_parser___socket.io_parser_4.0.5.tgz";
url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz";
sha512 = "sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==";
};
}
{
name = "socket.io_parser___socket.io_parser_4.1.1.tgz";
name = "socket.io_parser___socket.io_parser_4.2.1.tgz";
path = fetchurl {
name = "socket.io_parser___socket.io_parser_4.1.1.tgz";
url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.1.tgz";
sha512 = "USQVLSkDWE5nbcY760ExdKaJxCE65kcsG/8k5FDGZVVxpD1pA7hABYXYkCUvxUuYYh/+uQw0N/fvBzfT8o07KA==";
name = "socket.io_parser___socket.io_parser_4.2.1.tgz";
url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz";
sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==";
};
}
{
@@ -12303,8 +12279,8 @@
let
repo = fetchgit {
url = "https://github.com/EnterpriseDB/wcDocker/";
rev = "b4d58f29b3a308ab555085ee444fa7010aa4b991";
sha256 = "03hb9n6wkmj9dzs8fiv03krmy2kxhr1yqmqbrrza9jafbcbrap97";
rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8";
sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg";
};
in
runCommand "wcDocker" { buildInputs = [gnutar]; } ''
@@ -12601,14 +12577,6 @@
sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==";
};
}
{
name = "yeast___yeast_0.1.2.tgz";
path = fetchurl {
name = "yeast___yeast_0.1.2.tgz";
url = "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz";
sha512 = "8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==";
};
}
{
name = "yocto_queue___yocto_queue_0.1.0.tgz";
path = fetchurl {
pkgs/tools/misc/shadowenv/default.nix
+7 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowenv";
version = "2.0.6";
version = "2.1.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = version;
sha256 = "sha256-OfrK5eQ2oJ7ZeUem4PZPE2tsjIObQ+aao6GrtrK8AqA=";
hash = "sha256-11Zce3eehyuDOl2zYl0sf/yh8SOOnu8W/CrL18e3zzw=";
};
cargoSha256 = "sha256-gno44ZdLthcp5/+NP12d0C+x1jrmJHNkHSnyuHWl3Zk=";
cargoHash = "sha256-eo+/mZ6QFoXgIT1uT65TVR65xWBm/Cw5yBzvRUVgQUY=";
nativeBuildInputs = [ installShellFiles ];
@@ -25,6 +25,10 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh sh/completions/_shadowenv
'';
preCheck = ''
HOME=$TMPDIR
'';
meta = with lib; {
homepage = "https://shopify.github.io/shadowenv/";
description = "reversible directory-local environment variable manipulations";
pkgs/tools/package-management/clib/default.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, curl }:
stdenv.mkDerivation rec {
version = "2.8.1";
version = "2.8.2";
pname = "clib";
src = fetchFromGitHub {
rev = version;
owner = "clibs";
repo = "clib";
sha256 = "sha256-AzPpGwtZemKX2r/XKyNTJ+lVwU1QUxkB2OywtCwTAWs=";
sha256 = "sha256-O8elmwH63LU1o2SP+0aovQuhe+QTKOFGjBQ6MAb/6p8=";
};
makeFlags = [ "PREFIX=$(out)" ];