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: 6eadc1100531
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: 71412714101e
Choose a head ref
  • 18 commits
  • 13 files changed
  • 7 contributors

Commits on Feb 1, 2020

  1. Copy the full SHA
    f2e529a View commit details

Commits on Jul 18, 2020

  1. Copy the full SHA
    68b7fc2 View commit details

Commits on Jul 27, 2020

  1. jazzy: 0.13.3 -> 0.13.5

    lilyball committed Jul 27, 2020
    Copy the full SHA
    c8dd9d6 View commit details
  2. Copy the full SHA
    c4ce0b7 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    09bf619 View commit details

Commits on Jul 28, 2020

  1. Copy the full SHA
    7cce068 View commit details

Commits on Jul 29, 2020

  1. Copy the full SHA
    2b58f47 View commit details
  2. pt2-clone: 1.20 -> 1.22

    fgaz committed Jul 29, 2020
    Copy the full SHA
    411e09d View commit details
  3. pt2-clone: add nixos test

    fgaz committed Jul 29, 2020
    Copy the full SHA
    4436c01 View commit details

Commits on Jul 30, 2020

  1. Copy the full SHA
    5d85ffe View commit details
  2. Merge pull request #94183 from fgaz/pt2-clone/1.22

    pt2-clone: 1.20 -> 1.22, add nixos test
    Mic92 authored Jul 30, 2020
    Copy the full SHA
    a7888ee View commit details
  3. Merge pull request #93405 from fgaz/curseofwar/1.3.0

    curseofwar,curseofwar-sdl: 1.2.0 -> 1.3.0
    Mic92 authored Jul 30, 2020
    Copy the full SHA
    8704039 View commit details
  4. Merge pull request #78998 from magnetophon/real_time_config_quick_scan

    real_time_config_quick_scan: init at unstable-2020-01-16
    marsam authored Jul 30, 2020
    Copy the full SHA
    a4d5f9f View commit details
  5. Merge pull request #93967 from r-ryantm/auto-update/azure-storage-azcopy

    azure-storage-azcopy: 10.4.3 -> 10.5.1
    marsam authored Jul 30, 2020
    Copy the full SHA
    8f48236 View commit details
  6. Merge pull request #94139 from dtzWill/update/iosevka-bin-3.3.1

    iosevka-bin: 3.2.2 -> 3.3.1
    marsam authored Jul 30, 2020
    Copy the full SHA
    abe07bb View commit details
  7. Merge pull request #93950 from lilyball/jazzy

    jazzy: 0.13.3 -> 0.13.5
    marsam authored Jul 30, 2020
    Copy the full SHA
    b1ac18b View commit details
  8. Merge pull request #93951 from lilyball/cocoapods-beta

    cocoapods-beta: 1.9.3 -> 1.10.0.beta.1
    marsam authored Jul 30, 2020
    Copy the full SHA
    07543f0 View commit details
  9. soundtracker: 1.0.0.1 -> 1.0.1

    fgaz authored and bjornfor committed Jul 30, 2020
    Copy the full SHA
    7141271 View commit details
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
@@ -285,6 +285,7 @@ in
prosody = handleTest ./xmpp/prosody.nix {};
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
proxy = handleTest ./proxy.nix {};
pt2-clone = handleTest ./pt2-clone.nix {};
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
quagga = handleTest ./quagga.nix {};
quorum = handleTest ./quorum.nix {};
35 changes: 35 additions & 0 deletions nixos/tests/pt2-clone.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "pt2-clone";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ fgaz ];
};

machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];

services.xserver.enable = true;
sound.enable = true;
environment.systemPackages = [ pkgs.pt2-clone ];
};

enableOCR = true;

testScript =
''
machine.wait_for_x()
# Add a dummy sound card, or the program won't start
machine.execute("modprobe snd-dummy")
machine.execute("pt2-clone &")
machine.wait_for_window(r"ProTracker")
machine.sleep(5)
# One of the few words that actually get recognized
if "LENGTH" not in machine.get_screen_text():
raise Exception("Program did not start successfully")
machine.screenshot("screen")
'';
})

9 changes: 7 additions & 2 deletions pkgs/applications/audio/pt2-clone/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
{ stdenv
, fetchFromGitHub
, cmake
, nixosTests
, alsaLib
, SDL2
}:

stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.20";
version = "1.22";

src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "0s4yk8w19qa58n5p558n6m7d5mslr9h9z5q3ayrgqcchdlm8cfky";
sha256 = "1w6lbq4366bawy975glvjizk57zhvl562xhxwzn7p5hpm2bvw09b";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;

passthru.tests = {
pt2-clone-opens = nixosTests.pt2-clone;
};

meta = with stdenv.lib; {
description = "A highly accurate clone of the classic ProTracker 2.3D software for Amiga";
homepage = "https://16-bits.org/pt2.php";
45 changes: 45 additions & 0 deletions pkgs/applications/audio/real_time_config_quick_scan/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{ stdenv, fetchFromGitHub, perlPackages, makeWrapper }:

stdenv.mkDerivation rec {
pname = "realTimeConfigQuickScan";
version = "unstable-2020-08-03";

src = fetchFromGitHub {
owner = "raboof";
repo = pname;
rev = "4b482db17f8d8567ba0abf33459ceb5f756f088c";
sha256 = "00l69gzwla9gjv5kpklgxlwnl48wnh8h6w0k8i69qr2cxigg4rhj";
};

buildInputs = [ perlPackages.perl makeWrapper ];

dontBuild = true;

installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/doc
# Install Script Files:
# *.pm files
for i in *.pm; do
install -Dm 755 "$i" "$out/share/$i"
done
# Install doc files:
install -D COPYING "$out/share/doc/COPYING"
install -D README.md "$out/share/doc/README.md"
# Install Executable scripts:
install -Dm 755 realTimeConfigQuickScan.pl "$out/bin/realTimeConfigQuickScan"
install -Dm 755 QuickScan.pl "$out/bin/QuickScan"
wrapProgram $out/bin/realTimeConfigQuickScan \
--set PERL5LIB "$out/share"
wrapProgram $out/bin/QuickScan \
--set PERL5LIB "$out/share:${with perlPackages; makePerlPath [ Tk ]}"
'';
meta = with stdenv.lib; {
description = "Linux configuration checker for systems to be used for real-time audio";
homepage = "https://github.com/raboof/realtimeconfigquickscan";
license = licenses.gpl2;
maintainers = with maintainers; [ magnetophon ];
platforms = platforms.linux ;
};
}

14 changes: 10 additions & 4 deletions pkgs/applications/audio/soundtracker/default.nix
Original file line number Diff line number Diff line change
@@ -6,18 +6,21 @@
, alsaLib
, SDL
, jack2
, audiofile
, goocanvas # graphical envelope editing
}:

stdenv.mkDerivation rec {
pname = "soundtracker";
version = "1.0.0.1";
version = "1.0.1";

src = fetchurl {
# Past releases get moved to the "old releases" directory.
# Only the latest release (currently a prerelease) is at the top level.
url = "mirror://sourceforge/soundtracker/old%20releases/soundtracker-${version}.tar.bz2";
sha256 = "1ggliswz5ngmlnrnyhv3x1arh5w77an0ww9p53cddp9aas5q11jm";
# Only the latest release is at the top level.
# Nonetheless, only the name of the file seems to affect which file is
# downloaded, so this path should be fine both for old and current releases.
url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.bz2";
sha256 = "0m5iiqccch6w53khpvdldz59zymw13vmwqc5ggx3sn41riwbd6ks";
};

nativeBuildInputs = [
@@ -28,9 +31,12 @@ stdenv.mkDerivation rec {
gtk2
SDL
jack2
audiofile
goocanvas
] ++ stdenv.lib.optional stdenv.isLinux alsaLib;

hardeningDisable = [ "format" ];

meta = with stdenv.lib; {
description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker";
longDescription = ''
4 changes: 2 additions & 2 deletions pkgs/data/fonts/iosevka/bin.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:

let
version = "3.2.2";
version = "3.3.1";
in fetchzip {
name = "iosevka-bin-${version}";

@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';

sha256 = "11966fvqamlg88vlgs47fl3ambi48h0mjj4a758i5y8myb2hk6bd";
sha256 = "1hfccivk5f7i489s78yh2x96ic6rf5ncbsjqnrxqmfs9n1gjhfbj";

meta = with stdenv.lib; {
homepage = "https://be5invis.github.io/Iosevka/";
44 changes: 24 additions & 20 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
Original file line number Diff line number Diff line change
@@ -2,25 +2,27 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.3)
i18n (~> 0.7)
activesupport (5.2.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.3)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.3)
activesupport (>= 4.0.2, < 5)
cocoapods (1.10.0.beta.1)
activesupport (> 5)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.3)
cocoapods-core (= 1.10.0.beta.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
@@ -30,21 +32,22 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.3)
activesupport (>= 4.0.2, < 6)
xcodeproj (>= 1.17.0, < 2.0)
cocoapods-core (1.10.0.beta.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
@@ -54,31 +57,32 @@ GEM
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.12.2)
ffi (1.13.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
json (2.3.0)
json (2.3.1)
minitest (5.14.1)
molinillo (0.6.6)
nanaimo (0.2.6)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.5)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.16.0)
xcodeproj (1.17.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
nanaimo (~> 0.3.0)

PLATFORMS
ruby
Loading