mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 23:23:07 +00:00
Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
58e496e649
@ -66,22 +66,31 @@ rec {
|
||||
*/
|
||||
makeOverridable = f: origArgs:
|
||||
let
|
||||
ff = f origArgs;
|
||||
result = f origArgs;
|
||||
|
||||
# Creates a functor with the same arguments as f
|
||||
copyArgs = g: lib.setFunctionArgs g (lib.functionArgs f);
|
||||
# Changes the original arguments with (potentially a function that returns) a set of new attributes
|
||||
overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs);
|
||||
|
||||
# Re-call the function but with different arguments
|
||||
overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs));
|
||||
# Change the result of the function call by applying g to it
|
||||
overrideResult = g: makeOverridable (copyArgs (args: g (f args))) origArgs;
|
||||
in
|
||||
if builtins.isAttrs ff then (ff // {
|
||||
override = newArgs: makeOverridable f (overrideWith newArgs);
|
||||
overrideDerivation = fdrv:
|
||||
makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
|
||||
${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv:
|
||||
makeOverridable (args: (f args).overrideAttrs fdrv) origArgs;
|
||||
})
|
||||
else if lib.isFunction ff then {
|
||||
override = newArgs: makeOverridable f (overrideWith newArgs);
|
||||
__functor = self: ff;
|
||||
overrideDerivation = throw "overrideDerivation not yet supported for functors";
|
||||
}
|
||||
else ff;
|
||||
if builtins.isAttrs result then
|
||||
result // {
|
||||
override = overrideArgs;
|
||||
overrideDerivation = fdrv: overrideResult (x: overrideDerivation x fdrv);
|
||||
${if result ? overrideAttrs then "overrideAttrs" else null} = fdrv:
|
||||
overrideResult (x: x.overrideAttrs fdrv);
|
||||
}
|
||||
else if lib.isFunction result then
|
||||
# Transform the result into a functor while propagating its arguments
|
||||
lib.setFunctionArgs result (lib.functionArgs result) // {
|
||||
override = overrideArgs;
|
||||
}
|
||||
else result;
|
||||
|
||||
|
||||
/* Call the package function in the file `fn' with the required
|
||||
|
||||
@ -2179,12 +2179,6 @@
|
||||
githubId = 2817965;
|
||||
name = "f--t";
|
||||
};
|
||||
fleaz = {
|
||||
email = "mail@felixbreidenstein.de";
|
||||
github = "fleaz";
|
||||
githubId = 2489598;
|
||||
name = "Felix Breidenstein";
|
||||
};
|
||||
fadenb = {
|
||||
email = "tristan.helmich+nixos@gmail.com";
|
||||
github = "fadenb";
|
||||
|
||||
@ -22,6 +22,7 @@ repair=
|
||||
profile=/nix/var/nix/profiles/system
|
||||
buildHost=
|
||||
targetHost=
|
||||
maybeSudo=
|
||||
|
||||
while [ "$#" -gt 0 ]; do
|
||||
i="$1"; shift 1
|
||||
@ -96,6 +97,9 @@ while [ "$#" -gt 0 ]; do
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -n "$SUDO_USER" ]; then
|
||||
maybeSudo="sudo "
|
||||
fi
|
||||
|
||||
if [ -z "$buildHost" -a -n "$targetHost" ]; then
|
||||
buildHost="$targetHost"
|
||||
@ -111,9 +115,9 @@ buildHostCmd() {
|
||||
if [ -z "$buildHost" ]; then
|
||||
"$@"
|
||||
elif [ -n "$remoteNix" ]; then
|
||||
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$@"
|
||||
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$maybeSudo$@"
|
||||
else
|
||||
ssh $SSHOPTS "$buildHost" "$@"
|
||||
ssh $SSHOPTS "$buildHost" "$maybeSudo$@"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -121,7 +125,7 @@ targetHostCmd() {
|
||||
if [ -z "$targetHost" ]; then
|
||||
"$@"
|
||||
else
|
||||
ssh $SSHOPTS "$targetHost" "$@"
|
||||
ssh $SSHOPTS "$targetHost" "$maybeSudo$@"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -10,6 +10,12 @@ in
|
||||
services.lidarr = {
|
||||
enable = mkEnableOption "Lidarr";
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/lidarr/.config/Lidarr";
|
||||
description = "The directory where Lidarr stores its data files.";
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.lidarr;
|
||||
@ -44,6 +50,10 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
|
||||
systemd.services.lidarr = {
|
||||
description = "Lidarr";
|
||||
after = [ "network.target" ];
|
||||
@ -53,11 +63,8 @@ in
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ExecStart = "${cfg.package}/bin/Lidarr";
|
||||
ExecStart = "${cfg.package}/bin/Lidarr -nobrowser -data='${cfg.dataDir}'";
|
||||
Restart = "on-failure";
|
||||
|
||||
StateDirectory = "lidarr";
|
||||
StateDirectoryMode = "0770";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
py = python3Packages;
|
||||
in py.buildPythonApplication rec {
|
||||
pname = "friture";
|
||||
version = "0.36";
|
||||
version = "0.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlecomte";
|
||||
repo = "friture";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1pz8v0qbzqq3ig9w33cp027s6c8rj316x5sy8pqs5nsiny9ddnk6";
|
||||
sha256 = "1ivy5qfd90w1s1icsphvvdnnqz563v3fhg5pws2zn4483cgnzc2y";
|
||||
};
|
||||
|
||||
# module imports scipy.misc.factorial, but it has been removed since scipy
|
||||
@ -37,8 +37,9 @@ in py.buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A real-time audio analyzer";
|
||||
homepage = http://friture.org/;
|
||||
homepage = "http://friture.org/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux; # fails on Darwin
|
||||
maintainers = [ maintainers.laikq ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsp-plugins";
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sadko4u";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2";
|
||||
sha256 = "09gmwzh1gq1q2lxn8fc1bpdh02h8vr7r0i040c1nx256wgfsarqb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig php expat ];
|
||||
@ -154,6 +154,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://lsp-plug.in;
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
30
pkgs/applications/audio/waon/default.nix
Normal file
30
pkgs/applications/audio/waon/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate
|
||||
, libsndfile, ncurses, pkgconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waon";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kichiki";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ fftw gtk2 libao libsamplerate libsndfile ncurses ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin waon pv gwaon
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Wave-to-Notes transcriber";
|
||||
homepage = https://kichiki.github.io/WaoN/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.puckipedia ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -4,14 +4,14 @@ with stdenv.lib;
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "neovim-remote";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
disabled = !pythonPackages.isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhinz";
|
||||
repo = "neovim-remote";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f9x053yr8wq35l2s2dsnb0iygd4g4yya2h3iv0yh3440jjj5vfj";
|
||||
sha256 = "129yjpwn6480rd5na866h4mcr6rf60rqv651hks5fn3ws112n751";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
|
||||
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "texmaker";
|
||||
version = "5.0.3";
|
||||
|
||||
@ -13,14 +13,15 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig poppler qmake ];
|
||||
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
|
||||
|
||||
preConfigure = ''
|
||||
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo"
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"DESKTOPDIR=${placeholder "out"}/share/applications"
|
||||
"ICONDIR=${placeholder "out"}/share/pixmaps"
|
||||
"METAINFODIR=${placeholder "out"}/share/metainfo"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "TeX and LaTeX editor";
|
||||
longDescription=''
|
||||
This editor is a full fledged IDE for TeX and
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.8-66";
|
||||
sha256 = "0wih8ag5i6qg2zhbjrlcripb5ic5l6i1z04chnlgykb84n5pcirv";
|
||||
version = "7.0.8-68";
|
||||
sha256 = "07p3gdqdfmip7066n8v7ark8kgffg7miiin814lj4zg6p3h0aja7";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}:
|
||||
|
||||
let
|
||||
allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
|
||||
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
|
||||
selectedPlugins = if plugins == null then allPlugins else plugins;
|
||||
extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
|
||||
versionBranch = stdenv.lib.versions.majorMinor gimp.version;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipe-7.2.12";
|
||||
name = "ipe-7.2.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
|
||||
sha256 = "1qw1cmwzi3wxk4x916i9y4prhi9brnwl14i9a1cbw23x1sr7i6kw";
|
||||
sha256 = "1a6a88r7j5z01z6k1z72a8g3n6lxdjjxxkdrzrfdd6df2gbs6g5g";
|
||||
};
|
||||
|
||||
sourceRoot = "${name}/src";
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kodelife";
|
||||
version = "0.8.5.99";
|
||||
version = "0.8.6.101";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip";
|
||||
sha256 = "189i2j6kaygjb5pccynxv4pwqpy67jf9nfi7fjfhbrmjpqnmkp90";
|
||||
sha256 = "1ldab1famdcby2djfys657g85d46s8k96m6mr71riw4v336ar238";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff -ru3 cdrtools-3.01-old/DEFAULTS/Defaults.linux cdrtools-3.01/DEFAULTS/Defaults.linux
|
||||
--- cdrtools-3.01-old/DEFAULTS/Defaults.linux 2015-12-11 17:37:21.505848835 +0300
|
||||
+++ cdrtools-3.01/DEFAULTS/Defaults.linux 2015-12-11 17:37:32.155828925 +0300
|
||||
@@ -57,7 +57,8 @@
|
||||
# Installation config stuff
|
||||
#
|
||||
###########################################################################
|
||||
-INS_BASE= /opt/schily
|
||||
+#INS_BASE= /opt/schily
|
||||
+INS_BASE= $(out)
|
||||
INS_KBASE= /
|
||||
INS_RBASE= /
|
||||
#
|
||||
Only in cdrtools-3.01/DEFAULTS: Defaults.linux.orig
|
||||
diff -ru3 cdrtools-3.01-old/RULES/rules.prg cdrtools-3.01/RULES/rules.prg
|
||||
--- cdrtools-3.01-old/RULES/rules.prg 2015-12-11 17:37:21.500848844 +0300
|
||||
+++ cdrtools-3.01/RULES/rules.prg 2015-12-11 17:38:29.890720987 +0300
|
||||
@@ -43,10 +43,10 @@
|
||||
#
|
||||
#SHELL= /bin/sh
|
||||
|
||||
-LN= /bin/ln
|
||||
-SYMLINK= /bin/ln -s
|
||||
-RM= /bin/rm
|
||||
-MV= /bin/mv
|
||||
+LN= ln
|
||||
+SYMLINK= ln -s
|
||||
+RM= rm
|
||||
+MV= mv
|
||||
LORDER= lorder
|
||||
TSORT= tsort
|
||||
CTAGS= vctags
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "josm";
|
||||
version = "15322";
|
||||
version = "15390";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "1i6cxs6rvqjwh7yfji5701xdzpnaxcv97gsd692fjrwasnsx1f1i";
|
||||
sha256 = "1wxncd3mjd4j14svgpmvrxc0nkzfkpn0xlci7m7wp9hfp1l81v9f";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk11 makeWrapper ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -100,10 +100,10 @@ rec {
|
||||
|
||||
firefox-esr-68 = common rec {
|
||||
pname = "firefox-esr";
|
||||
ffversion = "68.1.0esr";
|
||||
ffversion = "68.2.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "0n8iy9xwf8wldkknq3y3nlm0cmb48baamvz4wmmbpfb2kfrxbsj3wnnd9ayk9zxhrsdq0na9gvkc374mv06nyqijrahd67wljv08fx5";
|
||||
sha512 = "3p4gic3nlz1rxfc64xnv6vgfvf84w8752vpkdc1sfl3qx0w05q5d23rsvmkm8nb45bnsq3ch3jsrsh4p6fan4k9hvmzv8zgp6k2qlpn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.29.1";
|
||||
version = "0.29.2";
|
||||
pname = "notmuch";
|
||||
|
||||
passthru = {
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq";
|
||||
sha256 = "1pjmrnbn0iavm5pnw7wgfw5d6hg5i6miqfa6s7s4027vn94n3nhv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.20190410";
|
||||
version = "1.0.20190902";
|
||||
pname = "dcm2niix";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rordenlab";
|
||||
repo = "dcm2niix";
|
||||
rev = "v${version}";
|
||||
sha256 = "1prwpvbi76xlpkhc4kadjhyyx0s71cs30hi6anknhfm6hdyd26ms";
|
||||
sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.20.8";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "01bibkwyp4xzwcpvkr3ab6z0syjmzj4zmyxl3bybmrp9irhjvydg";
|
||||
sha256 = "0knfx0by7rml19kr5ynb7860iykij1z1mx2hx0bg3s287sld1ppl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -17,14 +17,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.29.53";
|
||||
version = "14.29.54";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "0wdkiprccgvc5nh6h616l282fbd5mx5z3aiq2y558qa4gn22nqrq";
|
||||
sha256 = "0f4a50rkba8g19d4vm4my0alc10g6p4myn7nqbjlcawx3z8k1dpb";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nauty";
|
||||
version = "26r11";
|
||||
version = "26r12";
|
||||
src = fetchurl {
|
||||
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
|
||||
sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
|
||||
sha256 = "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6";
|
||||
};
|
||||
outputs = [ "out" "dev" ];
|
||||
configureFlags = {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "1.13.7";
|
||||
version = "1.13.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "019pnf0g2dzdrbmckd96xq9md1qh8r5bwfj02qjrdg228lc9hzv4";
|
||||
sha256 = "0acsvrc45kdwpj5mi5i61mibr1fdx4g4835c3b8x0fdgrya4n37c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
31
pkgs/applications/virtualization/dumb-init/default.nix
Normal file
31
pkgs/applications/virtualization/dumb-init/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub, glibc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dumb-init";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yelp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "15hgl8rz5dmrl5gx21sq5269l1hq539qn68xghjx0bv9hgbx0g20";
|
||||
};
|
||||
|
||||
buildInputs = [ glibc.static ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin dumb-init
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A minimal init system for Linux containers";
|
||||
homepage = "https://github.com/Yelp/dumb-init";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -34,7 +34,7 @@ mkDerivation rec {
|
||||
# The Qt5 platforms plugin is vendored in the package, however what's there is not always up-to-date with what's in nixpkgs.
|
||||
# We simply copy the headers from qtbase's source tarball.
|
||||
mkdir -p platformplugin/libqt5xcbqpa-dev/${qtbase.version}
|
||||
cp -r ../qtbase-everywhere-src-5.12.4/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/
|
||||
cp -r ../qtbase-everywhere-src-${qtbase.version}/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, vala
|
||||
, vala_0_44
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, libcanberra
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
vala
|
||||
vala_0_44 # https://github.com/elementary/files/issues/1081
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
||||
@ -27,9 +27,23 @@ let
|
||||
The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
|
||||
`package/nix/build.sh`
|
||||
*/
|
||||
#elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {}));
|
||||
elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: {
|
||||
# GHC 8.8.1 support
|
||||
# https://github.com/avh4/elm-format/pull/640
|
||||
patches = [(
|
||||
fetchpatch {
|
||||
url = "https://github.com/turboMaCk/elm-format/commit/4f4abdc7117ed6ce3335f6cf39b6495b48067b7c.patch";
|
||||
sha256 = "1zqk6q6w0ph12mnwffgwzf4h1hcgqg0v09ws9q2g5bg2riq4rvd9";
|
||||
}
|
||||
)];
|
||||
# Tests are failing after upgrade to ghc881.
|
||||
# Cause is probably just a minor change in stdout output
|
||||
# see https://github.com/avh4/elm-format/pull/640
|
||||
doCheck = false;
|
||||
jailbreak = true;
|
||||
}));
|
||||
elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: {
|
||||
prePatch = ''
|
||||
prePatch = ''
|
||||
substituteInPlace package.yaml --replace "- -Werror" ""
|
||||
hpack
|
||||
'';
|
||||
|
||||
@ -6322,7 +6322,6 @@ broken-packages:
|
||||
- incremental-computing
|
||||
- incremental-maps
|
||||
- increments
|
||||
- indents
|
||||
- indexation
|
||||
- IndexedList
|
||||
- indextype
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janet";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janet-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p";
|
||||
sha256 = "0xszmgw5nl5b6gd3344h1mic1c1a3hj7nivp4d9hqzzh131qvbn5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.12.7";
|
||||
version = "0.12.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "0panmhrg1i158xbvqvq3s3217smbj7ynwlaiks18pmss36xx9dk4";
|
||||
sha256 = "19n2pzs045mflyzgq3cpa4w2fbd0f77j5k6c4yc3gk0mcwgdxhs2";
|
||||
};
|
||||
|
||||
modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
|
||||
|
||||
@ -46,7 +46,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "racket";
|
||||
version = "7.3"; # always change at once with ./minimal.nix
|
||||
version = "7.4"; # always change at once with ./minimal.nix
|
||||
|
||||
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
|
||||
fetchurl {
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
}
|
||||
)) {
|
||||
inherit ;name = "${pname}-${version}";
|
||||
sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
|
||||
sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
|
||||
};
|
||||
|
||||
FONTCONFIG_FILE = fontsConf;
|
||||
|
||||
@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
|
||||
name = "racket-minimal-${oldAttrs.version}";
|
||||
src = oldAttrs.src.override {
|
||||
inherit name;
|
||||
sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj";
|
||||
sha256 = "0ixha4hcxlrsqjszjlr7xv6nn3mc5pb6szlbn4cq0880avakmml7";
|
||||
};
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "9.700.2";
|
||||
version = "9.800.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "1g88mizzkza91v51fz174gg0700f6y6snshplffpqw2gjx42ngwj";
|
||||
sha256 = "1vnshgkz4d992kk2fwqigqfx7gx3145ryb8d2794hn2667h5gkzb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, cmake, vtk, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.2";
|
||||
version = "3.0.4";
|
||||
pname = "gdcm";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1kvgyci5wjsn16lwjriml10ci8h1a5ixygzcnif9c29xamxrbaif";
|
||||
sha256 = "0g46l7fjvn37sg29m0nb7wlnnpnxmlm9ryp7vam26ni02l73paid";
|
||||
};
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "19.2";
|
||||
version = "19.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "118cg1grzm62lppaygvh7mgxn23bicjkwjwpxhbyqs9g6yhdj3p8";
|
||||
sha256 = "1vzh11qr7dwmi3d10nq46k754h3q1yya71nk2jgicaj2mm0ylzx6";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leatherman";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1k70fx9i4prw0vp5680ijs1ldbwd7gmvpav7jfqvpbcm3zblkc23";
|
||||
sha256 = "0iizy20pdkbnsfj6bzrkkj7faizc85lcpkpandvnxfybiq7j60iw";
|
||||
rev = version;
|
||||
repo = "leatherman";
|
||||
owner = "puppetlabs";
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
_name = "liblockfile";
|
||||
version = "1.15";
|
||||
version = "1.16";
|
||||
name = "${_name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz";
|
||||
sha256 = "04ml9isvdl72fbr1825x7jb680xp8aprdq4pag32ahyjqk909cmh";
|
||||
sha256 = "0s8wj3y6mf1g47nvinkkm5avmqz0z6yxmdrnxpjwgz6krql3hvng";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmesode";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boothj5";
|
||||
repo = "libmesode";
|
||||
rev = version;
|
||||
sha256 = "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak";
|
||||
sha256 = "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "1.18.0";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ib12i2491piwiz0g5n5izr5jmn5fhwzicq97vfki3r7wrdb54mz";
|
||||
sha256 = "099qwla0yl76qw16lzdx33svyhx84p5gsa50ksy4828b18fy3bgb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mimalloc-${version}";
|
||||
version = "1.0.8";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "mimalloc";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5";
|
||||
sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nlohmann_json";
|
||||
version = "3.6.1";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z";
|
||||
sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -18,10 +18,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
|
||||
"-DJSON_MultipleHeaders=ON"
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
|
||||
postInstall = "rm -rf $out/lib64";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Header only C++ library for the JSON file format";
|
||||
homepage = https://github.com/nlohmann/json;
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
pname = "openvdb";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dreamworksanimation";
|
||||
repo = "openvdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ms7jmx9nsza46bky42vyb6n6p29kfjfidqg51kccvirzi07crvq";
|
||||
sha256 = "1ypkzdkgsbcczfvrqblnxfzm13w0mdkskgqmgvmbfi66vpaazdrf";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
|
||||
, sqlite, isPyPy }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apsw";
|
||||
version = "3.22.0-r1";
|
||||
version = "3.29.0-r1";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
@ -11,11 +11,19 @@ buildPythonPackage rec {
|
||||
owner = "rogerbinns";
|
||||
repo = "apsw";
|
||||
rev = version;
|
||||
sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak";
|
||||
sha256 = "1p3sgmk9qwd0a634lirva44qgpyq0a74r9d70wxb6hsa52yjj9xb";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
patches = [
|
||||
# Fixes a test failure with sqlite 3.30, see https://github.com/rogerbinns/apsw/issues/275
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rogerbinns/apsw/commit/13df0b57bff59542978abf7c0a440c9274e3aac3.diff";
|
||||
sha256 = "1wi1mfis2mr21389wdnvq44phg0bpm5vpwmxhvrj211vwfm0q7dv";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Python wrapper for the SQLite embedded relational database engine";
|
||||
homepage = https://github.com/rogerbinns/apsw;
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-authorization";
|
||||
version = "0.52.0";
|
||||
version = "0.60.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
|
||||
sha256 = "19yn2ar2y8j4idzf8mxrxplxnawbk83sid3pzvzddif29aipbs1i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-datafactory";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7a50da8415e316bd3be0c90ff7e2bffee2afb959aefea23b5923f22dd7094a37";
|
||||
sha256 = "0rv3443h4f9n88ky0fkfrp6jhf7ck9w3v96q040g3c2vkkywsnwa";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-devspaces";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "4710dd59fc219ebfa4272dbbad58bf62093b52ce22bfd32a5c0279d2149471b5";
|
||||
sha256 = "0dvjsr9i87j1ggbj3dcmgifpk64xr5f5ziwf7z1fwkcx0szcid7k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-hanaonazure";
|
||||
version = "0.6.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1spsy6g5z4nb1y1gfz0p1ykybi76qbig8j22zvmws59329b3br5h";
|
||||
sha256 = "01gnrhwi3nswjdxk9fjjwbyyx83agpdksrksk0c4d7bm9p2871g6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-iothub";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq";
|
||||
sha256 = "19gcvmcd0r9xi2i3m800h3ak0mkf9yj64d55z7nrk25v3ksx0wrl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.0.0";
|
||||
version = "6.0.0";
|
||||
pname = "azure-mgmt-network";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "03ymxm3ryhgh4f1pw00fiyb3lxv2w6nkvn8xnj91h8xdd34flqzc";
|
||||
sha256 = "07ak0qqa0fw79mrwpf4isfirrsv1simggi5hfrn856vngrszcx84";
|
||||
};
|
||||
|
||||
postInstall = if isPy3k then "" else ''
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-reservations";
|
||||
version = "0.3.2";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "0nksxjh5kh09dr0zw667fg8mzik4ymvfq3dipwag6pynbqr9ls4l";
|
||||
sha256 = "06l362xiqhk8vvb1pch6ngfyv8m00ahr6ysdznd6qvxz8awazy10";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-sql";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "184jma28nyn4c52mjj0g0p6rci6kajsdjqy8mbdaisphpjl4f77l";
|
||||
sha256 = "109w1kj45fvwc94bkhdkj3bdysrskfz8i6ph4qlpjk340zy81vvl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
pname = "azure-mgmt-storage";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1src3ki3xd8x0m6vmxig6y4lg7w4mg0sz6vmnsxdk8mxaird03jj";
|
||||
sha256 = "02a7f5vpaypr2lrayay4i9m7sf7d6galqwjz5wj549vq85jdq5ny";
|
||||
};
|
||||
|
||||
postInstall = if isPy3k then "" else ''
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-subscription";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7a095fe46e598210b178e1059bba82eb02f3b8a7f44f3791442ff7d9ff323d2b";
|
||||
sha256 = "1w91zqi2icld76mcrz0kwq0adb1nr83yqdq6qp1p1445p914qjsh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-servicefabric";
|
||||
version = "6.4.0.0";
|
||||
version = "6.5.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "f049e8c4a179f1277f2ec60158f88caf14a50f7df491fc6841e360cd61746da1";
|
||||
sha256 = "02q32rc3vmg3kpi92s2y2ic47s3mi9qjcvzvrpjdlzji8lhd9w45";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole-transit-relay";
|
||||
version = "0.1.2";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b13f1bfab295150b25958014d93fcd9f744d92011d186d7381575465587b8587";
|
||||
sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ twisted ];
|
||||
|
||||
@ -2,22 +2,23 @@
|
||||
, requests, filetype, pyparsing, configparser, arxiv2bib
|
||||
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
|
||||
, pylibgen, click, python-slugify, habanero, isbnlib
|
||||
, prompt_toolkit, pygments
|
||||
, prompt_toolkit, pygments, stevedore, tqdm, lxml
|
||||
, python-doi, isPy3k
|
||||
#, optional, dependencies
|
||||
, jinja2, whoosh, pytest
|
||||
, whoosh, pytest
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "papis";
|
||||
version = "0.8.2";
|
||||
version = "0.9";
|
||||
|
||||
# Missing tests on Pypi
|
||||
src = fetchFromGitHub {
|
||||
owner = "papis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb";
|
||||
sha256 = "kzA8nlglbjHDPEB7HRAY2dza1Umn/OYUu+ydbA1OJ5Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -25,10 +26,14 @@ buildPythonPackage rec {
|
||||
pyyaml chardet beautifulsoup4 colorama bibtexparser
|
||||
pylibgen click python-slugify habanero isbnlib
|
||||
prompt_toolkit pygments
|
||||
stevedore tqdm lxml
|
||||
python-doi
|
||||
# optional dependencies
|
||||
jinja2 whoosh
|
||||
whoosh
|
||||
];
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkInputs = ([
|
||||
@ -42,7 +47,8 @@ buildPythonPackage rec {
|
||||
# fail with 5.x
|
||||
checkPhase = ''
|
||||
HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \
|
||||
-k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url and not test_export_yaml and not test_citations"
|
||||
-k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \
|
||||
and not test_validate_arxivid and not test_downloader_getter"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, contexter
|
||||
, jinja2
|
||||
, pytest
|
||||
, pip
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -17,7 +18,7 @@ buildPythonPackage rec {
|
||||
sha256 = "ec9a71e09ac7f43cc7b6c9d386384eb7b5c331bf6ea0e72ca559d87979397a95";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click configobj contexter jinja2 pytest ];
|
||||
propagatedBuildInputs = [ click configobj contexter pip jinja2 pytest ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s/'pip>=8,<10'/'pip'/" setup.py
|
||||
@ -27,6 +28,9 @@ buildPythonPackage rec {
|
||||
# tests not included with pypi release
|
||||
doCheck = false;
|
||||
|
||||
# Requires an old pip version
|
||||
broken = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Generate Nix expressions for Python packages";
|
||||
homepage = https://github.com/johbo/pip2nix;
|
||||
|
||||
21
pkgs/development/python-modules/python-doi/default.nix
Normal file
21
pkgs/development/python-modules/python-doi/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-doi";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "papis";
|
||||
repo = "python-doi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wa5inh2a0drjswrnhjv6m23mvbfdgqj2jb8fya7q0armzp7l6fr";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python library to work with Document Object Identifiers (doi)";
|
||||
homepage = https://github.com/alejandrogallo/python-doi;
|
||||
maintainers = with maintainers; [ teto ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.109.0";
|
||||
version = "0.110.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0wfhy7r85s2bxhfkmcdp7p1gaqjxr4yzay52k680hv6ghhay2318";
|
||||
sha256 = "0w0z4pgwwvi12kvfg5xdjc83qw030a0c58cgr5rz3xzw2pgbdfm2";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wata727";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dma1nav6z9919lj4f7cqcf8h12l4gbwn24323y18l57zv988331";
|
||||
sha256 = "1vwv6gkzrs5nv5a278siwza2ifwqy08rmcdddx275crcjkz3bv53";
|
||||
};
|
||||
|
||||
modSha256 = "1xjxaszpxv9k9s27y1i54cnp0ip47bq4ad2ziq7n8nb76zxw03mx";
|
||||
modSha256 = "048mh6zr1fkz5bcxg27d0s472ig9xcq0zgbqpxspkvkdxxw9iizf";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "12.3.0";
|
||||
version = "12.4.0";
|
||||
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
|
||||
docker_x86_64 = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
|
||||
sha256 = "11xbz24811vi3l1dwhyqv3mypawrky85qjsg6aaigfv8zj9l2xmi";
|
||||
sha256 = "0x0i60l8w3iwf7kn1wi8hh87cc3rvxixi2bizd5807aw22g9z5pd";
|
||||
};
|
||||
|
||||
docker_arm = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
|
||||
sha256 = "04gfhlm32wrdq0s9blmfknpcnmr30vrnd7afib1lfbzbdl99g4sx";
|
||||
sha256 = "1a2z2m4c2cixibjgh6xv9yi760n10v374nb9jl2pf62rlpqkwz83";
|
||||
};
|
||||
in
|
||||
buildGoPackage rec {
|
||||
@ -29,7 +29,7 @@ buildGoPackage rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "155im9sybkldh0rx34j9fm3qg95dm5q3jcjjx635b7fwq1wyl7c7";
|
||||
sha256 = "0sdf3w5iq08dyhn2b9rz0sssxq4yfbki2z834z5l02wzjl8h2nk6";
|
||||
};
|
||||
|
||||
patches = [ ./fix-shell-path.patch ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ktlint";
|
||||
version = "0.34.2";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
|
||||
sha256 = "1v1s4y8ads2s8hjsjacxni1j0dbmnhilhnfs0xabr3aljqs15wb2";
|
||||
sha256 = "0zj18wcapnqny7k4wvwkyjfds6l2f4y22w6a84k06rzih2ghv0gm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-tools";
|
||||
version = "2.10.7";
|
||||
version = "2.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd";
|
||||
sha256 = "03dkwvmiqbr7dcnrk8hw8xd9i0vrx6xxz8wal56mfypxz52i2jk6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, flake8
|
||||
, certifi
|
||||
, setuptools
|
||||
, invoke
|
||||
, parver
|
||||
, pip
|
||||
@ -21,23 +22,18 @@ buildPythonApplication rec {
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
nativeBuildInputs = [ invoke parver ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flake8
|
||||
invoke
|
||||
parver
|
||||
certifi
|
||||
setuptools
|
||||
pip
|
||||
requests
|
||||
virtualenv
|
||||
virtualenv-clone
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set PYTHONPATH \".:$PYTHONPATH\""
|
||||
"--set PIP_IGNORE_INSTALLED 1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Development Workflow for Humans";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "health-check";
|
||||
version = "0.03.02";
|
||||
version = "0.03.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "12n2qp5lrlahkgrkwy3mjm0nscz6yhhh80z4xmd2n96pn8f3d4hh";
|
||||
sha256 = "1bvgfzmvbqqhf1ailbwrsma6sbp5wcl6a35pb1n0y1n1p1hnqzph";
|
||||
};
|
||||
|
||||
buildInputs = [ json_c libbsd ];
|
||||
|
||||
@ -154,6 +154,6 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
homepage = https://home-assistant.io/;
|
||||
description = "Open-source home automation platform running on Python 3";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fleaz dotlambda globin ];
|
||||
maintainers = with maintainers; [ dotlambda globin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
|
||||
pname = "icingaweb2";
|
||||
version = "2.7.1";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icingaweb2";
|
||||
rev = "v${version}";
|
||||
sha256 = "1awf0j4vlm9v7bsfk5a168446k7pa54yqc0k6phlaw772874g917";
|
||||
sha256 = "1qdsrpk6jbq9b4v4f2lfpdqs1yh3irbsm5fx02wxnnwvad05bcfv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
|
||||
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lidarr";
|
||||
@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \
|
||||
--add-flags "$out/bin/Lidarr.exe" \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ chromaprint ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
|
||||
curl sqlite libmediainfo ]}
|
||||
'';
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{stdenv, fetchurl, cyrus_sasl, libevent}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.18";
|
||||
version = "1.5.19";
|
||||
pname = "memcached";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "127g4l0ilb376dpgz6qby24vc72ban35c938dzmp1nh6bdqddgcy";
|
||||
sha256 = "1q2bb858iwc1jncav5vfl8c7dic9r1wqni5724qmy8ads6idmp1x";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "3.12.0";
|
||||
version = "3.13.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1j2p3r4vgp4l2xrrsh5mx3vbgq03c0vdg6961g1fvd307yqpibk0";
|
||||
sha256 = "018b07icvjhd44c046rxfjiczcs63cic77cymgg4w8pd3na06c7y";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.17.0.1841-d42cfa161";
|
||||
version = "1.18.0.1944-f2cae8d6b";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
|
||||
sha256 = "1sa3a8i204qq1hsg0dsa3f6vpsbyny88y3bskf6ljsz87c6g9kmh";
|
||||
sha256 = "1yq926j817aqngq5n8gjpcq5pr8lc5mi3xff1r834vkym1i5nz7q";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "groonga";
|
||||
version = "9.0.7";
|
||||
version = "9.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
|
||||
sha256 = "1j308p6l6q716qlk3azqk9v11a93cxhcppj7qh5wm2aqsngw9rfq";
|
||||
sha256 = "1fcagm0hzfl9jvn9afzhaahphvq3mc7d7s1s7hhinpv7bsr3xdl5";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
||||
@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "05l7l4d1765m01c14iz8lcr61dnm4xd5p09sns4w8wmanks9jg3x";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
assert par2Support -> par2cmdline != null;
|
||||
|
||||
let version = "0.29.3"; in
|
||||
let version = "0.30"; in
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
repo = "bup";
|
||||
owner = "bup";
|
||||
rev = version;
|
||||
sha256 = "1b5ynljd9gs1vzbsa0kggw32s3r4zhbprc2clvjm5qmvnx23hxh8";
|
||||
sha256 = "0kzi9mzgmx1kjv3aldawapz7bk73f02bysiwh8rngqnirmm0vxdp";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,33 +1,33 @@
|
||||
{ stdenv, fetchurl, acl, libcap, Carbon, IOKit }:
|
||||
{ stdenv, fetchurl, m4, acl, libcap, Carbon, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cdrtools";
|
||||
version = "3.02a06";
|
||||
version = "3.02a09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
|
||||
sha256 = "10ayj48jax2pvsv6j5gybwfsx7b74zdjj84znwag7wwf8n7l6a5a";
|
||||
};
|
||||
|
||||
patches = [ ./fix-paths.patch ];
|
||||
|
||||
nativeBuildInputs = [ m4 ];
|
||||
buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ];
|
||||
|
||||
postPatch = ''
|
||||
sed "/\.mk3/d" -i libschily/Targets.man
|
||||
substituteInPlace man/Makefile --replace "man4" ""
|
||||
substituteInPlace RULES/rules.prg --replace "/bin/" ""
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
GMAKE_NOWARN = true;
|
||||
makeFlags = [ "GMAKE_NOWARN=true" "INS_BASE=/" "INS_RBASE=/" "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ];
|
||||
enableParallelBuilding = false; # parallel building fails on some linux machines
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://sourceforge.net/projects/cdrtools/;
|
||||
homepage = "http://cdrtools.sourceforge.net/private/cdrecord.html";
|
||||
description = "Highly portable CD/DVD/BluRay command line recording software";
|
||||
license = with licenses; [ gpl2 lgpl2 cddl ];
|
||||
license = with licenses; [ cddl gpl2 lgpl21 ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
# Licensing issues: This package contains code licensed under CDDL, GPL2
|
||||
# and LGPL2. There is a debate regarding the legality of distributing this
|
||||
@ -1,38 +1,41 @@
|
||||
{stdenv, fetchurl, cdrkit, m4}:
|
||||
{ stdenv, fetchurl, fetchpatch, cdrtools, m4 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dvd+rw-tools-7.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dvd+rw-tools";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz;
|
||||
url = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pname}-${version}.tar.gz";
|
||||
sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
|
||||
};
|
||||
|
||||
# Patches from Gentoo / Fedora
|
||||
# https://bugs.gentoo.org/257360
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=426068
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=243036
|
||||
patches = [
|
||||
./dvd+rw-tools-7.0-dvddl.patch
|
||||
./dvd+rw-tools-7.0-glibc2.6.90.patch
|
||||
./dvd+rw-tools-7.0-wctomb.patch
|
||||
./dvd+rw-tools-7.0-wexit.patch
|
||||
./dvd+rw-tools-7.1-layerbreaksetup.patch
|
||||
];
|
||||
# Patches from Gentoo
|
||||
patches = [ ]
|
||||
++ builtins.map ({pfile, sha256}: fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-cdr/dvd+rw-tools/files/${pfile}?id=b510df361241e8f16314b1f14642305f0111dac6";
|
||||
inherit sha256;
|
||||
})
|
||||
[{ pfile = "dvd+rw-tools-7.0-dvddl-r1.patch"; sha256 = "12l33jq6405shfwdycrj52qmd07h5bsp1vjaddknfri456azjny5"; }
|
||||
{ pfile = "dvd+rw-tools-7.0-glibc2.6.90.patch"; sha256 = "1fb3gap2in782pa4164h1w0ha8ggsq3inissa1k0zn2p2r3rb5ln"; }
|
||||
{ pfile = "dvd+rw-tools-7.0-reload.patch"; sha256 = "12v2y2y6ci5hh6lbmsk97dzgznrm4bxwhc81mq684ix0qspb9mq4"; }
|
||||
{ pfile = "dvd+rw-tools-7.0-sysmacros.patch"; sha256 = "1rkb26cyhfxklkmna3l9b4797f6gzlxyqqin44jwnq3jmwfrs6v0"; }
|
||||
{ pfile = "dvd+rw-tools-7.0-wctomb-r1.patch"; sha256 = "1xg770l0b4bjn30y7nqg619v4m5ickcn2n8hv9k2an6r191daq58"; }
|
||||
{ pfile = "dvd+rw-tools-7.0-wexit.patch"; sha256 = "0sqzlkm19fmjx4lzxkxwn2ymrj9fq0zk0jkys3xm6xvd2ibb6kxl"; }
|
||||
{ pfile = "dvd+rw-tools-7.1-bluray_pow_freespace.patch"; sha256 = "0iscz8fs5002ymk6wl2fz4x06b7bdnc57rfz8kbv3216acqi5rv3"; }
|
||||
{ pfile = "dvd+rw-tools-7.1-bluray_srm+pow.patch"; sha256 = "0sy40m12w987i6g0cyxv8cfmab4vp7cd222lv05apknfi2y7smmw"; }
|
||||
{ pfile = "dvd+rw-tools-7.1-lastshort.patch"; sha256 = "01wspv70sil20khkg5kj086b1x8rrig4yhcq9s88bdjd42nv0vpx"; }
|
||||
{ pfile = "dvd+rw-tools-7.1-noevent.patch"; sha256 = "1kbmxpg15wci33f2h6pxxvf3qm0kpyzx9wj5a3l67sk34hvza3z6"; }
|
||||
];
|
||||
|
||||
buildInputs = [cdrkit m4];
|
||||
nativeBuildInputs = [ m4 ];
|
||||
buildInputs = [ cdrtools ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlags="prefix=$out"
|
||||
'';
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
# Incompatibility with Linux 2.6.23 headers, see
|
||||
# http://www.mail-archive.com/cdwrite@other.debian.org/msg11464.html
|
||||
NIX_CFLAGS_COMPILE = "-DINT_MAX=__INT_MAX__";
|
||||
|
||||
meta = {
|
||||
homepage = http://fy.chalmers.se/~appro/linux/DVD+RW/tools;
|
||||
description = "Tools for burning DVDs";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools";
|
||||
description = "Tools for mastering Blu-ray and DVD+-RW/+-R media";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl2 publicDomain ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
--- ./growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200
|
||||
+++ ./growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200
|
||||
@@ -1412,9 +1412,7 @@
|
||||
blocks += 15, blocks &= ~15;
|
||||
|
||||
if (blocks <= split)
|
||||
- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
|
||||
- " use single layer media for this recording\n"),
|
||||
- exit (FATAL_START(EMEDIUMTYPE));
|
||||
+ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
|
||||
|
||||
blocks /= 16;
|
||||
blocks += 1;
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
|
||||
--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 2007-08-15 12:56:17.000000000 +0200
|
||||
+++ dvd+rw-tools-7.0/transport.hxx 2007-08-15 12:56:42.000000000 +0200
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
+#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./transport.hxx~ 2008-03-25 21:24:47.000000000 -0400
|
||||
+++ ./transport.hxx 2008-03-25 21:25:36.000000000 -0400
|
||||
@@ -116,7 +116,7 @@
|
||||
extern "C" char *plusminus_locale()
|
||||
{ static class __plusminus {
|
||||
private:
|
||||
- char str[4];
|
||||
+ char str[MB_LEN_MAX];
|
||||
public:
|
||||
__plusminus() { setlocale(LC_CTYPE,ENV_LOCALE);
|
||||
int l = wctomb(str,(wchar_t)(unsigned char)'±');
|
||||
@ -1,11 +0,0 @@
|
||||
--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit 2007-06-21 12:42:30.000000000 +0200
|
||||
+++ dvd+rw-tools-7.0/dvd+rw-format.cpp 2007-06-21 12:44:13.000000000 +0200
|
||||
@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
|
||||
alarm(1);
|
||||
while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
|
||||
if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
|
||||
- exit (0);
|
||||
+ exit (WEXITSTATUS(i));
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
diff -ur dvd+rw-tools-7.1-orig/growisofs.c dvd+rw-tools-7.1/growisofs.c
|
||||
--- dvd+rw-tools-7.1-orig/growisofs.c 2008-03-04 10:15:03.000000000 +0100
|
||||
+++ dvd+rw-tools-7.1/growisofs.c 2009-09-06 22:39:33.000000000 +0200
|
||||
@@ -535,7 +535,7 @@
|
||||
*/
|
||||
int get_mmc_profile (void *fd);
|
||||
int plusminus_r_C_parm (void *fd,char *C_parm);
|
||||
-pwrite64_t poor_mans_setup (void *fd,off64_t leadout);
|
||||
+pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak);
|
||||
char *plusminus_locale ();
|
||||
int __1x ();
|
||||
/*
|
||||
@@ -2447,7 +2447,7 @@
|
||||
goto out;
|
||||
}
|
||||
if (!progress.final) progress.final = tracksize;
|
||||
- tracksize = layer_break*CD_BLOCK*2;
|
||||
+ //tracksize = layer_break*CD_BLOCK*2;
|
||||
}
|
||||
}
|
||||
else if (capacity > outoff)
|
||||
@@ -2648,7 +2648,7 @@
|
||||
* further details on poor_mans_setup
|
||||
*/
|
||||
pwrite64_method = poor_mans_setup (ioctl_handle,
|
||||
- outoff+tracksize);
|
||||
+ outoff+tracksize, (unsigned int)layer_break);
|
||||
}
|
||||
|
||||
if (!progress.final)
|
||||
diff -ur dvd+rw-tools-7.1-orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp
|
||||
--- dvd+rw-tools-7.1-orig/growisofs_mmc.cpp 2008-03-04 18:47:49.000000000 +0100
|
||||
+++ dvd+rw-tools-7.1/growisofs_mmc.cpp 2009-09-06 20:52:46.000000000 +0200
|
||||
@@ -1612,7 +1612,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static void plus_r_dl_split (Scsi_Command &cmd,off64_t size)
|
||||
+static void plus_r_dl_split (Scsi_Command &cmd,off64_t size,unsigned int lbreak)
|
||||
{ int err;
|
||||
unsigned int blocks,split;
|
||||
unsigned char dvd_20[4+8];
|
||||
@@ -1644,10 +1644,17 @@
|
||||
" use single layer media for this recording\n"),
|
||||
exit (FATAL_START(EMEDIUMTYPE));
|
||||
|
||||
- blocks /= 16;
|
||||
- blocks += 1;
|
||||
- blocks /= 2;
|
||||
- blocks *= 16;
|
||||
+ if (lbreak)
|
||||
+ {
|
||||
+ blocks=lbreak;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ blocks /= 16;
|
||||
+ blocks += 1;
|
||||
+ blocks /= 2;
|
||||
+ blocks *= 16;
|
||||
+ }
|
||||
|
||||
fprintf (stderr,"%s: splitting layers at %u blocks\n",
|
||||
ioctl_device,blocks);
|
||||
@@ -2010,7 +2017,7 @@
|
||||
typedef ssize_t (*pwrite64_t)(int,const void *,size_t,off64_t);
|
||||
|
||||
extern "C"
|
||||
-pwrite64_t poor_mans_setup (void *fd,off64_t leadout)
|
||||
+pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak)
|
||||
{ Scsi_Command cmd(ioctl_handle=fd);
|
||||
int err,profile=mmc_profile&0xFFFF;
|
||||
|
||||
@@ -2059,7 +2066,7 @@
|
||||
case 0x2B: // DVD+R Double Layer
|
||||
plusminus_pages_setup(cmd,profile);
|
||||
if (profile==0x2B && next_track==1 && dvd_compat && leadout)
|
||||
- plus_r_dl_split (cmd,leadout);
|
||||
+ plus_r_dl_split (cmd,leadout,lbreak);
|
||||
atexit (plus_r_finalize);
|
||||
if (next_wr_addr)
|
||||
{ atsignals (no_r_finalize);
|
||||
diff -ur dvd+rw-tools-7.1-orig/transport.hxx dvd+rw-tools-7.1/transport.hxx
|
||||
--- dvd+rw-tools-7.1-orig/transport.hxx 2008-03-01 11:34:43.000000000 +0100
|
||||
+++ dvd+rw-tools-7.1/transport.hxx 2009-09-06 20:53:53.000000000 +0200
|
||||
@@ -9,6 +9,7 @@
|
||||
#if defined(__unix) || defined(__unix__)
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmic";
|
||||
version = "2.7.1";
|
||||
version = "2.7.4";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
|
||||
sha256 = "1sxgmrxv1px07h5m7dcdg24c6x39ifjbc1fmz8p2ah91pm57h7n7";
|
||||
sha256 = "0h1c1c6l25c5rjc0wkspmw44k7cafrn0jwc0713vp87qipx416yd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
{ stdenv, fetchFromGitHub, makeWrapper
|
||||
, ghostscript, netpbm, perl }:
|
||||
# TODO: withTex
|
||||
|
||||
# Ported from Homebrew.
|
||||
# https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "latex2html";
|
||||
version = "2018";
|
||||
version = "2019.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz";
|
||||
sha256 = "1qnlg8ajh0amy9gy8rh8sp1l224ak54264i3dhk7rrv9s4k7bqq9";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1bcdhbaxf334wlxzkw5samj2y2q173709y0km3x8xs4bbh70ds6c";
|
||||
};
|
||||
|
||||
buildInputs = [ ghostscript netpbm perl ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phoronix-test-suite";
|
||||
version = "9.0.0";
|
||||
version = "9.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1gfmkwfzgpbmhv2wdr5aiknv1jyazx7sb33nna34pnd3bkmak0bq";
|
||||
sha256 = "056f2z1ssr2z7qnacq5aihpnawl05blbbw0bv64pkrkl0wss85x1";
|
||||
};
|
||||
|
||||
buildInputs = [ php ];
|
||||
|
||||
@ -1,34 +1,37 @@
|
||||
{ stdenv, fetchurl, getopt, ip2location-c, openssl, perl
|
||||
, geoip ? null, geolite-legacy ? null }:
|
||||
, libmaxminddb ? null, geolite-legacy ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipv6calc";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz";
|
||||
sha256 = "01a4p2g31y6p1r3kacymbv2hhvkwnv00yskhphgcgjq5jpkmfjcn";
|
||||
urls = [
|
||||
"https://www.deepspace6.net/ftp/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "18acy0sy3n6jcjjwpxskysinw06czyayx1q4rqc7zc3ic4pkad8r";
|
||||
};
|
||||
|
||||
buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];
|
||||
nativeBuildInputs = [ perl ];
|
||||
buildInputs = [ libmaxminddb geolite-legacy getopt ip2location-c openssl perl ];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
patchShebangs *.sh */*.sh
|
||||
for i in {,databases/}lib/Makefile.in; do
|
||||
substituteInPlace $i --replace /sbin/ldconfig true
|
||||
done
|
||||
for i in {{,databases/}lib,man}/Makefile.in; do
|
||||
substituteInPlace $i --replace DESTDIR out
|
||||
substituteInPlace $i --replace "/sbin/ldconfig" "ldconfig"
|
||||
done
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--libdir=${placeholder "out"}/lib"
|
||||
"--disable-bundled-getopt"
|
||||
"--disable-bundled-md5"
|
||||
"--disable-dynamic-load"
|
||||
"--enable-shared"
|
||||
] ++ stdenv.lib.optional (geoip != null ) [
|
||||
"--enable-geoip"
|
||||
] ++ stdenv.lib.optional (libmaxminddb != null ) [
|
||||
"--enable-mmdb"
|
||||
] ++ stdenv.lib.optional (geolite-legacy != null) [
|
||||
"--with-geoip-db=${geolite-legacy}/share/GeoIP"
|
||||
] ++ stdenv.lib.optional (ip2location-c != null ) [
|
||||
@ -47,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
difficult) migrating the Perl program ip6_int into.
|
||||
Now only one utiltity is needed to do a lot.
|
||||
'';
|
||||
homepage = http://www.deepspace6.net/projects/ipv6calc.html;
|
||||
homepage = "http://www.deepspace6.net/projects/ipv6calc.html";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "18f5ksngx6afh7rrw9aiw7q6yx801qflbbbqc7i28b68l9dh5qy4";
|
||||
sha256 = "0bqdjparv12wscq4qhm9xnryyfmdnn3w77hrhnsy8mlvxk2vnk13";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -13,11 +13,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireguard-tools";
|
||||
version = "0.0.20190913";
|
||||
version = "0.0.20191012";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
|
||||
sha256 = "08ns5d6xbl0qylb98mml0yh0yp837a1sm3hvpra21by1dvx8k0dg";
|
||||
sha256 = "0nwcx7m5cpp4h1bclswiqq1jzj08xzpxmq5s4rcfqmrp59cmwgrs";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/tools";
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://git.zx2c4.com/WireGuard/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ];
|
||||
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ let
|
||||
|
||||
common =
|
||||
{ lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
|
||||
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline
|
||||
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
|
||||
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq
|
||||
, busybox-sandbox-shell
|
||||
, storeDir
|
||||
@ -39,7 +39,7 @@ common =
|
||||
++ lib.optionals (!is20) [ curl perl ]
|
||||
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];
|
||||
|
||||
buildInputs = [ curl openssl sqlite xz bzip2 ]
|
||||
buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ]
|
||||
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
||||
++ lib.optionals is20 [ brotli boost editline ]
|
||||
++ lib.optional withLibseccomp libseccomp
|
||||
@ -201,12 +201,12 @@ in rec {
|
||||
|
||||
nixFlakes = lib.lowPrio (callPackage common rec {
|
||||
name = "nix-2.4${suffix}";
|
||||
suffix = "pre20190922_382aa05";
|
||||
suffix = "pre20191022_9cac895";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf";
|
||||
hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g=";
|
||||
rev = "9cac895406724e0304dff140379783c4d786e855";
|
||||
hash = "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=";
|
||||
};
|
||||
fromGit = true;
|
||||
|
||||
|
||||
@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
|
||||
familiar with, such as your web browser0 or secure shell.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acpica-tools";
|
||||
version = "20190816";
|
||||
version = "20191018";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
|
||||
sha256 = "0p7ws106hf8bir9yb1a5m6v3wmvqagxmk3l9rpp4i89vib44vv3s";
|
||||
sha256 = "0pz95fb1zvsj9238bg7a4vxl1svn5mnjg10sn5qvgr008q0v9782";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "html-xml-utils";
|
||||
version = "7.7";
|
||||
version = "7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
|
||||
sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr";
|
||||
sha256 = "0p8df3c6mw879vdi8l63kbdqylkf1is10b067mh9kipgfy91rd4s";
|
||||
};
|
||||
|
||||
buildInputs = [curl libiconv];
|
||||
|
||||
@ -215,6 +215,8 @@ in
|
||||
|
||||
dotnet-sdk = callPackage ../development/compilers/dotnet/sdk { };
|
||||
|
||||
dumb-init = callPackage ../applications/virtualization/dumb-init {};
|
||||
|
||||
dispad = callPackage ../tools/X11/dispad { };
|
||||
|
||||
dump1090 = callPackage ../applications/radio/dump1090 { };
|
||||
@ -2201,6 +2203,10 @@ in
|
||||
|
||||
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
|
||||
|
||||
cdrtools = callPackage ../tools/cd-dvd/cdrtools {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
|
||||
};
|
||||
|
||||
mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { };
|
||||
|
||||
nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
|
||||
@ -17820,10 +17826,6 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon;
|
||||
};
|
||||
|
||||
cdrtools = callPackage ../applications/misc/cdrtools {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
|
||||
};
|
||||
|
||||
centerim = callPackage ../applications/networking/instant-messengers/centerim { };
|
||||
|
||||
cgit = callPackage ../applications/version-management/git-and-tools/cgit {
|
||||
@ -21418,6 +21420,8 @@ in
|
||||
|
||||
vym = qt5.callPackage ../applications/misc/vym { };
|
||||
|
||||
waon = callPackage ../applications/audio/waon { };
|
||||
|
||||
w3m = callPackage ../applications/networking/browsers/w3m { };
|
||||
|
||||
# Should always be the version with the most features
|
||||
|
||||
@ -338,12 +338,12 @@ let
|
||||
};
|
||||
|
||||
phpcbf = mkDerivation rec {
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
pname = "phpcbf";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
|
||||
sha256 = "15n3r3sc62ar1kq38idw22y7gasvy747bix99zs0l0paapcbxz6n";
|
||||
sha256 = "1b68cmdvg356s2vk5q0jkk8sizza7r7pbcl9v5s0944wi0apsj0r";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
@ -365,12 +365,12 @@ let
|
||||
};
|
||||
|
||||
phpcs = mkDerivation rec {
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
pname = "phpcs";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
|
||||
sha256 = "078anf2r6a3p8v575m65vryazipgfchs07yb92m9xh41lk5wlndf";
|
||||
sha256 = "060jzgd99j16xjs0n75sgp79an6n7qp6zv5lrw6700jnw67zpmn7";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -6233,6 +6233,8 @@ in {
|
||||
|
||||
python-docx = callPackage ../development/python-modules/python-docx { };
|
||||
|
||||
python-doi = callPackage ../development/python-modules/python-doi { };
|
||||
|
||||
aiohue = callPackage ../development/python-modules/aiohue { };
|
||||
|
||||
PyMVGLive = callPackage ../development/python-modules/pymvglive { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user