Compare commits

..

5 Commits

Author SHA1 Message Date
84ec53f3af
ci: enable GitHub Actions 2020-10-17 16:39:44 +11:00
c1c942c346
spotify-ripper: mark as unfree
Allows building CI as free-only following requirements of upstream.
2020-10-17 16:20:37 +11:00
14e18ac2d2
alacritty-ligatures: fix for building on unstable
The unpacking logic for cargoDeps is changed so that the filename
doesn't implicitly have a file suffix appended to it, so we have to
specify that it's a tarball manually. The output hash is updated to
match.
2020-10-17 15:35:24 +11:00
cec9f93414
protonmail-bridge: fix for building on unstable
At some point the propagation logic is being changed such that
nativeBuildInputs isn't included in buildInputs, which means that
pkg-config can't see anything in nativeBuildInputs.
2020-10-17 15:34:29 +11:00
f66f6445ea
ci: stable -> unstable
NUR upstream requires that everything builds on Nixpkgs unstable, so I
guess that's what we're using. Also enable NixOS unstable to see if we
can get that for free as well.
2020-10-17 15:34:16 +11:00
6 changed files with 18 additions and 16 deletions

View File

@ -3,10 +3,10 @@ on:
pull_request: pull_request:
push: push:
schedule: schedule:
# rebuild everyday at 2:51 # rebuild everyday at 6:50
# TIP: Choose a random time here so not all repositories are build at once: # TIP: Choose a random time here so not all repositories are build at once:
# https://www.random.org/clock-times/?num=1&earliest=01%3A00&latest=08%3A00&interval=5&format=html&rnd=new # https://www.random.org/clock-times/?num=1&earliest=01%3A00&latest=08%3A00&interval=5&format=html&rnd=new
- cron: '51 2 * * *' - cron: '50 6 * * *'
jobs: jobs:
tests: tests:
strategy: strategy:
@ -17,7 +17,7 @@ jobs:
# The repo name as used in # The repo name as used in
# https://github.com/nix-community/NUR/blob/master/repos.json # https://github.com/nix-community/NUR/blob/master/repos.json
nurRepo: nurRepo:
- <YOUR_REPO_NAME> - xeals
# Set this to cache your build results in cachix for faster builds # Set this to cache your build results in cachix for faster builds
# in CI and for everyone who uses your cache. # in CI and for everyone who uses your cache.
# #
@ -27,11 +27,12 @@ jobs:
# For this to work, you also need to set the CACHIX_SIGNING_KEY secret # For this to work, you also need to set the CACHIX_SIGNING_KEY secret
# in your repository settings in Github found at https://github.com/<your_githubname>/nur-packages/settings/secrets # in your repository settings in Github found at https://github.com/<your_githubname>/nur-packages/settings/secrets
cachixName: cachixName:
- <YOUR_CACHIX_NAME> - xeals
nixPath: nixPath:
- nixpkgs=channel:nixos-unstable - nixpkgs=channel:nixos-unstable
- nixpkgs=channel:nixpkgs-unstable - nixpkgs=channel:nixpkgs-unstable
- nixpkgs=channel:nixos-20.03 # Disable due to buildGoModule and buildRustPackage
# - nixpkgs=channel:nixos-20.03
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository

View File

@ -7,14 +7,13 @@ os: linux
env: env:
global: global:
- CACHIX_CACHE="xeals" - CACHIX_CACHE="xeals"
- NIXPKGS_ALLOW_UNFREE="1"
- NUR_REPO="xeals" - NUR_REPO="xeals"
jobs: jobs:
include: include:
# - env: NIX_PATH=nixpkgs=channel:nixpkgs-unstable - env: NIX_PATH=nixpkgs=channel:nixpkgs-unstable
# - env: NIX_PATH=nixpkgs=channel:nixos-unstable - env: NIX_PATH=nixpkgs=channel:nixos-unstable
- env: NIX_PATH=nixpkgs=channel:nixos-20.03 # - env: NIX_PATH=nixpkgs=channel:nixos-20.03
script: script:
- nix-build ci.nix -kA buildOutputs - nix-build ci.nix -kA buildOutputs
@ -24,6 +23,6 @@ script:
after_success: after_success:
- if [ -n "${CACHIX_CACHE}" ]; then nix-build ci.nix -kA cacheOutputs | cachix push "${CACHIX_CACHE}"; fi - if [ -n "${CACHIX_CACHE}" ]; then nix-build ci.nix -kA cacheOutputs | cachix push "${CACHIX_CACHE}"; fi
- if [[ "cron" != "${TRAVIS_EVENT_TYPE}" && "false" = "${TRAVIS_PULL_REQUEST}" && "master" = "${TRAVIS_BRANCH}" ]]; then - if [[ NUR_REPO != "xeals" && "cron" != "${TRAVIS_EVENT_TYPE}" && "false" = "${TRAVIS_PULL_REQUEST}" && "master" = "${TRAVIS_BRANCH}" ]]; then
curl -XPOST "https://nur-update.herokuapp.com/update?repo=${NUR_REPO}"; fi curl -XPOST "https://nur-update.herokuapp.com/update?repo=${NUR_REPO}"; fi

View File

@ -2,8 +2,7 @@
**My personal [NUR](https://github.com/nix-community/NUR) repository** **My personal [NUR](https://github.com/nix-community/NUR) repository**
[![Build Status](https://travis-ci.com/xeals/nur-packages.svg?branch=master)](https://travis-ci.com/xeals/nur-packages) ![Build and populate cache](https://github.com/xeals/nur-packages/workflows/Build%20and%20populate%20cache/badge.svg) [![Cachix Cache](https://img.shields.io/badge/cachix-xeals-blue.svg)](https://xeals.cachix.org)
[![Cachix Cache](https://img.shields.io/badge/cachix-xeals-blue.svg)](https://xeals.cachix.org)
## Noteworthy packages ## Noteworthy packages

View File

@ -32,9 +32,9 @@ rec {
}; };
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const { cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
name = "${pname}-${version}-vendor"; name = "${pname}-${version}-vendor.tar.gz";
inherit src; inherit src;
outputHash = "1zvj8hdlc3fii1ffwkigvxjigwx53vls543pgcv3a2bw4sn1ky1k"; outputHash = "1gi3bvcra56maxcz1a6i1nmzdrfa4mhx6pn1xjbrifv7c6jlxard";
}); });
ligatureInputs = [ ligatureInputs = [

View File

@ -33,6 +33,9 @@ let
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
pkg-config pkg-config
];
buildInputs = (args.buildInputs or [ ]) ++ [
libsecret libsecret
]; ];
@ -58,7 +61,6 @@ let
}; };
}); });
in in
{ {

View File

@ -57,6 +57,7 @@ python2Packages.buildPythonApplication rec {
to WAV, FLAC, Ogg Vorbis, Opus, AAC, and MP4/M4A. to WAV, FLAC, Ogg Vorbis, Opus, AAC, and MP4/M4A.
''; '';
homepage = "https://github.com/hbashton/spotify-ripper"; homepage = "https://github.com/hbashton/spotify-ripper";
license = stdenv.lib.licenses.mit; # spotify-ripper itself is MIT, but the upstream libspotify is unfree.
license = stdenv.lib.licenses.unfree;
}; };
} }