Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34204f8e1f94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98d182885195
Choose a head ref
  • 20 commits
  • 13 files changed
  • 6 contributors

Commits on Oct 24, 2019

  1. toybox: 0.8.1 -> 0.8.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/toybox/versions
    r-ryantm committed Oct 24, 2019
    Copy the full SHA
    ff08eda View commit details

Commits on Oct 25, 2019

  1. tmate: 2.3.0 -> 2.3.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/tmate/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    b465883 View commit details
  2. git-backup: init at 0.2.0

    marsam authored and Jon committed Oct 25, 2019
    Copy the full SHA
    9e5a30b View commit details
  3. protobuf: add 3.10

    stites authored and Jon committed Oct 25, 2019
    Copy the full SHA
    9d90d5f View commit details
  4. Merge pull request #71930 from r-ryantm/auto-update/toybox

    toybox: 0.8.1 -> 0.8.2
    ryantm authored Oct 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b74808e View commit details
  5. xl2tpd: 1.3.14 -> 1.3.15

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xl2tpd/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    4b7e28f View commit details
  6. xlockmore: 5.58 -> 5.59

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xlockmore/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    ccfb3fd View commit details
  7. xxHash: 0.7.1 -> 0.7.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xxhash/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    a16145e View commit details
  8. yarn: 1.19.0 -> 1.19.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/yarn/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    83e7a50 View commit details
  9. tintin: 2.01.90 -> 2.01.91

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/tintin/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    ed57cd6 View commit details
  10. tiled: 1.2.4 -> 1.2.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/tiled/versions
    r-ryantm authored and Jon committed Oct 25, 2019
    Copy the full SHA
    e238399 View commit details
  11. vimPlugins.vader-vim: init at 2019-05-18

    Vader is a test framework for testing other vim plugins.
    27 of the plugins in vim-plugin-names use Vader for their tests.
    chkno authored and Matthieu Coudron committed Oct 25, 2019
    Copy the full SHA
    4250954 View commit details
  12. vimPlugins: update

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    91821d0 View commit details
  13. vimPlugins.ayu-vim: init at 2019-09-21

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    2ca6c45 View commit details
  14. vimPlugins.vim-flatbuffers: init at 2018-10-11

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    349035a View commit details
  15. vimPlugins.gentoo-syntax: init at 2019-09-30

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    1983fc9 View commit details
  16. vimPlugins.vim-nftables: init at 2019-07-25

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    5e0b837 View commit details
  17. vimPlugins.lalrpop-vim: init at 2017-11-22

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    fac36f1 View commit details
  18. vimPlugins.deoplete-tabnine: init at 2019-10-16

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    437c8ae View commit details
  19. vimPlugins.vim-protobuf: init at 2017-12-26

    lovesegfault authored and Jon committed Oct 25, 2019
    Copy the full SHA
    98d1828 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/tiled/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

mkDerivation rec {
pname = "tiled";
version = "1.2.4";
version = "1.2.5";

src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
sha256 = "18a0pkq8j20v1njrl0sswm0ch10c6c4fas7q9kk2d2fd610ga6gh";
sha256 = "0sz8klz0nz60dhvz7pdn44zwr9q578pq50sxsbynz7irhrv02b52";
};

nativeBuildInputs = [ pkgconfig qmake ];
26 changes: 26 additions & 0 deletions pkgs/applications/version-management/git-backup/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }:

rustPlatform.buildRustPackage rec {
pname = "git-backup";
version = "0.2.0";

src = fetchFromGitHub {
owner = "jsdw";
repo = pname;
rev = "v${version}";
sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj";
};

cargoSha256 = "1vfyhfdy5ks9zs9sy61ck9459w86hn9v6jqcar7rib82bclzr1mx";

nativeBuildInputs = [ pkg-config ];

buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

meta = with stdenv.lib; {
homepage = "https://github.com/jsdw/git-backup";
description = "A tool to help you backup your git repositories from services like GitHub";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}
6 changes: 6 additions & 0 deletions pkgs/development/libraries/protobuf/3.10.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ callPackage, ... }:

callPackage ./generic-v3.nix {
version = "3.10.0";
sha256 = "0cjwfm9v2gv6skzrq4m7w28810p2h3m1jj4kw6df3x8vvg7q842c";
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/xxHash/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "xxHash";
version = "0.7.1";
version = "0.7.2";

src = fetchFromGitHub {
owner = "Cyan4973";
repo = "xxHash";
rev = "v${version}";
sha256 = "0hh1ypwk86m3b0x4433k95f94b48kvl7s79dml0f3g0cv8jdvkgw";
sha256 = "1f9gl0cymmi92ihsfan0p4zmyf2hxwx4arjimpbmbp719nbcvdsx";
};

outputs = [ "out" "dev" ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/yarn/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "yarn";
version = "1.19.0";
version = "1.19.1";

src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
sha256 = "14h293kixxiww41daj0xyjii8d9mgr2ah5sxadass60p61ynxsq4";
sha256 = "0qlrwmvpv0ifvywqqzg28ywmhk4prkk1dflnnpk6grpgkq3bfv77";
};

buildInputs = [ nodejs ];
4 changes: 2 additions & 2 deletions pkgs/games/tintin/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, pcre }:

stdenv.mkDerivation rec {
name = "tintin-2.01.90";
name = "tintin-2.01.91";

src = fetchurl {
url = "mirror://sourceforge/tintin/${name}.tar.gz";
sha256 = "0v4khry5fmsp5w370v00ici5c8ryxak4mkaz9h4xfl1jk4mfygkb";
sha256 = "0nb3przw84r5zaibhpcb8gxm5vllrchca663c3f650fm83asd5im";
};

buildInputs = [ zlib pcre ];
4 changes: 2 additions & 2 deletions pkgs/misc/screensavers/xlockmore/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:

stdenv.mkDerivation rec {
name = "xlockmore-5.58";
name = "xlockmore-5.59";

src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
sha256 = "1va11sbv5lbkxkp0i0msz5md3n2n82nzppk27rzdrw7y79vq37zw";
sha256 = "0lajc5a4lki33b9mzfsi74q4hbivbmhwysp7mib4ivnyxianhaid";
curlOpts = "--user-agent 'Mozilla/5.0'";
};

Loading