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: 3155fbff0adc
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: 5c20107e626d
Choose a head ref
  • 9 commits
  • 5 files changed
  • 7 contributors

Commits on Aug 29, 2019

  1. hubstaff: 1.4.9 -> 1.4.10

    @srghma
    srghma committed Aug 29, 2019
    Copy the full SHA
    7f88d0f View commit details

  2. rsclock: 0.1.0 -> 0.1.4

    @valebes
    valebes committed Aug 29, 2019
    Copy the full SHA
    b5fc76e View commit details

  3. plex-media-player: 2.36.0.988 -> 2.40.0.1007

    Averell Dalton committed Aug 29, 2019
    Copy the full SHA
    3162cc1 View commit details

  4. ffsend: v0.2.50 -> v0.2.51

    @lilyball
    lilyball committed Aug 29, 2019
    Copy the full SHA
    8d084f6 View commit details

Commits on Aug 30, 2019

  1. pythonPackage.nixpart0: disable for python3

    Jonathan Ringer authored and Matthieu Coudron committed Aug 30, 2019
    Copy the full SHA
    5fe68fd View commit details

  2. Merge pull request #67720 from valebes/rsclock-0.1.4 

    rsclock: 0.1.0 -> 0.1.4
    @mmahut
    mmahut authored Aug 30, 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
    26f9a8a View commit details

  3. Merge pull request #67671 from srghma/hubstaff_update 

    hubstaff: 1.4.9 -> 1.4.10
    @mmahut
    mmahut authored Aug 30, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    3b67af5 View commit details

  4. Merge pull request #67721 from averelld/pmp-upgrade 

    plex-media-player: 2.36.0.988 -> 2.40.0.1007
    @dywedir
    dywedir authored Aug 30, 2019
    Copy the full SHA
    73bc17f View commit details

  5. Merge pull request #67729 from lilyball/ffsend_v0.2.51 

    ffsend: v0.2.50 -> v0.2.51
    @dywedir
    dywedir authored Aug 30, 2019
    Copy the full SHA
    5c20107 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/misc/hubstaff/revision.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.9-86828309/Hubstaff-1.4.9-86828309.sh",
"version": "1.4.9-86828309",
"sha256": "0p9b7s2damzxmbrm8m97bj06g0faslbjw51dmxq8icz6ldbqsspx"
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh",
"version": "1.4.10-848554d6",
"sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z"
}
6 changes: 3 additions & 3 deletions pkgs/applications/misc/rsclock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "rsClock";
version = "0.1.0";
version = "0.1.4";

src = fetchFromGitHub {
owner = "valebes";
repo = pname;
rev = "v${version}";
sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh";
sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
};

cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n";
cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr";

meta = with stdenv.lib; {
description = "A simple terminal clock written in Rust";
22 changes: 11 additions & 11 deletions pkgs/applications/video/plex-media-player/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,41 +9,41 @@ let
# plex-media-player is updated, the versions for these files are changed,
# so the build IDs (and SHAs) below will need to be updated!
depSrcs = rec {
webClientBuildId = "129-669a5eed7ae231";
webClientDesktopBuildId = "3.100.1-d7ae231";
webClientTvBuildId = "3.105.0-669a5ee";
webClientBuildId = "141-4af71961b12c68";
webClientDesktopBuildId = "3.104.2-1b12c68";
webClientTvBuildId = "4.3.0-4af7196";

webClient = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk";
sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p";
};
webClientDesktopHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg";
sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f";
};
webClientDesktop = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa";
sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z";
};
webClientTvHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd";
sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa";
};
webClientTv = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk";
sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455";
};
};
in mkDerivation rec {
name = "plex-media-player-${version}";
version = "2.36.0.988";
vsnHash = "0150ae52";
version = "2.40.0.1007";
vsnHash = "5482132c";

src = fetchFromGitHub {
owner = "plexinc";
repo = "plex-media-player";
rev = "v${version}-${vsnHash}";
sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0";
sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli";
};

nativeBuildInputs = [ pkgconfig cmake python3 ];
14 changes: 8 additions & 6 deletions pkgs/tools/filesystems/nixpart/0.4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -54,22 +54,24 @@ let
};

in buildPythonApplication rec {
name = "nixpart-${version}";
pname = "nixpart";
version = "0.4.1";
disabled = python.isPy3k;

src = fetchurl {
url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
url = "https://github.com/NixOS/nixpart/archive/v${version}.tar.gz";
sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
};

propagatedBuildInputs = [ blivet ];

doCheck = false;

meta = {
meta = with stdenv.lib; {
description = "NixOS storage manager/partitioner";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.aszlig ];
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/NixOS/nixpart";
license = licenses.gpl2Plus;
maintainers = [ maintainers.aszlig ];
platforms = platforms.linux;
};
}
6 changes: 3 additions & 3 deletions pkgs/tools/misc/ffsend/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,16 +16,16 @@ with rustPlatform;

buildRustPackage rec {
pname = "ffsend";
version = "0.2.50";
version = "0.2.51";

src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh";
sha256 = "1ckzgzbv2fh5y7c5r0b9n6y2migmsrnlwdg7dybr0c82s39swr7f";
};

cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1";
cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b";

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]