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: 2f1eacc949fe
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: aff2ba0cd27e
Choose a head ref
  • 6 commits
  • 3 files changed
  • 5 contributors

Commits on Apr 23, 2019

  1. factorio: alpha 0.16.51 -> 0.17.32

    @bjpbakker
    bjpbakker committed Apr 23, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    bjpbakker Bart Bakker
    GPG key ID: 8BC1D8F4C6C7B548
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    98bcc60 View commit details

Commits on Apr 24, 2019

  1. Merge pull request #60120 from bjpbakker/release-19.03 

    factorio: alpha 0.16.51 -> 0.17.32
    @joachifm
    joachifm authored Apr 24, 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
    3f2a7aa View commit details

  2. torcs: anonscm.debian.org has moved 

    the patch links where somewhat broken
my guess it is due to the move to a gitlab at salsa.debian.org
I used the non access required download link generated by gitlab

(cherry picked from commit acbdaa5)
    @eri451 @c0bw3b
    eri451 authored and c0bw3b committed Apr 24, 2019
    Copy the full SHA
    941ff83 View commit details

  3. torcs: anonscm.debian.org has moved (#59316) 

    * torcs: anonscm.debian.org has moved

the patch links returned a HTTP error 401 as
anonscm.debian.org moved to a gitlab at salsa.debian.org
I used the non access required download link generated by the new instance
As @worldofpeace suggested in #58978 I used the last commit involving the files.

* torcs: add patch on OpenALMusicPlayer.cpp

Unbreak builds with GCC7

(cherry picked from commit 99b9166)
    @eri451 @c0bw3b
    eri451 authored and c0bw3b committed Apr 24, 2019
    Copy the full SHA
    e60c4f5 View commit details

  4. chromium: 73.0.3683.103 -> 74.0.3729.108 

    CVE-2019-5805 CVE-2019-5806 CVE-2019-5807 CVE-2019-5808 CVE-2019-5809
CVE-2019-5810 CVE-2019-5811 CVE-2019-5812 CVE-2019-5813 CVE-2019-5814
CVE-2019-5815 CVE-2019-5816 CVE-2019-5817 CVE-2019-5818 CVE-2019-5819
CVE-2019-5820 CVE-2019-5821 CVE-2019-5822 CVE-2019-5823

(cherry picked from commit d77256c)
    @bendlas
    bendlas committed Apr 24, 2019
    Copy the full SHA
    d1e25d9 View commit details

  5. Merge pull request #60179 from c0bw3b/backport/torcs 

    [19.03] torcs: fetch patch from stable source
    @c0bw3b
    c0bw3b authored Apr 24, 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
    aff2ba0 View commit details
Showing with 20 additions and 15 deletions.
  1. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +2 −2 pkgs/games/factorio/default.nix
  3. +9 −4 pkgs/games/torcs/default.nix
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1lpgkf292f6v6v19zjp1si6vvizixk9192yjx76pq1d790678qrb";
sha256bin64 = "028c3gjh5zbxr53wkk3s5jvgwc2fz9cnvnyr58q4la91vyrbjslm";
version = "74.0.3729.61";
sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy";
sha256bin64 = "1zzmk08y2rhirm297a91bvq5q30vvxll8fzfp7z5cpqb6az80y2h";
version = "74.0.3729.108";
};
dev = {
sha256 = "15197r2gbx4h7dsasvgz0vcl7mqmj0glc4sip99dw145drwdpmsq";
sha256bin64 = "1qf089l5k7l69msrn49z5lkg932n1rgnzgr9yg5ja89arcgynacv";
version = "75.0.3753.4";
sha256 = "1wrg4r2q043i8i4vq9zn69yvnzjxzmxyn21k367909kci83hhi44";
sha256bin64 = "1jv9wi4nddijjp9y0r77rxciqsd1rkd87ipvagyq5nzpxr6wdzsa";
version = "75.0.3766.2";
};
stable = {
sha256 = "1bskjr7yiwvdab1b5mp36y6964xqpgks6dqazm4qifwqvqcw80pb";
sha256bin64 = "00ndrqhmnk567sw6xj22m84126qvivq0jzfx0v46ya3kq6ln22gr";
version = "73.0.3683.103";
sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy";
sha256bin64 = "0zs3khzszppmjf5s4rs6fbmhgc9y0abj4q4q8j3hn6nisddi9q9c";
version = "74.0.3729.108";
};
}
4 changes: 2 additions & 2 deletions pkgs/games/factorio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,11 +53,11 @@ let
x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
alpha = {
stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
experimental = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
experimental = bdist { sha256 = "0xgvvmyh49992y2r8yhafi80j3j4pcsp7pf0fg3rbc6zi1ariwsr"; version = "0.17.32"; withAuth = true; };
};
headless = {
stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
experimental = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
experimental = bdist { sha256 = "1jfjbb0v7yiqpn7nxkr4fcd1rsz59s8k6qcl82d1j320l3y7nl9w"; version = "0.17.32"; };
};
demo = {
stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };
13 changes: 9 additions & 4 deletions pkgs/games/torcs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,25 +12,30 @@ stdenv.mkDerivation rec {

patches = [
(fetchpatch {
url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch";
url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/gcc6-isnan.patch";
sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876";
})
(fetchpatch {
url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch";
url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch";
sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
})
(fetchpatch {
url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/glibc-default-source.patch";
url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/glibc-default-source.patch";
sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp";
})
(fetchpatch {
url = "https://salsa.debian.org/games-team/torcs/raw/32bbe77c68b4de07b28c34497f3c0ad666ee618d/debian/patches/gcc7.patch";
sha256 = "09iilnvdv8h7b4nb1372arszkbz9hbzsck4rimzz1xjdh9ydniw9";
})
];

postPatch = ''
sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
'';

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto
libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ];
libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ];

installTargets = "install datainstall";