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: e842ffbb3342
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 231f434a4d32
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 17, 2018

  1. bzflag: 2.4.10 -> 2.4.12

    @globin
    globin committed Jan 17, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    843f37d View commit details

  2. gitlab: 10.3.3 -> 10.3.4 

    Fixes:
 - CVE-2017-0915
 - CVE-2018-3710
 - CVE-2017-0918
 - CVE-2017-0923
 - CVE-2017-0925
 - CVE-2017-0926
 - CVE-2017-0924
 - CVE-2017-0914
 - CVE-2017-0916
 - CVE-2017-0917
 - CVE-2017-0927
 - CVE-2017-0922

See https://about.gitlab.com/2018/01/16/gitlab-10-dot-3-dot-4-released/
for details.
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    231f434 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/applications/version-management/gitlab/default.nix
  2. +2 −2 pkgs/games/bzflag/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ let
};
};

version = "10.3.3";
version = "10.3.4";

gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
sha256 = "0bnafl7mpm3vjhfkqwgf5ff1y1iixfdfvv25zmpl0yjd70fwx2aq";
sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica";
};

in
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
sha256 = "1fhjijs8rvxrgx43fc7vp6f3vwshwq74gjwk41fi2yam8bri8p6k";
sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/games/bzflag/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bzflag";
version = "2.4.10";
version = "2.4.12";

src = fetchurl {
url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa";
sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8";
};

nativeBuildInputs = [ pkgconfig ];