Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar 2021-03-12 19:58:39 +01:00
commit f747bcb868
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
18 changed files with 193 additions and 59 deletions

View file

@ -0,0 +1,82 @@
{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
, nss, pango, udev, xorg
}:
let
version = "4.7.1";
deps = [
alsaLib
atk
at-spi2-atk
cairo
cups
dbus
expat
fontconfig
freetype
GConf
gdk-pixbuf
glib
gtk2
gtk3
libpulseaudio
nspr
nss
pango
stdenv.cc.cc
udev
xorg.libX11
xorg.libxcb
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXScrnSaver
xorg.libXtst
];
in
stdenv.mkDerivation {
pname = "google-play-music-desktop-player";
inherit version;
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
};
dontBuild = true;
nativeBuildInputs = [ dpkg makeWrapper ];
unpackPhase = ''
dpkg -x $src .
'';
installPhase = ''
mkdir -p $out
cp -r ./usr/share $out
cp -r ./usr/bin $out
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
"$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
wrapProgram $out/bin/google-play-music-desktop-player \
--prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}"
'';
meta = {
homepage = "https://www.googleplaymusicdesktopplayer.com/";
description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music";
license = lib.licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ anna328p SuprDewd ];
};
}

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "free42";
version = "3.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
sha256 = "jzNopLndYH9dIdm30pyDaZNksHwS4i5LTZUXRmcrTp8=";
sha256 = "sha256-Htk2NHgYVL622URx67BUtounAUopLTahaSqfAqd3+ZI=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -1,7 +1,6 @@
{ lib, stdenv
, fetchurl
, autoreconfHook
, docbook_xml_dtd_412
, docbook_xml_dtd_45
, docbook-xsl-nons
, which
@ -53,14 +52,14 @@
stdenv.mkDerivation rec {
pname = "flatpak";
version = "1.10.1";
version = "1.10.2";
# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ=";
};
patches = [
@ -105,9 +104,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
libxml2
# Remove 4.1.2 again once the following is merged
# https://github.com/flatpak/flatpak/pull/4102
docbook_xml_dtd_412
docbook_xml_dtd_45
docbook-xsl-nons
which

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libgdata";
version = "0.18.0";
version = "0.18.1";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA=";
sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc=";
};
patches = [

View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
version = "2.18.2";
version = "2.18.3";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
sha256 = "sha256-451be1O/y92ib5hZNVbf8iCkD+e9DoK47Z7IkMnwuo0=";
sha256 = "sha256-Bdk1+X+SKcVS/zxEqlgnR3zjq/l0ht7icE4sQ1hjn8g=";
};
phases = [ "installPhase" ];

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bip_utils";
version = "1.6.0";
version = "1.7.0";
disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "ebellocchia";
repo = pname;
rev = "v${version}";
sha256 = "0zbjrgl4dd65r3liyp8syxr106z1wn7ngfcm5dlfcxqwj8zkf56m";
sha256 = "1dj0c9sj0c4dkdf7rbz3s1z5kfzw22hpncm4bnwqigjzi6nrk81z";
};
propagatedBuildInputs = [ ecdsa pysha3 ];

View file

@ -2,56 +2,56 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.27.tar.xz",
"needsAuth": true,
"sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.27/alpha/linux64",
"version": "1.1.27"
},
"stable": {
"name": "factorio_alpha_x64-1.1.26.tar.xz",
"needsAuth": true,
"sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/alpha/linux64",
"version": "1.1.26"
},
"stable": {
"name": "factorio_alpha_x64-1.1.25.tar.xz",
"needsAuth": true,
"sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.25/alpha/linux64",
"version": "1.1.25"
}
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.27.tar.xz",
"needsAuth": false,
"sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.27/demo/linux64",
"version": "1.1.27"
},
"stable": {
"name": "factorio_demo_x64-1.1.26.tar.xz",
"needsAuth": false,
"sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/demo/linux64",
"version": "1.1.26"
},
"stable": {
"name": "factorio_demo_x64-1.1.25.tar.xz",
"needsAuth": false,
"sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.25/demo/linux64",
"version": "1.1.25"
}
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.27.tar.xz",
"needsAuth": false,
"sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.27/headless/linux64",
"version": "1.1.27"
},
"stable": {
"name": "factorio_headless_x64-1.1.26.tar.xz",
"needsAuth": false,
"sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/headless/linux64",
"version": "1.1.26"
},
"stable": {
"name": "factorio_headless_x64-1.1.25.tar.xz",
"needsAuth": false,
"sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.25/headless/linux64",
"version": "1.1.25"
}
}
}

View file

@ -18,34 +18,36 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.6.4";
version = "10.7.0";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz";
sha256 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo=";
sha256 = "sha256-63T1EBjtTWxg41W5gBDYCthgnokZ/e/B1s6BmymO32w=";
};
nativeBuildInputs = [ unzip ];
buildInputs = [
nativeBuildInputs = [
unzip
makeWrapper
];
propagatedBuildInputs = [
dotnetCorePackages.aspnetcore_3_1
dotnetCorePackages.aspnetcore_5_0
sqlite
];
preferLocalBuild = true;
installPhase = ''
runHook preInstall
install -dm 755 "$out/opt/jellyfin"
cp -r * "$out/opt/jellyfin"
makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \
makeWrapper "${dotnetCorePackages.aspnetcore_5_0}/bin/dotnet" $out/bin/jellyfin \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
sqlite fontconfig freetype stdenv.cc.cc.lib
]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \
--add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
runHook postInstall
'';
passthru.tests = {
@ -55,7 +57,8 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "The Free Software Media System";
homepage = "https://jellyfin.org/";
license = licenses.gpl2;
# https://github.com/jellyfin/jellyfin/issues/610#issuecomment-537625510
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nyanloutre minijackson purcell ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql_check";
version = "1.15.3";
version = "1.16.0";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TbQanXNdomEjp11izowy4763NsQWUe5rLxoEmuHKFn0=";
sha256 = "sha256-ZZvRrt2JaAWruAT4FXB6ChS0jLKpUEDCF2UmAAH4BRQ=";
};
buildInputs = [ postgresql ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgcenter";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "lesovsky";
repo = "pgcenter";
rev = "v${version}";
sha256 = "sha256-W/UUc0qwOvLSXYWepkCydst113BqR9EsZK0Es+6HSt8=";
sha256 = "sha256-ow26wuM7nw/WbeaPVcNm5iYUYLydeujhw+7BcTirPcA=";
};
vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU=";

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2021.1";
version = "1.2021.2";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ=";
sha256 = "sha256-06PrqYf1Cc4FZPr0K2xUc83t+/qGbwMXe/BOV81Fuxc=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -0,0 +1,38 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "tfk8s";
version = "0.1.0";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = version;
sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw=";
};
vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4=";
runVend = true;
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X main.toolVersion=${version}"
"-X main.builtBy=nixpkgs"
];
meta = with lib; {
description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format.";
license = licenses.mit;
longDescription = ''
tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider.
If you want to copy examples from the Kubernetes documentation or migrate existing YAML manifests and use them with Terraform without having to convert YAML to HCL by hand, this tool is for you.
Features:
* Convert a YAML file containing multiple manifests.
* Strip out server side fields when piping kubectl get $R -o yaml | tfk8s --strip
'';
homepage = "https://github.com/jrhouston/tfk8s/";
maintainers = with maintainers; [ superherointj ];
};
}

View file

@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config bison flex check ];
buildInputs = [ libdaemon ];
# Needed for cross-compilation
makeFlags = [
"AR=${stdenv.cc.targetPrefix}ar"
];
meta = with lib; {
homepage = "http://www.litech.org/radvd/";
description = "IPv6 Router Advertisement Daemon";

View file

@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
configureFlags = [
(lib.withFeatureAs (openssl != null) "ssl" "openssl")
] ++ lib.optionals stdenv.isDarwin [
# https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
"--without-included-regex"
];
doCheck = false;

View file

@ -55,7 +55,8 @@ common =
]
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock lowdown libcpuid ]
++ lib.optionals is24 [ libarchive gmock lowdown ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS
((aws-sdk-cpp.override {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python2, libxslt, texlive
{ lib, stdenv, fetchurl, python3, libxslt, texlive
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
@ -21,14 +21,15 @@ assert enableAllFeatures ->
ghostscript != null;
stdenv.mkDerivation rec {
name = "dblatex-0.3.11";
pname = "dblatex";
version = "0.3.12";
src = fetchurl {
url = "mirror://sourceforge/dblatex/${name}.tar.bz2";
sha256 = "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv";
url = "mirror://sourceforge/dblatex/${pname}3-${version}.tar.bz2";
sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n";
};
buildInputs = [ python2 libxslt tex ]
buildInputs = [ python3 libxslt tex ]
++ lib.optionals enableAllFeatures [ imagemagick transfig ];
# TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
${python2.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
${python3.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
'';
passthru = { inherit tex; };

View file

@ -262,7 +262,6 @@ mapAliases ({
google-gflags = gflags; # added 2019-07-25
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07
google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07
googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25

View file

@ -755,6 +755,8 @@ in
metapixel = callPackage ../tools/graphics/metapixel { };
tfk8s = callPackage ../tools/misc/tfk8s { };
xtrt = callPackage ../tools/archivers/xtrt { };
yabridge = callPackage ../tools/audio/yabridge {
@ -22874,6 +22876,10 @@ in
google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
inherit (gnome2) GConf;
};
gosmore = callPackage ../applications/misc/gosmore { };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {