Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 936c9f4118f2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a88aa9e0cdc
Choose a head ref
  • 5 commits
  • 5 files changed
  • 5 contributors

Commits on Feb 8, 2019

  1. bat: 0.9.0 -> 0.10.0

    @dywedir
    dywedir committed Feb 8, 2019
    Copy the full SHA
    edf7cde View commit details

Commits on Feb 11, 2019

  1. ocamlPackages.topkg: 0.9.1 -> 1.0.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-topkg/versions
    @r-ryantm @vbgl
    r-ryantm authored and vbgl committed Feb 11, 2019
    Copy the full SHA
    8c2d2cb View commit details

  2. sage: add compatibility for sphinx 1.8.3 (#55078) (#55560) 

    Since NixOS/nixpkgs#48841 was replaced by
NixOS/nixpkgs#54186, this needs to be done
separately.

(cherry picked from commit 33db01e)
    @timokau
    timokau authored Feb 11, 2019
    Copy the full SHA
    342333c View commit details

  3. Merge pull request #55433 from dywedir/bat 

    bat: 0.9.0 -> 0.10.0
    @worldofpeace
    worldofpeace authored Feb 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8eadf8d View commit details

  4. sway-beta: 1.0-rc1 -> 1.0-rc2

    @primeos
    primeos committed Feb 11, 2019
    Copy the full SHA
    1a88aa9 View commit details
14 changes: 14 additions & 0 deletions pkgs/applications/science/math/sage/sage-src.nix
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,20 @@ stdenv.mkDerivation rec {
rev = "cd62d45bcef93fb4f7ed62609a46135e6de07051";
sha256 = "08l2b9w0rn1zrha6188j72f7737xs126gkgmydjd31baa6367np2";
})

# https://trac.sagemath.org/ticket/26949
(fetchpatch {
name = "sphinx-1.8.3-dependency.patch";
url = "https://git.sagemath.org/sage.git/patch?id=d305eda0fedc73fdbe0447b5d6d2b520b8d112c4";
sha256 = "1x3q5j8lq35vlj893gj5gq9fhzs60szm9r9rx6ri79yiy9apabph";
})
# https://trac.sagemath.org/ticket/26451
(fetchpatch {
name = "sphinx-1.8.3.patch";
url = "https://git.sagemath.org/sage.git/patch?id2=0cb494282d7b4cea50aba7f4d100e7932a4c00b1&id=62b989d5ee1d9646db85ea56053cd22e9ffde5ab";
sha256 = "1n5c61mvhalcr2wbp66wzsynwwk59aakvx3xqa5zw9nlkx3rd0h1";
})

];

patches = nixPatches ++ packageUpgradePatches;
14 changes: 3 additions & 11 deletions pkgs/applications/science/math/sage/sagenb.nix
View file
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@

buildPythonPackage rec {
pname = "sagenb";
version = "2018-06-26"; # not 1.0.1 because of new flask syntax
version = "1.1.2";

src = fetchFromGitHub {
owner = "sagemath";
repo = "sagenb";
rev = "b360a0172e15501fb0163d02dce713a561fee2af";
sha256 = "12anydw0v9w23rbc0a94bqmjhjdir9h820c5zdhipw9ccdcc2jlf";
rev = version;
sha256 = "0bxvhr03qh2nsjdfc4pyfiqrn9jhp3vf7irsc9gqx0185jlblbxs";
};

propagatedBuildInputs = [
@@ -39,14 +39,6 @@ buildPythonPackage rec {
# tests depend on sage
doCheck = false;

patches = [
# work with latest flask-babel
(fetchpatch {
url = "https://github.com/sagemath/sagenb/commit/ba065eca63dd34a383e4c7ba7561430a90fcd087.patch";
sha256 = "1lamzsrgymdd618imrasjp6ivhw2aynh83gkybsd7pm1rzjcq4x8";
})
];

meta = with stdenv.lib; {
description = "Sage Notebook";
license = licenses.gpl3Plus;
12 changes: 8 additions & 4 deletions pkgs/applications/window-managers/sway/beta.nix
View file
Original file line number Diff line number Diff line change
@@ -10,15 +10,19 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "sway";
version = "1.0-rc1";
version = "1.0-rc2";

src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz";
sha256 = "052if3nagmwg5zh79nhrq75fbc9v2x950lcs1mal52p801qiv8f1";
};

postPatch = ''
sed -iE "s/version: '1.0',/version: '${version}',/" meson.build
'';

nativeBuildInputs = [
pkgconfig meson ninja
] ++ stdenv.lib.optional buildDocs scdoc;
@@ -32,8 +36,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

mesonFlags = [
"-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
"-Dman-pages=enabled" "-Dtray=enabled"
"-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
"-Dtray=enabled"
];

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/topkg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@ in

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-topkg-${version}";
version = "0.9.1";
version = "1.0.0";

src = fetchurl {
url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz";
sha256 = "1slrzbmyp81xhgsfwwqs2d6gxzvqx0gcp34rq00h5iblhcq7myx6";
sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw";
};

buildInputs = [ ocaml findlib ocamlbuild ];
6 changes: 3 additions & 3 deletions pkgs/tools/misc/bat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@

rustPlatform.buildRustPackage rec {
name = "bat-${version}";
version = "0.9.0";
version = "0.10.0";

src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
sha256 = "13c88h1m9flmx3x2h7xrnb1wy4vgdxsqahw8cqa0x61ay0019a7s";
sha256 = "1q22lbyrwh58vhznpjpkiaa8v4qv6a3a8lrxzaypd8wg78p9dca6";
fetchSubmodules = true;
};

cargoSha256 = "1clng4rl7mq50z8d5ipmr9fapjj4qmpf4gmdnfl6vs35pq3wp9j4";
cargoSha256 = "0npj2rf4vr45gq3qwqq6kqnv9dh58v5lpx0gsmy2qrq44dxb75rq";

nativeBuildInputs = [ cmake pkgconfig zlib ];