JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-20 00:44:00 +00:00 committed by GitHub
commit fd51d0dfe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 128 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/editors/jetbrains/common.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
, vmopts ? null
}:
{ name, product, version, src, wmClass, jdk, meta }:
@ -9,6 +10,11 @@ with stdenv.lib;
let loName = toLower product;
hiName = toUpper product;
execName = concatStringsSep "-" (init (splitString "-" name));
vmoptsName = loName
+ ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
then ""
else "64" )
+ ".vmoptions";
in
with stdenv; lib.makeOverridable mkDerivation rec {
@ -26,6 +32,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
'';
};
vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts);
nativeBuildInputs = [ makeWrapper patchelf unzip ];
patchPhase = lib.optionalString (!stdenv.isDarwin) ''
@ -72,7 +80,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \
--set JAVA_HOME "$jdk"
--set JAVA_HOME "$jdk" \
--set ${hiName}_VM_OPTIONS ${vmoptsFile}
ln -s "$item/share/applications" $out/share
'';

25
pkgs/applications/editors/jetbrains/default.nix
View File

@ -2,12 +2,13 @@
, python
, jdk, cmake, libxml2, zlib, python3, ncurses5
, dotnet-sdk_3
, vmopts ? null
}:
with stdenv.lib;
let
mkJetBrainsProduct = callPackage ./common.nix { };
mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; };
# Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass, ... }:
@ -48,7 +49,7 @@ let
patchelf \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
patchelf \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
@ -268,12 +269,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
version = "2020.2.5"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */
sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -294,12 +295,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
version = "2020.2.3"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */
sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@ -346,12 +347,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */
sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@ -359,12 +360,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2020.2.5"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */
sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@ -372,12 +373,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2020.2.5"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */
sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";

6
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View File

@ -39,12 +39,12 @@
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.17.0";
buildNumber = "11";
version = "2.19.0";
buildNumber = "61";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68";
sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr";
};
nativeBuildInputs = [ rpmextract makeWrapper ];

3
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
, debugSupport ? false
, guiSupport ? true, dbus ? null # GUI OR headless
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
, trackerSearch ? true, python3 ? null
}:
@ -21,6 +21,7 @@ mkDerivation rec {
sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]

4
pkgs/applications/window-managers/i3/lock-color.nix
View File

@ -55,8 +55,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ malyn ];
license = licenses.bsd3;
# Needs the SSE2 instruction set. See upstream issue
# https://github.com/chrjguill/i3lock-color/issues/44
platforms = platforms.x86;
platforms = platforms.all;
};
}

18
pkgs/build-support/rust/build-rust-crate/test/default.nix
View File

@ -146,12 +146,18 @@ let
};
in
runCommand "assert-outputs-${name}" {
} ''
} (''
local actualFiles=$(mktemp)
cd "${crateOutput}"
find . -type f | sort >$actualFiles
diff -q ${expectedFilesFile} $actualFiles >/dev/null || {
find . -type f \
| sort \
''
# sed out the hash because it differs per platform
+ ''
| sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \
> "$actualFiles"
diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || {
echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
echo === Got:
sed -e 's/^/ /' $actualFiles
@ -164,7 +170,7 @@ let
exit 1
}
touch $out
''
'')
;
in rec {
@ -594,7 +600,7 @@ let
};
expectedFiles = [
"./nix-support/propagated-build-inputs"
"./lib/libtest_lib-042a1fdbef.rlib"
"./lib/libtest_lib-HASH.rlib"
"./lib/link"
];
};
@ -611,7 +617,7 @@ let
};
expectedFiles = [
"./nix-support/propagated-build-inputs"
"./lib/libtest_lib-042a1fdbef.rlib"
"./lib/libtest_lib-HASH.rlib"
"./lib/link"
];
};

2
pkgs/development/libraries/libmodulemd/default.nix
View File

@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/fedora-modularity/libmodulemd";
license = licenses.mit;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin ;
};
}

2
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -21,7 +21,7 @@ let param = {
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}"
then throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
else
buildDunePackage rec {

26
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
View File

@ -1,21 +1,19 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler
{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
stdenv.mkDerivation rec {
version = "3.2.1";
pname = "js_of_ocaml-camlp4";
buildDunePackage rec {
version = "3.2.1";
pname = "js_of_ocaml-camlp4";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
inherit (js_of_ocaml-compiler) installPhase meta;
inherit (js_of_ocaml-compiler) meta;
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
buildPhase = "dune build -p js_of_ocaml-camlp4";
buildInputs = [ camlp4 ocsigen_deriving ];
}

32
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@ -1,28 +1,28 @@
{ lib, fetchurl, buildDunePackage
, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree
, cmdliner, cppo, yojson, ppxlib
, menhir
}:
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "3.7.1";
useDune2 = true;
pname = "js_of_ocaml-compiler";
version = "3.8.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "0i0smhvsfx2ydmbyg5ai5cgqsfnng8rkcvys4i3fa55cw24aknrn";
};
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
};
nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ];
nativeBuildInputs = [ cppo menhir ];
buildInputs = [ cmdliner ];
configurePlatforms = [];
propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ];
propagatedBuildInputs = [ yojson ppxlib ];
meta = {
description = "Compiler from OCaml bytecode to Javascript";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://ocsigen.org/js_of_ocaml/";
};
meta = {
description = "Compiler from OCaml bytecode to Javascript";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://ocsigen.org/js_of_ocaml/";
};
}

17
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -1,16 +1,13 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
{ buildDunePackage, js_of_ocaml-compiler
, ppxlib, uchar
}:
stdenv.mkDerivation {
pname = "js_of_ocaml";
buildDunePackage {
pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
nativeBuildInputs = [ ocaml findlib dune_2 ];
buildInputs = [ ppxlib ];
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "dune build -p js_of_ocaml";
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
}

15
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
View File

@ -1,16 +1,13 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned
{ buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx
, js_of_ocaml, ocaml_lwt, lwt_log
}:
stdenv.mkDerivation {
pname = "js_of_ocaml-lwt";
buildDunePackage {
pname = "js_of_ocaml-lwt";
inherit (js_of_ocaml-compiler) version src installPhase meta;
inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
buildPhase = "dune build -p js_of_ocaml-lwt";
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
}

14
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
View File

@ -1,15 +1,11 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
{ buildDunePackage, js_of_ocaml-compiler
, ocamlbuild
}:
stdenv.mkDerivation {
pname = "js_of_ocaml-ocamlbuild";
buildDunePackage {
pname = "js_of_ocaml-ocamlbuild";
inherit (js_of_ocaml-compiler) version src installPhase meta;
inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ ocamlbuild ];
buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
propagatedBuildInputs = [ ocamlbuild ];
}

14
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
View File

@ -1,14 +1,12 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned
{ buildDunePackage, js_of_ocaml-compiler
, ppxlib
, js_of_ocaml
}:
stdenv.mkDerivation {
pname = "js_of_ocaml-ppx";
buildDunePackage {
pname = "js_of_ocaml-ppx";
inherit (js_of_ocaml-compiler) version src installPhase meta;
inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "dune build -p js_of_ocaml-ppx";
buildInputs = [ ppxlib js_of_ocaml ];
}

18
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View File

@ -1,19 +1,11 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
{ buildDunePackage, js_of_ocaml-compiler
, js_of_ocaml, ppxlib
}:
if !stdenv.lib.versionAtLeast ppxlib.version "0.14"
then throw "js_of_ocaml-ppx_deriving_json is not compatible with ppxlib ${ppxlib.version}"
else
buildDunePackage {
pname = "js_of_ocaml-ppx_deriving_json";
stdenv.mkDerivation {
pname = "js_of_ocaml-ppx_deriving_json";
inherit (js_of_ocaml-compiler) version src meta useDune2;
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
}

16
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View File

@ -1,16 +1,14 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
{ buildDunePackage, js_of_ocaml-compiler
, js_of_ocaml-ppx
, js_of_ocaml, reactivedata, tyxml
}:
stdenv.mkDerivation {
pname = "js_of_ocaml-tyxml";
buildDunePackage {
pname = "js_of_ocaml-tyxml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
buildPhase = "dune build -p js_of_ocaml-tyxml";
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
}

6
pkgs/games/frogatto/data.nix
View File

@ -7,9 +7,9 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "frogatto";
repo = "frogatto";
# master branch as of 2018-12-18
rev = "8f261b5d3fca3c88e6a534316a28378cf687d3e5";
sha256 = "0nyfwfyy5gxp61ydna299nq9p5wra9mk0bf1drdngg6bwws1hrqx";
# master branch as of 2020-12-17
rev = "c1d0813b3b755a4e232369b6791397ad058efc16";
sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg";
};
installPhase = ''

2
pkgs/games/frogatto/default.nix
View File

@ -14,7 +14,7 @@ let
genericName = "frogatto";
categories = "Game;ArcadeGame;";
};
version = "unstable-2018-12-18";
version = "unstable-2020-12-04";
in buildEnv {
name = "frogatto-${version}";

4
pkgs/games/frogatto/engine.nix
View File

@ -10,8 +10,8 @@ stdenv.mkDerivation {
owner = "anura-engine";
repo = "anura";
# trunk branch as of 2018-11-28
rev = "8070111467802dc772c0a6c7806ecd16b0bcdaa9";
sha256 = "0xbqwfmws69n7iiz17n93h4jiw39cwyf7hxw0qi2c8cccr37b1nr";
rev = "a05f413f255d2854019134be817c253a03da3d9f";
sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b";
fetchSubmodules = true;
};

2
pkgs/games/xonotic/default.nix
View File

@ -45,7 +45,7 @@ let
desktopItem = makeDesktopItem {
name = "xonotic";
exec = "$out/bin/xonotic";
exec = "xonotic";
comment = meta.description;
desktopName = "Xonotic";
categories = "Game;Shooter;";

1
pkgs/test/default.nix
View File

@ -39,6 +39,7 @@ with pkgs;
cross = callPackage ./cross {};
rustCustomSysroot = callPackage ./rust-sysroot {};
buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };
nixos-functions = callPackage ./nixos-functions {};

6
pkgs/tools/misc/lf/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lf";
version = "17";
version = "18";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8";
sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6";
};
vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs";
vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";
nativeBuildInputs = [ installShellFiles ];

9
pkgs/tools/package-management/librepo/default.nix
View File

@ -35,11 +35,12 @@ stdenv.mkDerivation rec {
libxml2
glib
openssl
zchunk
curl
check
gpgme
];
]
# zchunk currently has issues compiling in darwin, fine in linux
++ stdenv.lib.optional stdenv.isLinux zchunk;
# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
propagatedBuildInputs = [
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
];
] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF";
postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py"
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
homepage = "https://rpm-software-management.github.io/librepo/";
license = licenses.lgpl2Plus;
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ copumpkin ];
};
}

4
pkgs/tools/text/ugrep/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
version = "3.0.6";
version = "3.1.0";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6";
sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l";
};
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];

4
pkgs/top-level/all-packages.nix
View File

@ -10104,7 +10104,6 @@ in
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
cargo-web = callPackage ../development/tools/cargo-web {
@ -21720,6 +21719,7 @@ in
};
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
vmopts = config.jetbrains.vmopts or null;
jdk = jetbrains.jdk;
}) // {
jdk = callPackage ../development/compilers/jetbrains-jdk { };
@ -23015,7 +23015,7 @@ in
if stdenv.isDarwin then
callPackage ../applications/audio/musescore/darwin.nix { }
else
libsForQt5.callPackage ../applications/audio/musescore { };
libsForQt514.callPackage ../applications/audio/musescore { };
mmh = callPackage ../applications/networking/mailreaders/mmh { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };