From 873042271ad597dd77c95d380f75f05f6185249e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 28 Nov 2021 18:02:36 +0100 Subject: [PATCH 01/11] frogatto: 2021-05-24 -> 2021-11-23 And fix build --- pkgs/games/frogatto/engine.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 22aab537c21..9e8ee6fe8dd 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -4,21 +4,16 @@ stdenv.mkDerivation { pname = "anura-engine"; - version = "unstable-2021-05-24"; + version = "unstable-2021-11-23"; src = fetchFromGitHub { owner = "anura-engine"; repo = "anura"; - rev = "ed50bbfa68a4aa09438d95d39103ec39156d438f"; - sha256 = "0bk0qklk9wwx3jr2kbrmansccn1nj962v5n2vlb5hxsrcv96s3dg"; + rev = "816425df31624066e2815e26a25b1c5d3d355cb4"; + sha256 = "1k7fnfgz003gcbyygv4aakhkkz3w3z9nyz7dlwz01xa6122zqyir"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace src/sys.cpp \ - --replace mallinfo2 mallinfo - ''; - nativeBuildInputs = [ which pkg-config ]; From b9f6ee2e2f1cde415b610619e154d6b452583460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 28 Nov 2021 11:15:22 -0600 Subject: [PATCH 02/11] =?UTF-8?q?pijul:=201.0.0-alpha.55=20=E2=86=92=201.0?= =?UTF-8?q?.0-alpha.56?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index f558eab6b61..03659e0ba40 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.55"; + version = "1.0.0-alpha.56"; src = fetchCrate { inherit version pname; - sha256 = "sha256-1nnn0cdDe+WOetGtRe7dMEyuCcbfRHdJWFxQ4bTXebQ="; + sha256 = "zV4F4dbjJ58yGiupUwj5Z0HrKR78Mzch8Zs98YfxSTQ="; }; - cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs="; + cargoSha256 = "JQGBTCNu9U2Kq6tc7VT07LEbzLW+jdVWrK5e2qjzGRA="; doCheck = false; nativeBuildInputs = [ pkg-config ]; From 9366d120364a6a0106f6379838abe98d69307ed6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 14:03:33 -0500 Subject: [PATCH 03/11] hck: 0.7.0 -> 0.7.1 --- pkgs/tools/text/hck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index 87462d8d717..ebb66a07a8b 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BP1B1FlN+9qpkqv4WfT7OSyPCb7K47uxJQKXAW1Kkck="; + sha256 = "sha256-6PXhFOXWplj7yEyn7hOQSPS2YDGc1nxTs6wRseRvEVk="; }; - cargoSha256 = "sha256-Lp0VGt6z9mE8b9Fi6Fz3MjmHmbr9Az72D7BzOju9uOI="; + cargoSha256 = "sha256-VAtvc8K4282twB1MRY72+dCky3JmrTRjOPx1Ft7Oqt8="; nativeBuildInputs = [ cmake ]; From 8153160acfd08328adf0f32bb5a4358cb77a2ab4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 14:24:16 -0500 Subject: [PATCH 04/11] glitter: 1.5.6 -> 1.5.7 --- .../version-management/git-and-tools/glitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 89419605b3b..61533f19dd7 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RP/8E2wqEFArWrZ1nfDhTKt2Ak1bl6PhalaHcQobfTk="; + sha256 = "sha256-0hKwGZingOa4nB9VTErbOTSBLc4pcxDUnK5lltVZiYk="; }; - cargoSha256 = "sha256-6OGkcTGKCMgxMFDJ625NeVmKjRRwiRkQdE+oXRN3FHw="; + cargoSha256 = "sha256-08heeRIGzPmORh8KTyBx9GPfOZw2RR85PjkGvbaGA50="; # tests require it to be in a git repository preCheck = '' From fdc128b146fcc7a9c4f3bc50f1cf511abe184152 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 28 Nov 2021 17:56:22 -0500 Subject: [PATCH 05/11] iterm2: 3.4.13 -> 3.4.14 --- pkgs/applications/terminal-emulators/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index aa581f9b595..4c46bcc6c3f 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.13"; + version = "3.4.14"; src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; - sha256 = "sha256-GOUdXBQCvM0oJ2/3zgKqDpfyCkHNwd1Qdopg5Mpyekg="; + sha256 = "sha256-sDCnBO7xDpecu2cSjpHwync2DVsj9EKUmgpqEVLtxRM="; }; patches = [ ./disable_updates.patch ]; From 4aa2320ec14b185e0a601b108c3d970f6bba22c8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 27 Nov 2021 21:16:31 +0100 Subject: [PATCH 06/11] vorta: 0.7.8 -> 0.8.2 ChangeLogs: * https://github.com/borgbase/vorta/releases/tag/v0.8.0 * https://github.com/borgbase/vorta/releases/tag/v0.8.1 * https://github.com/borgbase/vorta/releases/tag/v0.8.2 --- pkgs/applications/backup/vorta/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 675ebf7d349..7434c12cba2 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.7.8"; + version = "0.8.2"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-qNBswy1dsCE6TEQLr/r7nnZWegDD8BD9pMkcpcuT7Q0="; + sha256 = "sha256-ut4HCfLU/P22y5QbNakTV4d4CnFRxJvn+cnJ0ZGpTlw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { peewee pyqt5 python-dateutil - APScheduler psutil qdarkstyle secretstorage From 3eb5d85beb8f126def8dbf7b35035826bd7dd58f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 22 Nov 2021 00:21:47 +0100 Subject: [PATCH 07/11] .github/workflows/periodic-merge: configure 21.11 release --- .github/workflows/periodic-merge-24h.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 9032b3d7d91..b8535fdf952 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -32,6 +32,10 @@ jobs: into: staging-next-21.05 - from: staging-next-21.05 into: staging-21.05 + - from: release-21.11 + into: staging-next-21.11 + - from: staging-next-21.11 + into: staging-21.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 From e1486feead37cacbc9726fba9c20c4fbc28b2b37 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 28 Nov 2021 20:06:53 -0500 Subject: [PATCH 08/11] maintainers: winterqt -> winter --- maintainers/maintainer-list.nix | 2 +- pkgs/tools/misc/bottom-rs/default.nix | 2 +- pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix | 2 +- pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e74a09490ff..c2c0d56dfee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12466,7 +12466,7 @@ githubId = 6016963; name = "Patrick Winter"; }; - winterqt = { + winter = { email = "nixos@winter.cafe"; github = "winterqt"; githubId = 78392041; diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/tools/misc/bottom-rs/default.nix index 9e1ecc03c12..f9a24537676 100644 --- a/pkgs/tools/misc/bottom-rs/default.nix +++ b/pkgs/tools/misc/bottom-rs/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { description = "Fantastic (maybe) CLI for translating between bottom and human-readable text"; homepage = "https://github.com/bottom-software-foundation/bottom-rs"; license = licenses.mit; - maintainers = with maintainers; [ winterqt ]; + maintainers = with maintainers; [ winter ]; mainProgram = "bottomify"; }; } diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix index 08b646421b8..d46e4a15939 100644 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jesec/libtorrent"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ winterqt AndersonTorres ]; + maintainers = with maintainers; [ winter AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix index 3e69e64de35..7fe444228d3 100644 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix +++ b/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; homepage = "https://github.com/jesec/rtorrent"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ winterqt AndersonTorres ]; + maintainers = with maintainers; [ winter AndersonTorres ]; platforms = platforms.linux; }; } From 3aab0e3ad9ef9663566c9c915b93922b4158d5ff Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Sun, 28 Nov 2021 20:22:43 -0700 Subject: [PATCH 09/11] Fix typo in Octave description (#147799) --- pkgs/development/interpreters/octave/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 30fd21f2f83..1bd78a8a2d4 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -235,7 +235,7 @@ let homepage = "https://www.gnu.org/software/octave/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin doronbehar ]; - description = "Scientific Pragramming Language"; + description = "Scientific Programming Language"; # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; platforms = if overridePlatforms == null then From 82b9b4268207f1af23486018254dbc521464c8b9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 29 Nov 2021 03:48:23 +0000 Subject: [PATCH 10/11] Fix some nixos-rebuild lints (#147449) --- .../linux/nixos-rebuild/nixos-rebuild.sh | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 244e1c1d52b..e5e40dca086 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ +# shellcheck shell=bash if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi; @@ -132,7 +133,7 @@ if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) fi -if [ -z "$buildHost" -a -n "$targetHost" ]; then +if [[ -z "$buildHost" && -n "$targetHost" ]]; then buildHost="$targetHost" fi if [ "$targetHost" = localhost ]; then @@ -217,8 +218,7 @@ nixBuild() { } nixFlakeBuild() { - if [[ -z "$buildHost" && -z "$targetHost" ]] && - ! [ "$action" = switch -o "$action" = boot ] + if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot ]] then nix "${flakeFlags[@]}" build "$@" readlink -f ./result @@ -273,7 +273,7 @@ if [ -z "$action" ]; then showSyntax; fi # executed, so it's safe to run nixos-rebuild against a potentially # untrusted tree. canRun= -if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then +if [[ "$action" = switch || "$action" = boot || "$action" = test ]]; then canRun=1 fi @@ -377,7 +377,7 @@ trap cleanup EXIT # First build Nix, since NixOS may require a newer version than the # current one. -if [ -n "$rollback" -o "$action" = dry-build ]; then +if [[ -n "$rollback" || "$action" = dry-build ]]; then buildNix= fi @@ -411,7 +411,7 @@ if [[ -n $buildNix && -z $flake ]]; then if ! nixStorePath="$(nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then nixStorePath="$(prebuiltNix "$(uname -m)")" fi - if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \ + if ! nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ --option extra-binary-caches https://cache.nixos.org/; then echo "warning: don't know how to get latest Nix" >&2 fi @@ -464,7 +464,7 @@ fi # current directory (for "build" and "test"). if [ -z "$rollback" ]; then echo "building the system configuration..." >&2 - if [ "$action" = switch -o "$action" = boot ]; then + if [[ "$action" = switch || "$action" = boot ]]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else @@ -472,7 +472,7 @@ if [ -z "$rollback" ]; then fi copyToTarget "$pathToConfig" targetHostCmd nix-env -p "$profile" --set "$pathToConfig" - elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then + elif [[ "$action" = test || "$action" = build || "$action" = dry-build || "$action" = dry-activate ]]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else @@ -494,14 +494,14 @@ if [ -z "$rollback" ]; then showSyntax fi # Copy build to target host if we haven't already done it - if ! [ "$action" = switch -o "$action" = boot ]; then + if ! [[ "$action" = switch || "$action" = boot ]]; then copyToTarget "$pathToConfig" fi else # [ -n "$rollback" ] - if [ "$action" = switch -o "$action" = boot ]; then + if [[ "$action" = switch || "$action" = boot ]]; then targetHostCmd nix-env --rollback -p "$profile" pathToConfig="$profile" - elif [ "$action" = test -o "$action" = build ]; then + elif [[ "$action" = test || "$action" = build ]]; then systemNumber=$( targetHostCmd nix-env -p "$profile" --list-generations | sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h' @@ -518,7 +518,7 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. -if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then +if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then if ! targetHostCmd "$pathToConfig/bin/switch-to-configuration" "$action"; then echo "warning: error(s) occurred while switching to the new configuration" >&2 exit 1 @@ -526,9 +526,9 @@ if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = d fi -if [ "$action" = build-vm -o "$action" = build-vm-with-bootloader ]; then +if [[ "$action" = build-vm || "$action" = build-vm-with-bootloader ]]; then cat >&2 < Date: Sun, 12 Jul 2020 21:04:04 +0200 Subject: [PATCH 11/11] linux_hardkernel_4_14: 4.14.165-172 -> 4.14.180-176 --- pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index a64520ab893..70ac299f161 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: buildLinux (args // rec { - version = "4.14.165-172"; + version = "4.14.180-176"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.165"; + modDirVersion = "4.14.180"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "10ayqjjs2hxj1q7sb0mxa3gv75q28lznjha19rpxvig2fpi8015s"; + sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v"; }; defconfig = "odroidxu4_defconfig";