mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/top-level/aliases.nix
This commit is contained in:
commit
ac5b189b0c
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.3.3"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.3.4"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-WycjNxPa4hkxBtT8Pq7ayUu8pNV0DvaJ+29GDKNJNWE=";
|
||||
sha256 = "sha256-n8QaOYFLQYxJcq/+7bBIKuYtqeIJIwa8b1pniH+FMXk=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
}: stdenv.mkDerivation rec {
|
||||
|
||||
pname = "vdr";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.tvdr.de/vdr.git";
|
||||
rev = version;
|
||||
sha256 = "sha256-TZm9pN9xtqkKhETsUhIIalK+4xQpFV3TXyWychSoyRk=";
|
||||
sha256 = "sha256-jKuvh1OruPXTBlgLwlwcJdqC8u0WBDr/Un5JUL3U0hw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -732,7 +732,7 @@ mapAliases ({
|
|||
mpd_clientlib = libmpdclient; # Added 2021-02-11
|
||||
mpich2 = mpich; # Added 2018-08-06
|
||||
msf = metasploit; # Added 2018-04-25
|
||||
multimc = throw "multimc was removed from nixpkgs; use polymc instead"; # Added 2022-01-08
|
||||
multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
|
||||
mumble_git = pkgs.mumble; # Added 2019-08-01
|
||||
murmur_git = pkgs.murmur; # Added 2019-08-01
|
||||
mysql-client = hiPrio mariadb.client;
|
||||
|
|
Loading…
Reference in a new issue