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: dcb10552357b
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: 79ed9e6ebf1a
Choose a head ref
  • 8 commits
  • 14 files changed
  • 7 contributors

Commits on Mar 17, 2020

  1. maintainers: add raboof

    raboof committed Mar 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    woodruffw William Woodruff
    Copy the full SHA
    f22706e View commit details
  2. notion: 3-2019050101 -> 4.0.0

    raboof committed Mar 17, 2020
    Copy the full SHA
    c0ef740 View commit details

Commits on Mar 27, 2020

  1. timetrap: 1.15.1 -> 1.15.2

    jerith666 committed Mar 27, 2020
    Copy the full SHA
    68e43c6 View commit details
  2. last: 1047 -> 1060

    r-ryantm committed Mar 27, 2020
    Copy the full SHA
    bd3fbef View commit details
  3. Merge pull request #83460 from jerith666/timetrap-1-15-2

    timetrap: 1.15.1 -> 1.15.2
    marsam authored Mar 27, 2020
    Copy the full SHA
    27b8dcf View commit details
  4. Merge pull request #83464 from r-ryantm/auto-update/last

    last: 1047 -> 1060
    ryantm authored Mar 27, 2020
    Copy the full SHA
    c669d29 View commit details
  5. poetry2nix: 1.6.0 -> 1.6.1

    adisbladis committed Mar 27, 2020
    Copy the full SHA
    7401afc View commit details
  6. Merge pull request #70610 from raboof/notion4

    notion: 3-2019050101 -> 4.0.0
    AndersonTorres authored Mar 27, 2020
    Copy the full SHA
    79ed9e6 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -6016,6 +6016,11 @@
fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97";
}];
};
raboof = {
email = "arnout@bzzt.net";
github = "raboof";
name = "Arnout Engelen";
};
rafaelgg = {
email = "rafael.garcia.gallego@gmail.com";
github = "rafaelgg";
12 changes: 6 additions & 6 deletions pkgs/applications/office/timetrap/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ GEM
remote: https://rubygems.org/
specs:
chronic (0.10.2)
sequel (4.43.0)
sqlite3 (1.3.13)
timetrap (1.15.1)
sequel (5.30.0)
sqlite3 (1.4.2)
timetrap (1.15.2)
chronic (~> 0.10.2)
sequel (~> 4.43.0)
sqlite3 (~> 1.3.3)
sequel (~> 5.30.0)
sqlite3 (~> 1.4.2)

PLATFORMS
ruby
@@ -16,4 +16,4 @@ DEPENDENCIES
timetrap

BUNDLED WITH
1.17.2
1.17.3
12 changes: 6 additions & 6 deletions pkgs/applications/office/timetrap/gemset.nix
Original file line number Diff line number Diff line change
@@ -14,30 +14,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0";
sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr";
type = "gem";
};
version = "4.43.0";
version = "5.30.0";
};
sqlite3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
type = "gem";
};
version = "1.3.13";
version = "1.4.2";
};
timetrap = {
dependencies = ["chronic" "sequel" "sqlite3"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd";
sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8";
type = "gem";
};
version = "1.15.1";
version = "1.15.2";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/science/biology/last/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "last";
version = "1047";
version = "1060";

src = fetchurl {
url = "http://last.cbrc.jp/last-${version}.zip";
sha256 = "06fj4qfw3dd35y3pky3dnr40v1alf43wjx373rbx1vr3hbgzvgf8";
sha256 = "0h0604rxg0z0h21dykrnxsb4679zfhibg79gss1v2ik5xpdxl8kk";
};

nativeBuildInputs = [ unzip ];
14 changes: 7 additions & 7 deletions pkgs/applications/window-managers/notion/default.nix
Original file line number Diff line number Diff line change
@@ -7,33 +7,33 @@

stdenv.mkDerivation rec{
pname = "notion";
version = "3-2019050101";
version = "4.0.0";

src = fetchFromGitHub {
owner = "raboof";
repo = pname;
rev = version;
sha256 = "09kvgqyw0gnj3jhz9gmwq81ak8qy32vyanx1hw79r6m181aysspz";
sha256 = "0rqfvwkj0j862hf6i4wsmb6185xibsskfj9kwy896qcpcg8w4kk7";
};

nativeBuildInputs = [ pkgconfig makeWrapper groff ];
buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM
libXinerama libXrandr libXft xlibsWrapper ];

buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];
buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];

makeFlags = [ "PREFIX=\${out}" ];
makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ];

postInstall = ''
wrapProgram $out/bin/notion \
--prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \
'';

meta = with stdenv.lib; {
description = "Tiling tabbed window manager, follow-on to the Ion";
homepage = "https://notionwm.net/";
description = "Tiling tabbed window manager";
homepage = "https://notionwm.net";
license = licenses.lgpl21;
maintainers = with maintainers; [ jfb AndersonTorres ];
maintainers = with maintainers; [ jfb AndersonTorres raboof ];
platforms = platforms.linux;
};
}
2 changes: 0 additions & 2 deletions pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,8 @@
, lib ? pkgs.lib
, version
}:

let
inherit (pkgs) python3;

in
pkgs.stdenv.mkDerivation {
pname = "poetry2nix";
Loading