mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge branch 'master' into staging-next
This commit is contained in:
Jan Tojnar
commit
2445e9a681
@ -603,6 +603,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
|
||||
free = false;
|
||||
};
|
||||
|
||||
odbl = spdx {
|
||||
spdxId = "ODbL-1.0";
|
||||
fullName = "Open Data Commons Open Database License v1.0";
|
||||
};
|
||||
|
||||
ofl = spdx {
|
||||
spdxId = "OFL-1.1";
|
||||
fullName = "SIL Open Font License 1.1";
|
||||
|
||||
@ -4159,6 +4159,12 @@
|
||||
github = "j0hax";
|
||||
githubId = 3802620;
|
||||
};
|
||||
j4m3s = {
|
||||
name = "James Landrein";
|
||||
email = "github@j4m3s.eu";
|
||||
github = "j4m3s-s";
|
||||
githubId = 9413812;
|
||||
};
|
||||
jacg = {
|
||||
name = "Jacek Generowicz";
|
||||
email = "jacg@my-post-office.net";
|
||||
@ -6993,7 +6999,7 @@
|
||||
githubId = 3359345;
|
||||
name = "obadz";
|
||||
};
|
||||
obsidian-systems-maintainence = {
|
||||
obsidian-systems-maintenance = {
|
||||
name = "Obsidian Systems Maintenance";
|
||||
email = "maintainer@obsidian.systems";
|
||||
github = "obsidian-systems-maintenance";
|
||||
|
||||
@ -274,6 +274,15 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
etcSlurm = mkOption {
|
||||
type = types.path;
|
||||
internal = true;
|
||||
default = etcSlurm;
|
||||
description = ''
|
||||
Path to directory with slurm config files. This option is set by default from the
|
||||
Slurm module and is meant to make the Slurm config file available to other modules.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
@ -308,7 +317,7 @@ in
|
||||
#!/bin/sh
|
||||
if [ -z "$SLURM_CONF" ]
|
||||
then
|
||||
SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
|
||||
SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
|
||||
else
|
||||
"$EXE" "\$0"
|
||||
fi
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, doxygen
|
||||
, fftwSinglePrec
|
||||
, flac
|
||||
, glibc
|
||||
, glibmm
|
||||
, graphviz
|
||||
, gtkmm2
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cheesecutter";
|
||||
version = "unstable-2020-04-03";
|
||||
version = "unstable-2021-02-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theyamo";
|
||||
repo = "CheeseCutter";
|
||||
rev = "68d6518f0e6249a2a5d122fc80201578337c1277";
|
||||
sha256 = "0xspzjhc6cp3m0yd0mwxncg8n1wklizamxvidrnn21jgj3mnaq2q";
|
||||
rev = "84450d3614b8fb2cabda87033baab7bedd5a5c98";
|
||||
sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -75,5 +75,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.warmplace.ru/soft/sunvox/";
|
||||
maintainers = with maintainers; [ puffnfresh ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
# hash mismatch
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,15 +10,13 @@
|
||||
, randomx, zeromq, libgcrypt, libgpgerror
|
||||
, hidapi, rapidjson, quirc
|
||||
, trezorSupport ? true
|
||||
, libusb1 ? null
|
||||
, protobuf ? null
|
||||
, python3 ? null
|
||||
, libusb1
|
||||
, protobuf
|
||||
, python3
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
|
||||
|
||||
let
|
||||
arch = if stdenv.isx86_64 then "x86-64"
|
||||
else if stdenv.isi686 then "i686"
|
||||
|
||||
@ -2,39 +2,39 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "edit-nightly";
|
||||
version = "20160425";
|
||||
version = "20180228";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://c9x.me/ed.git";
|
||||
rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484";
|
||||
sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v";
|
||||
rev = "77d96145b163d79186c722a7ffccfff57601157c";
|
||||
sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [
|
||||
pkg-config
|
||||
ncurses
|
||||
libX11
|
||||
libXft
|
||||
cwebbin
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
pkg-config
|
||||
cwebbin
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libX11
|
||||
libXft
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ctangle *.w
|
||||
make
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin/
|
||||
cp obj/edit $out/bin/edit
|
||||
install -Dm755 obj/edit -t $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A relaxing mix of Vi and ACME";
|
||||
homepage = "http://c9x.me/edit";
|
||||
homepage = "https://c9x.me/edit";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
61
pkgs/applications/misc/metadata-cleaner/default.nix
Normal file
61
pkgs/applications/misc/metadata-cleaner/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitLab
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libhandy
|
||||
, librsvg
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, poppler_gi
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "metadata-cleaner";
|
||||
version = "1.0.3";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "rmnvgr";
|
||||
repo = "metadata-cleaner";
|
||||
rev = "v${version}";
|
||||
sha256 = "06dzfcnjb1xd8lk0r7bi4i784gfj8r7habbjbk2c4vn2847v71lf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
glib
|
||||
gtk3
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libhandy
|
||||
librsvg
|
||||
poppler_gi
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
mat2
|
||||
pygobject3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python GTK application to view and clean metadata in files, using mat2";
|
||||
homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
|
||||
license = with licenses; [ gpl3Plus cc-by-sa-40 ];
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "90.0.4430.19",
|
||||
"sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
|
||||
"sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
|
||||
"version": "90.0.4430.30",
|
||||
"sha256": "01b6naziii72pvw35wphfqz3inih75is038yf1mdp1847jbvxpwp",
|
||||
"sha256bin64": "0k48mfzmyjb0w75fkm2j7ll340qgmzvmskz12awc2l19hgnw1s8p",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-02-09",
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "lens";
|
||||
version = "3.6.7";
|
||||
version = "4.1.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage";
|
||||
sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8";
|
||||
url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage";
|
||||
sha256 = "0g7k3sld6m31qi0zc9z5gydi60waw7ykwz48qnyg77xz1cpm6z5x";
|
||||
name="${pname}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
@ -87,8 +87,9 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Matrix group messaging app";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
||||
license = licenses.gpl3Plus;
|
||||
broken = stdenv.isDarwin;
|
||||
license = licenses.gpl3;
|
||||
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
|
||||
broken = true;
|
||||
maintainers = with maintainers; [ dtzWill worldofpeace ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
|
||||
meta = gnunet.meta // {
|
||||
description = "GNUnet GTK User Interface";
|
||||
homepage = "https://git.gnunet.org/gnunet-gtk.git";
|
||||
# configure: error: compiling gnunet-gtk requires GNUnet core headers
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-qKvzxIFUiRoX/fCTDoGOGFMfzMTCRq+A5b9K2J2Wnwk=";
|
||||
sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onedrive";
|
||||
version = "2.4.7";
|
||||
version = "2.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
|
||||
sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
|
||||
|
||||
@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.51.1";
|
||||
version = "0.51.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-sQisFv+MVGod/gmF0/EWNDvYzkpF3qbDuL5eDr7w0Bs=";
|
||||
sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sambamba";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biod";
|
||||
repo = "sambamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "0k5wy06zrbsc40x6answgz7rz2phadyqwlhi9nqxbfqanbg9kq20";
|
||||
sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which python3 dmd ldc ];
|
||||
nativeBuildInputs = [ which python3 ldc ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
# Upstream's install target is broken; copy manually
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, ninja
|
||||
, python3
|
||||
, pkg-config
|
||||
, dmd
|
||||
, ldc
|
||||
, dconf
|
||||
, dbus
|
||||
, gsettings-desktop-schemas
|
||||
@ -16,17 +16,18 @@
|
||||
, glib
|
||||
, wrapGAppsHook
|
||||
, libunwind
|
||||
, appstream
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tilix";
|
||||
version = "unstable-2019-10-02";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnunn1";
|
||||
repo = "tilix";
|
||||
rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f";
|
||||
sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9";
|
||||
};
|
||||
|
||||
# Default upstream else LDC fails to link
|
||||
@ -36,12 +37,13 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
dmd
|
||||
ldc
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
appstream
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,8 +2,6 @@
|
||||
, yacc, libtool, fontconfig, pango, gd, libwebp
|
||||
}:
|
||||
|
||||
assert libpng != null && libjpeg != null && expat != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "graphviz-2.0";
|
||||
|
||||
|
||||
@ -21,12 +21,12 @@ buildPythonApplication rec {
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
checkInputs = [ mock pytest nose ];
|
||||
propagatedBuildInputs = [
|
||||
pyyaml backports_ssl_match_hostname colorama dockerpty docker
|
||||
pyyaml colorama dockerpty docker
|
||||
ipaddress jsonschema requests six texttable websocket_client
|
||||
docopt cached-property paramiko distro python-dotenv
|
||||
] ++
|
||||
lib.optional (pythonOlder "3.4") enum34 ++
|
||||
lib.optional (pythonOlder "3.2") functools32;
|
||||
] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
|
||||
++ lib.optional (pythonOlder "3.4") enum34
|
||||
++ lib.optional (pythonOlder "3.2") functools32;
|
||||
|
||||
postPatch = ''
|
||||
# Remove upper bound on requires, see also
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2102.03";
|
||||
version = "2102.25";
|
||||
in
|
||||
fetchzip {
|
||||
name = "cascadia-code-${version}";
|
||||
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
|
||||
|
||||
sha256 = "076l44cyyp3cf15qyn2hzx34kzqm73d218fgwf8n69m8a1v34hs2";
|
||||
sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
||||
@ -2,25 +2,28 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spdx-license-list-data";
|
||||
version = "3.11";
|
||||
version = "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spdx";
|
||||
repo = "license-list-data";
|
||||
rev = "v${version}";
|
||||
sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a";
|
||||
sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -vDt $out/json json/licenses.json
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Various data formats for the SPDX License List";
|
||||
homepage = "https://github.com/spdx/license-list-data";
|
||||
license = lib.licenses.cc0;
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.cc0;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -214,6 +214,8 @@ let
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
|
||||
platforms = builtins.attrNames archs;
|
||||
# Error running at_exit handler: Nil assertion failed
|
||||
broken = lib.versions.minor version == "32" && stdenv.isDarwin;
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
, targetPackages, fetchpatch, bash
|
||||
, dmdBootstrap ? callPackage ./bootstrap.nix { }
|
||||
, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
|
||||
, version ? "2.091.1"
|
||||
, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr"
|
||||
, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl"
|
||||
, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs"
|
||||
, version ? "2.095.1"
|
||||
, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"
|
||||
, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha"
|
||||
, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
|
||||
}:
|
||||
|
||||
let
|
||||
@ -53,18 +53,6 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = [ "--directory=dmd" "-p1" "-F3" ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch";
|
||||
sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch";
|
||||
sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||
@ -76,6 +64,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
|
||||
|
||||
rm dmd/test/runnable/gdb1.d
|
||||
rm dmd/test/runnable/gdb10311.d
|
||||
rm dmd/test/runnable/gdb14225.d
|
||||
rm dmd/test/runnable/gdb14276.d
|
||||
rm dmd/test/runnable/gdb14313.d
|
||||
rm dmd/test/runnable/gdb14330.d
|
||||
rm dmd/test/runnable/gdb15729.sh
|
||||
rm dmd/test/runnable/gdb4149.d
|
||||
rm dmd/test/runnable/gdb4181.d
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
@ -171,5 +169,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ ThomasMader lionello ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
# many tests are failing
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ./generic.nix {
|
||||
version = "1.24.0";
|
||||
ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
|
||||
version = "1.25.1";
|
||||
ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA=";
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.38.0";
|
||||
version = "3.38.1";
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
|
||||
src = fetchFromGitLab {
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GNOME";
|
||||
repo = "gnome-online-accounts";
|
||||
rev = version;
|
||||
sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag=";
|
||||
sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "dev" "devdoc" ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goffice";
|
||||
version = "0.10.48";
|
||||
version = "0.10.49";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
|
||||
sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
|
||||
{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg
|
||||
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
|
||||
|
||||
let
|
||||
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dmd pkg-config which ];
|
||||
nativeBuildInputs = [ ldc pkg-config which ];
|
||||
propagatedBuildInputs = [
|
||||
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
|
||||
libgda libpeas librsvg pango vte
|
||||
|
||||
37
pkgs/development/libraries/libseat/default.nix
Normal file
37
pkgs/development/libraries/libseat/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ fetchFromSourcehut
|
||||
, lib
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libseat";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = "seatd";
|
||||
rev = version;
|
||||
sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
];
|
||||
|
||||
mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A universal seat management library";
|
||||
changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}";
|
||||
homepage = "https://sr.ht/~kennylevinsen/seatd/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ emantor ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/libraries/science/math/cutensor/default.nix
Normal file
37
pkgs/development/libraries/science/math/cutensor/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ callPackage
|
||||
, cudatoolkit_10_1, cudatoolkit_10_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
|
||||
}:
|
||||
|
||||
rec {
|
||||
cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec {
|
||||
version = "1.2.2.5";
|
||||
libPath = "lib/10.1";
|
||||
cudatoolkit = cudatoolkit_10_1;
|
||||
# 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2:
|
||||
# ephemeral doc at https://developer.nvidia.com/cutensor/downloads
|
||||
sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm";
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override {
|
||||
libPath = "lib/10.2";
|
||||
cudatoolkit = cudatoolkit_10_2;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2;
|
||||
|
||||
cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override {
|
||||
libPath = "lib/11";
|
||||
cudatoolkit = cudatoolkit_11_0;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override {
|
||||
cudatoolkit = cudatoolkit_11_1;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override {
|
||||
cudatoolkit = cudatoolkit_11_2;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2;
|
||||
}
|
||||
69
pkgs/development/libraries/science/math/cutensor/generic.nix
Normal file
69
pkgs/development/libraries/science/math/cutensor/generic.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, libPath
|
||||
, cudatoolkit
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, addOpenGLRunpath
|
||||
|
||||
, version
|
||||
, sha256
|
||||
}:
|
||||
|
||||
let
|
||||
mostOfVersion = builtins.concatStringsSep "."
|
||||
(lib.take 3 (lib.versions.splitVersion version));
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cudatoolkit
|
||||
];
|
||||
|
||||
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
|
||||
# See the explanation in addOpenGLRunpath.
|
||||
installPhase = ''
|
||||
mkdir -p "$out" "$dev"
|
||||
mv include "$dev"
|
||||
mv ${libPath} "$out/lib"
|
||||
|
||||
function finalRPathFixups {
|
||||
for lib in $out/lib/lib*.so; do
|
||||
addOpenGLRunpath $lib
|
||||
done
|
||||
}
|
||||
postFixupHooks+=(finalRPathFixups)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit cudatoolkit;
|
||||
majorVersion = lib.versions.major version;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives";
|
||||
homepage = "https://developer.nvidia.com/cutensor";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ obsidian-systems-maintenance ];
|
||||
};
|
||||
}
|
||||
@ -39,11 +39,11 @@ let
|
||||
throw "You need to enable at least one output module.";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "speech-dispatcher";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309";
|
||||
sha256 = "sha256-sGMZ8gHhXlbGKWZTr1vPwwDLNI6XLVF9+LBurHfq4tw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -56,6 +56,10 @@ let param =
|
||||
version = "8.06.9";
|
||||
sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0";
|
||||
};
|
||||
"4.12" = mkNewParam {
|
||||
version = "8.06.10";
|
||||
sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
|
||||
};
|
||||
}.${builtins.substring 0 4 ocaml.version};
|
||||
in
|
||||
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "backports.ssl_match_hostname";
|
||||
version = "3.7.0.1";
|
||||
disabled = pythonAtLeast "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
|
||||
{ lib, buildPythonPackage, isPy3k, fetchPypi
|
||||
, bluez, dbus-next, pytestCheckHook, pytest-cov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee";
|
||||
sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -19,10 +21,11 @@ buildPythonPackage rec {
|
||||
--replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ txdbus ];
|
||||
checkInputs = [ pytest pytestcov ];
|
||||
propagatedBuildInputs = [ dbus-next ];
|
||||
|
||||
checkPhase = "AGENT_OS=linux py.test";
|
||||
checkInputs = [ pytestCheckHook pytest-cov ];
|
||||
|
||||
pythonImportsCheck = [ "bleak" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bluetooth Low Energy platform Agnostic Klient for Python";
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.17.29"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
version = "1.17.30"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MTlvyv/fwPRltN524eyuU4lOuGmwAP+lSqFpOpjbOjw=";
|
||||
sha256 = "sha256-05wEtR5gGX9VA/hInwQ7yQSYFWfMhDHTiTZ3Z9w/1a4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.20.29"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.20.30"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-GEt9JrBmn9ZayBk2YjdtEmfYAOAFtpQStXzILF/76TU=";
|
||||
sha256 = "sha256-mP8eshDTlKH/5zazPIp75o8w8KA1ULVZxbtv3wwpMo0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bx-python";
|
||||
version = "0.8.10";
|
||||
version = "0.8.11";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bxlab";
|
||||
repo = "bx-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il";
|
||||
sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPythonPackage
|
||||
, fetchPypi, isPy3k, linuxPackages
|
||||
, fastrlock, numpy, six, wheel, pytest, mock, setuptools
|
||||
, cudatoolkit, cudnn, nccl
|
||||
, cudatoolkit, cudnn, cutensor, nccl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -26,6 +26,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
cudatoolkit
|
||||
cudnn
|
||||
cutensor
|
||||
linuxPackages.nvidia_x11
|
||||
nccl
|
||||
fastrlock
|
||||
|
||||
@ -24,11 +24,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
|
||||
sha256 = "a135612876dc3e4b16ccb9ddb70de50519825c8c1be251b49aefa550bcf8a39a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, certifi
|
||||
, six
|
||||
, backports_ssl_match_hostname
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,7 +19,8 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
|
||||
propagatedBuildInputs = [ gevent certifi six ]
|
||||
++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ];
|
||||
|
||||
# Several tests fail that require network
|
||||
doCheck = false;
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
|
||||
--replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
|
||||
--replace 'wheel = "^0.35.1"' 'wheel = "^0.36"'
|
||||
--replace 'wheel = "^0.35.1"' 'wheel = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
98
pkgs/development/python-modules/mat2/default.nix
Normal file
98
pkgs/development/python-modules/mat2/default.nix
Normal file
@ -0,0 +1,98 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, pythonOlder
|
||||
, fetchFromGitLab
|
||||
, substituteAll
|
||||
, bubblewrap
|
||||
, exiftool
|
||||
, ffmpeg
|
||||
, mime-types
|
||||
, wrapGAppsHook
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, librsvg
|
||||
, poppler_gi
|
||||
, mutagen
|
||||
, pygobject3
|
||||
, pycairo
|
||||
, dolphinIntegration ? false, plasma5Packages
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mat2";
|
||||
version = "0.12.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "0xacab.org";
|
||||
owner = "jvoisin";
|
||||
repo = "mat2";
|
||||
rev = version;
|
||||
sha256 = "0amxwwmcf47dakfm6zvsksv6ja7rz7dpmd1z2rsspy8yds6zgxs7";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# hardcode paths to some binaries
|
||||
(substituteAll ({
|
||||
src = ./paths.patch;
|
||||
bwrap = "${bubblewrap}/bin/bwrap";
|
||||
exiftool = "${exiftool}/bin/exiftool";
|
||||
ffmpeg = "${ffmpeg}/bin/ffmpeg";
|
||||
# remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master
|
||||
mimetypes = "${mime-types}/etc/mime.types";
|
||||
} // lib.optionalAttrs dolphinIntegration {
|
||||
kdialog = "${plasma5Packages.kdialog}/bin/kdialog";
|
||||
}))
|
||||
# the executable shouldn't be called .mat2-wrapped
|
||||
./executable-name.patch
|
||||
# hardcode path to mat2 executable
|
||||
./tests.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dolphin/mat2.desktop \
|
||||
--replace "@mat2@" "$out/bin/mat2" \
|
||||
--replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
gobject-introspection
|
||||
librsvg
|
||||
poppler_gi
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mutagen
|
||||
pygobject3
|
||||
pycairo
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
|
||||
install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
|
||||
install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions"
|
||||
buildPythonPath "$out $pythonPath"
|
||||
patchPythonScript "$out/share/nautilus-python/extensions/mat2.py"
|
||||
'' + lib.optionalString dolphinIntegration ''
|
||||
install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover -v
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A handy tool to trash your metadata";
|
||||
homepage = "https://0xacab.org/jvoisin/mat2";
|
||||
changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
13
pkgs/development/python-modules/mat2/executable-name.patch
Normal file
13
pkgs/development/python-modules/mat2/executable-name.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/mat2 b/mat2
|
||||
index 3b77e1e..b99a633 100755
|
||||
--- a/mat2
|
||||
+++ b/mat2
|
||||
@@ -46,7 +46,7 @@ def __check_file(filename: str, mode: int = os.R_OK) -> bool:
|
||||
|
||||
|
||||
def create_arg_parser() -> argparse.ArgumentParser:
|
||||
- parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2')
|
||||
+ parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2', prog='mat2')
|
||||
|
||||
parser.add_argument('-V', '--verbose', action='store_true',
|
||||
help='show more verbose status information')
|
||||
111
pkgs/development/python-modules/mat2/paths.patch
Normal file
111
pkgs/development/python-modules/mat2/paths.patch
Normal file
@ -0,0 +1,111 @@
|
||||
diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
|
||||
index e623962..5d69ae2 100644
|
||||
--- a/dolphin/mat2.desktop
|
||||
+++ b/dolphin/mat2.desktop
|
||||
@@ -7,5 +7,5 @@ Type=Service
|
||||
[Desktop Action cleanMetadata]
|
||||
Name=Clean metadata
|
||||
Name[es]=Limpiar metadatos
|
||||
-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
|
||||
-Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
|
||||
+Icon=@mat2svg@
|
||||
+Exec=@kdialog@ --yesno "$( @mat2@ -s %U )" --title "Clean Metadata?" && @mat2@ %U
|
||||
diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
|
||||
index 970d5dd..5d3c0b7 100644
|
||||
--- a/libmat2/bubblewrap.py
|
||||
+++ b/libmat2/bubblewrap.py
|
||||
@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError
|
||||
|
||||
|
||||
def _get_bwrap_path() -> str:
|
||||
- which_path = shutil.which('bwrap')
|
||||
- if which_path:
|
||||
- return which_path
|
||||
-
|
||||
- raise RuntimeError("Unable to find bwrap") # pragma: no cover
|
||||
+ return '@bwrap@'
|
||||
|
||||
|
||||
def _get_bwrap_args(tempdir: str,
|
||||
@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str,
|
||||
|
||||
# XXX: use --ro-bind-try once all supported platforms
|
||||
# have a bubblewrap recent enough to support it.
|
||||
- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd]
|
||||
+ ro_bind_dirs = ['/nix/store', cwd]
|
||||
for bind_dir in ro_bind_dirs:
|
||||
if os.path.isdir(bind_dir): # pragma: no cover
|
||||
ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir])
|
||||
|
||||
- ro_bind_files = ['/etc/ld.so.cache']
|
||||
- for bind_file in ro_bind_files:
|
||||
- if os.path.isfile(bind_file): # pragma: no cover
|
||||
- ro_bind_args.extend(['--ro-bind', bind_file, bind_file])
|
||||
-
|
||||
args = ro_bind_args + \
|
||||
['--dev', '/dev',
|
||||
'--proc', '/proc',
|
||||
diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
|
||||
index eb65b2a..51a0fa1 100644
|
||||
--- a/libmat2/exiftool.py
|
||||
+++ b/libmat2/exiftool.py
|
||||
@@ -1,8 +1,6 @@
|
||||
-import functools
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
-import shutil
|
||||
import subprocess
|
||||
from typing import Dict, Union, Set
|
||||
|
||||
@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser):
|
||||
return False
|
||||
return True
|
||||
|
||||
-@functools.lru_cache()
|
||||
def _get_exiftool_path() -> str: # pragma: no cover
|
||||
- which_path = shutil.which('exiftool')
|
||||
- if which_path:
|
||||
- return which_path
|
||||
-
|
||||
- # Exiftool on Arch Linux has a weird path
|
||||
- if os.access('/usr/bin/vendor_perl/exiftool', os.X_OK):
|
||||
- return '/usr/bin/vendor_perl/exiftool'
|
||||
-
|
||||
- raise RuntimeError("Unable to find exiftool")
|
||||
+ return '@exiftool@'
|
||||
diff --git a/libmat2/parser_factory.py b/libmat2/parser_factory.py
|
||||
index 9965432..bd45179 100644
|
||||
--- a/libmat2/parser_factory.py
|
||||
+++ b/libmat2/parser_factory.py
|
||||
@@ -8,6 +8,7 @@ from . import abstract, UNSUPPORTED_EXTENSIONS
|
||||
|
||||
T = TypeVar('T', bound='abstract.AbstractParser')
|
||||
|
||||
+mimetypes.init(['@mimetypes@'])
|
||||
mimetypes.add_type('application/epub+zip', '.epub')
|
||||
mimetypes.add_type('application/x-dtbncx+xml', '.ncx') # EPUB Navigation Control XML File
|
||||
|
||||
diff --git a/libmat2/video.py b/libmat2/video.py
|
||||
index b4a3232..3dd7ee5 100644
|
||||
--- a/libmat2/video.py
|
||||
+++ b/libmat2/video.py
|
||||
@@ -1,6 +1,4 @@
|
||||
import subprocess
|
||||
-import functools
|
||||
-import shutil
|
||||
import logging
|
||||
|
||||
from typing import Dict, Union
|
||||
@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
|
||||
}
|
||||
|
||||
|
||||
-@functools.lru_cache()
|
||||
def _get_ffmpeg_path() -> str: # pragma: no cover
|
||||
- which_path = shutil.which('ffmpeg')
|
||||
- if which_path:
|
||||
- return which_path
|
||||
-
|
||||
- raise RuntimeError("Unable to find ffmpeg")
|
||||
+ return '@ffmpeg@'
|
||||
18
pkgs/development/python-modules/mat2/tests.patch
Normal file
18
pkgs/development/python-modules/mat2/tests.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/tests/test_climat2.py b/tests/test_climat2.py
|
||||
index cede642..2d5ad77 100644
|
||||
--- a/tests/test_climat2.py
|
||||
+++ b/tests/test_climat2.py
|
||||
@@ -10,12 +10,7 @@ import glob
|
||||
from libmat2 import images, parser_factory
|
||||
|
||||
|
||||
-mat2_binary = ['./mat2']
|
||||
-
|
||||
-if 'MAT2_GLOBAL_PATH_TESTSUITE' in os.environ:
|
||||
- # Debian runs tests after installing the package
|
||||
- # https://0xacab.org/jvoisin/mat2/issues/16#note_153878
|
||||
- mat2_binary = ['/usr/bin/env', 'mat2']
|
||||
+mat2_binary = [os.environ['out'] + '/bin/mat2']
|
||||
|
||||
|
||||
class TestHelp(unittest.TestCase):
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.29.2";
|
||||
version = "2.30.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-e+yrjtDC6d47+zEFv6WY7xGw9kDfKLrNyMh/IkC/bQs=";
|
||||
sha256 = "sha256-3BxRDoaKxaXlKYGYQqhQ2DUO3XONvf6dlofE0pbXIho=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -30,10 +30,12 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
|
||||
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
|
||||
})];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
|
||||
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
|
||||
})
|
||||
];
|
||||
|
||||
# N.B. These exist because:
|
||||
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
|
||||
|
||||
@ -6,22 +6,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "TatSu";
|
||||
version = "5.0.0";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neogeny";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1c16fcxf0xjkh5py9bnj6ljb9krhrj57mkwayl1w1dvzwl5lkgj3";
|
||||
sha256 = "07bmdnwh99p60cgzhlb8s5vwi5v4r5zi8shymxnnarannkc66hzn";
|
||||
};
|
||||
|
||||
# Since version 5.0.0 only >=3.8 is officially supported, but ics is not
|
||||
# compatible with Python 3.8 due to aiohttp:
|
||||
disabled = pythonOlder "3.7";
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "python_requires='>=3.8'," "python_requires='>=3.7',"
|
||||
'';
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
propagatedBuildInputs = [ colorama mypy pyyaml regex ]
|
||||
|
||||
33
pkgs/development/python-modules/ytmusicapi/default.nix
Normal file
33
pkgs/development/python-modules/ytmusicapi/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.14.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "83251a95d5bd74116353d29dfda2d0c5055b88276a0876a313a66f8b9c691344";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = false; # requires network access
|
||||
|
||||
pythonImportsCheck = [ "ytmusicapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial API for YouTube Music";
|
||||
homepage = "https://github.com/sigma67/ytmusicapi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.145.0";
|
||||
version = "0.146.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4=";
|
||||
sha256 = "0kxws51hri0b4z7k05li6vg1arcdc7i5jzfibi0iplsfyy14159q";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
|
||||
{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
|
||||
|
||||
assert dcompiler != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dub";
|
||||
@ -24,12 +26,23 @@ stdenv.mkDerivation rec {
|
||||
--replace "dub remove" "\"${dubvar}\" remove"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dmd libevent rsync ];
|
||||
nativeBuildInputs = [ dcompiler libevent rsync ];
|
||||
buildInputs = [ curl ];
|
||||
|
||||
buildPhase = ''
|
||||
export DMD=${dmd.out}/bin/dmd
|
||||
./build.sh
|
||||
for dc_ in dmd ldmd2 gdmd; do
|
||||
echo "... check for D compiler $dc_ ..."
|
||||
dc=$(type -P $dc_ || echo "")
|
||||
if [ ! "$dc" == "" ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ "$dc" == "" ]; then
|
||||
exit "Error: could not find D compiler"
|
||||
fi
|
||||
echo "$dc_ found and used as D compiler to build $pname"
|
||||
$dc ./build.d
|
||||
./build
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
@ -37,7 +50,8 @@ stdenv.mkDerivation rec {
|
||||
checkPhase = ''
|
||||
export DUB=$NIX_BUILD_TOP/source/bin/dub
|
||||
export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
|
||||
export DC=${dmd.out}/bin/dmd
|
||||
export DC=${dcompiler.out}/bin/${dcompiler.pname}
|
||||
echo "DC out --> $DC"
|
||||
export HOME=$TMP
|
||||
|
||||
rm -rf test/issue502-root-import
|
||||
@ -46,7 +60,6 @@ stdenv.mkDerivation rec {
|
||||
rm test/issue990-download-optional-selected.sh
|
||||
rm test/issue877-auto-fetch-package-on-run.sh
|
||||
rm test/issue1037-better-dependency-messages.sh
|
||||
rm test/issue1040-run-with-ver.sh
|
||||
rm test/issue1416-maven-repo-pkg-supplier.sh
|
||||
rm test/issue1180-local-cache-broken.sh
|
||||
rm test/issue1574-addcommand.sh
|
||||
@ -62,13 +75,73 @@ stdenv.mkDerivation rec {
|
||||
rm test/version-spec.sh
|
||||
rm test/0-init-multi.sh
|
||||
rm test/0-init-multi-json.sh
|
||||
rm test/4-describe-data-1-list.sh
|
||||
rm test/4-describe-data-3-zero-delim.sh
|
||||
rm test/4-describe-import-paths.sh
|
||||
rm test/4-describe-string-import-paths.sh
|
||||
rm test/4-describe-json.sh
|
||||
rm test/5-convert-stdout.sh
|
||||
rm test/issue1003-check-empty-ld-flags.sh
|
||||
rm test/issue103-single-file-package.sh
|
||||
rm test/issue1040-run-with-ver.sh
|
||||
rm test/issue1091-bogus-rebuild.sh
|
||||
rm test/issue1194-warn-wrong-subconfig.sh
|
||||
rm test/issue1277.sh
|
||||
rm test/issue1372-ignore-files-in-hidden-dirs.sh
|
||||
rm test/issue1447-build-settings-vars.sh
|
||||
rm test/issue1531-toolchain-requirements.sh
|
||||
rm test/issue346-redundant-flags.sh
|
||||
rm test/issue361-optional-deps.sh
|
||||
rm test/issue564-invalid-upgrade-dependency.sh
|
||||
rm test/issue586-subpack-dep.sh
|
||||
rm test/issue616-describe-vs-generate-commands.sh
|
||||
rm test/issue686-multiple-march.sh
|
||||
rm test/issue813-fixed-dependency.sh
|
||||
rm test/issue813-pure-sub-dependency.sh
|
||||
rm test/issue820-extra-fields-after-convert.sh
|
||||
rm test/issue923-subpackage-deps.sh
|
||||
rm test/single-file-sdl-default-name.sh
|
||||
rm test/subpackage-common-with-sourcefile-globbing.sh
|
||||
rm test/issue934-path-dep.sh
|
||||
rm -r test/1-dynLib-simple
|
||||
rm -r test/1-exec-simple-package-json
|
||||
rm -r test/1-exec-simple
|
||||
rm -r test/1-staticLib-simple
|
||||
rm -r test/2-dynLib-dep
|
||||
rm -r test/2-staticLib-dep
|
||||
rm -r test/2-dynLib-with-staticLib-dep
|
||||
rm -r test/2-sourceLib-dep/
|
||||
rm -r test/3-copyFiles
|
||||
rm -r test/custom-source-main-bug487
|
||||
rm -r test/custom-unittest
|
||||
rm -r test/issue1262-version-inheritance-diamond
|
||||
rm -r test/issue1003-check-empty-ld-flags
|
||||
rm -r test/ignore-hidden-1
|
||||
rm -r test/ignore-hidden-2
|
||||
rm -r test/issue1427-betterC
|
||||
rm -r test/issue130-unicode-*
|
||||
rm -r test/issue1262-version-inheritance
|
||||
rm -r test/issue1372-ignore-files-in-hidden-dirs
|
||||
rm -r test/issue1350-transitive-none-deps
|
||||
rm -r test/issue1775
|
||||
rm -r test/issue1447-build-settings-vars
|
||||
rm -r test/issue1408-inherit-linker-files
|
||||
rm -r test/issue1551-var-escaping
|
||||
rm -r test/issue754-path-selection-fail
|
||||
rm -r test/issue1788-incomplete-string-import-override
|
||||
rm -r test/subpackage-ref
|
||||
rm -r test/issue777-bogus-path-dependency
|
||||
rm -r test/issue959-path-based-subpack-dep
|
||||
rm -r test/issue97-targettype-none-nodeps
|
||||
rm -r test/issue97-targettype-none-onerecipe
|
||||
rm -r test/path-subpackage-ref
|
||||
rm -r test/sdl-package-simple
|
||||
|
||||
./test/run-unittest.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
mkdir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp bin/dub $out/bin
|
||||
'';
|
||||
|
||||
|
||||
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
|
||||
};
|
||||
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{stdenv, lib, fetchFromGitHub, dmd, curl}:
|
||||
{stdenv, lib, fetchFromGitHub, ldc, curl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtools";
|
||||
version = "2.085.1";
|
||||
version = "2.095.1";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "dmd";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
|
||||
sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
|
||||
name = "dmd";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
|
||||
sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
|
||||
name = "dtools";
|
||||
})
|
||||
];
|
||||
@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
|
||||
mv dmd dtools
|
||||
cd dtools
|
||||
|
||||
substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dmd ];
|
||||
nativeBuildInputs = [ ldc ];
|
||||
buildInputs = [ curl ];
|
||||
|
||||
makeCmd = ''
|
||||
make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
|
||||
make -f posix.mak all DMD_DIR=dmd DMD=${ldc.out}/bin/ldmd2 CC=${stdenv.cc}/bin/cc
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib, stdenv, fetchgit, dmd, dub }:
|
||||
{ lib, stdenv, fetchgit, ldc, dub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "Literate";
|
||||
version = "unstable-2020-09-02";
|
||||
version = "unstable-2021-01-22";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/zyedidia/Literate.git";
|
||||
rev = "533991cca6ec7a608a778396d32d51b35182d944";
|
||||
sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
|
||||
rev = "7004dffec0cff3068828514eca72172274fd3f7d";
|
||||
sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
|
||||
};
|
||||
|
||||
buildInputs = [ dmd dub ];
|
||||
buildInputs = [ ldc dub ];
|
||||
|
||||
installPhase = "install -D bin/lit $out/bin/lit";
|
||||
|
||||
|
||||
@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
|
||||
};
|
||||
|
||||
buildInputs = [ tie ];
|
||||
# Remove references to __DATE__ and __TIME__
|
||||
postPatch = ''
|
||||
substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
|
||||
substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
|
||||
substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
|
||||
substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ tie ];
|
||||
|
||||
makeFlags = [
|
||||
"MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
|
||||
@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
"CP=cp"
|
||||
"RM=rm"
|
||||
"PDFTEX=echo"
|
||||
"CC=c++"
|
||||
"CC=${stdenv.cc.targetPrefix}c++"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rshell";
|
||||
version = "0.0.28";
|
||||
version = "0.0.30";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj";
|
||||
sha256 = "d2002d40d735204037d6142a6c2d51beecc763c124faaf759cabf7acd945be95";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial pyudev ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-fuzz";
|
||||
version = "0.8.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-fuzz";
|
||||
repo = "cargo-fuzz";
|
||||
rev = version;
|
||||
sha256 = "1d4bq9140bri8cd9zcxh5hhc51vr0s6jadjhwkp688w7k10rq7w8";
|
||||
sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr";
|
||||
cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
|
||||
platforms = platforms.linux;
|
||||
# error: 'snprintf' was not declared in this scope
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, libXdmcp, libXt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xlockmore-5.65";
|
||||
name = "xlockmore-5.66";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sillycycle.com/xlock/${name}.tar.xz";
|
||||
sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d";
|
||||
sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E=";
|
||||
curlOpts = "--user-agent 'Mozilla/5.0'";
|
||||
};
|
||||
|
||||
|
||||
@ -91,13 +91,7 @@ let
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "fwupd";
|
||||
# A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654
|
||||
# released with 1.5.6.
|
||||
# Fix for the regression: https://github.com/fwupd/fwupd/pull/2902
|
||||
# Maintainer says a new release is to be expected in a few days:
|
||||
# https://twitter.com/hughsient/status/1362476792297185289
|
||||
# In the mean time, please do not release 1.5.6 and go strait to 1.5.7
|
||||
version = "1.5.5";
|
||||
version = "1.5.7";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
@ -106,7 +100,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6";
|
||||
sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -189,6 +183,11 @@ let
|
||||
"-Defi-libdir=${gnu-efi}/lib"
|
||||
"-Defi-ldsdir=${gnu-efi}/lib"
|
||||
"-Defi-includedir=${gnu-efi}/include/efi"
|
||||
"-Defi_sbat_distro_id=nixos"
|
||||
"-Defi_sbat_distro_summary=NixOS"
|
||||
"-Defi_sbat_distro_pkgname=fwupd"
|
||||
"-Defi_sbat_distro_version=${version}"
|
||||
"-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||
@ -236,6 +235,8 @@ let
|
||||
contrib/get-version.py \
|
||||
contrib/generate-version-script.py \
|
||||
meson_post_install.sh \
|
||||
plugins/uefi-capsule/efi/generate_sbat.py \
|
||||
plugins/uefi-capsule/efi/generate_binary.py \
|
||||
po/make-images \
|
||||
po/make-images.sh \
|
||||
po/test-deps
|
||||
@ -250,8 +251,8 @@ let
|
||||
testFw = fetchFromGitHub {
|
||||
owner = "fwupd";
|
||||
repo = "fwupd-test-firmware";
|
||||
rev = "42b62c62dc85ecfb8e38099fe5de0625af87a722";
|
||||
sha256 = "XUpxE003DZSeLJMtyV5UN5CNHH89/nEVKpCbMStm91Q=";
|
||||
rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e";
|
||||
sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4=";
|
||||
};
|
||||
in ''
|
||||
# These files have weird licenses so they are shipped separately.
|
||||
@ -311,6 +312,7 @@ let
|
||||
# DisabledPlugins key in fwupd/daemon.conf
|
||||
defaultDisabledPlugins = [
|
||||
"test"
|
||||
"test_ble"
|
||||
"invalid"
|
||||
];
|
||||
|
||||
|
||||
@ -1,32 +1,32 @@
|
||||
{
|
||||
"4.14": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.225-hardened1.patch",
|
||||
"sha256": "1khdxny8jzvvhax10xq5kpbnhwrhfs7cxhi9f3rg4fa6c139pjbl",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.225-hardened1/linux-hardened-4.14.225-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.226-hardened1.patch",
|
||||
"sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.180-hardened1.patch",
|
||||
"sha256": "1wh01fwghgpbwkmndw5kkjbmav5iwmpk7g208jplhz6q6ymxfdbj",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.180-hardened1/linux-hardened-4.19.180-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.181-hardened1.patch",
|
||||
"sha256": "13j15nwmnzl1s17403icrpx9cdpfpzb5y1pnl6zaj5wsnjda7k5d",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.181-hardened1/linux-hardened-4.19.181-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.23-hardened1.patch",
|
||||
"sha256": "16mll5ayg7j0zdxciqa9m17zxv6kdm7vn1kp6bsl89nc301fxssc",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.23-hardened1/linux-hardened-5.10.23-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.24-hardened1.patch",
|
||||
"sha256": "0d2kwz01kgh43li6b76b7dhnx37hchzx99rk4h6jdz364272lh1p",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.24-hardened1/linux-hardened-5.10.24-hardened1.patch"
|
||||
},
|
||||
"5.11": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.11.6-hardened1.patch",
|
||||
"sha256": "0gl5irpqindz5d2pdhl0zzxx40xjqk591a20kyfjlnp3kjbg6nfj",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.6-hardened1/linux-hardened-5.11.6-hardened1.patch"
|
||||
"name": "linux-hardened-5.11.7-hardened1.patch",
|
||||
"sha256": "1d3rg722k796qh2zj97fyk30qak9i71yqy7mk2dpbmdpv0ksacax",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.7-hardened1/linux-hardened-5.11.7-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.105-hardened1.patch",
|
||||
"sha256": "1djp2cpsb6kgbz2xvix1p0hd7001qw5bnqigf4gz205pianbpakc",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.105-hardened1/linux-hardened-5.4.105-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.106-hardened1.patch",
|
||||
"sha256": "1hg18p1n26am6y2i459jrpnkq06rv0f5hds1znnm7jw4f61k395f",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.106-hardened1/linux-hardened-5.4.106-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.225";
|
||||
version = "4.14.226";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "09kik0jbfpijb4kylayphr8r2qxx4rlgsnmq300wzcjhxw5yxy3c";
|
||||
sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.180";
|
||||
version = "4.19.181";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0pxvnyhbcmbbkdrqsrf5hhaz36x9l07s0xmzrmc4ipcdhdy5va0x";
|
||||
sha256 = "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.261";
|
||||
version = "4.4.262";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0d9j4j72n8fl3s93qm82cydwk8lvwhvl2357rcsai2vsk5l0k1mc";
|
||||
sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.261";
|
||||
version = "4.9.262";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0r5822mj2gk9s8rbc8bazg34y8bwr7svn3nbgcq57y2qch8nych4";
|
||||
sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.23";
|
||||
version = "5.10.24";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0snvkrs95wbx611kcnap59whfiz6h6mzsnbwswk5py3gxh1irqpn";
|
||||
sha256 = "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.11.6";
|
||||
version = "5.11.7";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "02dcq7cqll5c39z8dh9f0xy68hh4a8jsab5k4n9calfldrm7jw79";
|
||||
sha256 = "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.105";
|
||||
version = "5.4.106";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1dmq1zkr4idbbvh7wln5hn5sl4d0mcfm1af5bvsmsa44c78lqki4";
|
||||
sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rspamd";
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rspamd";
|
||||
repo = "rspamd";
|
||||
rev = version;
|
||||
sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70";
|
||||
sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config perl ];
|
||||
|
||||
@ -131,7 +131,7 @@ let
|
||||
|
||||
fish = stdenv.mkDerivation rec {
|
||||
pname = "fish";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
# There are differences between the release tarball and the tarball GitHub
|
||||
@ -141,7 +141,7 @@ let
|
||||
# --version`), as well as the local documentation for all builtins (and
|
||||
# maybe other things).
|
||||
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";
|
||||
sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s=";
|
||||
};
|
||||
|
||||
# Fix FHS paths in tests
|
||||
@ -214,7 +214,7 @@ let
|
||||
|
||||
checkInputs = [
|
||||
coreutils
|
||||
(python3.withPackages(ps: [ps.pexpect]))
|
||||
(python3.withPackages (ps: [ ps.pexpect ]))
|
||||
procps
|
||||
];
|
||||
|
||||
|
||||
@ -11,8 +11,6 @@ attrs@{
|
||||
buildPhase ? ":",
|
||||
preInstall ? "",
|
||||
postInstall ? "",
|
||||
# name of the subdirectory in which to store the plugin
|
||||
installPath ? lib.getName pname,
|
||||
|
||||
checkInputs ? [],
|
||||
# plugin packages to add to the vendor paths of the test fish shell
|
||||
@ -26,7 +24,15 @@ attrs@{
|
||||
...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (attrs // {
|
||||
let
|
||||
# Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
|
||||
drvAttrs = builtins.removeAttrs attrs [
|
||||
"checkPlugins"
|
||||
"checkFunctionDirs"
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (drvAttrs // {
|
||||
inherit name;
|
||||
inherit unpackPhase configurePhase buildPhase;
|
||||
|
||||
|
||||
@ -1,16 +1,20 @@
|
||||
{ callPackage
|
||||
, cudatoolkit_10_1, cudatoolkit_10_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
|
||||
, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
|
||||
, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2
|
||||
}:
|
||||
|
||||
rec {
|
||||
|
||||
cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_10_1;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_10_1;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_10_2;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_10_2;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_10 =
|
||||
@ -20,14 +24,17 @@ rec {
|
||||
|
||||
cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_0;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_11_0;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_1;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_11_1;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_2;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_11 =
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, addOpenGLRunpath
|
||||
, cudatoolkit
|
||||
, cutensor_cudatoolkit
|
||||
}:
|
||||
|
||||
let
|
||||
@ -29,7 +30,7 @@ let
|
||||
cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.
|
||||
'';
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ obsidian-systems-maintainence ];
|
||||
maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
|
||||
};
|
||||
};
|
||||
in
|
||||
@ -48,4 +49,22 @@ in
|
||||
|
||||
sourceRoot = "cuSOLVER/gesv";
|
||||
});
|
||||
|
||||
cutensor = stdenv.mkDerivation (commonAttrs // {
|
||||
pname = "cuda-library-samples-cutensor";
|
||||
|
||||
src = "${src}/cuTENSOR";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
# CUTENSOR_ROOT is double escaped
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include"
|
||||
'';
|
||||
|
||||
CUTENSOR_ROOT = cutensor_cudatoolkit;
|
||||
});
|
||||
}
|
||||
|
||||
@ -46,6 +46,6 @@ stdenv.mkDerivation {
|
||||
description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
|
||||
# CUDA itself is proprietary, but these sample apps are not.
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ obsidian-systems-maintainence ];
|
||||
maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,11 +28,11 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.19.29"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
version = "1.19.30"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-d4PdFzIJSMJSpQta7JqCRwIkcgfh8XHgBKOEc/95r3w=";
|
||||
sha256 = "sha256-XD0CwBTDUvCTSL7JrcQCAd8zq+Ve0zSDpfz0Vzi8oeM=";
|
||||
};
|
||||
|
||||
# https://github.com/aws/aws-cli/issues/4837
|
||||
|
||||
55
pkgs/tools/archivers/rpm2targz/default.nix
Normal file
55
pkgs/tools/archivers/rpm2targz/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ bzip2
|
||||
, coreutils
|
||||
, cpio
|
||||
, fetchurl
|
||||
, gnutar
|
||||
, gzip
|
||||
, lib
|
||||
, stdenv
|
||||
, xz
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
shdeps = [
|
||||
bzip2
|
||||
coreutils
|
||||
cpio
|
||||
gnutar
|
||||
gzip
|
||||
xz
|
||||
zstd
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "rpm2targz";
|
||||
version = "2021.03.16";
|
||||
|
||||
# git repo: https://gitweb.gentoo.org/proj/rpm2targz.git/
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~vapier/dist/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
|
||||
};
|
||||
|
||||
buildInputs = shdeps;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
|
||||
# rpm2targz relies on the executable name
|
||||
# to guess what compressor it should use
|
||||
# this is more reliable than wrapProgram
|
||||
sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(prefix=$out)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert a .rpm file to a .tar.gz archive";
|
||||
homepage = "http://slackware.com/config/packages.php";
|
||||
license = licenses.bsd1;
|
||||
maintainers = with maintainers; [ zseri ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -14,13 +14,13 @@ let
|
||||
|
||||
arch = arch_table.${stdenv.system};
|
||||
sha = sha_table.${stdenv.system};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "essentia-extractor";
|
||||
version = "2.1_beta2";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
|
||||
url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
|
||||
sha256 = sha;
|
||||
};
|
||||
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
|
||||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
|
||||
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
|
||||
, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
|
||||
|
||||
assert stdenv.isDarwin -> ApplicationServices != null;
|
||||
, yacc, fetchpatch, xorg ? null, ApplicationServices }:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals optionalString;
|
||||
|
||||
21
pkgs/tools/misc/tea/default.nix
Normal file
21
pkgs/tools/misc/tea/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildGoModule, fetchgit }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tea";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitea.com/gitea/tea";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gitea official CLI client";
|
||||
homepage = "https://gitea.com/gitea/tea";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.j4m3s ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "assh";
|
||||
version = "2.11.0";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "advanced-ssh-config";
|
||||
owner = "moul";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/StB5yee9sbkebuJt6JDI+bp52NG0bBhprzmdepL+ek=";
|
||||
sha256 = "sha256-NH7Dmqsu7uRhKWGFHBnh5GGqsNFOijDxsc+ATt28jtY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0=";
|
||||
|
||||
@ -19,10 +19,9 @@ let
|
||||
requests
|
||||
websocket_client
|
||||
ipaddress
|
||||
backports_ssl_match_hostname
|
||||
docker_pycreds
|
||||
uptime
|
||||
];
|
||||
] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
|
||||
|
||||
# due to flake8
|
||||
doCheck = false;
|
||||
|
||||
@ -3,20 +3,17 @@
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, runtimeShell
|
||||
, iproute ? null
|
||||
, iproute
|
||||
, lzo
|
||||
, openssl
|
||||
, pam
|
||||
, useSystemd ? stdenv.isLinux
|
||||
, systemd ? null
|
||||
, util-linux ? null
|
||||
, systemd
|
||||
, util-linux
|
||||
, pkcs11Support ? false
|
||||
, pkcs11helper ? null
|
||||
, pkcs11helper
|
||||
}:
|
||||
|
||||
assert useSystemd -> (systemd != null);
|
||||
assert pkcs11Support -> (pkcs11helper != null);
|
||||
|
||||
with lib;
|
||||
let
|
||||
# Check if the script needs to have other binaries wrapped when changing this.
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, nixosTests
|
||||
, iptables ? null
|
||||
, iproute ? null
|
||||
, makeWrapper ? null
|
||||
, openresolv ? null
|
||||
, procps ? null
|
||||
, wireguard-go ? null
|
||||
, iptables
|
||||
, iproute
|
||||
, makeWrapper
|
||||
, openresolv
|
||||
, procps
|
||||
, wireguard-go
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireguard-tools";
|
||||
version = "1.0.20210315";
|
||||
@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
|
||||
--replace /usr/bin $out/bin
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
|
||||
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
|
||||
done
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
|
||||
done
|
||||
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
tests = nixosTests.wireguard;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Tools for the WireGuard secure network tunnel";
|
||||
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3
|
||||
, IOKit ? null }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsclite";
|
||||
@ -19,9 +18,9 @@ stdenv.mkDerivation rec {
|
||||
"--enable-usbdropdir=/var/lib/pcsc/drivers"
|
||||
"--enable-confdir=/etc"
|
||||
] ++ lib.optional stdenv.isLinux
|
||||
"--with-systemdsystemunitdir=\${out}/etc/systemd/system"
|
||||
++ lib.optional (!stdenv.isLinux)
|
||||
"--disable-libsystemd";
|
||||
"--with-systemdsystemunitdir=\${out}/etc/systemd/system"
|
||||
++ lib.optional (!stdenv.isLinux)
|
||||
"--disable-libsystemd";
|
||||
|
||||
postConfigure = ''
|
||||
sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ {
|
||||
@ -35,8 +34,10 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
buildInputs = [ python3 ]
|
||||
++ lib.optionals stdenv.isLinux [ udev dbus ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Middleware to access a smart card using SCard API (PC/SC)";
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thc-hydra";
|
||||
version = "9.1";
|
||||
version = "9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vanhauser-thc";
|
||||
repo = "thc-hydra";
|
||||
rev = "v${version}";
|
||||
sha256 = "1533h9z5jdlazwy0z7ll2753i507wq55by7rm9lh6y59889p0hps";
|
||||
sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
|
||||
@ -22,13 +22,13 @@ let
|
||||
++ recommendedDisplayInformationPrograms;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "inxi";
|
||||
version = "3.3.02-1";
|
||||
version = "3.3.03-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smxi";
|
||||
repo = "inxi";
|
||||
rev = version;
|
||||
sha256 = "sha256-hBFOJxmHtlowe/4AnIRnUVHFYPTjnMV6bswayGcoGlA=";
|
||||
sha256 = "sha256-OFjhMlBR1QUYUvpuFATCWZWZp2dop30Iz8qVCIK2UN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2633,6 +2633,8 @@ in
|
||||
|
||||
massren = callPackage ../tools/misc/massren { };
|
||||
|
||||
mat2 = with python3.pkgs; toPythonApplication mat2;
|
||||
|
||||
maxcso = callPackage ../tools/archivers/maxcso {};
|
||||
|
||||
medusa = callPackage ../tools/security/medusa { };
|
||||
@ -3543,6 +3545,18 @@ in
|
||||
|
||||
cudnn = cudnn_cudatoolkit_10;
|
||||
|
||||
cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
|
||||
inherit (cutensorPackages)
|
||||
cutensor_cudatoolkit_10
|
||||
cutensor_cudatoolkit_10_1
|
||||
cutensor_cudatoolkit_10_2
|
||||
cutensor_cudatoolkit_11
|
||||
cutensor_cudatoolkit_11_0
|
||||
cutensor_cudatoolkit_11_1
|
||||
cutensor_cudatoolkit_11_2;
|
||||
|
||||
cutensor = cutensor_cudatoolkit_10;
|
||||
|
||||
curlFull = curl.override {
|
||||
ldapSupport = true;
|
||||
};
|
||||
@ -7742,6 +7756,8 @@ in
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
|
||||
rpm2targz = callPackage ../tools/archivers/rpm2targz { };
|
||||
|
||||
rpmextract = callPackage ../tools/archivers/rpmextract { };
|
||||
|
||||
rrdtool = callPackage ../tools/misc/rrdtool { };
|
||||
@ -8408,6 +8424,8 @@ in
|
||||
|
||||
tdns-cli = callPackage ../tools/networking/tdns-cli { };
|
||||
|
||||
tea = callPackage ../tools/misc/tea { };
|
||||
|
||||
ted = callPackage ../tools/typesetting/ted { };
|
||||
|
||||
teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { };
|
||||
@ -12426,7 +12444,7 @@ in
|
||||
ffuf = callPackage ../tools/security/ffuf { };
|
||||
|
||||
flow = callPackage ../development/tools/analysis/flow {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_09;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
@ -15697,6 +15715,8 @@ in
|
||||
|
||||
libsearpc = callPackage ../development/libraries/libsearpc { };
|
||||
|
||||
libseat = callPackage ../development/libraries/libseat { };
|
||||
|
||||
libsigcxx = callPackage ../development/libraries/libsigcxx { };
|
||||
|
||||
libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
|
||||
@ -23897,6 +23917,8 @@ in
|
||||
|
||||
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
|
||||
|
||||
metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { };
|
||||
|
||||
metersLv2 = callPackage ../applications/audio/meters_lv2 { };
|
||||
|
||||
mhwaveedit = callPackage ../applications/audio/mhwaveedit {
|
||||
|
||||
@ -9143,10 +9143,6 @@ let
|
||||
};
|
||||
buildInputs = [ pkgs.gtk3 ];
|
||||
propagatedBuildInputs = [ Readonly Gtk3 ];
|
||||
# Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22.
|
||||
# See https://github.com/carygravel/gtk3-imageview/issues/19 and
|
||||
# https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659.
|
||||
doCheck = false;
|
||||
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
|
||||
checkPhase = ''
|
||||
${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
|
||||
@ -16756,6 +16752,11 @@ let
|
||||
preConfigure =
|
||||
''
|
||||
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
|
||||
|
||||
# Enable HDRI support to match the native ImageMagick 7 defaults
|
||||
# See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
|
||||
substituteInPlace Makefile.PL \
|
||||
--replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -1603,6 +1603,7 @@ in {
|
||||
cudatoolkit = pkgs.cudatoolkit_10_0;
|
||||
cudnn = pkgs.cudnn_cudatoolkit_10_0;
|
||||
nccl = pkgs.nccl_cudatoolkit_10;
|
||||
cutensor = pkgs.cutensor_cudatoolkit_10;
|
||||
};
|
||||
|
||||
curio = callPackage ../development/python-modules/curio { };
|
||||
@ -4126,6 +4127,8 @@ in {
|
||||
|
||||
mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };
|
||||
|
||||
mat2 = callPackage ../development/python-modules/mat2 { };
|
||||
|
||||
matchpy = callPackage ../development/python-modules/matchpy { };
|
||||
|
||||
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
|
||||
@ -8984,6 +8987,8 @@ in {
|
||||
|
||||
yt = callPackage ../development/python-modules/yt { };
|
||||
|
||||
ytmusicapi = callPackage ../development/python-modules/ytmusicapi { };
|
||||
|
||||
yubico-client = callPackage ../development/python-modules/yubico-client { };
|
||||
|
||||
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user