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: e99ec699a43b
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: 7b819104a216
Choose a head ref
  • 5 commits
  • 3 files changed
  • 4 contributors

Commits on Jan 26, 2020

  1. strawberry: 0.6.7 -> 0.6.8

    @r-ryantm
    r-ryantm committed Jan 26, 2020
    Copy the full SHA
    daf94bb View commit details

Commits on Jan 27, 2020

  1. gradm: 3.1-201608131257 -> 3.1-201903191516

    @r-ryantm
    r-ryantm committed Jan 27, 2020

    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
    5eb3be2 View commit details

  2. joplin-desktop: Add a desktop Item for joplin-desktop

    @Scriptkiddi @Lassulus
    Scriptkiddi authored and Lassulus committed Jan 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05e661f View commit details

  3. Merge pull request #78531 from r-ryantm/auto-update/strawberry 

    strawberry: 0.6.7 -> 0.6.8
    @peterhoeg
    peterhoeg authored Jan 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    99243ec View commit details

  4. Merge pull request #78586 from r-ryantm/auto-update/gradm 

    gradm: 3.1-201608131257 -> 3.1-201903191516
    @joachifm
    joachifm authored Jan 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7b81910 View commit details
Showing with 17 additions and 6 deletions.
  1. +2 −2 pkgs/applications/audio/strawberry/default.nix
  2. +13 −2 pkgs/applications/misc/joplin-desktop/default.nix
  3. +2 −2 pkgs/os-specific/linux/gradm/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/strawberry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,13 +35,13 @@

mkDerivation rec {
pname = "strawberry";
version = "0.6.7";
version = "0.6.8";

src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
sha256 = "14bw4hmysrbl4havz03s3wl8bv76380wddf5zzrjvfjjpwn333r6";
sha256 = "0jc1m1855dg3f1i1p744c5s42ssmjs61znw4cf28ifamw1nbr1r5";
};

buildInputs = [
15 changes: 13 additions & 2 deletions pkgs/applications/misc/joplin-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, makeDesktopItem }:

let
pname = "joplin-desktop";
version = "1.0.177";
desktopItem = makeDesktopItem {
name = "Joplin";
exec = "joplin-desktop";
type = "Application";
desktopName = "Joplin";
};
in appimageTools.wrapType2 rec {
name = "${pname}-${version}";
src = fetchurl {
@@ -18,7 +24,12 @@ in appimageTools.wrapType2 rec {

multiPkgs = null; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = "mv $out/bin/{${name},${pname}}";
extraInstallCommands = ''
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications
mv $out/bin/{${name},${pname}}
'';


meta = with lib; {
description = "An open source note taking and to-do application with synchronisation capabilities";
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/gradm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "gradm";
version = "3.1-201608131257";
version = "3.1-201903191516";

src = fetchurl {
url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz";
sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb";
sha256 = "1wszqwaswcf08s9zbvnqzmmfdykyfcy16w8xjia20ypr7wwbd86k";
};

nativeBuildInputs = [ bison flex ];