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-26 12:23:20 +00:00 committed by GitHub
commit 1ccbdbb3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/sonata/default.nix
View File

@ -5,13 +5,13 @@ let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
in buildPythonApplication rec {
pname = "sonata";
version = "1.7b1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "multani";
repo = "sonata";
rev = "v${version}";
sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh";
sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x";
};
disabled = !isPy3k;

4
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
View File

@ -20,13 +20,13 @@
python3Packages.buildPythonApplication rec {
pname = "gnome-tweaks";
version = "3.34.0";
version = "3.34.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0";
sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq";
};
nativeBuildInputs = [

6
pkgs/development/compilers/ocaml/4.12.nix
View File

@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "12";
patch_version = "0-alpha2";
patch_version = "0-alpha3";
src = fetchTarball {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha2.tar.xz";
sha256 = "148vgjcfajjvrvh0q9kb2y7fszqd02cikb5wyznz7kjxka6xxyn9";
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz";
sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw";
};
}

9
pkgs/development/ocaml-modules/ounit2/default.nix
View File

@ -1,18 +1,21 @@
{ lib, buildDunePackage, fetchurl, stdlib-shims }:
{ lib, ocaml, buildDunePackage, fetchurl, stdlib-shims, ncurses }:
buildDunePackage rec {
minimumOCamlVersion = "4.04";
pname = "ounit2";
version = "2.2.3";
version = "2.2.4";
src = fetchurl {
url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz";
sha256 = "1naahh24lbyxmrnzpfz8karniqbf1nknivf96mrvsr6zlx5ad072";
sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m";
};
propagatedBuildInputs = [ stdlib-shims ];
doCheck = true;
checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;
meta = with lib; {
homepage = "https://github.com/gildor478/ounit";
description = "A unit test framework for OCaml";