From d3e910bae802285119dd929247ac1f3ae6d7d4f4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Mar 2021 02:58:12 +0100 Subject: [PATCH 01/19] dblatex: 0.3.11 -> 0.3.12 --- pkgs/tools/typesetting/tex/dblatex/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 989f49b6d9a..dbd4fed1474 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -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; }; From 4770987f921215a7cfc8f07e3dfef6787140055d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Mar 2021 09:18:06 +0100 Subject: [PATCH 02/19] Revert "google-play-music-desktop-player: drop" This reverts commit aef2a70f67a6b051eb20b87d58f22ecd6ba63925. The package is still useful for YouTube Music. --- .../default.nix | 82 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 + 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/google-play-music-desktop-player/default.nix diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix new file mode 100644 index 00000000000..f86eed1d34d --- /dev/null +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -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"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.SuprDewd ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da00ed76ca8..0138ac26a43 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a47a94c08e7..64c588d393c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22849,6 +22849,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 { From 220b31d315f0fa1b346de206cd5bfef6dee0a07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Mar 2021 13:57:55 +0100 Subject: [PATCH 03/19] google-play-music-desktop-player: update description Co-authored-by: Sandro --- .../audio/google-play-music-desktop-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index f86eed1d34d..b62b070c3fd 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.googleplaymusicdesktopplayer.com/"; - description = "A beautiful cross platform Desktop Player for Google Play Music"; + description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.SuprDewd ]; From be3ed6d038a0fdabb450f9535ec6396fc36819d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 13:25:58 +0000 Subject: [PATCH 04/19] free42: 3.0 -> 3.0.1 --- pkgs/applications/misc/free42/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 5810607e8d1..c48e151e8ae 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -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 ]; From f0261331100ac1e4a7dcd7cbb8214278767ff56b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Mar 2021 15:29:53 +0100 Subject: [PATCH 05/19] flatpak: 1.10.1 -> 1.10.2 --- pkgs/development/libraries/flatpak/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 36c946e06f7..13a33f68d25 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -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 From 5c4410952a26ca315eea07a6bdd21a051974d15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Mar 2021 16:45:15 +0100 Subject: [PATCH 06/19] google-play-music-desktop-player: add anna328p as maintainer --- .../audio/google-play-music-desktop-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index b62b070c3fd..9d891d30234 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation { description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.SuprDewd ]; + maintainers = with lib.maintainers; [ anna328p SuprDewd ]; }; } From b73edccda275870544709e15c2a74155c95c30f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Mar 2021 10:41:49 +0100 Subject: [PATCH 07/19] nix: fix aarch64 build --- pkgs/tools/package-management/nix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 9c0beb224d2..d52ab6c2405 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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 (stdenv.isx86_64) libcpuid ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { From c870a98ba32cd17cb1cb8e1deaa7c1b73cfd4f92 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 12 Mar 2021 08:50:03 -0300 Subject: [PATCH 08/19] tfk8s: init at 0.1.0 With contributions & review by @SuperSandro2000 --- pkgs/tools/misc/tfk8s/default.nix | 38 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/tfk8s/default.nix diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix new file mode 100644 index 00000000000..b1e75f36b54 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a6d2052d34..9d36d25a653 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { From 8139757d9b6095764031efefae719671b4aa36c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 12:04:53 +0000 Subject: [PATCH 09/19] postgresql11Packages.plpgsql_check: 1.15.3 -> 1.16.0 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 8f922baea66..8e9e06d7ef0 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -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 ]; From 69a3744025aa3f2818218e848e7bc7fb92c2a47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Mar 2021 12:22:37 +0000 Subject: [PATCH 10/19] Update pkgs/tools/package-management/nix/default.nix Co-authored-by: Sandro --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d52ab6c2405..d39af405da5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -56,7 +56,7 @@ common = ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals is24 [ libarchive gmock lowdown ] - ++ lib.optional (stdenv.isx86_64) libcpuid + ++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { From d7d99cfef9e0e519f80f0a329fafca503a2b0ff6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 12:53:26 +0000 Subject: [PATCH 11/19] php73Packages.php-cs-fixer: 2.18.2 -> 2.18.3 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index a142c695121..9f1ce65db0a 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -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" ]; From aa696900a678f58c32f5abbe44bf1411299ffc2e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 13:10:52 +0000 Subject: [PATCH 12/19] pgcenter: 0.7.0 -> 0.8.0 --- pkgs/tools/misc/pgcenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 970a5bc8265..27e228f0f20 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -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="; From 416adcf85b65385c93e7b95f0aa33c0181e0a897 Mon Sep 17 00:00:00 2001 From: dramforever Date: Fri, 12 Mar 2021 11:32:46 +0800 Subject: [PATCH 13/19] radvd: Add AR to makeFlags for cross-compiling --- pkgs/tools/networking/radvd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index ddd196ebe56..de8b9a0a4f1 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -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"; From b868a483a46bea859af734fa0032206364e08dd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 23:52:53 +0000 Subject: [PATCH 14/19] libgdata: 0.18.0 -> 0.18.1 --- pkgs/development/libraries/libgdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 2cd7da0784a..fdaace2dc4f 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -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 = [ From 8ace8ee0713bb34f6d5512ea8dc1cd06f7d8c480 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Fri, 12 Mar 2021 15:54:23 +0100 Subject: [PATCH 15/19] factorio: stable 1.1.25 -> 1.1.26, experimental 1.1.26 -> 1.1.27 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 21aa2f6d200..b38069355ee 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -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" } } } From 7c2ffed6fd73865a532d92b30aaf59dac6f53630 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 15:24:02 +0000 Subject: [PATCH 16/19] python38Packages.bip_utils: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/bip_utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index 17f996bfd70..1854bd4f71b 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -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 ]; From 769aa398a54df4e2905a8463b19f207e2d80552d Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 13 Mar 2021 01:05:33 +0900 Subject: [PATCH 17/19] wget: fix darwin build Fixes #116035. --- pkgs/tools/networking/wget/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3427cd186c3..efdd16e630b 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -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; From 40ef3055b0ef5826a67a8918d88d581a26d42419 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 11:16:08 +0000 Subject: [PATCH 18/19] plantuml: 1.2021.1 -> 1.2021.2 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index eb267e6007a..ea49038724b 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -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 ]; From da94be3001de6859e6131fa13f08d32bea64e31e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 11 Mar 2021 23:55:04 +0100 Subject: [PATCH 19/19] jellyfin: 10.6.4 -> 10.7.0 https://github.com/jellyfin/jellyfin/releases/tag/v10.7.0 --- pkgs/servers/jellyfin/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index caca89bfd0d..6b67ef939dc 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -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="; }; - 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 ]; }; }