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: dae3575cee5b
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: d387c2dd552b
Choose a head ref
  • 14 commits
  • 13 files changed
  • 8 contributors

Commits on Nov 10, 2019

  1. kde_applications: 19.08.1 -> 19.08.2 

    (cherry picked from commit a83d96f)
    @nyanloutre @edolstra
    nyanloutre authored and edolstra committed Nov 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2469995 View commit details

Commits on Nov 30, 2019

  1. qtpass: scope qrencode 

    (cherry picked from commit 442670f)
    @c0bw3b
    c0bw3b committed Nov 30, 2019
    Copy the full SHA
    65ebe52 View commit details

  2. linux: 4.4.203 -> 4.4.205 

    (cherry picked from commit 9d07976)
    @NeQuissimus
    NeQuissimus committed Nov 30, 2019
    Copy the full SHA
    22a18d4 View commit details

  3. linux: 4.9.203 -> 4.9.205 

    (cherry picked from commit 77ce626)
    @NeQuissimus
    NeQuissimus committed Nov 30, 2019
    Copy the full SHA
    dcb79ef View commit details

  4. linux: 5.3.13 -> 5.3.14 

    (cherry picked from commit 0e2e1af)
    @NeQuissimus
    NeQuissimus committed Nov 30, 2019
    Copy the full SHA
    4624928 View commit details

  5. linux: 5.3.14 -> 5.4.1 

    Update latest kernel from 5.3.x to 5.4.x series
    @NeQuissimus
    NeQuissimus committed Nov 30, 2019
    Copy the full SHA
    63c756d View commit details

Commits on Dec 1, 2019

  1. linux: 4.14.156 -> 4.14.157 

    (cherry picked from commit 9d38dd4)
    @NeQuissimus
    NeQuissimus committed Dec 1, 2019
    Copy the full SHA
    7232107 View commit details

  2. linux: 4.19.86 -> 4.19.87 

    (cherry picked from commit c4dc27c)
    @NeQuissimus
    NeQuissimus committed Dec 1, 2019
    Copy the full SHA
    c37b370 View commit details

Commits on Dec 2, 2019

  1. lib/versions: expose splitVersion 

    (cherry picked from commit fd30529)
    @joachifm
    joachifm authored and Jon committed Dec 2, 2019
    Copy the full SHA
    3757f29 View commit details

  2. strawberry: 0.6.3 -> 0.6.5 (#71878) 

    * strawberry: 0.6.3 -> 0.6.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/strawberry/versions

* strawberry: add meta.homepage and meta.changelog

(cherry picked from commit a701093)
    @r-ryantm @lsix
    r-ryantm authored and lsix committed Dec 2, 2019
    Copy the full SHA
    27f0c19 View commit details

  3. strawberry: 0.6.5 -> 0.6.6 

    (cherry picked from commit 06d842e)
    @r-ryantm @lsix
    r-ryantm authored and lsix committed Dec 2, 2019
    Copy the full SHA
    bc5070b View commit details

  4. strawberry: 0.6.6 -> 0.6.7 

    (cherry picked from commit adc9ccd)
    @lsix
    lsix committed Dec 2, 2019
    Copy the full SHA
    6b68f17 View commit details

  5. Merge pull request #73172 from edolstra/backport-kde-19.08.2 

    kde_applications: 19.08.1 -> 19.08.2
    @ttuegel
    ttuegel authored Dec 2, 2019
    Copy the full SHA
    5ec872f View commit details

  6. haproxy: 1.9.8 -> 1.9.13 (security) (#74803) 

    addressing CVE-2019-19330
    @risicle @c0bw3b
    risicle authored and c0bw3b committed Dec 2, 2019
    Copy the full SHA
    d387c2d View commit details
2 changes: 2 additions & 0 deletions lib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -135,5 +135,7 @@ let
mergeAttrsByFuncDefaultsClean mergeAttrBy
fakeSha256 fakeSha512
nixType imap;
inherit (versions)
splitVersion;
});
in lib
12 changes: 7 additions & 5 deletions lib/versions.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/* Version string functions. */
{ lib }:

let
rec {

splitVersion = builtins.splitVersion or (lib.splitString ".");

in
/* Break a version string into its component parts.
{
Example:
splitVersion "1.2.3"
=> ["1" "2" "3"]
*/
splitVersion = builtins.splitVersion or (lib.splitString ".");

/* Get the major version string from a string.
10 changes: 6 additions & 4 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.3";
version = "0.6.7";

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

buildInputs = [
@@ -89,9 +89,11 @@ mkDerivation rec {

meta = with lib; {
description = "Music player and music collection organizer";
license = licenses.gpl2;
homepage = "https://www.strawberrymusicplayer.org/";
changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
# upstream says darwin should work but they lack maintainers as of 0.6.3
# upstream says darwin should work but they lack maintainers as of 0.6.6
platforms = platforms.linux;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/kde/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ )
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.2/ )
Loading