forked from mirrors/nixpkgs
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
9d35f2cd19
|
|
@ -5869,6 +5869,12 @@
|
|||
githubId = 587870;
|
||||
name = "Jonathan Mettes";
|
||||
};
|
||||
jmgilman = {
|
||||
email = "joshuagilman@gmail.com";
|
||||
github = "jmgilman";
|
||||
githubId = 2308444;
|
||||
name = "Joshua Gilman";
|
||||
};
|
||||
jo1gi = {
|
||||
email = "joakimholm@protonmail.com";
|
||||
github = "jo1gi";
|
||||
|
|
|
|||
|
|
@ -91,6 +91,10 @@
|
|||
<option>--flake</option> <replaceable>flake-uri</replaceable>
|
||||
</arg>
|
||||
|
||||
<arg>
|
||||
<option>--no-flake</option>
|
||||
</arg>
|
||||
|
||||
<arg>
|
||||
<option>--override-input</option> <replaceable>input-name</replaceable> <replaceable>flake-uri</replaceable>
|
||||
</arg>
|
||||
|
|
@ -594,6 +598,20 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<option>--no-flake</option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Do not imply <option>--flake</option> if
|
||||
<filename>/etc/nixos/flake.nix</filename> exists. With this
|
||||
option, it is possible to build non-flake NixOS configurations
|
||||
even if the current NixOS systems uses flakes.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ class Driver:
|
|||
tmp_dir = get_tmp_dir()
|
||||
|
||||
with rootlog.nested("start all VLans"):
|
||||
vlans = list(set(vlans))
|
||||
self.vlans = [VLan(nr, tmp_dir) for nr in vlans]
|
||||
|
||||
def cmd(scripts: List[str]) -> Iterator[NixStartScript]:
|
||||
|
|
|
|||
|
|
@ -239,7 +239,10 @@ in
|
|||
"d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
# The hardened systemd unit breaks the fuse-mount function according to documentation in the unit file itself
|
||||
systemd.packages = if cfg.autoMount
|
||||
then [ cfg.package.systemd_unit ]
|
||||
else [ cfg.package.systemd_unit_hardened ];
|
||||
|
||||
systemd.services.ipfs = {
|
||||
path = [ "/run/wrappers" cfg.package ];
|
||||
|
|
@ -275,6 +278,8 @@ in
|
|||
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}" ];
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
StateDirectory = "";
|
||||
ReadWritePaths = [ "" cfg.dataDir ];
|
||||
} // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
|
||||
} // optionalAttrs (!cfg.startWhenNeeded) {
|
||||
wantedBy = [ "default.target" ];
|
||||
|
|
|
|||
|
|
@ -17,6 +17,13 @@ let
|
|||
description = "The IP addresses of the interface.";
|
||||
};
|
||||
|
||||
autostart = mkOption {
|
||||
description = "Whether to bring up this interface automatically during boot.";
|
||||
default = true;
|
||||
example = false;
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
dns = mkOption {
|
||||
example = [ "192.168.2.2" ];
|
||||
default = [];
|
||||
|
|
@ -247,7 +254,7 @@ let
|
|||
description = "wg-quick WireGuard Tunnel - ${name}";
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = optional values.autostart "multi-user.target";
|
||||
environment.DEVICE = name;
|
||||
path = [ pkgs.kmod pkgs.wireguard-tools ];
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ import ./make-test-python.nix {
|
|||
two.succeed("test `wc -l < out` -gt 0")
|
||||
|
||||
# More DNS-SD.
|
||||
one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 &')
|
||||
one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 >&2 &')
|
||||
one.sleep(5)
|
||||
two.succeed("avahi-browse -r -t _test._tcp | tee out >&2")
|
||||
two.succeed("test `wc -l < out` -gt 0")
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
# Also will add a unix domain socket socket API address, see module.
|
||||
startWhenNeeded = true;
|
||||
apiAddress = "/ip4/127.0.0.1/tcp/2324";
|
||||
dataDir = "/mnt/ipfs";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -35,5 +36,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
machine.succeed(
|
||||
f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2"
|
||||
)
|
||||
|
||||
# Test if setting dataDir works properly with the hardened systemd unit
|
||||
machine.succeed("test -e /mnt/ipfs/config")
|
||||
machine.succeed("test ! -e /var/lib/ipfs/")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.11.5";
|
||||
version = "3.11.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-YkSsvhBbju/NEkT7RspZQYnLkcx/5POA8VtxCAL3Wcc=";
|
||||
sha256 = "sha256-fTeDRo7gCM1jXTQGm9MsmKu4KvTGDUogF3VSZWk91RM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
rm -rf $out/opt
|
||||
|
||||
# Create symlink bzip2 library
|
||||
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/libbz2.so.1.0
|
||||
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/libbz2.so.1.0
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "4.0.3";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "Nh0+/ibZnjcGXgQUe+QvukWpaX6/0nNPR4NIK0i2Bn6kBkihv9bkfF9xGpgqeE6H3CK+4e6ywg8y9RR+pJBBSA==";
|
||||
sha512 = "N+WkH6n7MWfRd2rsk/2b/rABL6pcjpKa1iBZSHslIOEc5fYWjGAxjwwTU0RgSaqptS1DyPeCUeWuphWPZJsQgw==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
|
|||
meta = with lib; {
|
||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/41";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/42";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ killercup synthetica ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -69,14 +69,14 @@ let
|
|||
six
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.22.4";
|
||||
version = "3.22.5";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-z2dCdaIJUKpZgJHtn1/qA07uMJpAWKL0cDx6B/n1Oxg=";
|
||||
sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -69,14 +69,14 @@ let
|
|||
six
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.24.0";
|
||||
version = "3.24.1";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-EPF8sXAH7UAttLutxXGFovog3+XpXP0GXg2tu0mSU2s=";
|
||||
sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ let
|
|||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "11.0.7";
|
||||
version = "11.0.9";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz";
|
||||
sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -107,7 +107,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk";
|
||||
sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -29,15 +29,23 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = null;
|
||||
|
||||
outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace 'misc/systemd/ipfs.service' \
|
||||
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
|
||||
substituteInPlace 'misc/systemd/ipfs-hardened.service' \
|
||||
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
|
||||
install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service
|
||||
install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
|
||||
install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
|
||||
substituteInPlace $out/etc/systemd/system/ipfs.service \
|
||||
--replace /usr/bin/ipfs $out/bin/ipfs
|
||||
substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \
|
||||
--replace /usr/bin/ipfs $out/bin/ipfs
|
||||
install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit/etc/systemd/system/ipfs-api.socket"
|
||||
install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit/etc/systemd/system/ipfs-gateway.socket"
|
||||
install --mode=444 -D 'misc/systemd/ipfs.service' "$systemd_unit/etc/systemd/system/ipfs.service"
|
||||
|
||||
install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket"
|
||||
install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket"
|
||||
install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filebot";
|
||||
version = "4.9.5";
|
||||
version = "4.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20220226124706/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-LNvfAueDMd2TedK6bqnNG+J/4YhhbmUca9iyUkoUNkE=";
|
||||
url = "https://web.archive.org/web/20220305095926/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-3j0WmmamE9KUNwjOVZvrdFH5dS/9FHSdbLfcAsOzQOo=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
|
|
|
|||
|
|
@ -97,18 +97,21 @@ let
|
|||
if [[ -d $out/share/gsettings-schemas/ ]]; then
|
||||
# Recreate the standard schemas directory if its a symlink to make it writable
|
||||
if [[ -L $out/share/glib-2.0 ]]; then
|
||||
ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old
|
||||
rm -rf $out/share/glib-2.0
|
||||
target=$(readlink $out/share/glib-2.0)
|
||||
rm $out/share/glib-2.0
|
||||
mkdir $out/share/glib-2.0
|
||||
ln -fs $target/* $out/share/glib-2.0
|
||||
fi
|
||||
|
||||
if [[ -L $out/share/glib-2.0/schemas ]]; then
|
||||
target=$(readlink $out/share/glib-2.0/schemas)
|
||||
rm $out/share/glib-2.0/schemas
|
||||
mkdir $out/share/glib-2.0/schemas
|
||||
ln -fs $target/* $out/share/glib-2.0/schemas
|
||||
fi
|
||||
|
||||
mkdir -p $out/share/glib-2.0/schemas
|
||||
|
||||
# symlink any schema files or overrides to the standard schema directory
|
||||
if [[ -e $out/share/glib-2.0.old/schemas ]]; then
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas
|
||||
fi
|
||||
|
||||
for d in $out/share/gsettings-schemas/*; do
|
||||
# Force symlink, in case there are duplicates
|
||||
ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
|
|
|
|||
|
|
@ -138,18 +138,21 @@ let
|
|||
if [[ -d $out/share/gsettings-schemas/ ]]; then
|
||||
# Recreate the standard schemas directory if its a symlink to make it writable
|
||||
if [[ -L $out/share/glib-2.0 ]]; then
|
||||
ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old
|
||||
rm -rf $out/share/glib-2.0
|
||||
target=$(readlink $out/share/glib-2.0)
|
||||
rm $out/share/glib-2.0
|
||||
mkdir $out/share/glib-2.0
|
||||
ln -fs $target/* $out/share/glib-2.0
|
||||
fi
|
||||
|
||||
if [[ -L $out/share/glib-2.0/schemas ]]; then
|
||||
target=$(readlink $out/share/glib-2.0/schemas)
|
||||
rm $out/share/glib-2.0/schemas
|
||||
mkdir $out/share/glib-2.0/schemas
|
||||
ln -fs $target/* $out/share/glib-2.0/schemas
|
||||
fi
|
||||
|
||||
mkdir -p $out/share/glib-2.0/schemas
|
||||
|
||||
# symlink any schema files or overrides to the standard schema directory
|
||||
if [[ -e $out/share/glib-2.0.old/schemas ]]; then
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas
|
||||
fi
|
||||
|
||||
for d in $out/share/gsettings-schemas/*; do
|
||||
# Force symlink, in case there are duplicates
|
||||
ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, zlib
|
||||
, debugVersion ? false
|
||||
, enableManpages ? false
|
||||
, enableSharedLibraries ? !stdenv.hostPlatform.isStatic
|
||||
, enableSharedLibraries ? false
|
||||
|
||||
, version
|
||||
, src
|
||||
|
|
@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
|
|||
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
postPatch = lib.optional enableSharedLibraries ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1986,7 +1986,6 @@ broken-packages:
|
|||
- haskell-mpi
|
||||
- haskell-names
|
||||
- haskell-neo4j-client
|
||||
- HaskellNet-SSL
|
||||
- HaskellNN
|
||||
- Haskelloids
|
||||
- haskell-openflow
|
||||
|
|
|
|||
|
|
@ -10200,8 +10200,6 @@ self: {
|
|||
];
|
||||
description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"HaskellTorrent" = callPackage
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnatpmp";
|
||||
|
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||
"CC:=$(CC)"
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
postFixup = ''
|
||||
chmod +x $out/lib/*
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -27,15 +27,6 @@ stdenv.mkDerivation rec {
|
|||
"-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\""
|
||||
];
|
||||
|
||||
# The comgr build tends to link against the static LLVM libraries
|
||||
# *and* the dynamic library. Linking against both causes errors
|
||||
# about command line options being registered twice. This patch
|
||||
# removes the static library linking.
|
||||
patchPhase = ''
|
||||
sed -e '/^llvm_map_components_to_libnames/,/[[:space:]]*Symbolize)/d' \
|
||||
-i CMakeLists.txt
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "catalogue";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik";
|
||||
sha256 = "sha256-U10zrnnr0hyimFUdhdoYaui44d82sPsCRtp3QWPsLWs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataclasses-json";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lidatong";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf";
|
||||
sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,11 +30,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: Type annotations check failed
|
||||
"test_type_hints"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dataclasses_json" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
52
pkgs/development/python-modules/dunamai/default.nix
Normal file
52
pkgs/development/python-modules/dunamai/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, poetry-core
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, importlib-metadata
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dunamai";
|
||||
version = "1.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = "dunamai";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
# needs to be able to run dunami from PATH
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dunamai" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dynamic version generation";
|
||||
homepage = "https://github.com/mtkennerly/dunamai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jmgilman ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-bugbear";
|
||||
version = "22.1.11";
|
||||
version = "22.3.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc=";
|
||||
sha256 = "sha256-tq008SNytZCttnVY1NLf9/2aeqP+iPLUNsRLZu0k3Uk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,37 +1,65 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, pkg-config
|
||||
, pango
|
||||
, cython
|
||||
, AppKit
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "manimpango";
|
||||
version = "0.4.0.post2";
|
||||
version = "0.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4=";
|
||||
hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" ""
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pango
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
propagatedBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov --no-cov-on-fail" ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
${python.interpreter} setup.py build_ext --inplace
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "manimpango" ];
|
||||
pythonImportsCheck = [
|
||||
"manimpango"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Binding for Pango";
|
||||
homepage = "https://github.com/ManimCommunity/ManimPango";
|
||||
license = licenses.mit;
|
||||
description = "Binding for Pango";
|
||||
maintainers = [ maintainers.emilytrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pysigma
|
||||
, pysigma-pipeline-sysmon
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-backend-splunk";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "SigmaHQ";
|
||||
repo = "pySigma-backend-splunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jKvGBUO55DtF6bpgEL82XB5Ba+kmqJsCqUdzftcpSJ0=";
|
||||
hash = "sha256-EP0gcK05hZ5TCOgTePezfEGbW45dGrnnksWyI9Jo9MQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,6 +31,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pysigma-pipeline-sysmon
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-egyzeniid2PZZQ6hsd44W+YURI8uGaXvDMuhNIXUqO0=";
|
||||
hash = "sha256-0k6m86RQoP4QTuxmCWBpxiGqaJt3alOLS5BAuOFwdb4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
38
pkgs/development/python-modules/zipstream-ng/default.nix
Normal file
38
pkgs/development/python-modules/zipstream-ng/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zipstream-ng";
|
||||
version = "1.3.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pR0Ps";
|
||||
repo = "zipstream-ng";
|
||||
rev = "v${version}";
|
||||
sha256 = "NTsnGCddGDUxdHbEoM2ew756psboex3sb6MkYKtaSjQ=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"zipstream"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to generate streamable zip files";
|
||||
longDescription = ''
|
||||
A modern and easy to use streamable zip file generator. It can package and stream many files
|
||||
and folders on the fly without needing temporary files or excessive memory
|
||||
'';
|
||||
homepage = "https://github.com/pR0Ps/zipstream-ng";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +1,48 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, file
|
||||
, scdoc
|
||||
, openssl
|
||||
, zlib
|
||||
, busybox
|
||||
, apk-tools
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abuild";
|
||||
version = "3.7.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.alpinelinux.org";
|
||||
owner = "alpine";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx";
|
||||
rev = version;
|
||||
sha256 = "1zs8slaqiv8q8bim8mwfy08ymar78rqpkgqksw8y1lsjrj49fqy4";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
zlib
|
||||
busybox
|
||||
# for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi
|
||||
(perl.withPackages (ps: with ps; [
|
||||
LWP
|
||||
JSON
|
||||
ModuleBuildTiny
|
||||
LWPProtocolHttps
|
||||
IPCSystemSimple
|
||||
]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
scdoc
|
||||
makeWrapper
|
||||
file
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
|
|
@ -43,6 +59,24 @@ stdenv.mkDerivation rec {
|
|||
"sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# this script requires unpackaged 'augeas' rubygem, no reason
|
||||
# to ship it if we can't provide the dependencies for it
|
||||
rm -f ${placeholder "out"}/bin/apkbuild-gem-resolver
|
||||
|
||||
# Find all executables that are not compiled binaries and wrap
|
||||
# them, make `apk-tools` available in their PATH and also the
|
||||
# $out directory since many of the binaries provided call into
|
||||
# other binaries
|
||||
for prog in \
|
||||
$(find ${placeholder "out"}/bin -type f -exec ${file}/bin/file -i '{}' + \
|
||||
| grep -v x-executable | cut -d : -f1); do
|
||||
wrapProgram $prog \
|
||||
--prefix PATH : "${lib.makeBinPath [ apk-tools ]}" \
|
||||
--prefix PATH : "${placeholder "out"}/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Alpine Linux build tools";
|
||||
homepage = "https://gitlab.alpinelinux.org/alpine/abuild";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "air";
|
||||
version = "1.27.10";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmtrek";
|
||||
repo = "air";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mgFLelf0TPjJK/keQz+s52fKlruSn6+KTPj+waJuQdU=";
|
||||
sha256 = "sha256-JbFSEfm8SVyJBgZju3kfIv5WK/kFYTqkU0EH5HXl9cc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MEIPkron42OJioV7PPhnLWVevjKDs5Bw3jDmvZbac9s=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
name = "lunar-client";
|
||||
version = "2.9.3";
|
||||
version = "2.10.0";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "lunar-client";
|
||||
exec = "lunar-client";
|
||||
icon = "lunarclient";
|
||||
comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client";
|
||||
comment = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client";
|
||||
desktopName = "Lunar Client";
|
||||
genericName = "Minecraft Client";
|
||||
categories = [ "Game" ];
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
name = "lunar-client.AppImage";
|
||||
sha256 = "sha256-2wlC+OAG2lvUB3yPxppNhhvNDZv4gxrNKpww9vAfStI=";
|
||||
sha256 = "1kfi3rgy401ll3gn9k30j0a1zds1ghl5g2ibfwlsnr826nckfmzw";
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType1 rec {
|
||||
|
|
@ -36,7 +36,7 @@ appimageTools.wrapType1 rec {
|
|||
extraPkgs = pkgs: [ pkgs.libpulseaudio ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client";
|
||||
description = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client";
|
||||
homepage = "https://www.lunarclient.com/";
|
||||
license = with licenses; [ unfree ];
|
||||
maintainers = with maintainers; [ zyansheep Technical27 ];
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ buildHost=localhost
|
|||
targetHost=
|
||||
remoteSudo=
|
||||
verboseScript=
|
||||
noFlake=
|
||||
# comma separated list of vars to preserve when using sudo
|
||||
preservedSudoVars=NIXOS_INSTALL_BOOTLOADER
|
||||
|
||||
|
|
@ -65,14 +66,14 @@ while [ "$#" -gt 0 ]; do
|
|||
upgrade=1
|
||||
upgrade_all=1
|
||||
;;
|
||||
-s|--use-substitutes)
|
||||
--use-substitutes|-s)
|
||||
copyClosureFlags+=("$i")
|
||||
;;
|
||||
--max-jobs|-j|--cores|-I|--builders)
|
||||
-I|--max-jobs|-j|--cores|--builders)
|
||||
j="$1"; shift 1
|
||||
extraBuildFlags+=("$i" "$j")
|
||||
;;
|
||||
--show-trace|--keep-failed|-K|--keep-going|-k|--fallback|--repair|--no-build-output|-Q|-j*|-L|--print-build-logs|--refresh|--no-net|--offline|--impure)
|
||||
-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net)
|
||||
extraBuildFlags+=("$i")
|
||||
;;
|
||||
--verbose|-v|-vv|-vvv|-vvvv|-vvvvv)
|
||||
|
|
@ -115,6 +116,9 @@ while [ "$#" -gt 0 ]; do
|
|||
flakeFlags=(--extra-experimental-features 'nix-command flakes')
|
||||
shift 1
|
||||
;;
|
||||
--no-flake)
|
||||
noFlake=1
|
||||
;;
|
||||
--recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)
|
||||
lockFlags+=("$i")
|
||||
;;
|
||||
|
|
@ -339,7 +343,7 @@ fi
|
|||
|
||||
# Use /etc/nixos/flake.nix if it exists. It can be a symlink to the
|
||||
# actual flake.
|
||||
if [[ -z $flake && -e /etc/nixos/flake.nix ]]; then
|
||||
if [[ -z $flake && -e /etc/nixos/flake.nix && -z $noFlake ]]; then
|
||||
flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-mjolnir-antispam";
|
||||
version = "1.3.2";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
rev = "v${version}";
|
||||
sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
|
||||
sha256 = "sha256-zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
|
||||
};
|
||||
|
||||
sourceRoot = "./source/synapse_antispam";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pr-tracker";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";
|
||||
sha256 = "0881ckb4y762isisf9d6xk6fh9207xi1i04kays298zx2dq6gh6h";
|
||||
sha256 = "sha256-Tru9DsitRQLiO4Ln70J9LvkEqcj2i4A+eArBvIhd/ls=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0r8pxg65s5jv95a0g8pzr693za7jfb4rv0wc739lkbpf0dssw8sr";
|
||||
cargoSha256 = "0q3ibxnzw8gngvrgfkv4m64dr411c511xkvb6j9k63vhy9vwarz7";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl systemd ];
|
||||
|
|
|
|||
|
|
@ -11,9 +11,8 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man4
|
||||
cp u9fs.man $out/share/man4
|
||||
cp u9fs $out/bin
|
||||
install -Dm644 u9fs.man "$out/share/man/man4/u9fs.4"
|
||||
install -Dm755 u9fs -t "$out/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
, runtimeShell, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
versionSuffix = "20220120174718.95a3939b3a";
|
||||
versionSuffix = "20220216215910.c82d65a685";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keybase-gui";
|
||||
version = "5.9.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
|
||||
version = "5.9.3"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
|
||||
sha256 = "sha256-Wdl5pZFIz+mDkkE0EDpLGH/eGWYoBbLV05LYJgkwpI4=";
|
||||
hash = "sha256-JY2DaqApv6K02y3B+JIXpV4SvvMQpBhw9eqr/5Sn0cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "2.6.3";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4jByNyO0EvJ2ppdg21+7YfeB9arjBZALrOm5MJlkZsg=";
|
||||
sha256 = "sha256-g78sZDhV2+MgoFkJIrE2RbVLa/aPjbKFFRyKj594Hb0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-717+jJiyqmctR9Yb/XnnKd1N+31K2+xO1XClGMKlL+k=";
|
||||
vendorSha256 = "sha256-/umoSOQ0ehQplxU8OTGJVmTgO+8xPZxVwRBfM67zMh8=";
|
||||
|
||||
modRoot = "./v2";
|
||||
subPackages = [
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sigma-cli";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-We6vJXLIxGe//78pgJFrihFJHl0gRd02I53hoYWcao0=";
|
||||
hash = "sha256-AUAOZrwLNu+Llg8RX4RKm4vAETgpPLKK1mcpl8jxGYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2499,6 +2499,8 @@ in {
|
|||
|
||||
dulwich = callPackage ../development/python-modules/dulwich { };
|
||||
|
||||
dunamai = callPackage ../development/python-modules/dunamai { };
|
||||
|
||||
dungeon-eos = callPackage ../development/python-modules/dungeon-eos { };
|
||||
|
||||
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
|
||||
|
|
@ -10985,6 +10987,8 @@ in {
|
|||
|
||||
zipstream-new = callPackage ../development/python-modules/zipstream-new { };
|
||||
|
||||
zipstream-ng = callPackage ../development/python-modules/zipstream-ng { };
|
||||
|
||||
zm-py = callPackage ../development/python-modules/zm-py { };
|
||||
|
||||
zodb = callPackage ../development/python-modules/zodb { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue