ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-27 12:23:21 +00:00 committed by GitHub
commit ed85c4f3c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/android-studio/common.nix
View File

@ -1,4 +1,4 @@
{ channel, pname, version, build, sha256Hash }:
{ channel, pname, version, build ? null, sha256Hash }:
{ alsaLib
, bash
@ -53,11 +53,13 @@
let
drvName = "android-studio-${channel}-${version}";
filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz";
androidStudio = stdenv.mkDerivation {
name = "${drvName}-unwrapped";
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz";
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}";
sha256 = sha256Hash;
};

11
pkgs/applications/editors/android-studio/default.nix
View File

@ -14,14 +14,13 @@ let
sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os=";
};
betaVersion = {
version = "4.2.0.17"; # "Android Studio 4.2 Beta 1"
build = "202.6987402";
sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7";
version = "4.2.0.18"; # "Android Studio 4.2 Beta 2"
build = "202.7008469";
sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh";
};
latestVersion = { # canary & dev
version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2"
build = "202.7006259";
sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5";
version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3"
sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx";
};
in {
# Attributes are named by their corresponding release channels

4
pkgs/applications/kde/yakuake.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdoctools, extra-cmake-modules,
karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
knotifyconfig, konsole, kparts, kwayland, kwindowsystem, qtx11extras
}:
mkDerivation {
@ -9,7 +9,7 @@ mkDerivation {
buildInputs = [
karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
knotifyconfig kparts kwindowsystem qtx11extras
knotifyconfig kparts kwayland kwindowsystem qtx11extras
];
propagatedBuildInputs = [

4
pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
View File

@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "mlarchive2maildir";
version = "0.0.8";
version = "0.0.9";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp";
sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";
};
nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];

15
pkgs/applications/radio/soapyuhd/default.nix
View File

@ -1,22 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
{ stdenv, fetchFromGitHub, cmake, pkg-config
, uhd, boost, soapysdr
} :
let
version = "0.3.6";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "soapyuhd";
inherit version;
version = "0.4.1";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapyUHD";
rev = "soapy-uhd-${version}";
sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7";
sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ uhd boost soapysdr ];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
@ -28,7 +25,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/pothosware/SoapyAirspy";
description = "SoapySDR plugin for UHD devices";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ markuskowa ];
platforms = platforms.linux;
};

2
pkgs/desktops/xfce/applications/orage/default.nix
View File

@ -28,7 +28,7 @@ mkXfceDerivation {
# Fix build with libical 3.0
(fetchpatch {
name = "fix-libical3.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f";
url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10";
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];

4
pkgs/development/python-modules/casbin/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "0.14.0";
version = "0.15.0";
disabled = isPy27;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "0k5dhhlypilpa7h6ncqldvc14bv70c8mb2bbj7vyzfwahy57zb29";
sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/django-storages/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-storages";
version = "1.11";
version = "1.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "7af56611c62a1c174aab4e862efb7fdd98296dccf76f42135f5b6851fc313c97";
sha256 = "c823dbf56c9e35b0999a13d7e05062b837bae36c518a40255d522fbe3750fbb4";
};
propagatedBuildInputs = [ django ];