Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
4a06e5020b
88 changed files with 528 additions and 258 deletions
|
|
@ -145,7 +145,8 @@ rec {
|
|||
let
|
||||
outputs = drv.outputs or [ "out" ];
|
||||
|
||||
commonAttrs = drv // (builtins.listToAttrs outputsList) //
|
||||
commonAttrs = (removeAttrs drv [ "outputUnspecified" ]) //
|
||||
(builtins.listToAttrs outputsList) //
|
||||
({ all = map (x: x.value) outputsList; }) // passthru;
|
||||
|
||||
outputToAttrListElement = outputName:
|
||||
|
|
|
|||
|
|
@ -3039,6 +3039,16 @@
|
|||
githubId = 36110478;
|
||||
name = "Erik Arvstedt";
|
||||
};
|
||||
ebbertd = {
|
||||
email = "daniel@ebbert.nrw";
|
||||
github = "ebbertd";
|
||||
githubId = 20522234;
|
||||
name = "Daniel Ebbert";
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0x47BC155927CBB9C7";
|
||||
fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7";
|
||||
}];
|
||||
};
|
||||
ebzzry = {
|
||||
email = "ebzzry@ebzzry.io";
|
||||
github = "ebzzry";
|
||||
|
|
|
|||
|
|
@ -1002,8 +1002,8 @@ Superuser created successfully.
|
|||
<listitem>
|
||||
<para>
|
||||
The <literal>varnish</literal> package was upgraded from 6.3.x
|
||||
to 6.5.x. <literal>varnish60</literal> for the last LTS
|
||||
release is also still available.
|
||||
to 7.x. <literal>varnish60</literal> for the last LTS release
|
||||
is also still available.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
configures the address and port the web UI is listening, it defaults to `:9001`.
|
||||
To be able to access the web UI this port needs to be opened in the firewall.
|
||||
|
||||
- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available.
|
||||
- The `varnish` package was upgraded from 6.3.x to 7.x. `varnish60` for the last LTS release is also still available.
|
||||
|
||||
- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used.
|
||||
|
||||
|
|
|
|||
|
|
@ -320,6 +320,10 @@ in
|
|||
qtvirtualkeyboard
|
||||
|
||||
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
|
||||
elisa
|
||||
gwenview
|
||||
okular
|
||||
]
|
||||
|
||||
# Phonon audio backend
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
# if the source is a local file, it should be imported to the store
|
||||
localToStore = mapAttrs (name: value: if name == "source" then "${value}" else value);
|
||||
etc' = map localToStore (filter (f: f.enable) (attrValues config.environment.etc));
|
||||
etc' = filter (f: f.enable) (attrValues config.environment.etc);
|
||||
|
||||
etc = pkgs.runCommandLocal "etc" {
|
||||
# This is needed for the systemd module
|
||||
|
|
@ -55,7 +53,8 @@ let
|
|||
mkdir -p "$out/etc"
|
||||
${concatMapStringsSep "\n" (etcEntry: escapeShellArgs [
|
||||
"makeEtcEntry"
|
||||
etcEntry.source
|
||||
# Force local source paths to be added to the store
|
||||
"${etcEntry.source}"
|
||||
etcEntry.target
|
||||
etcEntry.mode
|
||||
etcEntry.user
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
|
||||
{ lib, fetchFromGitHub, fetchpatch, python3Packages, wrapQtAppsHook }:
|
||||
|
||||
let
|
||||
py = python3Packages;
|
||||
in py.buildPythonApplication rec {
|
||||
pname = "friture";
|
||||
version = "0.47";
|
||||
version = "0.48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlecomte";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qcsvmgdz9hhv5gaa918147wvng6manc4iq8ci6yr761ljqrgwjx";
|
||||
sha256 = "sha256-oOH58jD49xAeSuP+l6tYUpwkYsnfeSGTt8x4DFzTY6g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = (with py; [ numpy cython scipy ]) ++
|
||||
|
|
@ -29,9 +29,19 @@ in py.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
patches = [
|
||||
./unlock_constraints.patch
|
||||
# Backported fix that resolves an issue with setuptools packaging
|
||||
(fetchpatch {
|
||||
name = "fix-setuptools-packaging.patch";
|
||||
url = "https://github.com/tlecomte/friture/commit/ea7210dae883edf17de8fec82f9428b18ee138b6.diff";
|
||||
sha256 = "sha256-Kv/vmC8kcqfOgfIPQyZN46sbV6bezhq6pyj8bvke6s8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove version constraints from Python dependencies in setup.py
|
||||
sed -i -E "s/\"([A-Za-z0-9]+)(=|>|<)=[0-9\.]+\"/\"\1\"/g" setup.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
|
@ -53,6 +63,6 @@ in py.buildPythonApplication rec {
|
|||
homepage = "https://friture.org/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux; # fails on Darwin
|
||||
maintainers = [ maintainers.laikq ];
|
||||
maintainers = with maintainers; [ laikq alyaeanyx ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
diff --git a/setup.py b/setup.py
|
||||
index 4092388..6cb7dac 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv",
|
||||
# these will be installed when calling 'pip install friture'
|
||||
# they are also retrieved by 'requirements.txt'
|
||||
install_requires = [
|
||||
- "sounddevice==0.4.2",
|
||||
- "rtmixer==0.1.3",
|
||||
- "PyOpenGL==3.1.5",
|
||||
- "PyOpenGL-accelerate==3.1.5",
|
||||
- "docutils==0.17.1",
|
||||
- "numpy==1.21.1",
|
||||
- "PyQt5==5.15.4",
|
||||
- "appdirs==1.4.4",
|
||||
- "pyrr==0.10.3",
|
||||
+ "sounddevice>=0.4.1",
|
||||
+ "rtmixer>=0.1.1",
|
||||
+ "PyOpenGL>=3.1.4",
|
||||
+ "PyOpenGL-accelerate>=3.1.5",
|
||||
+ "docutils>=0.17.1",
|
||||
+ "numpy>=1.20.3",
|
||||
+ "PyQt5>=5.15.4",
|
||||
+ "appdirs>=1.4.4",
|
||||
+ "pyrr>=0.10.3",
|
||||
]
|
||||
|
||||
# Cython and numpy are needed when running setup.py, to build extensions
|
||||
-setup_requires=["numpy==1.21.1", "Cython==0.29.24"]
|
||||
+setup_requires=["numpy>=1.20.3", "Cython>=0.29.22"]
|
||||
|
||||
with open(join(dirname(__file__), 'README.rst')) as f:
|
||||
long_description = f.read()
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "vmpk";
|
||||
version = "0.8.2";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1kv256j13adk4ib7r464gsl4vjhih820bq37ddhqfyfd07wh53a2";
|
||||
sha256 = "sha256-SSdD8dyn6abti8qkd7N5n8EYr5yMW+EPYUnRm7S9CE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ];
|
||||
|
|
|
|||
|
|
@ -5,23 +5,18 @@
|
|||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.0.0+unstable=2021-09-26";
|
||||
version = "0.0.0+unstable=2021-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "97cbdc67fe6a9652c42daefadd658cc41c1e5ae3";
|
||||
sha256 = "09nmsl7gzyi56g0x459a6571c8nsafl0g350m0hk1vy2gpg6yq0p";
|
||||
owner = "AndersonTorres";
|
||||
repo = "bqn-mode";
|
||||
rev = "5bdc713ade78f11d756231739429440552d7faf8";
|
||||
hash = "sha256-ztGHWKVgMP9N4hV9k0PY9LxqXgHxkycyF3N0eZ+jIZs=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot="$sourceRoot/editors/emacs"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
|
||||
description = "Emacs mode for BQN";
|
||||
description = "Emacs mode for BQN programming language";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
maintainers = with maintainers; [ sternenseemann AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9";
|
||||
x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl";
|
||||
aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i";
|
||||
armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9";
|
||||
x86_64-linux = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4";
|
||||
x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc";
|
||||
aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy";
|
||||
armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
|
@ -31,7 +31,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.60.1";
|
||||
version = "1.60.2";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -68,13 +68,13 @@ let
|
|||
|
||||
in mkDerivation rec {
|
||||
pname = "drawpile";
|
||||
version = "2.1.19";
|
||||
version = "2.1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drawpile";
|
||||
repo = "drawpile";
|
||||
rev = version;
|
||||
sha256 = "sha256-MNmzcqTHfMms6q3ZilrChE5WoGzGxnAOkB0a75udA1I=";
|
||||
sha256 = "sha256-HjGsaa2BYRNxaQP9e8Z7BkVlIKByC/ta92boGbYHRWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -136,17 +136,16 @@ stdenv.mkDerivation rec {
|
|||
NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib";
|
||||
|
||||
blenderExecutable =
|
||||
placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender");
|
||||
postInstall = ''
|
||||
placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender");
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir $out/Applications
|
||||
mv $out/Blender.app $out/Applications
|
||||
'' + ''
|
||||
buildPythonPath "$pythonPath"
|
||||
wrapProgram $blenderExecutable \
|
||||
--prefix PATH : $program_PATH \
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH" \
|
||||
--add-flags '--python-use-system-env'
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications/Blender.app
|
||||
ln -s $out/Blender.app $out/Applications/Blender.app
|
||||
ln -s $out/Blender.app/Contents/MacOS $out/bin
|
||||
'';
|
||||
|
||||
# Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.18.4";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bdb84706fdde867fe2ee11c74c8c51af4e560399bd5fa562f19bfcaf8fc0dac9";
|
||||
sha256 = "ceffaa5022d76132165ca9004c1e57d7400b56c9ab3866e3bd139e2ffe38cb72";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }:
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "todoist-electron";
|
||||
version = "0.2.4";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage";
|
||||
sha256 = "1xrf2qjhq116z18qx7n1zd7mhvkb2dccaq7az4w6fs216l8q5zf2";
|
||||
sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons/hicolor/0x0/apps $out/share/icons/hicolor/512x512
|
||||
cp -a ${appimageContents}/usr/share/icons/hicolor/512x512/apps $out/share/icons/hicolor/512x512
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "94.0.4606.61",
|
||||
"sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4",
|
||||
"sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz",
|
||||
"version": "94.0.4606.71",
|
||||
"sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya",
|
||||
"sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
|
@ -12,9 +12,9 @@
|
|||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "94.0.4606.41",
|
||||
"sha256_linux": "06flgis4am4jmd9qz6yn1jfdr07w2n3mfrlicw6a9icg5ir64fdq",
|
||||
"sha256_darwin": "1mc0hhksqm5ms4k4aji043xzxncbifjwz5fqzywy4ji64w5kqrca"
|
||||
"version": "94.0.4606.61",
|
||||
"sha256_linux": "1l7ls8qqqd9q3a20a459q40jd9djzf67s8qfdmfj44vwgidiw0fj",
|
||||
"sha256_darwin": "1b43agdd6vw5zarrbbk1sgmdr6n3d9cdl4dcikk304yplh58d49v"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
@ -44,9 +44,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "94.0.4606.61",
|
||||
"sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4",
|
||||
"sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz",
|
||||
"version": "94.0.4606.71",
|
||||
"sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya",
|
||||
"sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "94.0.4606.61-1",
|
||||
"sha256": "1sb6n3dnp8d1bzhyl9d8yc0x9imyccnwxf1fqzv7vs3fd6dgcprp"
|
||||
"rev": "94.0.4606.71-1",
|
||||
"sha256": "12p39ay8lmdni6gnmw3w67pg4w3nrphhgn6bmz3cr6cy7nx4kiv2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,12 +94,18 @@ let
|
|||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
|
||||
urls = [
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "1hxjixriah08c65nngjdp1blbji1vlnhqkphp8f96hy34hk4dpiw";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
|
||||
urls = [
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "018kwwbbn02drvdj0bjkcyhsnbx97wnmd3lxkrx0kc9dw1s4r418";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "multus-cni";
|
||||
|
|
@ -11,15 +11,14 @@ buildGoModule rec {
|
|||
sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
|
||||
};
|
||||
|
||||
ldflags = let
|
||||
multus = "gopkg.in/intel/multus-cni.v3/pkg/multus";
|
||||
commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7";
|
||||
in [
|
||||
"-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}"
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mv $GOPATH/bin/cmd $GOPATH/bin/multus
|
||||
mv $GOPATH/bin/cmd $GOPATH/bin/multus
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -28,10 +27,11 @@ buildGoModule rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. ";
|
||||
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods";
|
||||
homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ onixie ];
|
||||
mainProgram = "multus";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "2.9.10";
|
||||
version = "2.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-2gCJ6aN6uN0KtOVddLDry4pLhScSh4JHmdsFws59phk=";
|
||||
sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vFO3Rv+7CLIkl1qS4zp177GmerewfgmyjxEbzdt/RsE=";
|
||||
vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
20
pkgs/applications/science/electronics/dwfv/default.nix
Normal file
20
pkgs/applications/science/electronics/dwfv/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ lib, rustPlatform, fetchCrate }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dwfv";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7";
|
||||
};
|
||||
|
||||
cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple digital waveform viewer with vi-like key bindings";
|
||||
homepage = "https://github.com/psurply/dwfv";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ newam ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +1,38 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "13.7.1";
|
||||
version = "13.8.0";
|
||||
pname = "mediathekview";
|
||||
src = fetchurl {
|
||||
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
|
||||
sha256 = "sha256-yFPyj1Mbgj2eJv4DpvfOtPyTbL9gMAXC5TzSx8AV27o=";
|
||||
sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,lib}
|
||||
|
||||
install -m644 MediathekView.jar $out/lib
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/mediathek \
|
||||
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar"
|
||||
--add-flags "-jar $out/lib/MediathekView.jar"
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/MediathekView \
|
||||
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar"
|
||||
--add-flags "-jar $out/lib/MediathekView.jar"
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
|
||||
--add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
|
||||
--add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
|
||||
homepage = "https://mediathekview.de/";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ moredread ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-playlistmanager";
|
||||
version = "unstable-2021-08-17";
|
||||
version = "unstable-2021-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonniek";
|
||||
repo = "mpv-playlistmanager";
|
||||
rev = "44d6911856a39e9a4057d19b70f21a9bc18bd6a9";
|
||||
sha256 = "IwH6XngfrZlKGDab/ut43hzHeino8DmWzWRX8Av21Sk=";
|
||||
rev = "9a759b300c92b55e82be5824fe058e263975741a";
|
||||
sha256 = "qMzDJlouBptwyNdw2ag4VKEtmkQNUlos0USPerBAV/s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -121,10 +121,9 @@ mkDerivation rec {
|
|||
"-DCEF_ROOT_DIR=../../cef"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/obs \
|
||||
--prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib"
|
||||
'';
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
addOpenGLRunpath $out/lib/lib*.so
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DVRLdJFYD5Ovc0n5SoMv71GPTuBO3wfqREcGRJEuND0=";
|
||||
sha256 = "sha256-AeddndkKyUs9i0bg0XO5QCmYgqgWREnHWsmce6VM7Oo=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
, version
|
||||
# : string
|
||||
, sha256
|
||||
# : list (int | string)
|
||||
, sections
|
||||
# : string
|
||||
, description
|
||||
# : list Maintainer
|
||||
|
|
@ -39,10 +37,6 @@ stdenv.mkDerivation {
|
|||
|
||||
dontBuild = true;
|
||||
|
||||
preInstall = lib.concatMapStringsSep "\n"
|
||||
(section: "mkdir -p \"${manDir}/man${builtins.toString section}\"")
|
||||
sections;
|
||||
|
||||
meta = with lib; {
|
||||
inherit description license maintainers;
|
||||
inherit (src.meta) homepage;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
buildManPages {
|
||||
pname = "execline-man-pages";
|
||||
version = "2.8.0.1.1";
|
||||
sha256 = "0xv9v39na1qnd8cm4v7xb8wa4ap3djq20iws0lrqz7vn1w40i8b4";
|
||||
version = "2.8.1.0.1";
|
||||
sha256 = "0d3lzxy7wv91q3nr6bw1wfmrfj285i15wmj4c8v9k9pxjg42iwwx";
|
||||
description = "Port of the documentation for the execline suite to mdoc";
|
||||
sections = [ 1 7 ];
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
buildManPages {
|
||||
pname = "s6-man-pages";
|
||||
version = "2.10.0.3.1";
|
||||
sha256 = "0q9b6v7kbyjsh390s4bw80kjdp92kih609vlmnpl1qzyrr6kivsg";
|
||||
version = "2.11.0.0.1";
|
||||
sha256 = "00nxlpdf0kkdadyv84vj5w66y926pccqls8prkbip3zmcmnqgghs";
|
||||
description = "Port of the documentation for the s6 supervision suite to mdoc";
|
||||
sections = [ 1 7 ];
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
buildManPages {
|
||||
pname = "s6-networking-man-pages";
|
||||
version = "2.4.1.1.1";
|
||||
sha256 = "1qrqzm2r4rxf8hglz8k4laknjqcx1y0z1kjf636z91w1077qg0pn";
|
||||
version = "2.5.0.0.1";
|
||||
sha256 = "02xvyby23b2x30jxd4nw9c5629j4hdaxq9sph3qhajlhl53yiyf2";
|
||||
description = "Port of the documentation for the s6-networking suite to mdoc";
|
||||
sections = [ 1 7 ];
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20210901";
|
||||
version = "20211001";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SbqEHLXSomUUaLRJA1MJbtF1lTQPiWSUXgapjEzSl00=";
|
||||
sha256 = "sha256-OVG/bKWOdSxOXVvtMOITnCDoGNSc+zPNZ/XOablfSEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "21.10.1";
|
||||
version = "21.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
sha256 = "sha256-VcuH/lEnSeOYGFXr3OPw9PRUwHOVx4RjUQXblv6jdD8=";
|
||||
sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
|
|
|||
|
|
@ -64,6 +64,16 @@ python3Packages.buildPythonApplication rec {
|
|||
patchShebangs meson-postinstall.py
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@ existing packages here and modify it as necessary.
|
|||
|
||||
*/
|
||||
|
||||
{
|
||||
libsForQt5, lib, fetchurl,
|
||||
gconf, gsettings-desktop-schemas
|
||||
{ libsForQt5, lib, config, fetchurl
|
||||
, gconf, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -123,7 +122,6 @@ let
|
|||
kscreen = callPackage ./kscreen.nix {};
|
||||
kscreenlocker = callPackage ./kscreenlocker.nix {};
|
||||
ksshaskpass = callPackage ./ksshaskpass.nix {};
|
||||
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
|
||||
ksystemstats = callPackage ./ksystemstats.nix {};
|
||||
kwallet-pam = callPackage ./kwallet-pam.nix {};
|
||||
kwayland-integration = callPackage ./kwayland-integration.nix {};
|
||||
|
|
@ -164,6 +162,8 @@ let
|
|||
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
|
||||
};
|
||||
|
||||
} // lib.optionalAttrs (config.allowAliases or true) {
|
||||
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
|
||||
};
|
||||
in
|
||||
lib.makeScope libsForQt5.newScope packages
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
let
|
||||
release_version = "13.0.0";
|
||||
candidate = "rc4"; # empty or "rcN"
|
||||
candidate = ""; # empty or "rcN"
|
||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||
rev = ""; # When using a Git commit
|
||||
rev-version = ""; # When using a Git commit
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
import ./common.nix {
|
||||
version = "2.1.8";
|
||||
sha256 = "0ijmw8adyf6fgaq4ixdj9v5lfg3cs9wyxhb96wxhfld0rjpppsm3";
|
||||
}
|
||||
4
pkgs/development/compilers/sbcl/2.1.9.nix
Normal file
4
pkgs/development/compilers/sbcl/2.1.9.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
import ./common.nix {
|
||||
version = "2.1.9";
|
||||
sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";
|
||||
}
|
||||
|
|
@ -3,6 +3,6 @@
|
|||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "24.0.6";
|
||||
sha256 = "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z";
|
||||
version = "24.1.1";
|
||||
sha256 = "sha256-y5QtLCrYeMT4WdHkFngKv02CZ35eYZF3sjfI5OZNAH0=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Musical key detection for digital audio (C++ library)";
|
||||
homepage = "https://mixxxdj.github.io/libkeyfinder/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/stump/libsmf";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A C library to make the use of LV2 plugins";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://lvtk.org/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://drobilla.net/software/raul";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A library for serialising LV2 atoms to/from RDF";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://vamp-plugins.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "21.3.3";
|
||||
version = "21.3.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "1j33qq53jjmcvpr9w1xlyl5bpmq4rmshrd123l9alc2ddqbngrf7";
|
||||
sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
44
pkgs/development/libraries/libdecor/default.nix
Normal file
44
pkgs/development/libraries/libdecor/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, cairo
|
||||
, dbus
|
||||
, pango
|
||||
, libxkbcommon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdecor";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "jadahl";
|
||||
repo = "libdecor";
|
||||
rev = "${version}";
|
||||
hash = "sha256:0qdg3r7k086wzszr969s0ljlqdvfqm31zpl8p5h397bw076zr6p2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
buildInputs = [
|
||||
wayland
|
||||
wayland-protocols
|
||||
cairo
|
||||
dbus
|
||||
pango
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/jadahl/libdecor";
|
||||
description = "Client-side decorations library for Wayland clients";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild
|
||||
, topkg, result, lwt, cmdliner, fmt
|
||||
, js_of_ocaml
|
||||
, jsooSupport ? true
|
||||
}:
|
||||
let
|
||||
pname = "logs";
|
||||
|
|
@ -21,10 +22,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
||||
buildInputs = [ findlib topkg fmt cmdliner js_of_ocaml lwt ];
|
||||
buildInputs = [ findlib topkg fmt cmdliner lwt ]
|
||||
++ lib.optional jsooSupport js_of_ocaml;
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
buildPhase = "${topkg.run} build --with-js_of_ocaml true";
|
||||
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pwaqajwxkb8c7rnb6cvpz877azs13f1mdq33z5gp2v09fj8s2b0";
|
||||
sha256 = "0awqdh4jsarf0lr2bl2qiaff1yk9vndq15jcl4abiig9wr2yghpc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "collections-extended";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlenzen";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:1qcr1q49a134b122rpldjiim1fsl32gxs5fpj3232nyb05r68haz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "collections_extended" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mlenzen/collections-extended";
|
||||
description = "Extra Python Collections - bags (multisets), setlists (unique list / indexed set), RangeMap and IndexedDict";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ exarkun ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cornice";
|
||||
version = "5.2.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "50f86a5e9fb73d664d20e8dd0bdc3ce419145eb17813591a5a40e8a9d567b9c5";
|
||||
sha256 = "532485ed53cae81ef476aaf4cc7c2e0208749ad1959119c46efefdeea5546eba";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyramid simplejson six venusian ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.3.3";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4rMnGnDQtuu55mzrYkeJjrU0ykQXd+pOYAw2yVcqJAQ=";
|
||||
sha256 = "b8472c91b05159f20121fcca6ebdc2a3b5648d68158ec747860914279b6b983b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nettigo-air-monitor";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-VTKIUo3rR/HyEW/d/Nm0fm7wbgSdLGf02i8R3om1oCE=";
|
||||
sha256 = "sha256-YfRPfOJ0uEBounRMSUHcjNASLBqEwS2nVJKbsfrSpGQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,12 +3,14 @@
|
|||
, pythonOlder
|
||||
, fetchPypi
|
||||
, pydsdl
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nunavut";
|
||||
version = "1.4.2";
|
||||
disabled = pythonOlder "3.5"; # only python>=3.5 is supported
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
@ -17,6 +19,7 @@
|
|||
|
||||
propagatedBuildInputs = [
|
||||
pydsdl
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# allow for writable directory for darwin
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
|
|
@ -73,6 +75,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ocrmypdf"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jbarlow83/OCRmyPDF";
|
||||
description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathvalidate";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PJvZTH7CPpz7IR/741audfl51sCZosdF7pSQ9STzJGg=";
|
||||
sha256 = "119ba36be7e9a405d704c7b7aea4b871c757c53c9adc0ed64f40be1ed8da2781";
|
||||
};
|
||||
|
||||
# Requires `pytest-md-report`, causing infinite recursion.
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipx";
|
||||
version = "0.16.3";
|
||||
version = "0.16.5";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "pipxproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c";
|
||||
sha256 = "sha256-gBeaHEig47XWKoPx3jzvgk/jJPJXtr5R5qUL0LgvbDg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcengine";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
checkInputs = [
|
||||
pytest-runner
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lz9r0fh31mcixdhayiwfc69cp8if9b3nkrk7gxdrb6vhbfrxhij";
|
||||
sha256 = "5b405efb4b6ebe81e7f991b360126a4f61c2768ceed6027346e2b8ef3f57ef39";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
repo = "RapidFuzz";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-tzjtvM5b9RD+Uqg5wT+FtSgjbAc0IgoDAmUFNpXQ9KA=";
|
||||
sha256 = "sha256-vK2MnFdZOAO+0WNM20w2vz5Yh2buI+fl7teHQqwuiUk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Rapid fuzzy string matching";
|
||||
homepage = "https://github.com/maxbachmann/rapidfuzz";
|
||||
homepage = "https://github.com/maxbachmann/RapidFuzz";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "restfly";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevemcgrath";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03k1843llpi4ycd450j5x8bd58vxsbfw43p81hsawidsx4c6bk85";
|
||||
sha256 = "sha256-1sLkjM6hRAbfrZEXP97N9ZDqpL255LC7JS1r2yOXG5E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.57.0";
|
||||
version = "2.59.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b03b340fe54f91b0533d3ce19d5b7fdf403da21b5befab70a9915466e48f6e75";
|
||||
sha256 = "16b325966c1a05413994831ff29e3c7656a4be947a7771541af5935b1d01c024";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MhPbABGgQG0sAHVnUA9PUGqaVYWd/YsY2pyf8H4uTe8=";
|
||||
sha256 = "sha256-vAuUA51E1pufn3YvNe4yfqJHXo14iUEA5MzP3/ah+8I=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.63.1";
|
||||
version = "1.64.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SSjTrCR5H+3nIKHKEfrQX917HjgpViS6H1RwmRe4coI=";
|
||||
sha256 = "sha256-z5uPrhvCt2Sx88LxUPvDjul4AurVBF5WNnNBoJzU6KE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bvPMSys2EY8cMNQ3rG4WlXaI9k2JsEWQkMZnDgcNFhY=";
|
||||
sha256 = "sha256-ySCfU/VWZz6tSZbrbhT/OIoxme+Y53eFtlVTI43yNVA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-/bqlDcv4lQ49NM849MTlna36ENfzUfcHtwuo75I77VQ=";
|
||||
vendorSha256 = "sha256-G3kiaYoCyoltyS/OlecJHaYWpeFax1qonOJZr30wSV8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
36
pkgs/development/tools/neil/default.nix
Normal file
36
pkgs/development/tools/neil/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, babashka
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neil";
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "babashka";
|
||||
repo = "neil";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jiyl0d39d8kk5bpangwxiy90vqipj4lgp8x84rh4z5m53knjpkd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D neil $out/bin/neil
|
||||
wrapProgram $out/bin/neil \
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/babashka/neil";
|
||||
description = "A CLI to add common aliases and features to deps.edn-based projects";
|
||||
license = licenses.mit;
|
||||
platforms = babashka.meta.platforms;
|
||||
maintainers = with maintainers; [ jlesquembre ];
|
||||
};
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
configureFlags = [
|
||||
# TODO(Profpatsch): mupdf support
|
||||
"--with-mutool-path=${mupdf}/bin/mutool"
|
||||
"--with-pdftops=pdftops"
|
||||
"--with-pdftops-path=${poppler_utils}/bin/pdftops"
|
||||
"--with-gs-path=${ghostscript}/bin/gs"
|
||||
|
|
@ -35,6 +35,8 @@ in stdenv.mkDerivation rec {
|
|||
"--with-rcdir=no"
|
||||
"--with-shell=${stdenv.shell}"
|
||||
"--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
];
|
||||
|
||||
makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
|
||||
|
|
|
|||
|
|
@ -406,6 +406,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
davidlday.languagetool-linter = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "languagetool-linter";
|
||||
publisher = "davidlday";
|
||||
version = "0.18.0";
|
||||
sha256 = "sha256-AYINgq1BMfh7p4xhwSC2Www6dQvyQAGTA45HJsmMGDg=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "LanguageTool integration for VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=davidlday.languagetool-linter";
|
||||
homepage = "https://github.com/davidlday/vscode-languagetool-linter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ebbertd ];
|
||||
};
|
||||
};
|
||||
|
||||
denoland.vscode-deno = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-deno";
|
||||
|
|
@ -928,6 +944,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
influxdata.flux = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "influxdata";
|
||||
name = "flux";
|
||||
version = "0.6.5";
|
||||
sha256 = "sha256-rKkZ7Sg8buryFtbIuKsrf3V3Rf7PP8hnbEIRFf4FvSM=";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "headscale";
|
||||
version = "0.8.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juanfont";
|
||||
repo = "headscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xNsdq8qcf2V+OQkRPBVys8SiusFoahezzQet19dYqlw=";
|
||||
sha256 = "sha256-1YxcfSOGGdyUZyQdKSHUiK5/43Ki/QvHvIZ/Ai5Mq7E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g=";
|
||||
vendorSha256 = "sha256-LJajQDk+r9Wt2t/kwNhsCoSlU+EjSNc1WT2vqtqg4LI=";
|
||||
|
||||
# Ldflags are same as build target in the project's Makefile
|
||||
# https://github.com/juanfont/headscale/blob/main/Makefile
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, gawk }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jdk11, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "youtrack";
|
||||
|
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
makeWrapper ${jre}/bin/java $out/bin/youtrack \
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/youtrack \
|
||||
--add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \
|
||||
--prefix PATH : "${lib.makeBinPath [ gawk ]}" \
|
||||
--set JRE_HOME ${jre}
|
||||
--set JRE_HOME ${jdk11}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sonarr";
|
||||
version = "3.0.6.1266";
|
||||
version = "3.0.6.1342";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz";
|
||||
sha256 = "2YkzmPxJLYClNQnGgheXI8y42ZXAHZUqEpmQ+b2mpfY=";
|
||||
sha256 = "sha256-6RMthsf60FJLDHB72QJkPeF7vXmjBgcqKujO0IOjVIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.14.4";
|
||||
version = "1.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8=";
|
||||
sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
vendorSha256 = "sha256-em6443czDMak9RxLq7Dj9miknqg29vf0a0N82LmNrHk=";
|
||||
vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
|
||||
, python3, makeWrapper }:
|
||||
|
||||
let
|
||||
|
|
@ -16,8 +16,10 @@ let
|
|||
|
||||
nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ];
|
||||
buildInputs = [
|
||||
pcre libxslt groff ncurses readline libedit makeWrapper python3
|
||||
];
|
||||
libxslt groff ncurses readline libedit makeWrapper python3
|
||||
]
|
||||
++ lib.optional (lib.versionOlder version "7") pcre
|
||||
++ lib.optional (lib.versionAtLeast version "7") pcre2;
|
||||
|
||||
buildFlags = [ "localstatedir=/var/spool" ];
|
||||
|
||||
|
|
@ -45,11 +47,18 @@ let
|
|||
in
|
||||
{
|
||||
varnish60 = common {
|
||||
version = "6.0.7";
|
||||
sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a";
|
||||
};
|
||||
varnish65 = common {
|
||||
version = "6.5.2";
|
||||
sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx";
|
||||
version = "6.0.8";
|
||||
sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx";
|
||||
};
|
||||
varnish70 = (common {
|
||||
version = "7.0.0";
|
||||
sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc";
|
||||
}).overrideAttrs (oA: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch";
|
||||
sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82";
|
||||
})
|
||||
];
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, varnish60, varnish65, fetchFromGitHub }: {
|
||||
{ callPackage, varnish60, varnish70, fetchFromGitHub }: {
|
||||
varnish60Packages = rec {
|
||||
varnish = varnish60;
|
||||
digest = callPackage ./digest.nix {
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
|
||||
};
|
||||
};
|
||||
varnish65Packages = rec {
|
||||
varnish = varnish65;
|
||||
varnish70Packages = rec {
|
||||
varnish = varnish70;
|
||||
digest = callPackage ./digest.nix {
|
||||
inherit varnish;
|
||||
version = "6.6";
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
};
|
||||
dynamic = callPackage ./dynamic.nix {
|
||||
inherit varnish;
|
||||
version = "2.3.1";
|
||||
sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88";
|
||||
version = "2.4.0";
|
||||
sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
sed -i src/anlghead.h \
|
||||
-e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \
|
||||
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g"
|
||||
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g"
|
||||
substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "4.18";
|
||||
version = "4.19";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
|
||||
sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn";
|
||||
sha256 = "0mxbzg8xra0qpd3g3z1b230f0519h56x4jnn09lbbqa92p5zck3f";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,20 @@
|
|||
|
||||
let
|
||||
version = "6.0.2";
|
||||
# TODO: add support for macOS
|
||||
srcUrl =
|
||||
if stdenv.isi686 then {
|
||||
srcUrl = {
|
||||
i686-linux = {
|
||||
url = "https://www.rarlab.com/rar/rarlinux-${version}.tar.gz";
|
||||
sha256 = "sha256-5iqK7eOo+hgLtGSCqUoB+wOFZHUqZ0M/8Jf7bxdf9qA=";
|
||||
} else if stdenv.isx86_64 then {
|
||||
sha256 = "sha256-5iqk7eoo+hgltgscquob+wofzhuqz0m/8jf7bxdf9qa=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://www.rarlab.com/rar/rarlinux-x64-${version}.tar.gz";
|
||||
sha256 = "sha256-WAvrUGCgfwI51Mo/RYSSF0OLPPrTegUCuDEsnBeR9uQ=";
|
||||
}
|
||||
else throw "Unknown architecture";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://www.rarlab.com/rar/rarosx-${version}.tar.gz";
|
||||
sha256 = "sha256-baZ71vYXIGs25f7PJ0ujoGUrsWZRmFLhvDI0KoVktsg=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
manSrc = fetchurl {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10";
|
||||
name = "rar.1";
|
||||
|
|
@ -50,6 +54,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.rarlab.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
pname = "goaccess";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
|
||||
sha256 = "sha256-iEF+eOYrcN45gLdiKRHk/NcZw2YPADyIeWjnGWw5lw8=";
|
||||
sha256 = "sha256-oM4vk5OyYiSE5GnpWoCd/VKt5NQgBJHkPt4fy1KrHIo=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cni-plugin-flannel";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flannel-io";
|
||||
repo = "cni-plugin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s2gibebXTqM/12nDHwc89geWxA6gZi9/if5VnUFoTDE=";
|
||||
sha256 = "sha256-DZC6uJR6TIHdmu8kZcbM+RC7pdejqLCOep0v3PM8/QY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs=";
|
||||
|
|
|
|||
24
pkgs/tools/networking/ssh-key-confirmer/default.nix
Normal file
24
pkgs/tools/networking/ssh-key-confirmer/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ssh-key-confirmer";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjojo";
|
||||
repo = "ssh-key-confirmer";
|
||||
rev = "v${version}";
|
||||
sha256 = "18whj9ds3rpjj5b71lbadi37ps99v13nnmkn3vq28x6cqfdy6w09";
|
||||
};
|
||||
|
||||
vendorSha256 = "0v9yw6v8fj6dqgbkks4pnmvxx9b7jqdy7bn7ywddk396sbsxjiqa";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Test ssh login key acceptance without having the private key";
|
||||
homepage = "https://github.com/benjojo/ssh-key-confirmer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -40,6 +40,11 @@ in stdenv.mkDerivation rec {
|
|||
done
|
||||
)
|
||||
|
||||
makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_create \
|
||||
--add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_create.rb"
|
||||
|
||||
makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_offset \
|
||||
--add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_offset.rb"
|
||||
'';
|
||||
|
||||
# run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "step-ca";
|
||||
version = "0.16.2";
|
||||
version = "0.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = "certificates";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JDoiz/BX8zB+qdwlGPUCa30R+pwWWtjEiXHP5LxdPAE=";
|
||||
sha256 = "sha256-X4dOrd/wxtYLw3C4Lj88RV/J6CEkmsOeqtiVX/6VFHg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI=";
|
||||
vendorSha256 = "sha256-/8Glo+U8MS8Y8mKECgTAB7JWmp/rjMQhG4nZkNs+Zgs=";
|
||||
|
||||
ldflags = [ "-buildid=" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "difftastic";
|
||||
version = "0.9";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilfred";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-spncRJjROytGnIig6ujqHu0e/XBTN4dsJ3og4aIu+l8=";
|
||||
sha256 = "12fcfwx56phs64yl94al2hkvss1km4n9wbrn2md7wfh1137jykbg";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2xGwS4wjLQ7zmfZ2gMdlUAkjPDF6SmUaiX2j1KYy0vo=";
|
||||
cargoSha256 = "0xnlnkdvsd2l7acdrkz918cjkk36k01rvvm0c8hnpx5327v6nsa8";
|
||||
|
||||
postPatch = ''
|
||||
pushd vendor
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{ lib, fetchFromGitHub, pythonPackages }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
let
|
||||
rev = "4467bd46a7a798f738247a7f090c1505176bd597";
|
||||
sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w";
|
||||
in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rpl";
|
||||
version = "1.5.7";
|
||||
version = "1.10";
|
||||
|
||||
# Tests not included in pip package.
|
||||
doCheck = false;
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kcoyner";
|
||||
owner = "rrthomas";
|
||||
repo = "rpl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xhpgcmq91ivy9ijfyz5ilg51m7fz8ar2077r7gq246j8gbf8ggr";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-argparse-manpage.diff # quickfix for ImportError: No module named build_manpages.build_manpages
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
#python3Packages.argparse-manpage # TODO
|
||||
python3Packages.chardet
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv rpl $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Replace strings in files";
|
||||
homepage = "https://github.com/kcoyner/rpl";
|
||||
homepage = "https://github.com/rrthomas/rpl";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ teto ];
|
||||
};
|
||||
|
|
|
|||
27
pkgs/tools/text/rpl/remove-argparse-manpage.diff
Normal file
27
pkgs/tools/text/rpl/remove-argparse-manpage.diff
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
diff --git a/setup.cfg b/setup.cfg
|
||||
index 12e9198..38e5376 100644
|
||||
--- a/setup.cfg
|
||||
+++ b/setup.cfg
|
||||
@@ -15,7 +15,6 @@ classifiers =
|
||||
[options]
|
||||
scripts = rpl
|
||||
python_requires = >=3
|
||||
-setup_requires = argparse-manpage
|
||||
install_requires = chardet
|
||||
|
||||
[options.extras_require]
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 96cade6..879fc44 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,9 +1,8 @@
|
||||
-from build_manpages.build_manpages import get_install_cmd
|
||||
from setuptools import setup
|
||||
from setuptools.command.install import install
|
||||
|
||||
setup(
|
||||
cmdclass={
|
||||
- 'install': get_install_cmd(install),
|
||||
+ 'install': install,
|
||||
}
|
||||
)
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shfmt";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvdan";
|
||||
repo = "sh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-43v64TQS1xpmU9pyjSTgV03n7xYJR+JAfZVoK3vwbiY=";
|
||||
sha256 = "sha256-Bxb4BlvAmJQhog3bZEGHJlrpXNqXpokkipBszPzRHSk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t1Zdn+NaHrKde6F5o86e+FmN3tH55YpZLuDhTv2lIf4=";
|
||||
vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8=";
|
||||
|
||||
subPackages = [ "cmd/shfmt" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -969,6 +969,7 @@ mapAliases ({
|
|||
vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
|
||||
varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
|
||||
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
|
||||
varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15
|
||||
venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05
|
||||
vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
|
||||
vimbWrapper = vimb; # added 2015-01
|
||||
|
|
|
|||
|
|
@ -1844,6 +1844,8 @@ with pkgs;
|
|||
|
||||
ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { };
|
||||
|
||||
ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { };
|
||||
|
||||
sshchecker = callPackage ../tools/security/sshchecker { };
|
||||
|
||||
titaniumenv = callPackage ../development/mobile/titaniumenv { };
|
||||
|
|
@ -7693,6 +7695,8 @@ with pkgs;
|
|||
|
||||
pwsafe = callPackage ../applications/misc/pwsafe { };
|
||||
|
||||
neil = callPackage ../development/tools/neil { };
|
||||
|
||||
niff = callPackage ../tools/package-management/niff { };
|
||||
|
||||
nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
|
||||
|
|
@ -10413,11 +10417,11 @@ with pkgs;
|
|||
valum = callPackage ../development/web/valum { };
|
||||
|
||||
inherit (callPackages ../servers/varnish { })
|
||||
varnish60 varnish65;
|
||||
varnish60 varnish70;
|
||||
inherit (callPackages ../servers/varnish/packages.nix { })
|
||||
varnish60Packages varnish65Packages;
|
||||
varnish60Packages varnish70Packages;
|
||||
|
||||
varnishPackages = varnish65Packages;
|
||||
varnishPackages = varnish70Packages;
|
||||
varnish = varnishPackages.varnish;
|
||||
|
||||
hitch = callPackage ../servers/hitch { };
|
||||
|
|
@ -12606,7 +12610,7 @@ with pkgs;
|
|||
sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {};
|
||||
sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {};
|
||||
sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {};
|
||||
sbcl_2_1_8 = callPackage ../development/compilers/sbcl/2.1.8.nix {};
|
||||
sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {};
|
||||
sbcl = sbcl_2_1_2;
|
||||
|
||||
roswell = callPackage ../development/tools/roswell/default.nix { };
|
||||
|
|
@ -14046,6 +14050,8 @@ with pkgs;
|
|||
|
||||
drush = callPackage ../development/tools/misc/drush { };
|
||||
|
||||
dwfv = callPackage ../applications/science/electronics/dwfv { };
|
||||
|
||||
dwz = callPackage ../development/tools/misc/dwz { };
|
||||
|
||||
easypdkprog = callPackage ../development/embedded/easypdkprog { };
|
||||
|
|
@ -16959,6 +16965,8 @@ with pkgs;
|
|||
libGL = null;
|
||||
};
|
||||
|
||||
libdecor = callPackage ../development/libraries/libdecor { };
|
||||
|
||||
libdigidoc = callPackage ../development/libraries/libdigidoc {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -17453,7 +17461,7 @@ with pkgs;
|
|||
|
||||
libkate = callPackage ../development/libraries/libkate { };
|
||||
|
||||
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
|
||||
libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { };
|
||||
|
||||
libkml = callPackage ../development/libraries/libkml { };
|
||||
|
||||
|
|
@ -25945,7 +25953,7 @@ with pkgs;
|
|||
|
||||
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
|
||||
|
||||
mediathekview = callPackage ../applications/video/mediathekview { };
|
||||
mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; };
|
||||
|
||||
megapixels = callPackage ../applications/graphics/megapixels { };
|
||||
|
||||
|
|
@ -32101,9 +32109,7 @@ with pkgs;
|
|||
inherit glib gtk3 gobject-introspection wrapGAppsHook;
|
||||
};
|
||||
|
||||
rpl = callPackage ../tools/text/rpl {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
rpl = callPackage ../tools/text/rpl { };
|
||||
|
||||
ricty = callPackage ../data/fonts/ricty { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1613,6 +1613,8 @@ in {
|
|||
|
||||
colander = callPackage ../development/python-modules/colander { };
|
||||
|
||||
collections-extended = callPackage ../development/python-modules/collections-extended { };
|
||||
|
||||
colorama = callPackage ../development/python-modules/colorama { };
|
||||
|
||||
colorcet = callPackage ../development/python-modules/colorcet { };
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
mkPlasma5 = import ../desktops/plasma-5;
|
||||
attrs = {
|
||||
inherit libsForQt5;
|
||||
inherit (pkgs) lib fetchurl;
|
||||
inherit (pkgs) config lib fetchurl;
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
inherit (pkgs) gsettings-desktop-schemas;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue